You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by sr...@apache.org on 2023/05/22 15:15:26 UTC

[plc4x] 02/02: build(plc4j): code sync

This is an automated email from the ASF dual-hosted git repository.

sruehl pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/plc4x.git

commit 769443ba1567000665a882c8b26e65eff8161972
Author: Sebastian Rühl <sr...@apache.org>
AuthorDate: Mon May 22 17:15:15 2023 +0200

    build(plc4j): code sync
---
 .../org/apache/plc4x/java/test/readwrite/AbstractTypeTest.java         | 3 ---
 .../org/apache/plc4x/java/test/readwrite/AbstractTypeTestSubType.java  | 3 ---
 .../generated/org/apache/plc4x/java/test/readwrite/ArrayTypeTest.java  | 3 ---
 .../org/apache/plc4x/java/test/readwrite/CheckSumTypeTest.java         | 3 ---
 .../org/apache/plc4x/java/test/readwrite/ComplexOfComplexUsageA.java   | 3 ---
 .../org/apache/plc4x/java/test/readwrite/ComplexOfComplexUsageB.java   | 3 ---
 .../org/apache/plc4x/java/test/readwrite/ComplexOfComplexUsageC.java   | 3 ---
 .../org/apache/plc4x/java/test/readwrite/ComplexOfComplexUsageD.java   | 3 ---
 .../generated/org/apache/plc4x/java/test/readwrite/ConstTypeTest.java  | 3 ---
 .../org/apache/plc4x/java/test/readwrite/EnumDiscriminatedType.java    | 3 ---
 .../org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeA.java   | 3 ---
 .../org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeB.java   | 3 ---
 .../org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeC.java   | 3 ---
 .../plc4x/java/test/readwrite/EnumDiscriminatedTypeMultiple.java       | 3 ---
 .../plc4x/java/test/readwrite/EnumDiscriminatedTypeMultipleA.java      | 3 ---
 .../plc4x/java/test/readwrite/EnumDiscriminatedTypeMultipleB.java      | 3 ---
 .../plc4x/java/test/readwrite/EnumDiscriminatedTypeMultipleC.java      | 3 ---
 .../plc4x/java/test/readwrite/EnumDiscriminatedTypeParameter.java      | 3 ---
 .../plc4x/java/test/readwrite/EnumDiscriminatedTypeParameterA.java     | 3 ---
 .../plc4x/java/test/readwrite/EnumDiscriminatedTypeParameterB.java     | 3 ---
 .../plc4x/java/test/readwrite/EnumDiscriminatedTypeParameterC.java     | 3 ---
 .../java/test/readwrite/EnumDiscriminatedTypeParameterMultiple.java    | 3 ---
 .../java/test/readwrite/EnumDiscriminatedTypeParameterMultipleA.java   | 3 ---
 .../java/test/readwrite/EnumDiscriminatedTypeParameterMultipleB.java   | 3 ---
 .../java/test/readwrite/EnumDiscriminatedTypeParameterMultipleC.java   | 3 ---
 .../generated/org/apache/plc4x/java/test/readwrite/EnumTypeTest.java   | 3 ---
 .../generated/org/apache/plc4x/java/test/readwrite/FieldTypeTest.java  | 2 --
 .../plc4x/java/test/readwrite/FieldTypeTestWithUnknownField.java       | 2 --
 .../apache/plc4x/java/test/readwrite/ImplicitPascalStringTypeTest.java | 3 ---
 .../org/apache/plc4x/java/test/readwrite/ImplicitTypeTest.java         | 3 ---
 .../generated/org/apache/plc4x/java/test/readwrite/IntTypeTest.java    | 3 ---
 .../generated/org/apache/plc4x/java/test/readwrite/LengthLoopTest.java | 3 ---
 .../org/apache/plc4x/java/test/readwrite/OptionalTypeTest.java         | 3 ---
 .../org/apache/plc4x/java/test/readwrite/PaddingTypeTest.java          | 3 ---
 .../org/apache/plc4x/java/test/readwrite/PascalStringTypeTest.java     | 3 ---
 .../org/apache/plc4x/java/test/readwrite/ReservedTypeTest.java         | 3 ---
 .../org/apache/plc4x/java/test/readwrite/ReservedTypeTestChild.java    | 3 ---
 .../org/apache/plc4x/java/test/readwrite/ReservedTypeTestParent.java   | 3 ---
 .../org/apache/plc4x/java/test/readwrite/SimpleBitTypeTest.java        | 3 ---
 .../org/apache/plc4x/java/test/readwrite/SimpleDiscriminatedType.java  | 3 ---
 .../org/apache/plc4x/java/test/readwrite/SimpleDiscriminatedTypeA.java | 3 ---
 .../org/apache/plc4x/java/test/readwrite/SimpleDiscriminatedTypeB.java | 3 ---
 .../org/apache/plc4x/java/test/readwrite/SimpleDiscriminatedTypeC.java | 3 ---
 .../generated/org/apache/plc4x/java/test/readwrite/SimpleTypeTest.java | 3 ---
 .../generated/org/apache/plc4x/java/test/readwrite/UIntTypeTest.java   | 3 ---
 .../org/apache/plc4x/java/test/readwrite/VirtualFieldTest.java         | 3 ---
 46 files changed, 136 deletions(-)

diff --git a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/AbstractTypeTest.java b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/AbstractTypeTest.java
index 2d32437b7b..d7ede560f5 100644
--- a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/AbstractTypeTest.java
+++ b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/AbstractTypeTest.java
@@ -69,7 +69,6 @@ public abstract class AbstractTypeTest implements Message {
   public void serialize(WriteBuffer writeBuffer) throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    int startPos = positionAware.getPos();
     writeBuffer.pushContext("AbstractTypeTest");
 
     // Simple Field (simpleField)
@@ -109,8 +108,6 @@ public abstract class AbstractTypeTest implements Message {
   public static AbstractTypeTest staticParse(ReadBuffer readBuffer) throws ParseException {
     readBuffer.pullContext("AbstractTypeTest");
     PositionAware positionAware = readBuffer;
-    int startPos = positionAware.getPos();
-    int curPos;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     short simpleField = readSimpleField("simpleField", readUnsignedShort(readBuffer, 8));
diff --git a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/AbstractTypeTestSubType.java b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/AbstractTypeTestSubType.java
index 38b2498091..38a79a9884 100644
--- a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/AbstractTypeTestSubType.java
+++ b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/AbstractTypeTestSubType.java
@@ -93,7 +93,6 @@ public class AbstractTypeTestSubType extends AbstractTypeTest implements Message
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    int startPos = positionAware.getPos();
     writeBuffer.pushContext("AbstractTypeTestSubType");
 
     // Simple Field (abstractBitField)
@@ -153,8 +152,6 @@ public class AbstractTypeTestSubType extends AbstractTypeTest implements Message
       throws ParseException {
     readBuffer.pullContext("AbstractTypeTestSubType");
     PositionAware positionAware = readBuffer;
-    int startPos = positionAware.getPos();
-    int curPos;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     boolean abstractBitField = readSimpleField("abstractBitField", readBoolean(readBuffer));
diff --git a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/ArrayTypeTest.java b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/ArrayTypeTest.java
index f806e3eb57..a530a73ff1 100644
--- a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/ArrayTypeTest.java
+++ b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/ArrayTypeTest.java
@@ -95,7 +95,6 @@ public class ArrayTypeTest implements Message {
   public void serialize(WriteBuffer writeBuffer) throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    int startPos = positionAware.getPos();
     writeBuffer.pushContext("ArrayTypeTest");
 
     // Array Field (bitField)
@@ -180,8 +179,6 @@ public class ArrayTypeTest implements Message {
   public static ArrayTypeTest staticParse(ReadBuffer readBuffer) throws ParseException {
     readBuffer.pullContext("ArrayTypeTest");
     PositionAware positionAware = readBuffer;
-    int startPos = positionAware.getPos();
-    int curPos;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     List<Boolean> bitField = readCountArrayField("bitField", readBoolean(readBuffer), 5);
diff --git a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/CheckSumTypeTest.java b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/CheckSumTypeTest.java
index f6d976c623..5226c1af8f 100644
--- a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/CheckSumTypeTest.java
+++ b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/CheckSumTypeTest.java
@@ -44,7 +44,6 @@ public class CheckSumTypeTest implements Message {
   public void serialize(WriteBuffer writeBuffer) throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    int startPos = positionAware.getPos();
     writeBuffer.pushContext("CheckSumTypeTest");
 
     // Checksum Field (checksum) (Calculated)
@@ -91,8 +90,6 @@ public class CheckSumTypeTest implements Message {
   public static CheckSumTypeTest staticParse(ReadBuffer readBuffer) throws ParseException {
     readBuffer.pullContext("CheckSumTypeTest");
     PositionAware positionAware = readBuffer;
-    int startPos = positionAware.getPos();
-    int curPos;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     byte intField =
diff --git a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/ComplexOfComplexUsageA.java b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/ComplexOfComplexUsageA.java
index 28bbf131cd..99f01237dd 100644
--- a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/ComplexOfComplexUsageA.java
+++ b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/ComplexOfComplexUsageA.java
@@ -52,7 +52,6 @@ public class ComplexOfComplexUsageA implements Message {
   public void serialize(WriteBuffer writeBuffer) throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    int startPos = positionAware.getPos();
     writeBuffer.pushContext("ComplexOfComplexUsageA");
 
     // Simple Field (b)
@@ -87,8 +86,6 @@ public class ComplexOfComplexUsageA implements Message {
   public static ComplexOfComplexUsageA staticParse(ReadBuffer readBuffer) throws ParseException {
     readBuffer.pullContext("ComplexOfComplexUsageA");
     PositionAware positionAware = readBuffer;
-    int startPos = positionAware.getPos();
-    int curPos;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     ComplexOfComplexUsageB b =
diff --git a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/ComplexOfComplexUsageB.java b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/ComplexOfComplexUsageB.java
index 59cd27925e..6408dcf20d 100644
--- a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/ComplexOfComplexUsageB.java
+++ b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/ComplexOfComplexUsageB.java
@@ -58,7 +58,6 @@ public class ComplexOfComplexUsageB implements Message {
   public void serialize(WriteBuffer writeBuffer) throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    int startPos = positionAware.getPos();
     writeBuffer.pushContext("ComplexOfComplexUsageB");
 
     // Optional Field (c) (Can be skipped, if the value is null)
@@ -107,8 +106,6 @@ public class ComplexOfComplexUsageB implements Message {
   public static ComplexOfComplexUsageB staticParse(ReadBuffer readBuffer) throws ParseException {
     readBuffer.pullContext("ComplexOfComplexUsageB");
     PositionAware positionAware = readBuffer;
-    int startPos = positionAware.getPos();
-    int curPos;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     ComplexOfComplexUsageC c =
diff --git a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/ComplexOfComplexUsageC.java b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/ComplexOfComplexUsageC.java
index 123a77d42f..b0568be162 100644
--- a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/ComplexOfComplexUsageC.java
+++ b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/ComplexOfComplexUsageC.java
@@ -52,7 +52,6 @@ public class ComplexOfComplexUsageC implements Message {
   public void serialize(WriteBuffer writeBuffer) throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    int startPos = positionAware.getPos();
     writeBuffer.pushContext("ComplexOfComplexUsageC");
 
     // Simple Field (irrelevant)
@@ -87,8 +86,6 @@ public class ComplexOfComplexUsageC implements Message {
   public static ComplexOfComplexUsageC staticParse(ReadBuffer readBuffer) throws ParseException {
     readBuffer.pullContext("ComplexOfComplexUsageC");
     PositionAware positionAware = readBuffer;
-    int startPos = positionAware.getPos();
-    int curPos;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     short irrelevant = readSimpleField("irrelevant", readUnsignedShort(readBuffer, 8));
diff --git a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/ComplexOfComplexUsageD.java b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/ComplexOfComplexUsageD.java
index a1899521f1..a1238d79b5 100644
--- a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/ComplexOfComplexUsageD.java
+++ b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/ComplexOfComplexUsageD.java
@@ -52,7 +52,6 @@ public class ComplexOfComplexUsageD implements Message {
   public void serialize(WriteBuffer writeBuffer) throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    int startPos = positionAware.getPos();
     writeBuffer.pushContext("ComplexOfComplexUsageD");
 
     // Simple Field (irrelevant)
@@ -87,8 +86,6 @@ public class ComplexOfComplexUsageD implements Message {
   public static ComplexOfComplexUsageD staticParse(ReadBuffer readBuffer) throws ParseException {
     readBuffer.pullContext("ComplexOfComplexUsageD");
     PositionAware positionAware = readBuffer;
-    int startPos = positionAware.getPos();
-    int curPos;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     short irrelevant = readSimpleField("irrelevant", readUnsignedShort(readBuffer, 8));
diff --git a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/ConstTypeTest.java b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/ConstTypeTest.java
index 534b34f860..6dbd68b6b2 100644
--- a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/ConstTypeTest.java
+++ b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/ConstTypeTest.java
@@ -76,7 +76,6 @@ public class ConstTypeTest implements Message {
   public void serialize(WriteBuffer writeBuffer) throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    int startPos = positionAware.getPos();
     writeBuffer.pushContext("ConstTypeTest");
 
     // Const Field (bitField)
@@ -141,8 +140,6 @@ public class ConstTypeTest implements Message {
   public static ConstTypeTest staticParse(ReadBuffer readBuffer) throws ParseException {
     readBuffer.pullContext("ConstTypeTest");
     PositionAware positionAware = readBuffer;
-    int startPos = positionAware.getPos();
-    int curPos;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     boolean bitField = readConstField("bitField", readBoolean(readBuffer), ConstTypeTest.BITFIELD);
diff --git a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedType.java b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedType.java
index cb793b66f1..2ad3c735bf 100644
--- a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedType.java
+++ b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedType.java
@@ -50,7 +50,6 @@ public abstract class EnumDiscriminatedType implements Message {
   public void serialize(WriteBuffer writeBuffer) throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    int startPos = positionAware.getPos();
     writeBuffer.pushContext("EnumDiscriminatedType");
 
     // Discriminator Field (discr) (Used as input to a switch field)
@@ -95,8 +94,6 @@ public abstract class EnumDiscriminatedType implements Message {
   public static EnumDiscriminatedType staticParse(ReadBuffer readBuffer) throws ParseException {
     readBuffer.pullContext("EnumDiscriminatedType");
     PositionAware positionAware = readBuffer;
-    int startPos = positionAware.getPos();
-    int curPos;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     EnumType discr =
diff --git a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeA.java b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeA.java
index 23fc009fd3..c8dcb2aea0 100644
--- a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeA.java
+++ b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeA.java
@@ -59,7 +59,6 @@ public class EnumDiscriminatedTypeA extends EnumDiscriminatedType implements Mes
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    int startPos = positionAware.getPos();
     writeBuffer.pushContext("EnumDiscriminatedTypeA");
 
     // Simple Field (simpA)
@@ -89,8 +88,6 @@ public class EnumDiscriminatedTypeA extends EnumDiscriminatedType implements Mes
       ReadBuffer readBuffer) throws ParseException {
     readBuffer.pullContext("EnumDiscriminatedTypeA");
     PositionAware positionAware = readBuffer;
-    int startPos = positionAware.getPos();
-    int curPos;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     short simpA = readSimpleField("simpA", readUnsignedShort(readBuffer, 8));
diff --git a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeB.java b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeB.java
index a3456ce0a4..e286ebce4c 100644
--- a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeB.java
+++ b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeB.java
@@ -59,7 +59,6 @@ public class EnumDiscriminatedTypeB extends EnumDiscriminatedType implements Mes
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    int startPos = positionAware.getPos();
     writeBuffer.pushContext("EnumDiscriminatedTypeB");
 
     // Simple Field (simpB)
@@ -89,8 +88,6 @@ public class EnumDiscriminatedTypeB extends EnumDiscriminatedType implements Mes
       ReadBuffer readBuffer) throws ParseException {
     readBuffer.pullContext("EnumDiscriminatedTypeB");
     PositionAware positionAware = readBuffer;
-    int startPos = positionAware.getPos();
-    int curPos;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     short simpB = readSimpleField("simpB", readUnsignedShort(readBuffer, 8));
diff --git a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeC.java b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeC.java
index 47cd8be13f..b923ccac2b 100644
--- a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeC.java
+++ b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeC.java
@@ -59,7 +59,6 @@ public class EnumDiscriminatedTypeC extends EnumDiscriminatedType implements Mes
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    int startPos = positionAware.getPos();
     writeBuffer.pushContext("EnumDiscriminatedTypeC");
 
     // Simple Field (simpC)
@@ -89,8 +88,6 @@ public class EnumDiscriminatedTypeC extends EnumDiscriminatedType implements Mes
       ReadBuffer readBuffer) throws ParseException {
     readBuffer.pullContext("EnumDiscriminatedTypeC");
     PositionAware positionAware = readBuffer;
-    int startPos = positionAware.getPos();
-    int curPos;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     short simpC = readSimpleField("simpC", readUnsignedShort(readBuffer, 8));
diff --git a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeMultiple.java b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeMultiple.java
index 464c8123ad..8ea49794d1 100644
--- a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeMultiple.java
+++ b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeMultiple.java
@@ -52,7 +52,6 @@ public abstract class EnumDiscriminatedTypeMultiple implements Message {
   public void serialize(WriteBuffer writeBuffer) throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    int startPos = positionAware.getPos();
     writeBuffer.pushContext("EnumDiscriminatedTypeMultiple");
 
     // Discriminator Field (discr1) (Used as input to a switch field)
@@ -109,8 +108,6 @@ public abstract class EnumDiscriminatedTypeMultiple implements Message {
       throws ParseException {
     readBuffer.pullContext("EnumDiscriminatedTypeMultiple");
     PositionAware positionAware = readBuffer;
-    int startPos = positionAware.getPos();
-    int curPos;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     EnumType discr1 =
diff --git a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeMultipleA.java b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeMultipleA.java
index 61040e0461..df93defe84 100644
--- a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeMultipleA.java
+++ b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeMultipleA.java
@@ -64,7 +64,6 @@ public class EnumDiscriminatedTypeMultipleA extends EnumDiscriminatedTypeMultipl
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    int startPos = positionAware.getPos();
     writeBuffer.pushContext("EnumDiscriminatedTypeMultipleA");
 
     // Simple Field (simpA)
@@ -94,8 +93,6 @@ public class EnumDiscriminatedTypeMultipleA extends EnumDiscriminatedTypeMultipl
       staticParseEnumDiscriminatedTypeMultipleBuilder(ReadBuffer readBuffer) throws ParseException {
     readBuffer.pullContext("EnumDiscriminatedTypeMultipleA");
     PositionAware positionAware = readBuffer;
-    int startPos = positionAware.getPos();
-    int curPos;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     short simpA = readSimpleField("simpA", readUnsignedShort(readBuffer, 8));
diff --git a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeMultipleB.java b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeMultipleB.java
index 3d16ddda6b..b4408df718 100644
--- a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeMultipleB.java
+++ b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeMultipleB.java
@@ -64,7 +64,6 @@ public class EnumDiscriminatedTypeMultipleB extends EnumDiscriminatedTypeMultipl
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    int startPos = positionAware.getPos();
     writeBuffer.pushContext("EnumDiscriminatedTypeMultipleB");
 
     // Simple Field (simpB)
@@ -94,8 +93,6 @@ public class EnumDiscriminatedTypeMultipleB extends EnumDiscriminatedTypeMultipl
       staticParseEnumDiscriminatedTypeMultipleBuilder(ReadBuffer readBuffer) throws ParseException {
     readBuffer.pullContext("EnumDiscriminatedTypeMultipleB");
     PositionAware positionAware = readBuffer;
-    int startPos = positionAware.getPos();
-    int curPos;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     short simpB = readSimpleField("simpB", readUnsignedShort(readBuffer, 8));
diff --git a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeMultipleC.java b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeMultipleC.java
index fa53f74d00..921e380583 100644
--- a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeMultipleC.java
+++ b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeMultipleC.java
@@ -64,7 +64,6 @@ public class EnumDiscriminatedTypeMultipleC extends EnumDiscriminatedTypeMultipl
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    int startPos = positionAware.getPos();
     writeBuffer.pushContext("EnumDiscriminatedTypeMultipleC");
 
     // Simple Field (simpC)
@@ -94,8 +93,6 @@ public class EnumDiscriminatedTypeMultipleC extends EnumDiscriminatedTypeMultipl
       staticParseEnumDiscriminatedTypeMultipleBuilder(ReadBuffer readBuffer) throws ParseException {
     readBuffer.pullContext("EnumDiscriminatedTypeMultipleC");
     PositionAware positionAware = readBuffer;
-    int startPos = positionAware.getPos();
-    int curPos;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     short simpC = readSimpleField("simpC", readUnsignedShort(readBuffer, 8));
diff --git a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeParameter.java b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeParameter.java
index 1f19bf33cf..b0201b8e48 100644
--- a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeParameter.java
+++ b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeParameter.java
@@ -50,7 +50,6 @@ public abstract class EnumDiscriminatedTypeParameter implements Message {
   public void serialize(WriteBuffer writeBuffer) throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    int startPos = positionAware.getPos();
     writeBuffer.pushContext("EnumDiscriminatedTypeParameter");
 
     // Switch field (Serialize the sub-type)
@@ -99,8 +98,6 @@ public abstract class EnumDiscriminatedTypeParameter implements Message {
       throws ParseException {
     readBuffer.pullContext("EnumDiscriminatedTypeParameter");
     PositionAware positionAware = readBuffer;
-    int startPos = positionAware.getPos();
-    int curPos;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type)
diff --git a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeParameterA.java b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeParameterA.java
index d606695416..4d06ceee2b 100644
--- a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeParameterA.java
+++ b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeParameterA.java
@@ -60,7 +60,6 @@ public class EnumDiscriminatedTypeParameterA extends EnumDiscriminatedTypeParame
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    int startPos = positionAware.getPos();
     writeBuffer.pushContext("EnumDiscriminatedTypeParameterA");
 
     // Simple Field (simpA)
@@ -91,8 +90,6 @@ public class EnumDiscriminatedTypeParameterA extends EnumDiscriminatedTypeParame
           throws ParseException {
     readBuffer.pullContext("EnumDiscriminatedTypeParameterA");
     PositionAware positionAware = readBuffer;
-    int startPos = positionAware.getPos();
-    int curPos;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     short simpA = readSimpleField("simpA", readUnsignedShort(readBuffer, 8));
diff --git a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeParameterB.java b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeParameterB.java
index 926b2cee0a..9efd680971 100644
--- a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeParameterB.java
+++ b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeParameterB.java
@@ -60,7 +60,6 @@ public class EnumDiscriminatedTypeParameterB extends EnumDiscriminatedTypeParame
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    int startPos = positionAware.getPos();
     writeBuffer.pushContext("EnumDiscriminatedTypeParameterB");
 
     // Simple Field (simpB)
@@ -91,8 +90,6 @@ public class EnumDiscriminatedTypeParameterB extends EnumDiscriminatedTypeParame
           throws ParseException {
     readBuffer.pullContext("EnumDiscriminatedTypeParameterB");
     PositionAware positionAware = readBuffer;
-    int startPos = positionAware.getPos();
-    int curPos;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     short simpB = readSimpleField("simpB", readUnsignedShort(readBuffer, 8));
diff --git a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeParameterC.java b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeParameterC.java
index cc79842cb7..d5512a4c15 100644
--- a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeParameterC.java
+++ b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeParameterC.java
@@ -60,7 +60,6 @@ public class EnumDiscriminatedTypeParameterC extends EnumDiscriminatedTypeParame
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    int startPos = positionAware.getPos();
     writeBuffer.pushContext("EnumDiscriminatedTypeParameterC");
 
     // Simple Field (simpC)
@@ -91,8 +90,6 @@ public class EnumDiscriminatedTypeParameterC extends EnumDiscriminatedTypeParame
           throws ParseException {
     readBuffer.pullContext("EnumDiscriminatedTypeParameterC");
     PositionAware positionAware = readBuffer;
-    int startPos = positionAware.getPos();
-    int curPos;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     short simpC = readSimpleField("simpC", readUnsignedShort(readBuffer, 8));
diff --git a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeParameterMultiple.java b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeParameterMultiple.java
index 0ca1d64620..50ed8ab94b 100644
--- a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeParameterMultiple.java
+++ b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeParameterMultiple.java
@@ -52,7 +52,6 @@ public abstract class EnumDiscriminatedTypeParameterMultiple implements Message
   public void serialize(WriteBuffer writeBuffer) throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    int startPos = positionAware.getPos();
     writeBuffer.pushContext("EnumDiscriminatedTypeParameterMultiple");
 
     // Switch field (Serialize the sub-type)
@@ -111,8 +110,6 @@ public abstract class EnumDiscriminatedTypeParameterMultiple implements Message
       ReadBuffer readBuffer, EnumType discr1, EnumTypeInt discr2) throws ParseException {
     readBuffer.pullContext("EnumDiscriminatedTypeParameterMultiple");
     PositionAware positionAware = readBuffer;
-    int startPos = positionAware.getPos();
-    int curPos;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type)
diff --git a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeParameterMultipleA.java b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeParameterMultipleA.java
index 441ecf9798..0ac5d6da74 100644
--- a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeParameterMultipleA.java
+++ b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeParameterMultipleA.java
@@ -64,7 +64,6 @@ public class EnumDiscriminatedTypeParameterMultipleA extends EnumDiscriminatedTy
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    int startPos = positionAware.getPos();
     writeBuffer.pushContext("EnumDiscriminatedTypeParameterMultipleA");
 
     // Simple Field (simpA)
@@ -95,8 +94,6 @@ public class EnumDiscriminatedTypeParameterMultipleA extends EnumDiscriminatedTy
           ReadBuffer readBuffer, EnumType discr1, EnumTypeInt discr2) throws ParseException {
     readBuffer.pullContext("EnumDiscriminatedTypeParameterMultipleA");
     PositionAware positionAware = readBuffer;
-    int startPos = positionAware.getPos();
-    int curPos;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     short simpA = readSimpleField("simpA", readUnsignedShort(readBuffer, 8));
diff --git a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeParameterMultipleB.java b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeParameterMultipleB.java
index 50c2caa756..77b9a546ec 100644
--- a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeParameterMultipleB.java
+++ b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeParameterMultipleB.java
@@ -64,7 +64,6 @@ public class EnumDiscriminatedTypeParameterMultipleB extends EnumDiscriminatedTy
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    int startPos = positionAware.getPos();
     writeBuffer.pushContext("EnumDiscriminatedTypeParameterMultipleB");
 
     // Simple Field (simpB)
@@ -95,8 +94,6 @@ public class EnumDiscriminatedTypeParameterMultipleB extends EnumDiscriminatedTy
           ReadBuffer readBuffer, EnumType discr1, EnumTypeInt discr2) throws ParseException {
     readBuffer.pullContext("EnumDiscriminatedTypeParameterMultipleB");
     PositionAware positionAware = readBuffer;
-    int startPos = positionAware.getPos();
-    int curPos;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     short simpB = readSimpleField("simpB", readUnsignedShort(readBuffer, 8));
diff --git a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeParameterMultipleC.java b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeParameterMultipleC.java
index 7d2a35799a..b364796e2b 100644
--- a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeParameterMultipleC.java
+++ b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumDiscriminatedTypeParameterMultipleC.java
@@ -64,7 +64,6 @@ public class EnumDiscriminatedTypeParameterMultipleC extends EnumDiscriminatedTy
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    int startPos = positionAware.getPos();
     writeBuffer.pushContext("EnumDiscriminatedTypeParameterMultipleC");
 
     // Simple Field (simpC)
@@ -95,8 +94,6 @@ public class EnumDiscriminatedTypeParameterMultipleC extends EnumDiscriminatedTy
           ReadBuffer readBuffer, EnumType discr1, EnumTypeInt discr2) throws ParseException {
     readBuffer.pullContext("EnumDiscriminatedTypeParameterMultipleC");
     PositionAware positionAware = readBuffer;
-    int startPos = positionAware.getPos();
-    int curPos;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     short simpC = readSimpleField("simpC", readUnsignedShort(readBuffer, 8));
diff --git a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumTypeTest.java b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumTypeTest.java
index 3b276d38c3..71f2bbadf2 100644
--- a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumTypeTest.java
+++ b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/EnumTypeTest.java
@@ -52,7 +52,6 @@ public class EnumTypeTest implements Message {
   public void serialize(WriteBuffer writeBuffer) throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    int startPos = positionAware.getPos();
     writeBuffer.pushContext("EnumTypeTest");
 
     // Enum field (enumField)
@@ -94,8 +93,6 @@ public class EnumTypeTest implements Message {
   public static EnumTypeTest staticParse(ReadBuffer readBuffer) throws ParseException {
     readBuffer.pullContext("EnumTypeTest");
     PositionAware positionAware = readBuffer;
-    int startPos = positionAware.getPos();
-    int curPos;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     EnumTypeParameters enumField =
diff --git a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/FieldTypeTest.java b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/FieldTypeTest.java
index bd2694d450..000ee98f77 100644
--- a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/FieldTypeTest.java
+++ b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/FieldTypeTest.java
@@ -197,8 +197,6 @@ public class FieldTypeTest implements Message {
   public static FieldTypeTest staticParse(ReadBuffer readBuffer) throws ParseException {
     readBuffer.pullContext("FieldTypeTest");
     PositionAware positionAware = readBuffer;
-    int startPos = positionAware.getPos();
-    int curPos;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     short simpleField = readSimpleField("simpleField", readUnsignedShort(readBuffer, 8));
diff --git a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/FieldTypeTestWithUnknownField.java b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/FieldTypeTestWithUnknownField.java
index 537e1facb3..e5fa537bfc 100644
--- a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/FieldTypeTestWithUnknownField.java
+++ b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/FieldTypeTestWithUnknownField.java
@@ -144,8 +144,6 @@ public class FieldTypeTestWithUnknownField implements Message {
       throws ParseException {
     readBuffer.pullContext("FieldTypeTestWithUnknownField");
     PositionAware positionAware = readBuffer;
-    int startPos = positionAware.getPos();
-    int curPos;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     short simpleField = readSimpleField("simpleField", readUnsignedShort(readBuffer, 8));
diff --git a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/ImplicitPascalStringTypeTest.java b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/ImplicitPascalStringTypeTest.java
index a75aae5231..c4e7700473 100644
--- a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/ImplicitPascalStringTypeTest.java
+++ b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/ImplicitPascalStringTypeTest.java
@@ -52,7 +52,6 @@ public class ImplicitPascalStringTypeTest implements Message {
   public void serialize(WriteBuffer writeBuffer) throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    int startPos = positionAware.getPos();
     writeBuffer.pushContext("ImplicitPascalStringTypeTest");
 
     // Implicit Field (stringLength) (Used for parsing, but its value is not stored as it's
@@ -96,8 +95,6 @@ public class ImplicitPascalStringTypeTest implements Message {
       throws ParseException {
     readBuffer.pullContext("ImplicitPascalStringTypeTest");
     PositionAware positionAware = readBuffer;
-    int startPos = positionAware.getPos();
-    int curPos;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     byte stringLength = readImplicitField("stringLength", readSignedByte(readBuffer, 8));
diff --git a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/ImplicitTypeTest.java b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/ImplicitTypeTest.java
index ddb3b25c86..b721b7330c 100644
--- a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/ImplicitTypeTest.java
+++ b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/ImplicitTypeTest.java
@@ -52,7 +52,6 @@ public class ImplicitTypeTest implements Message {
   public void serialize(WriteBuffer writeBuffer) throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    int startPos = positionAware.getPos();
     writeBuffer.pushContext("ImplicitTypeTest");
 
     // Simple Field (simpleField)
@@ -135,8 +134,6 @@ public class ImplicitTypeTest implements Message {
   public static ImplicitTypeTest staticParse(ReadBuffer readBuffer) throws ParseException {
     readBuffer.pullContext("ImplicitTypeTest");
     PositionAware positionAware = readBuffer;
-    int startPos = positionAware.getPos();
-    int curPos;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     short simpleField = readSimpleField("simpleField", readUnsignedShort(readBuffer, 8));
diff --git a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/IntTypeTest.java b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/IntTypeTest.java
index 4f88da50bf..5ccd564878 100644
--- a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/IntTypeTest.java
+++ b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/IntTypeTest.java
@@ -88,7 +88,6 @@ public class IntTypeTest implements Message {
   public void serialize(WriteBuffer writeBuffer) throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    int startPos = positionAware.getPos();
     writeBuffer.pushContext("IntTypeTest");
 
     // Simple Field (ThreeField)
@@ -153,8 +152,6 @@ public class IntTypeTest implements Message {
   public static IntTypeTest staticParse(ReadBuffer readBuffer) throws ParseException {
     readBuffer.pullContext("IntTypeTest");
     PositionAware positionAware = readBuffer;
-    int startPos = positionAware.getPos();
-    int curPos;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     byte ThreeField = readSimpleField("ThreeField", readSignedByte(readBuffer, 3));
diff --git a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/LengthLoopTest.java b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/LengthLoopTest.java
index 1a17a18c76..f3a80c09ee 100644
--- a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/LengthLoopTest.java
+++ b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/LengthLoopTest.java
@@ -52,7 +52,6 @@ public class LengthLoopTest implements Message {
   public void serialize(WriteBuffer writeBuffer) throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    int startPos = positionAware.getPos();
     writeBuffer.pushContext("LengthLoopTest");
 
     // Simple Field (commandType)
@@ -95,8 +94,6 @@ public class LengthLoopTest implements Message {
   public static LengthLoopTest staticParse(ReadBuffer readBuffer) throws ParseException {
     readBuffer.pullContext("LengthLoopTest");
     PositionAware positionAware = readBuffer;
-    int startPos = positionAware.getPos();
-    int curPos;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     int commandType = readSimpleField("commandType", readUnsignedInt(readBuffer, 16));
diff --git a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/OptionalTypeTest.java b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/OptionalTypeTest.java
index e4b945af44..3973c301b5 100644
--- a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/OptionalTypeTest.java
+++ b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/OptionalTypeTest.java
@@ -58,7 +58,6 @@ public class OptionalTypeTest implements Message {
   public void serialize(WriteBuffer writeBuffer) throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    int startPos = positionAware.getPos();
     writeBuffer.pushContext("OptionalTypeTest");
 
     // Simple Field (simpleField)
@@ -101,8 +100,6 @@ public class OptionalTypeTest implements Message {
   public static OptionalTypeTest staticParse(ReadBuffer readBuffer) throws ParseException {
     readBuffer.pullContext("OptionalTypeTest");
     PositionAware positionAware = readBuffer;
-    int startPos = positionAware.getPos();
-    int curPos;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     short simpleField = readSimpleField("simpleField", readUnsignedShort(readBuffer, 8));
diff --git a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/PaddingTypeTest.java b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/PaddingTypeTest.java
index 28e21375bb..2eea0789a8 100644
--- a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/PaddingTypeTest.java
+++ b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/PaddingTypeTest.java
@@ -52,7 +52,6 @@ public class PaddingTypeTest implements Message {
   public void serialize(WriteBuffer writeBuffer) throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    int startPos = positionAware.getPos();
     writeBuffer.pushContext("PaddingTypeTest");
 
     // Simple Field (simpleField)
@@ -97,8 +96,6 @@ public class PaddingTypeTest implements Message {
   public static PaddingTypeTest staticParse(ReadBuffer readBuffer) throws ParseException {
     readBuffer.pullContext("PaddingTypeTest");
     PositionAware positionAware = readBuffer;
-    int startPos = positionAware.getPos();
-    int curPos;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     short simpleField = readSimpleField("simpleField", readUnsignedShort(readBuffer, 8));
diff --git a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/PascalStringTypeTest.java b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/PascalStringTypeTest.java
index 7df545b714..831b25a620 100644
--- a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/PascalStringTypeTest.java
+++ b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/PascalStringTypeTest.java
@@ -58,7 +58,6 @@ public class PascalStringTypeTest implements Message {
   public void serialize(WriteBuffer writeBuffer) throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    int startPos = positionAware.getPos();
     writeBuffer.pushContext("PascalStringTypeTest");
 
     // Simple Field (stringLength)
@@ -99,8 +98,6 @@ public class PascalStringTypeTest implements Message {
   public static PascalStringTypeTest staticParse(ReadBuffer readBuffer) throws ParseException {
     readBuffer.pullContext("PascalStringTypeTest");
     PositionAware positionAware = readBuffer;
-    int startPos = positionAware.getPos();
-    int curPos;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     byte stringLength = readSimpleField("stringLength", readSignedByte(readBuffer, 8));
diff --git a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/ReservedTypeTest.java b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/ReservedTypeTest.java
index 2cc7b83c22..8bb4fb2f27 100644
--- a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/ReservedTypeTest.java
+++ b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/ReservedTypeTest.java
@@ -44,7 +44,6 @@ public class ReservedTypeTest implements Message {
   public void serialize(WriteBuffer writeBuffer) throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    int startPos = positionAware.getPos();
     writeBuffer.pushContext("ReservedTypeTest");
 
     // Reserved Field (reserved)
@@ -79,8 +78,6 @@ public class ReservedTypeTest implements Message {
   public static ReservedTypeTest staticParse(ReadBuffer readBuffer) throws ParseException {
     readBuffer.pullContext("ReservedTypeTest");
     PositionAware positionAware = readBuffer;
-    int startPos = positionAware.getPos();
-    int curPos;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     Short reservedField0 =
diff --git a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/ReservedTypeTestChild.java b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/ReservedTypeTestChild.java
index 9151d7fdba..85bb3a3790 100644
--- a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/ReservedTypeTestChild.java
+++ b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/ReservedTypeTestChild.java
@@ -48,7 +48,6 @@ public class ReservedTypeTestChild extends ReservedTypeTestParent implements Mes
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    int startPos = positionAware.getPos();
     writeBuffer.pushContext("ReservedTypeTestChild");
 
     // Reserved Field (reserved)
@@ -78,8 +77,6 @@ public class ReservedTypeTestChild extends ReservedTypeTestParent implements Mes
       ReadBuffer readBuffer) throws ParseException {
     readBuffer.pullContext("ReservedTypeTestChild");
     PositionAware positionAware = readBuffer;
-    int startPos = positionAware.getPos();
-    int curPos;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     Short reservedField0 =
diff --git a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/ReservedTypeTestParent.java b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/ReservedTypeTestParent.java
index 536c961c92..1f450bcb5c 100644
--- a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/ReservedTypeTestParent.java
+++ b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/ReservedTypeTestParent.java
@@ -57,7 +57,6 @@ public abstract class ReservedTypeTestParent implements Message {
   public void serialize(WriteBuffer writeBuffer) throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    int startPos = positionAware.getPos();
     writeBuffer.pushContext("ReservedTypeTestParent");
 
     // Reserved Field (reserved)
@@ -103,8 +102,6 @@ public abstract class ReservedTypeTestParent implements Message {
   public static ReservedTypeTestParent staticParse(ReadBuffer readBuffer) throws ParseException {
     readBuffer.pullContext("ReservedTypeTestParent");
     PositionAware positionAware = readBuffer;
-    int startPos = positionAware.getPos();
-    int curPos;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     Short reservedField0 =
diff --git a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/SimpleBitTypeTest.java b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/SimpleBitTypeTest.java
index 1bf3d1e567..eb62286604 100644
--- a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/SimpleBitTypeTest.java
+++ b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/SimpleBitTypeTest.java
@@ -52,7 +52,6 @@ public class SimpleBitTypeTest implements Message {
   public void serialize(WriteBuffer writeBuffer) throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    int startPos = positionAware.getPos();
     writeBuffer.pushContext("SimpleBitTypeTest");
 
     // Simple Field (bitField)
@@ -87,8 +86,6 @@ public class SimpleBitTypeTest implements Message {
   public static SimpleBitTypeTest staticParse(ReadBuffer readBuffer) throws ParseException {
     readBuffer.pullContext("SimpleBitTypeTest");
     PositionAware positionAware = readBuffer;
-    int startPos = positionAware.getPos();
-    int curPos;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     boolean bitField = readSimpleField("bitField", readBoolean(readBuffer));
diff --git a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/SimpleDiscriminatedType.java b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/SimpleDiscriminatedType.java
index 55a30cd497..3be4febaf8 100644
--- a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/SimpleDiscriminatedType.java
+++ b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/SimpleDiscriminatedType.java
@@ -50,7 +50,6 @@ public abstract class SimpleDiscriminatedType implements Message {
   public void serialize(WriteBuffer writeBuffer) throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    int startPos = positionAware.getPos();
     writeBuffer.pushContext("SimpleDiscriminatedType");
 
     // Discriminator Field (discr) (Used as input to a switch field)
@@ -90,8 +89,6 @@ public abstract class SimpleDiscriminatedType implements Message {
   public static SimpleDiscriminatedType staticParse(ReadBuffer readBuffer) throws ParseException {
     readBuffer.pullContext("SimpleDiscriminatedType");
     PositionAware positionAware = readBuffer;
-    int startPos = positionAware.getPos();
-    int curPos;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     short discr = readDiscriminatorField("discr", readUnsignedShort(readBuffer, 8));
diff --git a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/SimpleDiscriminatedTypeA.java b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/SimpleDiscriminatedTypeA.java
index 4a5002e7ed..125015b7f9 100644
--- a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/SimpleDiscriminatedTypeA.java
+++ b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/SimpleDiscriminatedTypeA.java
@@ -59,7 +59,6 @@ public class SimpleDiscriminatedTypeA extends SimpleDiscriminatedType implements
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    int startPos = positionAware.getPos();
     writeBuffer.pushContext("SimpleDiscriminatedTypeA");
 
     // Simple Field (simpA)
@@ -89,8 +88,6 @@ public class SimpleDiscriminatedTypeA extends SimpleDiscriminatedType implements
       ReadBuffer readBuffer) throws ParseException {
     readBuffer.pullContext("SimpleDiscriminatedTypeA");
     PositionAware positionAware = readBuffer;
-    int startPos = positionAware.getPos();
-    int curPos;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     short simpA = readSimpleField("simpA", readUnsignedShort(readBuffer, 8));
diff --git a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/SimpleDiscriminatedTypeB.java b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/SimpleDiscriminatedTypeB.java
index ee6c744ce0..becfdfa80f 100644
--- a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/SimpleDiscriminatedTypeB.java
+++ b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/SimpleDiscriminatedTypeB.java
@@ -59,7 +59,6 @@ public class SimpleDiscriminatedTypeB extends SimpleDiscriminatedType implements
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    int startPos = positionAware.getPos();
     writeBuffer.pushContext("SimpleDiscriminatedTypeB");
 
     // Simple Field (simpB)
@@ -89,8 +88,6 @@ public class SimpleDiscriminatedTypeB extends SimpleDiscriminatedType implements
       ReadBuffer readBuffer) throws ParseException {
     readBuffer.pullContext("SimpleDiscriminatedTypeB");
     PositionAware positionAware = readBuffer;
-    int startPos = positionAware.getPos();
-    int curPos;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     short simpB = readSimpleField("simpB", readUnsignedShort(readBuffer, 8));
diff --git a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/SimpleDiscriminatedTypeC.java b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/SimpleDiscriminatedTypeC.java
index 6904e9b27d..bb1a63f8f6 100644
--- a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/SimpleDiscriminatedTypeC.java
+++ b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/SimpleDiscriminatedTypeC.java
@@ -59,7 +59,6 @@ public class SimpleDiscriminatedTypeC extends SimpleDiscriminatedType implements
       throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    int startPos = positionAware.getPos();
     writeBuffer.pushContext("SimpleDiscriminatedTypeC");
 
     // Simple Field (simpC)
@@ -89,8 +88,6 @@ public class SimpleDiscriminatedTypeC extends SimpleDiscriminatedType implements
       ReadBuffer readBuffer) throws ParseException {
     readBuffer.pullContext("SimpleDiscriminatedTypeC");
     PositionAware positionAware = readBuffer;
-    int startPos = positionAware.getPos();
-    int curPos;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     short simpC = readSimpleField("simpC", readUnsignedShort(readBuffer, 8));
diff --git a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/SimpleTypeTest.java b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/SimpleTypeTest.java
index 7ca347e9ed..2ee0c86c25 100644
--- a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/SimpleTypeTest.java
+++ b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/SimpleTypeTest.java
@@ -95,7 +95,6 @@ public class SimpleTypeTest implements Message {
   public void serialize(WriteBuffer writeBuffer) throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    int startPos = positionAware.getPos();
     writeBuffer.pushContext("SimpleTypeTest");
 
     // Simple Field (bitField)
@@ -166,8 +165,6 @@ public class SimpleTypeTest implements Message {
   public static SimpleTypeTest staticParse(ReadBuffer readBuffer) throws ParseException {
     readBuffer.pullContext("SimpleTypeTest");
     PositionAware positionAware = readBuffer;
-    int startPos = positionAware.getPos();
-    int curPos;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     boolean bitField = readSimpleField("bitField", readBoolean(readBuffer));
diff --git a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/UIntTypeTest.java b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/UIntTypeTest.java
index e84071cd53..ae774aa8cf 100644
--- a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/UIntTypeTest.java
+++ b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/UIntTypeTest.java
@@ -89,7 +89,6 @@ public class UIntTypeTest implements Message {
   public void serialize(WriteBuffer writeBuffer) throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    int startPos = positionAware.getPos();
     writeBuffer.pushContext("UIntTypeTest");
 
     // Simple Field (ThreeField)
@@ -154,8 +153,6 @@ public class UIntTypeTest implements Message {
   public static UIntTypeTest staticParse(ReadBuffer readBuffer) throws ParseException {
     readBuffer.pullContext("UIntTypeTest");
     PositionAware positionAware = readBuffer;
-    int startPos = positionAware.getPos();
-    int curPos;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     byte ThreeField = readSimpleField("ThreeField", readUnsignedByte(readBuffer, 3));
diff --git a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/VirtualFieldTest.java b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/VirtualFieldTest.java
index 2ca61439e0..f122e032e4 100644
--- a/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/VirtualFieldTest.java
+++ b/code-generation/tests/protocol-test-java/src/main/generated/org/apache/plc4x/java/test/readwrite/VirtualFieldTest.java
@@ -76,7 +76,6 @@ public class VirtualFieldTest implements Message {
   public void serialize(WriteBuffer writeBuffer) throws SerializationException {
     PositionAware positionAware = writeBuffer;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
-    int startPos = positionAware.getPos();
     writeBuffer.pushContext("VirtualFieldTest");
 
     // Simple Field (simpleField)
@@ -147,8 +146,6 @@ public class VirtualFieldTest implements Message {
   public static VirtualFieldTest staticParse(ReadBuffer readBuffer) throws ParseException {
     readBuffer.pullContext("VirtualFieldTest");
     PositionAware positionAware = readBuffer;
-    int startPos = positionAware.getPos();
-    int curPos;
     boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
 
     short simpleField = readSimpleField("simpleField", readUnsignedShort(readBuffer, 8));