X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FIdentified.java;h=eec94f14d6810dd68fc9cac192b5e33cc73b36af;hb=0a4b6fc252003c71f4bdef09560e87982838d9c8;hp=489247994643559ce73fc596a86453832fa18661;hpb=59987c0cdf71bb2b58e0b97abe60e5d77e3cd8be;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 4892479..eec94f1 100644
--- a/src/main/java/net/pterodactylus/sone/data/Identified.java
+++ b/src/main/java/net/pterodactylus/sone/data/Identified.java
@@ -17,10 +17,7 @@
 
 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.
@@ -30,12 +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
-		@Nonnull
-		public Optional<String> apply(Optional<? extends Identified> identified) {
-			return (identified == null) ? Optional.<String>absent() : (identified.isPresent() ? Optional.of(identified.get().getId()) : Optional.<String>absent());
+		public String apply(Identified identified) {
+			return (identified == null) ? null : identified.getId();
 		}
 	};