Merge pull request #3365 from hazendaz/pom-cleanup

tests: Cleanup equals

Author: hazendaz

src/test/java/org/apache/ibatis/domain/blog/Author.java

@@ -106,12 +106,8 @@ public boolean equals(Object o) {
         || (password != null ? !password.equals(author.password) : author.password != null)) {
       return false;
     }
-    if ((username != null ? !username.equals(author.username) : author.username != null) || (favouriteSection != null
-        ? !favouriteSection.equals(author.favouriteSection) : author.favouriteSection != null)) {
-      return false;
-    }
-
-    return true;
+    return username != null ? username.equals(author.username) : author.username == null && favouriteSection != null
+        ? favouriteSection.equals(author.favouriteSection) : author.favouriteSection == null;
   }
 
   @Override

src/test/java/org/apache/ibatis/domain/blog/ComplexImmutableAuthor.java

@@ -52,13 +52,10 @@ public boolean equals(Object o) {
 
     final ComplexImmutableAuthor that = (ComplexImmutableAuthor) o;
 
-    if ((bio != null ? !bio.equals(that.bio) : that.bio != null) || favouriteSection != that.favouriteSection
-        || (theComplexImmutableAuthorId != null ? !theComplexImmutableAuthorId.equals(that.theComplexImmutableAuthorId)
-            : that.theComplexImmutableAuthorId != null)) {
-      return false;
-    }
-
-    return true;
+    return bio != null ? bio.equals(that.bio)
+        : that.bio == null && favouriteSection == that.favouriteSection && theComplexImmutableAuthorId != null
+            ? theComplexImmutableAuthorId.equals(that.theComplexImmutableAuthorId)
+            : that.theComplexImmutableAuthorId == null;
   }
 
   @Override

src/test/java/org/apache/ibatis/domain/blog/ComplexImmutableAuthorId.java

@@ -55,13 +55,9 @@ public boolean equals(Object o) {
 
     final ComplexImmutableAuthorId that = (ComplexImmutableAuthorId) o;
 
-    if (id != that.id || (email != null ? !email.equals(that.email) : that.email != null)
-        || (password != null ? !password.equals(that.password) : that.password != null)
-        || (username != null ? !username.equals(that.username) : that.username != null)) {
-      return false;
-    }
-
-    return true;
+    return id == that.id && email != null ? email.equals(that.email)
+        : that.email == null && password != null ? password.equals(that.password)
+            : that.password == null && username != null ? username.equals(that.username) : that.username == null;
   }
 
   @Override

src/test/java/org/apache/ibatis/domain/blog/ImmutableAuthor.java

@@ -73,12 +73,8 @@ public boolean equals(Object o) {
         || (password != null ? !password.equals(author.password) : author.password != null)) {
       return false;
     }
-    if ((username != null ? !username.equals(author.username) : author.username != null) || (favouriteSection != null
-        ? !favouriteSection.equals(author.favouriteSection) : author.favouriteSection != null)) {
-      return false;
-    }
-
-    return true;
+    return username != null ? username.equals(author.username) : author.username == null && favouriteSection != null
+        ? favouriteSection.equals(author.favouriteSection) : author.favouriteSection == null;
   }
 
   @Override

src/test/java/org/apache/ibatis/domain/blog/PostLite.java

@@ -54,11 +54,7 @@ public boolean equals(Object o) {
 
     final PostLite that = (PostLite) o;
 
-    if (blogId != that.blogId || (theId != null ? !theId.equals(that.theId) : that.theId != null)) {
-      return false;
-    }
-
-    return true;
+    return blogId == that.blogId && theId != null ? theId.equals(that.theId) : that.theId == null;
   }
 
   @Override

src/test/java/org/apache/ibatis/domain/blog/PostLiteId.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2024 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -45,11 +45,7 @@ public boolean equals(Object o) {
 
     final PostLiteId that = (PostLiteId) o;
 
-    if (id != that.id) {
-      return false;
-    }
-
-    return true;
+    return id == that.id;
   }
 
   @Override

src/test/java/org/apache/ibatis/domain/misc/CustomBeanWrapperFactory.java

@@ -1,5 +1,5 @@
 /*
- *    Copyright 2009-2023 the original author or authors.
+ *    Copyright 2009-2024 the original author or authors.
  *
  *    Licensed under the Apache License, Version 2.0 (the "License");
  *    you may not use this file except in compliance with the License.
@@ -23,10 +23,7 @@
 public class CustomBeanWrapperFactory implements ObjectWrapperFactory {
   @Override
   public boolean hasWrapperFor(Object object) {
-    if (object instanceof Author) {
-      return true;
-    }
-    return false;
+    return object instanceof Author;
   }
 
   @Override

src/test/java/org/apache/ibatis/submitted/cglib_lazy_error/Person.java

@@ -38,11 +38,7 @@ public boolean equals(Object o) {
       return false;
     }
 
-    if (id != null ? !id.equals(person.id) : person.id != null) {
-      return false;
-    }
-
-    return true;
+    return id != null ? id.equals(person.id) : person.id == null;
   }
 
   @Override

src/test/java/org/apache/ibatis/submitted/constructor_columnprefix/EntityKey.java

@@ -42,9 +42,6 @@ public boolean equals(Object obj) {
       return false;
     }
     EntityKey other = (EntityKey) obj;
-    if (!Objects.equals(id, other.id)) {
-      return false;
-    }
-    return true;
+    return Objects.equals(id, other.id);
   }
 }

src/test/java/org/apache/ibatis/submitted/extendresultmap/TestModel.java

@@ -60,10 +60,7 @@ public boolean equals(Object obj) {
       return false;
     }
     TestModel other = (TestModel) obj;
-    if (!Objects.equals(a, other.a) || !Objects.equals(b, other.b)) {
-      return false;
-    }
-    return true;
+    return Objects.equals(a, other.a) && Objects.equals(b, other.b);
   }
 
   @Override

src/test/java/org/apache/ibatis/submitted/foreach_map/IntBoolMapEntry.java

@@ -51,12 +51,8 @@ public boolean equals(Object o) {
 
     IntBoolMapEntry mapEntry = (IntBoolMapEntry) o;
 
-    if ((key != null ? !key.equals(mapEntry.key) : mapEntry.key != null)
-        || (value != null ? !value.equals(mapEntry.value) : mapEntry.value != null)) {
-      return false;
-    }
-
-    return true;
+    return key != null ? key.equals(mapEntry.key)
+        : mapEntry.key == null && value == null ? value.equals(mapEntry.value) : mapEntry.value == null;
   }
 
   @Override

src/test/java/org/apache/ibatis/submitted/foreach_map/NestedBeanMapEntry.java

@@ -71,12 +71,8 @@ public boolean equals(Object o) {
 
     NestedBeanMapEntry map3Entry = (NestedBeanMapEntry) o;
 
-    if (!Objects.equals(keya, map3Entry.keya) || !Objects.equals(keyb, map3Entry.keyb)
-        || !Objects.equals(valuea, map3Entry.valuea) || !Objects.equals(valueb, map3Entry.valueb)) {
-      return false;
-    }
-
-    return true;
+    return Objects.equals(keya, map3Entry.keya) && Objects.equals(keyb, map3Entry.keyb)
+        && Objects.equals(valuea, map3Entry.valuea) && Objects.equals(valueb, map3Entry.valueb);
   }
 
   @Override

src/test/java/org/apache/ibatis/submitted/foreach_map/StringStringMapEntry.java

@@ -51,12 +51,8 @@ public boolean equals(Object o) {
 
     StringStringMapEntry mapEntry = (StringStringMapEntry) o;
 
-    if ((key != null ? !key.equals(mapEntry.key) : mapEntry.key != null)
-        || (value != null ? !value.equals(mapEntry.value) : mapEntry.value != null)) {
-      return false;
-    }
-
-    return true;
+    return key != null ? key.equals(mapEntry.key)
+        : mapEntry.key == null && value != null ? value.equals(mapEntry.value) : mapEntry.value == null;
   }
 
   @Override
@@ -67,7 +63,7 @@ public int hashCode() {
 
   @Override
   public String toString() {
-    return '{' + key.toString() + '=' + value + '}';
+    return '{' + key + '=' + value + '}';
   }
 
   private String key;