Updated ModifiableVariableVersion and added Hashcode and EqualsMethods

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/biginteger/BigIntegerAddModification.java

@@ -10,12 +10,13 @@
 
 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;
 
 @XmlRootElement
-@XmlType(propOrder = { "summand", "modificationFilter", "postModification" })
+@XmlType(propOrder = {"summand", "modificationFilter", "postModification"})
 public class BigIntegerAddModification extends VariableModification<BigInteger> {
 
     private final static int MAX_ADD_LENGTH = 8;
@@ -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,12 +10,13 @@
 
 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;
 
 @XmlRootElement
-@XmlType(propOrder = { "explicitValue", "modificationFilter", "postModification" })
+@XmlType(propOrder = {"explicitValue", "modificationFilter", "postModification"})
 public class BigIntegerExplicitValueModification extends VariableModification<BigInteger> {
 
     private final static int MAX_EXPLICIT_LENGTH = 8;
@@ -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

@@ -15,7 +15,7 @@
 import javax.xml.bind.annotation.XmlType;
 
 @XmlRootElement
-@XmlType(propOrder = { "shift", "modificationFilter", "postModification" })
+@XmlType(propOrder = {"shift", "modificationFilter", "postModification"})
 public class BigIntegerShiftLeftModification extends VariableModification<BigInteger> {
 
     private final static int MAX_SHIFT_LENGTH = 32;
@@ -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

@@ -15,7 +15,7 @@
 import javax.xml.bind.annotation.XmlType;
 
 @XmlRootElement
-@XmlType(propOrder = { "shift", "modificationFilter", "postModification" })
+@XmlType(propOrder = {"shift", "modificationFilter", "postModification"})
 public class BigIntegerShiftRightModification extends VariableModification<BigInteger> {
 
     private final static int MAX_SHIFT_LENGTH = 32;
@@ -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,12 +10,13 @@
 
 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;
 
 @XmlRootElement
-@XmlType(propOrder = { "subtrahend", "modificationFilter", "postModification" })
+@XmlType(propOrder = {"subtrahend", "modificationFilter", "postModification"})
 public class BigIntegerSubtractModification extends VariableModification<BigInteger> {
 
     private final static int MAX_SUBTRACT_LENGTH = 8;
@@ -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,12 +10,13 @@
 
 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;
 
 @XmlRootElement
-@XmlType(propOrder = { "xor", "modificationFilter", "postModification" })
+@XmlType(propOrder = {"xor", "modificationFilter", "postModification"})
 public class BigIntegerXorModification extends VariableModification<BigInteger> {
 
     private final static int MAX_XOR_LENGTH = 8;
@@ -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

@@ -13,7 +13,7 @@
 import javax.xml.bind.annotation.XmlType;
 
 @XmlRootElement
-@XmlType(propOrder = { "explicitValue", "modificationFilter", "postModification" })
+@XmlType(propOrder = {"explicitValue", "modificationFilter", "postModification"})
 public class BooleanExplicitValueModification extends VariableModification<Boolean> {
 
     private boolean explicitValue;
@@ -42,4 +42,29 @@ 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;
+    }
 }

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

@@ -15,7 +15,7 @@
 @XmlRootElement
 @XmlType(propOrder = { "modificationFilter", "postModification" })
 public class BooleanToogleModification extends VariableModification<Boolean> {
-
+    
     public BooleanToogleModification() {
     }
 
@@ -31,4 +31,24 @@ protected Boolean modifyImplementationHook(Boolean input) {
     public VariableModification<Boolean> getModifiedCopy() {
         return new BooleanToogleModification();
     }
+
+    @Override
+    public int hashCode() {
+        int hash = 7;
+        return hash;
+    }
+
+    @Override
+    public boolean equals(Object obj) {
+        if (this == obj) {
+            return true;
+        }
+        if (obj == null) {
+            return false;
+        }
+        if (getClass() != obj.getClass()) {
+            return false;
+        }
+        return true;
+    }
 }

src/main/java/de/rub/nds/modifiablevariable/bytearray/ByteArrayDeleteModification.java

@@ -17,7 +17,7 @@
 import javax.xml.bind.annotation.XmlType;
 
 @XmlRootElement
-@XmlType(propOrder = { "count", "startPosition", "modificationFilter", "postModification" })
+@XmlType(propOrder = {"count", "startPosition", "modificationFilter", "postModification"})
 public class ByteArrayDeleteModification extends VariableModification<byte[]> {
 
     private final static int MAX_MODIFIER_LENGTH = 32;
@@ -103,4 +103,33 @@ public VariableModification<byte[]> getModifiedCopy() {
             return new ByteArrayDeleteModification(startPosition, modifier);
         }
     }
+
+    @Override
+    public int hashCode() {
+        int hash = 7;
+        hash = 89 * hash + this.count;
+        hash = 89 * hash + this.startPosition;
+        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 ByteArrayDeleteModification other = (ByteArrayDeleteModification) obj;
+        if (this.count != other.count) {
+            return false;
+        }
+        if (this.startPosition != other.startPosition) {
+            return false;
+        }
+        return true;
+    }
 }