Refactoring + Insert Modification for Strings, Integer, BigInteger, Long + Some more Modifications for Long

.gitignore

@@ -9,9 +9,11 @@ nbproject/
 nbactions.xml.project
 nbactions.xml
 
-# IntelliJ
-.idea/
+### IntelliJ IDEA ###
+.idea/*
+*.iws
 *.iml
+*.ipr
 
 # VS Code
 .vscode/

README.md

@@ -42,7 +42,7 @@ The best way to present the functionality of ModifiableVariables is by means of
 ModifiableInteger i = new ModifiableInteger();
 i.setOriginalValue(30);
 VariableModification<Integer> modifier = IntegerModificationFactory.add(20);
-i.setModification(modifier);
+i.setModifications(modifier);
 System.out.println(i.getValue());  // 50
 ```
 
@@ -56,7 +56,7 @@ In byte arrays you can use further modifications like shuffling or inserting byt
 ModifiableByteArray ba = new ModifiableByteArray();
 VariableModification<byte[]> modifier = ByteArrayModificationFactory.insert(new byte[] {2, 3}, 1);
 ba.setOriginalValue(new byte[]{1, 4});
-ba.setModification(modifier);
+ba.setModifications(modifier);
 System.out.println(ArrayConverter.bytesToHexString(ba)); // 01 02 03 04
 ```
 
@@ -116,15 +116,17 @@ The result of the serialized modifiable byte array looks as follows:
 </modifiableByteArray>
 ```
 
-If you would use modification from the previous example, the result would look as follows:
+If you were to use the modification from the previous example, the result would look as follows:
 
 ```xml
 <modifiableByteArray>
     <originalValue>01 02 03</originalValue>
-    <ByteArrayInsertModification>
-        <bytesToInsert>02 03</bytesToInsert>
-        <startPosition>1</startPosition>
-    </ByteArrayInsertModification>
+    <modifications>
+        <ByteArrayInsertModification>
+            <bytesToInsert>02 03</bytesToInsert>
+            <startPosition>1</startPosition>
+        </ByteArrayInsertModification>
+    </modifications>
 </modifiableByteArray>
 ```
 

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

@@ -9,7 +9,9 @@
 
 public class FileConfigurationException extends RuntimeException {
 
-    public FileConfigurationException() {}
+    public FileConfigurationException() {
+        super();
+    }
 
     public FileConfigurationException(Exception ex) {
         super(ex);

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

@@ -7,201 +7,119 @@
  */
 package de.rub.nds.modifiablevariable;
 
-import de.rub.nds.modifiablevariable.biginteger.BigIntegerAddModification;
-import de.rub.nds.modifiablevariable.biginteger.BigIntegerExplicitValueModification;
-import de.rub.nds.modifiablevariable.biginteger.BigIntegerInteractiveModification;
-import de.rub.nds.modifiablevariable.biginteger.BigIntegerMultiplyModification;
-import de.rub.nds.modifiablevariable.biginteger.BigIntegerShiftLeftModification;
-import de.rub.nds.modifiablevariable.biginteger.BigIntegerShiftRightModification;
-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.BooleanToggleModification;
-import de.rub.nds.modifiablevariable.bytearray.ByteArrayDeleteModification;
-import de.rub.nds.modifiablevariable.bytearray.ByteArrayDuplicateModification;
-import de.rub.nds.modifiablevariable.bytearray.ByteArrayExplicitValueModification;
-import de.rub.nds.modifiablevariable.bytearray.ByteArrayInsertModification;
-import de.rub.nds.modifiablevariable.bytearray.ByteArrayShuffleModification;
-import de.rub.nds.modifiablevariable.bytearray.ByteArrayXorModification;
-import de.rub.nds.modifiablevariable.integer.IntegerAddModification;
-import de.rub.nds.modifiablevariable.integer.IntegerExplicitValueModification;
-import de.rub.nds.modifiablevariable.integer.IntegerShiftLeftModification;
-import de.rub.nds.modifiablevariable.integer.IntegerShiftRightModification;
-import de.rub.nds.modifiablevariable.integer.IntegerSubtractModification;
-import de.rub.nds.modifiablevariable.integer.IntegerXorModification;
-import de.rub.nds.modifiablevariable.longint.LongAddModification;
-import de.rub.nds.modifiablevariable.longint.LongExplicitValueModification;
-import de.rub.nds.modifiablevariable.longint.LongSubtractModification;
-import de.rub.nds.modifiablevariable.longint.LongXorModification;
-import de.rub.nds.modifiablevariable.singlebyte.ByteAddModification;
-import de.rub.nds.modifiablevariable.singlebyte.ByteExplicitValueModification;
-import de.rub.nds.modifiablevariable.singlebyte.ByteSubtractModification;
-import de.rub.nds.modifiablevariable.singlebyte.ByteXorModification;
-import de.rub.nds.modifiablevariable.string.StringAppendValueModification;
-import de.rub.nds.modifiablevariable.string.StringExplicitValueModification;
-import de.rub.nds.modifiablevariable.string.StringPrependValueModification;
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
-import jakarta.xml.bind.annotation.XmlElement;
-import jakarta.xml.bind.annotation.XmlElements;
-import jakarta.xml.bind.annotation.XmlRootElement;
-import jakarta.xml.bind.annotation.XmlTransient;
+import jakarta.xml.bind.annotation.*;
 import java.io.Serializable;
-import java.util.Objects;
+import java.util.LinkedList;
+import java.util.List;
+import java.util.stream.Collectors;
 
 /**
- * The base abstract class for modifiable variables, including the getValue function.The class needs
- * to be defined transient to allow propOrder definition in subclasses, see:
- * http://blog.bdoughan.com/2011/06/ignoring-inheritance-with-xmltransient.html
+ * The base abstract class for modifiable variables, including the getValue function. The class
+ * needs to be defined transient to allow propOrder definition in subclasses, see: <a
+ * href="http://blog.bdoughan.com/2011/06/ignoring-inheritance-with-xmltransient.html">docs</a>
  *
  * @param <E>
  */
-@XmlRootElement
 @XmlTransient
 @XmlAccessorType(XmlAccessType.FIELD)
 public abstract class ModifiableVariable<E> implements Serializable {
 
-    @XmlElements(
-            value = {
-                @XmlElement(
-                        type = BigIntegerXorModification.class,
-                        name = "BigIntegerXorModification"),
-                @XmlElement(
-                        type = BigIntegerSubtractModification.class,
-                        name = "BigIntegerSubtractModification"),
-                @XmlElement(
-                        type = BigIntegerShiftRightModification.class,
-                        name = "BigIntegerShiftRightModification"),
-                @XmlElement(
-                        type = BigIntegerShiftLeftModification.class,
-                        name = "BigIntegerShiftLeftModification"),
-                @XmlElement(
-                        type = BigIntegerExplicitValueModification.class,
-                        name = "BigIntegerExplicitValueModification"),
-                @XmlElement(
-                        type = BigIntegerAddModification.class,
-                        name = "BigIntegerAddModification"),
-                @XmlElement(
-                        type = BigIntegerInteractiveModification.class,
-                        name = "BigIntegerInteractiveModification"),
-                @XmlElement(
-                        type = BigIntegerMultiplyModification.class,
-                        name = "BigIntegerMultiplyModification"),
-                @XmlElement(
-                        type = BooleanToggleModification.class,
-                        name = "BooleanToggleModification"),
-                @XmlElement(
-                        type = BooleanExplicitValueModification.class,
-                        name = "BooleanExplicitValueModification"),
-                @XmlElement(
-                        type = ByteArrayXorModification.class,
-                        name = "ByteArrayXorModification"),
-                @XmlElement(
-                        type = ByteArrayShuffleModification.class,
-                        name = "ByteArrayShuffleModification"),
-                @XmlElement(
-                        type = ByteArrayInsertModification.class,
-                        name = "ByteArrayInsertModification"),
-                @XmlElement(
-                        type = ByteArrayExplicitValueModification.class,
-                        name = "ByteArrayExplicitValueModification"),
-                @XmlElement(
-                        type = ByteArrayDuplicateModification.class,
-                        name = "ByteArrayDuplicateModification"),
-                @XmlElement(
-                        type = ByteArrayDeleteModification.class,
-                        name = "ByteArrayDeleteModification"),
-                @XmlElement(type = IntegerXorModification.class, name = "IntegerXorModification"),
-                @XmlElement(
-                        type = IntegerSubtractModification.class,
-                        name = "IntegerSubtractModification"),
-                @XmlElement(
-                        type = IntegerShiftRightModification.class,
-                        name = "IntegerShiftRightModification"),
-                @XmlElement(
-                        type = IntegerShiftLeftModification.class,
-                        name = "IntegerShiftLeftModification"),
-                @XmlElement(
-                        type = IntegerExplicitValueModification.class,
-                        name = "IntegerExplicitValueModification"),
-                @XmlElement(type = IntegerAddModification.class, name = "IntegerAddModification"),
-                @XmlElement(type = LongXorModification.class, name = "LongXorModification"),
-                @XmlElement(
-                        type = LongSubtractModification.class,
-                        name = "LongSubtractModification"),
-                @XmlElement(
-                        type = LongExplicitValueModification.class,
-                        name = "LongExplicitValueModification"),
-                @XmlElement(type = LongAddModification.class, name = "LongAddModification"),
-                @XmlElement(type = ByteXorModification.class, name = "ByteXorModification"),
-                @XmlElement(
-                        type = ByteSubtractModification.class,
-                        name = "ByteSubtractModification"),
-                @XmlElement(type = ByteAddModification.class, name = "ByteAddModification"),
-                @XmlElement(
-                        type = ByteExplicitValueModification.class,
-                        name = "ByteExplicitValueModification"),
-                @XmlElement(
-                        type = StringPrependValueModification.class,
-                        name = "StringPrependValueModification"),
-                @XmlElement(
-                        type = StringAppendValueModification.class,
-                        name = "StringAppendValueModification"),
-                @XmlElement(
-                        type = StringExplicitValueModification.class,
-                        name = "StringExplicitValueModification")
-            })
-    private VariableModification<E> modification = null;
-
-    private Boolean createRandomModification;
+    @XmlElementWrapper
+    @XmlAnyElement(lax = true)
+    private LinkedList<VariableModification<E>> modifications;
 
     protected E assertEquals;
 
-    public ModifiableVariable() {}
+    protected ModifiableVariable() {
+        super();
+    }
 
-    public void setModification(VariableModification<E> modification) {
-        this.modification = modification;
+    protected ModifiableVariable(ModifiableVariable<E> other) {
+        super();
+        if (other.modifications != null) {
+            modifications = new LinkedList<>();
+            for (VariableModification<E> item : other.modifications) {
+                modifications.add(item != null ? item.createCopy() : null);
+            }
+        }
+        // Warning: Make sure to copy assertEquals in subclass correctly
+        assertEquals = other.assertEquals;
     }
 
-    @XmlTransient
-    public VariableModification<E> getModification() {
-        return modification;
+    /** Sets multiple modifications, all previously set modifications are removed */
+    public void setModifications(List<VariableModification<E>> modifications) {
+        this.modifications = new LinkedList<>(modifications);
     }
 
-    public E getValue() {
-        if (Objects.equals(createRandomModification, Boolean.TRUE)) {
-            createRandomModification();
-            createRandomModification = false;
-        }
+    /** Sets multiple modifications, all previously set modifications are removed */
+    @SafeVarargs
+    public final void setModifications(VariableModification<E>... modifications) {
+        this.modifications = new LinkedList<>(List.of(modifications));
+    }
 
+    /** Removes all modifications */
+    public void clearModifications() {
+        modifications = null;
+    }
+
+    /** Adds a modification to this modifiable variable */
+    public void addModification(VariableModification<E> modification) {
         if (modification != null) {
-            return modification.modify(getOriginalValue());
+            if (modifications == null) {
+                modifications = new LinkedList<>();
+            }
+            modifications.add(modification);
+        }
+    }
+
+    /** Returns all modifications that are set for this modifiable variable */
+    public LinkedList<VariableModification<E>> getModifications() {
+        return modifications;
+    }
+
+    public E getValue() {
+        return getModifiedValue();
+    }
+
+    private E getModifiedValue() {
+        E resultValue = getOriginalValue();
+        if (modifications != null) {
+            for (VariableModification<E> modification : modifications) {
+                resultValue = modification.modify(resultValue);
+            }
         }
-        return getOriginalValue();
+        return resultValue;
     }
 
     public abstract E getOriginalValue();
 
     public abstract void setOriginalValue(E originalValue);
 
-    protected abstract void createRandomModification();
-
-    public void createRandomModificationAtRuntime() {
-        createRandomModification = true;
-    }
+    public abstract ModifiableVariable<E> createCopy();
 
     public abstract boolean isOriginalValueModified();
 
     public abstract boolean validateAssertions();
 
     public boolean containsAssertion() {
-        return (assertEquals != null);
+        return assertEquals != null;
     }
 
-    public Boolean isCreateRandomModification() {
-        if (createRandomModification == null) {
-            return false;
+    protected String innerToString() {
+        StringBuilder result = new StringBuilder();
+        if (modifications != null) {
+            result.append(", modifications=[")
+                    .append(
+                            modifications.stream()
+                                    .map(Object::toString)
+                                    .collect(Collectors.joining(", ")))
+                    .append("]");
         }
-        return createRandomModification;
+
+        if (assertEquals != null) {
+            result.append(", assertEquals=").append(assertEquals);
+        }
+
+        return result.toString();
     }
 }