X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;ds=sidebyside;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FProfile.java;h=6201276b8a03c3dafade2630fb7971b76e546039;hb=532076508aac8e03e0ef9914e90c7a0558b66bbe;hp=3e446fdb89f13a6ee8550d2d6bd124159feb62ec;hpb=64718e3250252e618b2012db44f9095b87470243;p=Sone.git

diff --git a/src/main/java/net/pterodactylus/sone/data/Profile.java b/src/main/java/net/pterodactylus/sone/data/Profile.java
index 3e446fd..6201276 100644
--- a/src/main/java/net/pterodactylus/sone/data/Profile.java
+++ b/src/main/java/net/pterodactylus/sone/data/Profile.java
@@ -17,7 +17,9 @@
 
 package net.pterodactylus.sone.data;
 
+import static com.google.common.base.Optional.absent;
 import static com.google.common.base.Optional.fromNullable;
+import static com.google.common.base.Optional.of;
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
 import static com.google.common.base.Preconditions.checkState;
@@ -184,39 +186,23 @@ public class Profile implements Fingerprintable {
 		return fields.contains(field);
 	}
 
-	/**
-	 * Returns the field with the given ID.
-	 *
-	 * @param fieldId
-	 *            The ID of the field to get
-	 * @return The field, or {@code null} if this profile does not contain a
-	 *         field with the given ID
-	 */
-	public Field getFieldById(String fieldId) {
+	public Optional<Field> getFieldById(String fieldId) {
 		checkNotNull(fieldId, "fieldId must not be null");
 		for (Field field : fields) {
 			if (field.getId().equals(fieldId)) {
-				return field;
+				return of(field);
 			}
 		}
-		return null;
+		return absent();
 	}
 
-	/**
-	 * Returns the field with the given name.
-	 *
-	 * @param fieldName
-	 *            The name of the field to get
-	 * @return The field, or {@code null} if this profile does not contain a
-	 *         field with the given name
-	 */
-	public Field getFieldByName(String fieldName) {
+	public Optional<Field> getFieldByName(String fieldName) {
 		for (Field field : fields) {
 			if (field.getName().equals(fieldName)) {
-				return field;
+				return of(field);
 			}
 		}
-		return null;
+		return absent();
 	}
 
 	/**