Regenerate equals/hashCode methods for Java 8

Author: mangstadt

src/main/java/ezvcard/io/json/JCardValue.java

@@ -4,6 +4,7 @@
 import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
+import java.util.Objects;
 import java.util.stream.Collectors;
 
 import ezvcard.property.Categories;
@@ -299,25 +300,16 @@ public List<String> asMulti() {
 	}
 
 	@Override
-	public boolean equals(Object o) {
-		if (this == o) {
-			return true;
-		}
-		if (o == null || getClass() != o.getClass()) {
-			return false;
-		}
-
-		JCardValue that = (JCardValue) o;
-
-		if (values != null ? !values.equals(that.values) : that.values != null) {
-			return false;
-		}
-
-		return true;
+	public boolean equals(Object obj) {
+		if (this == obj) return true;
+		if (obj == null) return false;
+		if (getClass() != obj.getClass()) return false;
+		JCardValue other = (JCardValue) obj;
+		return Objects.equals(values, other.values);
 	}
 
 	@Override
 	public int hashCode() {
-		return values != null ? values.hashCode() : 0;
+		return Objects.hash(values);
 	}
 }

src/main/java/ezvcard/io/json/JsonValue.java

@@ -2,6 +2,7 @@
 
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 /*
  Copyright (c) 2012-2023, Michael Angstadt
@@ -105,42 +106,16 @@ public boolean isNull() {
 
 	@Override
 	public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = prime * result + ((array == null) ? 0 : array.hashCode());
-		result = prime * result + (isNull ? 1231 : 1237);
-		result = prime * result + ((object == null) ? 0 : object.hashCode());
-		result = prime * result + ((value == null) ? 0 : value.hashCode());
-		return result;
+		return Objects.hash(array, isNull, object, value);
 	}
 
 	@Override
 	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (obj == null)
-			return false;
-		if (getClass() != obj.getClass())
-			return false;
+		if (this == obj) return true;
+		if (obj == null) return false;
+		if (getClass() != obj.getClass()) return false;
 		JsonValue other = (JsonValue) obj;
-		if (array == null) {
-			if (other.array != null)
-				return false;
-		} else if (!array.equals(other.array))
-			return false;
-		if (isNull != other.isNull)
-			return false;
-		if (object == null) {
-			if (other.object != null)
-				return false;
-		} else if (!object.equals(other.object))
-			return false;
-		if (value == null) {
-			if (other.value != null)
-				return false;
-		} else if (!value.equals(other.value))
-			return false;
-		return true;
+		return Objects.equals(array, other.array) && isNull == other.isNull && Objects.equals(object, other.object) && Objects.equals(value, other.value);
 	}
 
 	@Override

src/main/java/ezvcard/parameter/MediaTypeParameter.java

@@ -1,5 +1,7 @@
 package ezvcard.parameter;
 
+import java.util.Objects;
+
 /*
  Copyright (c) 2012-2023, Michael Angstadt
  All rights reserved.
@@ -70,30 +72,16 @@ public String getExtension() {
 	public int hashCode() {
 		final int prime = 31;
 		int result = super.hashCode();
-		result = prime * result + ((extension == null) ? 0 : extension.hashCode());
-		result = prime * result + ((mediaType == null) ? 0 : mediaType.hashCode());
+		result = prime * result + Objects.hash(extension, mediaType);
 		return result;
 	}
 
 	@Override
 	public boolean equals(Object obj) {
-		if (this == obj)
-			return true;
-		if (!super.equals(obj))
-			return false;
-		if (getClass() != obj.getClass())
-			return false;
+		if (this == obj) return true;
+		if (!super.equals(obj)) return false;
+		if (getClass() != obj.getClass()) return false;
 		MediaTypeParameter other = (MediaTypeParameter) obj;
-		if (extension == null) {
-			if (other.extension != null)
-				return false;
-		} else if (!extension.equals(other.extension))
-			return false;
-		if (mediaType == null) {
-			if (other.mediaType != null)
-				return false;
-		} else if (!mediaType.equals(other.mediaType))
-			return false;
-		return true;
+		return Objects.equals(extension, other.extension) && Objects.equals(mediaType, other.mediaType);
 	}
 }

src/main/java/ezvcard/parameter/Pid.java

@@ -1,5 +1,7 @@
 package ezvcard.parameter;
 
+import java.util.Objects;
+
 import ezvcard.property.ClientPidMap;
 
 /*
@@ -115,11 +117,7 @@ public String toString() {
 
 	@Override
 	public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = prime * result + ((clientPidMapReference == null) ? 0 : clientPidMapReference.hashCode());
-		result = prime * result + localId.hashCode();
-		return result;
+		return Objects.hash(clientPidMapReference, localId);
 	}
 
 	@Override
@@ -128,10 +126,6 @@ public boolean equals(Object obj) {
 		if (obj == null) return false;
 		if (getClass() != obj.getClass()) return false;
 		Pid other = (Pid) obj;
-		if (clientPidMapReference == null) {
-			if (other.clientPidMapReference != null) return false;
-		} else if (!clientPidMapReference.equals(other.clientPidMapReference)) return false;
-		if (!localId.equals(other.localId)) return false;
-		return true;
+		return Objects.equals(clientPidMapReference, other.clientPidMapReference) && Objects.equals(localId, other.localId);
 	}
 }

src/main/java/ezvcard/parameter/VCardParameter.java

@@ -1,5 +1,7 @@
 package ezvcard.parameter;
 
+import java.util.Objects;
+
 import ezvcard.SupportedVersions;
 import ezvcard.VCardVersion;
 import ezvcard.util.SupportedVersionsHelper;
@@ -112,10 +114,7 @@ public String toString() {
 
 	@Override
 	public int hashCode() {
-		final int prime = 31;
-		int result = 1;
-		result = prime * result + ((value == null) ? 0 : value.hashCode());
-		return result;
+		return Objects.hash(value);
 	}
 
 	@Override
@@ -124,9 +123,6 @@ public boolean equals(Object obj) {
 		if (obj == null) return false;
 		if (getClass() != obj.getClass()) return false;
 		VCardParameter other = (VCardParameter) obj;
-		if (value == null) {
-			if (other.value != null) return false;
-		} else if (!value.equals(other.value)) return false;
-		return true;
+		return Objects.equals(value, other.value);
 	}
 }

src/main/java/ezvcard/parameter/VCardParameters.java

@@ -13,7 +13,6 @@
 import java.util.Map;
 import java.util.Objects;
 import java.util.Set;
-import java.util.stream.Collectors;
 
 import com.github.mangstadt.vinnie.SyntaxStyle;
 import com.github.mangstadt.vinnie.validate.AllowedCharacters;
@@ -35,6 +34,7 @@
 import ezvcard.util.CharIterator;
 import ezvcard.util.GeoUri;
 import ezvcard.util.ListMultimap;
+import ezvcard.util.StringUtils;
 
 /*
  Copyright (c) 2012-2023, Michael Angstadt
@@ -1615,30 +1615,14 @@ public boolean equals(Object obj) {
 			String key = entry.getKey();
 			List<String> value = entry.getValue();
 			List<String> otherValue = other.get(key);
-
-			if (value.size() != otherValue.size()) {
-				return false;
-			}
-
-			List<String> valueLower = toLowerCaseAndSort(value);
-			List<String> otherValueLower = toLowerCaseAndSort(otherValue);
-			if (!valueLower.equals(otherValueLower)) {
+			if (!StringUtils.equalsIgnoreCaseIgnoreOrder(value, otherValue)) {
 				return false;
 			}
 		}
 
 		return true;
 	}
 
-	private List<String> toLowerCaseAndSort(List<String> values) {
-		//@formatter:off
-		return values.stream()
-			.map(String::toLowerCase)
-			.sorted()
-		.collect(Collectors.toList());
-		//@formatter:on
-	}
-
 	/**
 	 * <p>
 	 * A list that converts the raw string values of a TYPE parameter to the

src/main/java/ezvcard/property/Address.java

@@ -4,6 +4,7 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 import ezvcard.VCard;
 import ezvcard.VCardVersion;
@@ -505,29 +506,17 @@ public Address copy() {
 	public int hashCode() {
 		final int prime = 31;
 		int result = super.hashCode();
-		result = prime * result + countries.hashCode();
-		result = prime * result + extendedAddresses.hashCode();
-		result = prime * result + localities.hashCode();
-		result = prime * result + poBoxes.hashCode();
-		result = prime * result + postalCodes.hashCode();
-		result = prime * result + regions.hashCode();
-		result = prime * result + streetAddresses.hashCode();
+		result = prime * result + Objects.hash(countries, extendedAddresses, localities, poBoxes, postalCodes, regions, streetAddresses);
 		return result;
 	}
 
 	@Override
 	public boolean equals(Object obj) {
 		if (this == obj) return true;
 		if (!super.equals(obj)) return false;
+		if (getClass() != obj.getClass()) return false;
 		Address other = (Address) obj;
-		if (!countries.equals(other.countries)) return false;
-		if (!extendedAddresses.equals(other.extendedAddresses)) return false;
-		if (!localities.equals(other.localities)) return false;
-		if (!poBoxes.equals(other.poBoxes)) return false;
-		if (!postalCodes.equals(other.postalCodes)) return false;
-		if (!regions.equals(other.regions)) return false;
-		if (!streetAddresses.equals(other.streetAddresses)) return false;
-		return true;
+		return Objects.equals(countries, other.countries) && Objects.equals(extendedAddresses, other.extendedAddresses) && Objects.equals(localities, other.localities) && Objects.equals(poBoxes, other.poBoxes) && Objects.equals(postalCodes, other.postalCodes) && Objects.equals(regions, other.regions) && Objects.equals(streetAddresses, other.streetAddresses);
 	}
 
 	private static String first(List<String> list) {

src/main/java/ezvcard/property/Agent.java

@@ -5,6 +5,7 @@
 import java.util.List;
 import java.util.Locale;
 import java.util.Map;
+import java.util.Objects;
 
 import ezvcard.SupportedVersions;
 import ezvcard.VCard;
@@ -217,22 +218,16 @@ public Agent copy() {
 	public int hashCode() {
 		final int prime = 31;
 		int result = super.hashCode();
-		result = prime * result + ((url == null) ? 0 : url.hashCode());
-		result = prime * result + ((vcard == null) ? 0 : vcard.hashCode());
+		result = prime * result + Objects.hash(url, vcard);
 		return result;
 	}
 
 	@Override
 	public boolean equals(Object obj) {
 		if (this == obj) return true;
 		if (!super.equals(obj)) return false;
+		if (getClass() != obj.getClass()) return false;
 		Agent other = (Agent) obj;
-		if (url == null) {
-			if (other.url != null) return false;
-		} else if (!url.equals(other.url)) return false;
-		if (vcard == null) {
-			if (other.vcard != null) return false;
-		} else if (!vcard.equals(other.vcard)) return false;
-		return true;
+		return Objects.equals(url, other.url) && Objects.equals(vcard, other.vcard);
 	}
 }

src/main/java/ezvcard/property/BinaryProperty.java

@@ -9,6 +9,7 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 
 import ezvcard.VCard;
 import ezvcard.VCardVersion;
@@ -245,24 +246,17 @@ protected Map<String, Object> toStringValues() {
 	public int hashCode() {
 		final int prime = 31;
 		int result = super.hashCode();
-		result = prime * result + ((contentType == null) ? 0 : contentType.hashCode());
 		result = prime * result + Arrays.hashCode(data);
-		result = prime * result + ((url == null) ? 0 : url.hashCode());
+		result = prime * result + Objects.hash(contentType, url);
 		return result;
 	}
 
 	@Override
 	public boolean equals(Object obj) {
 		if (this == obj) return true;
 		if (!super.equals(obj)) return false;
+		if (getClass() != obj.getClass()) return false;
 		BinaryProperty<?> other = (BinaryProperty<?>) obj;
-		if (contentType == null) {
-			if (other.contentType != null) return false;
-		} else if (!contentType.equals(other.contentType)) return false;
-		if (!Arrays.equals(data, other.data)) return false;
-		if (url == null) {
-			if (other.url != null) return false;
-		} else if (!url.equals(other.url)) return false;
-		return true;
+		return Objects.equals(contentType, other.contentType) && Arrays.equals(data, other.data) && Objects.equals(url, other.url);
 	}
 }

src/main/java/ezvcard/property/ClientPidMap.java

@@ -3,6 +3,7 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
+import java.util.Objects;
 import java.util.UUID;
 
 import ezvcard.SupportedVersions;
@@ -184,22 +185,16 @@ public ClientPidMap copy() {
 	public int hashCode() {
 		final int prime = 31;
 		int result = super.hashCode();
-		result = prime * result + ((pid == null) ? 0 : pid.hashCode());
-		result = prime * result + ((uri == null) ? 0 : uri.hashCode());
+		result = prime * result + Objects.hash(pid, uri);
 		return result;
 	}
 
 	@Override
 	public boolean equals(Object obj) {
 		if (this == obj) return true;
 		if (!super.equals(obj)) return false;
+		if (getClass() != obj.getClass()) return false;
 		ClientPidMap other = (ClientPidMap) obj;
-		if (pid == null) {
-			if (other.pid != null) return false;
-		} else if (!pid.equals(other.pid)) return false;
-		if (uri == null) {
-			if (other.uri != null) return false;
-		} else if (!uri.equals(other.uri)) return false;
-		return true;
+		return Objects.equals(pid, other.pid) && Objects.equals(uri, other.uri);
 	}
 }