Exchanged Hardcoded ranges with final constants

ic0ns · ic0ns · commit 8e1a4a9ccb89 · 2018-06-01T11:12:11.000Z
diff --git a/src/main/java/de/rub/nds/modifiablevariable/biginteger/BigIntegerAddModification.java b/src/main/java/de/rub/nds/modifiablevariable/biginteger/BigIntegerAddModification.java
@@ -18,6 +18,8 @@
 @XmlType(propOrder = { "summand", "modificationFilter", "postModification" })
 public class BigIntegerAddModification extends VariableModification<BigInteger> {
 
+    private final static int MAX_ADD_LENGTH = 8;
+
     private BigInteger summand;
 
     public BigIntegerAddModification() {
@@ -43,6 +45,6 @@ public void setSummand(BigInteger summand) {
 
     @Override
     public VariableModification<BigInteger> getModifiedCopy() {
-        return new BigIntegerAddModification(summand.add(new BigInteger(8, new Random())));
+        return new BigIntegerAddModification(summand.add(new BigInteger(MAX_ADD_LENGTH, new Random())));
     }
 }
diff --git a/src/main/java/de/rub/nds/modifiablevariable/biginteger/BigIntegerExplicitValueModification.java b/src/main/java/de/rub/nds/modifiablevariable/biginteger/BigIntegerExplicitValueModification.java
@@ -18,6 +18,8 @@
 @XmlType(propOrder = { "explicitValue", "modificationFilter", "postModification" })
 public class BigIntegerExplicitValueModification extends VariableModification<BigInteger> {
 
+    private final static int MAX_EXPLICIT_LENGTH = 8;
+
     private BigInteger explicitValue;
 
     public BigIntegerExplicitValueModification() {
@@ -44,9 +46,10 @@ public void setExplicitValue(BigInteger explicitValue) {
     public VariableModification<BigInteger> getModifiedCopy() {
         Random r = new Random();
         if (r.nextBoolean()) {
-            return new BigIntegerExplicitValueModification(explicitValue.add(new BigInteger(8, r)));
+            return new BigIntegerExplicitValueModification(explicitValue.add(new BigInteger(MAX_EXPLICIT_LENGTH, r)));
         } else {
-            return new BigIntegerExplicitValueModification(explicitValue.subtract(new BigInteger(8, r)));
+            return new BigIntegerExplicitValueModification(
+                    explicitValue.subtract(new BigInteger(MAX_EXPLICIT_LENGTH, r)));
         }
     }
 }
diff --git a/src/main/java/de/rub/nds/modifiablevariable/biginteger/BigIntegerShiftLeftModification.java b/src/main/java/de/rub/nds/modifiablevariable/biginteger/BigIntegerShiftLeftModification.java
@@ -18,6 +18,8 @@
 @XmlType(propOrder = { "shift", "modificationFilter", "postModification" })
 public class BigIntegerShiftLeftModification extends VariableModification<BigInteger> {
 
+    private final static int MAX_SHIFT_LENGTH = 32;
+
     private int shift;
 
     public BigIntegerShiftLeftModification() {
@@ -46,6 +48,6 @@ public void setShift(int shift) {
 
     @Override
     public VariableModification<BigInteger> getModifiedCopy() {
-        return new BigIntegerShiftLeftModification(shift + new Random().nextInt(32));
+        return new BigIntegerShiftLeftModification(shift + new Random().nextInt(MAX_SHIFT_LENGTH));
     }
 }
diff --git a/src/main/java/de/rub/nds/modifiablevariable/biginteger/BigIntegerShiftRightModification.java b/src/main/java/de/rub/nds/modifiablevariable/biginteger/BigIntegerShiftRightModification.java
@@ -18,6 +18,8 @@
 @XmlType(propOrder = { "shift", "modificationFilter", "postModification" })
 public class BigIntegerShiftRightModification extends VariableModification<BigInteger> {
 
+    private final static int MAX_SHIFT_LENGTH = 32;
+
     private int shift;
 
     public BigIntegerShiftRightModification() {
@@ -46,6 +48,6 @@ public void setShift(int shift) {
 
     @Override
     public VariableModification<BigInteger> getModifiedCopy() {
-        return new BigIntegerShiftRightModification(shift + new Random().nextInt(32));
+        return new BigIntegerShiftRightModification(shift + new Random().nextInt(MAX_SHIFT_LENGTH));
     }
 }
diff --git a/src/main/java/de/rub/nds/modifiablevariable/biginteger/BigIntegerSubtractModification.java b/src/main/java/de/rub/nds/modifiablevariable/biginteger/BigIntegerSubtractModification.java
@@ -18,6 +18,8 @@
 @XmlType(propOrder = { "subtrahend", "modificationFilter", "postModification" })
 public class BigIntegerSubtractModification extends VariableModification<BigInteger> {
 
+    private final static int MAX_SUBTRACT_LENGTH = 8;
+
     private BigInteger subtrahend;
 
     public BigIntegerSubtractModification() {
@@ -46,6 +48,6 @@ public void setSubtrahend(BigInteger subtrahend) {
 
     @Override
     public VariableModification<BigInteger> getModifiedCopy() {
-        return new BigIntegerSubtractModification(subtrahend.add(new BigInteger(8, new Random())));
+        return new BigIntegerSubtractModification(subtrahend.add(new BigInteger(MAX_SUBTRACT_LENGTH, new Random())));
     }
 }
diff --git a/src/main/java/de/rub/nds/modifiablevariable/biginteger/BigIntegerXorModification.java b/src/main/java/de/rub/nds/modifiablevariable/biginteger/BigIntegerXorModification.java
@@ -18,6 +18,8 @@
 @XmlType(propOrder = { "xor", "modificationFilter", "postModification" })
 public class BigIntegerXorModification extends VariableModification<BigInteger> {
 
+    private final static int MAX_XOR_LENGTH = 8;
+
     private BigInteger xor;
 
     public BigIntegerXorModification() {
@@ -46,6 +48,6 @@ public void setXor(BigInteger xor) {
 
     @Override
     public VariableModification<BigInteger> getModifiedCopy() {
-        return new BigIntegerXorModification(xor.add(new BigInteger(8, new Random())));
+        return new BigIntegerXorModification(xor.add(new BigInteger(MAX_XOR_LENGTH, new Random())));
     }
 }
diff --git a/src/main/java/de/rub/nds/modifiablevariable/bytearray/ByteArrayDeleteModification.java b/src/main/java/de/rub/nds/modifiablevariable/bytearray/ByteArrayDeleteModification.java
@@ -20,6 +20,8 @@
 @XmlType(propOrder = { "count", "startPosition", "modificationFilter", "postModification" })
 public class ByteArrayDeleteModification extends VariableModification<byte[]> {
 
+    private final static int MAX_MODIFIER_LENGTH = 32;
+
     private int count;
 
     private int startPosition;
@@ -83,7 +85,7 @@ public void setCount(int count) {
     @Override
     public VariableModification<byte[]> getModifiedCopy() {
         Random r = new Random();
-        int modifier = r.nextInt(32);
+        int modifier = r.nextInt(MAX_MODIFIER_LENGTH);
         if (r.nextBoolean()) {
             modifier *= -1;
         }
diff --git a/src/main/java/de/rub/nds/modifiablevariable/bytearray/ByteArrayExplicitValueModification.java b/src/main/java/de/rub/nds/modifiablevariable/bytearray/ByteArrayExplicitValueModification.java
@@ -21,6 +21,8 @@
 @XmlType(propOrder = { "explicitValue", "modificationFilter", "postModification" })
 public class ByteArrayExplicitValueModification extends VariableModification<byte[]> {
 
+    private final static int MAX_EXPLICIT_VALUE = 256;
+
     private byte[] explicitValue;
 
     public ByteArrayExplicitValueModification() {
@@ -59,7 +61,7 @@ public VariableModification<byte[]> getModifiedCopy() {
         }
         int index = r.nextInt(explicitValue.length);
         byte[] newValue = Arrays.copyOf(explicitValue, explicitValue.length);
-        newValue[index] = (byte) r.nextInt(256);
+        newValue[index] = (byte) r.nextInt(MAX_EXPLICIT_VALUE);
         return new ByteArrayExplicitValueModification(newValue);
     }
 }
diff --git a/src/main/java/de/rub/nds/modifiablevariable/bytearray/ByteArrayInsertModification.java b/src/main/java/de/rub/nds/modifiablevariable/bytearray/ByteArrayInsertModification.java
@@ -21,6 +21,10 @@
 @XmlType(propOrder = { "bytesToInsert", "startPosition", "modificationFilter", "postModification" })
 public class ByteArrayInsertModification extends VariableModification<byte[]> {
 
+    private final static int MAX_EXPLICIT_VALUE = 256;
+
+    private final static int MAX_INSERT_MODIFIER = 32;
+
     private byte[] bytesToInsert;
 
     private int startPosition;
@@ -85,11 +89,11 @@ public VariableModification<byte[]> getModifiedCopy() {
         if (r.nextBoolean()) {
             int index = r.nextInt(bytesToInsert.length);
             byte[] newValue = Arrays.copyOf(bytesToInsert, bytesToInsert.length);
-            newValue[index] = (byte) r.nextInt(256);
+            newValue[index] = (byte) r.nextInt(MAX_EXPLICIT_VALUE);
             return new ByteArrayInsertModification(newValue, startPosition);
         } else {
             byte[] newValue = Arrays.copyOf(bytesToInsert, bytesToInsert.length);
-            int modifier = r.nextInt(32);
+            int modifier = r.nextInt(MAX_INSERT_MODIFIER);
             if (r.nextBoolean()) {
                 modifier *= -1;
             }
diff --git a/src/main/java/de/rub/nds/modifiablevariable/bytearray/ByteArrayShuffleModification.java b/src/main/java/de/rub/nds/modifiablevariable/bytearray/ByteArrayShuffleModification.java
@@ -26,6 +26,8 @@
 @XmlType(propOrder = { "shuffle", "modificationFilter", "postModification" })
 public class ByteArrayShuffleModification extends VariableModification<byte[]> {
 
+    private final static int MAX_MODIFIER_VALUE = 256;
+
     private byte[] shuffle;
 
     public ByteArrayShuffleModification() {
@@ -69,7 +71,7 @@ public VariableModification<byte[]> getModifiedCopy() {
         Random r = new Random();
         int index = r.nextInt(shuffle.length);
         byte[] newValue = Arrays.copyOf(shuffle, shuffle.length);
-        newValue[index] = (byte) r.nextInt(256);
+        newValue[index] = (byte) r.nextInt(MAX_MODIFIER_VALUE);
         return new ByteArrayShuffleModification(shuffle);
     }
 }
diff --git a/src/main/java/de/rub/nds/modifiablevariable/bytearray/ByteArrayXorModification.java b/src/main/java/de/rub/nds/modifiablevariable/bytearray/ByteArrayXorModification.java
@@ -21,6 +21,10 @@
 @XmlType(propOrder = { "xor", "startPosition", "modificationFilter", "postModification" })
 public class ByteArrayXorModification extends VariableModification<byte[]> {
 
+    private final static int MAX_MODIFIER_VALUE = 256;
+
+    private final static int MAX_XOR_MODIFIER = 32;
+
     private byte[] xor;
 
     private int startPosition;
@@ -83,11 +87,11 @@ public VariableModification<byte[]> getModifiedCopy() {
         if (r.nextBoolean()) {
             int index = r.nextInt(xor.length);
             byte[] newValue = Arrays.copyOf(xor, xor.length);
-            newValue[index] = (byte) r.nextInt(256);
+            newValue[index] = (byte) r.nextInt(MAX_MODIFIER_VALUE);
             return new ByteArrayXorModification(newValue, startPosition);
         } else {
             byte[] newValue = Arrays.copyOf(xor, xor.length);
-            int modifier = r.nextInt(32);
+            int modifier = r.nextInt(MAX_XOR_MODIFIER);
             if (r.nextBoolean()) {
                 modifier *= -1;
             }
diff --git a/src/main/java/de/rub/nds/modifiablevariable/integer/IntegerAddModification.java b/src/main/java/de/rub/nds/modifiablevariable/integer/IntegerAddModification.java
@@ -17,6 +17,8 @@
 @XmlType(propOrder = { "summand", "modificationFilter", "postModification" })
 public class IntegerAddModification extends VariableModification<Integer> {
 
+    private final static int MAX_ADD_MODIFIER = 256;
+
     private Integer summand;
 
     public IntegerAddModification() {
@@ -42,6 +44,6 @@ public void setSummand(Integer summand) {
 
     @Override
     public VariableModification<Integer> getModifiedCopy() {
-        return new IntegerAddModification(summand + new Random().nextInt(256));
+        return new IntegerAddModification(summand + new Random().nextInt(MAX_ADD_MODIFIER));
     }
 }
diff --git a/src/main/java/de/rub/nds/modifiablevariable/integer/IntegerExplicitValueModification.java b/src/main/java/de/rub/nds/modifiablevariable/integer/IntegerExplicitValueModification.java
@@ -17,6 +17,8 @@
 @XmlType(propOrder = { "explicitValue", "modificationFilter", "postModification" })
 public class IntegerExplicitValueModification extends VariableModification<Integer> {
 
+    private final static int MAX_VALUE_MODIFIER = 256;
+
     private Integer explicitValue;
 
     public IntegerExplicitValueModification() {
@@ -44,9 +46,9 @@ public void setExplicitValue(Integer explicitValue) {
     public VariableModification<Integer> getModifiedCopy() {
         Random r = new Random();
         if (r.nextBoolean()) {
-            return new IntegerExplicitValueModification(explicitValue + r.nextInt(256));
+            return new IntegerExplicitValueModification(explicitValue + r.nextInt(MAX_VALUE_MODIFIER));
         } else {
-            return new IntegerExplicitValueModification(explicitValue - r.nextInt(256));
+            return new IntegerExplicitValueModification(explicitValue - r.nextInt(MAX_VALUE_MODIFIER));
         }
     }
 }
diff --git a/src/main/java/de/rub/nds/modifiablevariable/integer/IntegerShiftLeftModification.java b/src/main/java/de/rub/nds/modifiablevariable/integer/IntegerShiftLeftModification.java
@@ -17,6 +17,8 @@
 @XmlType(propOrder = { "shift", "modificationFilter", "postModification" })
 public class IntegerShiftLeftModification extends VariableModification<Integer> {
 
+    private final static int MAX_SHIFT_MODIFIER = 32;
+
     private int shift;
 
     public IntegerShiftLeftModification() {
@@ -45,13 +47,13 @@ public VariableModification<Integer> getModifiedCopy() {
         Random r = new Random();
         int newShift;
         if (r.nextBoolean()) {
-            newShift = shift + r.nextInt(32);
+            newShift = shift + r.nextInt(MAX_SHIFT_MODIFIER);
         } else {
-            newShift = shift - r.nextInt(32);
+            newShift = shift - r.nextInt(MAX_SHIFT_MODIFIER);
         }
         if (newShift < 0) {
-            newShift = 31;
-        } else if (newShift > 31) {
+            newShift = MAX_SHIFT_MODIFIER - 1;
+        } else if (newShift > MAX_SHIFT_MODIFIER - 1) {
             newShift = 0;
         }
         return new IntegerShiftLeftModification(newShift);
diff --git a/src/main/java/de/rub/nds/modifiablevariable/integer/IntegerShiftRightModification.java b/src/main/java/de/rub/nds/modifiablevariable/integer/IntegerShiftRightModification.java
@@ -17,6 +17,8 @@
 @XmlType(propOrder = { "shift", "modificationFilter", "postModification" })
 public class IntegerShiftRightModification extends VariableModification<Integer> {
 
+    private final static int MAX_SHIFT_MODIFIER = 32;
+
     private int shift;
 
     public IntegerShiftRightModification() {
@@ -45,13 +47,13 @@ public VariableModification<Integer> getModifiedCopy() {
         Random r = new Random();
         int newShift;
         if (r.nextBoolean()) {
-            newShift = shift + r.nextInt(32);
+            newShift = shift + r.nextInt(MAX_SHIFT_MODIFIER);
         } else {
-            newShift = shift - r.nextInt(32);
+            newShift = shift - r.nextInt(MAX_SHIFT_MODIFIER);
         }
         if (newShift < 0) {
-            newShift = 31;
-        } else if (newShift > 31) {
+            newShift = MAX_SHIFT_MODIFIER - 1;
+        } else if (newShift > MAX_SHIFT_MODIFIER - 1) {
             newShift = 0;
         }
         return new IntegerShiftRightModification(newShift);
diff --git a/src/main/java/de/rub/nds/modifiablevariable/integer/IntegerSubtractModification.java b/src/main/java/de/rub/nds/modifiablevariable/integer/IntegerSubtractModification.java
@@ -17,6 +17,8 @@
 @XmlType(propOrder = { "subtrahend", "modificationFilter", "postModification" })
 public class IntegerSubtractModification extends VariableModification<Integer> {
 
+    private final static int MAX_SUBTRACT_MODIFIER = 256;
+
     private Integer subtrahend;
 
     public IntegerSubtractModification() {
@@ -42,6 +44,6 @@ public void setSubtrahend(Integer subtrahend) {
 
     @Override
     public VariableModification<Integer> getModifiedCopy() {
-        return new IntegerSubtractModification(subtrahend + new Random().nextInt(256));
+        return new IntegerSubtractModification(subtrahend + new Random().nextInt(MAX_SUBTRACT_MODIFIER));
     }
 }
diff --git a/src/main/java/de/rub/nds/modifiablevariable/integer/IntegerXorModification.java b/src/main/java/de/rub/nds/modifiablevariable/integer/IntegerXorModification.java
@@ -17,6 +17,8 @@
 @XmlType(propOrder = { "xor", "modificationFilter", "postModification" })
 public class IntegerXorModification extends VariableModification<Integer> {
 
+    private final static int MAX_VALUE_MODIFIER = 256;
+
     private Integer xor;
 
     public IntegerXorModification() {
@@ -44,9 +46,9 @@ public void setXor(Integer xor) {
     public VariableModification<Integer> getModifiedCopy() {
         Random r = new Random();
         if (r.nextBoolean()) {
-            return new IntegerSubtractModification(xor + new Random().nextInt(256));
+            return new IntegerSubtractModification(xor + new Random().nextInt(MAX_VALUE_MODIFIER));
         } else {
-            return new IntegerSubtractModification(xor - new Random().nextInt(256));
+            return new IntegerSubtractModification(xor - new Random().nextInt(MAX_VALUE_MODIFIER));
         }
     }
 }
diff --git a/src/main/java/de/rub/nds/modifiablevariable/mlong/LongAddModification.java b/src/main/java/de/rub/nds/modifiablevariable/mlong/LongAddModification.java
@@ -18,6 +18,8 @@
 @XmlType(propOrder = { "summand", "modificationFilter", "postModification" })
 public class LongAddModification extends VariableModification<Long> {
 
+    private final static int MAX_ADD_MODIFIER = 32;
+
     private Long summand;
 
     public LongAddModification() {
@@ -43,6 +45,6 @@ public void setSummand(Long summand) {
 
     @Override
     public VariableModification<Long> getModifiedCopy() {
-        return new LongAddModification(summand + new Random().nextInt(256));
+        return new LongAddModification(summand + new Random().nextInt(MAX_ADD_MODIFIER));
     }
 }
diff --git a/src/main/java/de/rub/nds/modifiablevariable/mlong/LongExplicitValueModification.java b/src/main/java/de/rub/nds/modifiablevariable/mlong/LongExplicitValueModification.java
@@ -9,7 +9,6 @@
 package de.rub.nds.modifiablevariable.mlong;
 
 import de.rub.nds.modifiablevariable.VariableModification;
-import de.rub.nds.modifiablevariable.integer.IntegerExplicitValueModification;
 import java.util.Random;
 import javax.xml.bind.annotation.XmlRootElement;
 import javax.xml.bind.annotation.XmlType;
@@ -18,6 +17,8 @@
 @XmlType(propOrder = { "explicitValue", "modificationFilter", "postModification" })
 public class LongExplicitValueModification extends VariableModification<Long> {
 
+    private final static int MAX_EXPLICIT_MODIFIER = 256;
+
     private Long explicitValue;
 
     public LongExplicitValueModification() {
@@ -45,9 +46,9 @@ public void setExplicitValue(Long explicitValue) {
     public VariableModification<Long> getModifiedCopy() {
         Random r = new Random();
         if (r.nextBoolean()) {
-            return new LongExplicitValueModification(explicitValue + r.nextInt(256));
+            return new LongExplicitValueModification(explicitValue + r.nextInt(MAX_EXPLICIT_MODIFIER));
         } else {
-            return new LongExplicitValueModification(explicitValue - r.nextInt(256));
+            return new LongExplicitValueModification(explicitValue - r.nextInt(MAX_EXPLICIT_MODIFIER));
         }
     }
 }
diff --git a/src/main/java/de/rub/nds/modifiablevariable/mlong/LongSubtractModification.java b/src/main/java/de/rub/nds/modifiablevariable/mlong/LongSubtractModification.java
diff --git a/src/main/java/de/rub/nds/modifiablevariable/mlong/LongXorModification.java b/src/main/java/de/rub/nds/modifiablevariable/mlong/LongXorModification.java
diff --git a/src/main/java/de/rub/nds/modifiablevariable/singlebyte/ByteAddModification.java b/src/main/java/de/rub/nds/modifiablevariable/singlebyte/ByteAddModification.java
diff --git a/src/main/java/de/rub/nds/modifiablevariable/singlebyte/ByteExplicitValueModification.java b/src/main/java/de/rub/nds/modifiablevariable/singlebyte/ByteExplicitValueModification.java
diff --git a/src/main/java/de/rub/nds/modifiablevariable/singlebyte/ByteSubtractModification.java b/src/main/java/de/rub/nds/modifiablevariable/singlebyte/ByteSubtractModification.java
diff --git a/src/main/java/de/rub/nds/modifiablevariable/singlebyte/ByteXorModification.java b/src/main/java/de/rub/nds/modifiablevariable/singlebyte/ByteXorModification.java
diff --git a/src/main/java/de/rub/nds/modifiablevariable/string/StringExplicitValueModification.java b/src/main/java/de/rub/nds/modifiablevariable/string/StringExplicitValueModification.java
diff --git a/src/main/java/de/rub/nds/modifiablevariable/util/XMLPrettyPrinter.java b/src/main/java/de/rub/nds/modifiablevariable/util/XMLPrettyPrinter.java

Original file line number	Diff line number	Diff line change
`@@ -18,6 +18,8 @@`
`18`	`18`	`@XmlType(propOrder = { "summand", "modificationFilter", "postModification" })`
`19`	`19`	`public class BigIntegerAddModification extends VariableModification<BigInteger> {`
`20`	`20`
	`21`	`+ private final static int MAX_ADD_LENGTH = 8;`
	`22`	`+`
`21`	`23`	`private BigInteger summand;`
`22`	`24`
`23`	`25`	`public BigIntegerAddModification() {`
`@@ -43,6 +45,6 @@ public void setSummand(BigInteger summand) {`
`43`	`45`
`44`	`46`	`@Override`
`45`	`47`	`public VariableModification<BigInteger> getModifiedCopy() {`
`46`		`- return new BigIntegerAddModification(summand.add(new BigInteger(8, new Random())));`
	`48`	`+ return new BigIntegerAddModification(summand.add(new BigInteger(MAX_ADD_LENGTH, new Random())));`
`47`	`49`	`}`
`48`	`50`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,6 +21,8 @@`
`21`	`21`	`@XmlType(propOrder = { "explicitValue", "modificationFilter", "postModification" })`
`22`	`22`	`public class ByteArrayExplicitValueModification extends VariableModification<byte[]> {`
`23`	`23`
	`24`	`+ private final static int MAX_EXPLICIT_VALUE = 256;`
	`25`	`+`
`24`	`26`	`private byte[] explicitValue;`
`25`	`27`
`26`	`28`	`public ByteArrayExplicitValueModification() {`
`@@ -59,7 +61,7 @@ public VariableModification<byte[]> getModifiedCopy() {`
`59`	`61`	`}`
`60`	`62`	`int index = r.nextInt(explicitValue.length);`
`61`	`63`	`byte[] newValue = Arrays.copyOf(explicitValue, explicitValue.length);`
`62`		`- newValue[index] = (byte) r.nextInt(256);`
	`64`	`+ newValue[index] = (byte) r.nextInt(MAX_EXPLICIT_VALUE);`
`63`	`65`	`return new ByteArrayExplicitValueModification(newValue);`
`64`	`66`	`}`
`65`	`67`	`}`