Improve equals methods

Author: ben221199

src/main/java/com/yocto/yoclib/imap/protocol/ProtocolBinaryLiteral.java

@@ -3,7 +3,6 @@
 import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 import java.util.Base64;
-import java.util.Objects;
 
 public class ProtocolBinaryLiteral extends ProtocolObject {
 
@@ -32,12 +31,7 @@ public ProtocolBinaryLiteral(String value){
     public boolean equals(Object o) {
         if (!(o instanceof ProtocolBinaryLiteral)) return false;
         ProtocolBinaryLiteral that = (ProtocolBinaryLiteral) o;
-        return isNonSynchronizing == that.isNonSynchronizing && Objects.deepEquals(value, that.value);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(Arrays.hashCode(value), isNonSynchronizing);
+        return this.isNonSynchronizing == that.isNonSynchronizing && Arrays.equals(this.value, that.value);
     }
 
     public byte[] getValue(){

src/main/java/com/yocto/yoclib/imap/protocol/ProtocolList.java

@@ -1,8 +1,6 @@
 package com.yocto.yoclib.imap.protocol;
 
 import java.util.Arrays;
-import java.util.Objects;
-import java.util.stream.Collectors;
 
 public class ProtocolList extends ProtocolObject {
 
@@ -16,12 +14,7 @@ public ProtocolList(ProtocolObject[] objects){
     public boolean equals(Object o) {
         if (!(o instanceof ProtocolList)) return false;
         ProtocolList that = (ProtocolList) o;
-        return Objects.deepEquals(objects, that.objects);
-    }
-
-    @Override
-    public int hashCode() {
-        return Arrays.hashCode(objects);
+        return Arrays.deepEquals(this.objects, that.objects);
     }
 
     public ProtocolObject[] getObjects() {

src/main/java/com/yocto/yoclib/imap/protocol/ProtocolLiteral.java

@@ -1,7 +1,5 @@
 package com.yocto.yoclib.imap.protocol;
 
-import java.util.Objects;
-
 public class ProtocolLiteral extends ProtocolString {
 
     private final boolean isNonSynchronizing;
@@ -21,12 +19,7 @@ public boolean equals(Object o) {
         if (!(o instanceof ProtocolLiteral)) return false;
         if (!super.equals(o)) return false;
         ProtocolLiteral that = (ProtocolLiteral) o;
-        return isNonSynchronizing == that.isNonSynchronizing;
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(super.hashCode(), isNonSynchronizing);
+        return this.isNonSynchronizing == that.isNonSynchronizing;
     }
 
     public boolean isNonSynchronizing(){

src/main/java/com/yocto/yoclib/imap/protocol/ProtocolSectionPartial.java

@@ -62,12 +62,7 @@ public Integer getPartialLength() {
     public boolean equals(Object o) {
         if (!(o instanceof ProtocolSectionPartial)) return false;
         ProtocolSectionPartial that = (ProtocolSectionPartial) o;
-        return Objects.equals(atom, that.atom) && Objects.equals(subordinate, that.subordinate) && Objects.equals(partialOffset, that.partialOffset) && Objects.equals(partialLength, that.partialLength);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hash(atom, subordinate, partialOffset, partialLength);
+        return Objects.equals(this.atom, that.atom) && Objects.equals(this.subordinate, that.subordinate) && Objects.equals(this.partialOffset, that.partialOffset) && Objects.equals(this.partialLength, that.partialLength);
     }
 
     @Override

src/main/java/com/yocto/yoclib/imap/protocol/ProtocolString.java

@@ -14,12 +14,7 @@ protected ProtocolString(String value){
     public boolean equals(Object o) {
         if (!(o instanceof ProtocolString)) return false;
         ProtocolString that = (ProtocolString) o;
-        return Objects.equals(value, that.value);
-    }
-
-    @Override
-    public int hashCode() {
-        return Objects.hashCode(value);
+        return Objects.equals(this.value, that.value);
     }
 
     public String getValue(){

src/main/java/com/yocto/yoclib/imap/protocol/ProtocolSubordinate.java

@@ -1,8 +1,6 @@
 package com.yocto.yoclib.imap.protocol;
 
 import java.util.Arrays;
-import java.util.Objects;
-import java.util.stream.Collectors;
 
 public class ProtocolSubordinate extends ProtocolObject {
 
@@ -20,12 +18,7 @@ public ProtocolObject[] getObjects(){
     public boolean equals(Object o) {
         if (!(o instanceof ProtocolSubordinate)) return false;
         ProtocolSubordinate that = (ProtocolSubordinate) o;
-        return Objects.deepEquals(objects, that.objects);
-    }
-
-    @Override
-    public int hashCode() {
-        return Arrays.hashCode(objects);
+        return Arrays.deepEquals(this.objects, that.objects);
     }
 
     @Override

src/test/java/com/yocto/yoclib/imap/tests/protocol/ProtocolAtomTest.java

@@ -6,10 +6,24 @@
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertFalse;
+import static org.junit.jupiter.api.Assertions.assertNotEquals;
 import static org.junit.jupiter.api.Assertions.assertTrue;
 
 public class ProtocolAtomTest {
 
+    @Test
+    public void testEquals(){
+        assertEquals(new ProtocolAtom("a"),new ProtocolAtom("a"));
+        assertEquals(new ProtocolAtom("ab"),new ProtocolAtom("ab"));
+        assertEquals(new ProtocolAtom("abc"),new ProtocolAtom("abc"));
+
+        assertNotEquals(new ProtocolAtom("a"),null);
+        assertNotEquals(null,new ProtocolAtom("a"));
+
+        assertNotEquals(new ProtocolAtom("ab"),"ab");
+        assertNotEquals("ab",new ProtocolAtom("ab"));
+    }
+
     @Test
     public void testGetValue(){
         assertEquals("a",new ProtocolAtom("a").getValue());

src/test/java/com/yocto/yoclib/imap/tests/protocol/ProtocolBinaryLiteralTest.java

@@ -1,7 +1,6 @@
 package com.yocto.yoclib.imap.tests.protocol;
 
 import com.yocto.yoclib.imap.protocol.ProtocolBinaryLiteral;
-import com.yocto.yoclib.imap.protocol.ProtocolLiteral;
 
 import org.junit.jupiter.api.Test;
 

src/test/java/com/yocto/yoclib/imap/tests/protocol/ProtocolListTest.java

@@ -1,6 +1,10 @@
 package com.yocto.yoclib.imap.tests.protocol;
 
-import com.yocto.yoclib.imap.protocol.*;
+import com.yocto.yoclib.imap.protocol.ProtocolAtom;
+import com.yocto.yoclib.imap.protocol.ProtocolList;
+import com.yocto.yoclib.imap.protocol.ProtocolLiteral;
+import com.yocto.yoclib.imap.protocol.ProtocolObject;
+import com.yocto.yoclib.imap.protocol.ProtocolQuoted;
 
 import org.junit.jupiter.api.Test;