Fixing serialization of ByteArrays, Strings and Path for real by making "getModification" transient. Removing unnecessary @XmlAccessorType(XmlAccessType.FIELD) annotations. For the record, using package-info.java did not work, because we can not specify adapters for assertEquals, but we could use it to get rid of the XmlJavaTypeAdapter annotations in the modifications.

Author: C0D3D3V

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

@@ -23,13 +23,12 @@
 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: <a
- * href="http://blog.bdoughan.com/2011/06/ignoring-inheritance-with-xmltransient.html">...</a>
+ * 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 {
@@ -192,6 +191,15 @@ public abstract class ModifiableVariable<E> implements Serializable {
 
     private Boolean createRandomModification;
 
+    // @XmlElements({
+    //     @XmlElement(type = byte[].class),
+    //     @XmlElement(type = String.class),
+    //     @XmlElement(type = Boolean.class),
+    //     @XmlElement(type = Byte.class),
+    //     @XmlElement(type = Integer.class),
+    //     @XmlElement(type = Long.class),
+    //     @XmlElement(type = BigInteger.class)
+    // })
     protected E assertEquals;
 
     protected ModifiableVariable() {
@@ -236,6 +244,7 @@ public void addModification(VariableModification<E> modification) {
      *
      * <p>Use {@code getModifications()} to get all modifications
      */
+    @XmlTransient
     public VariableModification<E> getModification() {
         if (modifications == null || modifications.isEmpty()) {
             return null;

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

@@ -15,12 +15,10 @@
 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 org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 
-@XmlRootElement
 @XmlTransient
 @XmlAccessorType(XmlAccessType.FIELD)
 public abstract class VariableModification<E> {

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

@@ -8,8 +8,6 @@
 package de.rub.nds.modifiablevariable.biginteger;
 
 import de.rub.nds.modifiablevariable.VariableModification;
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
 import jakarta.xml.bind.annotation.XmlRootElement;
 import jakarta.xml.bind.annotation.XmlType;
 import java.math.BigInteger;
@@ -18,7 +16,6 @@
 
 @XmlRootElement
 @XmlType(propOrder = {"summand", "modificationFilter"})
-@XmlAccessorType(XmlAccessType.FIELD)
 public class BigIntegerAddModification extends VariableModification<BigInteger> {
 
     private static final int MAX_ADD_LENGTH = 8;

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

@@ -8,8 +8,6 @@
 package de.rub.nds.modifiablevariable.biginteger;
 
 import de.rub.nds.modifiablevariable.VariableModification;
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
 import jakarta.xml.bind.annotation.XmlRootElement;
 import jakarta.xml.bind.annotation.XmlType;
 import java.math.BigInteger;
@@ -18,7 +16,6 @@
 
 @XmlRootElement
 @XmlType(propOrder = {"appendValue", "modificationFilter"})
-@XmlAccessorType(XmlAccessType.FIELD)
 public class BigIntegerAppendValueModification extends VariableModification<BigInteger> {
 
     private static final int MAX_APPEND_LENGTH = 8;

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

@@ -8,16 +8,13 @@
 package de.rub.nds.modifiablevariable.biginteger;
 
 import de.rub.nds.modifiablevariable.VariableModification;
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
 import jakarta.xml.bind.annotation.XmlRootElement;
 import jakarta.xml.bind.annotation.XmlType;
 import java.math.BigInteger;
 import java.util.Objects;
 
 @XmlRootElement
 @XmlType(propOrder = "index")
-@XmlAccessorType(XmlAccessType.FIELD)
 public class BigIntegerExplicitValueFromFileModification
         extends BigIntegerExplicitValueModification {
     private int index;

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

@@ -8,8 +8,6 @@
 package de.rub.nds.modifiablevariable.biginteger;
 
 import de.rub.nds.modifiablevariable.VariableModification;
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
 import jakarta.xml.bind.annotation.XmlRootElement;
 import jakarta.xml.bind.annotation.XmlType;
 import java.math.BigInteger;
@@ -18,7 +16,6 @@
 
 @XmlRootElement
 @XmlType(propOrder = {"explicitValue", "modificationFilter"})
-@XmlAccessorType(XmlAccessType.FIELD)
 public class BigIntegerExplicitValueModification extends VariableModification<BigInteger> {
 
     private static final int MAX_EXPLICIT_LENGTH = 8;

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

@@ -8,8 +8,6 @@
 package de.rub.nds.modifiablevariable.biginteger;
 
 import de.rub.nds.modifiablevariable.VariableModification;
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
 import jakarta.xml.bind.annotation.XmlRootElement;
 import jakarta.xml.bind.annotation.XmlType;
 import java.math.BigInteger;
@@ -18,7 +16,6 @@
 
 @XmlRootElement
 @XmlType(propOrder = {"insertValue", "startPosition", "modificationFilter"})
-@XmlAccessorType(XmlAccessType.FIELD)
 public class BigIntegerInsertValueModification extends VariableModification<BigInteger> {
 
     private static final int MAX_INSERT_LENGTH = 8;

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

@@ -8,16 +8,13 @@
 package de.rub.nds.modifiablevariable.biginteger;
 
 import de.rub.nds.modifiablevariable.VariableModification;
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
 import jakarta.xml.bind.annotation.XmlRootElement;
 import jakarta.xml.bind.annotation.XmlTransient;
 import jakarta.xml.bind.annotation.XmlType;
 import java.math.BigInteger;
 
 @XmlRootElement
 @XmlType(propOrder = "modificationFilter")
-@XmlAccessorType(XmlAccessType.FIELD)
 public class BigIntegerInteractiveModification extends VariableModification<BigInteger> {
 
     @XmlTransient private final InteractiveBigIntegerModification modification;

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

@@ -8,8 +8,6 @@
 package de.rub.nds.modifiablevariable.biginteger;
 
 import de.rub.nds.modifiablevariable.VariableModification;
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
 import jakarta.xml.bind.annotation.XmlRootElement;
 import jakarta.xml.bind.annotation.XmlType;
 import java.math.BigInteger;
@@ -18,7 +16,6 @@
 
 @XmlRootElement
 @XmlType(propOrder = {"factor", "modificationFilter"})
-@XmlAccessorType(XmlAccessType.FIELD)
 public class BigIntegerMultiplyModification extends VariableModification<BigInteger> {
 
     private static final int MAX_FACTOR_LENGTH = 8;

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

@@ -8,8 +8,6 @@
 package de.rub.nds.modifiablevariable.biginteger;
 
 import de.rub.nds.modifiablevariable.VariableModification;
-import jakarta.xml.bind.annotation.XmlAccessType;
-import jakarta.xml.bind.annotation.XmlAccessorType;
 import jakarta.xml.bind.annotation.XmlRootElement;
 import jakarta.xml.bind.annotation.XmlType;
 import java.math.BigInteger;
@@ -18,7 +16,6 @@
 
 @XmlRootElement
 @XmlType(propOrder = {"prependValue", "modificationFilter"})
-@XmlAccessorType(XmlAccessType.FIELD)
 public class BigIntegerPrependValueModification extends VariableModification<BigInteger> {
 
     private static final int MAX_PREPEND_LENGTH = 8;