X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FIdentified.java;h=bd1a91fa1831962b3920148fb0d55ff92a927d0c;hp=f12f842a7938981a8ba07848dee9f77ff0abfa9f;hb=d39e39ed52c231bd7331c4b2da8e55ffbed081f5;hpb=f855be86d4d02a29c4603522c793a3b0eecc961c

diff --git a/src/main/java/net/pterodactylus/sone/data/Identified.java b/src/main/java/net/pterodactylus/sone/data/Identified.java
index f12f842..bd1a91f 100644
--- a/src/main/java/net/pterodactylus/sone/data/Identified.java
+++ b/src/main/java/net/pterodactylus/sone/data/Identified.java
@@ -17,8 +17,9 @@
 
 package net.pterodactylus.sone.data;
 
+import javax.annotation.Nonnull;
+
 import com.google.common.base.Function;
-import com.google.common.base.Optional;
 
 /**
  * Interface for all objects that expose an ID.
@@ -28,11 +29,12 @@ import com.google.common.base.Optional;
 public interface Identified {
 
 	/** Function to extract the ID from an optional. */
-	public static final Function<Optional<? extends Identified>, Optional<String>> GET_ID = new Function<Optional<? extends Identified>, Optional<String>>() {
+	public static final Function<Identified, String> GET_ID = new Function<Identified, String>() {
 
 		@Override
-		public Optional<String> apply(Optional<? extends Identified> identified) {
-			return identified.isPresent() ? Optional.of(identified.get().getId()) : Optional.<String>absent();
+		@Nonnull
+		public String apply(Identified identified) {
+			return (identified == null) ? null : identified.getId();
 		}
 	};