X-Git-Url: https://git.pterodactylus.net/?p=Sone.git;a=blobdiff_plain;f=src%2Fmain%2Fjava%2Fnet%2Fpterodactylus%2Fsone%2Fdata%2FProfile.java;h=b87ef4fe3737ee822fdda60141d373a4bf34ee72;hp=6936409a04cc490288210bea59b1608a222fb262;hb=438378deab1514f0f608d975ef65f5b7aea44ccb;hpb=480691a26222e035e53bda56029524e160fdf898 diff --git a/src/main/java/net/pterodactylus/sone/data/Profile.java b/src/main/java/net/pterodactylus/sone/data/Profile.java index 6936409..b87ef4f 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–2020 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 @@ -17,18 +17,25 @@ 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 net.pterodactylus.util.validation.Validation; +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 { @@ -75,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; @@ -96,6 +103,7 @@ public class Profile implements Fingerprintable { * * @return The Sone this profile belongs to */ + @Nonnull public Sone getSone() { return sone; } @@ -105,6 +113,7 @@ public class Profile implements Fingerprintable { * * @return The first name */ + @Nullable public String getFirstName() { return firstName; } @@ -116,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; } @@ -126,6 +136,7 @@ public class Profile implements Fingerprintable { * * @return The middle name */ + @Nullable public String getMiddleName() { return middleName; } @@ -137,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; } @@ -147,6 +159,7 @@ public class Profile implements Fingerprintable { * * @return The last name */ + @Nullable public String getLastName() { return lastName; } @@ -158,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; } @@ -168,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; } @@ -179,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; } @@ -189,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; } @@ -200,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; } @@ -210,6 +228,7 @@ public class Profile implements Fingerprintable { * * @return The year of the birth date */ + @Nullable public Integer getBirthYear() { return birthYear; } @@ -220,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; } @@ -232,12 +252,13 @@ 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; } - Validation.begin().isEqual("Image Owner", avatar.getSone(), sone).check(); + checkArgument(avatar.getSone().equals(sone), "avatar must belong to Sone"); this.avatar = avatar.getId(); return this; } @@ -249,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; } @@ -259,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); } /** @@ -270,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); } @@ -282,8 +305,9 @@ 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) { - Validation.begin().isNotNull("Field ID", fieldId).check(); + @Nullable + public Field getFieldById(@Nonnull String fieldId) { + checkNotNull(fieldId, "fieldId must not be null"); for (Field field : fields) { if (field.getId().equals(fieldId)) { return field; @@ -300,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; @@ -318,10 +343,17 @@ public class Profile implements Fingerprintable { * @throws IllegalArgumentException * if the name is not valid */ - public Field addField(String fieldName) throws IllegalArgumentException { - Validation.begin().isNotNull("Field Name", fieldName).check().isGreater("Field Name Length", fieldName.length(), 0).isNull("Field Name Unique", getFieldByName(fieldName)).check(); + @Nonnull + public Field addField(@Nonnull String fieldName) throws IllegalArgumentException { + checkNotNull(fieldName, "fieldName must not be null"); + 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; } @@ -334,8 +366,10 @@ public class Profile implements Fingerprintable { * @param field * The field to move up */ - public void moveFieldUp(Field field) { - Validation.begin().isNotNull("Field", field).check().is("Field Existing", hasField(field)).isGreater("Field Index", getFieldIndex(field), 0).check(); + 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"); int fieldIndex = getFieldIndex(field); fields.remove(field); fields.add(fieldIndex - 1, field); @@ -349,8 +383,10 @@ public class Profile implements Fingerprintable { * @param field * The field to move down */ - public void moveFieldDown(Field field) { - Validation.begin().isNotNull("Field", field).check().is("Field Existing", hasField(field)).isLess("Field Index", getFieldIndex(field), fields.size() - 1).check(); + 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)); int fieldIndex = getFieldIndex(field); fields.remove(field); fields.add(fieldIndex + 1, field); @@ -362,8 +398,9 @@ public class Profile implements Fingerprintable { * @param field * The field to remove */ - public void removeField(Field field) { - Validation.begin().isNotNull("Field", field).check().is("Field Existing", hasField(field)).check(); + 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); } @@ -379,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); } @@ -392,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 { @@ -454,9 +489,8 @@ public class Profile implements Fingerprintable { * @param id * The ID of the field */ - private Field(String id) { - Validation.begin().isNotNull("Field ID", id).check(); - this.id = id; + private Field(@Nonnull String id) { + this.id = checkNotNull(id, "id must not be null"); } /** @@ -464,6 +498,7 @@ public class Profile implements Fingerprintable { * * @return The ID of this field */ + @Nonnull public String getId() { return id; } @@ -473,6 +508,7 @@ public class Profile implements Fingerprintable { * * @return The name of this field */ + @Nonnull public String getName() { return name; } @@ -486,8 +522,10 @@ public class Profile implements Fingerprintable { * The new name of this field * @return This field */ - public Field setName(String name) { - Validation.begin().isNotNull("Field Name", name).check().is("Field Unique", (getFieldByName(name) == null) || equals(getFieldByName(name))).check(); + @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; return this; } @@ -497,6 +535,7 @@ public class Profile implements Fingerprintable { * * @return The value of this field */ + @Nullable public String getValue() { return value; } @@ -510,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; } @@ -541,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 { } + }