Merge pull request #2824 from hazendaz/copyright

[ci] Use objects class for hash, equals usage

Author: hazendaz

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

@@ -15,6 +15,8 @@
  */
 package org.apache.ibatis.submitted.constructor_columnprefix;
 
+import java.util.Objects;
+
 public class EntityKey {
   private Integer id;
 
@@ -28,10 +30,7 @@ public void setId(Integer id) {
 
   @Override
   public int hashCode() {
-    final int prime = 31;
-    int result = 1;
-    result = prime * result + ((id == null) ? 0 : id.hashCode());
-    return result;
+    return Objects.hash(id);
   }
 
   @Override
@@ -43,11 +42,7 @@ public boolean equals(Object obj) {
       return false;
     }
     EntityKey other = (EntityKey) obj;
-    if (id == null) {
-      if (other.id != null) {
-        return false;
-      }
-    } else if (!id.equals(other.id)) {
+    if (!Objects.equals(id, other.id)) {
       return false;
     }
     return true;

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

@@ -15,6 +15,8 @@
  */
 package org.apache.ibatis.submitted.extendresultmap;
 
+import java.util.Objects;
+
 public class TestModel {
 
   private String a;
@@ -46,11 +48,7 @@ public void setB(String b) {
 
   @Override
   public int hashCode() {
-    final int prime = 31;
-    int result = 1;
-    result = prime * result + ((a == null) ? 0 : a.hashCode());
-    result = prime * result + ((b == null) ? 0 : b.hashCode());
-    return result;
+    return Objects.hash(a, b);
   }
 
   @Override
@@ -62,18 +60,10 @@ public boolean equals(Object obj) {
       return false;
     }
     TestModel other = (TestModel) obj;
-    if (a == null) {
-      if (other.a != null) {
-        return false;
-      }
-    } else if (!a.equals(other.a)) {
+    if (!Objects.equals(a, other.a)) {
       return false;
     }
-    if (b == null) {
-      if (other.b != null) {
-        return false;
-      }
-    } else if (!b.equals(other.b)) {
+    if (!Objects.equals(b, other.b)) {
       return false;
     }
     return true;