Serialization fixed

Also, new workflow to specify an interactive modification. Again, this
is probably something that should be discussed; my idea of a sensible
compromise might differ from yours.

Author: j-fliegenschmidt

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

@@ -10,6 +10,7 @@
 
 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.BigIntegerShiftLeftModification;
 import de.rub.nds.modifiablevariable.biginteger.BigIntegerShiftRightModification;
 import de.rub.nds.modifiablevariable.biginteger.BigIntegerSubtractModification;
@@ -46,7 +47,7 @@
  */
 @XmlRootElement
 @XmlTransient
-@XmlSeeAlso({ AccessModificationFilter.class, BigIntegerAddModification.class,
+@XmlSeeAlso({ AccessModificationFilter.class, BigIntegerAddModification.class, BigIntegerInteractiveModification.class,
         BigIntegerExplicitValueModification.class, BigIntegerSubtractModification.class,
         BigIntegerXorModification.class, BigIntegerShiftLeftModification.class, BigIntegerShiftRightModification.class,
         IntegerAddModification.class, IntegerExplicitValueModification.class, IntegerSubtractModification.class,

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

@@ -17,19 +17,13 @@
  * @author Janis Fliegenschmidt - janis.fliegenschmidt@rub.de
  */
 @XmlRootElement
-@XmlType(propOrder = { "interactive", "modificationFilter", "postModification" })
+@XmlType(propOrder = { "modificationFilter", "postModification" })
 public class BigIntegerInteractiveModification extends VariableModification<BigInteger> {
 
     private InteractiveBigIntegerModification modification;
 
     protected BigIntegerInteractiveModification() {
-        this(new InteractiveBigIntegerModification() {
-            @Override
-            public BigInteger modify(BigInteger oldVal) {
-                // Fail fast
-                throw new UnsupportedOperationException("No interactive modifi" + "cation specified.");
-            }
-        });
+        this.modification = BigIntegerModificationFactory.getStandardInteractiveModification();
     }
 
     protected BigIntegerInteractiveModification(InteractiveBigIntegerModification modification) {

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

@@ -89,29 +89,29 @@ public static VariableModification<BigInteger> explicitValueFromFile(int value)
         return modifications.get(pos);
     }
 
-    public static VariableModification<BigInteger> interactive(final String variableName) {
-        return interactive(new BigIntegerInteractiveModification.InteractiveBigIntegerModification() {
-            @Override
-            public BigInteger modify(BigInteger oldVal) {
-                BigInteger result = null;
-
-                System.out.println("Enter new value for " + variableName + " (Old value is " + oldVal.toString()
-                        + "): ");
-                
-                result = new Scanner(System.in).nextBigInteger();
-
-                return result;
-            }
-        });
+    /*
+     * Interactive modification
+     */
+
+    private static BigIntegerInteractiveModification.InteractiveBigIntegerModification standardInteractiveModification = new BigIntegerInteractiveModification.InteractiveBigIntegerModification() {
+        @Override
+        public BigInteger modify(BigInteger oldVal) {
+            System.out.println("Enter new value for BigInt: ");
+            return new Scanner(System.in).nextBigInteger();
+        }
+    };
+
+    public static void setStandardInteractiveModification(
+            BigIntegerInteractiveModification.InteractiveBigIntegerModification modification) {
+        standardInteractiveModification = modification;
     }
 
-    public static VariableModification<BigInteger> interactive() {
-        return interactive("BigInt");
+    protected static BigIntegerInteractiveModification.InteractiveBigIntegerModification getStandardInteractiveModification() {
+        return standardInteractiveModification;
     }
 
-    public static VariableModification<BigInteger> interactive(
-            BigIntegerInteractiveModification.InteractiveBigIntegerModification modification) {
-        return new BigIntegerInteractiveModification(modification);
+    public static VariableModification<BigInteger> interactive() {
+        return new BigIntegerInteractiveModification();
     }
 
     public static synchronized List<VariableModification<BigInteger>> modificationsFromFile() {

src/test/java/de/rub/nds/modifiablevariable/serialization/BigIntegerSerializationTest.java

@@ -10,6 +10,7 @@
 
 import de.rub.nds.modifiablevariable.VariableModification;
 import de.rub.nds.modifiablevariable.biginteger.BigIntegerAddModification;
+import de.rub.nds.modifiablevariable.biginteger.BigIntegerInteractiveModification;
 import de.rub.nds.modifiablevariable.biginteger.BigIntegerModificationFactory;
 import de.rub.nds.modifiablevariable.biginteger.ModifiableBigInteger;
 import de.rub.nds.modifiablevariable.bytearray.ByteArrayModificationFactory;
@@ -61,10 +62,17 @@ public void setUp() throws JAXBException {
 
         writer = new StringWriter();
         context = JAXBContext.newInstance(ModifiableBigInteger.class, BigIntegerAddModification.class,
-                ByteArrayModificationFactory.class);
+                ByteArrayModificationFactory.class, BigIntegerInteractiveModification.class);
         m = context.createMarshaller();
         m.setProperty(Marshaller.JAXB_FORMATTED_OUTPUT, true);
         um = context.createUnmarshaller();
+
+        BigIntegerModificationFactory
+                .setStandardInteractiveModification(new BigIntegerInteractiveModification.InteractiveBigIntegerModification() {
+                    public BigInteger modify(BigInteger oldVal) {
+                        return new BigInteger("12");
+                    }
+                });
     }
 
     @Test
@@ -102,7 +110,24 @@ public void testSerializeDeserializeWithDoubleModification() throws Exception {
         result = mv.getValue();
         assertEquals(expectedResult, result);
         assertNotSame(expectedResult, result);
+    }
+
+    @Test
+    public void testSerializationWithInteractiveMod() throws Exception {
+        VariableModification<BigInteger> mod = BigIntegerModificationFactory.interactive();
+        start.setModification(mod);
+        m.marshal(start, writer);
+
+        String xmlString = writer.toString();
+        LOGGER.debug(xmlString);
 
+        um = context.createUnmarshaller();
+        ModifiableBigInteger mv = (ModifiableBigInteger) um.unmarshal(new StringReader(xmlString));
+
+        expectedResult = new BigInteger("12");
+        result = mv.getValue();
+        assertEquals(expectedResult, result);
+        assertNotSame(expectedResult, result);
     }
 
     @Test