Merge pull request #33 from RUB-NDS/2.5equalsHashcode

Implemented Equals and Hashcode Methods

Author: ic0ns

pom.xml

@@ -3,7 +3,7 @@
     <modelVersion>4.0.0</modelVersion>
     <groupId>de.rub.nds</groupId>
     <artifactId>ModifiableVariable</artifactId>
-    <version>2.4</version>
+    <version>2.5</version>
     <packaging>jar</packaging>
 
     <name>ModifiableVariable</name>

src/main/java/de/rub/nds/modifiablevariable/VariableModification.java

@@ -16,7 +16,7 @@
 import de.rub.nds.modifiablevariable.biginteger.BigIntegerSubtractModification;
 import de.rub.nds.modifiablevariable.biginteger.BigIntegerXorModification;
 import de.rub.nds.modifiablevariable.bool.BooleanExplicitValueModification;
-import de.rub.nds.modifiablevariable.bool.BooleanToogleModification;
+import de.rub.nds.modifiablevariable.bool.BooleanToggleModification;
 import de.rub.nds.modifiablevariable.bytearray.*;
 import de.rub.nds.modifiablevariable.filter.AccessModificationFilter;
 import de.rub.nds.modifiablevariable.integer.IntegerAddModification;
@@ -42,7 +42,7 @@
 @XmlTransient
 @XmlSeeAlso({ AccessModificationFilter.class, BigIntegerAddModification.class, BigIntegerInteractiveModification.class,
         BigIntegerExplicitValueModification.class, BigIntegerSubtractModification.class,
-        BooleanExplicitValueModification.class, BooleanToogleModification.class, BigIntegerXorModification.class,
+        BooleanExplicitValueModification.class, BooleanToggleModification.class, BigIntegerXorModification.class,
         BigIntegerShiftLeftModification.class, BigIntegerShiftRightModification.class, IntegerAddModification.class,
         IntegerExplicitValueModification.class, IntegerSubtractModification.class, IntegerXorModification.class,
         IntegerShiftLeftModification.class, IntegerShiftRightModification.class, ByteArrayDeleteModification.class,

src/main/java/de/rub/nds/modifiablevariable/biginteger/BigIntegerAddModification.java

@@ -10,6 +10,7 @@
 
 import de.rub.nds.modifiablevariable.VariableModification;
 import java.math.BigInteger;
+import java.util.Objects;
 import java.util.Random;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
@@ -47,4 +48,30 @@ public void setSummand(BigInteger summand) {
     public VariableModification<BigInteger> getModifiedCopy() {
         return new BigIntegerAddModification(summand.add(new BigInteger(MAX_ADD_LENGTH, new Random())));
     }
+
+    @Override
+    public int hashCode() {
+        int hash = 7;
+        hash = 41 * hash + Objects.hashCode(this.summand);
+        return hash;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final BigIntegerAddModification other = (BigIntegerAddModification) obj;
+        if (!Objects.equals(this.summand, other.summand)) {
+            return false;
+        }
+        return true;
+    }
+
 }

src/main/java/de/rub/nds/modifiablevariable/biginteger/BigIntegerExplicitValueModification.java

@@ -10,6 +10,7 @@
 
 import de.rub.nds.modifiablevariable.VariableModification;
 import java.math.BigInteger;
+import java.util.Objects;
 import java.util.Random;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
@@ -52,4 +53,29 @@ public VariableModification<BigInteger> getModifiedCopy() {
                     explicitValue.subtract(new BigInteger(MAX_EXPLICIT_LENGTH, r)));
         }
     }
+
+    @Override
+    public int hashCode() {
+        int hash = 3;
+        hash = 41 * hash + Objects.hashCode(this.explicitValue);
+        return hash;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final BigIntegerExplicitValueModification other = (BigIntegerExplicitValueModification) obj;
+        if (!Objects.equals(this.explicitValue, other.explicitValue)) {
+            return false;
+        }
+        return true;
+    }
 }

src/main/java/de/rub/nds/modifiablevariable/biginteger/BigIntegerShiftLeftModification.java

@@ -50,4 +50,29 @@ public void setShift(int shift) {
     public VariableModification<BigInteger> getModifiedCopy() {
         return new BigIntegerShiftLeftModification(shift + new Random().nextInt(MAX_SHIFT_LENGTH));
     }
+
+    @Override
+    public int hashCode() {
+        int hash = 7;
+        hash = 97 * hash + this.shift;
+        return hash;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final BigIntegerShiftLeftModification other = (BigIntegerShiftLeftModification) obj;
+        if (this.shift != other.shift) {
+            return false;
+        }
+        return true;
+    }
 }

src/main/java/de/rub/nds/modifiablevariable/biginteger/BigIntegerShiftRightModification.java

@@ -50,4 +50,29 @@ public void setShift(int shift) {
     public VariableModification<BigInteger> getModifiedCopy() {
         return new BigIntegerShiftRightModification(shift + new Random().nextInt(MAX_SHIFT_LENGTH));
     }
+
+    @Override
+    public int hashCode() {
+        int hash = 7;
+        hash = 97 * hash + this.shift;
+        return hash;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final BigIntegerShiftRightModification other = (BigIntegerShiftRightModification) obj;
+        if (this.shift != other.shift) {
+            return false;
+        }
+        return true;
+    }
 }

src/main/java/de/rub/nds/modifiablevariable/biginteger/BigIntegerSubtractModification.java

@@ -10,6 +10,7 @@
 
 import de.rub.nds.modifiablevariable.VariableModification;
 import java.math.BigInteger;
+import java.util.Objects;
 import java.util.Random;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
@@ -50,4 +51,29 @@ public void setSubtrahend(BigInteger subtrahend) {
     public VariableModification<BigInteger> getModifiedCopy() {
         return new BigIntegerSubtractModification(subtrahend.add(new BigInteger(MAX_SUBTRACT_LENGTH, new Random())));
     }
+
+    @Override
+    public int hashCode() {
+        int hash = 5;
+        hash = 61 * hash + Objects.hashCode(this.subtrahend);
+        return hash;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final BigIntegerSubtractModification other = (BigIntegerSubtractModification) obj;
+        if (!Objects.equals(this.subtrahend, other.subtrahend)) {
+            return false;
+        }
+        return true;
+    }
 }

src/main/java/de/rub/nds/modifiablevariable/biginteger/BigIntegerXorModification.java

@@ -10,6 +10,7 @@
 
 import de.rub.nds.modifiablevariable.VariableModification;
 import java.math.BigInteger;
+import java.util.Objects;
 import java.util.Random;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
@@ -50,4 +51,29 @@ public void setXor(BigInteger xor) {
     public VariableModification<BigInteger> getModifiedCopy() {
         return new BigIntegerXorModification(xor.add(new BigInteger(MAX_XOR_LENGTH, new Random())));
     }
+
+    @Override
+    public int hashCode() {
+        int hash = 7;
+        hash = 97 * hash + Objects.hashCode(this.xor);
+        return hash;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final BigIntegerXorModification other = (BigIntegerXorModification) obj;
+        if (!Objects.equals(this.xor, other.xor)) {
+            return false;
+        }
+        return true;
+    }
 }

src/main/java/de/rub/nds/modifiablevariable/bool/BooleanExplicitValueModification.java

@@ -42,4 +42,35 @@ public void setExplicitValue(boolean explicitValue) {
     public VariableModification<Boolean> getModifiedCopy() {
         return new BooleanExplicitValueModification(!explicitValue);
     }
+
+    @Override
+    public int hashCode() {
+        int hash = 7;
+        hash = 29 * hash + (this.explicitValue ? 1 : 0);
+        return hash;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        final BooleanExplicitValueModification other = (BooleanExplicitValueModification) obj;
+        if (this.explicitValue != other.explicitValue) {
+            return false;
+        }
+        return true;
+    }
+
+    @Override
+    public String toString() {
+        return "BooleanExplicitValueModification{" + "explicitValue=" + explicitValue + '}';
+    }
+
 }

src/main/java/de/rub/nds/modifiablevariable/bool/BooleanModificationFactory.java

@@ -24,13 +24,13 @@ public static VariableModification<Boolean> createRandomModification() {
             case 1:
                 return new BooleanExplicitValueModification(false);
             case 2:
-                return new BooleanToogleModification();
+                return new BooleanToggleModification();
         }
         return null;
     }
 
     public static VariableModification<Boolean> toogle() {
-        return new BooleanToogleModification();
+        return new BooleanToggleModification();
     }
 
     public static VariableModification<Boolean> explicitValue(final boolean explicitValue) {