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

diff --git a/src/main/java/net/pterodactylus/sone/data/Identified.java b/src/main/java/net/pterodactylus/sone/data/Identified.java
index f12f842..eec94f1 100644
--- a/src/main/java/net/pterodactylus/sone/data/Identified.java
+++ b/src/main/java/net/pterodactylus/sone/data/Identified.java
@@ -18,7 +18,6 @@
 package net.pterodactylus.sone.data;
 
 import com.google.common.base.Function;
-import com.google.common.base.Optional;
 
 /**
  * Interface for all objects that expose an ID.
@@ -28,11 +27,11 @@ 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();
+		public String apply(Identified identified) {
+			return (identified == null) ? null : identified.getId();
 		}
 	};