Consistent equals() implementations using this/that and pattern matching

sbrannen · sbrannen · commit 7ed841b894b5 · 2025-05-30T12:28:58.000+02:00
diff --git a/junit-platform-engine/src/main/java/org/junit/platform/engine/TestTag.java b/junit-platform-engine/src/main/java/org/junit/platform/engine/TestTag.java
@@ -132,10 +132,7 @@ public String getName() {
 
 	@Override
 	public boolean equals(Object obj) {
-		if (obj instanceof TestTag that) {
-			return Objects.equals(this.name, that.name);
-		}
-		return false;
+		return (obj instanceof TestTag that && Objects.equals(this.name, that.name));
 	}
 
 	@Override
diff --git a/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestIdentifier.java b/junit-platform-launcher/src/main/java/org/junit/platform/launcher/TestIdentifier.java
@@ -251,10 +251,7 @@ public Set<TestTag> getTags() {
 
 	@Override
 	public boolean equals(Object obj) {
-		if (obj instanceof TestIdentifier that) {
-			return Objects.equals(this.uniqueId, that.uniqueId);
-		}
-		return false;
+		return (obj instanceof TestIdentifier that && Objects.equals(this.uniqueId, that.uniqueId));
 	}
 
 	@Override
diff --git a/platform-tests/src/test/java/org/junit/platform/commons/support/conversion/FallbackStringToObjectConverterTests.java b/platform-tests/src/test/java/org/junit/platform/commons/support/conversion/FallbackStringToObjectConverterTests.java
@@ -158,13 +158,7 @@ Book nonStaticFactory(String title) {
 
 		@Override
 		public boolean equals(Object obj) {
-			if (this == obj) {
-				return true;
-			}
-			if (!(obj instanceof Book that)) {
-				return false;
-			}
-			return Objects.equals(this.title, that.title);
+			return (this == obj) || (obj instanceof Book that && Objects.equals(this.title, that.title));
 		}
 
 		@Override
@@ -184,13 +178,7 @@ static class Journal {
 
 		@Override
 		public boolean equals(Object obj) {
-			if (this == obj) {
-				return true;
-			}
-			if (!(obj instanceof Journal that)) {
-				return false;
-			}
-			return Objects.equals(this.title, that.title);
+			return (this == obj) || (obj instanceof Journal that && Objects.equals(this.title, that.title));
 		}
 
 		@Override
@@ -218,13 +206,7 @@ static Newspaper of(String title) {
 
 		@Override
 		public boolean equals(Object obj) {
-			if (this == obj) {
-				return true;
-			}
-			if (!(obj instanceof Newspaper that)) {
-				return false;
-			}
-			return Objects.equals(this.title, that.title);
+			return (this == obj) || (obj instanceof Newspaper that && Objects.equals(this.title, that.title));
 		}
 
 		@Override
