X-Git-Url: https://git.pterodactylus.net/?a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FProfile.java;h=8ea09f76f0a59d9fd14ef547c2ea99247981466a;hb=c6c4802b4e389b4457adf0827efafca1cd7d1e9c;hp=4b4e0f405cdde567b2f859c11d0b74034531cbeb;hpb=cce88f819ae0ef84b5a86c6a826f88ce0208107f;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 4b4e0f4..8ea09f7 100644
--- a/src/main/java/net/pterodactylus/sone/data/Profile.java
+++ b/src/main/java/net/pterodactylus/sone/data/Profile.java
@@ -1,5 +1,5 @@
/*
- * Sone - Profile.java - Copyright © 2010â2012 David Roden
+ * Sone - Profile.java - Copyright © 2010â2019 David Roden
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
@@ -20,17 +20,22 @@ package net.pterodactylus.sone.data;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
+import static java.nio.charset.StandardCharsets.UTF_8;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.UUID;
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+import com.google.common.hash.Hasher;
+import com.google.common.hash.Hashing;
+
/**
* A profile stores personal information about a {@link Sone}. All information
* is optional and can be {@code null}.
- *
- * @author David âBombeâ Roden
*/
public class Profile implements Fingerprintable {
@@ -77,7 +82,7 @@ public class Profile implements Fingerprintable {
* @param profile
* The profile to copy
*/
- public Profile(Profile profile) {
+ public Profile(@Nonnull Profile profile) {
this.sone = profile.sone;
this.firstName = profile.firstName;
this.middleName = profile.middleName;
@@ -98,6 +103,7 @@ public class Profile implements Fingerprintable {
*
* @return The Sone this profile belongs to
*/
+ @Nonnull
public Sone getSone() {
return sone;
}
@@ -107,6 +113,7 @@ public class Profile implements Fingerprintable {
*
* @return The first name
*/
+ @Nullable
public String getFirstName() {
return firstName;
}
@@ -118,8 +125,9 @@ public class Profile implements Fingerprintable {
* The first name to set
* @return This profile (for method chaining)
*/
- public Profile setFirstName(String firstName) {
- this.firstName = firstName;
+ @Nonnull
+ public Profile setFirstName(@Nullable String firstName) {
+ this.firstName = "".equals(firstName) ? null : firstName;
return this;
}
@@ -128,6 +136,7 @@ public class Profile implements Fingerprintable {
*
* @return The middle name
*/
+ @Nullable
public String getMiddleName() {
return middleName;
}
@@ -139,8 +148,9 @@ public class Profile implements Fingerprintable {
* The middle name to set
* @return This profile (for method chaining)
*/
- public Profile setMiddleName(String middleName) {
- this.middleName = middleName;
+ @Nonnull
+ public Profile setMiddleName(@Nullable String middleName) {
+ this.middleName = "".equals(middleName) ? null : middleName;
return this;
}
@@ -149,6 +159,7 @@ public class Profile implements Fingerprintable {
*
* @return The last name
*/
+ @Nullable
public String getLastName() {
return lastName;
}
@@ -160,8 +171,9 @@ public class Profile implements Fingerprintable {
* The last name to set
* @return This profile (for method chaining)
*/
- public Profile setLastName(String lastName) {
- this.lastName = lastName;
+ @Nonnull
+ public Profile setLastName(@Nullable String lastName) {
+ this.lastName = "".equals(lastName) ? null : lastName;
return this;
}
@@ -170,6 +182,7 @@ public class Profile implements Fingerprintable {
*
* @return The day of the birth date (from 1 to 31)
*/
+ @Nullable
public Integer getBirthDay() {
return birthDay;
}
@@ -181,7 +194,8 @@ public class Profile implements Fingerprintable {
* The day of the birth date (from 1 to 31)
* @return This profile (for method chaining)
*/
- public Profile setBirthDay(Integer birthDay) {
+ @Nonnull
+ public Profile setBirthDay(@Nullable Integer birthDay) {
this.birthDay = birthDay;
return this;
}
@@ -191,6 +205,7 @@ public class Profile implements Fingerprintable {
*
* @return The month of the birth date (from 1 to 12)
*/
+ @Nullable
public Integer getBirthMonth() {
return birthMonth;
}
@@ -202,7 +217,8 @@ public class Profile implements Fingerprintable {
* The month of the birth date (from 1 to 12)
* @return This profile (for method chaining)
*/
- public Profile setBirthMonth(Integer birthMonth) {
+ @Nonnull
+ public Profile setBirthMonth(@Nullable Integer birthMonth) {
this.birthMonth = birthMonth;
return this;
}
@@ -212,6 +228,7 @@ public class Profile implements Fingerprintable {
*
* @return The year of the birth date
*/
+ @Nullable
public Integer getBirthYear() {
return birthYear;
}
@@ -222,6 +239,7 @@ public class Profile implements Fingerprintable {
* @return The ID of the currently selected avatar image, or {@code null} if
* no avatar is selected.
*/
+ @Nullable
public String getAvatar() {
return avatar;
}
@@ -234,7 +252,8 @@ public class Profile implements Fingerprintable {
* image.
* @return This Sone
*/
- public Profile setAvatar(Image avatar) {
+ @Nonnull
+ public Profile setAvatar(@Nullable Image avatar) {
if (avatar == null) {
this.avatar = null;
return this;
@@ -251,7 +270,8 @@ public class Profile implements Fingerprintable {
* The year of the birth date
* @return This profile (for method chaining)
*/
- public Profile setBirthYear(Integer birthYear) {
+ @Nonnull
+ public Profile setBirthYear(@Nullable Integer birthYear) {
this.birthYear = birthYear;
return this;
}
@@ -261,8 +281,9 @@ public class Profile implements Fingerprintable {
*
* @return The fields of this profile
*/
+ @Nonnull
public List getFields() {
- return new ArrayList(fields);
+ return new ArrayList<>(fields);
}
/**
@@ -272,7 +293,7 @@ public class Profile implements Fingerprintable {
* The field to check for
* @return {@code true} if this profile contains the field, false otherwise
*/
- public boolean hasField(Field field) {
+ public boolean hasField(@Nonnull Field field) {
return fields.contains(field);
}
@@ -284,7 +305,8 @@ public class Profile implements Fingerprintable {
* @return The field, or {@code null} if this profile does not contain a
* field with the given ID
*/
- public Field getFieldById(String fieldId) {
+ @Nullable
+ public Field getFieldById(@Nonnull String fieldId) {
checkNotNull(fieldId, "fieldId must not be null");
for (Field field : fields) {
if (field.getId().equals(fieldId)) {
@@ -302,7 +324,8 @@ public class Profile implements Fingerprintable {
* @return The field, or {@code null} if this profile does not contain a
* field with the given name
*/
- public Field getFieldByName(String fieldName) {
+ @Nullable
+ public Field getFieldByName(@Nonnull String fieldName) {
for (Field field : fields) {
if (field.getName().equals(fieldName)) {
return field;
@@ -320,12 +343,17 @@ public class Profile implements Fingerprintable {
* @throws IllegalArgumentException
* if the name is not valid
*/
- public Field addField(String fieldName) throws IllegalArgumentException {
+ @Nonnull
+ public Field addField(@Nonnull String fieldName) throws IllegalArgumentException {
checkNotNull(fieldName, "fieldName must not be null");
- checkArgument(fieldName.length() > 0, "fieldName must not be empty");
- checkState(getFieldByName(fieldName) == null, "fieldName must be unique");
+ if (fieldName.length() == 0) {
+ throw new EmptyFieldName();
+ }
+ if (getFieldByName(fieldName) != null) {
+ throw new DuplicateField();
+ }
@SuppressWarnings("synthetic-access")
- Field field = new Field().setName(fieldName);
+ Field field = new Field().setName(fieldName).setValue("");
fields.add(field);
return field;
}
@@ -338,7 +366,7 @@ public class Profile implements Fingerprintable {
* @param field
* The field to move up
*/
- public void moveFieldUp(Field field) {
+ public void moveFieldUp(@Nonnull Field field) {
checkNotNull(field, "field must not be null");
checkArgument(hasField(field), "field must belong to this profile");
checkArgument(getFieldIndex(field) > 0, "field index must be > 0");
@@ -355,7 +383,7 @@ public class Profile implements Fingerprintable {
* @param field
* The field to move down
*/
- public void moveFieldDown(Field field) {
+ public void moveFieldDown(@Nonnull Field field) {
checkNotNull(field, "field must not be null");
checkArgument(hasField(field), "field must belong to this profile");
checkArgument(getFieldIndex(field) < fields.size() - 1, "field index must be < " + (fields.size() - 1));
@@ -370,7 +398,7 @@ public class Profile implements Fingerprintable {
* @param field
* The field to remove
*/
- public void removeField(Field field) {
+ public void removeField(@Nonnull Field field) {
checkNotNull(field, "field must not be null");
checkArgument(hasField(field), "field must belong to this profile");
fields.remove(field);
@@ -388,7 +416,7 @@ public class Profile implements Fingerprintable {
* @return The index of the field, or {@code -1} if there is no field with
* the given name
*/
- private int getFieldIndex(Field field) {
+ private int getFieldIndex(@Nonnull Field field) {
return fields.indexOf(field);
}
@@ -401,43 +429,41 @@ public class Profile implements Fingerprintable {
*/
@Override
public String getFingerprint() {
- StringBuilder fingerprint = new StringBuilder();
- fingerprint.append("Profile(");
+ Hasher hash = Hashing.sha256().newHasher();
+ hash.putString("Profile(", UTF_8);
if (firstName != null) {
- fingerprint.append("FirstName(").append(firstName).append(')');
+ hash.putString("FirstName(", UTF_8).putString(firstName, UTF_8).putString(")", UTF_8);
}
if (middleName != null) {
- fingerprint.append("MiddleName(").append(middleName).append(')');
+ hash.putString("MiddleName(", UTF_8).putString(middleName, UTF_8).putString(")", UTF_8);
}
if (lastName != null) {
- fingerprint.append("LastName(").append(lastName).append(')');
+ hash.putString("LastName(", UTF_8).putString(lastName, UTF_8).putString(")", UTF_8);
}
if (birthDay != null) {
- fingerprint.append("BirthDay(").append(birthDay).append(')');
+ hash.putString("BirthDay(", UTF_8).putInt(birthDay).putString(")", UTF_8);
}
if (birthMonth != null) {
- fingerprint.append("BirthMonth(").append(birthMonth).append(')');
+ hash.putString("BirthMonth(", UTF_8).putInt(birthMonth).putString(")", UTF_8);
}
if (birthYear != null) {
- fingerprint.append("BirthYear(").append(birthYear).append(')');
+ hash.putString("BirthYear(", UTF_8).putInt(birthYear).putString(")", UTF_8);
}
if (avatar != null) {
- fingerprint.append("Avatar(").append(avatar).append(')');
+ hash.putString("Avatar(", UTF_8).putString(avatar, UTF_8).putString(")", UTF_8);
}
- fingerprint.append("ContactInformation(");
+ hash.putString("ContactInformation(", UTF_8);
for (Field field : fields) {
- fingerprint.append(field.getName()).append('(').append(field.getValue()).append(')');
+ hash.putString(field.getName(), UTF_8).putString("(", UTF_8).putString(field.getValue(), UTF_8).putString(")", UTF_8);
}
- fingerprint.append(")");
- fingerprint.append(")");
+ hash.putString(")", UTF_8);
+ hash.putString(")", UTF_8);
- return fingerprint.toString();
+ return hash.hash().toString();
}
/**
* Container for a profile field.
- *
- * @author David âBombeâ Roden
*/
public class Field {
@@ -463,7 +489,7 @@ public class Profile implements Fingerprintable {
* @param id
* The ID of the field
*/
- private Field(String id) {
+ private Field(@Nonnull String id) {
this.id = checkNotNull(id, "id must not be null");
}
@@ -472,6 +498,7 @@ public class Profile implements Fingerprintable {
*
* @return The ID of this field
*/
+ @Nonnull
public String getId() {
return id;
}
@@ -481,6 +508,7 @@ public class Profile implements Fingerprintable {
*
* @return The name of this field
*/
+ @Nonnull
public String getName() {
return name;
}
@@ -494,7 +522,8 @@ public class Profile implements Fingerprintable {
* The new name of this field
* @return This field
*/
- public Field setName(String name) {
+ @Nonnull
+ public Field setName(@Nonnull String name) {
checkNotNull(name, "name must not be null");
checkArgument(getFieldByName(name) == null, "name must be unique");
this.name = name;
@@ -506,6 +535,7 @@ public class Profile implements Fingerprintable {
*
* @return The value of this field
*/
+ @Nullable
public String getValue() {
return value;
}
@@ -519,7 +549,8 @@ public class Profile implements Fingerprintable {
* The new value of this field
* @return This field
*/
- public Field setValue(String value) {
+ @Nonnull
+ public Field setValue(@Nullable String value) {
this.value = value;
return this;
}
@@ -550,4 +581,14 @@ public class Profile implements Fingerprintable {
}
+ /**
+ * Exception that signals the addition of a field with an empty name.
+ */
+ public static class EmptyFieldName extends IllegalArgumentException { }
+
+ /**
+ * Exception that signals the addition of a field that already exists.
+ */
+ public static class DuplicateField extends IllegalArgumentException { }
+
}