Merge pull request #30 from RUB-NDS/prettyXml2

Pretty xml

Author: ic0ns

pom.xml

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

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

@@ -107,6 +107,8 @@ public E modify(E input) {
 
     protected abstract E modifyImplementationHook(E input);
 
+    public abstract VariableModification<E> getModifiedCopy();
+
     /**
      * Debugging modified variables. Getting stack trace can be time consuming,
      * thus we use isDebugEnabled() function

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

@@ -10,13 +10,16 @@
 
 import de.rub.nds.modifiablevariable.VariableModification;
 import java.math.BigInteger;
+import java.util.Random;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
 @XmlRootElement
 @XmlType(propOrder = { "summand", "modificationFilter", "postModification" })
 public class BigIntegerAddModification extends VariableModification<BigInteger> {
 
+    private final static int MAX_ADD_LENGTH = 8;
+
     private BigInteger summand;
 
     public BigIntegerAddModification() {
@@ -39,4 +42,9 @@ public BigInteger getSummand() {
     public void setSummand(BigInteger summand) {
         this.summand = summand;
     }
+
+    @Override
+    public VariableModification<BigInteger> getModifiedCopy() {
+        return new BigIntegerAddModification(summand.add(new BigInteger(MAX_ADD_LENGTH, new Random())));
+    }
 }

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

@@ -10,13 +10,16 @@
 
 import de.rub.nds.modifiablevariable.VariableModification;
 import java.math.BigInteger;
+import java.util.Random;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
 @XmlRootElement
 @XmlType(propOrder = { "explicitValue", "modificationFilter", "postModification" })
 public class BigIntegerExplicitValueModification extends VariableModification<BigInteger> {
 
+    private final static int MAX_EXPLICIT_LENGTH = 8;
+
     private BigInteger explicitValue;
 
     public BigIntegerExplicitValueModification() {
@@ -38,4 +41,15 @@ public BigInteger getExplicitValue() {
     public void setExplicitValue(BigInteger explicitValue) {
         this.explicitValue = explicitValue;
     }
-}
+
+    @Override
+    public VariableModification<BigInteger> getModifiedCopy() {
+        Random r = new Random();
+        if (r.nextBoolean()) {
+            return new BigIntegerExplicitValueModification(explicitValue.add(new BigInteger(MAX_EXPLICIT_LENGTH, r)));
+        } else {
+            return new BigIntegerExplicitValueModification(
+                    explicitValue.subtract(new BigInteger(MAX_EXPLICIT_LENGTH, r)));
+        }
+    }
+}

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

@@ -36,4 +36,10 @@ public interface InteractiveBigIntegerModification {
 
         BigInteger modify(BigInteger oldVal);
     }
+
+    @Override
+    public VariableModification<BigInteger> getModifiedCopy() {
+        throw new UnsupportedOperationException("This method is not supported for interactive Modifactions");
+    }
+
 }

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

@@ -10,13 +10,16 @@
 
 import de.rub.nds.modifiablevariable.VariableModification;
 import java.math.BigInteger;
+import java.util.Random;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
 @XmlRootElement
 @XmlType(propOrder = { "shift", "modificationFilter", "postModification" })
 public class BigIntegerShiftLeftModification extends VariableModification<BigInteger> {
 
+    private final static int MAX_SHIFT_LENGTH = 32;
+
     private int shift;
 
     public BigIntegerShiftLeftModification() {
@@ -42,4 +45,9 @@ public int getShift() {
     public void setShift(int shift) {
         this.shift = shift;
     }
+
+    @Override
+    public VariableModification<BigInteger> getModifiedCopy() {
+        return new BigIntegerShiftLeftModification(shift + new Random().nextInt(MAX_SHIFT_LENGTH));
+    }
 }

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

@@ -10,13 +10,16 @@
 
 import de.rub.nds.modifiablevariable.VariableModification;
 import java.math.BigInteger;
+import java.util.Random;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
 @XmlRootElement
 @XmlType(propOrder = { "shift", "modificationFilter", "postModification" })
 public class BigIntegerShiftRightModification extends VariableModification<BigInteger> {
 
+    private final static int MAX_SHIFT_LENGTH = 32;
+
     private int shift;
 
     public BigIntegerShiftRightModification() {
@@ -42,4 +45,9 @@ public int getShift() {
     public void setShift(int shift) {
         this.shift = shift;
     }
+
+    @Override
+    public VariableModification<BigInteger> getModifiedCopy() {
+        return new BigIntegerShiftRightModification(shift + new Random().nextInt(MAX_SHIFT_LENGTH));
+    }
 }

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

@@ -10,13 +10,16 @@
 
 import de.rub.nds.modifiablevariable.VariableModification;
 import java.math.BigInteger;
+import java.util.Random;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
 @XmlRootElement
 @XmlType(propOrder = { "subtrahend", "modificationFilter", "postModification" })
 public class BigIntegerSubtractModification extends VariableModification<BigInteger> {
 
+    private final static int MAX_SUBTRACT_LENGTH = 8;
+
     private BigInteger subtrahend;
 
     public BigIntegerSubtractModification() {
@@ -42,4 +45,9 @@ public BigInteger getSubtrahend() {
     public void setSubtrahend(BigInteger subtrahend) {
         this.subtrahend = subtrahend;
     }
+
+    @Override
+    public VariableModification<BigInteger> getModifiedCopy() {
+        return new BigIntegerSubtractModification(subtrahend.add(new BigInteger(MAX_SUBTRACT_LENGTH, new Random())));
+    }
 }

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

@@ -10,13 +10,16 @@
 
 import de.rub.nds.modifiablevariable.VariableModification;
 import java.math.BigInteger;
+import java.util.Random;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
 
 @XmlRootElement
 @XmlType(propOrder = { "xor", "modificationFilter", "postModification" })
 public class BigIntegerXorModification extends VariableModification<BigInteger> {
 
+    private final static int MAX_XOR_LENGTH = 8;
+
     private BigInteger xor;
 
     public BigIntegerXorModification() {
@@ -42,4 +45,9 @@ public BigInteger getXor() {
     public void setXor(BigInteger xor) {
         this.xor = xor;
     }
+
+    @Override
+    public VariableModification<BigInteger> getModifiedCopy() {
+        return new BigIntegerXorModification(xor.add(new BigInteger(MAX_XOR_LENGTH, new Random())));
+    }
 }

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

@@ -37,4 +37,9 @@ public boolean isExplicitValue() {
     public void setExplicitValue(boolean explicitValue) {
         this.explicitValue = explicitValue;
     }
+
+    @Override
+    public VariableModification<Boolean> getModifiedCopy() {
+        return new BooleanExplicitValueModification(!explicitValue);
+    }
 }