diff --git a/code-generation/language-cs/src/main/java/org/apache/plc4x/language/cs/CsLanguageTemplateHelper.java b/code-generation/language-cs/src/main/java/org/apache/plc4x/language/cs/CsLanguageTemplateHelper.java index 2e07d8c0a2a..1bdb5d57bbf 100644 --- a/code-generation/language-cs/src/main/java/org/apache/plc4x/language/cs/CsLanguageTemplateHelper.java +++ b/code-generation/language-cs/src/main/java/org/apache/plc4x/language/cs/CsLanguageTemplateHelper.java @@ -157,50 +157,49 @@ public String getPlcValueTypeForTypeReference(TypeReference typeReference) { return "PlcStruct"; } SimpleTypeReference simpleTypeReference = (SimpleTypeReference) typeReference; + int sizeInBits = simpleTypeReference.getSizeInBits(); switch (simpleTypeReference.getBaseType()) { case BIT: return "PlcBOOL"; case BYTE: return "PlcBYTE"; case UINT: - IntegerTypeReference unsignedIntegerTypeReference = (IntegerTypeReference) simpleTypeReference; - if (unsignedIntegerTypeReference.getSizeInBits() <= 8) { + if (sizeInBits <= 8) { return "PlcUSINT"; } - if (unsignedIntegerTypeReference.getSizeInBits() <= 16) { + if (sizeInBits <= 16) { return "PlcUINT"; } - if (unsignedIntegerTypeReference.getSizeInBits() <= 32) { + if (sizeInBits <= 32) { return "PlcUDINT"; } - if (unsignedIntegerTypeReference.getSizeInBits() <= 64) { + if (sizeInBits <= 64) { return "PlcULINT"; } + throw new RuntimeException("Unsupported UINT with bit length " + sizeInBits); case INT: - IntegerTypeReference integerTypeReference = (IntegerTypeReference) simpleTypeReference; - if (integerTypeReference.getSizeInBits() <= 8) { + if (sizeInBits <= 8) { return "PlcSINT"; } - if (integerTypeReference.getSizeInBits() <= 16) { + if (sizeInBits <= 16) { return "PlcINT"; } - if (integerTypeReference.getSizeInBits() <= 32) { + if (sizeInBits <= 32) { return "PlcDINT"; } - if (integerTypeReference.getSizeInBits() <= 64) { + if (sizeInBits <= 64) { return "PlcLINT"; } - + throw new RuntimeException("Unsupported INT with bit length " + sizeInBits); case FLOAT: case UFLOAT: - FloatTypeReference floatTypeReference = (FloatTypeReference) simpleTypeReference; - int sizeInBits = floatTypeReference.getSizeInBits(); if (sizeInBits <= 32) { return "PlcREAL"; } if (sizeInBits <= 64) { return "PlcLREAL"; } + throw new RuntimeException("Unsupported REAL with bit length " + sizeInBits); case STRING: case VSTRING: return "PlcSTRING"; diff --git a/code-generation/language-java/src/main/java/org/apache/plc4x/language/java/JavaLanguageTemplateHelper.java b/code-generation/language-java/src/main/java/org/apache/plc4x/language/java/JavaLanguageTemplateHelper.java index 5756e837bbd..25da83f7735 100644 --- a/code-generation/language-java/src/main/java/org/apache/plc4x/language/java/JavaLanguageTemplateHelper.java +++ b/code-generation/language-java/src/main/java/org/apache/plc4x/language/java/JavaLanguageTemplateHelper.java @@ -114,16 +114,16 @@ public String getLanguageTypeNameForTypeReference(TypeReference typeReference, b return allowPrimitive ? byte.class.getSimpleName() : Byte.class.getSimpleName(); case UINT: IntegerTypeReference unsignedIntegerTypeReference = (IntegerTypeReference) simpleTypeReference; - if (unsignedIntegerTypeReference.getSizeInBits() <= 4) { + if (unsignedIntegerTypeReference.getSizeInBits() <= 7) { return allowPrimitive ? byte.class.getSimpleName() : Byte.class.getSimpleName(); } - if (unsignedIntegerTypeReference.getSizeInBits() <= 8) { + if (unsignedIntegerTypeReference.getSizeInBits() <= 15) { return allowPrimitive ? short.class.getSimpleName() : Short.class.getSimpleName(); } - if (unsignedIntegerTypeReference.getSizeInBits() <= 16) { + if (unsignedIntegerTypeReference.getSizeInBits() <= 31) { return allowPrimitive ? int.class.getSimpleName() : Integer.class.getSimpleName(); } - if (unsignedIntegerTypeReference.getSizeInBits() <= 32) { + if (unsignedIntegerTypeReference.getSizeInBits() <= 63) { return allowPrimitive ? long.class.getSimpleName() : Long.class.getSimpleName(); } return BigInteger.class.getSimpleName(); @@ -172,50 +172,49 @@ public String getPlcValueTypeForTypeReference(TypeReference typeReference) { return "PlcStruct"; } SimpleTypeReference simpleTypeReference = (SimpleTypeReference) typeReference; + int sizeInBits = simpleTypeReference.getSizeInBits(); switch (simpleTypeReference.getBaseType()) { case BIT: return "PlcBOOL"; case BYTE: return "PlcSINT"; case UINT: - IntegerTypeReference unsignedIntegerTypeReference = (IntegerTypeReference) simpleTypeReference; - if (unsignedIntegerTypeReference.getSizeInBits() <= 4) { + if (sizeInBits <= 8) { return "PlcUSINT"; } - if (unsignedIntegerTypeReference.getSizeInBits() <= 8) { + if (sizeInBits <= 16) { return "PlcUINT"; } - if (unsignedIntegerTypeReference.getSizeInBits() <= 16) { + if (sizeInBits <= 32) { return "PlcUDINT"; } - if (unsignedIntegerTypeReference.getSizeInBits() <= 32) { + if (sizeInBits <= 64) { return "PlcULINT"; } + throw new RuntimeException("Unsupported UINT with bit length " + sizeInBits); case INT: - IntegerTypeReference integerTypeReference = (IntegerTypeReference) simpleTypeReference; - if (integerTypeReference.getSizeInBits() <= 8) { + if (sizeInBits <= 8) { return "PlcSINT"; } - if (integerTypeReference.getSizeInBits() <= 16) { + if (sizeInBits <= 16) { return "PlcINT"; } - if (integerTypeReference.getSizeInBits() <= 32) { + if (sizeInBits <= 32) { return "PlcDINT"; } - if (integerTypeReference.getSizeInBits() <= 64) { + if (sizeInBits <= 64) { return "PlcLINT"; } - + throw new RuntimeException("Unsupported INT with bit length " + sizeInBits); case FLOAT: case UFLOAT: - FloatTypeReference floatTypeReference = (FloatTypeReference) simpleTypeReference; - int sizeInBits = floatTypeReference.getSizeInBits(); if (sizeInBits <= 32) { return "PlcREAL"; } if (sizeInBits <= 64) { return "PlcLREAL"; } + throw new RuntimeException("Unsupported REAL with bit length " + sizeInBits); case STRING: case VSTRING: return "PlcSTRING"; @@ -238,10 +237,10 @@ public String getNullValueForTypeReference(TypeReference typeReference) { return "0"; case UINT: IntegerTypeReference unsignedIntegerTypeReference = (IntegerTypeReference) simpleTypeReference; - if (unsignedIntegerTypeReference.getSizeInBits() <= 16) { + if (unsignedIntegerTypeReference.getSizeInBits() <= 31) { return "0"; } - if (unsignedIntegerTypeReference.getSizeInBits() <= 32) { + if (unsignedIntegerTypeReference.getSizeInBits() <= 63) { return "0l"; } return "null"; @@ -315,13 +314,13 @@ public String getReadBufferReadMethodCall(String logicalName, SimpleTypeReferenc case UINT: String unsignedIntegerType; IntegerTypeReference unsignedIntegerTypeReference = (IntegerTypeReference) simpleTypeReference; - if (unsignedIntegerTypeReference.getSizeInBits() <= 4) { + if (unsignedIntegerTypeReference.getSizeInBits() <= 7) { unsignedIntegerType = "UnsignedByte"; - } else if (unsignedIntegerTypeReference.getSizeInBits() <= 8) { + } else if (unsignedIntegerTypeReference.getSizeInBits() <= 15) { unsignedIntegerType = "UnsignedShort"; - } else if (unsignedIntegerTypeReference.getSizeInBits() <= 16) { + } else if (unsignedIntegerTypeReference.getSizeInBits() <= 31) { unsignedIntegerType = "UnsignedInt"; - } else if (unsignedIntegerTypeReference.getSizeInBits() <= 32) { + } else if (unsignedIntegerTypeReference.getSizeInBits() <= 63) { unsignedIntegerType = "UnsignedLong"; } else { unsignedIntegerType = "UnsignedBigInteger"; @@ -416,10 +415,10 @@ public String getDataReaderCall(SimpleTypeReference simpleTypeReference) { case BYTE: return "readByte(readBuffer, " + sizeInBits + ")"; case UINT: - if (sizeInBits <= 4) return "readUnsignedByte(readBuffer, " + sizeInBits + ")"; - if (sizeInBits <= 8) return "readUnsignedShort(readBuffer, " + sizeInBits + ")"; - if (sizeInBits <= 16) return "readUnsignedInt(readBuffer, " + sizeInBits + ")"; - if (sizeInBits <= 32) return "readUnsignedLong(readBuffer, " + sizeInBits + ")"; + if (sizeInBits <= 7) return "readUnsignedByte(readBuffer, " + sizeInBits + ")"; + if (sizeInBits <= 15) return "readUnsignedShort(readBuffer, " + sizeInBits + ")"; + if (sizeInBits <= 31) return "readUnsignedInt(readBuffer, " + sizeInBits + ")"; + if (sizeInBits <= 63) return "readUnsignedLong(readBuffer, " + sizeInBits + ")"; return "readUnsignedBigInteger(readBuffer, " + sizeInBits + ")"; case INT: if (sizeInBits <= 8) return "readSignedByte(readBuffer, " + sizeInBits + ")"; @@ -483,10 +482,10 @@ public String getDataWriterCall(SimpleTypeReference simpleTypeReference) { case BYTE: return "writeByte(writeBuffer, " + sizeInBits + ")"; case UINT: - if (sizeInBits <= 4) return "writeUnsignedByte(writeBuffer, " + sizeInBits + ")"; - if (sizeInBits <= 8) return "writeUnsignedShort(writeBuffer, " + sizeInBits + ")"; - if (sizeInBits <= 16) return "writeUnsignedInt(writeBuffer, " + sizeInBits + ")"; - if (sizeInBits <= 32) return "writeUnsignedLong(writeBuffer, " + sizeInBits + ")"; + if (sizeInBits <= 7) return "writeUnsignedByte(writeBuffer, " + sizeInBits + ")"; + if (sizeInBits <= 15) return "writeUnsignedShort(writeBuffer, " + sizeInBits + ")"; + if (sizeInBits <= 31) return "writeUnsignedInt(writeBuffer, " + sizeInBits + ")"; + if (sizeInBits <= 63) return "writeUnsignedLong(writeBuffer, " + sizeInBits + ")"; return "writeUnsignedBigInteger(writeBuffer, " + sizeInBits + ")"; case INT: if (sizeInBits <= 8) return "writeSignedByte(writeBuffer, " + sizeInBits + ")"; @@ -534,16 +533,16 @@ public String getWriteBufferWriteMethodCall(String logicalName, SimpleTypeRefere return "/*TODO: migrate me*/" + "writeBuffer.writeByte(\"" + logicalName + "\", ((Number) " + fieldName + ").byteValue()" + writerArgsString + ")"; case UINT: IntegerTypeReference unsignedIntegerTypeReference = (IntegerTypeReference) simpleTypeReference; - if (unsignedIntegerTypeReference.getSizeInBits() <= 4) { + if (unsignedIntegerTypeReference.getSizeInBits() <= 7) { return "/*TODO: migrate me*/" + "writeBuffer.writeUnsignedByte(\"" + logicalName + "\", " + unsignedIntegerTypeReference.getSizeInBits() + ", ((Number) " + fieldName + ").byteValue()" + writerArgsString + ")"; } - if (unsignedIntegerTypeReference.getSizeInBits() <= 8) { + if (unsignedIntegerTypeReference.getSizeInBits() <= 15) { return "/*TODO: migrate me*/" + "writeBuffer.writeUnsignedShort(\"" + logicalName + "\", " + unsignedIntegerTypeReference.getSizeInBits() + ", ((Number) " + fieldName + ").shortValue()" + writerArgsString + ")"; } - if (unsignedIntegerTypeReference.getSizeInBits() <= 16) { + if (unsignedIntegerTypeReference.getSizeInBits() <= 31) { return "/*TODO: migrate me*/" + "writeBuffer.writeUnsignedInt(\"" + logicalName + "\", " + unsignedIntegerTypeReference.getSizeInBits() + ", ((Number) " + fieldName + ").intValue()" + writerArgsString + ")"; } - if (unsignedIntegerTypeReference.getSizeInBits() <= 32) { + if (unsignedIntegerTypeReference.getSizeInBits() <= 63) { return "/*TODO: migrate me*/" + "writeBuffer.writeUnsignedLong(\"" + logicalName + "\", " + unsignedIntegerTypeReference.getSizeInBits() + ", ((Number) " + fieldName + ").longValue()" + writerArgsString + ")"; } return "/*TODO: migrate me*/" + "writeBuffer.writeUnsignedBigInteger(\"" + logicalName + "\", " + unsignedIntegerTypeReference.getSizeInBits() + ", (BigInteger) " + fieldName + "" + writerArgsString + ")"; 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 ae774aa8cf4..1306d4140d0 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 @@ -42,7 +42,7 @@ public class UIntTypeTest implements Message { protected final byte ThreeField; protected final short ByteField; protected final int WordField; - protected final long WordPlusByteField; + protected final int WordPlusByteField; protected final long DoubleIntField; protected final BigInteger QuadIntField; @@ -50,7 +50,7 @@ public UIntTypeTest( byte ThreeField, short ByteField, int WordField, - long WordPlusByteField, + int WordPlusByteField, long DoubleIntField, BigInteger QuadIntField) { super(); @@ -74,7 +74,7 @@ public int getWordField() { return WordField; } - public long getWordPlusByteField() { + public int getWordPlusByteField() { return WordPlusByteField; } @@ -101,7 +101,7 @@ public void serialize(WriteBuffer writeBuffer) throws SerializationException { writeSimpleField("WordField", WordField, writeUnsignedInt(writeBuffer, 16)); // Simple Field (WordPlusByteField) - writeSimpleField("WordPlusByteField", WordPlusByteField, writeUnsignedLong(writeBuffer, 24)); + writeSimpleField("WordPlusByteField", WordPlusByteField, writeUnsignedInt(writeBuffer, 24)); // Simple Field (DoubleIntField) writeSimpleField("DoubleIntField", DoubleIntField, writeUnsignedLong(writeBuffer, 32)); @@ -161,7 +161,7 @@ public static UIntTypeTest staticParse(ReadBuffer readBuffer) throws ParseExcept int WordField = readSimpleField("WordField", readUnsignedInt(readBuffer, 16)); - long WordPlusByteField = readSimpleField("WordPlusByteField", readUnsignedLong(readBuffer, 24)); + int WordPlusByteField = readSimpleField("WordPlusByteField", readUnsignedInt(readBuffer, 24)); long DoubleIntField = readSimpleField("DoubleIntField", readUnsignedLong(readBuffer, 32)); diff --git a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/DataItem.java b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/DataItem.java index 9f41ac621bd..4729ae49a71 100644 --- a/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/DataItem.java +++ b/plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/DataItem.java @@ -48,9 +48,9 @@ public static PlcValue staticParse( // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 7); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 7); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -275,8 +275,7 @@ public static void staticSerialize( if (EvaluationHelper.equals(plcValueType, PlcValueType.BOOL)) { // BOOL // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 7, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 7, ((Number) (byte) 0x00).byteValue()); // Simple Field (value) boolean value = (boolean) _value.getBoolean(); /*TODO: migrate me*/ diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetApplicationTagObjectIdentifier.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetApplicationTagObjectIdentifier.java index de8ce39877b..ceb5c15e79c 100644 --- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetApplicationTagObjectIdentifier.java +++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetApplicationTagObjectIdentifier.java @@ -56,8 +56,8 @@ public BACnetObjectType getObjectType() { return (BACnetObjectType) (getPayload().getObjectType()); } - public long getInstanceNumber() { - return (long) (getPayload().getInstanceNumber()); + public int getInstanceNumber() { + return (int) (getPayload().getInstanceNumber()); } @Override @@ -75,7 +75,7 @@ protected void serializeBACnetApplicationTagChild(WriteBuffer writeBuffer) writeBuffer.writeVirtual("objectType", objectType); // Virtual field (doesn't actually serialize anything, just makes the value available) - long instanceNumber = getInstanceNumber(); + int instanceNumber = getInstanceNumber(); writeBuffer.writeVirtual("instanceNumber", instanceNumber); writeBuffer.popContext("BACnetApplicationTagObjectIdentifier"); @@ -115,8 +115,7 @@ public static BACnetApplicationTagBuilder staticParseBACnetApplicationTagBuilder () -> BACnetTagPayloadObjectIdentifier.staticParse(readBuffer), readBuffer)); BACnetObjectType objectType = readVirtualField("objectType", BACnetObjectType.class, payload.getObjectType()); - long instanceNumber = - readVirtualField("instanceNumber", long.class, payload.getInstanceNumber()); + int instanceNumber = readVirtualField("instanceNumber", int.class, payload.getInstanceNumber()); readBuffer.closeContext("BACnetApplicationTagObjectIdentifier"); // Create the instance diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagObjectIdentifier.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagObjectIdentifier.java index 59328528568..ccc99992135 100644 --- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagObjectIdentifier.java +++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetContextTagObjectIdentifier.java @@ -63,8 +63,8 @@ public BACnetObjectType getObjectType() { return (BACnetObjectType) (getPayload().getObjectType()); } - public long getInstanceNumber() { - return (long) (getPayload().getInstanceNumber()); + public int getInstanceNumber() { + return (int) (getPayload().getInstanceNumber()); } @Override @@ -82,7 +82,7 @@ protected void serializeBACnetContextTagChild(WriteBuffer writeBuffer) writeBuffer.writeVirtual("objectType", objectType); // Virtual field (doesn't actually serialize anything, just makes the value available) - long instanceNumber = getInstanceNumber(); + int instanceNumber = getInstanceNumber(); writeBuffer.writeVirtual("instanceNumber", instanceNumber); writeBuffer.popContext("BACnetContextTagObjectIdentifier"); @@ -123,8 +123,7 @@ public static BACnetContextTagBuilder staticParseBACnetContextTagBuilder( () -> BACnetTagPayloadObjectIdentifier.staticParse(readBuffer), readBuffer)); BACnetObjectType objectType = readVirtualField("objectType", BACnetObjectType.class, payload.getObjectType()); - long instanceNumber = - readVirtualField("instanceNumber", long.class, payload.getInstanceNumber()); + int instanceNumber = readVirtualField("instanceNumber", int.class, payload.getInstanceNumber()); readBuffer.closeContext("BACnetContextTagObjectIdentifier"); // Create the instance diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetObjectType.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetObjectType.java index 8ec70d4b8a6..5f1b25d5f82 100644 --- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetObjectType.java +++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetObjectType.java @@ -24,91 +24,91 @@ // Code generated by code-generation. DO NOT EDIT. public enum BACnetObjectType { - ACCESS_CREDENTIAL((int) 32), - ACCESS_DOOR((int) 30), - ACCESS_POINT((int) 33), - ACCESS_RIGHTS((int) 34), - ACCESS_USER((int) 35), - ACCESS_ZONE((int) 36), - ACCUMULATOR((int) 23), - ALERT_ENROLLMENT((int) 52), - ANALOG_INPUT((int) 0), - ANALOG_OUTPUT((int) 1), - ANALOG_VALUE((int) 2), - AVERAGING((int) 18), - BINARY_INPUT((int) 3), - BINARY_LIGHTING_OUTPUT((int) 55), - BINARY_OUTPUT((int) 4), - BINARY_VALUE((int) 5), - BITSTRING_VALUE((int) 39), - CALENDAR((int) 6), - CHANNEL((int) 53), - CHARACTERSTRING_VALUE((int) 40), - COMMAND((int) 7), - CREDENTIAL_DATA_INPUT((int) 37), - DATEPATTERN_VALUE((int) 41), - DATE_VALUE((int) 42), - DATETIMEPATTERN_VALUE((int) 43), - DATETIME_VALUE((int) 44), - DEVICE((int) 8), - ELEVATOR_GROUP((int) 57), - ESCALATOR((int) 58), - EVENT_ENROLLMENT((int) 9), - EVENT_LOG((int) 25), - FILE((int) 10), - GLOBAL_GROUP((int) 26), - GROUP((int) 11), - INTEGER_VALUE((int) 45), - LARGE_ANALOG_VALUE((int) 46), - LIFE_SAFETY_POINT((int) 21), - LIFE_SAFETY_ZONE((int) 22), - LIFT((int) 59), - LIGHTING_OUTPUT((int) 54), - LOAD_CONTROL((int) 28), - LOOP((int) 12), - MULTI_STATE_INPUT((int) 13), - MULTI_STATE_OUTPUT((int) 14), - MULTI_STATE_VALUE((int) 19), - NETWORK_PORT((int) 56), - NETWORK_SECURITY((int) 38), - NOTIFICATION_CLASS((int) 15), - NOTIFICATION_FORWARDER((int) 51), - OCTETSTRING_VALUE((int) 47), - POSITIVE_INTEGER_VALUE((int) 48), - PROGRAM((int) 16), - PULSE_CONVERTER((int) 24), - SCHEDULE((int) 17), - STRUCTURED_VIEW((int) 29), - TIMEPATTERN_VALUE((int) 49), - TIME_VALUE((int) 50), - TIMER((int) 31), - TREND_LOG((int) 20), - TREND_LOG_MULTIPLE((int) 27), - VENDOR_PROPRIETARY_VALUE((int) 0x3FF); - private static final Map map; + ACCESS_CREDENTIAL((short) 32), + ACCESS_DOOR((short) 30), + ACCESS_POINT((short) 33), + ACCESS_RIGHTS((short) 34), + ACCESS_USER((short) 35), + ACCESS_ZONE((short) 36), + ACCUMULATOR((short) 23), + ALERT_ENROLLMENT((short) 52), + ANALOG_INPUT((short) 0), + ANALOG_OUTPUT((short) 1), + ANALOG_VALUE((short) 2), + AVERAGING((short) 18), + BINARY_INPUT((short) 3), + BINARY_LIGHTING_OUTPUT((short) 55), + BINARY_OUTPUT((short) 4), + BINARY_VALUE((short) 5), + BITSTRING_VALUE((short) 39), + CALENDAR((short) 6), + CHANNEL((short) 53), + CHARACTERSTRING_VALUE((short) 40), + COMMAND((short) 7), + CREDENTIAL_DATA_INPUT((short) 37), + DATEPATTERN_VALUE((short) 41), + DATE_VALUE((short) 42), + DATETIMEPATTERN_VALUE((short) 43), + DATETIME_VALUE((short) 44), + DEVICE((short) 8), + ELEVATOR_GROUP((short) 57), + ESCALATOR((short) 58), + EVENT_ENROLLMENT((short) 9), + EVENT_LOG((short) 25), + FILE((short) 10), + GLOBAL_GROUP((short) 26), + GROUP((short) 11), + INTEGER_VALUE((short) 45), + LARGE_ANALOG_VALUE((short) 46), + LIFE_SAFETY_POINT((short) 21), + LIFE_SAFETY_ZONE((short) 22), + LIFT((short) 59), + LIGHTING_OUTPUT((short) 54), + LOAD_CONTROL((short) 28), + LOOP((short) 12), + MULTI_STATE_INPUT((short) 13), + MULTI_STATE_OUTPUT((short) 14), + MULTI_STATE_VALUE((short) 19), + NETWORK_PORT((short) 56), + NETWORK_SECURITY((short) 38), + NOTIFICATION_CLASS((short) 15), + NOTIFICATION_FORWARDER((short) 51), + OCTETSTRING_VALUE((short) 47), + POSITIVE_INTEGER_VALUE((short) 48), + PROGRAM((short) 16), + PULSE_CONVERTER((short) 24), + SCHEDULE((short) 17), + STRUCTURED_VIEW((short) 29), + TIMEPATTERN_VALUE((short) 49), + TIME_VALUE((short) 50), + TIMER((short) 31), + TREND_LOG((short) 20), + TREND_LOG_MULTIPLE((short) 27), + VENDOR_PROPRIETARY_VALUE((short) 0x3FF); + private static final Map map; static { map = new HashMap<>(); for (BACnetObjectType value : BACnetObjectType.values()) { - map.put((int) value.getValue(), value); + map.put((short) value.getValue(), value); } } - private final int value; + private final short value; - BACnetObjectType(int value) { + BACnetObjectType(short value) { this.value = value; } - public int getValue() { + public short getValue() { return value; } - public static BACnetObjectType enumForValue(int value) { + public static BACnetObjectType enumForValue(short value) { return map.get(value); } - public static Boolean isDefined(int value) { + public static Boolean isDefined(short value) { return map.containsKey(value); } } diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTagPayloadObjectIdentifier.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTagPayloadObjectIdentifier.java index 1634c94e7c1..523b872a074 100644 --- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTagPayloadObjectIdentifier.java +++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTagPayloadObjectIdentifier.java @@ -39,11 +39,11 @@ public class BACnetTagPayloadObjectIdentifier implements Message { // Properties. protected final BACnetObjectType objectType; - protected final int proprietaryValue; - protected final long instanceNumber; + protected final short proprietaryValue; + protected final int instanceNumber; public BACnetTagPayloadObjectIdentifier( - BACnetObjectType objectType, int proprietaryValue, long instanceNumber) { + BACnetObjectType objectType, short proprietaryValue, int instanceNumber) { super(); this.objectType = objectType; this.proprietaryValue = proprietaryValue; @@ -54,11 +54,11 @@ public BACnetObjectType getObjectType() { return objectType; } - public int getProprietaryValue() { + public short getProprietaryValue() { return proprietaryValue; } - public long getInstanceNumber() { + public int getInstanceNumber() { return instanceNumber; } @@ -92,7 +92,7 @@ public void serialize(WriteBuffer writeBuffer) throws SerializationException { writeBuffer.writeVirtual("isProprietary", isProprietary); // Simple Field (instanceNumber) - writeSimpleField("instanceNumber", instanceNumber, writeUnsignedLong(writeBuffer, 22)); + writeSimpleField("instanceNumber", instanceNumber, writeUnsignedInt(writeBuffer, 22)); writeBuffer.popContext("BACnetTagPayloadObjectIdentifier"); } @@ -143,12 +143,12 @@ public static BACnetTagPayloadObjectIdentifier staticParse(ReadBuffer readBuffer (org.apache.plc4x.java.bacnetip.readwrite.utils.StaticHelper.readObjectType( readBuffer))); - int proprietaryValue = + short proprietaryValue = readManualField( "proprietaryValue", readBuffer, () -> - (int) + (short) (org.apache.plc4x.java.bacnetip.readwrite.utils.StaticHelper .readProprietaryObjectType(readBuffer, objectType))); boolean isProprietary = @@ -157,7 +157,7 @@ public static BACnetTagPayloadObjectIdentifier staticParse(ReadBuffer readBuffer boolean.class, (objectType) == (BACnetObjectType.VENDOR_PROPRIETARY_VALUE)); - long instanceNumber = readSimpleField("instanceNumber", readUnsignedLong(readBuffer, 22)); + int instanceNumber = readSimpleField("instanceNumber", readUnsignedInt(readBuffer, 22)); readBuffer.closeContext("BACnetTagPayloadObjectIdentifier"); // Create the instance diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTagPayloadUnsignedInteger.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTagPayloadUnsignedInteger.java index 4ab632bcf3d..b35719b392a 100644 --- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTagPayloadUnsignedInteger.java +++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/BACnetTagPayloadUnsignedInteger.java @@ -41,11 +41,11 @@ public class BACnetTagPayloadUnsignedInteger implements Message { // Properties. protected final Short valueUint8; protected final Integer valueUint16; - protected final Long valueUint24; + protected final Integer valueUint24; protected final Long valueUint32; - protected final BigInteger valueUint40; - protected final BigInteger valueUint48; - protected final BigInteger valueUint56; + protected final Long valueUint40; + protected final Long valueUint48; + protected final Long valueUint56; protected final BigInteger valueUint64; // Arguments. @@ -54,11 +54,11 @@ public class BACnetTagPayloadUnsignedInteger implements Message { public BACnetTagPayloadUnsignedInteger( Short valueUint8, Integer valueUint16, - Long valueUint24, + Integer valueUint24, Long valueUint32, - BigInteger valueUint40, - BigInteger valueUint48, - BigInteger valueUint56, + Long valueUint40, + Long valueUint48, + Long valueUint56, BigInteger valueUint64, Long actualLength) { super(); @@ -81,7 +81,7 @@ public Integer getValueUint16() { return valueUint16; } - public Long getValueUint24() { + public Integer getValueUint24() { return valueUint24; } @@ -89,15 +89,15 @@ public Long getValueUint32() { return valueUint32; } - public BigInteger getValueUint40() { + public Long getValueUint40() { return valueUint40; } - public BigInteger getValueUint48() { + public Long getValueUint48() { return valueUint48; } - public BigInteger getValueUint56() { + public Long getValueUint56() { return valueUint56; } @@ -184,7 +184,7 @@ public void serialize(WriteBuffer writeBuffer) throws SerializationException { // Optional Field (valueUint24) (Can be skipped, if the value is null) writeOptionalField( - "valueUint24", valueUint24, writeUnsignedLong(writeBuffer, 24), getIsUint24()); + "valueUint24", valueUint24, writeUnsignedInt(writeBuffer, 24), getIsUint24()); // Virtual field (doesn't actually serialize anything, just makes the value available) boolean isUint32 = getIsUint32(); @@ -200,7 +200,7 @@ public void serialize(WriteBuffer writeBuffer) throws SerializationException { // Optional Field (valueUint40) (Can be skipped, if the value is null) writeOptionalField( - "valueUint40", valueUint40, writeUnsignedBigInteger(writeBuffer, 40), getIsUint40()); + "valueUint40", valueUint40, writeUnsignedLong(writeBuffer, 40), getIsUint40()); // Virtual field (doesn't actually serialize anything, just makes the value available) boolean isUint48 = getIsUint48(); @@ -208,7 +208,7 @@ public void serialize(WriteBuffer writeBuffer) throws SerializationException { // Optional Field (valueUint48) (Can be skipped, if the value is null) writeOptionalField( - "valueUint48", valueUint48, writeUnsignedBigInteger(writeBuffer, 48), getIsUint48()); + "valueUint48", valueUint48, writeUnsignedLong(writeBuffer, 48), getIsUint48()); // Virtual field (doesn't actually serialize anything, just makes the value available) boolean isUint56 = getIsUint56(); @@ -216,7 +216,7 @@ public void serialize(WriteBuffer writeBuffer) throws SerializationException { // Optional Field (valueUint56) (Can be skipped, if the value is null) writeOptionalField( - "valueUint56", valueUint56, writeUnsignedBigInteger(writeBuffer, 56), getIsUint56()); + "valueUint56", valueUint56, writeUnsignedLong(writeBuffer, 56), getIsUint56()); // Virtual field (doesn't actually serialize anything, just makes the value available) boolean isUint64 = getIsUint64(); @@ -339,22 +339,20 @@ public static BACnetTagPayloadUnsignedInteger staticParse( readOptionalField("valueUint16", readUnsignedInt(readBuffer, 16), isUint16); boolean isUint24 = readVirtualField("isUint24", boolean.class, (actualLength) == (3)); - Long valueUint24 = readOptionalField("valueUint24", readUnsignedLong(readBuffer, 24), isUint24); + Integer valueUint24 = + readOptionalField("valueUint24", readUnsignedInt(readBuffer, 24), isUint24); boolean isUint32 = readVirtualField("isUint32", boolean.class, (actualLength) == (4)); Long valueUint32 = readOptionalField("valueUint32", readUnsignedLong(readBuffer, 32), isUint32); boolean isUint40 = readVirtualField("isUint40", boolean.class, (actualLength) == (5)); - BigInteger valueUint40 = - readOptionalField("valueUint40", readUnsignedBigInteger(readBuffer, 40), isUint40); + Long valueUint40 = readOptionalField("valueUint40", readUnsignedLong(readBuffer, 40), isUint40); boolean isUint48 = readVirtualField("isUint48", boolean.class, (actualLength) == (6)); - BigInteger valueUint48 = - readOptionalField("valueUint48", readUnsignedBigInteger(readBuffer, 48), isUint48); + Long valueUint48 = readOptionalField("valueUint48", readUnsignedLong(readBuffer, 48), isUint48); boolean isUint56 = readVirtualField("isUint56", boolean.class, (actualLength) == (7)); - BigInteger valueUint56 = - readOptionalField("valueUint56", readUnsignedBigInteger(readBuffer, 56), isUint56); + Long valueUint56 = readOptionalField("valueUint56", readUnsignedLong(readBuffer, 56), isUint56); boolean isUint64 = readVirtualField("isUint64", boolean.class, (actualLength) == (8)); BigInteger valueUint64 = diff --git a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMNetworkNumberIs.java b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMNetworkNumberIs.java index 6c62925432e..f132c1b0060 100644 --- a/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMNetworkNumberIs.java +++ b/plc4j/drivers/bacnet/src/main/generated/org/apache/plc4x/java/bacnetip/readwrite/NLMNetworkNumberIs.java @@ -49,7 +49,7 @@ public Short getMessageType() { // Arguments. protected final Integer apduLength; // Reserved Fields - private Short reservedField0; + private Byte reservedField0; public NLMNetworkNumberIs( int networkNumber, boolean networkNumberConfigured, Integer apduLength) { @@ -79,8 +79,8 @@ protected void serializeNLMChild(WriteBuffer writeBuffer) throws SerializationEx // Reserved Field (reserved) writeReservedField( "reserved", - reservedField0 != null ? reservedField0 : (short) 0, - writeUnsignedShort(writeBuffer, 7)); + reservedField0 != null ? reservedField0 : (byte) 0, + writeUnsignedByte(writeBuffer, 7)); // Simple Field (networkNumberConfigured) writeSimpleField("networkNumberConfigured", networkNumberConfigured, writeBoolean(writeBuffer)); @@ -119,8 +119,7 @@ public static NLMBuilder staticParseNLMBuilder(ReadBuffer readBuffer, Integer ap int networkNumber = readSimpleField("networkNumber", readUnsignedInt(readBuffer, 16)); - Short reservedField0 = - readReservedField("reserved", readUnsignedShort(readBuffer, 7), (short) 0); + Byte reservedField0 = readReservedField("reserved", readUnsignedByte(readBuffer, 7), (byte) 0); boolean networkNumberConfigured = readSimpleField("networkNumberConfigured", readBoolean(readBuffer)); @@ -135,13 +134,13 @@ public static class NLMNetworkNumberIsBuilderImpl implements NLM.NLMBuilder { private final int networkNumber; private final boolean networkNumberConfigured; private final Integer apduLength; - private final Short reservedField0; + private final Byte reservedField0; public NLMNetworkNumberIsBuilderImpl( int networkNumber, boolean networkNumberConfigured, Integer apduLength, - Short reservedField0) { + Byte reservedField0) { this.networkNumber = networkNumber; this.networkNumberConfigured = networkNumberConfigured; this.apduLength = apduLength; diff --git a/plc4j/drivers/bacnet/src/main/java/org/apache/plc4x/java/bacnetip/readwrite/utils/StaticHelper.java b/plc4j/drivers/bacnet/src/main/java/org/apache/plc4x/java/bacnetip/readwrite/utils/StaticHelper.java index da7e50c60a4..030093b8158 100644 --- a/plc4j/drivers/bacnet/src/main/java/org/apache/plc4x/java/bacnetip/readwrite/utils/StaticHelper.java +++ b/plc4j/drivers/bacnet/src/main/java/org/apache/plc4x/java/bacnetip/readwrite/utils/StaticHelper.java @@ -288,24 +288,25 @@ public static void writeProprietaryEnumGeneric(WriteBuffer writeBuffer, long val @Deprecated public static BACnetObjectType readObjectType(ReadBuffer readBuffer) throws ParseException { - int readUnsignedLong = readBuffer.readUnsignedInt("objectType", 10); - if (!BACnetObjectType.isDefined(readUnsignedLong)) { + short readUnsignedShort = readBuffer.readUnsignedShort("objectType", 10); + if (!BACnetObjectType.isDefined(readUnsignedShort)) { return BACnetObjectType.VENDOR_PROPRIETARY_VALUE; } - return BACnetObjectType.enumForValue(readUnsignedLong); + return BACnetObjectType.enumForValue(readUnsignedShort); } @Deprecated - public static Integer readProprietaryObjectType(ReadBuffer readBuffer, BACnetObjectType value) throws ParseException { + public static Short readProprietaryObjectType(ReadBuffer readBuffer, BACnetObjectType value) throws ParseException { if (value != null && value != BACnetObjectType.VENDOR_PROPRIETARY_VALUE) { return 0; } // We need to reset our reader to the position we read before // TODO: maybe we reset to much here because pos is byte based - // we consume the leftover bits before we reset to avoid trouble // TODO: we really need bit precision on resetting + // we consume the leftover bits before we reset to avoid trouble + // TODO: we really need bit precision on resetting readBuffer.readUnsignedInt(6); readBuffer.reset(readBuffer.getPos() - 2); - return readBuffer.readUnsignedInt("proprietaryObjectType", 10); + return readBuffer.readUnsignedShort("proprietaryObjectType", 10); } @Deprecated @@ -327,7 +328,7 @@ public static void writeProprietaryObjectType(WriteBuffer writeBuffer, BACnetObj @Deprecated public static BACnetObjectType mapBACnetObjectType(BACnetContextTagEnumerated rawObjectType) { if (rawObjectType == null) return null; - BACnetObjectType baCnetObjectType = BACnetObjectType.enumForValue((int) rawObjectType.getActualValue()); + BACnetObjectType baCnetObjectType = BACnetObjectType.enumForValue((short) rawObjectType.getActualValue()); if (baCnetObjectType == null) return BACnetObjectType.VENDOR_PROPRIETARY_VALUE; return baCnetObjectType; } @@ -442,10 +443,10 @@ public static BACnetClosingTag createBACnetClosingTag(short tagNum) { return new BACnetClosingTag(header, tagNum); } - public static BACnetApplicationTagObjectIdentifier createBACnetApplicationTagObjectIdentifier(int objectType, long instance) { + public static BACnetApplicationTagObjectIdentifier createBACnetApplicationTagObjectIdentifier(short objectType, int instance) { BACnetTagHeader header = new BACnetTagHeader((byte) BACnetDataType.BACNET_OBJECT_IDENTIFIER.getValue(), TagClass.APPLICATION_TAGS, (byte) 4, null, null, null, null); BACnetObjectType objectTypeEnum = BACnetObjectType.enumForValue(objectType); - int proprietaryValue = 0; + short proprietaryValue = 0; if (objectType >= 128 || !BACnetObjectType.isDefined(objectType)) { objectTypeEnum = BACnetObjectType.VENDOR_PROPRIETARY_VALUE; proprietaryValue = objectType; @@ -454,10 +455,10 @@ public static BACnetApplicationTagObjectIdentifier createBACnetApplicationTagObj return new BACnetApplicationTagObjectIdentifier(header, payload); } - public static BACnetContextTagObjectIdentifier createBACnetContextTagObjectIdentifier(byte tagNum, int objectType, long instance) { + public static BACnetContextTagObjectIdentifier createBACnetContextTagObjectIdentifier(byte tagNum, short objectType, int instance) { BACnetTagHeader header = new BACnetTagHeader(tagNum, TagClass.CONTEXT_SPECIFIC_TAGS, (byte) 4, null, null, null, null); BACnetObjectType objectTypeEnum = BACnetObjectType.enumForValue(objectType); - int proprietaryValue = 0; + short proprietaryValue = 0; if (objectType >= 128 || !BACnetObjectType.isDefined(objectType)) { objectTypeEnum = BACnetObjectType.VENDOR_PROPRIETARY_VALUE; proprietaryValue = objectType; @@ -530,11 +531,11 @@ public static Pair createUnsignedPayload( long length; Short valueUint8 = null; Integer valueUint16 = null; - Long valueUint24 = null; + Integer valueUint24 = null; Long valueUint32 = null; - BigInteger valueUint40 = null; - BigInteger valueUint48 = null; - BigInteger valueUint56 = null; + Long valueUint40 = null; + Long valueUint48 = null; + Long valueUint56 = null; BigInteger valueUint64 = null; if (value < 0x100) { length = 1; @@ -544,7 +545,7 @@ public static Pair createUnsignedPayload( valueUint16 = (int) value; } else if (value < 0x1000000) { length = 3; - valueUint24 = value; + valueUint24 = (int) value; } else { length = 4; valueUint32 = value; diff --git a/plc4j/drivers/bacnet/src/test/java/org/apache/plc4x/java/bacnetip/RandomPackagesTest.java b/plc4j/drivers/bacnet/src/test/java/org/apache/plc4x/java/bacnetip/RandomPackagesTest.java index e2903ce2b52..643aaecce45 100644 --- a/plc4j/drivers/bacnet/src/test/java/org/apache/plc4x/java/bacnetip/RandomPackagesTest.java +++ b/plc4j/drivers/bacnet/src/test/java/org/apache/plc4x/java/bacnetip/RandomPackagesTest.java @@ -24,8 +24,6 @@ import org.apache.plc4x.java.bacnetip.readwrite.*; import org.apache.plc4x.java.spi.generation.*; import org.apache.plc4x.java.spi.utils.Serializable; -import org.apache.plc4x.java.spi.utils.ascii.AsciiBox; -import org.apache.plc4x.java.spi.utils.ascii.AsciiBoxWriter; import org.apache.plc4x.java.spi.utils.hex.Hex; import org.apache.plc4x.test.RequirePcapNg; import org.apache.plc4x.test.hex.HexDiff; @@ -288,21 +286,21 @@ Collection BACnetDeviceObjectReference() throws Exception { BACnetConstructedDataZoneMembers baCnetConstructedDataZoneMembers = (BACnetConstructedDataZoneMembers) baCnetServiceAckReadProperty.getValues(); List members = baCnetConstructedDataZoneMembers.getMembers(); - assertThat(members.get(0)).extracting(BACnetDeviceObjectReference::getObjectIdentifier).extracting("objectType", "instanceNumber").contains(BACnetObjectType.LIFE_SAFETY_ZONE, 3L); - assertThat(members.get(1)).extracting(BACnetDeviceObjectReference::getObjectIdentifier).extracting("objectType", "instanceNumber").contains(BACnetObjectType.LIFE_SAFETY_ZONE, 4L); - assertThat(members.get(2)).extracting(BACnetDeviceObjectReference::getObjectIdentifier).extracting("objectType", "instanceNumber").contains(BACnetObjectType.LIFE_SAFETY_ZONE, 5L); - assertThat(members.get(3)).extracting(BACnetDeviceObjectReference::getObjectIdentifier).extracting("objectType", "instanceNumber").contains(BACnetObjectType.LIFE_SAFETY_ZONE, 6L); - assertThat(members.get(4)).extracting(BACnetDeviceObjectReference::getObjectIdentifier).extracting("objectType", "instanceNumber").contains(BACnetObjectType.LIFE_SAFETY_ZONE, 7L); - assertThat(members.get(5)).extracting(BACnetDeviceObjectReference::getObjectIdentifier).extracting("objectType", "instanceNumber").contains(BACnetObjectType.LIFE_SAFETY_ZONE, 8L); - assertThat(members.get(6)).extracting(BACnetDeviceObjectReference::getObjectIdentifier).extracting("objectType", "instanceNumber").contains(BACnetObjectType.LIFE_SAFETY_ZONE, 9L); - assertThat(members.get(7)).extracting(BACnetDeviceObjectReference::getObjectIdentifier).extracting("objectType", "instanceNumber").contains(BACnetObjectType.LIFE_SAFETY_ZONE, 16L); - assertThat(members.get(8)).extracting(BACnetDeviceObjectReference::getObjectIdentifier).extracting("objectType", "instanceNumber").contains(BACnetObjectType.LIFE_SAFETY_ZONE, 494L); - assertThat(members.get(9)).extracting(BACnetDeviceObjectReference::getObjectIdentifier).extracting("objectType", "instanceNumber").contains(BACnetObjectType.LIFE_SAFETY_ZONE, 255L); - assertThat(members.get(10)).extracting(BACnetDeviceObjectReference::getObjectIdentifier).extracting("objectType", "instanceNumber").contains(BACnetObjectType.LIFE_SAFETY_ZONE, 231L); - assertThat(members.get(11)).extracting(BACnetDeviceObjectReference::getObjectIdentifier).extracting("objectType", "instanceNumber").contains(BACnetObjectType.LIFE_SAFETY_ZONE, 4193620L); - assertThat(members.get(12)).extracting(BACnetDeviceObjectReference::getObjectIdentifier).extracting("objectType", "instanceNumber").contains(BACnetObjectType.LIFE_SAFETY_ZONE, 222L); - assertThat(members.get(13)).extracting(BACnetDeviceObjectReference::getObjectIdentifier).extracting("objectType", "instanceNumber").contains(BACnetObjectType.LIFE_SAFETY_ZONE, 300L); - assertThat(members.get(14)).extracting(BACnetDeviceObjectReference::getObjectIdentifier).extracting("objectType", "instanceNumber").contains(BACnetObjectType.LIFE_SAFETY_ZONE, 166L); + assertThat(members.get(0)).extracting(BACnetDeviceObjectReference::getObjectIdentifier).extracting("objectType", "instanceNumber").contains(BACnetObjectType.LIFE_SAFETY_ZONE, 3); + assertThat(members.get(1)).extracting(BACnetDeviceObjectReference::getObjectIdentifier).extracting("objectType", "instanceNumber").contains(BACnetObjectType.LIFE_SAFETY_ZONE, 4); + assertThat(members.get(2)).extracting(BACnetDeviceObjectReference::getObjectIdentifier).extracting("objectType", "instanceNumber").contains(BACnetObjectType.LIFE_SAFETY_ZONE, 5); + assertThat(members.get(3)).extracting(BACnetDeviceObjectReference::getObjectIdentifier).extracting("objectType", "instanceNumber").contains(BACnetObjectType.LIFE_SAFETY_ZONE, 6); + assertThat(members.get(4)).extracting(BACnetDeviceObjectReference::getObjectIdentifier).extracting("objectType", "instanceNumber").contains(BACnetObjectType.LIFE_SAFETY_ZONE, 7); + assertThat(members.get(5)).extracting(BACnetDeviceObjectReference::getObjectIdentifier).extracting("objectType", "instanceNumber").contains(BACnetObjectType.LIFE_SAFETY_ZONE, 8); + assertThat(members.get(6)).extracting(BACnetDeviceObjectReference::getObjectIdentifier).extracting("objectType", "instanceNumber").contains(BACnetObjectType.LIFE_SAFETY_ZONE, 9); + assertThat(members.get(7)).extracting(BACnetDeviceObjectReference::getObjectIdentifier).extracting("objectType", "instanceNumber").contains(BACnetObjectType.LIFE_SAFETY_ZONE, 16); + assertThat(members.get(8)).extracting(BACnetDeviceObjectReference::getObjectIdentifier).extracting("objectType", "instanceNumber").contains(BACnetObjectType.LIFE_SAFETY_ZONE, 494); + assertThat(members.get(9)).extracting(BACnetDeviceObjectReference::getObjectIdentifier).extracting("objectType", "instanceNumber").contains(BACnetObjectType.LIFE_SAFETY_ZONE, 255); + assertThat(members.get(10)).extracting(BACnetDeviceObjectReference::getObjectIdentifier).extracting("objectType", "instanceNumber").contains(BACnetObjectType.LIFE_SAFETY_ZONE, 231); + assertThat(members.get(11)).extracting(BACnetDeviceObjectReference::getObjectIdentifier).extracting("objectType", "instanceNumber").contains(BACnetObjectType.LIFE_SAFETY_ZONE, 4193620); + assertThat(members.get(12)).extracting(BACnetDeviceObjectReference::getObjectIdentifier).extracting("objectType", "instanceNumber").contains(BACnetObjectType.LIFE_SAFETY_ZONE, 222); + assertThat(members.get(13)).extracting(BACnetDeviceObjectReference::getObjectIdentifier).extracting("objectType", "instanceNumber").contains(BACnetObjectType.LIFE_SAFETY_ZONE, 300); + assertThat(members.get(14)).extracting(BACnetDeviceObjectReference::getObjectIdentifier).extracting("objectType", "instanceNumber").contains(BACnetObjectType.LIFE_SAFETY_ZONE, 166); }), DynamicTest.dynamicTest("No. 3 - Confirmed-REQ readProperty[ 0] life-safety-zone,1 member-of", () -> { @@ -332,7 +330,7 @@ Collection BACnetDeviceObjectReference() throws Exception { BACnetConstructedDataMemberOf baCnetConstructedDataMemberOf = (BACnetConstructedDataMemberOf) baCnetServiceAckReadProperty.getValues(); List zones = baCnetConstructedDataMemberOf.getZones(); - assertThat(zones.get(0)).extracting(BACnetDeviceObjectReference::getObjectIdentifier).extracting("objectType", "instanceNumber").contains(BACnetObjectType.LIFE_SAFETY_ZONE, 1L); + assertThat(zones.get(0)).extracting(BACnetDeviceObjectReference::getObjectIdentifier).extracting("objectType", "instanceNumber").contains(BACnetObjectType.LIFE_SAFETY_ZONE, 1); }) ); } @@ -1308,7 +1306,7 @@ Collection Subordinate_List() throws Exception { NPDU npdu = ((BVLCOriginalUnicastNPDU) bvlc).getNpdu(); APDUConfirmedRequest apdu = (APDUConfirmedRequest) npdu.getApdu(); BACnetConfirmedServiceRequestReadProperty serviceRequest = (BACnetConfirmedServiceRequestReadProperty) apdu.getServiceRequest(); - assertThat(serviceRequest.getObjectIdentifier()).extracting("objectType", "instanceNumber").contains(BACnetObjectType.STRUCTURED_VIEW, 1L); + assertThat(serviceRequest.getObjectIdentifier()).extracting("objectType", "instanceNumber").contains(BACnetObjectType.STRUCTURED_VIEW, 1); assertThat(serviceRequest.getPropertyIdentifier()).extracting("value").isEqualTo(BACnetPropertyIdentifier.SUBORDINATE_LIST); }), DynamicTest.dynamicTest("No. 2 - Complex-ACK readProperty[152] structured-view,1 subordinate-list device,128 analog-input,1 device,128 analog-input,3 device,128 analog-output,1 device,128 analog-output,3", @@ -1319,41 +1317,41 @@ Collection Subordinate_List() throws Exception { APDUComplexAck apduComplexAck = (APDUComplexAck) npdu.getApdu(); BACnetServiceAckReadProperty baCnetServiceAckReadProperty = (BACnetServiceAckReadProperty) apduComplexAck.getServiceAck(); assertNotNull(baCnetServiceAckReadProperty); - assertThat(baCnetServiceAckReadProperty.getObjectIdentifier()).extracting("objectType", "instanceNumber").contains(BACnetObjectType.STRUCTURED_VIEW, 1L); + assertThat(baCnetServiceAckReadProperty.getObjectIdentifier()).extracting("objectType", "instanceNumber").contains(BACnetObjectType.STRUCTURED_VIEW, 1); assertEquals(BACnetPropertyIdentifier.SUBORDINATE_LIST, baCnetServiceAckReadProperty.getPropertyIdentifier().getValue()); List data = ((BACnetConstructedDataSubordinateList) baCnetServiceAckReadProperty.getValues()).getSubordinateList(); assertThat(data) .element(0) .extracting(BACnetDeviceObjectReference::getDeviceIdentifier) - .extracting("objectType", "instanceNumber").contains(BACnetObjectType.DEVICE, 128L); + .extracting("objectType", "instanceNumber").contains(BACnetObjectType.DEVICE, 128); assertThat(data) .element(0) .extracting(BACnetDeviceObjectReference::getObjectIdentifier) - .extracting("objectType", "instanceNumber").contains(BACnetObjectType.ANALOG_INPUT, 1L); + .extracting("objectType", "instanceNumber").contains(BACnetObjectType.ANALOG_INPUT, 1); assertThat(data) .element(1) .extracting(BACnetDeviceObjectReference::getDeviceIdentifier) - .extracting("objectType", "instanceNumber").contains(BACnetObjectType.DEVICE, 128L); + .extracting("objectType", "instanceNumber").contains(BACnetObjectType.DEVICE, 128); assertThat(data) .element(1) .extracting(BACnetDeviceObjectReference::getObjectIdentifier) - .extracting("objectType", "instanceNumber").contains(BACnetObjectType.ANALOG_INPUT, 3L); + .extracting("objectType", "instanceNumber").contains(BACnetObjectType.ANALOG_INPUT, 3); assertThat(data) .element(2) .extracting(BACnetDeviceObjectReference::getDeviceIdentifier) - .extracting("objectType", "instanceNumber").contains(BACnetObjectType.DEVICE, 128L); + .extracting("objectType", "instanceNumber").contains(BACnetObjectType.DEVICE, 128); assertThat(data) .element(2) .extracting(BACnetDeviceObjectReference::getObjectIdentifier) - .extracting("objectType", "instanceNumber").contains(BACnetObjectType.ANALOG_OUTPUT, 1L); + .extracting("objectType", "instanceNumber").contains(BACnetObjectType.ANALOG_OUTPUT, 1); assertThat(data) .element(3) .extracting(BACnetDeviceObjectReference::getDeviceIdentifier) - .extracting("objectType", "instanceNumber").contains(BACnetObjectType.DEVICE, 128L); + .extracting("objectType", "instanceNumber").contains(BACnetObjectType.DEVICE, 128); assertThat(data) .element(3) .extracting(BACnetDeviceObjectReference::getObjectIdentifier) - .extracting("objectType", "instanceNumber").contains(BACnetObjectType.ANALOG_OUTPUT, 3L); + .extracting("objectType", "instanceNumber").contains(BACnetObjectType.ANALOG_OUTPUT, 3); }) ); } @@ -1370,7 +1368,7 @@ Collection Subordinate_List2() throws Exception { NPDU npdu = ((BVLCOriginalUnicastNPDU) bvlc).getNpdu(); APDUConfirmedRequest apdu = (APDUConfirmedRequest) npdu.getApdu(); BACnetConfirmedServiceRequestReadProperty serviceRequest = (BACnetConfirmedServiceRequestReadProperty) apdu.getServiceRequest(); - assertThat(serviceRequest.getObjectIdentifier()).extracting("objectType", "instanceNumber").contains(BACnetObjectType.STRUCTURED_VIEW, 1L); + assertThat(serviceRequest.getObjectIdentifier()).extracting("objectType", "instanceNumber").contains(BACnetObjectType.STRUCTURED_VIEW, 1); assertThat(serviceRequest.getPropertyIdentifier()).extracting("value").isEqualTo(BACnetPropertyIdentifier.SUBORDINATE_LIST); }), DynamicTest.dynamicTest("No. 2 - Complex-ACK readProperty[143] structured-view,1 subordinate-list device,4000 analog-input,1 analog-value,1 binary-input,1 binary-value,1", @@ -1381,14 +1379,14 @@ Collection Subordinate_List2() throws Exception { APDUComplexAck apduComplexAck = (APDUComplexAck) npdu.getApdu(); BACnetServiceAckReadProperty baCnetServiceAckReadProperty = (BACnetServiceAckReadProperty) apduComplexAck.getServiceAck(); assertNotNull(baCnetServiceAckReadProperty); - assertThat(baCnetServiceAckReadProperty.getObjectIdentifier()).extracting("objectType", "instanceNumber").contains(BACnetObjectType.STRUCTURED_VIEW, 1L); + assertThat(baCnetServiceAckReadProperty.getObjectIdentifier()).extracting("objectType", "instanceNumber").contains(BACnetObjectType.STRUCTURED_VIEW, 1); assertEquals(BACnetPropertyIdentifier.SUBORDINATE_LIST, baCnetServiceAckReadProperty.getPropertyIdentifier().getValue()); List data = ((BACnetConstructedDataSubordinateList) baCnetServiceAckReadProperty.getValues()).getSubordinateList(); - assertThat(data).element(0).extracting(BACnetDeviceObjectReference::getDeviceIdentifier).extracting("objectType", "instanceNumber").contains(BACnetObjectType.DEVICE, 4000L); - assertThat(data).element(0).extracting(BACnetDeviceObjectReference::getObjectIdentifier).extracting("objectType", "instanceNumber").contains(BACnetObjectType.ANALOG_INPUT, 1L); - assertThat(data).element(1).extracting(BACnetDeviceObjectReference::getObjectIdentifier).extracting("objectType", "instanceNumber").contains(BACnetObjectType.ANALOG_VALUE, 1L); - assertThat(data).element(2).extracting(BACnetDeviceObjectReference::getObjectIdentifier).extracting("objectType", "instanceNumber").contains(BACnetObjectType.BINARY_INPUT, 1L); - assertThat(data).element(3).extracting(BACnetDeviceObjectReference::getObjectIdentifier).extracting("objectType", "instanceNumber").contains(BACnetObjectType.BINARY_VALUE, 1L); + assertThat(data).element(0).extracting(BACnetDeviceObjectReference::getDeviceIdentifier).extracting("objectType", "instanceNumber").contains(BACnetObjectType.DEVICE, 4000); + assertThat(data).element(0).extracting(BACnetDeviceObjectReference::getObjectIdentifier).extracting("objectType", "instanceNumber").contains(BACnetObjectType.ANALOG_INPUT, 1); + assertThat(data).element(1).extracting(BACnetDeviceObjectReference::getObjectIdentifier).extracting("objectType", "instanceNumber").contains(BACnetObjectType.ANALOG_VALUE, 1); + assertThat(data).element(2).extracting(BACnetDeviceObjectReference::getObjectIdentifier).extracting("objectType", "instanceNumber").contains(BACnetObjectType.BINARY_INPUT, 1); + assertThat(data).element(3).extracting(BACnetDeviceObjectReference::getObjectIdentifier).extracting("objectType", "instanceNumber").contains(BACnetObjectType.BINARY_VALUE, 1); }), DynamicTest.dynamicTest("No. 3 - Confirmed-REQ readProperty[144] structured-view,1 subordinate-annotations", () -> { @@ -1397,7 +1395,7 @@ Collection Subordinate_List2() throws Exception { NPDU npdu = ((BVLCOriginalUnicastNPDU) bvlc).getNpdu(); APDUConfirmedRequest apdu = (APDUConfirmedRequest) npdu.getApdu(); BACnetConfirmedServiceRequestReadProperty serviceRequest = (BACnetConfirmedServiceRequestReadProperty) apdu.getServiceRequest(); - assertThat(serviceRequest.getObjectIdentifier()).extracting("objectType", "instanceNumber").contains(BACnetObjectType.STRUCTURED_VIEW, 1L); + assertThat(serviceRequest.getObjectIdentifier()).extracting("objectType", "instanceNumber").contains(BACnetObjectType.STRUCTURED_VIEW, 1); assertThat(serviceRequest.getPropertyIdentifier()).extracting("value").isEqualTo(BACnetPropertyIdentifier.SUBORDINATE_ANNOTATIONS); }), DynamicTest.dynamicTest("No. 4 - Complex-ACK readProperty[144] structured-view,1 subordinate-annotations", @@ -1408,7 +1406,7 @@ Collection Subordinate_List2() throws Exception { APDUComplexAck apduComplexAck = (APDUComplexAck) npdu.getApdu(); BACnetServiceAckReadProperty baCnetServiceAckReadProperty = (BACnetServiceAckReadProperty) apduComplexAck.getServiceAck(); assertNotNull(baCnetServiceAckReadProperty); - assertThat(baCnetServiceAckReadProperty.getObjectIdentifier()).extracting("objectType", "instanceNumber").contains(BACnetObjectType.STRUCTURED_VIEW, 1L); + assertThat(baCnetServiceAckReadProperty.getObjectIdentifier()).extracting("objectType", "instanceNumber").contains(BACnetObjectType.STRUCTURED_VIEW, 1); assertEquals(BACnetPropertyIdentifier.SUBORDINATE_ANNOTATIONS, baCnetServiceAckReadProperty.getPropertyIdentifier().getValue()); List data = ((BACnetConstructedDataSubordinateAnnotations) baCnetServiceAckReadProperty.getValues()).getSubordinateAnnotations(); assertThat(data.get(0)).extracting("value").isEqualTo("Subordinate 1"); @@ -1694,7 +1692,7 @@ Collection WireSharkError_ArrayIndex() throws Exception { assertThat(serviceRequest.getObjectIdentifier()) .extracting(BACnetContextTagObjectIdentifier::getPayload) .extracting(BACnetTagPayloadObjectIdentifier::getObjectType, BACnetTagPayloadObjectIdentifier::getInstanceNumber) - .contains(BACnetObjectType.SCHEDULE, 1L); + .contains(BACnetObjectType.SCHEDULE, 1); assertThat(serviceRequest.getPropertyIdentifier()) .extracting(BACnetPropertyIdentifierTagged::getValue) .isEqualTo(BACnetPropertyIdentifier.EXCEPTION_SCHEDULE); @@ -1714,7 +1712,7 @@ Collection WireSharkError_ArrayIndex() throws Exception { assertThat(baCnetServiceAckReadProperty.getObjectIdentifier()) .extracting(BACnetContextTagObjectIdentifier::getPayload) .extracting(BACnetTagPayloadObjectIdentifier::getObjectType, BACnetTagPayloadObjectIdentifier::getInstanceNumber) - .contains(BACnetObjectType.SCHEDULE, 1L); + .contains(BACnetObjectType.SCHEDULE, 1); assertEquals(BACnetPropertyIdentifier.EXCEPTION_SCHEDULE, baCnetServiceAckReadProperty.getPropertyIdentifier().getValue()); List data = ((BACnetConstructedDataUnspecified) baCnetServiceAckReadProperty.getValues()).getData(); assertThat(data.get(0).getApplicationTag()).extracting("payload").extracting("actualValue").isEqualTo(BigInteger.ZERO); @@ -1760,7 +1758,7 @@ Collection action_list() throws Exception { assertThat(baCnetConfirmedServiceRequestReadProperty) .extracting(BACnetConfirmedServiceRequestReadProperty::getObjectIdentifier) .extracting(BACnetContextTagObjectIdentifier::getObjectType, BACnetContextTagObjectIdentifier::getInstanceNumber) - .containsExactly(BACnetObjectType.COMMAND, 1L); + .containsExactly(BACnetObjectType.COMMAND, 1); assertThat(baCnetConfirmedServiceRequestReadProperty) .extracting(BACnetConfirmedServiceRequestReadProperty::getPropertyIdentifier) .extracting(BACnetPropertyIdentifierTagged::getValue) @@ -1782,7 +1780,7 @@ Collection action_list() throws Exception { .satisfies(baCnetServiceAckReadProperty -> { assertThat(baCnetServiceAckReadProperty.getObjectIdentifier()) .extracting(BACnetContextTagObjectIdentifier::getObjectType, BACnetContextTagObjectIdentifier::getInstanceNumber) - .contains(BACnetObjectType.COMMAND, 1L); + .contains(BACnetObjectType.COMMAND, 1); assertThat(baCnetServiceAckReadProperty.getPropertyIdentifier()) .extracting(BACnetPropertyIdentifierTagged::getValue) .isEqualTo(BACnetPropertyIdentifier.ACTION); @@ -1935,7 +1933,7 @@ Collection alerton_plugfest_2() throws Exception { assertThat(baCnetServiceAckReadProperty) .extracting(BACnetServiceAckReadProperty::getObjectIdentifier) .extracting(BACnetContextTagObjectIdentifier::getObjectType, BACnetContextTagObjectIdentifier::getInstanceNumber) - .containsExactly(BACnetObjectType.DEVICE, 42222L); + .containsExactly(BACnetObjectType.DEVICE, 42222); assertThat(baCnetServiceAckReadProperty) .extracting(BACnetServiceAckReadProperty::getPropertyIdentifier) .extracting(BACnetPropertyIdentifierTagged::getValue) @@ -2292,11 +2290,11 @@ Collection bo_command_failure_original() throws Exception { assertThat(baCnetUnconfirmedServiceRequestUnconfirmedCOVNotification) .extracting(BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification::getInitiatingDeviceIdentifier) .extracting(BACnetContextTagObjectIdentifier::getObjectType, BACnetContextTagObjectIdentifier::getInstanceNumber) - .containsExactly(BACnetObjectType.DEVICE, 1L); + .containsExactly(BACnetObjectType.DEVICE, 1); assertThat(baCnetUnconfirmedServiceRequestUnconfirmedCOVNotification) .extracting(BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification::getMonitoredObjectIdentifier) .extracting(BACnetContextTagObjectIdentifier::getObjectType, BACnetContextTagObjectIdentifier::getInstanceNumber) - .containsExactly(BACnetObjectType.ACCUMULATOR, 21L); + .containsExactly(BACnetObjectType.ACCUMULATOR, 21); assertThat(baCnetUnconfirmedServiceRequestUnconfirmedCOVNotification) .extracting(BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification::getLifetimeInSeconds) .extracting(BACnetContextTagUnsignedInteger::getPayload) @@ -2350,11 +2348,11 @@ Collection bo_command_failure_original() throws Exception { assertThat(baCnetUnconfirmedServiceRequestUnconfirmedCOVNotification) .extracting(BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification::getInitiatingDeviceIdentifier) .extracting(BACnetContextTagObjectIdentifier::getObjectType, BACnetContextTagObjectIdentifier::getInstanceNumber) - .containsExactly(BACnetObjectType.DEVICE, 1L); + .containsExactly(BACnetObjectType.DEVICE, 1); assertThat(baCnetUnconfirmedServiceRequestUnconfirmedCOVNotification) .extracting(BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification::getMonitoredObjectIdentifier) .extracting(BACnetContextTagObjectIdentifier::getObjectType, BACnetContextTagObjectIdentifier::getInstanceNumber) - .containsExactly(BACnetObjectType.ACCUMULATOR, 22L); + .containsExactly(BACnetObjectType.ACCUMULATOR, 22); assertThat(baCnetUnconfirmedServiceRequestUnconfirmedCOVNotification) .extracting(BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification::getLifetimeInSeconds) .extracting(BACnetContextTagUnsignedInteger::getPayload) @@ -2406,11 +2404,11 @@ Collection bo_command_failure_original() throws Exception { assertThat(baCnetUnconfirmedServiceRequestUnconfirmedCOVNotification) .extracting(BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification::getInitiatingDeviceIdentifier) .extracting(BACnetContextTagObjectIdentifier::getObjectType, BACnetContextTagObjectIdentifier::getInstanceNumber) - .containsExactly(BACnetObjectType.DEVICE, 1L); + .containsExactly(BACnetObjectType.DEVICE, 1); assertThat(baCnetUnconfirmedServiceRequestUnconfirmedCOVNotification) .extracting(BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification::getMonitoredObjectIdentifier) .extracting(BACnetContextTagObjectIdentifier::getObjectType, BACnetContextTagObjectIdentifier::getInstanceNumber) - .containsExactly(BACnetObjectType.BINARY_INPUT, 217L); + .containsExactly(BACnetObjectType.BINARY_INPUT, 217); assertThat(baCnetUnconfirmedServiceRequestUnconfirmedCOVNotification) .extracting(BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification::getLifetimeInSeconds) .extracting(BACnetContextTagUnsignedInteger::getPayload) @@ -2460,11 +2458,11 @@ Collection bo_command_failure_original() throws Exception { assertThat(baCnetUnconfirmedServiceRequestUnconfirmedCOVNotification) .extracting(BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification::getInitiatingDeviceIdentifier) .extracting(BACnetContextTagObjectIdentifier::getObjectType, BACnetContextTagObjectIdentifier::getInstanceNumber) - .containsExactly(BACnetObjectType.DEVICE, 1L); + .containsExactly(BACnetObjectType.DEVICE, 1); assertThat(baCnetUnconfirmedServiceRequestUnconfirmedCOVNotification) .extracting(BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification::getMonitoredObjectIdentifier) .extracting(BACnetContextTagObjectIdentifier::getObjectType, BACnetContextTagObjectIdentifier::getInstanceNumber) - .containsExactly(BACnetObjectType.ACCUMULATOR, 21L); + .containsExactly(BACnetObjectType.ACCUMULATOR, 21); assertThat(baCnetUnconfirmedServiceRequestUnconfirmedCOVNotification) .extracting(BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification::getLifetimeInSeconds) .extracting(BACnetContextTagUnsignedInteger::getPayload) @@ -2516,11 +2514,11 @@ Collection bo_command_failure_original() throws Exception { assertThat(baCnetUnconfirmedServiceRequestUnconfirmedCOVNotification) .extracting(BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification::getInitiatingDeviceIdentifier) .extracting(BACnetContextTagObjectIdentifier::getObjectType, BACnetContextTagObjectIdentifier::getInstanceNumber) - .containsExactly(BACnetObjectType.DEVICE, 1L); + .containsExactly(BACnetObjectType.DEVICE, 1); assertThat(baCnetUnconfirmedServiceRequestUnconfirmedCOVNotification) .extracting(BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification::getMonitoredObjectIdentifier) .extracting(BACnetContextTagObjectIdentifier::getObjectType, BACnetContextTagObjectIdentifier::getInstanceNumber) - .containsExactly(BACnetObjectType.BINARY_INPUT, 217L); + .containsExactly(BACnetObjectType.BINARY_INPUT, 217); assertThat(baCnetUnconfirmedServiceRequestUnconfirmedCOVNotification) .extracting(BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification::getLifetimeInSeconds) .extracting(BACnetContextTagUnsignedInteger::getPayload) @@ -2570,11 +2568,11 @@ Collection bo_command_failure_original() throws Exception { assertThat(baCnetUnconfirmedServiceRequestUnconfirmedCOVNotification) .extracting(BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification::getInitiatingDeviceIdentifier) .extracting(BACnetContextTagObjectIdentifier::getObjectType, BACnetContextTagObjectIdentifier::getInstanceNumber) - .containsExactly(BACnetObjectType.DEVICE, 1L); + .containsExactly(BACnetObjectType.DEVICE, 1); assertThat(baCnetUnconfirmedServiceRequestUnconfirmedCOVNotification) .extracting(BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification::getMonitoredObjectIdentifier) .extracting(BACnetContextTagObjectIdentifier::getObjectType, BACnetContextTagObjectIdentifier::getInstanceNumber) - .containsExactly(BACnetObjectType.BINARY_OUTPUT, 1L); + .containsExactly(BACnetObjectType.BINARY_OUTPUT, 1); assertThat(baCnetUnconfirmedServiceRequestUnconfirmedCOVNotification) .extracting(BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification::getLifetimeInSeconds) .extracting(BACnetContextTagUnsignedInteger::getPayload) @@ -2625,11 +2623,11 @@ Collection bo_command_failure_original() throws Exception { assertThat(baCnetUnconfirmedServiceRequestUnconfirmedEventNotification) .extracting(BACnetUnconfirmedServiceRequestUnconfirmedEventNotification::getInitiatingDeviceIdentifier) .extracting(BACnetContextTagObjectIdentifier::getObjectType, BACnetContextTagObjectIdentifier::getInstanceNumber) - .containsExactly(BACnetObjectType.DEVICE, 1L); + .containsExactly(BACnetObjectType.DEVICE, 1); assertThat(baCnetUnconfirmedServiceRequestUnconfirmedEventNotification) .extracting(BACnetUnconfirmedServiceRequestUnconfirmedEventNotification::getEventObjectIdentifier) .extracting(BACnetContextTagObjectIdentifier::getObjectType, BACnetContextTagObjectIdentifier::getInstanceNumber) - .containsExactly(BACnetObjectType.BINARY_OUTPUT, 1L); + .containsExactly(BACnetObjectType.BINARY_OUTPUT, 1); assertThat(baCnetUnconfirmedServiceRequestUnconfirmedEventNotification) .extracting(BACnetUnconfirmedServiceRequestUnconfirmedEventNotification::getTimestamp) .extracting(BACnetTimeStampEnclosed::getTimestamp) @@ -2733,11 +2731,11 @@ Collection bo_command_failure_original() throws Exception { assertThat(baCnetUnconfirmedServiceRequestUnconfirmedCOVNotification) .extracting(BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification::getInitiatingDeviceIdentifier) .extracting(BACnetContextTagObjectIdentifier::getObjectType, BACnetContextTagObjectIdentifier::getInstanceNumber) - .containsExactly(BACnetObjectType.DEVICE, 1L); + .containsExactly(BACnetObjectType.DEVICE, 1); assertThat(baCnetUnconfirmedServiceRequestUnconfirmedCOVNotification) .extracting(BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification::getMonitoredObjectIdentifier) .extracting(BACnetContextTagObjectIdentifier::getObjectType, BACnetContextTagObjectIdentifier::getInstanceNumber) - .containsExactly(BACnetObjectType.ACCUMULATOR, 22L); + .containsExactly(BACnetObjectType.ACCUMULATOR, 22); assertThat(baCnetUnconfirmedServiceRequestUnconfirmedCOVNotification) .extracting(BACnetUnconfirmedServiceRequestUnconfirmedCOVNotification::getLifetimeInSeconds) .extracting(BACnetContextTagUnsignedInteger::getPayload) @@ -2967,7 +2965,7 @@ Collection eventTimeStamp_rp() throws Exception { assertThat(baCnetConfirmedServiceRequestReadProperty) .extracting(BACnetConfirmedServiceRequestReadProperty::getObjectIdentifier) .extracting(BACnetContextTagObjectIdentifier::getObjectType, BACnetContextTagObjectIdentifier::getInstanceNumber) - .containsExactly(BACnetObjectType.LOAD_CONTROL, 1L); + .containsExactly(BACnetObjectType.LOAD_CONTROL, 1); assertThat(baCnetConfirmedServiceRequestReadProperty) .extracting(BACnetConfirmedServiceRequestReadProperty::getPropertyIdentifier) .extracting(BACnetPropertyIdentifierTagged::getValue) @@ -2988,7 +2986,7 @@ Collection eventTimeStamp_rp() throws Exception { assertThat(baCnetServiceAckReadProperty) .extracting(BACnetServiceAckReadProperty::getObjectIdentifier) .extracting(BACnetContextTagObjectIdentifier::getObjectType, BACnetContextTagObjectIdentifier::getInstanceNumber) - .containsExactly(BACnetObjectType.LOAD_CONTROL, 1L); + .containsExactly(BACnetObjectType.LOAD_CONTROL, 1); assertThat(baCnetServiceAckReadProperty) .extracting(BACnetServiceAckReadProperty::getPropertyIdentifier) .extracting(BACnetPropertyIdentifierTagged::getValue) @@ -3572,7 +3570,7 @@ Collection read_file_segments() throws Exception { assertThat(baCnetConfirmedServiceRequestAtomicReadFile) .extracting(BACnetConfirmedServiceRequestAtomicReadFile::getFileIdentifier) .extracting(BACnetApplicationTagObjectIdentifier::getObjectType, BACnetApplicationTagObjectIdentifier::getInstanceNumber) - .containsExactly(BACnetObjectType.FILE, 1L); + .containsExactly(BACnetObjectType.FILE, 1); assertThat(baCnetConfirmedServiceRequestAtomicReadFile) .extracting(BACnetConfirmedServiceRequestAtomicReadFile::getAccessMethod) .asInstanceOf(InstanceOfAssertFactories.type(BACnetConfirmedServiceRequestAtomicReadFileStream.class)) @@ -3588,7 +3586,7 @@ Collection read_file_segments() throws Exception { .asInstanceOf(InstanceOfAssertFactories.type(BACnetApplicationTagUnsignedInteger.class)) .extracting(BACnetApplicationTagUnsignedInteger::getPayload) .extracting(BACnetTagPayloadUnsignedInteger::getActualValue) - .isEqualTo(BigInteger.valueOf(2048L)); + .isEqualTo(BigInteger.valueOf(2048)); }); })), DynamicTest.dynamicTest("No. 4 - Complex-ACK atomicReadFile[195] (Message fragment 0)", diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/AccessControlCommandTypeContainer.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/AccessControlCommandTypeContainer.java index 9f49de27ca0..11a59a0645f 100644 --- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/AccessControlCommandTypeContainer.java +++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/AccessControlCommandTypeContainer.java @@ -28,352 +28,352 @@ public enum AccessControlCommandTypeContainer { AccessControlCommandCloseAccessPoint( (short) 0x02, - (short) 2, + (byte) 2, AccessControlCommandType.CLOSE_ACCESS_POINT, AccessControlCategory.SYSTEM_REQUEST), AccessControlCommandLockAccessPoint( (short) 0x0A, - (short) 2, + (byte) 2, AccessControlCommandType.LOCK_ACCESS_POINT, AccessControlCategory.SYSTEM_REQUEST), AccessControlCommandAccessPointLeftOpen( (short) 0x12, - (short) 2, + (byte) 2, AccessControlCommandType.ACCESS_POINT_LEFT_OPEN, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandAccessPointForcedOpen( (short) 0x1A, - (short) 2, + (byte) 2, AccessControlCommandType.ACCESS_POINT_FORCED_OPEN, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandAccessPointClosed( (short) 0x22, - (short) 2, + (byte) 2, AccessControlCommandType.ACCESS_POINT_CLOSED, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandRequestToExit( (short) 0x32, - (short) 2, + (byte) 2, AccessControlCommandType.REQUEST_TO_EXIT, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandValidAccessRequest_0Bytes( (short) 0xA0, - (short) 0, + (byte) 0, AccessControlCommandType.VALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandValidAccessRequest_1Bytes( (short) 0xA1, - (short) 1, + (byte) 1, AccessControlCommandType.VALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandValidAccessRequest_2Bytes( (short) 0xA2, - (short) 2, + (byte) 2, AccessControlCommandType.VALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandValidAccessRequest_3Bytes( (short) 0xA3, - (short) 3, + (byte) 3, AccessControlCommandType.VALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandValidAccessRequest_4Bytes( (short) 0xA4, - (short) 4, + (byte) 4, AccessControlCommandType.VALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandValidAccessRequest_5Bytes( (short) 0xA5, - (short) 5, + (byte) 5, AccessControlCommandType.VALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandValidAccessRequest_6Bytes( (short) 0xA6, - (short) 6, + (byte) 6, AccessControlCommandType.VALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandValidAccessRequest_7Bytes( (short) 0xA7, - (short) 7, + (byte) 7, AccessControlCommandType.VALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandValidAccessRequest_8Bytes( (short) 0xA8, - (short) 8, + (byte) 8, AccessControlCommandType.VALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandValidAccessRequest_9Bytes( (short) 0xA9, - (short) 9, + (byte) 9, AccessControlCommandType.VALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandValidAccessRequest_10Bytes( (short) 0xAA, - (short) 10, + (byte) 10, AccessControlCommandType.VALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandValidAccessRequest_11Bytes( (short) 0xAB, - (short) 11, + (byte) 11, AccessControlCommandType.VALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandValidAccessRequest_12Bytes( (short) 0xAC, - (short) 12, + (byte) 12, AccessControlCommandType.VALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandValidAccessRequest_13Bytes( (short) 0xAD, - (short) 13, + (byte) 13, AccessControlCommandType.VALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandValidAccessRequest_14Bytes( (short) 0xAE, - (short) 14, + (byte) 14, AccessControlCommandType.VALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandValidAccessRequest_15Bytes( (short) 0xAF, - (short) 15, + (byte) 15, AccessControlCommandType.VALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandValidAccessRequest_16Bytes( (short) 0xB0, - (short) 16, + (byte) 16, AccessControlCommandType.VALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandValidAccessRequest_17Bytes( (short) 0xB1, - (short) 17, + (byte) 17, AccessControlCommandType.VALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandValidAccessRequest_18Bytes( (short) 0xB2, - (short) 18, + (byte) 18, AccessControlCommandType.VALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandValidAccessRequest_19Bytes( (short) 0xB3, - (short) 19, + (byte) 19, AccessControlCommandType.VALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandValidAccessRequest_20Bytes( (short) 0xB4, - (short) 20, + (byte) 20, AccessControlCommandType.VALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandValidAccessRequest_21Bytes( (short) 0xB5, - (short) 21, + (byte) 21, AccessControlCommandType.VALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandValidAccessRequest_22Bytes( (short) 0xB6, - (short) 22, + (byte) 22, AccessControlCommandType.VALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandValidAccessRequest_23Bytes( (short) 0xB7, - (short) 23, + (byte) 23, AccessControlCommandType.VALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandValidAccessRequest_24Bytes( (short) 0xB8, - (short) 24, + (byte) 24, AccessControlCommandType.VALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandValidAccessRequest_25Bytes( (short) 0xB9, - (short) 25, + (byte) 25, AccessControlCommandType.VALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandValidAccessRequest_26Bytes( (short) 0xBA, - (short) 26, + (byte) 26, AccessControlCommandType.VALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandValidAccessRequest_27Bytes( (short) 0xBB, - (short) 27, + (byte) 27, AccessControlCommandType.VALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandValidAccessRequest_28Bytes( (short) 0xBC, - (short) 28, + (byte) 28, AccessControlCommandType.VALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandValidAccessRequest_29Bytes( (short) 0xBD, - (short) 29, + (byte) 29, AccessControlCommandType.VALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandValidAccessRequest_30Bytes( (short) 0xBE, - (short) 30, + (byte) 30, AccessControlCommandType.VALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandValidAccessRequest_31Bytes( (short) 0xBF, - (short) 31, + (byte) 31, AccessControlCommandType.VALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandInvalidAccessRequest_0Bytes( (short) 0xC0, - (short) 0, + (byte) 0, AccessControlCommandType.INVALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandInvalidAccessRequest_1Bytes( (short) 0xC1, - (short) 1, + (byte) 1, AccessControlCommandType.INVALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandInvalidAccessRequest_2Bytes( (short) 0xC2, - (short) 2, + (byte) 2, AccessControlCommandType.INVALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandInvalidAccessRequest_3Bytes( (short) 0xC3, - (short) 3, + (byte) 3, AccessControlCommandType.INVALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandInvalidAccessRequest_4Bytes( (short) 0xC4, - (short) 4, + (byte) 4, AccessControlCommandType.INVALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandInvalidAccessRequest_5Bytes( (short) 0xC5, - (short) 5, + (byte) 5, AccessControlCommandType.INVALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandInvalidAccessRequest_6Bytes( (short) 0xC6, - (short) 6, + (byte) 6, AccessControlCommandType.INVALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandInvalidAccessRequest_7Bytes( (short) 0xC7, - (short) 7, + (byte) 7, AccessControlCommandType.INVALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandInvalidAccessRequest_8Bytes( (short) 0xC8, - (short) 8, + (byte) 8, AccessControlCommandType.INVALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandInvalidAccessRequest_9Bytes( (short) 0xC9, - (short) 9, + (byte) 9, AccessControlCommandType.INVALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandInvalidAccessRequest_10Bytes( (short) 0xCA, - (short) 10, + (byte) 10, AccessControlCommandType.INVALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandInvalidAccessRequest_11Bytes( (short) 0xCB, - (short) 11, + (byte) 11, AccessControlCommandType.INVALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandInvalidAccessRequest_12Bytes( (short) 0xCC, - (short) 12, + (byte) 12, AccessControlCommandType.INVALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandInvalidAccessRequest_13Bytes( (short) 0xCD, - (short) 13, + (byte) 13, AccessControlCommandType.INVALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandInvalidAccessRequest_14Bytes( (short) 0xCE, - (short) 14, + (byte) 14, AccessControlCommandType.INVALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandInvalidAccessRequest_15Bytes( (short) 0xCF, - (short) 15, + (byte) 15, AccessControlCommandType.INVALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandInvalidAccessRequest_16Bytes( (short) 0xD0, - (short) 16, + (byte) 16, AccessControlCommandType.INVALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandInvalidAccessRequest_17Bytes( (short) 0xD1, - (short) 17, + (byte) 17, AccessControlCommandType.INVALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandInvalidAccessRequest_18Bytes( (short) 0xD2, - (short) 18, + (byte) 18, AccessControlCommandType.INVALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandInvalidAccessRequest_19Bytes( (short) 0xD3, - (short) 19, + (byte) 19, AccessControlCommandType.INVALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandInvalidAccessRequest_20Bytes( (short) 0xD4, - (short) 20, + (byte) 20, AccessControlCommandType.INVALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandInvalidAccessRequest_21Bytes( (short) 0xD5, - (short) 21, + (byte) 21, AccessControlCommandType.INVALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandInvalidAccessRequest_22Bytes( (short) 0xD6, - (short) 22, + (byte) 22, AccessControlCommandType.INVALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandInvalidAccessRequest_23Bytes( (short) 0xD7, - (short) 23, + (byte) 23, AccessControlCommandType.INVALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandInvalidAccessRequest_24Bytes( (short) 0xD8, - (short) 24, + (byte) 24, AccessControlCommandType.INVALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandInvalidAccessRequest_25Bytes( (short) 0xD9, - (short) 25, + (byte) 25, AccessControlCommandType.INVALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandInvalidAccessRequest_26Bytes( (short) 0xDA, - (short) 26, + (byte) 26, AccessControlCommandType.INVALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandInvalidAccessRequest_27Bytes( (short) 0xDB, - (short) 27, + (byte) 27, AccessControlCommandType.INVALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandInvalidAccessRequest_28Bytes( (short) 0xDC, - (short) 28, + (byte) 28, AccessControlCommandType.INVALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandInvalidAccessRequest_29Bytes( (short) 0xDD, - (short) 29, + (byte) 29, AccessControlCommandType.INVALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandInvalidAccessRequest_30Bytes( (short) 0xDE, - (short) 30, + (byte) 30, AccessControlCommandType.INVALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY), AccessControlCommandInvalidAccessRequest_31Bytes( (short) 0xDF, - (short) 31, + (byte) 31, AccessControlCommandType.INVALID_ACCESS, AccessControlCategory.SYSTEM_ACTIVITY); private static final Map map; @@ -386,13 +386,13 @@ public enum AccessControlCommandTypeContainer { } private final short value; - private final short numBytes; + private final byte numBytes; private final AccessControlCommandType commandType; private final AccessControlCategory category; AccessControlCommandTypeContainer( short value, - short numBytes, + byte numBytes, AccessControlCommandType commandType, AccessControlCategory category) { this.value = value; @@ -405,11 +405,11 @@ public short getValue() { return value; } - public short getNumBytes() { + public byte getNumBytes() { return numBytes; } - public static AccessControlCommandTypeContainer firstEnumForFieldNumBytes(short fieldValue) { + public static AccessControlCommandTypeContainer firstEnumForFieldNumBytes(byte fieldValue) { for (AccessControlCommandTypeContainer _val : AccessControlCommandTypeContainer.values()) { if (_val.getNumBytes() == fieldValue) { return _val; @@ -418,7 +418,7 @@ public static AccessControlCommandTypeContainer firstEnumForFieldNumBytes(short return null; } - public static List enumsForFieldNumBytes(short fieldValue) { + public static List enumsForFieldNumBytes(byte fieldValue) { List _values = new ArrayList<>(); for (AccessControlCommandTypeContainer _val : AccessControlCommandTypeContainer.values()) { if (_val.getNumBytes() == fieldValue) { diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/AirConditioningCommandTypeContainer.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/AirConditioningCommandTypeContainer.java index 5d0d1d7209d..b9e87731df4 100644 --- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/AirConditioningCommandTypeContainer.java +++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/AirConditioningCommandTypeContainer.java @@ -27,42 +27,42 @@ public enum AirConditioningCommandTypeContainer { AirConditioningCommandSetZoneGroupOff( - (short) 0x01, (short) 1, AirConditioningCommandType.SET_ZONE_GROUP_OFF), + (short) 0x01, (byte) 1, AirConditioningCommandType.SET_ZONE_GROUP_OFF), AirConditioningCommandZoneHvacPlantStatus( - (short) 0x05, (short) 5, AirConditioningCommandType.ZONE_HVAC_PLANT_STATUS), + (short) 0x05, (byte) 5, AirConditioningCommandType.ZONE_HVAC_PLANT_STATUS), AirConditioningCommandZoneHumidityPlantStatus( - (short) 0x0D, (short) 5, AirConditioningCommandType.ZONE_HUMIDITY_PLANT_STATUS), + (short) 0x0D, (byte) 5, AirConditioningCommandType.ZONE_HUMIDITY_PLANT_STATUS), AirConditioningCommandZoneTemperature( - (short) 0x15, (short) 5, AirConditioningCommandType.ZONE_TEMPERATURE), + (short) 0x15, (byte) 5, AirConditioningCommandType.ZONE_TEMPERATURE), AirConditioningCommandZoneHumidity( - (short) 0x1D, (short) 5, AirConditioningCommandType.ZONE_HUMIDITY), - AirConditioningCommandRefresh((short) 0x21, (short) 1, AirConditioningCommandType.REFRESH), + (short) 0x1D, (byte) 5, AirConditioningCommandType.ZONE_HUMIDITY), + AirConditioningCommandRefresh((short) 0x21, (byte) 1, AirConditioningCommandType.REFRESH), AirConditioningCommandSetZoneHvacMode( - (short) 0x2F, (short) 7, AirConditioningCommandType.SET_ZONE_HVAC_MODE), + (short) 0x2F, (byte) 7, AirConditioningCommandType.SET_ZONE_HVAC_MODE), AirConditioningCommandSetPlantHvacLevel( - (short) 0x36, (short) 6, AirConditioningCommandType.SET_PLANT_HVAC_LEVEL), + (short) 0x36, (byte) 6, AirConditioningCommandType.SET_PLANT_HVAC_LEVEL), AirConditioningCommandSetZoneHumidityMode( - (short) 0x47, (short) 7, AirConditioningCommandType.SET_ZONE_HUMIDITY_MODE), + (short) 0x47, (byte) 7, AirConditioningCommandType.SET_ZONE_HUMIDITY_MODE), AirConditioningCommandSetPlantHumidityLevel( - (short) 0x4E, (short) 6, AirConditioningCommandType.SET_PLANT_HUMIDITY_LEVEL), + (short) 0x4E, (byte) 6, AirConditioningCommandType.SET_PLANT_HUMIDITY_LEVEL), AirConditioningCommandSetHvacUpperGuardLimit( - (short) 0x55, (short) 5, AirConditioningCommandType.SET_HVAC_UPPER_GUARD_LIMIT), + (short) 0x55, (byte) 5, AirConditioningCommandType.SET_HVAC_UPPER_GUARD_LIMIT), AirConditioningCommandSetHvacLowerGuardLimit( - (short) 0x5D, (short) 5, AirConditioningCommandType.SET_HVAC_LOWER_GUARD_LIMIT), + (short) 0x5D, (byte) 5, AirConditioningCommandType.SET_HVAC_LOWER_GUARD_LIMIT), AirConditioningCommandSetHvacSetbackLimit( - (short) 0x65, (short) 5, AirConditioningCommandType.SET_HVAC_SETBACK_LIMIT), + (short) 0x65, (byte) 5, AirConditioningCommandType.SET_HVAC_SETBACK_LIMIT), AirConditioningCommandSetHumidityUpperGuardLimit( - (short) 0x6D, (short) 5, AirConditioningCommandType.SET_HUMIDITY_UPPER_GUARD_LIMIT), + (short) 0x6D, (byte) 5, AirConditioningCommandType.SET_HUMIDITY_UPPER_GUARD_LIMIT), AirConditioningCommandSetHumidityLowerGuardLimit( - (short) 0x75, (short) 5, AirConditioningCommandType.SET_HUMIDITY_LOWER_GUARD_LIMIT), + (short) 0x75, (byte) 5, AirConditioningCommandType.SET_HUMIDITY_LOWER_GUARD_LIMIT), AirConditioningCommandSetZoneGroupOn( - (short) 0x79, (short) 1, AirConditioningCommandType.SET_ZONE_GROUP_ON), + (short) 0x79, (byte) 1, AirConditioningCommandType.SET_ZONE_GROUP_ON), AirConditioningCommandSetHumiditySetbackLimit( - (short) 0x7D, (short) 5, AirConditioningCommandType.SET_HUMIDITY_SETBACK_LIMIT), + (short) 0x7D, (byte) 5, AirConditioningCommandType.SET_HUMIDITY_SETBACK_LIMIT), AirConditioningCommandHvacScheduleEntry( - (short) 0x89, (short) 9, AirConditioningCommandType.HVAC_SCHEDULE_ENTRY), + (short) 0x89, (byte) 9, AirConditioningCommandType.HVAC_SCHEDULE_ENTRY), AirConditioningCommandHumidityScheduleEntry( - (short) 0xA9, (short) 9, AirConditioningCommandType.HUMIDITY_SCHEDULE_ENTRY); + (short) 0xA9, (byte) 9, AirConditioningCommandType.HUMIDITY_SCHEDULE_ENTRY); private static final Map map; static { @@ -73,11 +73,11 @@ public enum AirConditioningCommandTypeContainer { } private final short value; - private final short numBytes; + private final byte numBytes; private final AirConditioningCommandType commandType; AirConditioningCommandTypeContainer( - short value, short numBytes, AirConditioningCommandType commandType) { + short value, byte numBytes, AirConditioningCommandType commandType) { this.value = value; this.numBytes = numBytes; this.commandType = commandType; @@ -87,11 +87,11 @@ public short getValue() { return value; } - public short getNumBytes() { + public byte getNumBytes() { return numBytes; } - public static AirConditioningCommandTypeContainer firstEnumForFieldNumBytes(short fieldValue) { + public static AirConditioningCommandTypeContainer firstEnumForFieldNumBytes(byte fieldValue) { for (AirConditioningCommandTypeContainer _val : AirConditioningCommandTypeContainer.values()) { if (_val.getNumBytes() == fieldValue) { return _val; @@ -100,7 +100,7 @@ public static AirConditioningCommandTypeContainer firstEnumForFieldNumBytes(shor return null; } - public static List enumsForFieldNumBytes(short fieldValue) { + public static List enumsForFieldNumBytes(byte fieldValue) { List _values = new ArrayList<>(); for (AirConditioningCommandTypeContainer _val : AirConditioningCommandTypeContainer.values()) { if (_val.getNumBytes() == fieldValue) { diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALCommandTypeContainer.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALCommandTypeContainer.java index f7273c4ee39..034868328ea 100644 --- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALCommandTypeContainer.java +++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALCommandTypeContainer.java @@ -26,123 +26,123 @@ // Code generated by code-generation. DO NOT EDIT. public enum CALCommandTypeContainer { - CALCommandReset((short) 0x08, (short) 0, CALCommandType.RESET), - CALCommandRecall((short) 0x1A, (short) 2, CALCommandType.RECALL), - CALCommandIdentify((short) 0x21, (short) 1, CALCommandType.IDENTIFY), - CALCommandGetStatus((short) 0x2A, (short) 2, CALCommandType.GET_STATUS), - CALCommandAcknowledge((short) 0x32, (short) 2, CALCommandType.ACKNOWLEDGE), - CALCommandReply_0Bytes((short) 0x80, (short) 0, CALCommandType.REPLY), - CALCommandReply_1Bytes((short) 0x81, (short) 1, CALCommandType.REPLY), - CALCommandReply_2Bytes((short) 0x82, (short) 2, CALCommandType.REPLY), - CALCommandReply_3Bytes((short) 0x83, (short) 3, CALCommandType.REPLY), - CALCommandReply_4Bytes((short) 0x84, (short) 4, CALCommandType.REPLY), - CALCommandReply_5Bytes((short) 0x85, (short) 5, CALCommandType.REPLY), - CALCommandReply_6Bytes((short) 0x86, (short) 6, CALCommandType.REPLY), - CALCommandReply_7Bytes((short) 0x87, (short) 7, CALCommandType.REPLY), - CALCommandReply_8Bytes((short) 0x88, (short) 8, CALCommandType.REPLY), - CALCommandReply_9Bytes((short) 0x89, (short) 9, CALCommandType.REPLY), - CALCommandReply_10Bytes((short) 0x8A, (short) 10, CALCommandType.REPLY), - CALCommandReply_11Bytes((short) 0x8B, (short) 11, CALCommandType.REPLY), - CALCommandReply_12Bytes((short) 0x8C, (short) 12, CALCommandType.REPLY), - CALCommandReply_13Bytes((short) 0x8D, (short) 13, CALCommandType.REPLY), - CALCommandReply_14Bytes((short) 0x8E, (short) 14, CALCommandType.REPLY), - CALCommandReply_15Bytes((short) 0x8F, (short) 15, CALCommandType.REPLY), - CALCommandReply_16Bytes((short) 0x90, (short) 16, CALCommandType.REPLY), - CALCommandReply_17Bytes((short) 0x91, (short) 17, CALCommandType.REPLY), - CALCommandReply_18Bytes((short) 0x92, (short) 18, CALCommandType.REPLY), - CALCommandReply_19Bytes((short) 0x93, (short) 19, CALCommandType.REPLY), - CALCommandReply_20Bytes((short) 0x94, (short) 20, CALCommandType.REPLY), - CALCommandReply_21Bytes((short) 0x95, (short) 21, CALCommandType.REPLY), - CALCommandReply_22Bytes((short) 0x96, (short) 22, CALCommandType.REPLY), - CALCommandReply_23Bytes((short) 0x97, (short) 23, CALCommandType.REPLY), - CALCommandReply_24Bytes((short) 0x98, (short) 24, CALCommandType.REPLY), - CALCommandReply_25Bytes((short) 0x99, (short) 25, CALCommandType.REPLY), - CALCommandReply_26Bytes((short) 0x9A, (short) 26, CALCommandType.REPLY), - CALCommandReply_27Bytes((short) 0x9B, (short) 27, CALCommandType.REPLY), - CALCommandReply_28Bytes((short) 0x9C, (short) 28, CALCommandType.REPLY), - CALCommandReply_29Bytes((short) 0x9D, (short) 29, CALCommandType.REPLY), - CALCommandReply_30Bytes((short) 0x9E, (short) 30, CALCommandType.REPLY), - CALCommandReply_31Bytes((short) 0x9F, (short) 31, CALCommandType.REPLY), - CALCommandWrite_0Bytes((short) 0xA0, (short) 0, CALCommandType.WRITE), - CALCommandWrite_1Bytes((short) 0xA1, (short) 1, CALCommandType.WRITE), - CALCommandWrite_2Bytes((short) 0xA2, (short) 2, CALCommandType.WRITE), - CALCommandWrite_3Bytes((short) 0xA3, (short) 3, CALCommandType.WRITE), - CALCommandWrite_4Bytes((short) 0xA4, (short) 4, CALCommandType.WRITE), - CALCommandWrite_5Bytes((short) 0xA5, (short) 5, CALCommandType.WRITE), - CALCommandWrite_6Bytes((short) 0xA6, (short) 6, CALCommandType.WRITE), - CALCommandWrite_7Bytes((short) 0xA7, (short) 7, CALCommandType.WRITE), - CALCommandWrite_8Bytes((short) 0xA8, (short) 8, CALCommandType.WRITE), - CALCommandWrite_9Bytes((short) 0xA9, (short) 9, CALCommandType.WRITE), - CALCommandWrite_10Bytes((short) 0xAA, (short) 10, CALCommandType.WRITE), - CALCommandWrite_11Bytes((short) 0xAB, (short) 11, CALCommandType.WRITE), - CALCommandWrite_12Bytes((short) 0xAC, (short) 12, CALCommandType.WRITE), - CALCommandWrite_13Bytes((short) 0xAD, (short) 13, CALCommandType.WRITE), - CALCommandWrite_14Bytes((short) 0xAE, (short) 14, CALCommandType.WRITE), - CALCommandWrite_15Bytes((short) 0xAF, (short) 15, CALCommandType.WRITE), - CALCommandStatus_0Bytes((short) 0xC0, (short) 0, CALCommandType.STATUS), - CALCommandStatus_1Bytes((short) 0xC1, (short) 1, CALCommandType.STATUS), - CALCommandStatus_2Bytes((short) 0xC2, (short) 2, CALCommandType.STATUS), - CALCommandStatus_3Bytes((short) 0xC3, (short) 3, CALCommandType.STATUS), - CALCommandStatus_4Bytes((short) 0xC4, (short) 4, CALCommandType.STATUS), - CALCommandStatus_5Bytes((short) 0xC5, (short) 5, CALCommandType.STATUS), - CALCommandStatus_6Bytes((short) 0xC6, (short) 6, CALCommandType.STATUS), - CALCommandStatus_7Bytes((short) 0xC7, (short) 7, CALCommandType.STATUS), - CALCommandStatus_8Bytes((short) 0xC8, (short) 8, CALCommandType.STATUS), - CALCommandStatus_9Bytes((short) 0xC9, (short) 9, CALCommandType.STATUS), - CALCommandStatus_10Bytes((short) 0xCA, (short) 10, CALCommandType.STATUS), - CALCommandStatus_11Bytes((short) 0xCB, (short) 11, CALCommandType.STATUS), - CALCommandStatus_12Bytes((short) 0xCC, (short) 12, CALCommandType.STATUS), - CALCommandStatus_13Bytes((short) 0xCD, (short) 13, CALCommandType.STATUS), - CALCommandStatus_14Bytes((short) 0xCE, (short) 14, CALCommandType.STATUS), - CALCommandStatus_15Bytes((short) 0xCF, (short) 15, CALCommandType.STATUS), - CALCommandStatus_16Bytes((short) 0xD0, (short) 16, CALCommandType.STATUS), - CALCommandStatus_17Bytes((short) 0xD1, (short) 17, CALCommandType.STATUS), - CALCommandStatus_18Bytes((short) 0xD2, (short) 18, CALCommandType.STATUS), - CALCommandStatus_19Bytes((short) 0xD3, (short) 19, CALCommandType.STATUS), - CALCommandStatus_20Bytes((short) 0xD4, (short) 20, CALCommandType.STATUS), - CALCommandStatus_21Bytes((short) 0xD5, (short) 21, CALCommandType.STATUS), - CALCommandStatus_22Bytes((short) 0xD6, (short) 22, CALCommandType.STATUS), - CALCommandStatus_23Bytes((short) 0xD7, (short) 23, CALCommandType.STATUS), - CALCommandStatus_24Bytes((short) 0xD8, (short) 24, CALCommandType.STATUS), - CALCommandStatus_25Bytes((short) 0xD9, (short) 25, CALCommandType.STATUS), - CALCommandStatus_26Bytes((short) 0xDA, (short) 26, CALCommandType.STATUS), - CALCommandStatus_27Bytes((short) 0xDB, (short) 27, CALCommandType.STATUS), - CALCommandStatus_28Bytes((short) 0xDC, (short) 28, CALCommandType.STATUS), - CALCommandStatus_29Bytes((short) 0xDD, (short) 29, CALCommandType.STATUS), - CALCommandStatus_30Bytes((short) 0xDE, (short) 30, CALCommandType.STATUS), - CALCommandStatus_31Bytes((short) 0xDF, (short) 31, CALCommandType.STATUS), - CALCommandStatusExtended_0Bytes((short) 0xE0, (short) 0, CALCommandType.STATUS_EXTENDED), - CALCommandStatusExtended_1Bytes((short) 0xE1, (short) 1, CALCommandType.STATUS_EXTENDED), - CALCommandStatusExtended_2Bytes((short) 0xE2, (short) 2, CALCommandType.STATUS_EXTENDED), - CALCommandStatusExtended_3Bytes((short) 0xE3, (short) 3, CALCommandType.STATUS_EXTENDED), - CALCommandStatusExtended_4Bytes((short) 0xE4, (short) 4, CALCommandType.STATUS_EXTENDED), - CALCommandStatusExtended_5Bytes((short) 0xE5, (short) 5, CALCommandType.STATUS_EXTENDED), - CALCommandStatusExtended_6Bytes((short) 0xE6, (short) 6, CALCommandType.STATUS_EXTENDED), - CALCommandStatusExtended_7Bytes((short) 0xE7, (short) 7, CALCommandType.STATUS_EXTENDED), - CALCommandStatusExtended_8Bytes((short) 0xE8, (short) 8, CALCommandType.STATUS_EXTENDED), - CALCommandStatusExtended_9Bytes((short) 0xE9, (short) 9, CALCommandType.STATUS_EXTENDED), - CALCommandStatusExtended_10Bytes((short) 0xEA, (short) 10, CALCommandType.STATUS_EXTENDED), - CALCommandStatusExtended_11Bytes((short) 0xEB, (short) 11, CALCommandType.STATUS_EXTENDED), - CALCommandStatusExtended_12Bytes((short) 0xEC, (short) 12, CALCommandType.STATUS_EXTENDED), - CALCommandStatusExtended_13Bytes((short) 0xED, (short) 13, CALCommandType.STATUS_EXTENDED), - CALCommandStatusExtended_14Bytes((short) 0xEE, (short) 14, CALCommandType.STATUS_EXTENDED), - CALCommandStatusExtended_15Bytes((short) 0xEF, (short) 15, CALCommandType.STATUS_EXTENDED), - CALCommandStatusExtended_16Bytes((short) 0xF0, (short) 16, CALCommandType.STATUS_EXTENDED), - CALCommandStatusExtended_17Bytes((short) 0xF1, (short) 17, CALCommandType.STATUS_EXTENDED), - CALCommandStatusExtended_18Bytes((short) 0xF2, (short) 18, CALCommandType.STATUS_EXTENDED), - CALCommandStatusExtended_19Bytes((short) 0xF3, (short) 19, CALCommandType.STATUS_EXTENDED), - CALCommandStatusExtended_20Bytes((short) 0xF4, (short) 20, CALCommandType.STATUS_EXTENDED), - CALCommandStatusExtended_21Bytes((short) 0xF5, (short) 21, CALCommandType.STATUS_EXTENDED), - CALCommandStatusExtended_22Bytes((short) 0xF6, (short) 22, CALCommandType.STATUS_EXTENDED), - CALCommandStatusExtended_23Bytes((short) 0xF7, (short) 23, CALCommandType.STATUS_EXTENDED), - CALCommandStatusExtended_24Bytes((short) 0xF8, (short) 24, CALCommandType.STATUS_EXTENDED), - CALCommandStatusExtended_25Bytes((short) 0xF9, (short) 25, CALCommandType.STATUS_EXTENDED), - CALCommandStatusExtended_26Bytes((short) 0xFA, (short) 26, CALCommandType.STATUS_EXTENDED), - CALCommandStatusExtended_27Bytes((short) 0xFB, (short) 27, CALCommandType.STATUS_EXTENDED), - CALCommandStatusExtended_28Bytes((short) 0xFC, (short) 28, CALCommandType.STATUS_EXTENDED), - CALCommandStatusExtended_29Bytes((short) 0xFD, (short) 29, CALCommandType.STATUS_EXTENDED), - CALCommandStatusExtended_30Bytes((short) 0xFE, (short) 30, CALCommandType.STATUS_EXTENDED), - CALCommandStatusExtended_31Bytes((short) 0xFF, (short) 31, CALCommandType.STATUS_EXTENDED); + CALCommandReset((short) 0x08, (byte) 0, CALCommandType.RESET), + CALCommandRecall((short) 0x1A, (byte) 2, CALCommandType.RECALL), + CALCommandIdentify((short) 0x21, (byte) 1, CALCommandType.IDENTIFY), + CALCommandGetStatus((short) 0x2A, (byte) 2, CALCommandType.GET_STATUS), + CALCommandAcknowledge((short) 0x32, (byte) 2, CALCommandType.ACKNOWLEDGE), + CALCommandReply_0Bytes((short) 0x80, (byte) 0, CALCommandType.REPLY), + CALCommandReply_1Bytes((short) 0x81, (byte) 1, CALCommandType.REPLY), + CALCommandReply_2Bytes((short) 0x82, (byte) 2, CALCommandType.REPLY), + CALCommandReply_3Bytes((short) 0x83, (byte) 3, CALCommandType.REPLY), + CALCommandReply_4Bytes((short) 0x84, (byte) 4, CALCommandType.REPLY), + CALCommandReply_5Bytes((short) 0x85, (byte) 5, CALCommandType.REPLY), + CALCommandReply_6Bytes((short) 0x86, (byte) 6, CALCommandType.REPLY), + CALCommandReply_7Bytes((short) 0x87, (byte) 7, CALCommandType.REPLY), + CALCommandReply_8Bytes((short) 0x88, (byte) 8, CALCommandType.REPLY), + CALCommandReply_9Bytes((short) 0x89, (byte) 9, CALCommandType.REPLY), + CALCommandReply_10Bytes((short) 0x8A, (byte) 10, CALCommandType.REPLY), + CALCommandReply_11Bytes((short) 0x8B, (byte) 11, CALCommandType.REPLY), + CALCommandReply_12Bytes((short) 0x8C, (byte) 12, CALCommandType.REPLY), + CALCommandReply_13Bytes((short) 0x8D, (byte) 13, CALCommandType.REPLY), + CALCommandReply_14Bytes((short) 0x8E, (byte) 14, CALCommandType.REPLY), + CALCommandReply_15Bytes((short) 0x8F, (byte) 15, CALCommandType.REPLY), + CALCommandReply_16Bytes((short) 0x90, (byte) 16, CALCommandType.REPLY), + CALCommandReply_17Bytes((short) 0x91, (byte) 17, CALCommandType.REPLY), + CALCommandReply_18Bytes((short) 0x92, (byte) 18, CALCommandType.REPLY), + CALCommandReply_19Bytes((short) 0x93, (byte) 19, CALCommandType.REPLY), + CALCommandReply_20Bytes((short) 0x94, (byte) 20, CALCommandType.REPLY), + CALCommandReply_21Bytes((short) 0x95, (byte) 21, CALCommandType.REPLY), + CALCommandReply_22Bytes((short) 0x96, (byte) 22, CALCommandType.REPLY), + CALCommandReply_23Bytes((short) 0x97, (byte) 23, CALCommandType.REPLY), + CALCommandReply_24Bytes((short) 0x98, (byte) 24, CALCommandType.REPLY), + CALCommandReply_25Bytes((short) 0x99, (byte) 25, CALCommandType.REPLY), + CALCommandReply_26Bytes((short) 0x9A, (byte) 26, CALCommandType.REPLY), + CALCommandReply_27Bytes((short) 0x9B, (byte) 27, CALCommandType.REPLY), + CALCommandReply_28Bytes((short) 0x9C, (byte) 28, CALCommandType.REPLY), + CALCommandReply_29Bytes((short) 0x9D, (byte) 29, CALCommandType.REPLY), + CALCommandReply_30Bytes((short) 0x9E, (byte) 30, CALCommandType.REPLY), + CALCommandReply_31Bytes((short) 0x9F, (byte) 31, CALCommandType.REPLY), + CALCommandWrite_0Bytes((short) 0xA0, (byte) 0, CALCommandType.WRITE), + CALCommandWrite_1Bytes((short) 0xA1, (byte) 1, CALCommandType.WRITE), + CALCommandWrite_2Bytes((short) 0xA2, (byte) 2, CALCommandType.WRITE), + CALCommandWrite_3Bytes((short) 0xA3, (byte) 3, CALCommandType.WRITE), + CALCommandWrite_4Bytes((short) 0xA4, (byte) 4, CALCommandType.WRITE), + CALCommandWrite_5Bytes((short) 0xA5, (byte) 5, CALCommandType.WRITE), + CALCommandWrite_6Bytes((short) 0xA6, (byte) 6, CALCommandType.WRITE), + CALCommandWrite_7Bytes((short) 0xA7, (byte) 7, CALCommandType.WRITE), + CALCommandWrite_8Bytes((short) 0xA8, (byte) 8, CALCommandType.WRITE), + CALCommandWrite_9Bytes((short) 0xA9, (byte) 9, CALCommandType.WRITE), + CALCommandWrite_10Bytes((short) 0xAA, (byte) 10, CALCommandType.WRITE), + CALCommandWrite_11Bytes((short) 0xAB, (byte) 11, CALCommandType.WRITE), + CALCommandWrite_12Bytes((short) 0xAC, (byte) 12, CALCommandType.WRITE), + CALCommandWrite_13Bytes((short) 0xAD, (byte) 13, CALCommandType.WRITE), + CALCommandWrite_14Bytes((short) 0xAE, (byte) 14, CALCommandType.WRITE), + CALCommandWrite_15Bytes((short) 0xAF, (byte) 15, CALCommandType.WRITE), + CALCommandStatus_0Bytes((short) 0xC0, (byte) 0, CALCommandType.STATUS), + CALCommandStatus_1Bytes((short) 0xC1, (byte) 1, CALCommandType.STATUS), + CALCommandStatus_2Bytes((short) 0xC2, (byte) 2, CALCommandType.STATUS), + CALCommandStatus_3Bytes((short) 0xC3, (byte) 3, CALCommandType.STATUS), + CALCommandStatus_4Bytes((short) 0xC4, (byte) 4, CALCommandType.STATUS), + CALCommandStatus_5Bytes((short) 0xC5, (byte) 5, CALCommandType.STATUS), + CALCommandStatus_6Bytes((short) 0xC6, (byte) 6, CALCommandType.STATUS), + CALCommandStatus_7Bytes((short) 0xC7, (byte) 7, CALCommandType.STATUS), + CALCommandStatus_8Bytes((short) 0xC8, (byte) 8, CALCommandType.STATUS), + CALCommandStatus_9Bytes((short) 0xC9, (byte) 9, CALCommandType.STATUS), + CALCommandStatus_10Bytes((short) 0xCA, (byte) 10, CALCommandType.STATUS), + CALCommandStatus_11Bytes((short) 0xCB, (byte) 11, CALCommandType.STATUS), + CALCommandStatus_12Bytes((short) 0xCC, (byte) 12, CALCommandType.STATUS), + CALCommandStatus_13Bytes((short) 0xCD, (byte) 13, CALCommandType.STATUS), + CALCommandStatus_14Bytes((short) 0xCE, (byte) 14, CALCommandType.STATUS), + CALCommandStatus_15Bytes((short) 0xCF, (byte) 15, CALCommandType.STATUS), + CALCommandStatus_16Bytes((short) 0xD0, (byte) 16, CALCommandType.STATUS), + CALCommandStatus_17Bytes((short) 0xD1, (byte) 17, CALCommandType.STATUS), + CALCommandStatus_18Bytes((short) 0xD2, (byte) 18, CALCommandType.STATUS), + CALCommandStatus_19Bytes((short) 0xD3, (byte) 19, CALCommandType.STATUS), + CALCommandStatus_20Bytes((short) 0xD4, (byte) 20, CALCommandType.STATUS), + CALCommandStatus_21Bytes((short) 0xD5, (byte) 21, CALCommandType.STATUS), + CALCommandStatus_22Bytes((short) 0xD6, (byte) 22, CALCommandType.STATUS), + CALCommandStatus_23Bytes((short) 0xD7, (byte) 23, CALCommandType.STATUS), + CALCommandStatus_24Bytes((short) 0xD8, (byte) 24, CALCommandType.STATUS), + CALCommandStatus_25Bytes((short) 0xD9, (byte) 25, CALCommandType.STATUS), + CALCommandStatus_26Bytes((short) 0xDA, (byte) 26, CALCommandType.STATUS), + CALCommandStatus_27Bytes((short) 0xDB, (byte) 27, CALCommandType.STATUS), + CALCommandStatus_28Bytes((short) 0xDC, (byte) 28, CALCommandType.STATUS), + CALCommandStatus_29Bytes((short) 0xDD, (byte) 29, CALCommandType.STATUS), + CALCommandStatus_30Bytes((short) 0xDE, (byte) 30, CALCommandType.STATUS), + CALCommandStatus_31Bytes((short) 0xDF, (byte) 31, CALCommandType.STATUS), + CALCommandStatusExtended_0Bytes((short) 0xE0, (byte) 0, CALCommandType.STATUS_EXTENDED), + CALCommandStatusExtended_1Bytes((short) 0xE1, (byte) 1, CALCommandType.STATUS_EXTENDED), + CALCommandStatusExtended_2Bytes((short) 0xE2, (byte) 2, CALCommandType.STATUS_EXTENDED), + CALCommandStatusExtended_3Bytes((short) 0xE3, (byte) 3, CALCommandType.STATUS_EXTENDED), + CALCommandStatusExtended_4Bytes((short) 0xE4, (byte) 4, CALCommandType.STATUS_EXTENDED), + CALCommandStatusExtended_5Bytes((short) 0xE5, (byte) 5, CALCommandType.STATUS_EXTENDED), + CALCommandStatusExtended_6Bytes((short) 0xE6, (byte) 6, CALCommandType.STATUS_EXTENDED), + CALCommandStatusExtended_7Bytes((short) 0xE7, (byte) 7, CALCommandType.STATUS_EXTENDED), + CALCommandStatusExtended_8Bytes((short) 0xE8, (byte) 8, CALCommandType.STATUS_EXTENDED), + CALCommandStatusExtended_9Bytes((short) 0xE9, (byte) 9, CALCommandType.STATUS_EXTENDED), + CALCommandStatusExtended_10Bytes((short) 0xEA, (byte) 10, CALCommandType.STATUS_EXTENDED), + CALCommandStatusExtended_11Bytes((short) 0xEB, (byte) 11, CALCommandType.STATUS_EXTENDED), + CALCommandStatusExtended_12Bytes((short) 0xEC, (byte) 12, CALCommandType.STATUS_EXTENDED), + CALCommandStatusExtended_13Bytes((short) 0xED, (byte) 13, CALCommandType.STATUS_EXTENDED), + CALCommandStatusExtended_14Bytes((short) 0xEE, (byte) 14, CALCommandType.STATUS_EXTENDED), + CALCommandStatusExtended_15Bytes((short) 0xEF, (byte) 15, CALCommandType.STATUS_EXTENDED), + CALCommandStatusExtended_16Bytes((short) 0xF0, (byte) 16, CALCommandType.STATUS_EXTENDED), + CALCommandStatusExtended_17Bytes((short) 0xF1, (byte) 17, CALCommandType.STATUS_EXTENDED), + CALCommandStatusExtended_18Bytes((short) 0xF2, (byte) 18, CALCommandType.STATUS_EXTENDED), + CALCommandStatusExtended_19Bytes((short) 0xF3, (byte) 19, CALCommandType.STATUS_EXTENDED), + CALCommandStatusExtended_20Bytes((short) 0xF4, (byte) 20, CALCommandType.STATUS_EXTENDED), + CALCommandStatusExtended_21Bytes((short) 0xF5, (byte) 21, CALCommandType.STATUS_EXTENDED), + CALCommandStatusExtended_22Bytes((short) 0xF6, (byte) 22, CALCommandType.STATUS_EXTENDED), + CALCommandStatusExtended_23Bytes((short) 0xF7, (byte) 23, CALCommandType.STATUS_EXTENDED), + CALCommandStatusExtended_24Bytes((short) 0xF8, (byte) 24, CALCommandType.STATUS_EXTENDED), + CALCommandStatusExtended_25Bytes((short) 0xF9, (byte) 25, CALCommandType.STATUS_EXTENDED), + CALCommandStatusExtended_26Bytes((short) 0xFA, (byte) 26, CALCommandType.STATUS_EXTENDED), + CALCommandStatusExtended_27Bytes((short) 0xFB, (byte) 27, CALCommandType.STATUS_EXTENDED), + CALCommandStatusExtended_28Bytes((short) 0xFC, (byte) 28, CALCommandType.STATUS_EXTENDED), + CALCommandStatusExtended_29Bytes((short) 0xFD, (byte) 29, CALCommandType.STATUS_EXTENDED), + CALCommandStatusExtended_30Bytes((short) 0xFE, (byte) 30, CALCommandType.STATUS_EXTENDED), + CALCommandStatusExtended_31Bytes((short) 0xFF, (byte) 31, CALCommandType.STATUS_EXTENDED); private static final Map map; static { @@ -153,10 +153,10 @@ public enum CALCommandTypeContainer { } private final short value; - private final short numBytes; + private final byte numBytes; private final CALCommandType commandType; - CALCommandTypeContainer(short value, short numBytes, CALCommandType commandType) { + CALCommandTypeContainer(short value, byte numBytes, CALCommandType commandType) { this.value = value; this.numBytes = numBytes; this.commandType = commandType; @@ -166,11 +166,11 @@ public short getValue() { return value; } - public short getNumBytes() { + public byte getNumBytes() { return numBytes; } - public static CALCommandTypeContainer firstEnumForFieldNumBytes(short fieldValue) { + public static CALCommandTypeContainer firstEnumForFieldNumBytes(byte fieldValue) { for (CALCommandTypeContainer _val : CALCommandTypeContainer.values()) { if (_val.getNumBytes() == fieldValue) { return _val; @@ -179,7 +179,7 @@ public static CALCommandTypeContainer firstEnumForFieldNumBytes(short fieldValue return null; } - public static List enumsForFieldNumBytes(short fieldValue) { + public static List enumsForFieldNumBytes(byte fieldValue) { List _values = new ArrayList<>(); for (CALCommandTypeContainer _val : CALCommandTypeContainer.values()) { if (_val.getNumBytes() == fieldValue) { diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALDataIdentifyReply.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALDataIdentifyReply.java index 32777e4441d..49f4ad2c868 100644 --- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALDataIdentifyReply.java +++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALDataIdentifyReply.java @@ -130,7 +130,7 @@ public static CALDataBuilder staticParseCALDataBuilder( IdentifyReplyCommand.staticParse( readBuffer, (Attribute) (attribute), - (short) ((commandTypeContainer.getNumBytes()) - (1))), + (byte) ((commandTypeContainer.getNumBytes()) - (1))), readBuffer)); readBuffer.closeContext("CALDataIdentifyReply"); diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALDataStatusExtended.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALDataStatusExtended.java index 638f902ac9f..fff567a94ef 100644 --- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALDataStatusExtended.java +++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALDataStatusExtended.java @@ -87,16 +87,16 @@ public List getLevelInformation() { return levelInformation; } - public short getNumberOfStatusBytes() { - return (short) + public byte getNumberOfStatusBytes() { + return (byte) ((((((getCoding()) == (StatusCoding.BINARY_BY_THIS_SERIAL_INTERFACE)) || ((getCoding()) == (StatusCoding.BINARY_BY_ELSEWHERE)))) ? ((commandTypeContainer.getNumBytes()) - (3)) : (0))); } - public short getNumberOfLevelInformation() { - return (short) + public byte getNumberOfLevelInformation() { + return (byte) ((((((getCoding()) == (StatusCoding.LEVEL_BY_THIS_SERIAL_INTERFACE)) || ((getCoding()) == (StatusCoding.LEVEL_BY_ELSEWHERE)))) ? ((((commandTypeContainer.getNumBytes()) - (3))) / (2)) @@ -131,11 +131,11 @@ protected void serializeCALDataChild(WriteBuffer writeBuffer) throws Serializati writeSimpleField("blockStart", blockStart, writeUnsignedShort(writeBuffer, 8)); // Virtual field (doesn't actually serialize anything, just makes the value available) - short numberOfStatusBytes = getNumberOfStatusBytes(); + byte numberOfStatusBytes = getNumberOfStatusBytes(); writeBuffer.writeVirtual("numberOfStatusBytes", numberOfStatusBytes); // Virtual field (doesn't actually serialize anything, just makes the value available) - short numberOfLevelInformation = getNumberOfLevelInformation(); + byte numberOfLevelInformation = getNumberOfLevelInformation(); writeBuffer.writeVirtual("numberOfLevelInformation", numberOfLevelInformation); // Array Field (statusBytes) @@ -215,18 +215,18 @@ public static CALDataBuilder staticParseCALDataBuilder( ApplicationIdContainer::enumForValue, readUnsignedShort(readBuffer, 8))); short blockStart = readSimpleField("blockStart", readUnsignedShort(readBuffer, 8)); - short numberOfStatusBytes = + byte numberOfStatusBytes = readVirtualField( "numberOfStatusBytes", - short.class, + byte.class, (((((coding) == (StatusCoding.BINARY_BY_THIS_SERIAL_INTERFACE)) || ((coding) == (StatusCoding.BINARY_BY_ELSEWHERE)))) ? ((commandTypeContainer.getNumBytes()) - (3)) : (0))); - short numberOfLevelInformation = + byte numberOfLevelInformation = readVirtualField( "numberOfLevelInformation", - short.class, + byte.class, (((((coding) == (StatusCoding.LEVEL_BY_THIS_SERIAL_INTERFACE)) || ((coding) == (StatusCoding.LEVEL_BY_ELSEWHERE)))) ? ((((commandTypeContainer.getNumBytes()) - (3))) / (2)) diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALReplyLong.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALReplyLong.java index 94c923e006e..aae37d86002 100644 --- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALReplyLong.java +++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/CALReplyLong.java @@ -40,7 +40,7 @@ public class CALReplyLong extends CALReply implements Message { // Accessors for discriminator values. // Properties. - protected final long terminatingByte; + protected final int terminatingByte; protected final UnitAddress unitAddress; protected final BridgeAddress bridgeAddress; protected final SerialInterfaceAddress serialInterfaceAddress; @@ -56,7 +56,7 @@ public class CALReplyLong extends CALReply implements Message { public CALReplyLong( byte calType, CALData calData, - long terminatingByte, + int terminatingByte, UnitAddress unitAddress, BridgeAddress bridgeAddress, SerialInterfaceAddress serialInterfaceAddress, @@ -75,7 +75,7 @@ public CALReplyLong( this.requestContext = requestContext; } - public long getTerminatingByte() { + public int getTerminatingByte() { return terminatingByte; } @@ -203,7 +203,7 @@ public static CALReplyBuilder staticParseCALReplyBuilder( Byte reservedField0 = readReservedField("reserved", readByte(readBuffer, 8), (byte) 0x86); - long terminatingByte = readPeekField("terminatingByte", readUnsignedLong(readBuffer, 24)); + int terminatingByte = readPeekField("terminatingByte", readUnsignedInt(readBuffer, 24)); boolean isUnitAddress = readVirtualField("isUnitAddress", boolean.class, (((terminatingByte) & (0xff))) == (0x00)); @@ -252,7 +252,7 @@ public static CALReplyBuilder staticParseCALReplyBuilder( } public static class CALReplyLongBuilderImpl implements CALReply.CALReplyBuilder { - private final long terminatingByte; + private final int terminatingByte; private final UnitAddress unitAddress; private final BridgeAddress bridgeAddress; private final SerialInterfaceAddress serialInterfaceAddress; @@ -263,7 +263,7 @@ public static class CALReplyLongBuilderImpl implements CALReply.CALReplyBuilder private final Byte reservedField0; public CALReplyLongBuilderImpl( - long terminatingByte, + int terminatingByte, UnitAddress unitAddress, BridgeAddress bridgeAddress, SerialInterfaceAddress serialInterfaceAddress, diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ClockAndTimekeepingCommandTypeContainer.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ClockAndTimekeepingCommandTypeContainer.java index 224d983d1e6..ef45b0d378e 100644 --- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ClockAndTimekeepingCommandTypeContainer.java +++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ClockAndTimekeepingCommandTypeContainer.java @@ -27,23 +27,23 @@ public enum ClockAndTimekeepingCommandTypeContainer { MediaTransportControlCommandUpdateNetworkVariable_0Bytes( - (short) 0x08, (short) 0, ClockAndTimekeepingCommandType.UPDATE_NETWORK_VARIABLE), + (short) 0x08, (byte) 0, ClockAndTimekeepingCommandType.UPDATE_NETWORK_VARIABLE), MediaTransportControlCommandUpdateNetworkVariable_1Bytes( - (short) 0x09, (short) 1, ClockAndTimekeepingCommandType.UPDATE_NETWORK_VARIABLE), + (short) 0x09, (byte) 1, ClockAndTimekeepingCommandType.UPDATE_NETWORK_VARIABLE), MediaTransportControlCommandUpdateNetworkVariable_2Bytes( - (short) 0x0A, (short) 2, ClockAndTimekeepingCommandType.UPDATE_NETWORK_VARIABLE), + (short) 0x0A, (byte) 2, ClockAndTimekeepingCommandType.UPDATE_NETWORK_VARIABLE), MediaTransportControlCommandUpdateNetworkVariable_3Bytes( - (short) 0x0B, (short) 3, ClockAndTimekeepingCommandType.UPDATE_NETWORK_VARIABLE), + (short) 0x0B, (byte) 3, ClockAndTimekeepingCommandType.UPDATE_NETWORK_VARIABLE), MediaTransportControlCommandUpdateNetworkVariable_4Bytes( - (short) 0x0C, (short) 4, ClockAndTimekeepingCommandType.UPDATE_NETWORK_VARIABLE), + (short) 0x0C, (byte) 4, ClockAndTimekeepingCommandType.UPDATE_NETWORK_VARIABLE), MediaTransportControlCommandUpdateNetworkVariable_5Bytes( - (short) 0x0D, (short) 5, ClockAndTimekeepingCommandType.UPDATE_NETWORK_VARIABLE), + (short) 0x0D, (byte) 5, ClockAndTimekeepingCommandType.UPDATE_NETWORK_VARIABLE), MediaTransportControlCommandUpdateNetworkVariable_6Bytes( - (short) 0x0E, (short) 6, ClockAndTimekeepingCommandType.UPDATE_NETWORK_VARIABLE), + (short) 0x0E, (byte) 6, ClockAndTimekeepingCommandType.UPDATE_NETWORK_VARIABLE), MediaTransportControlCommandUpdateNetworkVariable_7Bytes( - (short) 0x0F, (short) 7, ClockAndTimekeepingCommandType.UPDATE_NETWORK_VARIABLE), + (short) 0x0F, (byte) 7, ClockAndTimekeepingCommandType.UPDATE_NETWORK_VARIABLE), MediaTransportControlCommandRequestRefresh( - (short) 0x11, (short) 1, ClockAndTimekeepingCommandType.REQUEST_REFRESH); + (short) 0x11, (byte) 1, ClockAndTimekeepingCommandType.REQUEST_REFRESH); private static final Map map; static { @@ -55,11 +55,11 @@ public enum ClockAndTimekeepingCommandTypeContainer { } private final short value; - private final short numBytes; + private final byte numBytes; private final ClockAndTimekeepingCommandType commandType; ClockAndTimekeepingCommandTypeContainer( - short value, short numBytes, ClockAndTimekeepingCommandType commandType) { + short value, byte numBytes, ClockAndTimekeepingCommandType commandType) { this.value = value; this.numBytes = numBytes; this.commandType = commandType; @@ -69,12 +69,11 @@ public short getValue() { return value; } - public short getNumBytes() { + public byte getNumBytes() { return numBytes; } - public static ClockAndTimekeepingCommandTypeContainer firstEnumForFieldNumBytes( - short fieldValue) { + public static ClockAndTimekeepingCommandTypeContainer firstEnumForFieldNumBytes(byte fieldValue) { for (ClockAndTimekeepingCommandTypeContainer _val : ClockAndTimekeepingCommandTypeContainer.values()) { if (_val.getNumBytes() == fieldValue) { @@ -85,7 +84,7 @@ public static ClockAndTimekeepingCommandTypeContainer firstEnumForFieldNumBytes( } public static List enumsForFieldNumBytes( - short fieldValue) { + byte fieldValue) { List _values = new ArrayList<>(); for (ClockAndTimekeepingCommandTypeContainer _val : ClockAndTimekeepingCommandTypeContainer.values()) { diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/EnableControlCommandTypeContainer.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/EnableControlCommandTypeContainer.java index 7b2bac0272f..451a0adc96d 100644 --- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/EnableControlCommandTypeContainer.java +++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/EnableControlCommandTypeContainer.java @@ -27,37 +27,37 @@ public enum EnableControlCommandTypeContainer { EnableControlCommandSetNetworkVariable0_2Bytes( - (short) 0x02, (short) 2, EnableControlCommandType.SET_NETWORK_VARIABLE), + (short) 0x02, (byte) 2, EnableControlCommandType.SET_NETWORK_VARIABLE), EnableControlCommandSetNetworkVariable1_2Bytes( - (short) 0x0A, (short) 2, EnableControlCommandType.SET_NETWORK_VARIABLE), + (short) 0x0A, (byte) 2, EnableControlCommandType.SET_NETWORK_VARIABLE), EnableControlCommandSetNetworkVariable2_2Bytes( - (short) 0x12, (short) 2, EnableControlCommandType.SET_NETWORK_VARIABLE), + (short) 0x12, (byte) 2, EnableControlCommandType.SET_NETWORK_VARIABLE), EnableControlCommandSetNetworkVariable3_2Bytes( - (short) 0x1A, (short) 2, EnableControlCommandType.SET_NETWORK_VARIABLE), + (short) 0x1A, (byte) 2, EnableControlCommandType.SET_NETWORK_VARIABLE), EnableControlCommandSetNetworkVariable4_2Bytes( - (short) 0x22, (short) 2, EnableControlCommandType.SET_NETWORK_VARIABLE), + (short) 0x22, (byte) 2, EnableControlCommandType.SET_NETWORK_VARIABLE), EnableControlCommandSetNetworkVariable5_2Bytes( - (short) 0x2A, (short) 2, EnableControlCommandType.SET_NETWORK_VARIABLE), + (short) 0x2A, (byte) 2, EnableControlCommandType.SET_NETWORK_VARIABLE), EnableControlCommandSetNetworkVariable6_2Bytes( - (short) 0x32, (short) 2, EnableControlCommandType.SET_NETWORK_VARIABLE), + (short) 0x32, (byte) 2, EnableControlCommandType.SET_NETWORK_VARIABLE), EnableControlCommandSetNetworkVariable7_2Bytes( - (short) 0x3A, (short) 2, EnableControlCommandType.SET_NETWORK_VARIABLE), + (short) 0x3A, (byte) 2, EnableControlCommandType.SET_NETWORK_VARIABLE), EnableControlCommandSetNetworkVariable8_2Bytes( - (short) 0x42, (short) 2, EnableControlCommandType.SET_NETWORK_VARIABLE), + (short) 0x42, (byte) 2, EnableControlCommandType.SET_NETWORK_VARIABLE), EnableControlCommandSetNetworkVariable9_2Bytes( - (short) 0x4A, (short) 2, EnableControlCommandType.SET_NETWORK_VARIABLE), + (short) 0x4A, (byte) 2, EnableControlCommandType.SET_NETWORK_VARIABLE), EnableControlCommandSetNetworkVariable10_2Bytes( - (short) 0x52, (short) 2, EnableControlCommandType.SET_NETWORK_VARIABLE), + (short) 0x52, (byte) 2, EnableControlCommandType.SET_NETWORK_VARIABLE), EnableControlCommandSetNetworkVariable11_2Bytes( - (short) 0x5A, (short) 2, EnableControlCommandType.SET_NETWORK_VARIABLE), + (short) 0x5A, (byte) 2, EnableControlCommandType.SET_NETWORK_VARIABLE), EnableControlCommandSetNetworkVariable12_2Bytes( - (short) 0x62, (short) 2, EnableControlCommandType.SET_NETWORK_VARIABLE), + (short) 0x62, (byte) 2, EnableControlCommandType.SET_NETWORK_VARIABLE), EnableControlCommandSetNetworkVariable13_2Bytes( - (short) 0x6A, (short) 2, EnableControlCommandType.SET_NETWORK_VARIABLE), + (short) 0x6A, (byte) 2, EnableControlCommandType.SET_NETWORK_VARIABLE), EnableControlCommandSetNetworkVariable14_2Bytes( - (short) 0x72, (short) 2, EnableControlCommandType.SET_NETWORK_VARIABLE), + (short) 0x72, (byte) 2, EnableControlCommandType.SET_NETWORK_VARIABLE), EnableControlCommandSetNetworkVariable15_2Bytes( - (short) 0x7A, (short) 2, EnableControlCommandType.SET_NETWORK_VARIABLE); + (short) 0x7A, (byte) 2, EnableControlCommandType.SET_NETWORK_VARIABLE); private static final Map map; static { @@ -68,11 +68,11 @@ public enum EnableControlCommandTypeContainer { } private final short value; - private final short numBytes; + private final byte numBytes; private final EnableControlCommandType commandType; EnableControlCommandTypeContainer( - short value, short numBytes, EnableControlCommandType commandType) { + short value, byte numBytes, EnableControlCommandType commandType) { this.value = value; this.numBytes = numBytes; this.commandType = commandType; @@ -82,11 +82,11 @@ public short getValue() { return value; } - public short getNumBytes() { + public byte getNumBytes() { return numBytes; } - public static EnableControlCommandTypeContainer firstEnumForFieldNumBytes(short fieldValue) { + public static EnableControlCommandTypeContainer firstEnumForFieldNumBytes(byte fieldValue) { for (EnableControlCommandTypeContainer _val : EnableControlCommandTypeContainer.values()) { if (_val.getNumBytes() == fieldValue) { return _val; @@ -95,7 +95,7 @@ public static EnableControlCommandTypeContainer firstEnumForFieldNumBytes(short return null; } - public static List enumsForFieldNumBytes(short fieldValue) { + public static List enumsForFieldNumBytes(byte fieldValue) { List _values = new ArrayList<>(); for (EnableControlCommandTypeContainer _val : EnableControlCommandTypeContainer.values()) { if (_val.getNumBytes() == fieldValue) { diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ErrorReportingCommandTypeContainer.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ErrorReportingCommandTypeContainer.java index 6510fb543ac..075c7be5f7c 100644 --- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ErrorReportingCommandTypeContainer.java +++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/ErrorReportingCommandTypeContainer.java @@ -26,11 +26,11 @@ // Code generated by code-generation. DO NOT EDIT. public enum ErrorReportingCommandTypeContainer { - ErrorReportingCommandDeprecated((short) 0x05, (short) 5, ErrorReportingCommandType.DEPRECATED), - ErrorReportingCommandErrorReport((short) 0x15, (short) 5, ErrorReportingCommandType.ERROR_REPORT), - ErrorReportingCommandAcknowledge((short) 0x25, (short) 5, ErrorReportingCommandType.ACKNOWLEDGE), + ErrorReportingCommandDeprecated((short) 0x05, (byte) 5, ErrorReportingCommandType.DEPRECATED), + ErrorReportingCommandErrorReport((short) 0x15, (byte) 5, ErrorReportingCommandType.ERROR_REPORT), + ErrorReportingCommandAcknowledge((short) 0x25, (byte) 5, ErrorReportingCommandType.ACKNOWLEDGE), ErrorReportingCommandClearMostSevere( - (short) 0x35, (short) 5, ErrorReportingCommandType.CLEAR_MOST_SEVERE); + (short) 0x35, (byte) 5, ErrorReportingCommandType.CLEAR_MOST_SEVERE); private static final Map map; static { @@ -41,11 +41,11 @@ public enum ErrorReportingCommandTypeContainer { } private final short value; - private final short numBytes; + private final byte numBytes; private final ErrorReportingCommandType commandType; ErrorReportingCommandTypeContainer( - short value, short numBytes, ErrorReportingCommandType commandType) { + short value, byte numBytes, ErrorReportingCommandType commandType) { this.value = value; this.numBytes = numBytes; this.commandType = commandType; @@ -55,11 +55,11 @@ public short getValue() { return value; } - public short getNumBytes() { + public byte getNumBytes() { return numBytes; } - public static ErrorReportingCommandTypeContainer firstEnumForFieldNumBytes(short fieldValue) { + public static ErrorReportingCommandTypeContainer firstEnumForFieldNumBytes(byte fieldValue) { for (ErrorReportingCommandTypeContainer _val : ErrorReportingCommandTypeContainer.values()) { if (_val.getNumBytes() == fieldValue) { return _val; @@ -68,7 +68,7 @@ public static ErrorReportingCommandTypeContainer firstEnumForFieldNumBytes(short return null; } - public static List enumsForFieldNumBytes(short fieldValue) { + public static List enumsForFieldNumBytes(byte fieldValue) { List _values = new ArrayList<>(); for (ErrorReportingCommandTypeContainer _val : ErrorReportingCommandTypeContainer.values()) { if (_val.getNumBytes() == fieldValue) { diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/HVACAuxiliaryLevel.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/HVACAuxiliaryLevel.java index 037eb554aba..e86f733958c 100644 --- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/HVACAuxiliaryLevel.java +++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/HVACAuxiliaryLevel.java @@ -39,12 +39,12 @@ public class HVACAuxiliaryLevel implements Message { // Properties. protected final boolean fanMode; - protected final short mode; + protected final byte mode; // Reserved Fields private Boolean reservedField0; - public HVACAuxiliaryLevel(boolean fanMode, short mode) { + public HVACAuxiliaryLevel(boolean fanMode, byte mode) { super(); this.fanMode = fanMode; this.mode = mode; @@ -54,7 +54,7 @@ public boolean getFanMode() { return fanMode; } - public short getMode() { + public byte getMode() { return mode; } @@ -70,8 +70,8 @@ public boolean getIsFanSpeedAtDefaultSpeed() { return (boolean) ((getMode()) == (0x00)); } - public short getSpeedSettings() { - return (short) (getMode()); + public byte getSpeedSettings() { + return (byte) (getMode()); } public void serialize(WriteBuffer writeBuffer) throws SerializationException { @@ -97,14 +97,14 @@ public void serialize(WriteBuffer writeBuffer) throws SerializationException { writeBuffer.writeVirtual("isFanModeContinuous", isFanModeContinuous); // Simple Field (mode) - writeSimpleField("mode", mode, writeUnsignedShort(writeBuffer, 6)); + writeSimpleField("mode", mode, writeUnsignedByte(writeBuffer, 6)); // Virtual field (doesn't actually serialize anything, just makes the value available) boolean isFanSpeedAtDefaultSpeed = getIsFanSpeedAtDefaultSpeed(); writeBuffer.writeVirtual("isFanSpeedAtDefaultSpeed", isFanSpeedAtDefaultSpeed); // Virtual field (doesn't actually serialize anything, just makes the value available) - short speedSettings = getSpeedSettings(); + byte speedSettings = getSpeedSettings(); writeBuffer.writeVirtual("speedSettings", speedSettings); writeBuffer.popContext("HVACAuxiliaryLevel"); @@ -159,10 +159,10 @@ public static HVACAuxiliaryLevel staticParse(ReadBuffer readBuffer) throws Parse boolean isFanModeAutomatic = readVirtualField("isFanModeAutomatic", boolean.class, !(fanMode)); boolean isFanModeContinuous = readVirtualField("isFanModeContinuous", boolean.class, fanMode); - short mode = readSimpleField("mode", readUnsignedShort(readBuffer, 6)); + byte mode = readSimpleField("mode", readUnsignedByte(readBuffer, 6)); boolean isFanSpeedAtDefaultSpeed = readVirtualField("isFanSpeedAtDefaultSpeed", boolean.class, (mode) == (0x00)); - short speedSettings = readVirtualField("speedSettings", short.class, mode); + byte speedSettings = readVirtualField("speedSettings", byte.class, mode); readBuffer.closeContext("HVACAuxiliaryLevel"); // Create the instance diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommand.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommand.java index 1f9d1bdbb1a..2d7faca58d3 100644 --- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommand.java +++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommand.java @@ -41,9 +41,9 @@ public abstract class IdentifyReplyCommand implements Message { public abstract Attribute getAttribute(); // Arguments. - protected final Short numBytes; + protected final Byte numBytes; - public IdentifyReplyCommand(Short numBytes) { + public IdentifyReplyCommand(Byte numBytes) { super(); this.numBytes = numBytes; } @@ -95,21 +95,21 @@ public static IdentifyReplyCommand staticParse(ReadBuffer readBuffer, Object... "Argument 0 expected to be of type Attribute or a string which is parseable but was " + args[0].getClass().getName()); } - Short numBytes; - if (args[1] instanceof Short) { - numBytes = (Short) args[1]; + Byte numBytes; + if (args[1] instanceof Byte) { + numBytes = (Byte) args[1]; } else if (args[1] instanceof String) { - numBytes = Short.valueOf((String) args[1]); + numBytes = Byte.valueOf((String) args[1]); } else { throw new PlcRuntimeException( - "Argument 1 expected to be of type Short or a string which is parseable but was " + "Argument 1 expected to be of type Byte or a string which is parseable but was " + args[1].getClass().getName()); } return staticParse(readBuffer, attribute, numBytes); } public static IdentifyReplyCommand staticParse( - ReadBuffer readBuffer, Attribute attribute, Short numBytes) throws ParseException { + ReadBuffer readBuffer, Attribute attribute, Byte numBytes) throws ParseException { readBuffer.pullContext("IdentifyReplyCommand"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -206,7 +206,7 @@ public static IdentifyReplyCommand staticParse( } public interface IdentifyReplyCommandBuilder { - IdentifyReplyCommand build(Short numBytes); + IdentifyReplyCommand build(Byte numBytes); } @Override diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandCurrentSenseLevels.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandCurrentSenseLevels.java index 0ce5e719d43..2258aa1fc40 100644 --- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandCurrentSenseLevels.java +++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandCurrentSenseLevels.java @@ -47,9 +47,9 @@ public Attribute getAttribute() { protected final byte[] currentSenseLevels; // Arguments. - protected final Short numBytes; + protected final Byte numBytes; - public IdentifyReplyCommandCurrentSenseLevels(byte[] currentSenseLevels, Short numBytes) { + public IdentifyReplyCommandCurrentSenseLevels(byte[] currentSenseLevels, Byte numBytes) { super(numBytes); this.currentSenseLevels = currentSenseLevels; this.numBytes = numBytes; @@ -92,7 +92,7 @@ public int getLengthInBits() { } public static IdentifyReplyCommandBuilder staticParseIdentifyReplyCommandBuilder( - ReadBuffer readBuffer, Attribute attribute, Short numBytes) throws ParseException { + ReadBuffer readBuffer, Attribute attribute, Byte numBytes) throws ParseException { readBuffer.pullContext("IdentifyReplyCommandCurrentSenseLevels"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -108,15 +108,15 @@ public static IdentifyReplyCommandBuilder staticParseIdentifyReplyCommandBuilder public static class IdentifyReplyCommandCurrentSenseLevelsBuilderImpl implements IdentifyReplyCommand.IdentifyReplyCommandBuilder { private final byte[] currentSenseLevels; - private final Short numBytes; + private final Byte numBytes; public IdentifyReplyCommandCurrentSenseLevelsBuilderImpl( - byte[] currentSenseLevels, Short numBytes) { + byte[] currentSenseLevels, Byte numBytes) { this.currentSenseLevels = currentSenseLevels; this.numBytes = numBytes; } - public IdentifyReplyCommandCurrentSenseLevels build(Short numBytes) { + public IdentifyReplyCommandCurrentSenseLevels build(Byte numBytes) { IdentifyReplyCommandCurrentSenseLevels identifyReplyCommandCurrentSenseLevels = new IdentifyReplyCommandCurrentSenseLevels(currentSenseLevels, numBytes); diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandDSIStatus.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandDSIStatus.java index 199e7fd9b99..7387a289618 100644 --- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandDSIStatus.java +++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandDSIStatus.java @@ -55,7 +55,7 @@ public Attribute getAttribute() { protected final byte dimmingUCRevisionNumber; // Arguments. - protected final Short numBytes; + protected final Byte numBytes; public IdentifyReplyCommandDSIStatus( ChannelStatus channelStatus1, @@ -68,7 +68,7 @@ public IdentifyReplyCommandDSIStatus( ChannelStatus channelStatus8, UnitStatus unitStatus, byte dimmingUCRevisionNumber, - Short numBytes) { + Byte numBytes) { super(numBytes); this.channelStatus1 = channelStatus1; this.channelStatus2 = channelStatus2; @@ -253,7 +253,7 @@ public int getLengthInBits() { } public static IdentifyReplyCommandBuilder staticParseIdentifyReplyCommandBuilder( - ReadBuffer readBuffer, Attribute attribute, Short numBytes) throws ParseException { + ReadBuffer readBuffer, Attribute attribute, Byte numBytes) throws ParseException { readBuffer.pullContext("IdentifyReplyCommandDSIStatus"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -352,7 +352,7 @@ public static class IdentifyReplyCommandDSIStatusBuilderImpl private final ChannelStatus channelStatus8; private final UnitStatus unitStatus; private final byte dimmingUCRevisionNumber; - private final Short numBytes; + private final Byte numBytes; public IdentifyReplyCommandDSIStatusBuilderImpl( ChannelStatus channelStatus1, @@ -365,7 +365,7 @@ public IdentifyReplyCommandDSIStatusBuilderImpl( ChannelStatus channelStatus8, UnitStatus unitStatus, byte dimmingUCRevisionNumber, - Short numBytes) { + Byte numBytes) { this.channelStatus1 = channelStatus1; this.channelStatus2 = channelStatus2; this.channelStatus3 = channelStatus3; @@ -379,7 +379,7 @@ public IdentifyReplyCommandDSIStatusBuilderImpl( this.numBytes = numBytes; } - public IdentifyReplyCommandDSIStatus build(Short numBytes) { + public IdentifyReplyCommandDSIStatus build(Byte numBytes) { IdentifyReplyCommandDSIStatus identifyReplyCommandDSIStatus = new IdentifyReplyCommandDSIStatus( diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandDelays.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandDelays.java index 896cd1c838b..cca305ffcde 100644 --- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandDelays.java +++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandDelays.java @@ -47,9 +47,9 @@ public Attribute getAttribute() { protected final byte reStrikeDelay; // Arguments. - protected final Short numBytes; + protected final Byte numBytes; - public IdentifyReplyCommandDelays(byte[] terminalLevels, byte reStrikeDelay, Short numBytes) { + public IdentifyReplyCommandDelays(byte[] terminalLevels, byte reStrikeDelay, Byte numBytes) { super(numBytes); this.terminalLevels = terminalLevels; this.reStrikeDelay = reStrikeDelay; @@ -103,7 +103,7 @@ public int getLengthInBits() { } public static IdentifyReplyCommandBuilder staticParseIdentifyReplyCommandBuilder( - ReadBuffer readBuffer, Attribute attribute, Short numBytes) throws ParseException { + ReadBuffer readBuffer, Attribute attribute, Byte numBytes) throws ParseException { readBuffer.pullContext("IdentifyReplyCommandDelays"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -122,16 +122,16 @@ public static class IdentifyReplyCommandDelaysBuilderImpl implements IdentifyReplyCommand.IdentifyReplyCommandBuilder { private final byte[] terminalLevels; private final byte reStrikeDelay; - private final Short numBytes; + private final Byte numBytes; public IdentifyReplyCommandDelaysBuilderImpl( - byte[] terminalLevels, byte reStrikeDelay, Short numBytes) { + byte[] terminalLevels, byte reStrikeDelay, Byte numBytes) { this.terminalLevels = terminalLevels; this.reStrikeDelay = reStrikeDelay; this.numBytes = numBytes; } - public IdentifyReplyCommandDelays build(Short numBytes) { + public IdentifyReplyCommandDelays build(Byte numBytes) { IdentifyReplyCommandDelays identifyReplyCommandDelays = new IdentifyReplyCommandDelays(terminalLevels, reStrikeDelay, numBytes); diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandExtendedDiagnosticSummary.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandExtendedDiagnosticSummary.java index 4dd26230c4d..776128ec230 100644 --- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandExtendedDiagnosticSummary.java +++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandExtendedDiagnosticSummary.java @@ -65,7 +65,7 @@ public Attribute getAttribute() { protected final boolean microPowerReset; // Arguments. - protected final Short numBytes; + protected final Byte numBytes; // Reserved Fields private Byte reservedField0; private Byte reservedField1; @@ -91,7 +91,7 @@ public IdentifyReplyCommandExtendedDiagnosticSummary( boolean commsTxError, boolean internalStackOverflow, boolean microPowerReset, - Short numBytes) { + Byte numBytes) { super(numBytes); this.lowApplication = lowApplication; this.highApplication = highApplication; @@ -381,7 +381,7 @@ public int getLengthInBits() { } public static IdentifyReplyCommandBuilder staticParseIdentifyReplyCommandBuilder( - ReadBuffer readBuffer, Attribute attribute, Short numBytes) throws ParseException { + ReadBuffer readBuffer, Attribute attribute, Byte numBytes) throws ParseException { readBuffer.pullContext("IdentifyReplyCommandExtendedDiagnosticSummary"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -493,7 +493,7 @@ public static class IdentifyReplyCommandExtendedDiagnosticSummaryBuilderImpl private final boolean commsTxError; private final boolean internalStackOverflow; private final boolean microPowerReset; - private final Short numBytes; + private final Byte numBytes; private final Byte reservedField0; private final Byte reservedField1; private final Byte reservedField2; @@ -518,7 +518,7 @@ public IdentifyReplyCommandExtendedDiagnosticSummaryBuilderImpl( boolean commsTxError, boolean internalStackOverflow, boolean microPowerReset, - Short numBytes, + Byte numBytes, Byte reservedField0, Byte reservedField1, Byte reservedField2) { @@ -547,7 +547,7 @@ public IdentifyReplyCommandExtendedDiagnosticSummaryBuilderImpl( this.reservedField2 = reservedField2; } - public IdentifyReplyCommandExtendedDiagnosticSummary build(Short numBytes) { + public IdentifyReplyCommandExtendedDiagnosticSummary build(Byte numBytes) { IdentifyReplyCommandExtendedDiagnosticSummary identifyReplyCommandExtendedDiagnosticSummary = new IdentifyReplyCommandExtendedDiagnosticSummary( diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandFirmwareVersion.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandFirmwareVersion.java index 83afe6cfd7f..f0301294820 100644 --- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandFirmwareVersion.java +++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandFirmwareVersion.java @@ -46,9 +46,9 @@ public Attribute getAttribute() { protected final String firmwareVersion; // Arguments. - protected final Short numBytes; + protected final Byte numBytes; - public IdentifyReplyCommandFirmwareVersion(String firmwareVersion, Short numBytes) { + public IdentifyReplyCommandFirmwareVersion(String firmwareVersion, Byte numBytes) { super(numBytes); this.firmwareVersion = firmwareVersion; this.numBytes = numBytes; @@ -89,7 +89,7 @@ public int getLengthInBits() { } public static IdentifyReplyCommandBuilder staticParseIdentifyReplyCommandBuilder( - ReadBuffer readBuffer, Attribute attribute, Short numBytes) throws ParseException { + ReadBuffer readBuffer, Attribute attribute, Byte numBytes) throws ParseException { readBuffer.pullContext("IdentifyReplyCommandFirmwareVersion"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -104,14 +104,14 @@ public static IdentifyReplyCommandBuilder staticParseIdentifyReplyCommandBuilder public static class IdentifyReplyCommandFirmwareVersionBuilderImpl implements IdentifyReplyCommand.IdentifyReplyCommandBuilder { private final String firmwareVersion; - private final Short numBytes; + private final Byte numBytes; - public IdentifyReplyCommandFirmwareVersionBuilderImpl(String firmwareVersion, Short numBytes) { + public IdentifyReplyCommandFirmwareVersionBuilderImpl(String firmwareVersion, Byte numBytes) { this.firmwareVersion = firmwareVersion; this.numBytes = numBytes; } - public IdentifyReplyCommandFirmwareVersion build(Short numBytes) { + public IdentifyReplyCommandFirmwareVersion build(Byte numBytes) { IdentifyReplyCommandFirmwareVersion identifyReplyCommandFirmwareVersion = new IdentifyReplyCommandFirmwareVersion(firmwareVersion, numBytes); diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandGAVPhysicalAddresses.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandGAVPhysicalAddresses.java index 1695f4eaf7c..72e5ab869a3 100644 --- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandGAVPhysicalAddresses.java +++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandGAVPhysicalAddresses.java @@ -47,9 +47,9 @@ public Attribute getAttribute() { protected final byte[] values; // Arguments. - protected final Short numBytes; + protected final Byte numBytes; - public IdentifyReplyCommandGAVPhysicalAddresses(byte[] values, Short numBytes) { + public IdentifyReplyCommandGAVPhysicalAddresses(byte[] values, Byte numBytes) { super(numBytes); this.values = values; this.numBytes = numBytes; @@ -92,7 +92,7 @@ public int getLengthInBits() { } public static IdentifyReplyCommandBuilder staticParseIdentifyReplyCommandBuilder( - ReadBuffer readBuffer, Attribute attribute, Short numBytes) throws ParseException { + ReadBuffer readBuffer, Attribute attribute, Byte numBytes) throws ParseException { readBuffer.pullContext("IdentifyReplyCommandGAVPhysicalAddresses"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -107,14 +107,14 @@ public static IdentifyReplyCommandBuilder staticParseIdentifyReplyCommandBuilder public static class IdentifyReplyCommandGAVPhysicalAddressesBuilderImpl implements IdentifyReplyCommand.IdentifyReplyCommandBuilder { private final byte[] values; - private final Short numBytes; + private final Byte numBytes; - public IdentifyReplyCommandGAVPhysicalAddressesBuilderImpl(byte[] values, Short numBytes) { + public IdentifyReplyCommandGAVPhysicalAddressesBuilderImpl(byte[] values, Byte numBytes) { this.values = values; this.numBytes = numBytes; } - public IdentifyReplyCommandGAVPhysicalAddresses build(Short numBytes) { + public IdentifyReplyCommandGAVPhysicalAddresses build(Byte numBytes) { IdentifyReplyCommandGAVPhysicalAddresses identifyReplyCommandGAVPhysicalAddresses = new IdentifyReplyCommandGAVPhysicalAddresses(values, numBytes); diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandGAVValuesCurrent.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandGAVValuesCurrent.java index 59d6f6e542f..eadafa0385d 100644 --- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandGAVValuesCurrent.java +++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandGAVValuesCurrent.java @@ -46,9 +46,9 @@ public Attribute getAttribute() { protected final byte[] values; // Arguments. - protected final Short numBytes; + protected final Byte numBytes; - public IdentifyReplyCommandGAVValuesCurrent(byte[] values, Short numBytes) { + public IdentifyReplyCommandGAVValuesCurrent(byte[] values, Byte numBytes) { super(numBytes); this.values = values; this.numBytes = numBytes; @@ -91,7 +91,7 @@ public int getLengthInBits() { } public static IdentifyReplyCommandBuilder staticParseIdentifyReplyCommandBuilder( - ReadBuffer readBuffer, Attribute attribute, Short numBytes) throws ParseException { + ReadBuffer readBuffer, Attribute attribute, Byte numBytes) throws ParseException { readBuffer.pullContext("IdentifyReplyCommandGAVValuesCurrent"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -106,14 +106,14 @@ public static IdentifyReplyCommandBuilder staticParseIdentifyReplyCommandBuilder public static class IdentifyReplyCommandGAVValuesCurrentBuilderImpl implements IdentifyReplyCommand.IdentifyReplyCommandBuilder { private final byte[] values; - private final Short numBytes; + private final Byte numBytes; - public IdentifyReplyCommandGAVValuesCurrentBuilderImpl(byte[] values, Short numBytes) { + public IdentifyReplyCommandGAVValuesCurrentBuilderImpl(byte[] values, Byte numBytes) { this.values = values; this.numBytes = numBytes; } - public IdentifyReplyCommandGAVValuesCurrent build(Short numBytes) { + public IdentifyReplyCommandGAVValuesCurrent build(Byte numBytes) { IdentifyReplyCommandGAVValuesCurrent identifyReplyCommandGAVValuesCurrent = new IdentifyReplyCommandGAVValuesCurrent(values, numBytes); diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandGAVValuesStored.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandGAVValuesStored.java index be6a3193be4..0fe3e201417 100644 --- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandGAVValuesStored.java +++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandGAVValuesStored.java @@ -46,9 +46,9 @@ public Attribute getAttribute() { protected final byte[] values; // Arguments. - protected final Short numBytes; + protected final Byte numBytes; - public IdentifyReplyCommandGAVValuesStored(byte[] values, Short numBytes) { + public IdentifyReplyCommandGAVValuesStored(byte[] values, Byte numBytes) { super(numBytes); this.values = values; this.numBytes = numBytes; @@ -91,7 +91,7 @@ public int getLengthInBits() { } public static IdentifyReplyCommandBuilder staticParseIdentifyReplyCommandBuilder( - ReadBuffer readBuffer, Attribute attribute, Short numBytes) throws ParseException { + ReadBuffer readBuffer, Attribute attribute, Byte numBytes) throws ParseException { readBuffer.pullContext("IdentifyReplyCommandGAVValuesStored"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -106,14 +106,14 @@ public static IdentifyReplyCommandBuilder staticParseIdentifyReplyCommandBuilder public static class IdentifyReplyCommandGAVValuesStoredBuilderImpl implements IdentifyReplyCommand.IdentifyReplyCommandBuilder { private final byte[] values; - private final Short numBytes; + private final Byte numBytes; - public IdentifyReplyCommandGAVValuesStoredBuilderImpl(byte[] values, Short numBytes) { + public IdentifyReplyCommandGAVValuesStoredBuilderImpl(byte[] values, Byte numBytes) { this.values = values; this.numBytes = numBytes; } - public IdentifyReplyCommandGAVValuesStored build(Short numBytes) { + public IdentifyReplyCommandGAVValuesStored build(Byte numBytes) { IdentifyReplyCommandGAVValuesStored identifyReplyCommandGAVValuesStored = new IdentifyReplyCommandGAVValuesStored(values, numBytes); diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandLogicalAssignment.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandLogicalAssignment.java index c70b8b789f2..d195cf899da 100644 --- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandLogicalAssignment.java +++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandLogicalAssignment.java @@ -46,10 +46,10 @@ public Attribute getAttribute() { protected final List logicAssigment; // Arguments. - protected final Short numBytes; + protected final Byte numBytes; public IdentifyReplyCommandLogicalAssignment( - List logicAssigment, Short numBytes) { + List logicAssigment, Byte numBytes) { super(numBytes); this.logicAssigment = logicAssigment; this.numBytes = numBytes; @@ -96,7 +96,7 @@ public int getLengthInBits() { } public static IdentifyReplyCommandBuilder staticParseIdentifyReplyCommandBuilder( - ReadBuffer readBuffer, Attribute attribute, Short numBytes) throws ParseException { + ReadBuffer readBuffer, Attribute attribute, Byte numBytes) throws ParseException { readBuffer.pullContext("IdentifyReplyCommandLogicalAssignment"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -116,15 +116,15 @@ public static IdentifyReplyCommandBuilder staticParseIdentifyReplyCommandBuilder public static class IdentifyReplyCommandLogicalAssignmentBuilderImpl implements IdentifyReplyCommand.IdentifyReplyCommandBuilder { private final List logicAssigment; - private final Short numBytes; + private final Byte numBytes; public IdentifyReplyCommandLogicalAssignmentBuilderImpl( - List logicAssigment, Short numBytes) { + List logicAssigment, Byte numBytes) { this.logicAssigment = logicAssigment; this.numBytes = numBytes; } - public IdentifyReplyCommandLogicalAssignment build(Short numBytes) { + public IdentifyReplyCommandLogicalAssignment build(Byte numBytes) { IdentifyReplyCommandLogicalAssignment identifyReplyCommandLogicalAssignment = new IdentifyReplyCommandLogicalAssignment(logicAssigment, numBytes); diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandManufacturer.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandManufacturer.java index 580e8aa8e71..e3f69e0c61e 100644 --- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandManufacturer.java +++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandManufacturer.java @@ -46,9 +46,9 @@ public Attribute getAttribute() { protected final String manufacturerName; // Arguments. - protected final Short numBytes; + protected final Byte numBytes; - public IdentifyReplyCommandManufacturer(String manufacturerName, Short numBytes) { + public IdentifyReplyCommandManufacturer(String manufacturerName, Byte numBytes) { super(numBytes); this.manufacturerName = manufacturerName; this.numBytes = numBytes; @@ -89,7 +89,7 @@ public int getLengthInBits() { } public static IdentifyReplyCommandBuilder staticParseIdentifyReplyCommandBuilder( - ReadBuffer readBuffer, Attribute attribute, Short numBytes) throws ParseException { + ReadBuffer readBuffer, Attribute attribute, Byte numBytes) throws ParseException { readBuffer.pullContext("IdentifyReplyCommandManufacturer"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -104,14 +104,14 @@ public static IdentifyReplyCommandBuilder staticParseIdentifyReplyCommandBuilder public static class IdentifyReplyCommandManufacturerBuilderImpl implements IdentifyReplyCommand.IdentifyReplyCommandBuilder { private final String manufacturerName; - private final Short numBytes; + private final Byte numBytes; - public IdentifyReplyCommandManufacturerBuilderImpl(String manufacturerName, Short numBytes) { + public IdentifyReplyCommandManufacturerBuilderImpl(String manufacturerName, Byte numBytes) { this.manufacturerName = manufacturerName; this.numBytes = numBytes; } - public IdentifyReplyCommandManufacturer build(Short numBytes) { + public IdentifyReplyCommandManufacturer build(Byte numBytes) { IdentifyReplyCommandManufacturer identifyReplyCommandManufacturer = new IdentifyReplyCommandManufacturer(manufacturerName, numBytes); diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandMaximumLevels.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandMaximumLevels.java index fbc80cc6577..5fcbb80acf9 100644 --- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandMaximumLevels.java +++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandMaximumLevels.java @@ -46,9 +46,9 @@ public Attribute getAttribute() { protected final byte[] maximumLevels; // Arguments. - protected final Short numBytes; + protected final Byte numBytes; - public IdentifyReplyCommandMaximumLevels(byte[] maximumLevels, Short numBytes) { + public IdentifyReplyCommandMaximumLevels(byte[] maximumLevels, Byte numBytes) { super(numBytes); this.maximumLevels = maximumLevels; this.numBytes = numBytes; @@ -91,7 +91,7 @@ public int getLengthInBits() { } public static IdentifyReplyCommandBuilder staticParseIdentifyReplyCommandBuilder( - ReadBuffer readBuffer, Attribute attribute, Short numBytes) throws ParseException { + ReadBuffer readBuffer, Attribute attribute, Byte numBytes) throws ParseException { readBuffer.pullContext("IdentifyReplyCommandMaximumLevels"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -106,14 +106,14 @@ public static IdentifyReplyCommandBuilder staticParseIdentifyReplyCommandBuilder public static class IdentifyReplyCommandMaximumLevelsBuilderImpl implements IdentifyReplyCommand.IdentifyReplyCommandBuilder { private final byte[] maximumLevels; - private final Short numBytes; + private final Byte numBytes; - public IdentifyReplyCommandMaximumLevelsBuilderImpl(byte[] maximumLevels, Short numBytes) { + public IdentifyReplyCommandMaximumLevelsBuilderImpl(byte[] maximumLevels, Byte numBytes) { this.maximumLevels = maximumLevels; this.numBytes = numBytes; } - public IdentifyReplyCommandMaximumLevels build(Short numBytes) { + public IdentifyReplyCommandMaximumLevels build(Byte numBytes) { IdentifyReplyCommandMaximumLevels identifyReplyCommandMaximumLevels = new IdentifyReplyCommandMaximumLevels(maximumLevels, numBytes); diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandMinimumLevels.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandMinimumLevels.java index 9d01354cbda..e96ebb3f887 100644 --- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandMinimumLevels.java +++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandMinimumLevels.java @@ -46,9 +46,9 @@ public Attribute getAttribute() { protected final byte[] minimumLevels; // Arguments. - protected final Short numBytes; + protected final Byte numBytes; - public IdentifyReplyCommandMinimumLevels(byte[] minimumLevels, Short numBytes) { + public IdentifyReplyCommandMinimumLevels(byte[] minimumLevels, Byte numBytes) { super(numBytes); this.minimumLevels = minimumLevels; this.numBytes = numBytes; @@ -91,7 +91,7 @@ public int getLengthInBits() { } public static IdentifyReplyCommandBuilder staticParseIdentifyReplyCommandBuilder( - ReadBuffer readBuffer, Attribute attribute, Short numBytes) throws ParseException { + ReadBuffer readBuffer, Attribute attribute, Byte numBytes) throws ParseException { readBuffer.pullContext("IdentifyReplyCommandMinimumLevels"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -106,14 +106,14 @@ public static IdentifyReplyCommandBuilder staticParseIdentifyReplyCommandBuilder public static class IdentifyReplyCommandMinimumLevelsBuilderImpl implements IdentifyReplyCommand.IdentifyReplyCommandBuilder { private final byte[] minimumLevels; - private final Short numBytes; + private final Byte numBytes; - public IdentifyReplyCommandMinimumLevelsBuilderImpl(byte[] minimumLevels, Short numBytes) { + public IdentifyReplyCommandMinimumLevelsBuilderImpl(byte[] minimumLevels, Byte numBytes) { this.minimumLevels = minimumLevels; this.numBytes = numBytes; } - public IdentifyReplyCommandMinimumLevels build(Short numBytes) { + public IdentifyReplyCommandMinimumLevels build(Byte numBytes) { IdentifyReplyCommandMinimumLevels identifyReplyCommandMinimumLevels = new IdentifyReplyCommandMinimumLevels(minimumLevels, numBytes); diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandNetworkTerminalLevels.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandNetworkTerminalLevels.java index ce8097b46c5..49f4b7bd753 100644 --- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandNetworkTerminalLevels.java +++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandNetworkTerminalLevels.java @@ -47,9 +47,9 @@ public Attribute getAttribute() { protected final byte[] networkTerminalLevels; // Arguments. - protected final Short numBytes; + protected final Byte numBytes; - public IdentifyReplyCommandNetworkTerminalLevels(byte[] networkTerminalLevels, Short numBytes) { + public IdentifyReplyCommandNetworkTerminalLevels(byte[] networkTerminalLevels, Byte numBytes) { super(numBytes); this.networkTerminalLevels = networkTerminalLevels; this.numBytes = numBytes; @@ -93,7 +93,7 @@ public int getLengthInBits() { } public static IdentifyReplyCommandBuilder staticParseIdentifyReplyCommandBuilder( - ReadBuffer readBuffer, Attribute attribute, Short numBytes) throws ParseException { + ReadBuffer readBuffer, Attribute attribute, Byte numBytes) throws ParseException { readBuffer.pullContext("IdentifyReplyCommandNetworkTerminalLevels"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -110,15 +110,15 @@ public static IdentifyReplyCommandBuilder staticParseIdentifyReplyCommandBuilder public static class IdentifyReplyCommandNetworkTerminalLevelsBuilderImpl implements IdentifyReplyCommand.IdentifyReplyCommandBuilder { private final byte[] networkTerminalLevels; - private final Short numBytes; + private final Byte numBytes; public IdentifyReplyCommandNetworkTerminalLevelsBuilderImpl( - byte[] networkTerminalLevels, Short numBytes) { + byte[] networkTerminalLevels, Byte numBytes) { this.networkTerminalLevels = networkTerminalLevels; this.numBytes = numBytes; } - public IdentifyReplyCommandNetworkTerminalLevels build(Short numBytes) { + public IdentifyReplyCommandNetworkTerminalLevels build(Byte numBytes) { IdentifyReplyCommandNetworkTerminalLevels identifyReplyCommandNetworkTerminalLevels = new IdentifyReplyCommandNetworkTerminalLevels(networkTerminalLevels, numBytes); diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandNetworkVoltage.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandNetworkVoltage.java index d40f4ece9bb..dba4d7052dd 100644 --- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandNetworkVoltage.java +++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandNetworkVoltage.java @@ -51,10 +51,9 @@ public Attribute getAttribute() { protected final String voltsDecimalPlace; // Arguments. - protected final Short numBytes; + protected final Byte numBytes; - public IdentifyReplyCommandNetworkVoltage( - String volts, String voltsDecimalPlace, Short numBytes) { + public IdentifyReplyCommandNetworkVoltage(String volts, String voltsDecimalPlace, Byte numBytes) { super(numBytes); this.volts = volts; this.voltsDecimalPlace = voltsDecimalPlace; @@ -126,7 +125,7 @@ public int getLengthInBits() { } public static IdentifyReplyCommandBuilder staticParseIdentifyReplyCommandBuilder( - ReadBuffer readBuffer, Attribute attribute, Short numBytes) throws ParseException { + ReadBuffer readBuffer, Attribute attribute, Byte numBytes) throws ParseException { readBuffer.pullContext("IdentifyReplyCommandNetworkVoltage"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -149,16 +148,16 @@ public static class IdentifyReplyCommandNetworkVoltageBuilderImpl implements IdentifyReplyCommand.IdentifyReplyCommandBuilder { private final String volts; private final String voltsDecimalPlace; - private final Short numBytes; + private final Byte numBytes; public IdentifyReplyCommandNetworkVoltageBuilderImpl( - String volts, String voltsDecimalPlace, Short numBytes) { + String volts, String voltsDecimalPlace, Byte numBytes) { this.volts = volts; this.voltsDecimalPlace = voltsDecimalPlace; this.numBytes = numBytes; } - public IdentifyReplyCommandNetworkVoltage build(Short numBytes) { + public IdentifyReplyCommandNetworkVoltage build(Byte numBytes) { IdentifyReplyCommandNetworkVoltage identifyReplyCommandNetworkVoltage = new IdentifyReplyCommandNetworkVoltage(volts, voltsDecimalPlace, numBytes); diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandOutputUnitSummary.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandOutputUnitSummary.java index 563100211c6..d237475c76d 100644 --- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandOutputUnitSummary.java +++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandOutputUnitSummary.java @@ -49,14 +49,14 @@ public Attribute getAttribute() { protected final short timeFromLastRecoverOfMainsInSeconds; // Arguments. - protected final Short numBytes; + protected final Byte numBytes; public IdentifyReplyCommandOutputUnitSummary( IdentifyReplyCommandUnitSummary unitFlags, Byte gavStoreEnabledByte1, Byte gavStoreEnabledByte2, short timeFromLastRecoverOfMainsInSeconds, - Short numBytes) { + Byte numBytes) { super(numBytes); this.unitFlags = unitFlags; this.gavStoreEnabledByte1 = gavStoreEnabledByte1; @@ -139,7 +139,7 @@ public int getLengthInBits() { } public static IdentifyReplyCommandBuilder staticParseIdentifyReplyCommandBuilder( - ReadBuffer readBuffer, Attribute attribute, Short numBytes) throws ParseException { + ReadBuffer readBuffer, Attribute attribute, Byte numBytes) throws ParseException { readBuffer.pullContext("IdentifyReplyCommandOutputUnitSummary"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -175,14 +175,14 @@ public static class IdentifyReplyCommandOutputUnitSummaryBuilderImpl private final Byte gavStoreEnabledByte1; private final Byte gavStoreEnabledByte2; private final short timeFromLastRecoverOfMainsInSeconds; - private final Short numBytes; + private final Byte numBytes; public IdentifyReplyCommandOutputUnitSummaryBuilderImpl( IdentifyReplyCommandUnitSummary unitFlags, Byte gavStoreEnabledByte1, Byte gavStoreEnabledByte2, short timeFromLastRecoverOfMainsInSeconds, - Short numBytes) { + Byte numBytes) { this.unitFlags = unitFlags; this.gavStoreEnabledByte1 = gavStoreEnabledByte1; this.gavStoreEnabledByte2 = gavStoreEnabledByte2; @@ -190,7 +190,7 @@ public IdentifyReplyCommandOutputUnitSummaryBuilderImpl( this.numBytes = numBytes; } - public IdentifyReplyCommandOutputUnitSummary build(Short numBytes) { + public IdentifyReplyCommandOutputUnitSummary build(Byte numBytes) { IdentifyReplyCommandOutputUnitSummary identifyReplyCommandOutputUnitSummary = new IdentifyReplyCommandOutputUnitSummary( diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandSummary.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandSummary.java index 50cffc9882d..7152cd40ce8 100644 --- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandSummary.java +++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandSummary.java @@ -48,10 +48,10 @@ public Attribute getAttribute() { protected final String version; // Arguments. - protected final Short numBytes; + protected final Byte numBytes; public IdentifyReplyCommandSummary( - String partName, byte unitServiceType, String version, Short numBytes) { + String partName, byte unitServiceType, String version, Byte numBytes) { super(numBytes); this.partName = partName; this.unitServiceType = unitServiceType; @@ -114,7 +114,7 @@ public int getLengthInBits() { } public static IdentifyReplyCommandBuilder staticParseIdentifyReplyCommandBuilder( - ReadBuffer readBuffer, Attribute attribute, Short numBytes) throws ParseException { + ReadBuffer readBuffer, Attribute attribute, Byte numBytes) throws ParseException { readBuffer.pullContext("IdentifyReplyCommandSummary"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -135,17 +135,17 @@ public static class IdentifyReplyCommandSummaryBuilderImpl private final String partName; private final byte unitServiceType; private final String version; - private final Short numBytes; + private final Byte numBytes; public IdentifyReplyCommandSummaryBuilderImpl( - String partName, byte unitServiceType, String version, Short numBytes) { + String partName, byte unitServiceType, String version, Byte numBytes) { this.partName = partName; this.unitServiceType = unitServiceType; this.version = version; this.numBytes = numBytes; } - public IdentifyReplyCommandSummary build(Short numBytes) { + public IdentifyReplyCommandSummary build(Byte numBytes) { IdentifyReplyCommandSummary identifyReplyCommandSummary = new IdentifyReplyCommandSummary(partName, unitServiceType, version, numBytes); diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandTerminalLevels.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandTerminalLevels.java index d522a91cbf1..2cd966110f5 100644 --- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandTerminalLevels.java +++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandTerminalLevels.java @@ -46,9 +46,9 @@ public Attribute getAttribute() { protected final byte[] terminalLevels; // Arguments. - protected final Short numBytes; + protected final Byte numBytes; - public IdentifyReplyCommandTerminalLevels(byte[] terminalLevels, Short numBytes) { + public IdentifyReplyCommandTerminalLevels(byte[] terminalLevels, Byte numBytes) { super(numBytes); this.terminalLevels = terminalLevels; this.numBytes = numBytes; @@ -91,7 +91,7 @@ public int getLengthInBits() { } public static IdentifyReplyCommandBuilder staticParseIdentifyReplyCommandBuilder( - ReadBuffer readBuffer, Attribute attribute, Short numBytes) throws ParseException { + ReadBuffer readBuffer, Attribute attribute, Byte numBytes) throws ParseException { readBuffer.pullContext("IdentifyReplyCommandTerminalLevels"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -106,14 +106,14 @@ public static IdentifyReplyCommandBuilder staticParseIdentifyReplyCommandBuilder public static class IdentifyReplyCommandTerminalLevelsBuilderImpl implements IdentifyReplyCommand.IdentifyReplyCommandBuilder { private final byte[] terminalLevels; - private final Short numBytes; + private final Byte numBytes; - public IdentifyReplyCommandTerminalLevelsBuilderImpl(byte[] terminalLevels, Short numBytes) { + public IdentifyReplyCommandTerminalLevelsBuilderImpl(byte[] terminalLevels, Byte numBytes) { this.terminalLevels = terminalLevels; this.numBytes = numBytes; } - public IdentifyReplyCommandTerminalLevels build(Short numBytes) { + public IdentifyReplyCommandTerminalLevels build(Byte numBytes) { IdentifyReplyCommandTerminalLevels identifyReplyCommandTerminalLevels = new IdentifyReplyCommandTerminalLevels(terminalLevels, numBytes); diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandType.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandType.java index 33c661efe9a..460cf589094 100644 --- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandType.java +++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/IdentifyReplyCommandType.java @@ -46,9 +46,9 @@ public Attribute getAttribute() { protected final String unitType; // Arguments. - protected final Short numBytes; + protected final Byte numBytes; - public IdentifyReplyCommandType(String unitType, Short numBytes) { + public IdentifyReplyCommandType(String unitType, Byte numBytes) { super(numBytes); this.unitType = unitType; this.numBytes = numBytes; @@ -89,7 +89,7 @@ public int getLengthInBits() { } public static IdentifyReplyCommandBuilder staticParseIdentifyReplyCommandBuilder( - ReadBuffer readBuffer, Attribute attribute, Short numBytes) throws ParseException { + ReadBuffer readBuffer, Attribute attribute, Byte numBytes) throws ParseException { readBuffer.pullContext("IdentifyReplyCommandType"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -104,14 +104,14 @@ public static IdentifyReplyCommandBuilder staticParseIdentifyReplyCommandBuilder public static class IdentifyReplyCommandTypeBuilderImpl implements IdentifyReplyCommand.IdentifyReplyCommandBuilder { private final String unitType; - private final Short numBytes; + private final Byte numBytes; - public IdentifyReplyCommandTypeBuilderImpl(String unitType, Short numBytes) { + public IdentifyReplyCommandTypeBuilderImpl(String unitType, Byte numBytes) { this.unitType = unitType; this.numBytes = numBytes; } - public IdentifyReplyCommandType build(Short numBytes) { + public IdentifyReplyCommandType build(Byte numBytes) { IdentifyReplyCommandType identifyReplyCommandType = new IdentifyReplyCommandType(unitType, numBytes); diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/LightingCommandTypeContainer.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/LightingCommandTypeContainer.java index 7ab21df67f9..9dd6ea096cb 100644 --- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/LightingCommandTypeContainer.java +++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/LightingCommandTypeContainer.java @@ -26,58 +26,58 @@ // Code generated by code-generation. DO NOT EDIT. public enum LightingCommandTypeContainer { - LightingCommandOff((short) 0x01, (short) 1, LightingCommandType.OFF), - LightingCommandOn((short) 0x79, (short) 1, LightingCommandType.ON), + LightingCommandOff((short) 0x01, (byte) 1, LightingCommandType.OFF), + LightingCommandOn((short) 0x79, (byte) 1, LightingCommandType.ON), LightingCommandRampToLevel_Instantaneous( - (short) 0x02, (short) 1, LightingCommandType.RAMP_TO_LEVEL), - LightingCommandRampToLevel_4Second((short) 0x0A, (short) 2, LightingCommandType.RAMP_TO_LEVEL), - LightingCommandRampToLevel_8Second((short) 0x12, (short) 2, LightingCommandType.RAMP_TO_LEVEL), - LightingCommandRampToLevel_12Second((short) 0x1A, (short) 2, LightingCommandType.RAMP_TO_LEVEL), - LightingCommandRampToLevel_20Second((short) 0x22, (short) 2, LightingCommandType.RAMP_TO_LEVEL), - LightingCommandRampToLevel_30Second((short) 0x2A, (short) 2, LightingCommandType.RAMP_TO_LEVEL), - LightingCommandRampToLevel_40Second((short) 0x32, (short) 2, LightingCommandType.RAMP_TO_LEVEL), - LightingCommandRampToLevel_60Second((short) 0x3A, (short) 2, LightingCommandType.RAMP_TO_LEVEL), - LightingCommandRampToLevel_90Second((short) 0x42, (short) 2, LightingCommandType.RAMP_TO_LEVEL), - LightingCommandRampToLevel_120Second((short) 0x4A, (short) 2, LightingCommandType.RAMP_TO_LEVEL), - LightingCommandRampToLevel_180Second((short) 0x52, (short) 2, LightingCommandType.RAMP_TO_LEVEL), - LightingCommandRampToLevel_300Second((short) 0x5A, (short) 2, LightingCommandType.RAMP_TO_LEVEL), - LightingCommandRampToLevel_420Second((short) 0x62, (short) 2, LightingCommandType.RAMP_TO_LEVEL), - LightingCommandRampToLevel_600Second((short) 0x6A, (short) 2, LightingCommandType.RAMP_TO_LEVEL), - LightingCommandRampToLevel_900Second((short) 0x72, (short) 2, LightingCommandType.RAMP_TO_LEVEL), - LightingCommandRampToLevel_1020Second((short) 0x7A, (short) 2, LightingCommandType.RAMP_TO_LEVEL), - LightingCommandTerminateRamp((short) 0x09, (short) 1, LightingCommandType.TERMINATE_RAMP), - LightingCommandLabel_0Bytes((short) 0xA0, (short) 0, LightingCommandType.LABEL), - LightingCommandLabel_1Bytes((short) 0xA1, (short) 1, LightingCommandType.LABEL), - LightingCommandLabel_2Bytes((short) 0xA2, (short) 2, LightingCommandType.LABEL), - LightingCommandLabel_3Bytes((short) 0xA3, (short) 3, LightingCommandType.LABEL), - LightingCommandLabel_4Bytes((short) 0xA4, (short) 4, LightingCommandType.LABEL), - LightingCommandLabel_5Bytes((short) 0xA5, (short) 5, LightingCommandType.LABEL), - LightingCommandLabel_6Bytes((short) 0xA6, (short) 6, LightingCommandType.LABEL), - LightingCommandLabel_7Bytes((short) 0xA7, (short) 7, LightingCommandType.LABEL), - LightingCommandLabel_8Bytes((short) 0xA8, (short) 8, LightingCommandType.LABEL), - LightingCommandLabel_9Bytes((short) 0xA9, (short) 9, LightingCommandType.LABEL), - LightingCommandLabel_10Bytes((short) 0xAA, (short) 10, LightingCommandType.LABEL), - LightingCommandLabel_11Bytes((short) 0xAB, (short) 11, LightingCommandType.LABEL), - LightingCommandLabel_12Bytes((short) 0xAC, (short) 12, LightingCommandType.LABEL), - LightingCommandLabel_13Bytes((short) 0xAD, (short) 13, LightingCommandType.LABEL), - LightingCommandLabel_14Bytes((short) 0xAE, (short) 14, LightingCommandType.LABEL), - LightingCommandLabel_15Bytes((short) 0xAF, (short) 15, LightingCommandType.LABEL), - LightingCommandLabel_16Bytes((short) 0xB0, (short) 16, LightingCommandType.LABEL), - LightingCommandLabel_17Bytes((short) 0xB1, (short) 17, LightingCommandType.LABEL), - LightingCommandLabel_18Bytes((short) 0xB2, (short) 18, LightingCommandType.LABEL), - LightingCommandLabel_19Bytes((short) 0xB3, (short) 19, LightingCommandType.LABEL), - LightingCommandLabel_20Bytes((short) 0xB4, (short) 20, LightingCommandType.LABEL), - LightingCommandLabel_21Bytes((short) 0xB5, (short) 21, LightingCommandType.LABEL), - LightingCommandLabel_22Bytes((short) 0xB6, (short) 22, LightingCommandType.LABEL), - LightingCommandLabel_23Bytes((short) 0xB7, (short) 23, LightingCommandType.LABEL), - LightingCommandLabel_24Bytes((short) 0xB8, (short) 24, LightingCommandType.LABEL), - LightingCommandLabel_25Bytes((short) 0xB9, (short) 25, LightingCommandType.LABEL), - LightingCommandLabel_26Bytes((short) 0xBA, (short) 26, LightingCommandType.LABEL), - LightingCommandLabel_27Bytes((short) 0xBB, (short) 27, LightingCommandType.LABEL), - LightingCommandLabel_28Bytes((short) 0xBC, (short) 28, LightingCommandType.LABEL), - LightingCommandLabel_29Bytes((short) 0xBD, (short) 29, LightingCommandType.LABEL), - LightingCommandLabel_30Bytes((short) 0xBE, (short) 30, LightingCommandType.LABEL), - LightingCommandLabel_32Bytes((short) 0xBF, (short) 31, LightingCommandType.LABEL); + (short) 0x02, (byte) 1, LightingCommandType.RAMP_TO_LEVEL), + LightingCommandRampToLevel_4Second((short) 0x0A, (byte) 2, LightingCommandType.RAMP_TO_LEVEL), + LightingCommandRampToLevel_8Second((short) 0x12, (byte) 2, LightingCommandType.RAMP_TO_LEVEL), + LightingCommandRampToLevel_12Second((short) 0x1A, (byte) 2, LightingCommandType.RAMP_TO_LEVEL), + LightingCommandRampToLevel_20Second((short) 0x22, (byte) 2, LightingCommandType.RAMP_TO_LEVEL), + LightingCommandRampToLevel_30Second((short) 0x2A, (byte) 2, LightingCommandType.RAMP_TO_LEVEL), + LightingCommandRampToLevel_40Second((short) 0x32, (byte) 2, LightingCommandType.RAMP_TO_LEVEL), + LightingCommandRampToLevel_60Second((short) 0x3A, (byte) 2, LightingCommandType.RAMP_TO_LEVEL), + LightingCommandRampToLevel_90Second((short) 0x42, (byte) 2, LightingCommandType.RAMP_TO_LEVEL), + LightingCommandRampToLevel_120Second((short) 0x4A, (byte) 2, LightingCommandType.RAMP_TO_LEVEL), + LightingCommandRampToLevel_180Second((short) 0x52, (byte) 2, LightingCommandType.RAMP_TO_LEVEL), + LightingCommandRampToLevel_300Second((short) 0x5A, (byte) 2, LightingCommandType.RAMP_TO_LEVEL), + LightingCommandRampToLevel_420Second((short) 0x62, (byte) 2, LightingCommandType.RAMP_TO_LEVEL), + LightingCommandRampToLevel_600Second((short) 0x6A, (byte) 2, LightingCommandType.RAMP_TO_LEVEL), + LightingCommandRampToLevel_900Second((short) 0x72, (byte) 2, LightingCommandType.RAMP_TO_LEVEL), + LightingCommandRampToLevel_1020Second((short) 0x7A, (byte) 2, LightingCommandType.RAMP_TO_LEVEL), + LightingCommandTerminateRamp((short) 0x09, (byte) 1, LightingCommandType.TERMINATE_RAMP), + LightingCommandLabel_0Bytes((short) 0xA0, (byte) 0, LightingCommandType.LABEL), + LightingCommandLabel_1Bytes((short) 0xA1, (byte) 1, LightingCommandType.LABEL), + LightingCommandLabel_2Bytes((short) 0xA2, (byte) 2, LightingCommandType.LABEL), + LightingCommandLabel_3Bytes((short) 0xA3, (byte) 3, LightingCommandType.LABEL), + LightingCommandLabel_4Bytes((short) 0xA4, (byte) 4, LightingCommandType.LABEL), + LightingCommandLabel_5Bytes((short) 0xA5, (byte) 5, LightingCommandType.LABEL), + LightingCommandLabel_6Bytes((short) 0xA6, (byte) 6, LightingCommandType.LABEL), + LightingCommandLabel_7Bytes((short) 0xA7, (byte) 7, LightingCommandType.LABEL), + LightingCommandLabel_8Bytes((short) 0xA8, (byte) 8, LightingCommandType.LABEL), + LightingCommandLabel_9Bytes((short) 0xA9, (byte) 9, LightingCommandType.LABEL), + LightingCommandLabel_10Bytes((short) 0xAA, (byte) 10, LightingCommandType.LABEL), + LightingCommandLabel_11Bytes((short) 0xAB, (byte) 11, LightingCommandType.LABEL), + LightingCommandLabel_12Bytes((short) 0xAC, (byte) 12, LightingCommandType.LABEL), + LightingCommandLabel_13Bytes((short) 0xAD, (byte) 13, LightingCommandType.LABEL), + LightingCommandLabel_14Bytes((short) 0xAE, (byte) 14, LightingCommandType.LABEL), + LightingCommandLabel_15Bytes((short) 0xAF, (byte) 15, LightingCommandType.LABEL), + LightingCommandLabel_16Bytes((short) 0xB0, (byte) 16, LightingCommandType.LABEL), + LightingCommandLabel_17Bytes((short) 0xB1, (byte) 17, LightingCommandType.LABEL), + LightingCommandLabel_18Bytes((short) 0xB2, (byte) 18, LightingCommandType.LABEL), + LightingCommandLabel_19Bytes((short) 0xB3, (byte) 19, LightingCommandType.LABEL), + LightingCommandLabel_20Bytes((short) 0xB4, (byte) 20, LightingCommandType.LABEL), + LightingCommandLabel_21Bytes((short) 0xB5, (byte) 21, LightingCommandType.LABEL), + LightingCommandLabel_22Bytes((short) 0xB6, (byte) 22, LightingCommandType.LABEL), + LightingCommandLabel_23Bytes((short) 0xB7, (byte) 23, LightingCommandType.LABEL), + LightingCommandLabel_24Bytes((short) 0xB8, (byte) 24, LightingCommandType.LABEL), + LightingCommandLabel_25Bytes((short) 0xB9, (byte) 25, LightingCommandType.LABEL), + LightingCommandLabel_26Bytes((short) 0xBA, (byte) 26, LightingCommandType.LABEL), + LightingCommandLabel_27Bytes((short) 0xBB, (byte) 27, LightingCommandType.LABEL), + LightingCommandLabel_28Bytes((short) 0xBC, (byte) 28, LightingCommandType.LABEL), + LightingCommandLabel_29Bytes((short) 0xBD, (byte) 29, LightingCommandType.LABEL), + LightingCommandLabel_30Bytes((short) 0xBE, (byte) 30, LightingCommandType.LABEL), + LightingCommandLabel_32Bytes((short) 0xBF, (byte) 31, LightingCommandType.LABEL); private static final Map map; static { @@ -88,10 +88,10 @@ public enum LightingCommandTypeContainer { } private final short value; - private final short numBytes; + private final byte numBytes; private final LightingCommandType commandType; - LightingCommandTypeContainer(short value, short numBytes, LightingCommandType commandType) { + LightingCommandTypeContainer(short value, byte numBytes, LightingCommandType commandType) { this.value = value; this.numBytes = numBytes; this.commandType = commandType; @@ -101,11 +101,11 @@ public short getValue() { return value; } - public short getNumBytes() { + public byte getNumBytes() { return numBytes; } - public static LightingCommandTypeContainer firstEnumForFieldNumBytes(short fieldValue) { + public static LightingCommandTypeContainer firstEnumForFieldNumBytes(byte fieldValue) { for (LightingCommandTypeContainer _val : LightingCommandTypeContainer.values()) { if (_val.getNumBytes() == fieldValue) { return _val; @@ -114,7 +114,7 @@ public static LightingCommandTypeContainer firstEnumForFieldNumBytes(short field return null; } - public static List enumsForFieldNumBytes(short fieldValue) { + public static List enumsForFieldNumBytes(byte fieldValue) { List _values = new ArrayList<>(); for (LightingCommandTypeContainer _val : LightingCommandTypeContainer.values()) { if (_val.getNumBytes() == fieldValue) { diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/MeasurementCommandTypeContainer.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/MeasurementCommandTypeContainer.java index 1fae09f6613..0642f94dba7 100644 --- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/MeasurementCommandTypeContainer.java +++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/MeasurementCommandTypeContainer.java @@ -27,7 +27,7 @@ public enum MeasurementCommandTypeContainer { MeasurementCommandChannelMeasurementData( - (short) 0x0E, (short) 6, MeasurementCommandType.MEASUREMENT_EVENT); + (short) 0x0E, (byte) 6, MeasurementCommandType.MEASUREMENT_EVENT); private static final Map map; static { @@ -38,10 +38,10 @@ public enum MeasurementCommandTypeContainer { } private final short value; - private final short numBytes; + private final byte numBytes; private final MeasurementCommandType commandType; - MeasurementCommandTypeContainer(short value, short numBytes, MeasurementCommandType commandType) { + MeasurementCommandTypeContainer(short value, byte numBytes, MeasurementCommandType commandType) { this.value = value; this.numBytes = numBytes; this.commandType = commandType; @@ -51,11 +51,11 @@ public short getValue() { return value; } - public short getNumBytes() { + public byte getNumBytes() { return numBytes; } - public static MeasurementCommandTypeContainer firstEnumForFieldNumBytes(short fieldValue) { + public static MeasurementCommandTypeContainer firstEnumForFieldNumBytes(byte fieldValue) { for (MeasurementCommandTypeContainer _val : MeasurementCommandTypeContainer.values()) { if (_val.getNumBytes() == fieldValue) { return _val; @@ -64,7 +64,7 @@ public static MeasurementCommandTypeContainer firstEnumForFieldNumBytes(short fi return null; } - public static List enumsForFieldNumBytes(short fieldValue) { + public static List enumsForFieldNumBytes(byte fieldValue) { List _values = new ArrayList<>(); for (MeasurementCommandTypeContainer _val : MeasurementCommandTypeContainer.values()) { if (_val.getNumBytes() == fieldValue) { diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/MediaTransportControlCommandTypeContainer.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/MediaTransportControlCommandTypeContainer.java index 64f77ece569..5a9a4afcc6f 100644 --- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/MediaTransportControlCommandTypeContainer.java +++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/MediaTransportControlCommandTypeContainer.java @@ -26,234 +26,234 @@ // Code generated by code-generation. DO NOT EDIT. public enum MediaTransportControlCommandTypeContainer { - MediaTransportControlCommandStop((short) 0x01, (short) 1, MediaTransportControlCommandType.STOP), - MediaTransportControlCommandPlay((short) 0x79, (short) 1, MediaTransportControlCommandType.PLAY), + MediaTransportControlCommandStop((short) 0x01, (byte) 1, MediaTransportControlCommandType.STOP), + MediaTransportControlCommandPlay((short) 0x79, (byte) 1, MediaTransportControlCommandType.PLAY), MediaTransportControlCommandPauseResume( - (short) 0x0A, (short) 2, MediaTransportControlCommandType.PAUSE_RESUME), + (short) 0x0A, (byte) 2, MediaTransportControlCommandType.PAUSE_RESUME), MediaTransportControlCommandSelectCategory( - (short) 0x12, (short) 2, MediaTransportControlCommandType.SELECT_CATEGORY), + (short) 0x12, (byte) 2, MediaTransportControlCommandType.SELECT_CATEGORY), MediaTransportControlCommandSelectSelection( - (short) 0x1B, (short) 3, MediaTransportControlCommandType.SELECT_SELECTION), + (short) 0x1B, (byte) 3, MediaTransportControlCommandType.SELECT_SELECTION), MediaTransportControlCommandSelectTrack( - (short) 0x25, (short) 5, MediaTransportControlCommandType.SELECT_TRACK), + (short) 0x25, (byte) 5, MediaTransportControlCommandType.SELECT_TRACK), MediaTransportControlCommandShuffleOnOff( - (short) 0x2A, (short) 2, MediaTransportControlCommandType.SHUFFLE_ON_OFF), + (short) 0x2A, (byte) 2, MediaTransportControlCommandType.SHUFFLE_ON_OFF), MediaTransportControlCommandRepeatOnOff( - (short) 0x32, (short) 2, MediaTransportControlCommandType.REPEAT_ON_OFF), + (short) 0x32, (byte) 2, MediaTransportControlCommandType.REPEAT_ON_OFF), MediaTransportControlCommandNextPreviousCategory( - (short) 0x3A, (short) 2, MediaTransportControlCommandType.NEXT_PREVIOUS_CATEGORY), + (short) 0x3A, (byte) 2, MediaTransportControlCommandType.NEXT_PREVIOUS_CATEGORY), MediaTransportControlCommandNextPreviousSelection( - (short) 0x42, (short) 2, MediaTransportControlCommandType.NEXT_PREVIOUS_SELECTION), + (short) 0x42, (byte) 2, MediaTransportControlCommandType.NEXT_PREVIOUS_SELECTION), MediaTransportControlCommandNextPreviousTrack( - (short) 0x4A, (short) 2, MediaTransportControlCommandType.NEXT_PREVIOUS_TRACK), + (short) 0x4A, (byte) 2, MediaTransportControlCommandType.NEXT_PREVIOUS_TRACK), MediaTransportControlCommandFastForward( - (short) 0x52, (short) 2, MediaTransportControlCommandType.FAST_FORWARD), + (short) 0x52, (byte) 2, MediaTransportControlCommandType.FAST_FORWARD), MediaTransportControlCommandRewind( - (short) 0x5A, (short) 2, MediaTransportControlCommandType.REWIND), + (short) 0x5A, (byte) 2, MediaTransportControlCommandType.REWIND), MediaTransportControlCommandSourcePowerControl( - (short) 0x62, (short) 2, MediaTransportControlCommandType.SOURCE_POWER_CONTROL), + (short) 0x62, (byte) 2, MediaTransportControlCommandType.SOURCE_POWER_CONTROL), MediaTransportControlCommandTotalTracks( - (short) 0x6D, (short) 5, MediaTransportControlCommandType.TOTAL_TRACKS), + (short) 0x6D, (byte) 5, MediaTransportControlCommandType.TOTAL_TRACKS), MediaTransportControlCommandStatusRequest( - (short) 0x71, (short) 1, MediaTransportControlCommandType.STATUS_REQUEST), + (short) 0x71, (byte) 1, MediaTransportControlCommandType.STATUS_REQUEST), MediaTransportControlCommandEnumerateCategoriesSelectionsTracks( (short) 0x73, - (short) 3, + (byte) 3, MediaTransportControlCommandType.ENUMERATE_CATEGORIES_SELECTIONS_TRACKS), MediaTransportControlCommandEnumerationSize( - (short) 0x74, (short) 4, MediaTransportControlCommandType.ENUMERATION_SIZE), + (short) 0x74, (byte) 4, MediaTransportControlCommandType.ENUMERATION_SIZE), MediaTransportControlCommandTrackName_0Bytes( - (short) 0x80, (short) 0, MediaTransportControlCommandType.TRACK_NAME), + (short) 0x80, (byte) 0, MediaTransportControlCommandType.TRACK_NAME), MediaTransportControlCommandTrackName_1Bytes( - (short) 0x81, (short) 1, MediaTransportControlCommandType.TRACK_NAME), + (short) 0x81, (byte) 1, MediaTransportControlCommandType.TRACK_NAME), MediaTransportControlCommandTrackName_2Bytes( - (short) 0x82, (short) 2, MediaTransportControlCommandType.TRACK_NAME), + (short) 0x82, (byte) 2, MediaTransportControlCommandType.TRACK_NAME), MediaTransportControlCommandTrackName_3Bytes( - (short) 0x83, (short) 3, MediaTransportControlCommandType.TRACK_NAME), + (short) 0x83, (byte) 3, MediaTransportControlCommandType.TRACK_NAME), MediaTransportControlCommandTrackName_4Bytes( - (short) 0x84, (short) 4, MediaTransportControlCommandType.TRACK_NAME), + (short) 0x84, (byte) 4, MediaTransportControlCommandType.TRACK_NAME), MediaTransportControlCommandTrackName_5Bytes( - (short) 0x85, (short) 5, MediaTransportControlCommandType.TRACK_NAME), + (short) 0x85, (byte) 5, MediaTransportControlCommandType.TRACK_NAME), MediaTransportControlCommandTrackName_6Bytes( - (short) 0x86, (short) 6, MediaTransportControlCommandType.TRACK_NAME), + (short) 0x86, (byte) 6, MediaTransportControlCommandType.TRACK_NAME), MediaTransportControlCommandTrackName_7Bytes( - (short) 0x87, (short) 7, MediaTransportControlCommandType.TRACK_NAME), + (short) 0x87, (byte) 7, MediaTransportControlCommandType.TRACK_NAME), MediaTransportControlCommandTrackName_8Bytes( - (short) 0x88, (short) 8, MediaTransportControlCommandType.TRACK_NAME), + (short) 0x88, (byte) 8, MediaTransportControlCommandType.TRACK_NAME), MediaTransportControlCommandTrackName_9Bytes( - (short) 0x89, (short) 9, MediaTransportControlCommandType.TRACK_NAME), + (short) 0x89, (byte) 9, MediaTransportControlCommandType.TRACK_NAME), MediaTransportControlCommandTrackName_10Bytes( - (short) 0x8A, (short) 10, MediaTransportControlCommandType.TRACK_NAME), + (short) 0x8A, (byte) 10, MediaTransportControlCommandType.TRACK_NAME), MediaTransportControlCommandTrackName_11Bytes( - (short) 0x8B, (short) 11, MediaTransportControlCommandType.TRACK_NAME), + (short) 0x8B, (byte) 11, MediaTransportControlCommandType.TRACK_NAME), MediaTransportControlCommandTrackName_12Bytes( - (short) 0x8C, (short) 12, MediaTransportControlCommandType.TRACK_NAME), + (short) 0x8C, (byte) 12, MediaTransportControlCommandType.TRACK_NAME), MediaTransportControlCommandTrackName_13Bytes( - (short) 0x8D, (short) 13, MediaTransportControlCommandType.TRACK_NAME), + (short) 0x8D, (byte) 13, MediaTransportControlCommandType.TRACK_NAME), MediaTransportControlCommandTrackName_14Bytes( - (short) 0x8E, (short) 14, MediaTransportControlCommandType.TRACK_NAME), + (short) 0x8E, (byte) 14, MediaTransportControlCommandType.TRACK_NAME), MediaTransportControlCommandTrackName_15Bytes( - (short) 0x8F, (short) 15, MediaTransportControlCommandType.TRACK_NAME), + (short) 0x8F, (byte) 15, MediaTransportControlCommandType.TRACK_NAME), MediaTransportControlCommandTrackName_16Bytes( - (short) 0x90, (short) 16, MediaTransportControlCommandType.TRACK_NAME), + (short) 0x90, (byte) 16, MediaTransportControlCommandType.TRACK_NAME), MediaTransportControlCommandTrackName_17Bytes( - (short) 0x91, (short) 17, MediaTransportControlCommandType.TRACK_NAME), + (short) 0x91, (byte) 17, MediaTransportControlCommandType.TRACK_NAME), MediaTransportControlCommandTrackName_18Bytes( - (short) 0x92, (short) 18, MediaTransportControlCommandType.TRACK_NAME), + (short) 0x92, (byte) 18, MediaTransportControlCommandType.TRACK_NAME), MediaTransportControlCommandTrackName_19Bytes( - (short) 0x93, (short) 19, MediaTransportControlCommandType.TRACK_NAME), + (short) 0x93, (byte) 19, MediaTransportControlCommandType.TRACK_NAME), MediaTransportControlCommandTrackName_20Bytes( - (short) 0x94, (short) 20, MediaTransportControlCommandType.TRACK_NAME), + (short) 0x94, (byte) 20, MediaTransportControlCommandType.TRACK_NAME), MediaTransportControlCommandTrackName_21Bytes( - (short) 0x95, (short) 21, MediaTransportControlCommandType.TRACK_NAME), + (short) 0x95, (byte) 21, MediaTransportControlCommandType.TRACK_NAME), MediaTransportControlCommandTrackName_22Bytes( - (short) 0x96, (short) 22, MediaTransportControlCommandType.TRACK_NAME), + (short) 0x96, (byte) 22, MediaTransportControlCommandType.TRACK_NAME), MediaTransportControlCommandTrackName_23Bytes( - (short) 0x97, (short) 23, MediaTransportControlCommandType.TRACK_NAME), + (short) 0x97, (byte) 23, MediaTransportControlCommandType.TRACK_NAME), MediaTransportControlCommandTrackName_24Bytes( - (short) 0x98, (short) 24, MediaTransportControlCommandType.TRACK_NAME), + (short) 0x98, (byte) 24, MediaTransportControlCommandType.TRACK_NAME), MediaTransportControlCommandTrackName_25Bytes( - (short) 0x99, (short) 25, MediaTransportControlCommandType.TRACK_NAME), + (short) 0x99, (byte) 25, MediaTransportControlCommandType.TRACK_NAME), MediaTransportControlCommandTrackName_26Bytes( - (short) 0x9A, (short) 26, MediaTransportControlCommandType.TRACK_NAME), + (short) 0x9A, (byte) 26, MediaTransportControlCommandType.TRACK_NAME), MediaTransportControlCommandTrackName_27Bytes( - (short) 0x9B, (short) 27, MediaTransportControlCommandType.TRACK_NAME), + (short) 0x9B, (byte) 27, MediaTransportControlCommandType.TRACK_NAME), MediaTransportControlCommandTrackName_28Bytes( - (short) 0x9C, (short) 28, MediaTransportControlCommandType.TRACK_NAME), + (short) 0x9C, (byte) 28, MediaTransportControlCommandType.TRACK_NAME), MediaTransportControlCommandTrackName_29Bytes( - (short) 0x9D, (short) 29, MediaTransportControlCommandType.TRACK_NAME), + (short) 0x9D, (byte) 29, MediaTransportControlCommandType.TRACK_NAME), MediaTransportControlCommandTrackName_30Bytes( - (short) 0x9E, (short) 30, MediaTransportControlCommandType.TRACK_NAME), + (short) 0x9E, (byte) 30, MediaTransportControlCommandType.TRACK_NAME), MediaTransportControlCommandTrackName_31Bytes( - (short) 0x9F, (short) 31, MediaTransportControlCommandType.TRACK_NAME), + (short) 0x9F, (byte) 31, MediaTransportControlCommandType.TRACK_NAME), MediaTransportControlCommandSelectionName_0Bytes( - (short) 0xA0, (short) 0, MediaTransportControlCommandType.SELECTION_NAME), + (short) 0xA0, (byte) 0, MediaTransportControlCommandType.SELECTION_NAME), MediaTransportControlCommandSelectionName_1Bytes( - (short) 0xA1, (short) 1, MediaTransportControlCommandType.SELECTION_NAME), + (short) 0xA1, (byte) 1, MediaTransportControlCommandType.SELECTION_NAME), MediaTransportControlCommandSelectionName_2Bytes( - (short) 0xA2, (short) 2, MediaTransportControlCommandType.SELECTION_NAME), + (short) 0xA2, (byte) 2, MediaTransportControlCommandType.SELECTION_NAME), MediaTransportControlCommandSelectionName_3Bytes( - (short) 0xA3, (short) 3, MediaTransportControlCommandType.SELECTION_NAME), + (short) 0xA3, (byte) 3, MediaTransportControlCommandType.SELECTION_NAME), MediaTransportControlCommandSelectionName_4Bytes( - (short) 0xA4, (short) 4, MediaTransportControlCommandType.SELECTION_NAME), + (short) 0xA4, (byte) 4, MediaTransportControlCommandType.SELECTION_NAME), MediaTransportControlCommandSelectionName_5Bytes( - (short) 0xA5, (short) 5, MediaTransportControlCommandType.SELECTION_NAME), + (short) 0xA5, (byte) 5, MediaTransportControlCommandType.SELECTION_NAME), MediaTransportControlCommandSelectionName_6Bytes( - (short) 0xA6, (short) 6, MediaTransportControlCommandType.SELECTION_NAME), + (short) 0xA6, (byte) 6, MediaTransportControlCommandType.SELECTION_NAME), MediaTransportControlCommandSelectionName_7Bytes( - (short) 0xA7, (short) 7, MediaTransportControlCommandType.SELECTION_NAME), + (short) 0xA7, (byte) 7, MediaTransportControlCommandType.SELECTION_NAME), MediaTransportControlCommandSelectionName_8Bytes( - (short) 0xA8, (short) 8, MediaTransportControlCommandType.SELECTION_NAME), + (short) 0xA8, (byte) 8, MediaTransportControlCommandType.SELECTION_NAME), MediaTransportControlCommandSelectionName_9Bytes( - (short) 0xA9, (short) 9, MediaTransportControlCommandType.SELECTION_NAME), + (short) 0xA9, (byte) 9, MediaTransportControlCommandType.SELECTION_NAME), MediaTransportControlCommandSelectionName_10Bytes( - (short) 0xAA, (short) 10, MediaTransportControlCommandType.SELECTION_NAME), + (short) 0xAA, (byte) 10, MediaTransportControlCommandType.SELECTION_NAME), MediaTransportControlCommandSelectionName_11Bytes( - (short) 0xAB, (short) 11, MediaTransportControlCommandType.SELECTION_NAME), + (short) 0xAB, (byte) 11, MediaTransportControlCommandType.SELECTION_NAME), MediaTransportControlCommandSelectionName_12Bytes( - (short) 0xAC, (short) 12, MediaTransportControlCommandType.SELECTION_NAME), + (short) 0xAC, (byte) 12, MediaTransportControlCommandType.SELECTION_NAME), MediaTransportControlCommandSelectionName_13Bytes( - (short) 0xAD, (short) 13, MediaTransportControlCommandType.SELECTION_NAME), + (short) 0xAD, (byte) 13, MediaTransportControlCommandType.SELECTION_NAME), MediaTransportControlCommandSelectionName_14Bytes( - (short) 0xAE, (short) 14, MediaTransportControlCommandType.SELECTION_NAME), + (short) 0xAE, (byte) 14, MediaTransportControlCommandType.SELECTION_NAME), MediaTransportControlCommandSelectionName_15Bytes( - (short) 0xAF, (short) 15, MediaTransportControlCommandType.SELECTION_NAME), + (short) 0xAF, (byte) 15, MediaTransportControlCommandType.SELECTION_NAME), MediaTransportControlCommandSelectionName_16Bytes( - (short) 0xB0, (short) 16, MediaTransportControlCommandType.SELECTION_NAME), + (short) 0xB0, (byte) 16, MediaTransportControlCommandType.SELECTION_NAME), MediaTransportControlCommandSelectionName_17Bytes( - (short) 0xB1, (short) 17, MediaTransportControlCommandType.SELECTION_NAME), + (short) 0xB1, (byte) 17, MediaTransportControlCommandType.SELECTION_NAME), MediaTransportControlCommandSelectionName_18Bytes( - (short) 0xB2, (short) 18, MediaTransportControlCommandType.SELECTION_NAME), + (short) 0xB2, (byte) 18, MediaTransportControlCommandType.SELECTION_NAME), MediaTransportControlCommandSelectionName_19Bytes( - (short) 0xB3, (short) 19, MediaTransportControlCommandType.SELECTION_NAME), + (short) 0xB3, (byte) 19, MediaTransportControlCommandType.SELECTION_NAME), MediaTransportControlCommandSelectionName_20Bytes( - (short) 0xB4, (short) 20, MediaTransportControlCommandType.SELECTION_NAME), + (short) 0xB4, (byte) 20, MediaTransportControlCommandType.SELECTION_NAME), MediaTransportControlCommandSelectionName_21Bytes( - (short) 0xB5, (short) 21, MediaTransportControlCommandType.SELECTION_NAME), + (short) 0xB5, (byte) 21, MediaTransportControlCommandType.SELECTION_NAME), MediaTransportControlCommandSelectionName_22Bytes( - (short) 0xB6, (short) 22, MediaTransportControlCommandType.SELECTION_NAME), + (short) 0xB6, (byte) 22, MediaTransportControlCommandType.SELECTION_NAME), MediaTransportControlCommandSelectionName_23Bytes( - (short) 0xB7, (short) 23, MediaTransportControlCommandType.SELECTION_NAME), + (short) 0xB7, (byte) 23, MediaTransportControlCommandType.SELECTION_NAME), MediaTransportControlCommandSelectionName_24Bytes( - (short) 0xB8, (short) 24, MediaTransportControlCommandType.SELECTION_NAME), + (short) 0xB8, (byte) 24, MediaTransportControlCommandType.SELECTION_NAME), MediaTransportControlCommandSelectionName_25Bytes( - (short) 0xB9, (short) 25, MediaTransportControlCommandType.SELECTION_NAME), + (short) 0xB9, (byte) 25, MediaTransportControlCommandType.SELECTION_NAME), MediaTransportControlCommandSelectionName_26Bytes( - (short) 0xBA, (short) 26, MediaTransportControlCommandType.SELECTION_NAME), + (short) 0xBA, (byte) 26, MediaTransportControlCommandType.SELECTION_NAME), MediaTransportControlCommandSelectionName_27Bytes( - (short) 0xBB, (short) 27, MediaTransportControlCommandType.SELECTION_NAME), + (short) 0xBB, (byte) 27, MediaTransportControlCommandType.SELECTION_NAME), MediaTransportControlCommandSelectionName_28Bytes( - (short) 0xBC, (short) 28, MediaTransportControlCommandType.SELECTION_NAME), + (short) 0xBC, (byte) 28, MediaTransportControlCommandType.SELECTION_NAME), MediaTransportControlCommandSelectionName_29Bytes( - (short) 0xBD, (short) 29, MediaTransportControlCommandType.SELECTION_NAME), + (short) 0xBD, (byte) 29, MediaTransportControlCommandType.SELECTION_NAME), MediaTransportControlCommandSelectionName_30Bytes( - (short) 0xBE, (short) 30, MediaTransportControlCommandType.SELECTION_NAME), + (short) 0xBE, (byte) 30, MediaTransportControlCommandType.SELECTION_NAME), MediaTransportControlCommandSelectionName_31Bytes( - (short) 0xBF, (short) 31, MediaTransportControlCommandType.SELECTION_NAME), + (short) 0xBF, (byte) 31, MediaTransportControlCommandType.SELECTION_NAME), MediaTransportControlCommandCategoryName_0Bytes( - (short) 0xC0, (short) 0, MediaTransportControlCommandType.CATEGORY_NAME), + (short) 0xC0, (byte) 0, MediaTransportControlCommandType.CATEGORY_NAME), MediaTransportControlCommandCategoryName_1Bytes( - (short) 0xC1, (short) 1, MediaTransportControlCommandType.CATEGORY_NAME), + (short) 0xC1, (byte) 1, MediaTransportControlCommandType.CATEGORY_NAME), MediaTransportControlCommandCategoryName_2Bytes( - (short) 0xC2, (short) 2, MediaTransportControlCommandType.CATEGORY_NAME), + (short) 0xC2, (byte) 2, MediaTransportControlCommandType.CATEGORY_NAME), MediaTransportControlCommandCategoryName_3Bytes( - (short) 0xC3, (short) 3, MediaTransportControlCommandType.CATEGORY_NAME), + (short) 0xC3, (byte) 3, MediaTransportControlCommandType.CATEGORY_NAME), MediaTransportControlCommandCategoryName_4Bytes( - (short) 0xC4, (short) 4, MediaTransportControlCommandType.CATEGORY_NAME), + (short) 0xC4, (byte) 4, MediaTransportControlCommandType.CATEGORY_NAME), MediaTransportControlCommandCategoryName_5Bytes( - (short) 0xC5, (short) 5, MediaTransportControlCommandType.CATEGORY_NAME), + (short) 0xC5, (byte) 5, MediaTransportControlCommandType.CATEGORY_NAME), MediaTransportControlCommandCategoryName_6Bytes( - (short) 0xC6, (short) 6, MediaTransportControlCommandType.CATEGORY_NAME), + (short) 0xC6, (byte) 6, MediaTransportControlCommandType.CATEGORY_NAME), MediaTransportControlCommandCategoryName_7Bytes( - (short) 0xC7, (short) 7, MediaTransportControlCommandType.CATEGORY_NAME), + (short) 0xC7, (byte) 7, MediaTransportControlCommandType.CATEGORY_NAME), MediaTransportControlCommandCategoryName_8Bytes( - (short) 0xC8, (short) 8, MediaTransportControlCommandType.CATEGORY_NAME), + (short) 0xC8, (byte) 8, MediaTransportControlCommandType.CATEGORY_NAME), MediaTransportControlCommandCategoryName_9Bytes( - (short) 0xC9, (short) 9, MediaTransportControlCommandType.CATEGORY_NAME), + (short) 0xC9, (byte) 9, MediaTransportControlCommandType.CATEGORY_NAME), MediaTransportControlCommandCategoryName_10Bytes( - (short) 0xCA, (short) 10, MediaTransportControlCommandType.CATEGORY_NAME), + (short) 0xCA, (byte) 10, MediaTransportControlCommandType.CATEGORY_NAME), MediaTransportControlCommandCategoryName_11Bytes( - (short) 0xCB, (short) 11, MediaTransportControlCommandType.CATEGORY_NAME), + (short) 0xCB, (byte) 11, MediaTransportControlCommandType.CATEGORY_NAME), MediaTransportControlCommandCategoryName_12Bytes( - (short) 0xCC, (short) 12, MediaTransportControlCommandType.CATEGORY_NAME), + (short) 0xCC, (byte) 12, MediaTransportControlCommandType.CATEGORY_NAME), MediaTransportControlCommandCategoryName_13Bytes( - (short) 0xCD, (short) 13, MediaTransportControlCommandType.CATEGORY_NAME), + (short) 0xCD, (byte) 13, MediaTransportControlCommandType.CATEGORY_NAME), MediaTransportControlCommandCategoryName_14Bytes( - (short) 0xCE, (short) 14, MediaTransportControlCommandType.CATEGORY_NAME), + (short) 0xCE, (byte) 14, MediaTransportControlCommandType.CATEGORY_NAME), MediaTransportControlCommandCategoryName_15Bytes( - (short) 0xCF, (short) 15, MediaTransportControlCommandType.CATEGORY_NAME), + (short) 0xCF, (byte) 15, MediaTransportControlCommandType.CATEGORY_NAME), MediaTransportControlCommandCategoryName_16Bytes( - (short) 0xD0, (short) 16, MediaTransportControlCommandType.CATEGORY_NAME), + (short) 0xD0, (byte) 16, MediaTransportControlCommandType.CATEGORY_NAME), MediaTransportControlCommandCategoryName_17Bytes( - (short) 0xD1, (short) 17, MediaTransportControlCommandType.CATEGORY_NAME), + (short) 0xD1, (byte) 17, MediaTransportControlCommandType.CATEGORY_NAME), MediaTransportControlCommandCategoryName_18Bytes( - (short) 0xD2, (short) 18, MediaTransportControlCommandType.CATEGORY_NAME), + (short) 0xD2, (byte) 18, MediaTransportControlCommandType.CATEGORY_NAME), MediaTransportControlCommandCategoryName_19Bytes( - (short) 0xD3, (short) 19, MediaTransportControlCommandType.CATEGORY_NAME), + (short) 0xD3, (byte) 19, MediaTransportControlCommandType.CATEGORY_NAME), MediaTransportControlCommandCategoryName_20Bytes( - (short) 0xD4, (short) 20, MediaTransportControlCommandType.CATEGORY_NAME), + (short) 0xD4, (byte) 20, MediaTransportControlCommandType.CATEGORY_NAME), MediaTransportControlCommandCategoryName_21Bytes( - (short) 0xD5, (short) 21, MediaTransportControlCommandType.CATEGORY_NAME), + (short) 0xD5, (byte) 21, MediaTransportControlCommandType.CATEGORY_NAME), MediaTransportControlCommandCategoryName_22Bytes( - (short) 0xD6, (short) 22, MediaTransportControlCommandType.CATEGORY_NAME), + (short) 0xD6, (byte) 22, MediaTransportControlCommandType.CATEGORY_NAME), MediaTransportControlCommandCategoryName_23Bytes( - (short) 0xD7, (short) 23, MediaTransportControlCommandType.CATEGORY_NAME), + (short) 0xD7, (byte) 23, MediaTransportControlCommandType.CATEGORY_NAME), MediaTransportControlCommandCategoryName_24Bytes( - (short) 0xD8, (short) 24, MediaTransportControlCommandType.CATEGORY_NAME), + (short) 0xD8, (byte) 24, MediaTransportControlCommandType.CATEGORY_NAME), MediaTransportControlCommandCategoryName_25Bytes( - (short) 0xD9, (short) 25, MediaTransportControlCommandType.CATEGORY_NAME), + (short) 0xD9, (byte) 25, MediaTransportControlCommandType.CATEGORY_NAME), MediaTransportControlCommandCategoryName_26Bytes( - (short) 0xDA, (short) 26, MediaTransportControlCommandType.CATEGORY_NAME), + (short) 0xDA, (byte) 26, MediaTransportControlCommandType.CATEGORY_NAME), MediaTransportControlCommandCategoryName_27Bytes( - (short) 0xDB, (short) 27, MediaTransportControlCommandType.CATEGORY_NAME), + (short) 0xDB, (byte) 27, MediaTransportControlCommandType.CATEGORY_NAME), MediaTransportControlCommandCategoryName_28Bytes( - (short) 0xDC, (short) 28, MediaTransportControlCommandType.CATEGORY_NAME), + (short) 0xDC, (byte) 28, MediaTransportControlCommandType.CATEGORY_NAME), MediaTransportControlCommandCategoryName_29Bytes( - (short) 0xDD, (short) 29, MediaTransportControlCommandType.CATEGORY_NAME), + (short) 0xDD, (byte) 29, MediaTransportControlCommandType.CATEGORY_NAME), MediaTransportControlCommandCategoryName_30Bytes( - (short) 0xDE, (short) 30, MediaTransportControlCommandType.CATEGORY_NAME), + (short) 0xDE, (byte) 30, MediaTransportControlCommandType.CATEGORY_NAME), MediaTransportControlCommandCategoryName_31Bytes( - (short) 0xDF, (short) 31, MediaTransportControlCommandType.CATEGORY_NAME); + (short) 0xDF, (byte) 31, MediaTransportControlCommandType.CATEGORY_NAME); private static final Map map; static { @@ -265,11 +265,11 @@ public enum MediaTransportControlCommandTypeContainer { } private final short value; - private final short numBytes; + private final byte numBytes; private final MediaTransportControlCommandType commandType; MediaTransportControlCommandTypeContainer( - short value, short numBytes, MediaTransportControlCommandType commandType) { + short value, byte numBytes, MediaTransportControlCommandType commandType) { this.value = value; this.numBytes = numBytes; this.commandType = commandType; @@ -279,12 +279,12 @@ public short getValue() { return value; } - public short getNumBytes() { + public byte getNumBytes() { return numBytes; } public static MediaTransportControlCommandTypeContainer firstEnumForFieldNumBytes( - short fieldValue) { + byte fieldValue) { for (MediaTransportControlCommandTypeContainer _val : MediaTransportControlCommandTypeContainer.values()) { if (_val.getNumBytes() == fieldValue) { @@ -295,7 +295,7 @@ public static MediaTransportControlCommandTypeContainer firstEnumForFieldNumByte } public static List enumsForFieldNumBytes( - short fieldValue) { + byte fieldValue) { List _values = new ArrayList<>(); for (MediaTransportControlCommandTypeContainer _val : MediaTransportControlCommandTypeContainer.values()) { diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/MeteringCommandTypeContainer.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/MeteringCommandTypeContainer.java index 507ebcab441..23918a6c3a8 100644 --- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/MeteringCommandTypeContainer.java +++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/MeteringCommandTypeContainer.java @@ -26,14 +26,14 @@ // Code generated by code-generation. DO NOT EDIT. public enum MeteringCommandTypeContainer { - MeteringCommandEvent_0Bytes((short) 0x08, (short) 0, MeteringCommandType.EVENT), - MeteringCommandEvent_1Bytes((short) 0x09, (short) 1, MeteringCommandType.EVENT), - MeteringCommandEvent_2Bytes((short) 0x0A, (short) 2, MeteringCommandType.EVENT), - MeteringCommandEvent_3Bytes((short) 0x0B, (short) 3, MeteringCommandType.EVENT), - MeteringCommandEvent_4Bytes((short) 0x0C, (short) 4, MeteringCommandType.EVENT), - MeteringCommandEvent_5Bytes((short) 0x0D, (short) 5, MeteringCommandType.EVENT), - MeteringCommandEvent_6Bytes((short) 0x0E, (short) 6, MeteringCommandType.EVENT), - MeteringCommandEvent_7Bytes((short) 0x0F, (short) 7, MeteringCommandType.EVENT); + MeteringCommandEvent_0Bytes((short) 0x08, (byte) 0, MeteringCommandType.EVENT), + MeteringCommandEvent_1Bytes((short) 0x09, (byte) 1, MeteringCommandType.EVENT), + MeteringCommandEvent_2Bytes((short) 0x0A, (byte) 2, MeteringCommandType.EVENT), + MeteringCommandEvent_3Bytes((short) 0x0B, (byte) 3, MeteringCommandType.EVENT), + MeteringCommandEvent_4Bytes((short) 0x0C, (byte) 4, MeteringCommandType.EVENT), + MeteringCommandEvent_5Bytes((short) 0x0D, (byte) 5, MeteringCommandType.EVENT), + MeteringCommandEvent_6Bytes((short) 0x0E, (byte) 6, MeteringCommandType.EVENT), + MeteringCommandEvent_7Bytes((short) 0x0F, (byte) 7, MeteringCommandType.EVENT); private static final Map map; static { @@ -44,10 +44,10 @@ public enum MeteringCommandTypeContainer { } private final short value; - private final short numBytes; + private final byte numBytes; private final MeteringCommandType commandType; - MeteringCommandTypeContainer(short value, short numBytes, MeteringCommandType commandType) { + MeteringCommandTypeContainer(short value, byte numBytes, MeteringCommandType commandType) { this.value = value; this.numBytes = numBytes; this.commandType = commandType; @@ -57,11 +57,11 @@ public short getValue() { return value; } - public short getNumBytes() { + public byte getNumBytes() { return numBytes; } - public static MeteringCommandTypeContainer firstEnumForFieldNumBytes(short fieldValue) { + public static MeteringCommandTypeContainer firstEnumForFieldNumBytes(byte fieldValue) { for (MeteringCommandTypeContainer _val : MeteringCommandTypeContainer.values()) { if (_val.getNumBytes() == fieldValue) { return _val; @@ -70,7 +70,7 @@ public static MeteringCommandTypeContainer firstEnumForFieldNumBytes(short field return null; } - public static List enumsForFieldNumBytes(short fieldValue) { + public static List enumsForFieldNumBytes(byte fieldValue) { List _values = new ArrayList<>(); for (MeteringCommandTypeContainer _val : MeteringCommandTypeContainer.values()) { if (_val.getNumBytes() == fieldValue) { diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/MonitoredSALLongFormSmartMode.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/MonitoredSALLongFormSmartMode.java index 5dab62b9c37..d02ab1dc8b1 100644 --- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/MonitoredSALLongFormSmartMode.java +++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/MonitoredSALLongFormSmartMode.java @@ -40,7 +40,7 @@ public class MonitoredSALLongFormSmartMode extends MonitoredSAL implements Messa // Accessors for discriminator values. // Properties. - protected final long terminatingByte; + protected final int terminatingByte; protected final UnitAddress unitAddress; protected final BridgeAddress bridgeAddress; protected final ApplicationIdContainer application; @@ -55,7 +55,7 @@ public class MonitoredSALLongFormSmartMode extends MonitoredSAL implements Messa public MonitoredSALLongFormSmartMode( byte salType, - long terminatingByte, + int terminatingByte, UnitAddress unitAddress, BridgeAddress bridgeAddress, ApplicationIdContainer application, @@ -74,7 +74,7 @@ public MonitoredSALLongFormSmartMode( this.cBusOptions = cBusOptions; } - public long getTerminatingByte() { + public int getTerminatingByte() { return terminatingByte; } @@ -217,7 +217,7 @@ public static MonitoredSALBuilder staticParseMonitoredSALBuilder( Byte reservedField0 = readReservedField("reserved", readByte(readBuffer, 8), (byte) 0x05); - long terminatingByte = readPeekField("terminatingByte", readUnsignedLong(readBuffer, 24)); + int terminatingByte = readPeekField("terminatingByte", readUnsignedInt(readBuffer, 24)); boolean isUnitAddress = readVirtualField("isUnitAddress", boolean.class, (((terminatingByte) & (0xff))) == (0x00)); @@ -277,7 +277,7 @@ public static MonitoredSALBuilder staticParseMonitoredSALBuilder( public static class MonitoredSALLongFormSmartModeBuilderImpl implements MonitoredSAL.MonitoredSALBuilder { - private final long terminatingByte; + private final int terminatingByte; private final UnitAddress unitAddress; private final BridgeAddress bridgeAddress; private final ApplicationIdContainer application; @@ -288,7 +288,7 @@ public static class MonitoredSALLongFormSmartModeBuilderImpl private final Byte reservedField0; public MonitoredSALLongFormSmartModeBuilderImpl( - long terminatingByte, + int terminatingByte, UnitAddress unitAddress, BridgeAddress bridgeAddress, ApplicationIdContainer application, diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/SecurityCommandTypeContainer.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/SecurityCommandTypeContainer.java index 71b0ebc3262..324d0dccfc9 100644 --- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/SecurityCommandTypeContainer.java +++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/SecurityCommandTypeContainer.java @@ -26,126 +26,126 @@ // Code generated by code-generation. DO NOT EDIT. public enum SecurityCommandTypeContainer { - SecurityCommandOff_0Bytes((short) 0x00, (short) 0, SecurityCommandType.OFF), - SecurityCommandOff_1Bytes((short) 0x01, (short) 1, SecurityCommandType.OFF), - SecurityCommandOff_2Bytes((short) 0x02, (short) 2, SecurityCommandType.OFF), - SecurityCommandOff_3Bytes((short) 0x03, (short) 3, SecurityCommandType.OFF), - SecurityCommandOff_4Bytes((short) 0x04, (short) 4, SecurityCommandType.OFF), - SecurityCommandOff_5Bytes((short) 0x05, (short) 5, SecurityCommandType.OFF), - SecurityCommandOff_6Bytes((short) 0x06, (short) 6, SecurityCommandType.OFF), - SecurityCommandOff_7Bytes((short) 0x07, (short) 7, SecurityCommandType.OFF), - SecurityCommandEvent_0Bytes((short) 0x08, (short) 0, SecurityCommandType.EVENT), - SecurityCommandEvent_1Bytes((short) 0x09, (short) 1, SecurityCommandType.EVENT), - SecurityCommandEvent_2Bytes((short) 0x0A, (short) 2, SecurityCommandType.EVENT), - SecurityCommandEvent_3Bytes((short) 0x0B, (short) 3, SecurityCommandType.EVENT), - SecurityCommandEvent_4Bytes((short) 0x0C, (short) 4, SecurityCommandType.EVENT), - SecurityCommandEvent_5Bytes((short) 0x0D, (short) 5, SecurityCommandType.EVENT), - SecurityCommandEvent_6Bytes((short) 0x0E, (short) 6, SecurityCommandType.EVENT), - SecurityCommandEvent_7Bytes((short) 0x0F, (short) 7, SecurityCommandType.EVENT), - SecurityCommandOn_0Bytes((short) 0x78, (short) 0, SecurityCommandType.ON), - SecurityCommandOn_1Bytes((short) 0x79, (short) 1, SecurityCommandType.ON), - SecurityCommandOn_2Bytes((short) 0x7A, (short) 2, SecurityCommandType.ON), - SecurityCommandOn_3Bytes((short) 0x7B, (short) 3, SecurityCommandType.ON), - SecurityCommandOn_4Bytes((short) 0x7C, (short) 4, SecurityCommandType.ON), - SecurityCommandOn_5Bytes((short) 0x7D, (short) 5, SecurityCommandType.ON), - SecurityCommandOn_6Bytes((short) 0x7E, (short) 6, SecurityCommandType.ON), - SecurityCommandOn_7Bytes((short) 0x7F, (short) 7, SecurityCommandType.ON), - SecurityCommandLongOff_0Bytes((short) 0x80, (short) 8, SecurityCommandType.OFF), - SecurityCommandLongOff_1Bytes((short) 0x81, (short) 1, SecurityCommandType.OFF), - SecurityCommandLongOff_2Bytes((short) 0x82, (short) 2, SecurityCommandType.OFF), - SecurityCommandLongOff_3Bytes((short) 0x83, (short) 3, SecurityCommandType.OFF), - SecurityCommandLongOff_4Bytes((short) 0x84, (short) 4, SecurityCommandType.OFF), - SecurityCommandLongOff_5Bytes((short) 0x85, (short) 5, SecurityCommandType.OFF), - SecurityCommandLongOff_6Bytes((short) 0x86, (short) 6, SecurityCommandType.OFF), - SecurityCommandLongOff_7Bytes((short) 0x87, (short) 7, SecurityCommandType.OFF), - SecurityCommandLongOff_8Bytes((short) 0x88, (short) 8, SecurityCommandType.OFF), - SecurityCommandLongOff_9Bytes((short) 0x89, (short) 9, SecurityCommandType.OFF), - SecurityCommandLongOff_10Bytes((short) 0x8A, (short) 10, SecurityCommandType.OFF), - SecurityCommandLongOff_11Bytes((short) 0x8B, (short) 11, SecurityCommandType.OFF), - SecurityCommandLongOff_12Bytes((short) 0x8C, (short) 12, SecurityCommandType.OFF), - SecurityCommandLongOff_13Bytes((short) 0x8D, (short) 13, SecurityCommandType.OFF), - SecurityCommandLongOff_14Bytes((short) 0x8E, (short) 14, SecurityCommandType.OFF), - SecurityCommandLongOff_15Bytes((short) 0x8F, (short) 15, SecurityCommandType.OFF), - SecurityCommandLongOff_16Bytes((short) 0x90, (short) 16, SecurityCommandType.OFF), - SecurityCommandLongOff_17Bytes((short) 0x91, (short) 17, SecurityCommandType.OFF), - SecurityCommandLongOff_18Bytes((short) 0x92, (short) 18, SecurityCommandType.OFF), - SecurityCommandLongOff_19Bytes((short) 0x93, (short) 19, SecurityCommandType.OFF), - SecurityCommandLongOff_20Bytes((short) 0x94, (short) 20, SecurityCommandType.OFF), - SecurityCommandLongOff_21Bytes((short) 0x95, (short) 21, SecurityCommandType.OFF), - SecurityCommandLongOff_22Bytes((short) 0x96, (short) 22, SecurityCommandType.OFF), - SecurityCommandLongOff_23Bytes((short) 0x97, (short) 23, SecurityCommandType.OFF), - SecurityCommandLongOff_24Bytes((short) 0x98, (short) 24, SecurityCommandType.OFF), - SecurityCommandLongOff_25Bytes((short) 0x99, (short) 25, SecurityCommandType.OFF), - SecurityCommandLongOff_26Bytes((short) 0x9A, (short) 26, SecurityCommandType.OFF), - SecurityCommandLongOff_27Bytes((short) 0x9B, (short) 27, SecurityCommandType.OFF), - SecurityCommandLongOff_28Bytes((short) 0x9C, (short) 28, SecurityCommandType.OFF), - SecurityCommandLongOff_29Bytes((short) 0x9D, (short) 29, SecurityCommandType.OFF), - SecurityCommandLongOff_30Bytes((short) 0x9E, (short) 30, SecurityCommandType.OFF), - SecurityCommandLongOff_31Bytes((short) 0x9F, (short) 31, SecurityCommandType.OFF), - SecurityCommandLongEvent_0Bytes((short) 0xA0, (short) 0, SecurityCommandType.EVENT), - SecurityCommandLongEvent_1Bytes((short) 0xA1, (short) 1, SecurityCommandType.EVENT), - SecurityCommandLongEvent_2Bytes((short) 0xA2, (short) 2, SecurityCommandType.EVENT), - SecurityCommandLongEvent_3Bytes((short) 0xA3, (short) 3, SecurityCommandType.EVENT), - SecurityCommandLongEvent_4Bytes((short) 0xA4, (short) 4, SecurityCommandType.EVENT), - SecurityCommandLongEvent_5Bytes((short) 0xA5, (short) 5, SecurityCommandType.EVENT), - SecurityCommandLongEvent_6Bytes((short) 0xA6, (short) 6, SecurityCommandType.EVENT), - SecurityCommandLongEvent_7Bytes((short) 0xA7, (short) 7, SecurityCommandType.EVENT), - SecurityCommandLongEvent_8Bytes((short) 0xA8, (short) 8, SecurityCommandType.EVENT), - SecurityCommandLongEvent_9Bytes((short) 0xA9, (short) 9, SecurityCommandType.EVENT), - SecurityCommandLongEvent_10Bytes((short) 0xAA, (short) 10, SecurityCommandType.EVENT), - SecurityCommandLongEvent_11Bytes((short) 0xAB, (short) 11, SecurityCommandType.EVENT), - SecurityCommandLongEvent_12Bytes((short) 0xAC, (short) 12, SecurityCommandType.EVENT), - SecurityCommandLongEvent_13Bytes((short) 0xAD, (short) 13, SecurityCommandType.EVENT), - SecurityCommandLongEvent_14Bytes((short) 0xAE, (short) 14, SecurityCommandType.EVENT), - SecurityCommandLongEvent_15Bytes((short) 0xAF, (short) 15, SecurityCommandType.EVENT), - SecurityCommandLongEvent_16Bytes((short) 0xB0, (short) 16, SecurityCommandType.EVENT), - SecurityCommandLongEvent_17Bytes((short) 0xB1, (short) 17, SecurityCommandType.EVENT), - SecurityCommandLongEvent_18Bytes((short) 0xB2, (short) 18, SecurityCommandType.EVENT), - SecurityCommandLongEvent_19Bytes((short) 0xB3, (short) 19, SecurityCommandType.EVENT), - SecurityCommandLongEvent_20Bytes((short) 0xB4, (short) 20, SecurityCommandType.EVENT), - SecurityCommandLongEvent_21Bytes((short) 0xB5, (short) 21, SecurityCommandType.EVENT), - SecurityCommandLongEvent_22Bytes((short) 0xB6, (short) 22, SecurityCommandType.EVENT), - SecurityCommandLongEvent_23Bytes((short) 0xB7, (short) 23, SecurityCommandType.EVENT), - SecurityCommandLongEvent_24Bytes((short) 0xB8, (short) 24, SecurityCommandType.EVENT), - SecurityCommandLongEvent_25Bytes((short) 0xB9, (short) 25, SecurityCommandType.EVENT), - SecurityCommandLongEvent_26Bytes((short) 0xBA, (short) 26, SecurityCommandType.EVENT), - SecurityCommandLongEvent_27Bytes((short) 0xBB, (short) 27, SecurityCommandType.EVENT), - SecurityCommandLongEvent_28Bytes((short) 0xBC, (short) 28, SecurityCommandType.EVENT), - SecurityCommandLongEvent_29Bytes((short) 0xBD, (short) 29, SecurityCommandType.EVENT), - SecurityCommandLongEvent_30Bytes((short) 0xBE, (short) 30, SecurityCommandType.EVENT), - SecurityCommandLongEvent_31Bytes((short) 0xBF, (short) 31, SecurityCommandType.EVENT), - SecurityCommandLongOn_0Bytes((short) 0xE0, (short) 0, SecurityCommandType.ON), - SecurityCommandLongOn_1Bytes((short) 0xE1, (short) 1, SecurityCommandType.ON), - SecurityCommandLongOn_2Bytes((short) 0xE2, (short) 2, SecurityCommandType.ON), - SecurityCommandLongOn_3Bytes((short) 0xE3, (short) 3, SecurityCommandType.ON), - SecurityCommandLongOn_4Bytes((short) 0xE4, (short) 4, SecurityCommandType.ON), - SecurityCommandLongOn_5Bytes((short) 0xE5, (short) 5, SecurityCommandType.ON), - SecurityCommandLongOn_6Bytes((short) 0xE6, (short) 6, SecurityCommandType.ON), - SecurityCommandLongOn_7Bytes((short) 0xE7, (short) 7, SecurityCommandType.ON), - SecurityCommandLongOn_8Bytes((short) 0xE8, (short) 8, SecurityCommandType.ON), - SecurityCommandLongOn_9Bytes((short) 0xE9, (short) 9, SecurityCommandType.ON), - SecurityCommandLongOn_10Bytes((short) 0xEA, (short) 10, SecurityCommandType.ON), - SecurityCommandLongOn_11Bytes((short) 0xEB, (short) 11, SecurityCommandType.ON), - SecurityCommandLongOn_12Bytes((short) 0xEC, (short) 12, SecurityCommandType.ON), - SecurityCommandLongOn_13Bytes((short) 0xED, (short) 13, SecurityCommandType.ON), - SecurityCommandLongOn_14Bytes((short) 0xEE, (short) 14, SecurityCommandType.ON), - SecurityCommandLongOn_15Bytes((short) 0xEF, (short) 15, SecurityCommandType.ON), - SecurityCommandLongOn_16Bytes((short) 0xF0, (short) 16, SecurityCommandType.ON), - SecurityCommandLongOn_17Bytes((short) 0xF1, (short) 17, SecurityCommandType.ON), - SecurityCommandLongOn_18Bytes((short) 0xF2, (short) 18, SecurityCommandType.ON), - SecurityCommandLongOn_19Bytes((short) 0xF3, (short) 19, SecurityCommandType.ON), - SecurityCommandLongOn_20Bytes((short) 0xF4, (short) 20, SecurityCommandType.ON), - SecurityCommandLongOn_21Bytes((short) 0xF5, (short) 21, SecurityCommandType.ON), - SecurityCommandLongOn_22Bytes((short) 0xF6, (short) 22, SecurityCommandType.ON), - SecurityCommandLongOn_23Bytes((short) 0xF7, (short) 23, SecurityCommandType.ON), - SecurityCommandLongOn_24Bytes((short) 0xF8, (short) 24, SecurityCommandType.ON), - SecurityCommandLongOn_25Bytes((short) 0xF9, (short) 25, SecurityCommandType.ON), - SecurityCommandLongOn_26Bytes((short) 0xFA, (short) 26, SecurityCommandType.ON), - SecurityCommandLongOn_27Bytes((short) 0xFB, (short) 27, SecurityCommandType.ON), - SecurityCommandLongOn_28Bytes((short) 0xFC, (short) 28, SecurityCommandType.ON), - SecurityCommandLongOn_29Bytes((short) 0xFD, (short) 29, SecurityCommandType.ON), - SecurityCommandLongOn_30Bytes((short) 0xFE, (short) 30, SecurityCommandType.ON), - SecurityCommandLongOn_31Bytes((short) 0xFF, (short) 31, SecurityCommandType.ON); + SecurityCommandOff_0Bytes((short) 0x00, (byte) 0, SecurityCommandType.OFF), + SecurityCommandOff_1Bytes((short) 0x01, (byte) 1, SecurityCommandType.OFF), + SecurityCommandOff_2Bytes((short) 0x02, (byte) 2, SecurityCommandType.OFF), + SecurityCommandOff_3Bytes((short) 0x03, (byte) 3, SecurityCommandType.OFF), + SecurityCommandOff_4Bytes((short) 0x04, (byte) 4, SecurityCommandType.OFF), + SecurityCommandOff_5Bytes((short) 0x05, (byte) 5, SecurityCommandType.OFF), + SecurityCommandOff_6Bytes((short) 0x06, (byte) 6, SecurityCommandType.OFF), + SecurityCommandOff_7Bytes((short) 0x07, (byte) 7, SecurityCommandType.OFF), + SecurityCommandEvent_0Bytes((short) 0x08, (byte) 0, SecurityCommandType.EVENT), + SecurityCommandEvent_1Bytes((short) 0x09, (byte) 1, SecurityCommandType.EVENT), + SecurityCommandEvent_2Bytes((short) 0x0A, (byte) 2, SecurityCommandType.EVENT), + SecurityCommandEvent_3Bytes((short) 0x0B, (byte) 3, SecurityCommandType.EVENT), + SecurityCommandEvent_4Bytes((short) 0x0C, (byte) 4, SecurityCommandType.EVENT), + SecurityCommandEvent_5Bytes((short) 0x0D, (byte) 5, SecurityCommandType.EVENT), + SecurityCommandEvent_6Bytes((short) 0x0E, (byte) 6, SecurityCommandType.EVENT), + SecurityCommandEvent_7Bytes((short) 0x0F, (byte) 7, SecurityCommandType.EVENT), + SecurityCommandOn_0Bytes((short) 0x78, (byte) 0, SecurityCommandType.ON), + SecurityCommandOn_1Bytes((short) 0x79, (byte) 1, SecurityCommandType.ON), + SecurityCommandOn_2Bytes((short) 0x7A, (byte) 2, SecurityCommandType.ON), + SecurityCommandOn_3Bytes((short) 0x7B, (byte) 3, SecurityCommandType.ON), + SecurityCommandOn_4Bytes((short) 0x7C, (byte) 4, SecurityCommandType.ON), + SecurityCommandOn_5Bytes((short) 0x7D, (byte) 5, SecurityCommandType.ON), + SecurityCommandOn_6Bytes((short) 0x7E, (byte) 6, SecurityCommandType.ON), + SecurityCommandOn_7Bytes((short) 0x7F, (byte) 7, SecurityCommandType.ON), + SecurityCommandLongOff_0Bytes((short) 0x80, (byte) 8, SecurityCommandType.OFF), + SecurityCommandLongOff_1Bytes((short) 0x81, (byte) 1, SecurityCommandType.OFF), + SecurityCommandLongOff_2Bytes((short) 0x82, (byte) 2, SecurityCommandType.OFF), + SecurityCommandLongOff_3Bytes((short) 0x83, (byte) 3, SecurityCommandType.OFF), + SecurityCommandLongOff_4Bytes((short) 0x84, (byte) 4, SecurityCommandType.OFF), + SecurityCommandLongOff_5Bytes((short) 0x85, (byte) 5, SecurityCommandType.OFF), + SecurityCommandLongOff_6Bytes((short) 0x86, (byte) 6, SecurityCommandType.OFF), + SecurityCommandLongOff_7Bytes((short) 0x87, (byte) 7, SecurityCommandType.OFF), + SecurityCommandLongOff_8Bytes((short) 0x88, (byte) 8, SecurityCommandType.OFF), + SecurityCommandLongOff_9Bytes((short) 0x89, (byte) 9, SecurityCommandType.OFF), + SecurityCommandLongOff_10Bytes((short) 0x8A, (byte) 10, SecurityCommandType.OFF), + SecurityCommandLongOff_11Bytes((short) 0x8B, (byte) 11, SecurityCommandType.OFF), + SecurityCommandLongOff_12Bytes((short) 0x8C, (byte) 12, SecurityCommandType.OFF), + SecurityCommandLongOff_13Bytes((short) 0x8D, (byte) 13, SecurityCommandType.OFF), + SecurityCommandLongOff_14Bytes((short) 0x8E, (byte) 14, SecurityCommandType.OFF), + SecurityCommandLongOff_15Bytes((short) 0x8F, (byte) 15, SecurityCommandType.OFF), + SecurityCommandLongOff_16Bytes((short) 0x90, (byte) 16, SecurityCommandType.OFF), + SecurityCommandLongOff_17Bytes((short) 0x91, (byte) 17, SecurityCommandType.OFF), + SecurityCommandLongOff_18Bytes((short) 0x92, (byte) 18, SecurityCommandType.OFF), + SecurityCommandLongOff_19Bytes((short) 0x93, (byte) 19, SecurityCommandType.OFF), + SecurityCommandLongOff_20Bytes((short) 0x94, (byte) 20, SecurityCommandType.OFF), + SecurityCommandLongOff_21Bytes((short) 0x95, (byte) 21, SecurityCommandType.OFF), + SecurityCommandLongOff_22Bytes((short) 0x96, (byte) 22, SecurityCommandType.OFF), + SecurityCommandLongOff_23Bytes((short) 0x97, (byte) 23, SecurityCommandType.OFF), + SecurityCommandLongOff_24Bytes((short) 0x98, (byte) 24, SecurityCommandType.OFF), + SecurityCommandLongOff_25Bytes((short) 0x99, (byte) 25, SecurityCommandType.OFF), + SecurityCommandLongOff_26Bytes((short) 0x9A, (byte) 26, SecurityCommandType.OFF), + SecurityCommandLongOff_27Bytes((short) 0x9B, (byte) 27, SecurityCommandType.OFF), + SecurityCommandLongOff_28Bytes((short) 0x9C, (byte) 28, SecurityCommandType.OFF), + SecurityCommandLongOff_29Bytes((short) 0x9D, (byte) 29, SecurityCommandType.OFF), + SecurityCommandLongOff_30Bytes((short) 0x9E, (byte) 30, SecurityCommandType.OFF), + SecurityCommandLongOff_31Bytes((short) 0x9F, (byte) 31, SecurityCommandType.OFF), + SecurityCommandLongEvent_0Bytes((short) 0xA0, (byte) 0, SecurityCommandType.EVENT), + SecurityCommandLongEvent_1Bytes((short) 0xA1, (byte) 1, SecurityCommandType.EVENT), + SecurityCommandLongEvent_2Bytes((short) 0xA2, (byte) 2, SecurityCommandType.EVENT), + SecurityCommandLongEvent_3Bytes((short) 0xA3, (byte) 3, SecurityCommandType.EVENT), + SecurityCommandLongEvent_4Bytes((short) 0xA4, (byte) 4, SecurityCommandType.EVENT), + SecurityCommandLongEvent_5Bytes((short) 0xA5, (byte) 5, SecurityCommandType.EVENT), + SecurityCommandLongEvent_6Bytes((short) 0xA6, (byte) 6, SecurityCommandType.EVENT), + SecurityCommandLongEvent_7Bytes((short) 0xA7, (byte) 7, SecurityCommandType.EVENT), + SecurityCommandLongEvent_8Bytes((short) 0xA8, (byte) 8, SecurityCommandType.EVENT), + SecurityCommandLongEvent_9Bytes((short) 0xA9, (byte) 9, SecurityCommandType.EVENT), + SecurityCommandLongEvent_10Bytes((short) 0xAA, (byte) 10, SecurityCommandType.EVENT), + SecurityCommandLongEvent_11Bytes((short) 0xAB, (byte) 11, SecurityCommandType.EVENT), + SecurityCommandLongEvent_12Bytes((short) 0xAC, (byte) 12, SecurityCommandType.EVENT), + SecurityCommandLongEvent_13Bytes((short) 0xAD, (byte) 13, SecurityCommandType.EVENT), + SecurityCommandLongEvent_14Bytes((short) 0xAE, (byte) 14, SecurityCommandType.EVENT), + SecurityCommandLongEvent_15Bytes((short) 0xAF, (byte) 15, SecurityCommandType.EVENT), + SecurityCommandLongEvent_16Bytes((short) 0xB0, (byte) 16, SecurityCommandType.EVENT), + SecurityCommandLongEvent_17Bytes((short) 0xB1, (byte) 17, SecurityCommandType.EVENT), + SecurityCommandLongEvent_18Bytes((short) 0xB2, (byte) 18, SecurityCommandType.EVENT), + SecurityCommandLongEvent_19Bytes((short) 0xB3, (byte) 19, SecurityCommandType.EVENT), + SecurityCommandLongEvent_20Bytes((short) 0xB4, (byte) 20, SecurityCommandType.EVENT), + SecurityCommandLongEvent_21Bytes((short) 0xB5, (byte) 21, SecurityCommandType.EVENT), + SecurityCommandLongEvent_22Bytes((short) 0xB6, (byte) 22, SecurityCommandType.EVENT), + SecurityCommandLongEvent_23Bytes((short) 0xB7, (byte) 23, SecurityCommandType.EVENT), + SecurityCommandLongEvent_24Bytes((short) 0xB8, (byte) 24, SecurityCommandType.EVENT), + SecurityCommandLongEvent_25Bytes((short) 0xB9, (byte) 25, SecurityCommandType.EVENT), + SecurityCommandLongEvent_26Bytes((short) 0xBA, (byte) 26, SecurityCommandType.EVENT), + SecurityCommandLongEvent_27Bytes((short) 0xBB, (byte) 27, SecurityCommandType.EVENT), + SecurityCommandLongEvent_28Bytes((short) 0xBC, (byte) 28, SecurityCommandType.EVENT), + SecurityCommandLongEvent_29Bytes((short) 0xBD, (byte) 29, SecurityCommandType.EVENT), + SecurityCommandLongEvent_30Bytes((short) 0xBE, (byte) 30, SecurityCommandType.EVENT), + SecurityCommandLongEvent_31Bytes((short) 0xBF, (byte) 31, SecurityCommandType.EVENT), + SecurityCommandLongOn_0Bytes((short) 0xE0, (byte) 0, SecurityCommandType.ON), + SecurityCommandLongOn_1Bytes((short) 0xE1, (byte) 1, SecurityCommandType.ON), + SecurityCommandLongOn_2Bytes((short) 0xE2, (byte) 2, SecurityCommandType.ON), + SecurityCommandLongOn_3Bytes((short) 0xE3, (byte) 3, SecurityCommandType.ON), + SecurityCommandLongOn_4Bytes((short) 0xE4, (byte) 4, SecurityCommandType.ON), + SecurityCommandLongOn_5Bytes((short) 0xE5, (byte) 5, SecurityCommandType.ON), + SecurityCommandLongOn_6Bytes((short) 0xE6, (byte) 6, SecurityCommandType.ON), + SecurityCommandLongOn_7Bytes((short) 0xE7, (byte) 7, SecurityCommandType.ON), + SecurityCommandLongOn_8Bytes((short) 0xE8, (byte) 8, SecurityCommandType.ON), + SecurityCommandLongOn_9Bytes((short) 0xE9, (byte) 9, SecurityCommandType.ON), + SecurityCommandLongOn_10Bytes((short) 0xEA, (byte) 10, SecurityCommandType.ON), + SecurityCommandLongOn_11Bytes((short) 0xEB, (byte) 11, SecurityCommandType.ON), + SecurityCommandLongOn_12Bytes((short) 0xEC, (byte) 12, SecurityCommandType.ON), + SecurityCommandLongOn_13Bytes((short) 0xED, (byte) 13, SecurityCommandType.ON), + SecurityCommandLongOn_14Bytes((short) 0xEE, (byte) 14, SecurityCommandType.ON), + SecurityCommandLongOn_15Bytes((short) 0xEF, (byte) 15, SecurityCommandType.ON), + SecurityCommandLongOn_16Bytes((short) 0xF0, (byte) 16, SecurityCommandType.ON), + SecurityCommandLongOn_17Bytes((short) 0xF1, (byte) 17, SecurityCommandType.ON), + SecurityCommandLongOn_18Bytes((short) 0xF2, (byte) 18, SecurityCommandType.ON), + SecurityCommandLongOn_19Bytes((short) 0xF3, (byte) 19, SecurityCommandType.ON), + SecurityCommandLongOn_20Bytes((short) 0xF4, (byte) 20, SecurityCommandType.ON), + SecurityCommandLongOn_21Bytes((short) 0xF5, (byte) 21, SecurityCommandType.ON), + SecurityCommandLongOn_22Bytes((short) 0xF6, (byte) 22, SecurityCommandType.ON), + SecurityCommandLongOn_23Bytes((short) 0xF7, (byte) 23, SecurityCommandType.ON), + SecurityCommandLongOn_24Bytes((short) 0xF8, (byte) 24, SecurityCommandType.ON), + SecurityCommandLongOn_25Bytes((short) 0xF9, (byte) 25, SecurityCommandType.ON), + SecurityCommandLongOn_26Bytes((short) 0xFA, (byte) 26, SecurityCommandType.ON), + SecurityCommandLongOn_27Bytes((short) 0xFB, (byte) 27, SecurityCommandType.ON), + SecurityCommandLongOn_28Bytes((short) 0xFC, (byte) 28, SecurityCommandType.ON), + SecurityCommandLongOn_29Bytes((short) 0xFD, (byte) 29, SecurityCommandType.ON), + SecurityCommandLongOn_30Bytes((short) 0xFE, (byte) 30, SecurityCommandType.ON), + SecurityCommandLongOn_31Bytes((short) 0xFF, (byte) 31, SecurityCommandType.ON); private static final Map map; static { @@ -156,10 +156,10 @@ public enum SecurityCommandTypeContainer { } private final short value; - private final short numBytes; + private final byte numBytes; private final SecurityCommandType commandType; - SecurityCommandTypeContainer(short value, short numBytes, SecurityCommandType commandType) { + SecurityCommandTypeContainer(short value, byte numBytes, SecurityCommandType commandType) { this.value = value; this.numBytes = numBytes; this.commandType = commandType; @@ -169,11 +169,11 @@ public short getValue() { return value; } - public short getNumBytes() { + public byte getNumBytes() { return numBytes; } - public static SecurityCommandTypeContainer firstEnumForFieldNumBytes(short fieldValue) { + public static SecurityCommandTypeContainer firstEnumForFieldNumBytes(byte fieldValue) { for (SecurityCommandTypeContainer _val : SecurityCommandTypeContainer.values()) { if (_val.getNumBytes() == fieldValue) { return _val; @@ -182,7 +182,7 @@ public static SecurityCommandTypeContainer firstEnumForFieldNumBytes(short field return null; } - public static List enumsForFieldNumBytes(short fieldValue) { + public static List enumsForFieldNumBytes(byte fieldValue) { List _values = new ArrayList<>(); for (SecurityCommandTypeContainer _val : SecurityCommandTypeContainer.values()) { if (_val.getNumBytes() == fieldValue) { diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/TelephonyCommandTypeContainer.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/TelephonyCommandTypeContainer.java index c886e43d708..89cc389d003 100644 --- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/TelephonyCommandTypeContainer.java +++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/TelephonyCommandTypeContainer.java @@ -26,39 +26,39 @@ // Code generated by code-generation. DO NOT EDIT. public enum TelephonyCommandTypeContainer { - TelephonyCommandLineOnHook((short) 0x09, (short) 1, TelephonyCommandType.EVENT), - TelephonyCommandLineOffHook_0Bytes((short) 0xA0, (short) 0, TelephonyCommandType.EVENT), - TelephonyCommandLineOffHook_1Bytes((short) 0xA1, (short) 1, TelephonyCommandType.EVENT), - TelephonyCommandLineOffHook_2Bytes((short) 0xA2, (short) 2, TelephonyCommandType.EVENT), - TelephonyCommandLineOffHook_3Bytes((short) 0xA3, (short) 3, TelephonyCommandType.EVENT), - TelephonyCommandLineOffHook_4Bytes((short) 0xA4, (short) 4, TelephonyCommandType.EVENT), - TelephonyCommandLineOffHook_5Bytes((short) 0xA5, (short) 5, TelephonyCommandType.EVENT), - TelephonyCommandLineOffHook_6Bytes((short) 0xA6, (short) 6, TelephonyCommandType.EVENT), - TelephonyCommandLineOffHook_7Bytes((short) 0xA7, (short) 7, TelephonyCommandType.EVENT), - TelephonyCommandLineOffHook_8Bytes((short) 0xA8, (short) 8, TelephonyCommandType.EVENT), - TelephonyCommandLineOffHook_9Bytes((short) 0xA9, (short) 9, TelephonyCommandType.EVENT), - TelephonyCommandLineOffHook_10Bytes((short) 0xAA, (short) 10, TelephonyCommandType.EVENT), - TelephonyCommandLineOffHook_11Bytes((short) 0xAB, (short) 11, TelephonyCommandType.EVENT), - TelephonyCommandLineOffHook_12Bytes((short) 0xAC, (short) 12, TelephonyCommandType.EVENT), - TelephonyCommandLineOffHook_13Bytes((short) 0xAD, (short) 13, TelephonyCommandType.EVENT), - TelephonyCommandLineOffHook_14Bytes((short) 0xAE, (short) 14, TelephonyCommandType.EVENT), - TelephonyCommandLineOffHook_15Bytes((short) 0xAF, (short) 15, TelephonyCommandType.EVENT), - TelephonyCommandLineOffHook_16Bytes((short) 0xB0, (short) 16, TelephonyCommandType.EVENT), - TelephonyCommandLineOffHook_17Bytes((short) 0xB1, (short) 17, TelephonyCommandType.EVENT), - TelephonyCommandLineOffHook_18Bytes((short) 0xB2, (short) 18, TelephonyCommandType.EVENT), - TelephonyCommandLineOffHook_19Bytes((short) 0xB3, (short) 19, TelephonyCommandType.EVENT), - TelephonyCommandLineOffHook_20Bytes((short) 0xB4, (short) 20, TelephonyCommandType.EVENT), - TelephonyCommandLineOffHook_21Bytes((short) 0xB5, (short) 21, TelephonyCommandType.EVENT), - TelephonyCommandLineOffHook_22Bytes((short) 0xB6, (short) 22, TelephonyCommandType.EVENT), - TelephonyCommandLineOffHook_23Bytes((short) 0xB7, (short) 23, TelephonyCommandType.EVENT), - TelephonyCommandLineOffHook_24Bytes((short) 0xB8, (short) 24, TelephonyCommandType.EVENT), - TelephonyCommandLineOffHook_25Bytes((short) 0xB9, (short) 25, TelephonyCommandType.EVENT), - TelephonyCommandLineOffHook_26Bytes((short) 0xBA, (short) 26, TelephonyCommandType.EVENT), - TelephonyCommandLineOffHook_27Bytes((short) 0xBB, (short) 27, TelephonyCommandType.EVENT), - TelephonyCommandLineOffHook_28Bytes((short) 0xBC, (short) 28, TelephonyCommandType.EVENT), - TelephonyCommandLineOffHook_29Bytes((short) 0xBD, (short) 29, TelephonyCommandType.EVENT), - TelephonyCommandLineOffHook_30Bytes((short) 0xBE, (short) 30, TelephonyCommandType.EVENT), - TelephonyCommandLineOffHook_31Bytes((short) 0xBF, (short) 31, TelephonyCommandType.EVENT); + TelephonyCommandLineOnHook((short) 0x09, (byte) 1, TelephonyCommandType.EVENT), + TelephonyCommandLineOffHook_0Bytes((short) 0xA0, (byte) 0, TelephonyCommandType.EVENT), + TelephonyCommandLineOffHook_1Bytes((short) 0xA1, (byte) 1, TelephonyCommandType.EVENT), + TelephonyCommandLineOffHook_2Bytes((short) 0xA2, (byte) 2, TelephonyCommandType.EVENT), + TelephonyCommandLineOffHook_3Bytes((short) 0xA3, (byte) 3, TelephonyCommandType.EVENT), + TelephonyCommandLineOffHook_4Bytes((short) 0xA4, (byte) 4, TelephonyCommandType.EVENT), + TelephonyCommandLineOffHook_5Bytes((short) 0xA5, (byte) 5, TelephonyCommandType.EVENT), + TelephonyCommandLineOffHook_6Bytes((short) 0xA6, (byte) 6, TelephonyCommandType.EVENT), + TelephonyCommandLineOffHook_7Bytes((short) 0xA7, (byte) 7, TelephonyCommandType.EVENT), + TelephonyCommandLineOffHook_8Bytes((short) 0xA8, (byte) 8, TelephonyCommandType.EVENT), + TelephonyCommandLineOffHook_9Bytes((short) 0xA9, (byte) 9, TelephonyCommandType.EVENT), + TelephonyCommandLineOffHook_10Bytes((short) 0xAA, (byte) 10, TelephonyCommandType.EVENT), + TelephonyCommandLineOffHook_11Bytes((short) 0xAB, (byte) 11, TelephonyCommandType.EVENT), + TelephonyCommandLineOffHook_12Bytes((short) 0xAC, (byte) 12, TelephonyCommandType.EVENT), + TelephonyCommandLineOffHook_13Bytes((short) 0xAD, (byte) 13, TelephonyCommandType.EVENT), + TelephonyCommandLineOffHook_14Bytes((short) 0xAE, (byte) 14, TelephonyCommandType.EVENT), + TelephonyCommandLineOffHook_15Bytes((short) 0xAF, (byte) 15, TelephonyCommandType.EVENT), + TelephonyCommandLineOffHook_16Bytes((short) 0xB0, (byte) 16, TelephonyCommandType.EVENT), + TelephonyCommandLineOffHook_17Bytes((short) 0xB1, (byte) 17, TelephonyCommandType.EVENT), + TelephonyCommandLineOffHook_18Bytes((short) 0xB2, (byte) 18, TelephonyCommandType.EVENT), + TelephonyCommandLineOffHook_19Bytes((short) 0xB3, (byte) 19, TelephonyCommandType.EVENT), + TelephonyCommandLineOffHook_20Bytes((short) 0xB4, (byte) 20, TelephonyCommandType.EVENT), + TelephonyCommandLineOffHook_21Bytes((short) 0xB5, (byte) 21, TelephonyCommandType.EVENT), + TelephonyCommandLineOffHook_22Bytes((short) 0xB6, (byte) 22, TelephonyCommandType.EVENT), + TelephonyCommandLineOffHook_23Bytes((short) 0xB7, (byte) 23, TelephonyCommandType.EVENT), + TelephonyCommandLineOffHook_24Bytes((short) 0xB8, (byte) 24, TelephonyCommandType.EVENT), + TelephonyCommandLineOffHook_25Bytes((short) 0xB9, (byte) 25, TelephonyCommandType.EVENT), + TelephonyCommandLineOffHook_26Bytes((short) 0xBA, (byte) 26, TelephonyCommandType.EVENT), + TelephonyCommandLineOffHook_27Bytes((short) 0xBB, (byte) 27, TelephonyCommandType.EVENT), + TelephonyCommandLineOffHook_28Bytes((short) 0xBC, (byte) 28, TelephonyCommandType.EVENT), + TelephonyCommandLineOffHook_29Bytes((short) 0xBD, (byte) 29, TelephonyCommandType.EVENT), + TelephonyCommandLineOffHook_30Bytes((short) 0xBE, (byte) 30, TelephonyCommandType.EVENT), + TelephonyCommandLineOffHook_31Bytes((short) 0xBF, (byte) 31, TelephonyCommandType.EVENT); private static final Map map; static { @@ -69,10 +69,10 @@ public enum TelephonyCommandTypeContainer { } private final short value; - private final short numBytes; + private final byte numBytes; private final TelephonyCommandType commandType; - TelephonyCommandTypeContainer(short value, short numBytes, TelephonyCommandType commandType) { + TelephonyCommandTypeContainer(short value, byte numBytes, TelephonyCommandType commandType) { this.value = value; this.numBytes = numBytes; this.commandType = commandType; @@ -82,11 +82,11 @@ public short getValue() { return value; } - public short getNumBytes() { + public byte getNumBytes() { return numBytes; } - public static TelephonyCommandTypeContainer firstEnumForFieldNumBytes(short fieldValue) { + public static TelephonyCommandTypeContainer firstEnumForFieldNumBytes(byte fieldValue) { for (TelephonyCommandTypeContainer _val : TelephonyCommandTypeContainer.values()) { if (_val.getNumBytes() == fieldValue) { return _val; @@ -95,7 +95,7 @@ public static TelephonyCommandTypeContainer firstEnumForFieldNumBytes(short fiel return null; } - public static List enumsForFieldNumBytes(short fieldValue) { + public static List enumsForFieldNumBytes(byte fieldValue) { List _values = new ArrayList<>(); for (TelephonyCommandTypeContainer _val : TelephonyCommandTypeContainer.values()) { if (_val.getNumBytes() == fieldValue) { diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/TemperatureBroadcastCommandTypeContainer.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/TemperatureBroadcastCommandTypeContainer.java index 049c52b0a4d..75beff8e188 100644 --- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/TemperatureBroadcastCommandTypeContainer.java +++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/TemperatureBroadcastCommandTypeContainer.java @@ -27,37 +27,37 @@ public enum TemperatureBroadcastCommandTypeContainer { TemperatureBroadcastCommandSetBroadcastEvent0_2Bytes( - (short) 0x02, (short) 2, TemperatureBroadcastCommandType.BROADCAST_EVENT), + (short) 0x02, (byte) 2, TemperatureBroadcastCommandType.BROADCAST_EVENT), TemperatureBroadcastCommandSetBroadcastEvent1_2Bytes( - (short) 0x0A, (short) 2, TemperatureBroadcastCommandType.BROADCAST_EVENT), + (short) 0x0A, (byte) 2, TemperatureBroadcastCommandType.BROADCAST_EVENT), TemperatureBroadcastCommandSetBroadcastEvent2_2Bytes( - (short) 0x12, (short) 2, TemperatureBroadcastCommandType.BROADCAST_EVENT), + (short) 0x12, (byte) 2, TemperatureBroadcastCommandType.BROADCAST_EVENT), TemperatureBroadcastCommandSetBroadcastEvent3_2Bytes( - (short) 0x1A, (short) 2, TemperatureBroadcastCommandType.BROADCAST_EVENT), + (short) 0x1A, (byte) 2, TemperatureBroadcastCommandType.BROADCAST_EVENT), TemperatureBroadcastCommandSetBroadcastEvent4_2Bytes( - (short) 0x22, (short) 2, TemperatureBroadcastCommandType.BROADCAST_EVENT), + (short) 0x22, (byte) 2, TemperatureBroadcastCommandType.BROADCAST_EVENT), TemperatureBroadcastCommandSetBroadcastEvent5_2Bytes( - (short) 0x2A, (short) 2, TemperatureBroadcastCommandType.BROADCAST_EVENT), + (short) 0x2A, (byte) 2, TemperatureBroadcastCommandType.BROADCAST_EVENT), TemperatureBroadcastCommandSetBroadcastEvent6_2Bytes( - (short) 0x32, (short) 2, TemperatureBroadcastCommandType.BROADCAST_EVENT), + (short) 0x32, (byte) 2, TemperatureBroadcastCommandType.BROADCAST_EVENT), TemperatureBroadcastCommandSetBroadcastEvent7_2Bytes( - (short) 0x3A, (short) 2, TemperatureBroadcastCommandType.BROADCAST_EVENT), + (short) 0x3A, (byte) 2, TemperatureBroadcastCommandType.BROADCAST_EVENT), TemperatureBroadcastCommandSetBroadcastEvent8_2Bytes( - (short) 0x42, (short) 2, TemperatureBroadcastCommandType.BROADCAST_EVENT), + (short) 0x42, (byte) 2, TemperatureBroadcastCommandType.BROADCAST_EVENT), TemperatureBroadcastCommandSetBroadcastEvent9_2Bytes( - (short) 0x4A, (short) 2, TemperatureBroadcastCommandType.BROADCAST_EVENT), + (short) 0x4A, (byte) 2, TemperatureBroadcastCommandType.BROADCAST_EVENT), TemperatureBroadcastCommandSetBroadcastEvent10_2Bytes( - (short) 0x52, (short) 2, TemperatureBroadcastCommandType.BROADCAST_EVENT), + (short) 0x52, (byte) 2, TemperatureBroadcastCommandType.BROADCAST_EVENT), TemperatureBroadcastCommandSetBroadcastEvent11_2Bytes( - (short) 0x5A, (short) 2, TemperatureBroadcastCommandType.BROADCAST_EVENT), + (short) 0x5A, (byte) 2, TemperatureBroadcastCommandType.BROADCAST_EVENT), TemperatureBroadcastCommandSetBroadcastEvent12_2Bytes( - (short) 0x62, (short) 2, TemperatureBroadcastCommandType.BROADCAST_EVENT), + (short) 0x62, (byte) 2, TemperatureBroadcastCommandType.BROADCAST_EVENT), TemperatureBroadcastCommandSetBroadcastEvent13_2Bytes( - (short) 0x6A, (short) 2, TemperatureBroadcastCommandType.BROADCAST_EVENT), + (short) 0x6A, (byte) 2, TemperatureBroadcastCommandType.BROADCAST_EVENT), TemperatureBroadcastCommandSetBroadcastEvent14_2Bytes( - (short) 0x72, (short) 2, TemperatureBroadcastCommandType.BROADCAST_EVENT), + (short) 0x72, (byte) 2, TemperatureBroadcastCommandType.BROADCAST_EVENT), TemperatureBroadcastCommandSetBroadcastEvent15_2Bytes( - (short) 0x7A, (short) 2, TemperatureBroadcastCommandType.BROADCAST_EVENT); + (short) 0x7A, (byte) 2, TemperatureBroadcastCommandType.BROADCAST_EVENT); private static final Map map; static { @@ -69,11 +69,11 @@ public enum TemperatureBroadcastCommandTypeContainer { } private final short value; - private final short numBytes; + private final byte numBytes; private final TemperatureBroadcastCommandType commandType; TemperatureBroadcastCommandTypeContainer( - short value, short numBytes, TemperatureBroadcastCommandType commandType) { + short value, byte numBytes, TemperatureBroadcastCommandType commandType) { this.value = value; this.numBytes = numBytes; this.commandType = commandType; @@ -83,12 +83,12 @@ public short getValue() { return value; } - public short getNumBytes() { + public byte getNumBytes() { return numBytes; } public static TemperatureBroadcastCommandTypeContainer firstEnumForFieldNumBytes( - short fieldValue) { + byte fieldValue) { for (TemperatureBroadcastCommandTypeContainer _val : TemperatureBroadcastCommandTypeContainer.values()) { if (_val.getNumBytes() == fieldValue) { @@ -99,7 +99,7 @@ public static TemperatureBroadcastCommandTypeContainer firstEnumForFieldNumBytes } public static List enumsForFieldNumBytes( - short fieldValue) { + byte fieldValue) { List _values = new ArrayList<>(); for (TemperatureBroadcastCommandTypeContainer _val : TemperatureBroadcastCommandTypeContainer.values()) { diff --git a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/TriggerControlCommandTypeContainer.java b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/TriggerControlCommandTypeContainer.java index 91b3b3ba1fc..a45f1add1a5 100644 --- a/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/TriggerControlCommandTypeContainer.java +++ b/plc4j/drivers/c-bus/src/main/generated/org/apache/plc4x/java/cbus/readwrite/TriggerControlCommandTypeContainer.java @@ -27,75 +27,75 @@ public enum TriggerControlCommandTypeContainer { TriggerControlCommandTriggerMin_1Bytes( - (short) 0x01, (short) 1, TriggerControlCommandType.TRIGGER_MIN), + (short) 0x01, (byte) 1, TriggerControlCommandType.TRIGGER_MIN), TriggerControlCommandIndicatorKill_1Bytes( - (short) 0x09, (short) 1, TriggerControlCommandType.INDICATOR_KILL), + (short) 0x09, (byte) 1, TriggerControlCommandType.INDICATOR_KILL), TriggerControlCommandTriggerMax_1Bytes( - (short) 0x79, (short) 1, TriggerControlCommandType.TRIGGER_MAX), + (short) 0x79, (byte) 1, TriggerControlCommandType.TRIGGER_MAX), TriggerControlCommandTriggerEvent0_2Bytes( - (short) 0x02, (short) 2, TriggerControlCommandType.TRIGGER_EVENT), + (short) 0x02, (byte) 2, TriggerControlCommandType.TRIGGER_EVENT), TriggerControlCommandTriggerEvent1_2Bytes( - (short) 0x0A, (short) 2, TriggerControlCommandType.TRIGGER_EVENT), + (short) 0x0A, (byte) 2, TriggerControlCommandType.TRIGGER_EVENT), TriggerControlCommandTriggerEvent2_2Bytes( - (short) 0x12, (short) 2, TriggerControlCommandType.TRIGGER_EVENT), + (short) 0x12, (byte) 2, TriggerControlCommandType.TRIGGER_EVENT), TriggerControlCommandTriggerEvent3_2Bytes( - (short) 0x1A, (short) 2, TriggerControlCommandType.TRIGGER_EVENT), + (short) 0x1A, (byte) 2, TriggerControlCommandType.TRIGGER_EVENT), TriggerControlCommandTriggerEvent4_2Bytes( - (short) 0x22, (short) 2, TriggerControlCommandType.TRIGGER_EVENT), + (short) 0x22, (byte) 2, TriggerControlCommandType.TRIGGER_EVENT), TriggerControlCommandTriggerEvent5_2Bytes( - (short) 0x2A, (short) 2, TriggerControlCommandType.TRIGGER_EVENT), + (short) 0x2A, (byte) 2, TriggerControlCommandType.TRIGGER_EVENT), TriggerControlCommandTriggerEvent6_2Bytes( - (short) 0x32, (short) 2, TriggerControlCommandType.TRIGGER_EVENT), + (short) 0x32, (byte) 2, TriggerControlCommandType.TRIGGER_EVENT), TriggerControlCommandTriggerEvent7_2Bytes( - (short) 0x3A, (short) 2, TriggerControlCommandType.TRIGGER_EVENT), + (short) 0x3A, (byte) 2, TriggerControlCommandType.TRIGGER_EVENT), TriggerControlCommandTriggerEvent8_2Bytes( - (short) 0x42, (short) 2, TriggerControlCommandType.TRIGGER_EVENT), + (short) 0x42, (byte) 2, TriggerControlCommandType.TRIGGER_EVENT), TriggerControlCommandTriggerEvent9_2Bytes( - (short) 0x4A, (short) 2, TriggerControlCommandType.TRIGGER_EVENT), + (short) 0x4A, (byte) 2, TriggerControlCommandType.TRIGGER_EVENT), TriggerControlCommandTriggerEvent10_2Bytes( - (short) 0x52, (short) 2, TriggerControlCommandType.TRIGGER_EVENT), + (short) 0x52, (byte) 2, TriggerControlCommandType.TRIGGER_EVENT), TriggerControlCommandTriggerEvent11_2Bytes( - (short) 0x5A, (short) 2, TriggerControlCommandType.TRIGGER_EVENT), + (short) 0x5A, (byte) 2, TriggerControlCommandType.TRIGGER_EVENT), TriggerControlCommandTriggerEvent12_2Bytes( - (short) 0x62, (short) 2, TriggerControlCommandType.TRIGGER_EVENT), + (short) 0x62, (byte) 2, TriggerControlCommandType.TRIGGER_EVENT), TriggerControlCommandTriggerEvent13_2Bytes( - (short) 0x6A, (short) 2, TriggerControlCommandType.TRIGGER_EVENT), + (short) 0x6A, (byte) 2, TriggerControlCommandType.TRIGGER_EVENT), TriggerControlCommandTriggerEvent14_2Bytes( - (short) 0x72, (short) 2, TriggerControlCommandType.TRIGGER_EVENT), + (short) 0x72, (byte) 2, TriggerControlCommandType.TRIGGER_EVENT), TriggerControlCommandTriggerEvent15_2Bytes( - (short) 0x7A, (short) 2, TriggerControlCommandType.TRIGGER_EVENT), - TriggerControlCommandLabel_0Bytes((short) 0xA0, (short) 0, TriggerControlCommandType.LABEL), - TriggerControlCommandLabel_1Bytes((short) 0xA1, (short) 1, TriggerControlCommandType.LABEL), - TriggerControlCommandLabel_2Bytes((short) 0xA2, (short) 2, TriggerControlCommandType.LABEL), - TriggerControlCommandLabel_3Bytes((short) 0xA3, (short) 3, TriggerControlCommandType.LABEL), - TriggerControlCommandLabel_4Bytes((short) 0xA4, (short) 4, TriggerControlCommandType.LABEL), - TriggerControlCommandLabel_5Bytes((short) 0xA5, (short) 5, TriggerControlCommandType.LABEL), - TriggerControlCommandLabel_6Bytes((short) 0xA6, (short) 6, TriggerControlCommandType.LABEL), - TriggerControlCommandLabel_7Bytes((short) 0xA7, (short) 7, TriggerControlCommandType.LABEL), - TriggerControlCommandLabel_8Bytes((short) 0xA8, (short) 8, TriggerControlCommandType.LABEL), - TriggerControlCommandLabel_9Bytes((short) 0xA9, (short) 9, TriggerControlCommandType.LABEL), - TriggerControlCommandLabel_10Bytes((short) 0xAA, (short) 10, TriggerControlCommandType.LABEL), - TriggerControlCommandLabel_11Bytes((short) 0xAB, (short) 11, TriggerControlCommandType.LABEL), - TriggerControlCommandLabel_12Bytes((short) 0xAC, (short) 12, TriggerControlCommandType.LABEL), - TriggerControlCommandLabel_13Bytes((short) 0xAD, (short) 13, TriggerControlCommandType.LABEL), - TriggerControlCommandLabel_14Bytes((short) 0xAE, (short) 14, TriggerControlCommandType.LABEL), - TriggerControlCommandLabel_15Bytes((short) 0xAF, (short) 15, TriggerControlCommandType.LABEL), - TriggerControlCommandLabel_16Bytes((short) 0xB0, (short) 16, TriggerControlCommandType.LABEL), - TriggerControlCommandLabel_17Bytes((short) 0xB1, (short) 17, TriggerControlCommandType.LABEL), - TriggerControlCommandLabel_18Bytes((short) 0xB2, (short) 18, TriggerControlCommandType.LABEL), - TriggerControlCommandLabel_19Bytes((short) 0xB3, (short) 19, TriggerControlCommandType.LABEL), - TriggerControlCommandLabel_20Bytes((short) 0xB4, (short) 20, TriggerControlCommandType.LABEL), - TriggerControlCommandLabel_21Bytes((short) 0xB5, (short) 21, TriggerControlCommandType.LABEL), - TriggerControlCommandLabel_22Bytes((short) 0xB6, (short) 22, TriggerControlCommandType.LABEL), - TriggerControlCommandLabel_23Bytes((short) 0xB7, (short) 23, TriggerControlCommandType.LABEL), - TriggerControlCommandLabel_24Bytes((short) 0xB8, (short) 24, TriggerControlCommandType.LABEL), - TriggerControlCommandLabel_25Bytes((short) 0xB9, (short) 25, TriggerControlCommandType.LABEL), - TriggerControlCommandLabel_26Bytes((short) 0xBA, (short) 26, TriggerControlCommandType.LABEL), - TriggerControlCommandLabel_27Bytes((short) 0xBB, (short) 27, TriggerControlCommandType.LABEL), - TriggerControlCommandLabel_28Bytes((short) 0xBC, (short) 28, TriggerControlCommandType.LABEL), - TriggerControlCommandLabel_29Bytes((short) 0xBD, (short) 29, TriggerControlCommandType.LABEL), - TriggerControlCommandLabel_30Bytes((short) 0xBE, (short) 30, TriggerControlCommandType.LABEL), - TriggerControlCommandLabel_31Bytes((short) 0xBF, (short) 31, TriggerControlCommandType.LABEL); + (short) 0x7A, (byte) 2, TriggerControlCommandType.TRIGGER_EVENT), + TriggerControlCommandLabel_0Bytes((short) 0xA0, (byte) 0, TriggerControlCommandType.LABEL), + TriggerControlCommandLabel_1Bytes((short) 0xA1, (byte) 1, TriggerControlCommandType.LABEL), + TriggerControlCommandLabel_2Bytes((short) 0xA2, (byte) 2, TriggerControlCommandType.LABEL), + TriggerControlCommandLabel_3Bytes((short) 0xA3, (byte) 3, TriggerControlCommandType.LABEL), + TriggerControlCommandLabel_4Bytes((short) 0xA4, (byte) 4, TriggerControlCommandType.LABEL), + TriggerControlCommandLabel_5Bytes((short) 0xA5, (byte) 5, TriggerControlCommandType.LABEL), + TriggerControlCommandLabel_6Bytes((short) 0xA6, (byte) 6, TriggerControlCommandType.LABEL), + TriggerControlCommandLabel_7Bytes((short) 0xA7, (byte) 7, TriggerControlCommandType.LABEL), + TriggerControlCommandLabel_8Bytes((short) 0xA8, (byte) 8, TriggerControlCommandType.LABEL), + TriggerControlCommandLabel_9Bytes((short) 0xA9, (byte) 9, TriggerControlCommandType.LABEL), + TriggerControlCommandLabel_10Bytes((short) 0xAA, (byte) 10, TriggerControlCommandType.LABEL), + TriggerControlCommandLabel_11Bytes((short) 0xAB, (byte) 11, TriggerControlCommandType.LABEL), + TriggerControlCommandLabel_12Bytes((short) 0xAC, (byte) 12, TriggerControlCommandType.LABEL), + TriggerControlCommandLabel_13Bytes((short) 0xAD, (byte) 13, TriggerControlCommandType.LABEL), + TriggerControlCommandLabel_14Bytes((short) 0xAE, (byte) 14, TriggerControlCommandType.LABEL), + TriggerControlCommandLabel_15Bytes((short) 0xAF, (byte) 15, TriggerControlCommandType.LABEL), + TriggerControlCommandLabel_16Bytes((short) 0xB0, (byte) 16, TriggerControlCommandType.LABEL), + TriggerControlCommandLabel_17Bytes((short) 0xB1, (byte) 17, TriggerControlCommandType.LABEL), + TriggerControlCommandLabel_18Bytes((short) 0xB2, (byte) 18, TriggerControlCommandType.LABEL), + TriggerControlCommandLabel_19Bytes((short) 0xB3, (byte) 19, TriggerControlCommandType.LABEL), + TriggerControlCommandLabel_20Bytes((short) 0xB4, (byte) 20, TriggerControlCommandType.LABEL), + TriggerControlCommandLabel_21Bytes((short) 0xB5, (byte) 21, TriggerControlCommandType.LABEL), + TriggerControlCommandLabel_22Bytes((short) 0xB6, (byte) 22, TriggerControlCommandType.LABEL), + TriggerControlCommandLabel_23Bytes((short) 0xB7, (byte) 23, TriggerControlCommandType.LABEL), + TriggerControlCommandLabel_24Bytes((short) 0xB8, (byte) 24, TriggerControlCommandType.LABEL), + TriggerControlCommandLabel_25Bytes((short) 0xB9, (byte) 25, TriggerControlCommandType.LABEL), + TriggerControlCommandLabel_26Bytes((short) 0xBA, (byte) 26, TriggerControlCommandType.LABEL), + TriggerControlCommandLabel_27Bytes((short) 0xBB, (byte) 27, TriggerControlCommandType.LABEL), + TriggerControlCommandLabel_28Bytes((short) 0xBC, (byte) 28, TriggerControlCommandType.LABEL), + TriggerControlCommandLabel_29Bytes((short) 0xBD, (byte) 29, TriggerControlCommandType.LABEL), + TriggerControlCommandLabel_30Bytes((short) 0xBE, (byte) 30, TriggerControlCommandType.LABEL), + TriggerControlCommandLabel_31Bytes((short) 0xBF, (byte) 31, TriggerControlCommandType.LABEL); private static final Map map; static { @@ -106,11 +106,11 @@ public enum TriggerControlCommandTypeContainer { } private final short value; - private final short numBytes; + private final byte numBytes; private final TriggerControlCommandType commandType; TriggerControlCommandTypeContainer( - short value, short numBytes, TriggerControlCommandType commandType) { + short value, byte numBytes, TriggerControlCommandType commandType) { this.value = value; this.numBytes = numBytes; this.commandType = commandType; @@ -120,11 +120,11 @@ public short getValue() { return value; } - public short getNumBytes() { + public byte getNumBytes() { return numBytes; } - public static TriggerControlCommandTypeContainer firstEnumForFieldNumBytes(short fieldValue) { + public static TriggerControlCommandTypeContainer firstEnumForFieldNumBytes(byte fieldValue) { for (TriggerControlCommandTypeContainer _val : TriggerControlCommandTypeContainer.values()) { if (_val.getNumBytes() == fieldValue) { return _val; @@ -133,7 +133,7 @@ public static TriggerControlCommandTypeContainer firstEnumForFieldNumBytes(short return null; } - public static List enumsForFieldNumBytes(short fieldValue) { + public static List enumsForFieldNumBytes(byte fieldValue) { List _values = new ArrayList<>(); for (TriggerControlCommandTypeContainer _val : TriggerControlCommandTypeContainer.values()) { if (_val.getNumBytes() == fieldValue) { diff --git a/plc4j/drivers/can/src/main/generated/org/apache/plc4x/java/genericcan/readwrite/DataItem.java b/plc4j/drivers/can/src/main/generated/org/apache/plc4x/java/genericcan/readwrite/DataItem.java index 8fff16aec01..cca0596d5b4 100644 --- a/plc4j/drivers/can/src/main/generated/org/apache/plc4x/java/genericcan/readwrite/DataItem.java +++ b/plc4j/drivers/can/src/main/generated/org/apache/plc4x/java/genericcan/readwrite/DataItem.java @@ -69,7 +69,7 @@ public static PlcValue staticParse(ReadBuffer readBuffer, GenericCANDataType dat } else if (EvaluationHelper.equals(dataType, GenericCANDataType.UNSIGNED24)) { // UDINT // Simple Field (value) - Long value = /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readUnsignedLong("", 24); + Integer value = /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readUnsignedInt("", 24); return new PlcUDINT(value); } else if (EvaluationHelper.equals(dataType, GenericCANDataType.UNSIGNED32)) { // UDINT @@ -81,22 +81,19 @@ public static PlcValue staticParse(ReadBuffer readBuffer, GenericCANDataType dat } else if (EvaluationHelper.equals(dataType, GenericCANDataType.UNSIGNED40)) { // ULINT // Simple Field (value) - BigInteger value = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedBigInteger("", 40); + Long value = /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readUnsignedLong("", 40); return new PlcULINT(value); } else if (EvaluationHelper.equals(dataType, GenericCANDataType.UNSIGNED48)) { // ULINT // Simple Field (value) - BigInteger value = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedBigInteger("", 48); + Long value = /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readUnsignedLong("", 48); return new PlcULINT(value); } else if (EvaluationHelper.equals(dataType, GenericCANDataType.UNSIGNED56)) { // ULINT // Simple Field (value) - BigInteger value = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedBigInteger("", 56); + Long value = /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readUnsignedLong("", 56); return new PlcULINT(value); } else if (EvaluationHelper.equals(dataType, GenericCANDataType.UNSIGNED64)) { // ULINT @@ -201,9 +198,9 @@ public static void staticSerialize( /*TODO: migrate me*/ writeBuffer.writeUnsignedInt("", 16, ((Number) (value)).intValue()); } else if (EvaluationHelper.equals(dataType, GenericCANDataType.UNSIGNED24)) { // UDINT // Simple Field (value) - long value = (long) _value.getLong(); + int value = (int) _value.getInt(); /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedLong("", 24, ((Number) (value)).longValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedInt("", 24, ((Number) (value)).intValue()); } else if (EvaluationHelper.equals(dataType, GenericCANDataType.UNSIGNED32)) { // UDINT // Simple Field (value) long value = (long) _value.getLong(); @@ -211,19 +208,19 @@ public static void staticSerialize( /*TODO: migrate me*/ writeBuffer.writeUnsignedLong("", 32, ((Number) (value)).longValue()); } else if (EvaluationHelper.equals(dataType, GenericCANDataType.UNSIGNED40)) { // ULINT // Simple Field (value) - BigInteger value = (BigInteger) _value.getBigInteger(); + long value = (long) _value.getLong(); /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedBigInteger("", 40, (BigInteger) (value)); + /*TODO: migrate me*/ writeBuffer.writeUnsignedLong("", 40, ((Number) (value)).longValue()); } else if (EvaluationHelper.equals(dataType, GenericCANDataType.UNSIGNED48)) { // ULINT // Simple Field (value) - BigInteger value = (BigInteger) _value.getBigInteger(); + long value = (long) _value.getLong(); /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedBigInteger("", 48, (BigInteger) (value)); + /*TODO: migrate me*/ writeBuffer.writeUnsignedLong("", 48, ((Number) (value)).longValue()); } else if (EvaluationHelper.equals(dataType, GenericCANDataType.UNSIGNED56)) { // ULINT // Simple Field (value) - BigInteger value = (BigInteger) _value.getBigInteger(); + long value = (long) _value.getLong(); /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedBigInteger("", 56, (BigInteger) (value)); + /*TODO: migrate me*/ writeBuffer.writeUnsignedLong("", 56, ((Number) (value)).longValue()); } else if (EvaluationHelper.equals(dataType, GenericCANDataType.UNSIGNED64)) { // ULINT // Simple Field (value) BigInteger value = (BigInteger) _value.getBigInteger(); diff --git a/plc4j/drivers/canopen/src/main/generated/org/apache/plc4x/java/canopen/readwrite/CANOpenNetworkPayload.java b/plc4j/drivers/canopen/src/main/generated/org/apache/plc4x/java/canopen/readwrite/CANOpenNetworkPayload.java index c7d436ff4a1..cd74b64b11f 100644 --- a/plc4j/drivers/canopen/src/main/generated/org/apache/plc4x/java/canopen/readwrite/CANOpenNetworkPayload.java +++ b/plc4j/drivers/canopen/src/main/generated/org/apache/plc4x/java/canopen/readwrite/CANOpenNetworkPayload.java @@ -44,9 +44,9 @@ public CANOpenService getService() { // Properties. protected final NMTStateRequest request; - protected final short node; + protected final byte node; - public CANOpenNetworkPayload(NMTStateRequest request, short node) { + public CANOpenNetworkPayload(NMTStateRequest request, byte node) { super(); this.request = request; this.node = node; @@ -56,7 +56,7 @@ public NMTStateRequest getRequest() { return request; } - public short getNode() { + public byte getNode() { return node; } @@ -79,7 +79,7 @@ protected void serializeCANOpenPayloadChild(WriteBuffer writeBuffer) writeReservedField("reserved", (byte) 0x00, writeUnsignedByte(writeBuffer, 1)); // Simple Field (node) - writeSimpleField("node", node, writeUnsignedShort(writeBuffer, 7)); + writeSimpleField("node", node, writeUnsignedByte(writeBuffer, 7)); writeBuffer.popContext("CANOpenNetworkPayload"); } @@ -123,7 +123,7 @@ public static CANOpenPayloadBuilder staticParseCANOpenPayloadBuilder( Byte reservedField0 = readReservedField("reserved", readUnsignedByte(readBuffer, 1), (byte) 0x00); - short node = readSimpleField("node", readUnsignedShort(readBuffer, 7)); + byte node = readSimpleField("node", readUnsignedByte(readBuffer, 7)); readBuffer.closeContext("CANOpenNetworkPayload"); // Create the instance @@ -133,9 +133,9 @@ public static CANOpenPayloadBuilder staticParseCANOpenPayloadBuilder( public static class CANOpenNetworkPayloadBuilderImpl implements CANOpenPayload.CANOpenPayloadBuilder { private final NMTStateRequest request; - private final short node; + private final byte node; - public CANOpenNetworkPayloadBuilderImpl(NMTStateRequest request, short node) { + public CANOpenNetworkPayloadBuilderImpl(NMTStateRequest request, byte node) { this.request = request; this.node = node; } diff --git a/plc4j/drivers/canopen/src/main/generated/org/apache/plc4x/java/canopen/readwrite/CANOpenTime.java b/plc4j/drivers/canopen/src/main/generated/org/apache/plc4x/java/canopen/readwrite/CANOpenTime.java index 397f66c372c..2e891a4e133 100644 --- a/plc4j/drivers/canopen/src/main/generated/org/apache/plc4x/java/canopen/readwrite/CANOpenTime.java +++ b/plc4j/drivers/canopen/src/main/generated/org/apache/plc4x/java/canopen/readwrite/CANOpenTime.java @@ -55,16 +55,21 @@ public int getDays() { return days; } + public int getCleanMillis() { + return (int) ((getMillis()) & (0x0FFFFFFF)); + } + public void serialize(WriteBuffer writeBuffer) throws SerializationException { PositionAware positionAware = writeBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); writeBuffer.pushContext("CANOpenTime"); // Simple Field (millis) - writeSimpleField("millis", millis, writeUnsignedLong(writeBuffer, 28)); + writeSimpleField("millis", millis, writeUnsignedLong(writeBuffer, 32)); - // Reserved Field (reserved) - writeReservedField("reserved", (byte) 0x00, writeSignedByte(writeBuffer, 4)); + // Virtual field (doesn't actually serialize anything, just makes the value available) + int cleanMillis = getCleanMillis(); + writeBuffer.writeVirtual("cleanMillis", cleanMillis); // Simple Field (days) writeSimpleField("days", days, writeUnsignedInt(writeBuffer, 16)); @@ -84,10 +89,9 @@ public int getLengthInBits() { boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Simple field (millis) - lengthInBits += 28; + lengthInBits += 32; - // Reserved Field (reserved) - lengthInBits += 4; + // A virtual field doesn't have any in- or output. // Simple field (days) lengthInBits += 16; @@ -106,9 +110,8 @@ public static CANOpenTime staticParse(ReadBuffer readBuffer) throws ParseExcepti PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - long millis = readSimpleField("millis", readUnsignedLong(readBuffer, 28)); - - Byte reservedField0 = readReservedField("reserved", readSignedByte(readBuffer, 4), (byte) 0x00); + long millis = readSimpleField("millis", readUnsignedLong(readBuffer, 32)); + int cleanMillis = readVirtualField("cleanMillis", int.class, (millis) & (0x0FFFFFFF)); int days = readSimpleField("days", readUnsignedInt(readBuffer, 16)); diff --git a/plc4j/drivers/canopen/src/main/generated/org/apache/plc4x/java/canopen/readwrite/DataItem.java b/plc4j/drivers/canopen/src/main/generated/org/apache/plc4x/java/canopen/readwrite/DataItem.java index c417e260f68..b1e7647997a 100644 --- a/plc4j/drivers/canopen/src/main/generated/org/apache/plc4x/java/canopen/readwrite/DataItem.java +++ b/plc4j/drivers/canopen/src/main/generated/org/apache/plc4x/java/canopen/readwrite/DataItem.java @@ -64,7 +64,7 @@ public static PlcValue staticParse(ReadBuffer readBuffer, CANOpenDataType dataTy } else if (EvaluationHelper.equals(dataType, CANOpenDataType.UNSIGNED24)) { // UDINT // Simple Field (value) - Long value = /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readUnsignedLong("", 24); + Integer value = /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readUnsignedInt("", 24); return new PlcUDINT(value); } else if (EvaluationHelper.equals(dataType, CANOpenDataType.UNSIGNED32)) { // UDINT @@ -76,22 +76,19 @@ public static PlcValue staticParse(ReadBuffer readBuffer, CANOpenDataType dataTy } else if (EvaluationHelper.equals(dataType, CANOpenDataType.UNSIGNED40)) { // ULINT // Simple Field (value) - BigInteger value = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedBigInteger("", 40); + Long value = /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readUnsignedLong("", 40); return new PlcULINT(value); } else if (EvaluationHelper.equals(dataType, CANOpenDataType.UNSIGNED48)) { // ULINT // Simple Field (value) - BigInteger value = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedBigInteger("", 48); + Long value = /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readUnsignedLong("", 48); return new PlcULINT(value); } else if (EvaluationHelper.equals(dataType, CANOpenDataType.UNSIGNED56)) { // ULINT // Simple Field (value) - BigInteger value = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedBigInteger("", 56); + Long value = /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readUnsignedLong("", 56); return new PlcULINT(value); } else if (EvaluationHelper.equals(dataType, CANOpenDataType.UNSIGNED64)) { // ULINT @@ -227,9 +224,9 @@ public static void staticSerialize( /*TODO: migrate me*/ writeBuffer.writeUnsignedInt("", 16, ((Number) (value)).intValue()); } else if (EvaluationHelper.equals(dataType, CANOpenDataType.UNSIGNED24)) { // UDINT // Simple Field (value) - long value = (long) _value.getLong(); + int value = (int) _value.getInt(); /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedLong("", 24, ((Number) (value)).longValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedInt("", 24, ((Number) (value)).intValue()); } else if (EvaluationHelper.equals(dataType, CANOpenDataType.UNSIGNED32)) { // UDINT // Simple Field (value) long value = (long) _value.getLong(); @@ -237,19 +234,19 @@ public static void staticSerialize( /*TODO: migrate me*/ writeBuffer.writeUnsignedLong("", 32, ((Number) (value)).longValue()); } else if (EvaluationHelper.equals(dataType, CANOpenDataType.UNSIGNED40)) { // ULINT // Simple Field (value) - BigInteger value = (BigInteger) _value.getBigInteger(); + long value = (long) _value.getLong(); /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedBigInteger("", 40, (BigInteger) (value)); + /*TODO: migrate me*/ writeBuffer.writeUnsignedLong("", 40, ((Number) (value)).longValue()); } else if (EvaluationHelper.equals(dataType, CANOpenDataType.UNSIGNED48)) { // ULINT // Simple Field (value) - BigInteger value = (BigInteger) _value.getBigInteger(); + long value = (long) _value.getLong(); /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedBigInteger("", 48, (BigInteger) (value)); + /*TODO: migrate me*/ writeBuffer.writeUnsignedLong("", 48, ((Number) (value)).longValue()); } else if (EvaluationHelper.equals(dataType, CANOpenDataType.UNSIGNED56)) { // ULINT // Simple Field (value) - BigInteger value = (BigInteger) _value.getBigInteger(); + long value = (long) _value.getLong(); /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedBigInteger("", 56, (BigInteger) (value)); + /*TODO: migrate me*/ writeBuffer.writeUnsignedLong("", 56, ((Number) (value)).longValue()); } else if (EvaluationHelper.equals(dataType, CANOpenDataType.UNSIGNED64)) { // ULINT // Simple Field (value) BigInteger value = (BigInteger) _value.getBigInteger(); diff --git a/plc4j/drivers/canopen/src/main/generated/org/apache/plc4x/java/canopen/readwrite/SDOAbort.java b/plc4j/drivers/canopen/src/main/generated/org/apache/plc4x/java/canopen/readwrite/SDOAbort.java index 56ea55f0d33..4846c0c05c5 100644 --- a/plc4j/drivers/canopen/src/main/generated/org/apache/plc4x/java/canopen/readwrite/SDOAbort.java +++ b/plc4j/drivers/canopen/src/main/generated/org/apache/plc4x/java/canopen/readwrite/SDOAbort.java @@ -61,7 +61,7 @@ public void serialize(WriteBuffer writeBuffer) throws SerializationException { writeBuffer.pushContext("SDOAbort"); // Reserved Field (reserved) - writeReservedField("reserved", (short) 0x00, writeUnsignedShort(writeBuffer, 5)); + writeReservedField("reserved", (byte) 0x00, writeUnsignedByte(writeBuffer, 5)); // Simple Field (address) writeSimpleField("address", address, new DataWriterComplexDefault<>(writeBuffer)); @@ -105,8 +105,8 @@ public static SDOAbort staticParse(ReadBuffer readBuffer) throws ParseException PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - Short reservedField0 = - readReservedField("reserved", readUnsignedShort(readBuffer, 5), (short) 0x00); + Byte reservedField0 = + readReservedField("reserved", readUnsignedByte(readBuffer, 5), (byte) 0x00); IndexAddress address = readSimpleField( diff --git a/plc4j/drivers/canopen/src/main/generated/org/apache/plc4x/java/canopen/readwrite/SDOBlockData.java b/plc4j/drivers/canopen/src/main/generated/org/apache/plc4x/java/canopen/readwrite/SDOBlockData.java index 43136abd24c..ae0ece782bf 100644 --- a/plc4j/drivers/canopen/src/main/generated/org/apache/plc4x/java/canopen/readwrite/SDOBlockData.java +++ b/plc4j/drivers/canopen/src/main/generated/org/apache/plc4x/java/canopen/readwrite/SDOBlockData.java @@ -38,16 +38,16 @@ public class SDOBlockData implements Message { // Properties. - protected final short flags; + protected final byte flags; protected final byte[] data; - public SDOBlockData(short flags, byte[] data) { + public SDOBlockData(byte flags, byte[] data) { super(); this.flags = flags; this.data = data; } - public short getFlags() { + public byte getFlags() { return flags; } @@ -61,7 +61,7 @@ public void serialize(WriteBuffer writeBuffer) throws SerializationException { writeBuffer.pushContext("SDOBlockData"); // Simple Field (flags) - writeSimpleField("flags", flags, writeUnsignedShort(writeBuffer, 5)); + writeSimpleField("flags", flags, writeUnsignedByte(writeBuffer, 5)); // Array Field (data) writeByteArrayField("data", data, writeByteArray(writeBuffer, 8)); @@ -102,7 +102,7 @@ public static SDOBlockData staticParse(ReadBuffer readBuffer) throws ParseExcept PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - short flags = readSimpleField("flags", readUnsignedShort(readBuffer, 5)); + byte flags = readSimpleField("flags", readUnsignedByte(readBuffer, 5)); byte[] data = readBuffer.readByteArray("data", Math.toIntExact(7)); diff --git a/plc4j/drivers/canopen/src/main/generated/org/apache/plc4x/java/canopen/readwrite/SDOInitiateDownloadResponse.java b/plc4j/drivers/canopen/src/main/generated/org/apache/plc4x/java/canopen/readwrite/SDOInitiateDownloadResponse.java index 652fe882f06..79543306e77 100644 --- a/plc4j/drivers/canopen/src/main/generated/org/apache/plc4x/java/canopen/readwrite/SDOInitiateDownloadResponse.java +++ b/plc4j/drivers/canopen/src/main/generated/org/apache/plc4x/java/canopen/readwrite/SDOInitiateDownloadResponse.java @@ -61,7 +61,7 @@ protected void serializeSDOResponseChild(WriteBuffer writeBuffer) throws Seriali writeBuffer.pushContext("SDOInitiateDownloadResponse"); // Reserved Field (reserved) - writeReservedField("reserved", (short) 0x00, writeUnsignedShort(writeBuffer, 5)); + writeReservedField("reserved", (byte) 0x00, writeUnsignedByte(writeBuffer, 5)); // Simple Field (address) writeSimpleField("address", address, new DataWriterComplexDefault<>(writeBuffer)); @@ -101,8 +101,8 @@ public static SDOResponseBuilder staticParseSDOResponseBuilder( PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - Short reservedField0 = - readReservedField("reserved", readUnsignedShort(readBuffer, 5), (short) 0x00); + Byte reservedField0 = + readReservedField("reserved", readUnsignedByte(readBuffer, 5), (byte) 0x00); IndexAddress address = readSimpleField( diff --git a/plc4j/drivers/canopen/src/main/generated/org/apache/plc4x/java/canopen/readwrite/SDOInitiateUploadRequest.java b/plc4j/drivers/canopen/src/main/generated/org/apache/plc4x/java/canopen/readwrite/SDOInitiateUploadRequest.java index 6e7ba93b403..16a67a6f650 100644 --- a/plc4j/drivers/canopen/src/main/generated/org/apache/plc4x/java/canopen/readwrite/SDOInitiateUploadRequest.java +++ b/plc4j/drivers/canopen/src/main/generated/org/apache/plc4x/java/canopen/readwrite/SDOInitiateUploadRequest.java @@ -61,7 +61,7 @@ protected void serializeSDORequestChild(WriteBuffer writeBuffer) throws Serializ writeBuffer.pushContext("SDOInitiateUploadRequest"); // Reserved Field (reserved) - writeReservedField("reserved", (short) 0x00, writeUnsignedShort(writeBuffer, 5)); + writeReservedField("reserved", (byte) 0x00, writeUnsignedByte(writeBuffer, 5)); // Simple Field (address) writeSimpleField("address", address, new DataWriterComplexDefault<>(writeBuffer)); @@ -101,8 +101,8 @@ public static SDORequestBuilder staticParseSDORequestBuilder( PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - Short reservedField0 = - readReservedField("reserved", readUnsignedShort(readBuffer, 5), (short) 0x00); + Byte reservedField0 = + readReservedField("reserved", readUnsignedByte(readBuffer, 5), (byte) 0x00); IndexAddress address = readSimpleField( diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/AnsiExtendedSymbolSegment.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/AnsiExtendedSymbolSegment.java index 5361de1f8d4..8f52ccd98d8 100644 --- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/AnsiExtendedSymbolSegment.java +++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/AnsiExtendedSymbolSegment.java @@ -38,8 +38,8 @@ public class AnsiExtendedSymbolSegment extends DataSegmentType implements Message { // Accessors for discriminator values. - public Short getDataSegmentType() { - return (short) 0x11; + public Byte getDataSegmentType() { + return (byte) 0x11; } // Properties. diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipConnectedRequest.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipConnectedRequest.java index 709505297c3..d7849e46d2d 100644 --- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipConnectedRequest.java +++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipConnectedRequest.java @@ -38,8 +38,8 @@ public class CipConnectedRequest extends CipService implements Message { // Accessors for discriminator values. - public Short getService() { - return (short) 0x52; + public Byte getService() { + return (byte) 0x52; } public Boolean getResponse() { diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipConnectedResponse.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipConnectedResponse.java index 8e47801aefd..b65d6b48fa3 100644 --- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipConnectedResponse.java +++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipConnectedResponse.java @@ -38,8 +38,8 @@ public class CipConnectedResponse extends CipService implements Message { // Accessors for discriminator values. - public Short getService() { - return (short) 0x52; + public Byte getService() { + return (byte) 0x52; } public Boolean getResponse() { diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipConnectionManagerCloseRequest.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipConnectionManagerCloseRequest.java index 97b5d339dd4..deea8405e0e 100644 --- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipConnectionManagerCloseRequest.java +++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipConnectionManagerCloseRequest.java @@ -38,8 +38,8 @@ public class CipConnectionManagerCloseRequest extends CipService implements Message { // Accessors for discriminator values. - public Short getService() { - return (short) 0x4E; + public Byte getService() { + return (byte) 0x4E; } public Boolean getResponse() { diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipConnectionManagerCloseResponse.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipConnectionManagerCloseResponse.java index 9702b5fffb3..c1875cffee7 100644 --- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipConnectionManagerCloseResponse.java +++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipConnectionManagerCloseResponse.java @@ -38,8 +38,8 @@ public class CipConnectionManagerCloseResponse extends CipService implements Message { // Accessors for discriminator values. - public Short getService() { - return (short) 0x4E; + public Byte getService() { + return (byte) 0x4E; } public Boolean getResponse() { diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipConnectionManagerRequest.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipConnectionManagerRequest.java index ccd6317df1b..27d1405b18b 100644 --- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipConnectionManagerRequest.java +++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipConnectionManagerRequest.java @@ -38,8 +38,8 @@ public class CipConnectionManagerRequest extends CipService implements Message { // Accessors for discriminator values. - public Short getService() { - return (short) 0x5B; + public Byte getService() { + return (byte) 0x5B; } public Boolean getResponse() { @@ -233,7 +233,7 @@ protected void serializeCipServiceChild(WriteBuffer writeBuffer) throws Serializ writeSimpleField("timeoutMultiplier", timeoutMultiplier, writeUnsignedShort(writeBuffer, 8)); // Reserved Field (reserved) - writeReservedField("reserved", (long) 0x000000, writeUnsignedLong(writeBuffer, 24)); + writeReservedField("reserved", (int) 0x000000, writeUnsignedInt(writeBuffer, 24)); // Simple Field (otRpi) writeSimpleField("otRpi", otRpi, writeUnsignedLong(writeBuffer, 32)); @@ -382,8 +382,8 @@ public static CipServiceBuilder staticParseCipServiceBuilder( short timeoutMultiplier = readSimpleField("timeoutMultiplier", readUnsignedShort(readBuffer, 8)); - Long reservedField0 = - readReservedField("reserved", readUnsignedLong(readBuffer, 24), (long) 0x000000); + Integer reservedField0 = + readReservedField("reserved", readUnsignedInt(readBuffer, 24), (int) 0x000000); long otRpi = readSimpleField("otRpi", readUnsignedLong(readBuffer, 32)); diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipConnectionManagerResponse.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipConnectionManagerResponse.java index b4a19ad89bd..96b680aeaef 100644 --- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipConnectionManagerResponse.java +++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipConnectionManagerResponse.java @@ -38,8 +38,8 @@ public class CipConnectionManagerResponse extends CipService implements Message { // Accessors for discriminator values. - public Short getService() { - return (short) 0x5B; + public Byte getService() { + return (byte) 0x5B; } public Boolean getResponse() { @@ -112,7 +112,7 @@ protected void serializeCipServiceChild(WriteBuffer writeBuffer) throws Serializ writeBuffer.pushContext("CipConnectionManagerResponse"); // Reserved Field (reserved) - writeReservedField("reserved", (long) 0x000000, writeUnsignedLong(writeBuffer, 24)); + writeReservedField("reserved", (int) 0x000000, writeUnsignedInt(writeBuffer, 24)); // Simple Field (otConnectionId) writeSimpleField("otConnectionId", otConnectionId, writeUnsignedLong(writeBuffer, 32)); @@ -198,8 +198,8 @@ public static CipServiceBuilder staticParseCipServiceBuilder( PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - Long reservedField0 = - readReservedField("reserved", readUnsignedLong(readBuffer, 24), (long) 0x000000); + Integer reservedField0 = + readReservedField("reserved", readUnsignedInt(readBuffer, 24), (int) 0x000000); long otConnectionId = readSimpleField("otConnectionId", readUnsignedLong(readBuffer, 32)); diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipReadRequest.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipReadRequest.java index 1cddbcfa0d5..ee4930506ff 100644 --- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipReadRequest.java +++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipReadRequest.java @@ -38,8 +38,8 @@ public class CipReadRequest extends CipService implements Message { // Accessors for discriminator values. - public Short getService() { - return (short) 0x4C; + public Byte getService() { + return (byte) 0x4C; } public Boolean getResponse() { diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipReadResponse.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipReadResponse.java index 3b9b106fde3..adfbfdc07d8 100644 --- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipReadResponse.java +++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipReadResponse.java @@ -38,8 +38,8 @@ public class CipReadResponse extends CipService implements Message { // Accessors for discriminator values. - public Short getService() { - return (short) 0x4C; + public Byte getService() { + return (byte) 0x4C; } public Boolean getResponse() { diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipService.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipService.java index 133b21dfc44..77cbd68b7fc 100644 --- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipService.java +++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipService.java @@ -42,7 +42,7 @@ public abstract class CipService implements Message { public abstract Boolean getResponse(); - public abstract Short getService(); + public abstract Byte getService(); public CipService() { super(); @@ -60,7 +60,7 @@ public void serialize(WriteBuffer writeBuffer) throws SerializationException { writeDiscriminatorField("response", getResponse(), writeBoolean(writeBuffer)); // Discriminator Field (service) (Used as input to a switch field) - writeDiscriminatorField("service", getService(), writeUnsignedShort(writeBuffer, 7)); + writeDiscriminatorField("service", getService(), writeUnsignedByte(writeBuffer, 7)); // Switch field (Serialize the sub-type) serializeCipServiceChild(writeBuffer); @@ -128,109 +128,109 @@ public static CipService staticParse(ReadBuffer readBuffer, Boolean connected, I boolean response = readDiscriminatorField("response", readBoolean(readBuffer)); - short service = readDiscriminatorField("service", readUnsignedShort(readBuffer, 7)); + byte service = readDiscriminatorField("service", readUnsignedByte(readBuffer, 7)); // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) CipServiceBuilder builder = null; - if (EvaluationHelper.equals(service, (short) 0x01) + if (EvaluationHelper.equals(service, (byte) 0x01) && EvaluationHelper.equals(response, (boolean) false)) { builder = GetAttributeAllRequest.staticParseCipServiceBuilder(readBuffer, connected, serviceLen); - } else if (EvaluationHelper.equals(service, (short) 0x01) + } else if (EvaluationHelper.equals(service, (byte) 0x01) && EvaluationHelper.equals(response, (boolean) true)) { builder = GetAttributeAllResponse.staticParseCipServiceBuilder(readBuffer, connected, serviceLen); - } else if (EvaluationHelper.equals(service, (short) 0x02) + } else if (EvaluationHelper.equals(service, (byte) 0x02) && EvaluationHelper.equals(response, (boolean) false)) { builder = SetAttributeAllRequest.staticParseCipServiceBuilder(readBuffer, connected, serviceLen); - } else if (EvaluationHelper.equals(service, (short) 0x02) + } else if (EvaluationHelper.equals(service, (byte) 0x02) && EvaluationHelper.equals(response, (boolean) true)) { builder = SetAttributeAllResponse.staticParseCipServiceBuilder(readBuffer, connected, serviceLen); - } else if (EvaluationHelper.equals(service, (short) 0x03) + } else if (EvaluationHelper.equals(service, (byte) 0x03) && EvaluationHelper.equals(response, (boolean) false)) { builder = GetAttributeListRequest.staticParseCipServiceBuilder(readBuffer, connected, serviceLen); - } else if (EvaluationHelper.equals(service, (short) 0x03) + } else if (EvaluationHelper.equals(service, (byte) 0x03) && EvaluationHelper.equals(response, (boolean) true)) { builder = GetAttributeListResponse.staticParseCipServiceBuilder(readBuffer, connected, serviceLen); - } else if (EvaluationHelper.equals(service, (short) 0x04) + } else if (EvaluationHelper.equals(service, (byte) 0x04) && EvaluationHelper.equals(response, (boolean) false)) { builder = SetAttributeListRequest.staticParseCipServiceBuilder(readBuffer, connected, serviceLen); - } else if (EvaluationHelper.equals(service, (short) 0x04) + } else if (EvaluationHelper.equals(service, (byte) 0x04) && EvaluationHelper.equals(response, (boolean) true)) { builder = SetAttributeListResponse.staticParseCipServiceBuilder(readBuffer, connected, serviceLen); - } else if (EvaluationHelper.equals(service, (short) 0x0A) + } else if (EvaluationHelper.equals(service, (byte) 0x0A) && EvaluationHelper.equals(response, (boolean) false)) { builder = MultipleServiceRequest.staticParseCipServiceBuilder(readBuffer, connected, serviceLen); - } else if (EvaluationHelper.equals(service, (short) 0x0A) + } else if (EvaluationHelper.equals(service, (byte) 0x0A) && EvaluationHelper.equals(response, (boolean) true)) { builder = MultipleServiceResponse.staticParseCipServiceBuilder(readBuffer, connected, serviceLen); - } else if (EvaluationHelper.equals(service, (short) 0x0E) + } else if (EvaluationHelper.equals(service, (byte) 0x0E) && EvaluationHelper.equals(response, (boolean) false)) { builder = GetAttributeSingleRequest.staticParseCipServiceBuilder(readBuffer, connected, serviceLen); - } else if (EvaluationHelper.equals(service, (short) 0x0E) + } else if (EvaluationHelper.equals(service, (byte) 0x0E) && EvaluationHelper.equals(response, (boolean) true)) { builder = GetAttributeSingleResponse.staticParseCipServiceBuilder( readBuffer, connected, serviceLen); - } else if (EvaluationHelper.equals(service, (short) 0x10) + } else if (EvaluationHelper.equals(service, (byte) 0x10) && EvaluationHelper.equals(response, (boolean) false)) { builder = SetAttributeSingleRequest.staticParseCipServiceBuilder(readBuffer, connected, serviceLen); - } else if (EvaluationHelper.equals(service, (short) 0x10) + } else if (EvaluationHelper.equals(service, (byte) 0x10) && EvaluationHelper.equals(response, (boolean) true)) { builder = SetAttributeSingleResponse.staticParseCipServiceBuilder( readBuffer, connected, serviceLen); - } else if (EvaluationHelper.equals(service, (short) 0x4C) + } else if (EvaluationHelper.equals(service, (byte) 0x4C) && EvaluationHelper.equals(response, (boolean) false)) { builder = CipReadRequest.staticParseCipServiceBuilder(readBuffer, connected, serviceLen); - } else if (EvaluationHelper.equals(service, (short) 0x4C) + } else if (EvaluationHelper.equals(service, (byte) 0x4C) && EvaluationHelper.equals(response, (boolean) true)) { builder = CipReadResponse.staticParseCipServiceBuilder(readBuffer, connected, serviceLen); - } else if (EvaluationHelper.equals(service, (short) 0x4D) + } else if (EvaluationHelper.equals(service, (byte) 0x4D) && EvaluationHelper.equals(response, (boolean) false)) { builder = CipWriteRequest.staticParseCipServiceBuilder(readBuffer, connected, serviceLen); - } else if (EvaluationHelper.equals(service, (short) 0x4D) + } else if (EvaluationHelper.equals(service, (byte) 0x4D) && EvaluationHelper.equals(response, (boolean) true)) { builder = CipWriteResponse.staticParseCipServiceBuilder(readBuffer, connected, serviceLen); - } else if (EvaluationHelper.equals(service, (short) 0x4E) + } else if (EvaluationHelper.equals(service, (byte) 0x4E) && EvaluationHelper.equals(response, (boolean) false)) { builder = CipConnectionManagerCloseRequest.staticParseCipServiceBuilder( readBuffer, connected, serviceLen); - } else if (EvaluationHelper.equals(service, (short) 0x4E) + } else if (EvaluationHelper.equals(service, (byte) 0x4E) && EvaluationHelper.equals(response, (boolean) true)) { builder = CipConnectionManagerCloseResponse.staticParseCipServiceBuilder( readBuffer, connected, serviceLen); - } else if (EvaluationHelper.equals(service, (short) 0x52) + } else if (EvaluationHelper.equals(service, (byte) 0x52) && EvaluationHelper.equals(response, (boolean) false) && EvaluationHelper.equals(connected, (boolean) false)) { builder = CipUnconnectedRequest.staticParseCipServiceBuilder(readBuffer, connected, serviceLen); - } else if (EvaluationHelper.equals(service, (short) 0x52) + } else if (EvaluationHelper.equals(service, (byte) 0x52) && EvaluationHelper.equals(response, (boolean) false) && EvaluationHelper.equals(connected, (boolean) true)) { builder = CipConnectedRequest.staticParseCipServiceBuilder(readBuffer, connected, serviceLen); - } else if (EvaluationHelper.equals(service, (short) 0x52) + } else if (EvaluationHelper.equals(service, (byte) 0x52) && EvaluationHelper.equals(response, (boolean) true)) { builder = CipConnectedResponse.staticParseCipServiceBuilder(readBuffer, connected, serviceLen); - } else if (EvaluationHelper.equals(service, (short) 0x5B) + } else if (EvaluationHelper.equals(service, (byte) 0x5B) && EvaluationHelper.equals(response, (boolean) false)) { builder = CipConnectionManagerRequest.staticParseCipServiceBuilder( readBuffer, connected, serviceLen); - } else if (EvaluationHelper.equals(service, (short) 0x5B) + } else if (EvaluationHelper.equals(service, (byte) 0x5B) && EvaluationHelper.equals(response, (boolean) true)) { builder = CipConnectionManagerResponse.staticParseCipServiceBuilder( diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipUnconnectedRequest.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipUnconnectedRequest.java index 3f5c1d71513..b1d95de1717 100644 --- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipUnconnectedRequest.java +++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipUnconnectedRequest.java @@ -38,8 +38,8 @@ public class CipUnconnectedRequest extends CipService implements Message { // Accessors for discriminator values. - public Short getService() { - return (short) 0x52; + public Byte getService() { + return (byte) 0x52; } public Boolean getResponse() { diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipWriteRequest.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipWriteRequest.java index 9cdca06db23..eda18c985e9 100644 --- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipWriteRequest.java +++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipWriteRequest.java @@ -38,8 +38,8 @@ public class CipWriteRequest extends CipService implements Message { // Accessors for discriminator values. - public Short getService() { - return (short) 0x4D; + public Byte getService() { + return (byte) 0x4D; } public Boolean getResponse() { diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipWriteResponse.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipWriteResponse.java index c955e16e6eb..b27372fc57a 100644 --- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipWriteResponse.java +++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/CipWriteResponse.java @@ -38,8 +38,8 @@ public class CipWriteResponse extends CipService implements Message { // Accessors for discriminator values. - public Short getService() { - return (short) 0x4D; + public Byte getService() { + return (byte) 0x4D; } public Boolean getResponse() { diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/DataSegmentType.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/DataSegmentType.java index 1a95054115a..e376a65ab51 100644 --- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/DataSegmentType.java +++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/DataSegmentType.java @@ -38,7 +38,7 @@ public abstract class DataSegmentType implements Message { // Abstract accessors for discriminator values. - public abstract Short getDataSegmentType(); + public abstract Byte getDataSegmentType(); public DataSegmentType() { super(); @@ -54,7 +54,7 @@ public void serialize(WriteBuffer writeBuffer) throws SerializationException { // Discriminator Field (dataSegmentType) (Used as input to a switch field) writeDiscriminatorField( - "dataSegmentType", getDataSegmentType(), writeUnsignedShort(writeBuffer, 5)); + "dataSegmentType", getDataSegmentType(), writeUnsignedByte(writeBuffer, 5)); // Switch field (Serialize the sub-type) serializeDataSegmentTypeChild(writeBuffer); @@ -92,12 +92,12 @@ public static DataSegmentType staticParse(ReadBuffer readBuffer) throws ParseExc PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - short dataSegmentType = - readDiscriminatorField("dataSegmentType", readUnsignedShort(readBuffer, 5)); + byte dataSegmentType = + readDiscriminatorField("dataSegmentType", readUnsignedByte(readBuffer, 5)); // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) DataSegmentTypeBuilder builder = null; - if (EvaluationHelper.equals(dataSegmentType, (short) 0x11)) { + if (EvaluationHelper.equals(dataSegmentType, (byte) 0x11)) { builder = AnsiExtendedSymbolSegment.staticParseDataSegmentTypeBuilder(readBuffer); } if (builder == null) { diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/GetAttributeAllRequest.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/GetAttributeAllRequest.java index a85759460ca..7334b9ee79a 100644 --- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/GetAttributeAllRequest.java +++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/GetAttributeAllRequest.java @@ -38,8 +38,8 @@ public class GetAttributeAllRequest extends CipService implements Message { // Accessors for discriminator values. - public Short getService() { - return (short) 0x01; + public Byte getService() { + return (byte) 0x01; } public Boolean getResponse() { diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/GetAttributeAllResponse.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/GetAttributeAllResponse.java index a67f3d18598..b64684e3ac1 100644 --- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/GetAttributeAllResponse.java +++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/GetAttributeAllResponse.java @@ -38,8 +38,8 @@ public class GetAttributeAllResponse extends CipService implements Message { // Accessors for discriminator values. - public Short getService() { - return (short) 0x01; + public Byte getService() { + return (byte) 0x01; } public Boolean getResponse() { diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/GetAttributeListRequest.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/GetAttributeListRequest.java index 758855a6746..4fa66bf34a4 100644 --- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/GetAttributeListRequest.java +++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/GetAttributeListRequest.java @@ -38,8 +38,8 @@ public class GetAttributeListRequest extends CipService implements Message { // Accessors for discriminator values. - public Short getService() { - return (short) 0x03; + public Byte getService() { + return (byte) 0x03; } public Boolean getResponse() { diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/GetAttributeListResponse.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/GetAttributeListResponse.java index 90a743f5488..be8021dc532 100644 --- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/GetAttributeListResponse.java +++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/GetAttributeListResponse.java @@ -38,8 +38,8 @@ public class GetAttributeListResponse extends CipService implements Message { // Accessors for discriminator values. - public Short getService() { - return (short) 0x03; + public Byte getService() { + return (byte) 0x03; } public Boolean getResponse() { diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/GetAttributeSingleRequest.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/GetAttributeSingleRequest.java index b7731e1b8ee..ecd9e14cdc0 100644 --- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/GetAttributeSingleRequest.java +++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/GetAttributeSingleRequest.java @@ -38,8 +38,8 @@ public class GetAttributeSingleRequest extends CipService implements Message { // Accessors for discriminator values. - public Short getService() { - return (short) 0x0E; + public Byte getService() { + return (byte) 0x0E; } public Boolean getResponse() { diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/GetAttributeSingleResponse.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/GetAttributeSingleResponse.java index 9b0815fb83c..c798ff4ff7f 100644 --- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/GetAttributeSingleResponse.java +++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/GetAttributeSingleResponse.java @@ -38,8 +38,8 @@ public class GetAttributeSingleResponse extends CipService implements Message { // Accessors for discriminator values. - public Short getService() { - return (short) 0x0E; + public Byte getService() { + return (byte) 0x0E; } public Boolean getResponse() { diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/MultipleServiceRequest.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/MultipleServiceRequest.java index e12ae966583..ee3ed762133 100644 --- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/MultipleServiceRequest.java +++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/MultipleServiceRequest.java @@ -38,8 +38,8 @@ public class MultipleServiceRequest extends CipService implements Message { // Accessors for discriminator values. - public Short getService() { - return (short) 0x0A; + public Byte getService() { + return (byte) 0x0A; } public Boolean getResponse() { diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/MultipleServiceResponse.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/MultipleServiceResponse.java index 3dab40dd0a8..5ebbebe10fc 100644 --- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/MultipleServiceResponse.java +++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/MultipleServiceResponse.java @@ -38,8 +38,8 @@ public class MultipleServiceResponse extends CipService implements Message { // Accessors for discriminator values. - public Short getService() { - return (short) 0x0A; + public Byte getService() { + return (byte) 0x0A; } public Boolean getResponse() { diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/ServicesResponse.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/ServicesResponse.java index c24d4db198a..c2473ab5867 100644 --- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/ServicesResponse.java +++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/ServicesResponse.java @@ -99,7 +99,7 @@ protected void serializeTypeIdChild(WriteBuffer writeBuffer) throws Serializatio "supportsCIPEncapsulation", supportsCIPEncapsulation, writeBoolean(writeBuffer)); // Reserved Field (reserved) - writeReservedField("reserved", (int) 0x00, writeUnsignedInt(writeBuffer, 12)); + writeReservedField("reserved", (short) 0x00, writeUnsignedShort(writeBuffer, 12)); // Simple Field (supportsUDP) writeSimpleField("supportsUDP", supportsUDP, writeBoolean(writeBuffer)); @@ -164,8 +164,8 @@ public static TypeIdBuilder staticParseTypeIdBuilder(ReadBuffer readBuffer) boolean supportsCIPEncapsulation = readSimpleField("supportsCIPEncapsulation", readBoolean(readBuffer)); - Integer reservedField1 = - readReservedField("reserved", readUnsignedInt(readBuffer, 12), (int) 0x00); + Short reservedField1 = + readReservedField("reserved", readUnsignedShort(readBuffer, 12), (short) 0x00); boolean supportsUDP = readSimpleField("supportsUDP", readBoolean(readBuffer)); diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/SetAttributeAllRequest.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/SetAttributeAllRequest.java index 6ec42a3c6d6..618ddee8318 100644 --- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/SetAttributeAllRequest.java +++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/SetAttributeAllRequest.java @@ -38,8 +38,8 @@ public class SetAttributeAllRequest extends CipService implements Message { // Accessors for discriminator values. - public Short getService() { - return (short) 0x02; + public Byte getService() { + return (byte) 0x02; } public Boolean getResponse() { diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/SetAttributeAllResponse.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/SetAttributeAllResponse.java index 48d50ad73c4..2816a0ab254 100644 --- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/SetAttributeAllResponse.java +++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/SetAttributeAllResponse.java @@ -38,8 +38,8 @@ public class SetAttributeAllResponse extends CipService implements Message { // Accessors for discriminator values. - public Short getService() { - return (short) 0x02; + public Byte getService() { + return (byte) 0x02; } public Boolean getResponse() { diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/SetAttributeListRequest.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/SetAttributeListRequest.java index d946cfd32e2..91c25e72ced 100644 --- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/SetAttributeListRequest.java +++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/SetAttributeListRequest.java @@ -38,8 +38,8 @@ public class SetAttributeListRequest extends CipService implements Message { // Accessors for discriminator values. - public Short getService() { - return (short) 0x04; + public Byte getService() { + return (byte) 0x04; } public Boolean getResponse() { diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/SetAttributeListResponse.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/SetAttributeListResponse.java index ad661aa621e..104a2ab319a 100644 --- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/SetAttributeListResponse.java +++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/SetAttributeListResponse.java @@ -38,8 +38,8 @@ public class SetAttributeListResponse extends CipService implements Message { // Accessors for discriminator values. - public Short getService() { - return (short) 0x04; + public Byte getService() { + return (byte) 0x04; } public Boolean getResponse() { diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/SetAttributeSingleRequest.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/SetAttributeSingleRequest.java index 0078b0949fe..1b26719a0fb 100644 --- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/SetAttributeSingleRequest.java +++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/SetAttributeSingleRequest.java @@ -38,8 +38,8 @@ public class SetAttributeSingleRequest extends CipService implements Message { // Accessors for discriminator values. - public Short getService() { - return (short) 0x10; + public Byte getService() { + return (byte) 0x10; } public Boolean getResponse() { diff --git a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/SetAttributeSingleResponse.java b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/SetAttributeSingleResponse.java index 6dff4752767..e974f97490a 100644 --- a/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/SetAttributeSingleResponse.java +++ b/plc4j/drivers/eip/src/main/generated/org/apache/plc4x/java/eip/readwrite/SetAttributeSingleResponse.java @@ -38,8 +38,8 @@ public class SetAttributeSingleResponse extends CipService implements Message { // Accessors for discriminator values. - public Short getService() { - return (short) 0x10; + public Byte getService() { + return (byte) 0x10; } public Boolean getResponse() { diff --git a/plc4j/drivers/firmata/src/main/generated/org/apache/plc4x/java/firmata/readwrite/FirmataCommandSetDigitalPinValue.java b/plc4j/drivers/firmata/src/main/generated/org/apache/plc4x/java/firmata/readwrite/FirmataCommandSetDigitalPinValue.java index b29234850a6..fd1d4fcc51a 100644 --- a/plc4j/drivers/firmata/src/main/generated/org/apache/plc4x/java/firmata/readwrite/FirmataCommandSetDigitalPinValue.java +++ b/plc4j/drivers/firmata/src/main/generated/org/apache/plc4x/java/firmata/readwrite/FirmataCommandSetDigitalPinValue.java @@ -71,7 +71,7 @@ protected void serializeFirmataCommandChild(WriteBuffer writeBuffer) writeSimpleField("pin", pin, writeUnsignedShort(writeBuffer, 8)); // Reserved Field (reserved) - writeReservedField("reserved", (short) 0x00, writeUnsignedShort(writeBuffer, 7)); + writeReservedField("reserved", (byte) 0x00, writeUnsignedByte(writeBuffer, 7)); // Simple Field (on) writeSimpleField("on", on, writeBoolean(writeBuffer)); @@ -110,8 +110,8 @@ public static FirmataCommandBuilder staticParseFirmataCommandBuilder( short pin = readSimpleField("pin", readUnsignedShort(readBuffer, 8)); - Short reservedField0 = - readReservedField("reserved", readUnsignedShort(readBuffer, 7), (short) 0x00); + Byte reservedField0 = + readReservedField("reserved", readUnsignedByte(readBuffer, 7), (byte) 0x00); boolean on = readSimpleField("on", readBoolean(readBuffer)); diff --git a/plc4j/drivers/firmata/src/main/generated/org/apache/plc4x/java/firmata/readwrite/FirmataMessageSubscribeAnalogPinValue.java b/plc4j/drivers/firmata/src/main/generated/org/apache/plc4x/java/firmata/readwrite/FirmataMessageSubscribeAnalogPinValue.java index f4767850862..a5d676183a5 100644 --- a/plc4j/drivers/firmata/src/main/generated/org/apache/plc4x/java/firmata/readwrite/FirmataMessageSubscribeAnalogPinValue.java +++ b/plc4j/drivers/firmata/src/main/generated/org/apache/plc4x/java/firmata/readwrite/FirmataMessageSubscribeAnalogPinValue.java @@ -77,8 +77,8 @@ protected void serializeFirmataMessageChild(WriteBuffer writeBuffer) // Reserved Field (reserved) writeReservedField( "reserved", - (short) 0x00, - writeUnsignedShort(writeBuffer, 7), + (byte) 0x00, + writeUnsignedByte(writeBuffer, 7), WithOption.WithByteOrder(ByteOrder.BIG_ENDIAN)); // Simple Field (enable) @@ -124,11 +124,11 @@ public static FirmataMessageBuilder staticParseFirmataMessageBuilder( readSimpleField( "pin", readUnsignedByte(readBuffer, 4), WithOption.WithByteOrder(ByteOrder.BIG_ENDIAN)); - Short reservedField0 = + Byte reservedField0 = readReservedField( "reserved", - readUnsignedShort(readBuffer, 7), - (short) 0x00, + readUnsignedByte(readBuffer, 7), + (byte) 0x00, WithOption.WithByteOrder(ByteOrder.BIG_ENDIAN)); boolean enable = diff --git a/plc4j/drivers/firmata/src/main/generated/org/apache/plc4x/java/firmata/readwrite/FirmataMessageSubscribeDigitalPinValue.java b/plc4j/drivers/firmata/src/main/generated/org/apache/plc4x/java/firmata/readwrite/FirmataMessageSubscribeDigitalPinValue.java index 2b820788c66..4287c39b04e 100644 --- a/plc4j/drivers/firmata/src/main/generated/org/apache/plc4x/java/firmata/readwrite/FirmataMessageSubscribeDigitalPinValue.java +++ b/plc4j/drivers/firmata/src/main/generated/org/apache/plc4x/java/firmata/readwrite/FirmataMessageSubscribeDigitalPinValue.java @@ -77,8 +77,8 @@ protected void serializeFirmataMessageChild(WriteBuffer writeBuffer) // Reserved Field (reserved) writeReservedField( "reserved", - (short) 0x00, - writeUnsignedShort(writeBuffer, 7), + (byte) 0x00, + writeUnsignedByte(writeBuffer, 7), WithOption.WithByteOrder(ByteOrder.BIG_ENDIAN)); // Simple Field (enable) @@ -124,11 +124,11 @@ public static FirmataMessageBuilder staticParseFirmataMessageBuilder( readSimpleField( "pin", readUnsignedByte(readBuffer, 4), WithOption.WithByteOrder(ByteOrder.BIG_ENDIAN)); - Short reservedField0 = + Byte reservedField0 = readReservedField( "reserved", - readUnsignedShort(readBuffer, 7), - (short) 0x00, + readUnsignedByte(readBuffer, 7), + (byte) 0x00, WithOption.WithByteOrder(ByteOrder.BIG_ENDIAN)); boolean enable = diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataDeviceDescriptorRead.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataDeviceDescriptorRead.java index cca77670eba..50d7387e063 100644 --- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataDeviceDescriptorRead.java +++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataDeviceDescriptorRead.java @@ -43,14 +43,14 @@ public Byte getApciType() { } // Properties. - protected final short descriptorType; + protected final byte descriptorType; - public ApduDataDeviceDescriptorRead(short descriptorType) { + public ApduDataDeviceDescriptorRead(byte descriptorType) { super(); this.descriptorType = descriptorType; } - public short getDescriptorType() { + public byte getDescriptorType() { return descriptorType; } @@ -61,7 +61,7 @@ protected void serializeApduDataChild(WriteBuffer writeBuffer) throws Serializat writeBuffer.pushContext("ApduDataDeviceDescriptorRead"); // Simple Field (descriptorType) - writeSimpleField("descriptorType", descriptorType, writeUnsignedShort(writeBuffer, 6)); + writeSimpleField("descriptorType", descriptorType, writeUnsignedByte(writeBuffer, 6)); writeBuffer.popContext("ApduDataDeviceDescriptorRead"); } @@ -89,7 +89,7 @@ public static ApduDataBuilder staticParseApduDataBuilder(ReadBuffer readBuffer, PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - short descriptorType = readSimpleField("descriptorType", readUnsignedShort(readBuffer, 6)); + byte descriptorType = readSimpleField("descriptorType", readUnsignedByte(readBuffer, 6)); readBuffer.closeContext("ApduDataDeviceDescriptorRead"); // Create the instance @@ -97,9 +97,9 @@ public static ApduDataBuilder staticParseApduDataBuilder(ReadBuffer readBuffer, } public static class ApduDataDeviceDescriptorReadBuilderImpl implements ApduData.ApduDataBuilder { - private final short descriptorType; + private final byte descriptorType; - public ApduDataDeviceDescriptorReadBuilderImpl(short descriptorType) { + public ApduDataDeviceDescriptorReadBuilderImpl(byte descriptorType) { this.descriptorType = descriptorType; } diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataDeviceDescriptorResponse.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataDeviceDescriptorResponse.java index d05c839be33..fce3b099f2a 100644 --- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataDeviceDescriptorResponse.java +++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataDeviceDescriptorResponse.java @@ -43,16 +43,16 @@ public Byte getApciType() { } // Properties. - protected final short descriptorType; + protected final byte descriptorType; protected final byte[] data; - public ApduDataDeviceDescriptorResponse(short descriptorType, byte[] data) { + public ApduDataDeviceDescriptorResponse(byte descriptorType, byte[] data) { super(); this.descriptorType = descriptorType; this.data = data; } - public short getDescriptorType() { + public byte getDescriptorType() { return descriptorType; } @@ -67,7 +67,7 @@ protected void serializeApduDataChild(WriteBuffer writeBuffer) throws Serializat writeBuffer.pushContext("ApduDataDeviceDescriptorResponse"); // Simple Field (descriptorType) - writeSimpleField("descriptorType", descriptorType, writeUnsignedShort(writeBuffer, 6)); + writeSimpleField("descriptorType", descriptorType, writeUnsignedByte(writeBuffer, 6)); // Array Field (data) writeByteArrayField("data", data, writeByteArray(writeBuffer, 8)); @@ -103,7 +103,7 @@ public static ApduDataBuilder staticParseApduDataBuilder(ReadBuffer readBuffer, PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - short descriptorType = readSimpleField("descriptorType", readUnsignedShort(readBuffer, 6)); + byte descriptorType = readSimpleField("descriptorType", readUnsignedByte(readBuffer, 6)); byte[] data = readBuffer.readByteArray( @@ -116,10 +116,10 @@ public static ApduDataBuilder staticParseApduDataBuilder(ReadBuffer readBuffer, public static class ApduDataDeviceDescriptorResponseBuilderImpl implements ApduData.ApduDataBuilder { - private final short descriptorType; + private final byte descriptorType; private final byte[] data; - public ApduDataDeviceDescriptorResponseBuilderImpl(short descriptorType, byte[] data) { + public ApduDataDeviceDescriptorResponseBuilderImpl(byte descriptorType, byte[] data) { this.descriptorType = descriptorType; this.data = data; } diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExt.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExt.java index 8d8b78d6780..1cfa3df378f 100644 --- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExt.java +++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExt.java @@ -38,7 +38,7 @@ public abstract class ApduDataExt implements Message { // Abstract accessors for discriminator values. - public abstract Short getExtApciType(); + public abstract Byte getExtApciType(); public ApduDataExt() { super(); @@ -53,7 +53,7 @@ public void serialize(WriteBuffer writeBuffer) throws SerializationException { writeBuffer.pushContext("ApduDataExt"); // Discriminator Field (extApciType) (Used as input to a switch field) - writeDiscriminatorField("extApciType", getExtApciType(), writeUnsignedShort(writeBuffer, 6)); + writeDiscriminatorField("extApciType", getExtApciType(), writeUnsignedByte(writeBuffer, 6)); // Switch field (Serialize the sub-type) serializeApduDataExtChild(writeBuffer); @@ -105,120 +105,120 @@ public static ApduDataExt staticParse(ReadBuffer readBuffer, Short length) throw PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - short extApciType = readDiscriminatorField("extApciType", readUnsignedShort(readBuffer, 6)); + byte extApciType = readDiscriminatorField("extApciType", readUnsignedByte(readBuffer, 6)); // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) ApduDataExtBuilder builder = null; - if (EvaluationHelper.equals(extApciType, (short) 0x00)) { + if (EvaluationHelper.equals(extApciType, (byte) 0x00)) { builder = ApduDataExtOpenRoutingTableRequest.staticParseApduDataExtBuilder(readBuffer, length); - } else if (EvaluationHelper.equals(extApciType, (short) 0x01)) { + } else if (EvaluationHelper.equals(extApciType, (byte) 0x01)) { builder = ApduDataExtReadRoutingTableRequest.staticParseApduDataExtBuilder(readBuffer, length); - } else if (EvaluationHelper.equals(extApciType, (short) 0x02)) { + } else if (EvaluationHelper.equals(extApciType, (byte) 0x02)) { builder = ApduDataExtReadRoutingTableResponse.staticParseApduDataExtBuilder(readBuffer, length); - } else if (EvaluationHelper.equals(extApciType, (short) 0x03)) { + } else if (EvaluationHelper.equals(extApciType, (byte) 0x03)) { builder = ApduDataExtWriteRoutingTableRequest.staticParseApduDataExtBuilder(readBuffer, length); - } else if (EvaluationHelper.equals(extApciType, (short) 0x08)) { + } else if (EvaluationHelper.equals(extApciType, (byte) 0x08)) { builder = ApduDataExtReadRouterMemoryRequest.staticParseApduDataExtBuilder(readBuffer, length); - } else if (EvaluationHelper.equals(extApciType, (short) 0x09)) { + } else if (EvaluationHelper.equals(extApciType, (byte) 0x09)) { builder = ApduDataExtReadRouterMemoryResponse.staticParseApduDataExtBuilder(readBuffer, length); - } else if (EvaluationHelper.equals(extApciType, (short) 0x0A)) { + } else if (EvaluationHelper.equals(extApciType, (byte) 0x0A)) { builder = ApduDataExtWriteRouterMemoryRequest.staticParseApduDataExtBuilder(readBuffer, length); - } else if (EvaluationHelper.equals(extApciType, (short) 0x0D)) { + } else if (EvaluationHelper.equals(extApciType, (byte) 0x0D)) { builder = ApduDataExtReadRouterStatusRequest.staticParseApduDataExtBuilder(readBuffer, length); - } else if (EvaluationHelper.equals(extApciType, (short) 0x0E)) { + } else if (EvaluationHelper.equals(extApciType, (byte) 0x0E)) { builder = ApduDataExtReadRouterStatusResponse.staticParseApduDataExtBuilder(readBuffer, length); - } else if (EvaluationHelper.equals(extApciType, (short) 0x0F)) { + } else if (EvaluationHelper.equals(extApciType, (byte) 0x0F)) { builder = ApduDataExtWriteRouterStatusRequest.staticParseApduDataExtBuilder(readBuffer, length); - } else if (EvaluationHelper.equals(extApciType, (short) 0x10)) { + } else if (EvaluationHelper.equals(extApciType, (byte) 0x10)) { builder = ApduDataExtMemoryBitWrite.staticParseApduDataExtBuilder(readBuffer, length); - } else if (EvaluationHelper.equals(extApciType, (short) 0x11)) { + } else if (EvaluationHelper.equals(extApciType, (byte) 0x11)) { builder = ApduDataExtAuthorizeRequest.staticParseApduDataExtBuilder(readBuffer, length); - } else if (EvaluationHelper.equals(extApciType, (short) 0x12)) { + } else if (EvaluationHelper.equals(extApciType, (byte) 0x12)) { builder = ApduDataExtAuthorizeResponse.staticParseApduDataExtBuilder(readBuffer, length); - } else if (EvaluationHelper.equals(extApciType, (short) 0x13)) { + } else if (EvaluationHelper.equals(extApciType, (byte) 0x13)) { builder = ApduDataExtKeyWrite.staticParseApduDataExtBuilder(readBuffer, length); - } else if (EvaluationHelper.equals(extApciType, (short) 0x14)) { + } else if (EvaluationHelper.equals(extApciType, (byte) 0x14)) { builder = ApduDataExtKeyResponse.staticParseApduDataExtBuilder(readBuffer, length); - } else if (EvaluationHelper.equals(extApciType, (short) 0x15)) { + } else if (EvaluationHelper.equals(extApciType, (byte) 0x15)) { builder = ApduDataExtPropertyValueRead.staticParseApduDataExtBuilder(readBuffer, length); - } else if (EvaluationHelper.equals(extApciType, (short) 0x16)) { + } else if (EvaluationHelper.equals(extApciType, (byte) 0x16)) { builder = ApduDataExtPropertyValueResponse.staticParseApduDataExtBuilder(readBuffer, length); - } else if (EvaluationHelper.equals(extApciType, (short) 0x17)) { + } else if (EvaluationHelper.equals(extApciType, (byte) 0x17)) { builder = ApduDataExtPropertyValueWrite.staticParseApduDataExtBuilder(readBuffer, length); - } else if (EvaluationHelper.equals(extApciType, (short) 0x18)) { + } else if (EvaluationHelper.equals(extApciType, (byte) 0x18)) { builder = ApduDataExtPropertyDescriptionRead.staticParseApduDataExtBuilder(readBuffer, length); - } else if (EvaluationHelper.equals(extApciType, (short) 0x19)) { + } else if (EvaluationHelper.equals(extApciType, (byte) 0x19)) { builder = ApduDataExtPropertyDescriptionResponse.staticParseApduDataExtBuilder(readBuffer, length); - } else if (EvaluationHelper.equals(extApciType, (short) 0x1A)) { + } else if (EvaluationHelper.equals(extApciType, (byte) 0x1A)) { builder = ApduDataExtNetworkParameterRead.staticParseApduDataExtBuilder(readBuffer, length); - } else if (EvaluationHelper.equals(extApciType, (short) 0x1B)) { + } else if (EvaluationHelper.equals(extApciType, (byte) 0x1B)) { builder = ApduDataExtNetworkParameterResponse.staticParseApduDataExtBuilder(readBuffer, length); - } else if (EvaluationHelper.equals(extApciType, (short) 0x1C)) { + } else if (EvaluationHelper.equals(extApciType, (byte) 0x1C)) { builder = ApduDataExtIndividualAddressSerialNumberRead.staticParseApduDataExtBuilder( readBuffer, length); - } else if (EvaluationHelper.equals(extApciType, (short) 0x1D)) { + } else if (EvaluationHelper.equals(extApciType, (byte) 0x1D)) { builder = ApduDataExtIndividualAddressSerialNumberResponse.staticParseApduDataExtBuilder( readBuffer, length); - } else if (EvaluationHelper.equals(extApciType, (short) 0x1E)) { + } else if (EvaluationHelper.equals(extApciType, (byte) 0x1E)) { builder = ApduDataExtIndividualAddressSerialNumberWrite.staticParseApduDataExtBuilder( readBuffer, length); - } else if (EvaluationHelper.equals(extApciType, (short) 0x20)) { + } else if (EvaluationHelper.equals(extApciType, (byte) 0x20)) { builder = ApduDataExtDomainAddressWrite.staticParseApduDataExtBuilder(readBuffer, length); - } else if (EvaluationHelper.equals(extApciType, (short) 0x21)) { + } else if (EvaluationHelper.equals(extApciType, (byte) 0x21)) { builder = ApduDataExtDomainAddressRead.staticParseApduDataExtBuilder(readBuffer, length); - } else if (EvaluationHelper.equals(extApciType, (short) 0x22)) { + } else if (EvaluationHelper.equals(extApciType, (byte) 0x22)) { builder = ApduDataExtDomainAddressResponse.staticParseApduDataExtBuilder(readBuffer, length); - } else if (EvaluationHelper.equals(extApciType, (short) 0x23)) { + } else if (EvaluationHelper.equals(extApciType, (byte) 0x23)) { builder = ApduDataExtDomainAddressSelectiveRead.staticParseApduDataExtBuilder(readBuffer, length); - } else if (EvaluationHelper.equals(extApciType, (short) 0x24)) { + } else if (EvaluationHelper.equals(extApciType, (byte) 0x24)) { builder = ApduDataExtNetworkParameterWrite.staticParseApduDataExtBuilder(readBuffer, length); - } else if (EvaluationHelper.equals(extApciType, (short) 0x25)) { + } else if (EvaluationHelper.equals(extApciType, (byte) 0x25)) { builder = ApduDataExtLinkRead.staticParseApduDataExtBuilder(readBuffer, length); - } else if (EvaluationHelper.equals(extApciType, (short) 0x26)) { + } else if (EvaluationHelper.equals(extApciType, (byte) 0x26)) { builder = ApduDataExtLinkResponse.staticParseApduDataExtBuilder(readBuffer, length); - } else if (EvaluationHelper.equals(extApciType, (short) 0x27)) { + } else if (EvaluationHelper.equals(extApciType, (byte) 0x27)) { builder = ApduDataExtLinkWrite.staticParseApduDataExtBuilder(readBuffer, length); - } else if (EvaluationHelper.equals(extApciType, (short) 0x28)) { + } else if (EvaluationHelper.equals(extApciType, (byte) 0x28)) { builder = ApduDataExtGroupPropertyValueRead.staticParseApduDataExtBuilder(readBuffer, length); - } else if (EvaluationHelper.equals(extApciType, (short) 0x29)) { + } else if (EvaluationHelper.equals(extApciType, (byte) 0x29)) { builder = ApduDataExtGroupPropertyValueResponse.staticParseApduDataExtBuilder(readBuffer, length); - } else if (EvaluationHelper.equals(extApciType, (short) 0x2A)) { + } else if (EvaluationHelper.equals(extApciType, (byte) 0x2A)) { builder = ApduDataExtGroupPropertyValueWrite.staticParseApduDataExtBuilder(readBuffer, length); - } else if (EvaluationHelper.equals(extApciType, (short) 0x2B)) { + } else if (EvaluationHelper.equals(extApciType, (byte) 0x2B)) { builder = ApduDataExtGroupPropertyValueInfoReport.staticParseApduDataExtBuilder(readBuffer, length); - } else if (EvaluationHelper.equals(extApciType, (short) 0x2C)) { + } else if (EvaluationHelper.equals(extApciType, (byte) 0x2C)) { builder = ApduDataExtDomainAddressSerialNumberRead.staticParseApduDataExtBuilder( readBuffer, length); - } else if (EvaluationHelper.equals(extApciType, (short) 0x2D)) { + } else if (EvaluationHelper.equals(extApciType, (byte) 0x2D)) { builder = ApduDataExtDomainAddressSerialNumberResponse.staticParseApduDataExtBuilder( readBuffer, length); - } else if (EvaluationHelper.equals(extApciType, (short) 0x2E)) { + } else if (EvaluationHelper.equals(extApciType, (byte) 0x2E)) { builder = ApduDataExtDomainAddressSerialNumberWrite.staticParseApduDataExtBuilder( readBuffer, length); - } else if (EvaluationHelper.equals(extApciType, (short) 0x30)) { + } else if (EvaluationHelper.equals(extApciType, (byte) 0x30)) { builder = ApduDataExtFileStreamInfoReport.staticParseApduDataExtBuilder(readBuffer, length); } if (builder == null) { diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtAuthorizeRequest.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtAuthorizeRequest.java index 4e7cefda4d4..8508dd07ae8 100644 --- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtAuthorizeRequest.java +++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtAuthorizeRequest.java @@ -38,8 +38,8 @@ public class ApduDataExtAuthorizeRequest extends ApduDataExt implements Message { // Accessors for discriminator values. - public Short getExtApciType() { - return (short) 0x11; + public Byte getExtApciType() { + return (byte) 0x11; } // Properties. diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtAuthorizeResponse.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtAuthorizeResponse.java index e22a51046e8..09939a8bc4b 100644 --- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtAuthorizeResponse.java +++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtAuthorizeResponse.java @@ -38,8 +38,8 @@ public class ApduDataExtAuthorizeResponse extends ApduDataExt implements Message { // Accessors for discriminator values. - public Short getExtApciType() { - return (short) 0x12; + public Byte getExtApciType() { + return (byte) 0x12; } // Properties. diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtDomainAddressRead.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtDomainAddressRead.java index e40a3288163..bc8d8e8b4c3 100644 --- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtDomainAddressRead.java +++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtDomainAddressRead.java @@ -38,8 +38,8 @@ public class ApduDataExtDomainAddressRead extends ApduDataExt implements Message { // Accessors for discriminator values. - public Short getExtApciType() { - return (short) 0x21; + public Byte getExtApciType() { + return (byte) 0x21; } public ApduDataExtDomainAddressRead() { diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtDomainAddressResponse.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtDomainAddressResponse.java index 32a1e5b63a2..a2497059b0b 100644 --- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtDomainAddressResponse.java +++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtDomainAddressResponse.java @@ -38,8 +38,8 @@ public class ApduDataExtDomainAddressResponse extends ApduDataExt implements Message { // Accessors for discriminator values. - public Short getExtApciType() { - return (short) 0x22; + public Byte getExtApciType() { + return (byte) 0x22; } public ApduDataExtDomainAddressResponse() { diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtDomainAddressSelectiveRead.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtDomainAddressSelectiveRead.java index 29cc4a43638..6a08b02690f 100644 --- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtDomainAddressSelectiveRead.java +++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtDomainAddressSelectiveRead.java @@ -38,8 +38,8 @@ public class ApduDataExtDomainAddressSelectiveRead extends ApduDataExt implements Message { // Accessors for discriminator values. - public Short getExtApciType() { - return (short) 0x23; + public Byte getExtApciType() { + return (byte) 0x23; } public ApduDataExtDomainAddressSelectiveRead() { diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtDomainAddressSerialNumberRead.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtDomainAddressSerialNumberRead.java index f78e56fd6d2..3720b627af1 100644 --- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtDomainAddressSerialNumberRead.java +++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtDomainAddressSerialNumberRead.java @@ -38,8 +38,8 @@ public class ApduDataExtDomainAddressSerialNumberRead extends ApduDataExt implements Message { // Accessors for discriminator values. - public Short getExtApciType() { - return (short) 0x2C; + public Byte getExtApciType() { + return (byte) 0x2C; } public ApduDataExtDomainAddressSerialNumberRead() { diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtDomainAddressSerialNumberResponse.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtDomainAddressSerialNumberResponse.java index 770b184fc9d..356fe69718a 100644 --- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtDomainAddressSerialNumberResponse.java +++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtDomainAddressSerialNumberResponse.java @@ -38,8 +38,8 @@ public class ApduDataExtDomainAddressSerialNumberResponse extends ApduDataExt implements Message { // Accessors for discriminator values. - public Short getExtApciType() { - return (short) 0x2D; + public Byte getExtApciType() { + return (byte) 0x2D; } public ApduDataExtDomainAddressSerialNumberResponse() { diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtDomainAddressSerialNumberWrite.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtDomainAddressSerialNumberWrite.java index 452093b453a..d0b9d144c03 100644 --- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtDomainAddressSerialNumberWrite.java +++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtDomainAddressSerialNumberWrite.java @@ -38,8 +38,8 @@ public class ApduDataExtDomainAddressSerialNumberWrite extends ApduDataExt implements Message { // Accessors for discriminator values. - public Short getExtApciType() { - return (short) 0x2E; + public Byte getExtApciType() { + return (byte) 0x2E; } public ApduDataExtDomainAddressSerialNumberWrite() { diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtDomainAddressWrite.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtDomainAddressWrite.java index 36b35be7350..c38451ed2c4 100644 --- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtDomainAddressWrite.java +++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtDomainAddressWrite.java @@ -38,8 +38,8 @@ public class ApduDataExtDomainAddressWrite extends ApduDataExt implements Message { // Accessors for discriminator values. - public Short getExtApciType() { - return (short) 0x20; + public Byte getExtApciType() { + return (byte) 0x20; } public ApduDataExtDomainAddressWrite() { diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtFileStreamInfoReport.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtFileStreamInfoReport.java index 2a543592c5e..e722116a56e 100644 --- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtFileStreamInfoReport.java +++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtFileStreamInfoReport.java @@ -38,8 +38,8 @@ public class ApduDataExtFileStreamInfoReport extends ApduDataExt implements Message { // Accessors for discriminator values. - public Short getExtApciType() { - return (short) 0x30; + public Byte getExtApciType() { + return (byte) 0x30; } public ApduDataExtFileStreamInfoReport() { diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtGroupPropertyValueInfoReport.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtGroupPropertyValueInfoReport.java index 4985433b231..25d9d0c4edc 100644 --- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtGroupPropertyValueInfoReport.java +++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtGroupPropertyValueInfoReport.java @@ -38,8 +38,8 @@ public class ApduDataExtGroupPropertyValueInfoReport extends ApduDataExt implements Message { // Accessors for discriminator values. - public Short getExtApciType() { - return (short) 0x2B; + public Byte getExtApciType() { + return (byte) 0x2B; } public ApduDataExtGroupPropertyValueInfoReport() { diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtGroupPropertyValueRead.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtGroupPropertyValueRead.java index eb0ffe4b06b..fab26f58c88 100644 --- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtGroupPropertyValueRead.java +++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtGroupPropertyValueRead.java @@ -38,8 +38,8 @@ public class ApduDataExtGroupPropertyValueRead extends ApduDataExt implements Message { // Accessors for discriminator values. - public Short getExtApciType() { - return (short) 0x28; + public Byte getExtApciType() { + return (byte) 0x28; } public ApduDataExtGroupPropertyValueRead() { diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtGroupPropertyValueResponse.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtGroupPropertyValueResponse.java index d0907168baa..925eeb7949e 100644 --- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtGroupPropertyValueResponse.java +++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtGroupPropertyValueResponse.java @@ -38,8 +38,8 @@ public class ApduDataExtGroupPropertyValueResponse extends ApduDataExt implements Message { // Accessors for discriminator values. - public Short getExtApciType() { - return (short) 0x29; + public Byte getExtApciType() { + return (byte) 0x29; } public ApduDataExtGroupPropertyValueResponse() { diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtGroupPropertyValueWrite.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtGroupPropertyValueWrite.java index afa8bd746b9..a0a775c2aba 100644 --- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtGroupPropertyValueWrite.java +++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtGroupPropertyValueWrite.java @@ -38,8 +38,8 @@ public class ApduDataExtGroupPropertyValueWrite extends ApduDataExt implements Message { // Accessors for discriminator values. - public Short getExtApciType() { - return (short) 0x2A; + public Byte getExtApciType() { + return (byte) 0x2A; } public ApduDataExtGroupPropertyValueWrite() { diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtIndividualAddressSerialNumberRead.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtIndividualAddressSerialNumberRead.java index 3a796996e70..a32079606cb 100644 --- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtIndividualAddressSerialNumberRead.java +++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtIndividualAddressSerialNumberRead.java @@ -38,8 +38,8 @@ public class ApduDataExtIndividualAddressSerialNumberRead extends ApduDataExt implements Message { // Accessors for discriminator values. - public Short getExtApciType() { - return (short) 0x1C; + public Byte getExtApciType() { + return (byte) 0x1C; } public ApduDataExtIndividualAddressSerialNumberRead() { diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtIndividualAddressSerialNumberResponse.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtIndividualAddressSerialNumberResponse.java index 952b04ad5e0..51d8fe652c7 100644 --- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtIndividualAddressSerialNumberResponse.java +++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtIndividualAddressSerialNumberResponse.java @@ -39,8 +39,8 @@ public class ApduDataExtIndividualAddressSerialNumberResponse extends ApduDataEx implements Message { // Accessors for discriminator values. - public Short getExtApciType() { - return (short) 0x1D; + public Byte getExtApciType() { + return (byte) 0x1D; } public ApduDataExtIndividualAddressSerialNumberResponse() { diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtIndividualAddressSerialNumberWrite.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtIndividualAddressSerialNumberWrite.java index 4cfc60df251..5d96fb6ea05 100644 --- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtIndividualAddressSerialNumberWrite.java +++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtIndividualAddressSerialNumberWrite.java @@ -38,8 +38,8 @@ public class ApduDataExtIndividualAddressSerialNumberWrite extends ApduDataExt implements Message { // Accessors for discriminator values. - public Short getExtApciType() { - return (short) 0x1E; + public Byte getExtApciType() { + return (byte) 0x1E; } public ApduDataExtIndividualAddressSerialNumberWrite() { diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtKeyResponse.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtKeyResponse.java index 5478b95e8eb..be4fc1cefe6 100644 --- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtKeyResponse.java +++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtKeyResponse.java @@ -38,8 +38,8 @@ public class ApduDataExtKeyResponse extends ApduDataExt implements Message { // Accessors for discriminator values. - public Short getExtApciType() { - return (short) 0x14; + public Byte getExtApciType() { + return (byte) 0x14; } public ApduDataExtKeyResponse() { diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtKeyWrite.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtKeyWrite.java index da067e20365..073b502e646 100644 --- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtKeyWrite.java +++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtKeyWrite.java @@ -38,8 +38,8 @@ public class ApduDataExtKeyWrite extends ApduDataExt implements Message { // Accessors for discriminator values. - public Short getExtApciType() { - return (short) 0x13; + public Byte getExtApciType() { + return (byte) 0x13; } public ApduDataExtKeyWrite() { diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtLinkRead.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtLinkRead.java index 5d032950569..cffd1e83522 100644 --- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtLinkRead.java +++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtLinkRead.java @@ -38,8 +38,8 @@ public class ApduDataExtLinkRead extends ApduDataExt implements Message { // Accessors for discriminator values. - public Short getExtApciType() { - return (short) 0x25; + public Byte getExtApciType() { + return (byte) 0x25; } public ApduDataExtLinkRead() { diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtLinkResponse.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtLinkResponse.java index eba0addc81b..1f80e0781c5 100644 --- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtLinkResponse.java +++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtLinkResponse.java @@ -38,8 +38,8 @@ public class ApduDataExtLinkResponse extends ApduDataExt implements Message { // Accessors for discriminator values. - public Short getExtApciType() { - return (short) 0x26; + public Byte getExtApciType() { + return (byte) 0x26; } public ApduDataExtLinkResponse() { diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtLinkWrite.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtLinkWrite.java index bb3f0c8e996..84ec2fe66eb 100644 --- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtLinkWrite.java +++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtLinkWrite.java @@ -38,8 +38,8 @@ public class ApduDataExtLinkWrite extends ApduDataExt implements Message { // Accessors for discriminator values. - public Short getExtApciType() { - return (short) 0x27; + public Byte getExtApciType() { + return (byte) 0x27; } public ApduDataExtLinkWrite() { diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtMemoryBitWrite.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtMemoryBitWrite.java index cc9dd6d817d..d699e136e0e 100644 --- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtMemoryBitWrite.java +++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtMemoryBitWrite.java @@ -38,8 +38,8 @@ public class ApduDataExtMemoryBitWrite extends ApduDataExt implements Message { // Accessors for discriminator values. - public Short getExtApciType() { - return (short) 0x10; + public Byte getExtApciType() { + return (byte) 0x10; } public ApduDataExtMemoryBitWrite() { diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtNetworkParameterRead.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtNetworkParameterRead.java index f54d653c53c..04e318f3ecb 100644 --- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtNetworkParameterRead.java +++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtNetworkParameterRead.java @@ -38,8 +38,8 @@ public class ApduDataExtNetworkParameterRead extends ApduDataExt implements Message { // Accessors for discriminator values. - public Short getExtApciType() { - return (short) 0x1A; + public Byte getExtApciType() { + return (byte) 0x1A; } public ApduDataExtNetworkParameterRead() { diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtNetworkParameterResponse.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtNetworkParameterResponse.java index f8ad6e53ba9..26f78e9926d 100644 --- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtNetworkParameterResponse.java +++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtNetworkParameterResponse.java @@ -38,8 +38,8 @@ public class ApduDataExtNetworkParameterResponse extends ApduDataExt implements Message { // Accessors for discriminator values. - public Short getExtApciType() { - return (short) 0x1B; + public Byte getExtApciType() { + return (byte) 0x1B; } public ApduDataExtNetworkParameterResponse() { diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtNetworkParameterWrite.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtNetworkParameterWrite.java index 66e7ee3465a..8d211e7b772 100644 --- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtNetworkParameterWrite.java +++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtNetworkParameterWrite.java @@ -38,8 +38,8 @@ public class ApduDataExtNetworkParameterWrite extends ApduDataExt implements Message { // Accessors for discriminator values. - public Short getExtApciType() { - return (short) 0x24; + public Byte getExtApciType() { + return (byte) 0x24; } public ApduDataExtNetworkParameterWrite() { diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtOpenRoutingTableRequest.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtOpenRoutingTableRequest.java index 47869983cff..01683274fd1 100644 --- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtOpenRoutingTableRequest.java +++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtOpenRoutingTableRequest.java @@ -38,8 +38,8 @@ public class ApduDataExtOpenRoutingTableRequest extends ApduDataExt implements Message { // Accessors for discriminator values. - public Short getExtApciType() { - return (short) 0x00; + public Byte getExtApciType() { + return (byte) 0x00; } public ApduDataExtOpenRoutingTableRequest() { diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtPropertyDescriptionRead.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtPropertyDescriptionRead.java index 88e60c69629..9badbb97da8 100644 --- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtPropertyDescriptionRead.java +++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtPropertyDescriptionRead.java @@ -38,8 +38,8 @@ public class ApduDataExtPropertyDescriptionRead extends ApduDataExt implements Message { // Accessors for discriminator values. - public Short getExtApciType() { - return (short) 0x18; + public Byte getExtApciType() { + return (byte) 0x18; } // Properties. diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtPropertyDescriptionResponse.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtPropertyDescriptionResponse.java index 628d02b2c23..86418087db7 100644 --- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtPropertyDescriptionResponse.java +++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtPropertyDescriptionResponse.java @@ -38,8 +38,8 @@ public class ApduDataExtPropertyDescriptionResponse extends ApduDataExt implements Message { // Accessors for discriminator values. - public Short getExtApciType() { - return (short) 0x19; + public Byte getExtApciType() { + return (byte) 0x19; } // Properties. @@ -48,7 +48,7 @@ public Short getExtApciType() { protected final short index; protected final boolean writeEnabled; protected final KnxPropertyDataType propertyDataType; - protected final int maxNrOfElements; + protected final short maxNrOfElements; protected final AccessLevel readLevel; protected final AccessLevel writeLevel; @@ -58,7 +58,7 @@ public ApduDataExtPropertyDescriptionResponse( short index, boolean writeEnabled, KnxPropertyDataType propertyDataType, - int maxNrOfElements, + short maxNrOfElements, AccessLevel readLevel, AccessLevel writeLevel) { super(); @@ -92,7 +92,7 @@ public KnxPropertyDataType getPropertyDataType() { return propertyDataType; } - public int getMaxNrOfElements() { + public short getMaxNrOfElements() { return maxNrOfElements; } @@ -139,7 +139,7 @@ protected void serializeApduDataExtChild(WriteBuffer writeBuffer) throws Seriali writeReservedField("reserved", (byte) 0x0, writeUnsignedByte(writeBuffer, 4)); // Simple Field (maxNrOfElements) - writeSimpleField("maxNrOfElements", maxNrOfElements, writeUnsignedInt(writeBuffer, 12)); + writeSimpleField("maxNrOfElements", maxNrOfElements, writeUnsignedShort(writeBuffer, 12)); // Simple Field (readLevel) writeSimpleEnumField( @@ -231,7 +231,7 @@ public static ApduDataExtBuilder staticParseApduDataExtBuilder( Byte reservedField1 = readReservedField("reserved", readUnsignedByte(readBuffer, 4), (byte) 0x0); - int maxNrOfElements = readSimpleField("maxNrOfElements", readUnsignedInt(readBuffer, 12)); + short maxNrOfElements = readSimpleField("maxNrOfElements", readUnsignedShort(readBuffer, 12)); AccessLevel readLevel = readEnumField( @@ -267,7 +267,7 @@ public static class ApduDataExtPropertyDescriptionResponseBuilderImpl private final short index; private final boolean writeEnabled; private final KnxPropertyDataType propertyDataType; - private final int maxNrOfElements; + private final short maxNrOfElements; private final AccessLevel readLevel; private final AccessLevel writeLevel; @@ -277,7 +277,7 @@ public ApduDataExtPropertyDescriptionResponseBuilderImpl( short index, boolean writeEnabled, KnxPropertyDataType propertyDataType, - int maxNrOfElements, + short maxNrOfElements, AccessLevel readLevel, AccessLevel writeLevel) { this.objectIndex = objectIndex; diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtPropertyValueRead.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtPropertyValueRead.java index c0eb0982902..7e6b61657d7 100644 --- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtPropertyValueRead.java +++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtPropertyValueRead.java @@ -38,17 +38,18 @@ public class ApduDataExtPropertyValueRead extends ApduDataExt implements Message { // Accessors for discriminator values. - public Short getExtApciType() { - return (short) 0x15; + public Byte getExtApciType() { + return (byte) 0x15; } // Properties. protected final short objectIndex; protected final short propertyId; protected final byte count; - protected final int index; + protected final short index; - public ApduDataExtPropertyValueRead(short objectIndex, short propertyId, byte count, int index) { + public ApduDataExtPropertyValueRead( + short objectIndex, short propertyId, byte count, short index) { super(); this.objectIndex = objectIndex; this.propertyId = propertyId; @@ -68,7 +69,7 @@ public byte getCount() { return count; } - public int getIndex() { + public short getIndex() { return index; } @@ -88,7 +89,7 @@ protected void serializeApduDataExtChild(WriteBuffer writeBuffer) throws Seriali writeSimpleField("count", count, writeUnsignedByte(writeBuffer, 4)); // Simple Field (index) - writeSimpleField("index", index, writeUnsignedInt(writeBuffer, 12)); + writeSimpleField("index", index, writeUnsignedShort(writeBuffer, 12)); writeBuffer.popContext("ApduDataExtPropertyValueRead"); } @@ -131,7 +132,7 @@ public static ApduDataExtBuilder staticParseApduDataExtBuilder( byte count = readSimpleField("count", readUnsignedByte(readBuffer, 4)); - int index = readSimpleField("index", readUnsignedInt(readBuffer, 12)); + short index = readSimpleField("index", readUnsignedShort(readBuffer, 12)); readBuffer.closeContext("ApduDataExtPropertyValueRead"); // Create the instance @@ -143,10 +144,10 @@ public static class ApduDataExtPropertyValueReadBuilderImpl private final short objectIndex; private final short propertyId; private final byte count; - private final int index; + private final short index; public ApduDataExtPropertyValueReadBuilderImpl( - short objectIndex, short propertyId, byte count, int index) { + short objectIndex, short propertyId, byte count, short index) { this.objectIndex = objectIndex; this.propertyId = propertyId; this.count = count; diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtPropertyValueResponse.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtPropertyValueResponse.java index f09066e6e01..942bd0f1e34 100644 --- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtPropertyValueResponse.java +++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtPropertyValueResponse.java @@ -38,19 +38,19 @@ public class ApduDataExtPropertyValueResponse extends ApduDataExt implements Message { // Accessors for discriminator values. - public Short getExtApciType() { - return (short) 0x16; + public Byte getExtApciType() { + return (byte) 0x16; } // Properties. protected final short objectIndex; protected final short propertyId; protected final byte count; - protected final int index; + protected final short index; protected final byte[] data; public ApduDataExtPropertyValueResponse( - short objectIndex, short propertyId, byte count, int index, byte[] data) { + short objectIndex, short propertyId, byte count, short index, byte[] data) { super(); this.objectIndex = objectIndex; this.propertyId = propertyId; @@ -71,7 +71,7 @@ public byte getCount() { return count; } - public int getIndex() { + public short getIndex() { return index; } @@ -95,7 +95,7 @@ protected void serializeApduDataExtChild(WriteBuffer writeBuffer) throws Seriali writeSimpleField("count", count, writeUnsignedByte(writeBuffer, 4)); // Simple Field (index) - writeSimpleField("index", index, writeUnsignedInt(writeBuffer, 12)); + writeSimpleField("index", index, writeUnsignedShort(writeBuffer, 12)); // Array Field (data) writeByteArrayField("data", data, writeByteArray(writeBuffer, 8)); @@ -146,7 +146,7 @@ public static ApduDataExtBuilder staticParseApduDataExtBuilder( byte count = readSimpleField("count", readUnsignedByte(readBuffer, 4)); - int index = readSimpleField("index", readUnsignedInt(readBuffer, 12)); + short index = readSimpleField("index", readUnsignedShort(readBuffer, 12)); byte[] data = readBuffer.readByteArray("data", Math.toIntExact((length) - (5))); @@ -161,11 +161,11 @@ public static class ApduDataExtPropertyValueResponseBuilderImpl private final short objectIndex; private final short propertyId; private final byte count; - private final int index; + private final short index; private final byte[] data; public ApduDataExtPropertyValueResponseBuilderImpl( - short objectIndex, short propertyId, byte count, int index, byte[] data) { + short objectIndex, short propertyId, byte count, short index, byte[] data) { this.objectIndex = objectIndex; this.propertyId = propertyId; this.count = count; diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtPropertyValueWrite.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtPropertyValueWrite.java index d8d403e7614..ca8eb30f0e6 100644 --- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtPropertyValueWrite.java +++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtPropertyValueWrite.java @@ -38,19 +38,19 @@ public class ApduDataExtPropertyValueWrite extends ApduDataExt implements Message { // Accessors for discriminator values. - public Short getExtApciType() { - return (short) 0x17; + public Byte getExtApciType() { + return (byte) 0x17; } // Properties. protected final short objectIndex; protected final short propertyId; protected final byte count; - protected final int index; + protected final short index; protected final byte[] data; public ApduDataExtPropertyValueWrite( - short objectIndex, short propertyId, byte count, int index, byte[] data) { + short objectIndex, short propertyId, byte count, short index, byte[] data) { super(); this.objectIndex = objectIndex; this.propertyId = propertyId; @@ -71,7 +71,7 @@ public byte getCount() { return count; } - public int getIndex() { + public short getIndex() { return index; } @@ -95,7 +95,7 @@ protected void serializeApduDataExtChild(WriteBuffer writeBuffer) throws Seriali writeSimpleField("count", count, writeUnsignedByte(writeBuffer, 4)); // Simple Field (index) - writeSimpleField("index", index, writeUnsignedInt(writeBuffer, 12)); + writeSimpleField("index", index, writeUnsignedShort(writeBuffer, 12)); // Array Field (data) writeByteArrayField("data", data, writeByteArray(writeBuffer, 8)); @@ -146,7 +146,7 @@ public static ApduDataExtBuilder staticParseApduDataExtBuilder( byte count = readSimpleField("count", readUnsignedByte(readBuffer, 4)); - int index = readSimpleField("index", readUnsignedInt(readBuffer, 12)); + short index = readSimpleField("index", readUnsignedShort(readBuffer, 12)); byte[] data = readBuffer.readByteArray("data", Math.toIntExact((length) - (5))); @@ -161,11 +161,11 @@ public static class ApduDataExtPropertyValueWriteBuilderImpl private final short objectIndex; private final short propertyId; private final byte count; - private final int index; + private final short index; private final byte[] data; public ApduDataExtPropertyValueWriteBuilderImpl( - short objectIndex, short propertyId, byte count, int index, byte[] data) { + short objectIndex, short propertyId, byte count, short index, byte[] data) { this.objectIndex = objectIndex; this.propertyId = propertyId; this.count = count; diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtReadRouterMemoryRequest.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtReadRouterMemoryRequest.java index 935167924b6..f6c4a0e3800 100644 --- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtReadRouterMemoryRequest.java +++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtReadRouterMemoryRequest.java @@ -38,8 +38,8 @@ public class ApduDataExtReadRouterMemoryRequest extends ApduDataExt implements Message { // Accessors for discriminator values. - public Short getExtApciType() { - return (short) 0x08; + public Byte getExtApciType() { + return (byte) 0x08; } public ApduDataExtReadRouterMemoryRequest() { diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtReadRouterMemoryResponse.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtReadRouterMemoryResponse.java index 853314bba48..e757629c762 100644 --- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtReadRouterMemoryResponse.java +++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtReadRouterMemoryResponse.java @@ -38,8 +38,8 @@ public class ApduDataExtReadRouterMemoryResponse extends ApduDataExt implements Message { // Accessors for discriminator values. - public Short getExtApciType() { - return (short) 0x09; + public Byte getExtApciType() { + return (byte) 0x09; } public ApduDataExtReadRouterMemoryResponse() { diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtReadRouterStatusRequest.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtReadRouterStatusRequest.java index b068f249520..dde4b2788bb 100644 --- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtReadRouterStatusRequest.java +++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtReadRouterStatusRequest.java @@ -38,8 +38,8 @@ public class ApduDataExtReadRouterStatusRequest extends ApduDataExt implements Message { // Accessors for discriminator values. - public Short getExtApciType() { - return (short) 0x0D; + public Byte getExtApciType() { + return (byte) 0x0D; } public ApduDataExtReadRouterStatusRequest() { diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtReadRouterStatusResponse.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtReadRouterStatusResponse.java index a010697c87e..51ceb9d154c 100644 --- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtReadRouterStatusResponse.java +++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtReadRouterStatusResponse.java @@ -38,8 +38,8 @@ public class ApduDataExtReadRouterStatusResponse extends ApduDataExt implements Message { // Accessors for discriminator values. - public Short getExtApciType() { - return (short) 0x0E; + public Byte getExtApciType() { + return (byte) 0x0E; } public ApduDataExtReadRouterStatusResponse() { diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtReadRoutingTableRequest.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtReadRoutingTableRequest.java index d9803def3d8..29b6bcbdbaa 100644 --- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtReadRoutingTableRequest.java +++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtReadRoutingTableRequest.java @@ -38,8 +38,8 @@ public class ApduDataExtReadRoutingTableRequest extends ApduDataExt implements Message { // Accessors for discriminator values. - public Short getExtApciType() { - return (short) 0x01; + public Byte getExtApciType() { + return (byte) 0x01; } public ApduDataExtReadRoutingTableRequest() { diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtReadRoutingTableResponse.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtReadRoutingTableResponse.java index afb87a94c14..351ece8cca0 100644 --- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtReadRoutingTableResponse.java +++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtReadRoutingTableResponse.java @@ -38,8 +38,8 @@ public class ApduDataExtReadRoutingTableResponse extends ApduDataExt implements Message { // Accessors for discriminator values. - public Short getExtApciType() { - return (short) 0x02; + public Byte getExtApciType() { + return (byte) 0x02; } public ApduDataExtReadRoutingTableResponse() { diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtWriteRouterMemoryRequest.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtWriteRouterMemoryRequest.java index d08c1837faf..1129402fae2 100644 --- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtWriteRouterMemoryRequest.java +++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtWriteRouterMemoryRequest.java @@ -38,8 +38,8 @@ public class ApduDataExtWriteRouterMemoryRequest extends ApduDataExt implements Message { // Accessors for discriminator values. - public Short getExtApciType() { - return (short) 0x0A; + public Byte getExtApciType() { + return (byte) 0x0A; } public ApduDataExtWriteRouterMemoryRequest() { diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtWriteRouterStatusRequest.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtWriteRouterStatusRequest.java index ba2f6cff627..a117fb46036 100644 --- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtWriteRouterStatusRequest.java +++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtWriteRouterStatusRequest.java @@ -38,8 +38,8 @@ public class ApduDataExtWriteRouterStatusRequest extends ApduDataExt implements Message { // Accessors for discriminator values. - public Short getExtApciType() { - return (short) 0x0F; + public Byte getExtApciType() { + return (byte) 0x0F; } public ApduDataExtWriteRouterStatusRequest() { diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtWriteRoutingTableRequest.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtWriteRoutingTableRequest.java index a7831cb86a9..0df1c3db747 100644 --- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtWriteRoutingTableRequest.java +++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataExtWriteRoutingTableRequest.java @@ -38,8 +38,8 @@ public class ApduDataExtWriteRoutingTableRequest extends ApduDataExt implements Message { // Accessors for discriminator values. - public Short getExtApciType() { - return (short) 0x03; + public Byte getExtApciType() { + return (byte) 0x03; } public ApduDataExtWriteRoutingTableRequest() { diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataGroupValueRead.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataGroupValueRead.java index 9c1b53030de..80a095730bf 100644 --- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataGroupValueRead.java +++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataGroupValueRead.java @@ -53,7 +53,7 @@ protected void serializeApduDataChild(WriteBuffer writeBuffer) throws Serializat writeBuffer.pushContext("ApduDataGroupValueRead"); // Reserved Field (reserved) - writeReservedField("reserved", (short) 0x00, writeUnsignedShort(writeBuffer, 6)); + writeReservedField("reserved", (byte) 0x00, writeUnsignedByte(writeBuffer, 6)); writeBuffer.popContext("ApduDataGroupValueRead"); } @@ -81,8 +81,8 @@ public static ApduDataBuilder staticParseApduDataBuilder(ReadBuffer readBuffer, PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - Short reservedField0 = - readReservedField("reserved", readUnsignedShort(readBuffer, 6), (short) 0x00); + Byte reservedField0 = + readReservedField("reserved", readUnsignedByte(readBuffer, 6), (byte) 0x00); readBuffer.closeContext("ApduDataGroupValueRead"); // Create the instance diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataMemoryRead.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataMemoryRead.java index 0156ce77ac8..cc7599c83b9 100644 --- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataMemoryRead.java +++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataMemoryRead.java @@ -43,16 +43,16 @@ public Byte getApciType() { } // Properties. - protected final short numBytes; + protected final byte numBytes; protected final int address; - public ApduDataMemoryRead(short numBytes, int address) { + public ApduDataMemoryRead(byte numBytes, int address) { super(); this.numBytes = numBytes; this.address = address; } - public short getNumBytes() { + public byte getNumBytes() { return numBytes; } @@ -67,7 +67,7 @@ protected void serializeApduDataChild(WriteBuffer writeBuffer) throws Serializat writeBuffer.pushContext("ApduDataMemoryRead"); // Simple Field (numBytes) - writeSimpleField("numBytes", numBytes, writeUnsignedShort(writeBuffer, 6)); + writeSimpleField("numBytes", numBytes, writeUnsignedByte(writeBuffer, 6)); // Simple Field (address) writeSimpleField("address", address, writeUnsignedInt(writeBuffer, 16)); @@ -101,7 +101,7 @@ public static ApduDataBuilder staticParseApduDataBuilder(ReadBuffer readBuffer, PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - short numBytes = readSimpleField("numBytes", readUnsignedShort(readBuffer, 6)); + byte numBytes = readSimpleField("numBytes", readUnsignedByte(readBuffer, 6)); int address = readSimpleField("address", readUnsignedInt(readBuffer, 16)); @@ -111,10 +111,10 @@ public static ApduDataBuilder staticParseApduDataBuilder(ReadBuffer readBuffer, } public static class ApduDataMemoryReadBuilderImpl implements ApduData.ApduDataBuilder { - private final short numBytes; + private final byte numBytes; private final int address; - public ApduDataMemoryReadBuilderImpl(short numBytes, int address) { + public ApduDataMemoryReadBuilderImpl(byte numBytes, int address) { this.numBytes = numBytes; this.address = address; } diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataMemoryResponse.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataMemoryResponse.java index 573c25ab754..ea6ba377bae 100644 --- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataMemoryResponse.java +++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ApduDataMemoryResponse.java @@ -68,8 +68,8 @@ protected void serializeApduDataChild(WriteBuffer writeBuffer) throws Serializat // Implicit Field (numBytes) (Used for parsing, but its value is not stored as it's implicitly // given by the objects content) - short numBytes = (short) (COUNT(getData())); - writeImplicitField("numBytes", numBytes, writeUnsignedShort(writeBuffer, 6)); + byte numBytes = (byte) (COUNT(getData())); + writeImplicitField("numBytes", numBytes, writeUnsignedByte(writeBuffer, 6)); // Simple Field (address) writeSimpleField("address", address, writeUnsignedInt(writeBuffer, 16)); @@ -111,7 +111,7 @@ public static ApduDataBuilder staticParseApduDataBuilder(ReadBuffer readBuffer, PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - short numBytes = readImplicitField("numBytes", readUnsignedShort(readBuffer, 6)); + byte numBytes = readImplicitField("numBytes", readUnsignedByte(readBuffer, 6)); int address = readSimpleField("address", readUnsignedInt(readBuffer, 16)); diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ChannelInformation.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ChannelInformation.java index 7dbdc94b6b2..a63bdc76b77 100644 --- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ChannelInformation.java +++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/ChannelInformation.java @@ -39,9 +39,9 @@ public class ChannelInformation implements Message { // Properties. protected final byte numChannels; - protected final int channelCode; + protected final short channelCode; - public ChannelInformation(byte numChannels, int channelCode) { + public ChannelInformation(byte numChannels, short channelCode) { super(); this.numChannels = numChannels; this.channelCode = channelCode; @@ -51,7 +51,7 @@ public byte getNumChannels() { return numChannels; } - public int getChannelCode() { + public short getChannelCode() { return channelCode; } @@ -64,7 +64,7 @@ public void serialize(WriteBuffer writeBuffer) throws SerializationException { writeSimpleField("numChannels", numChannels, writeUnsignedByte(writeBuffer, 3)); // Simple Field (channelCode) - writeSimpleField("channelCode", channelCode, writeUnsignedInt(writeBuffer, 13)); + writeSimpleField("channelCode", channelCode, writeUnsignedShort(writeBuffer, 13)); writeBuffer.popContext("ChannelInformation"); } @@ -102,7 +102,7 @@ public static ChannelInformation staticParse(ReadBuffer readBuffer) throws Parse byte numChannels = readSimpleField("numChannels", readUnsignedByte(readBuffer, 3)); - int channelCode = readSimpleField("channelCode", readUnsignedInt(readBuffer, 13)); + short channelCode = readSimpleField("channelCode", readUnsignedShort(readBuffer, 13)); readBuffer.closeContext("ChannelInformation"); // Create the instance diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/DeviceDescriptorType2.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/DeviceDescriptorType2.java index 87b3cbaff8f..2abb5e2e03f 100644 --- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/DeviceDescriptorType2.java +++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/DeviceDescriptorType2.java @@ -43,7 +43,7 @@ public class DeviceDescriptorType2 implements Message { protected final short version; protected final boolean readSupported; protected final boolean writeSupported; - protected final short logicalTagBase; + protected final byte logicalTagBase; protected final ChannelInformation channelInfo1; protected final ChannelInformation channelInfo2; protected final ChannelInformation channelInfo3; @@ -55,7 +55,7 @@ public DeviceDescriptorType2( short version, boolean readSupported, boolean writeSupported, - short logicalTagBase, + byte logicalTagBase, ChannelInformation channelInfo1, ChannelInformation channelInfo2, ChannelInformation channelInfo3, @@ -93,7 +93,7 @@ public boolean getWriteSupported() { return writeSupported; } - public short getLogicalTagBase() { + public byte getLogicalTagBase() { return logicalTagBase; } @@ -134,7 +134,7 @@ public void serialize(WriteBuffer writeBuffer) throws SerializationException { writeSimpleField("writeSupported", writeSupported, writeBoolean(writeBuffer)); // Simple Field (logicalTagBase) - writeSimpleField("logicalTagBase", logicalTagBase, writeUnsignedShort(writeBuffer, 6)); + writeSimpleField("logicalTagBase", logicalTagBase, writeUnsignedByte(writeBuffer, 6)); // Simple Field (channelInfo1) writeSimpleField("channelInfo1", channelInfo1, new DataWriterComplexDefault<>(writeBuffer)); @@ -216,7 +216,7 @@ public static DeviceDescriptorType2 staticParse(ReadBuffer readBuffer) throws Pa boolean writeSupported = readSimpleField("writeSupported", readBoolean(readBuffer)); - short logicalTagBase = readSimpleField("logicalTagBase", readUnsignedShort(readBuffer, 6)); + byte logicalTagBase = readSimpleField("logicalTagBase", readUnsignedByte(readBuffer, 6)); ChannelInformation channelInfo1 = readSimpleField( diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/DeviceStatus.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/DeviceStatus.java index e15d46ceeb3..e61cf5e1ae9 100644 --- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/DeviceStatus.java +++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/DeviceStatus.java @@ -55,7 +55,7 @@ public void serialize(WriteBuffer writeBuffer) throws SerializationException { writeBuffer.pushContext("DeviceStatus"); // Reserved Field (reserved) - writeReservedField("reserved", (short) 0x00, writeUnsignedShort(writeBuffer, 7)); + writeReservedField("reserved", (byte) 0x00, writeUnsignedByte(writeBuffer, 7)); // Simple Field (programMode) writeSimpleField("programMode", programMode, writeBoolean(writeBuffer)); @@ -94,8 +94,8 @@ public static DeviceStatus staticParse(ReadBuffer readBuffer) throws ParseExcept PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - Short reservedField0 = - readReservedField("reserved", readUnsignedShort(readBuffer, 7), (short) 0x00); + Byte reservedField0 = + readReservedField("reserved", readUnsignedByte(readBuffer, 7), (byte) 0x00); boolean programMode = readSimpleField("programMode", readBoolean(readBuffer)); diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxDatapoint.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxDatapoint.java index dc41f16e938..dfe02653e14 100644 --- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxDatapoint.java +++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxDatapoint.java @@ -47,9 +47,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 7); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 7); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -502,9 +502,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 7); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 7); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -518,9 +518,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 7); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 7); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -534,9 +534,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 7); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 7); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -550,9 +550,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 7); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 7); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -566,9 +566,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 7); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 7); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -582,9 +582,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 7); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 7); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -598,9 +598,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 7); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 7); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -614,9 +614,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 7); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 7); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -630,9 +630,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 7); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 7); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -646,9 +646,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 7); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 7); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -662,9 +662,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 7); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 7); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -678,9 +678,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 7); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 7); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -694,9 +694,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 7); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 7); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -710,9 +710,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 7); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 7); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -726,9 +726,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 7); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 7); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -742,9 +742,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 7); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 7); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -758,9 +758,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 7); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 7); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -774,9 +774,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 7); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 7); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -790,9 +790,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 7); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 7); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -807,9 +807,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 7); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 7); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -823,9 +823,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 7); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 7); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -840,9 +840,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 7); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 7); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -856,9 +856,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 7); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 7); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -872,9 +872,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 7); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 7); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -889,9 +889,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 6); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 6); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -913,9 +913,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 6); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 6); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -937,9 +937,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 6); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 6); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -961,9 +961,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 6); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 6); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -985,9 +985,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 6); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 6); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -1009,9 +1009,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 6); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 6); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -1033,9 +1033,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 6); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 6); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -1057,9 +1057,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 6); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 6); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -1081,9 +1081,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 6); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 6); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -1105,9 +1105,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 6); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 6); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -1129,9 +1129,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 6); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 6); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -1153,9 +1153,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 6); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 6); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -2189,7 +2189,7 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap Byte day = /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readUnsignedByte("", 3); // Simple Field (hour) - Short hour = /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readUnsignedShort("", 5); + Byte hour = /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readUnsignedByte("", 5); // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { @@ -2202,7 +2202,7 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap } // Simple Field (minutes) - Short minutes = /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readUnsignedShort("", 6); + Byte minutes = /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readUnsignedByte("", 6); // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { @@ -2215,13 +2215,13 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap } // Simple Field (seconds) - Short seconds = /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readUnsignedShort("", 6); + Byte seconds = /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readUnsignedByte("", 6); Map _map = new HashMap<>(); _map.put("day", new PlcSINT(day)); - _map.put("hour", new PlcINT(hour)); - _map.put("minutes", new PlcINT(minutes)); - _map.put("seconds", new PlcINT(seconds)); + _map.put("hour", new PlcSINT(hour)); + _map.put("minutes", new PlcSINT(minutes)); + _map.put("seconds", new PlcSINT(seconds)); return new PlcStruct(_map); } else if (EvaluationHelper.equals(datapointType, KnxDatapointType.DPT_Date)) { // Struct @@ -2247,8 +2247,8 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap } // Simple Field (dayOfMonth) - Short dayOfMonth = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 5); + Byte dayOfMonth = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 5); // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { @@ -2274,12 +2274,12 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap } // Simple Field (year) - Short year = /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readUnsignedShort("", 7); + Byte year = /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readUnsignedByte("", 7); Map _map = new HashMap<>(); - _map.put("dayOfMonth", new PlcINT(dayOfMonth)); + _map.put("dayOfMonth", new PlcSINT(dayOfMonth)); _map.put("month", new PlcSINT(month)); - _map.put("year", new PlcINT(year)); + _map.put("year", new PlcSINT(year)); return new PlcStruct(_map); } else if (EvaluationHelper.equals( @@ -4090,7 +4090,7 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap } // Simple Field (value) - Short value = /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readUnsignedShort("", 6); + Byte value = /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readUnsignedByte("", 6); return new PlcUSINT(value); } else if (EvaluationHelper.equals( @@ -4122,14 +4122,14 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap } // Simple Field (sceneNumber) - Short sceneNumber = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 6); + Byte sceneNumber = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 6); Map _map = new HashMap<>(); _map.put( "learnTheSceneCorrespondingToTheFieldSceneNumber", new PlcBOOL(learnTheSceneCorrespondingToTheFieldSceneNumber)); - _map.put("sceneNumber", new PlcINT(sceneNumber)); + _map.put("sceneNumber", new PlcSINT(sceneNumber)); return new PlcStruct(_map); } else if (EvaluationHelper.equals(datapointType, KnxDatapointType.DPT_DateTime)) { // Struct @@ -4171,15 +4171,14 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap } // Simple Field (dayofmonth) - Short dayofmonth = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 5); + Byte dayofmonth = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 5); // Simple Field (dayofweek) Byte dayofweek = /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readUnsignedByte("", 3); // Simple Field (hourofday) - Short hourofday = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 5); + Byte hourofday = /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readUnsignedByte("", 5); // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { @@ -4192,7 +4191,7 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap } // Simple Field (minutes) - Short minutes = /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readUnsignedShort("", 6); + Byte minutes = /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readUnsignedByte("", 6); // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { @@ -4205,7 +4204,7 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap } // Simple Field (seconds) - Short seconds = /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readUnsignedShort("", 6); + Byte seconds = /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readUnsignedByte("", 6); // Simple Field (fault) Boolean fault = /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readBit(""); @@ -4236,9 +4235,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 7); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 7); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -4247,11 +4246,11 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap Map _map = new HashMap<>(); _map.put("year", new PlcINT(year)); _map.put("month", new PlcSINT(month)); - _map.put("dayofmonth", new PlcINT(dayofmonth)); + _map.put("dayofmonth", new PlcSINT(dayofmonth)); _map.put("dayofweek", new PlcSINT(dayofweek)); - _map.put("hourofday", new PlcINT(hourofday)); - _map.put("minutes", new PlcINT(minutes)); - _map.put("seconds", new PlcINT(seconds)); + _map.put("hourofday", new PlcSINT(hourofday)); + _map.put("minutes", new PlcSINT(minutes)); + _map.put("seconds", new PlcSINT(seconds)); _map.put("fault", new PlcBOOL(fault)); _map.put("workingDay", new PlcBOOL(workingDay)); _map.put("noWd", new PlcBOOL(noWd)); @@ -5263,9 +5262,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 5); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 5); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -5342,9 +5341,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 7); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 7); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -5415,9 +5414,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 5); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 5); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -5453,9 +5452,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 5); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 5); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -5480,9 +5479,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 7); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 7); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -5654,9 +5653,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 5); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 5); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -5692,9 +5691,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 5); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 5); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -5932,9 +5931,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 7); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 7); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -5996,9 +5995,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 7); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 7); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -6060,8 +6059,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - int reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readUnsignedInt("", 10); - if (reserved != (int) 0x00) { + short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedShort("", 10); + if (reserved != (short) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -6206,9 +6206,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 6); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 6); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -6223,9 +6223,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 6); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 6); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -6240,9 +6240,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 6); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 6); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -6257,9 +6257,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 6); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 6); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -6319,12 +6319,12 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap Boolean sceneIsInactive = /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readBit(""); // Simple Field (scenenumber) - Short scenenumber = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 6); + Byte scenenumber = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 6); Map _map = new HashMap<>(); _map.put("sceneIsInactive", new PlcBOOL(sceneIsInactive)); - _map.put("scenenumber", new PlcINT(scenenumber)); + _map.put("scenenumber", new PlcSINT(scenenumber)); return new PlcStruct(_map); } else if (EvaluationHelper.equals( @@ -6842,21 +6842,21 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap } // Simple Field (magicNumber) - Short magicNumber = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 5); + Byte magicNumber = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 5); // Simple Field (versionNumber) - Short versionNumber = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 5); + Byte versionNumber = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 5); // Simple Field (revisionNumber) - Short revisionNumber = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 6); + Byte revisionNumber = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 6); Map _map = new HashMap<>(); - _map.put("magicNumber", new PlcINT(magicNumber)); - _map.put("versionNumber", new PlcINT(versionNumber)); - _map.put("revisionNumber", new PlcINT(revisionNumber)); + _map.put("magicNumber", new PlcSINT(magicNumber)); + _map.put("versionNumber", new PlcSINT(versionNumber)); + _map.put("revisionNumber", new PlcSINT(revisionNumber)); return new PlcStruct(_map); } else if (EvaluationHelper.equals(datapointType, KnxDatapointType.DPT_AlarmInfo)) { // Struct @@ -6911,9 +6911,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 5); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 5); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -7207,9 +7207,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 6); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 6); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -7274,9 +7274,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 5); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 5); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -7298,8 +7298,8 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap Boolean addressIndicator = /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readBit(""); // Simple Field (daliDeviceAddressOrDaliGroupAddress) - Short daliDeviceAddressOrDaliGroupAddress = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 6); + Byte daliDeviceAddressOrDaliGroupAddress = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 6); Map _map = new HashMap<>(); _map.put("convertorError", new PlcBOOL(convertorError)); @@ -7308,7 +7308,7 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap _map.put("readOrResponse", new PlcBOOL(readOrResponse)); _map.put("addressIndicator", new PlcBOOL(addressIndicator)); _map.put( - "daliDeviceAddressOrDaliGroupAddress", new PlcINT(daliDeviceAddressOrDaliGroupAddress)); + "daliDeviceAddressOrDaliGroupAddress", new PlcSINT(daliDeviceAddressOrDaliGroupAddress)); return new PlcStruct(_map); } else if (EvaluationHelper.equals( @@ -7331,13 +7331,13 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap Boolean lampFailure = /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readBit(""); // Simple Field (deviceAddress) - Short deviceAddress = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 6); + Byte deviceAddress = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 6); Map _map = new HashMap<>(); _map.put("ballastFailure", new PlcBOOL(ballastFailure)); _map.put("lampFailure", new PlcBOOL(lampFailure)); - _map.put("deviceAddress", new PlcINT(deviceAddress)); + _map.put("deviceAddress", new PlcSINT(deviceAddress)); return new PlcStruct(_map); } else if (EvaluationHelper.equals( @@ -7363,9 +7363,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 6); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 6); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -7527,9 +7527,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 6); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 6); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -7696,9 +7696,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 5); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 5); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -7751,9 +7751,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 5); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 5); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -7831,9 +7831,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, KnxDatapointType datap // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 6); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 6); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -8238,8 +8238,7 @@ public static void staticSerialize( if (EvaluationHelper.equals(datapointType, KnxDatapointType.BOOL)) { // BOOL // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 7, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 7, ((Number) (byte) 0x00).byteValue()); // Simple Field (value) boolean value = (boolean) _value.getBoolean(); /*TODO: migrate me*/ @@ -8522,8 +8521,7 @@ public static void staticSerialize( } else if (EvaluationHelper.equals(datapointType, KnxDatapointType.DPT_Switch)) { // BOOL // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 7, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 7, ((Number) (byte) 0x00).byteValue()); // Simple Field (value) boolean value = (boolean) _value.getBoolean(); /*TODO: migrate me*/ @@ -8531,8 +8529,7 @@ public static void staticSerialize( } else if (EvaluationHelper.equals(datapointType, KnxDatapointType.DPT_Bool)) { // BOOL // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 7, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 7, ((Number) (byte) 0x00).byteValue()); // Simple Field (value) boolean value = (boolean) _value.getBoolean(); /*TODO: migrate me*/ @@ -8540,8 +8537,7 @@ public static void staticSerialize( } else if (EvaluationHelper.equals(datapointType, KnxDatapointType.DPT_Enable)) { // BOOL // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 7, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 7, ((Number) (byte) 0x00).byteValue()); // Simple Field (value) boolean value = (boolean) _value.getBoolean(); /*TODO: migrate me*/ @@ -8549,8 +8545,7 @@ public static void staticSerialize( } else if (EvaluationHelper.equals(datapointType, KnxDatapointType.DPT_Ramp)) { // BOOL // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 7, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 7, ((Number) (byte) 0x00).byteValue()); // Simple Field (value) boolean value = (boolean) _value.getBoolean(); /*TODO: migrate me*/ @@ -8558,8 +8553,7 @@ public static void staticSerialize( } else if (EvaluationHelper.equals(datapointType, KnxDatapointType.DPT_Alarm)) { // BOOL // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 7, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 7, ((Number) (byte) 0x00).byteValue()); // Simple Field (value) boolean value = (boolean) _value.getBoolean(); /*TODO: migrate me*/ @@ -8567,8 +8561,7 @@ public static void staticSerialize( } else if (EvaluationHelper.equals(datapointType, KnxDatapointType.DPT_BinaryValue)) { // BOOL // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 7, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 7, ((Number) (byte) 0x00).byteValue()); // Simple Field (value) boolean value = (boolean) _value.getBoolean(); /*TODO: migrate me*/ @@ -8576,8 +8569,7 @@ public static void staticSerialize( } else if (EvaluationHelper.equals(datapointType, KnxDatapointType.DPT_Step)) { // BOOL // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 7, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 7, ((Number) (byte) 0x00).byteValue()); // Simple Field (value) boolean value = (boolean) _value.getBoolean(); /*TODO: migrate me*/ @@ -8585,8 +8577,7 @@ public static void staticSerialize( } else if (EvaluationHelper.equals(datapointType, KnxDatapointType.DPT_UpDown)) { // BOOL // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 7, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 7, ((Number) (byte) 0x00).byteValue()); // Simple Field (value) boolean value = (boolean) _value.getBoolean(); /*TODO: migrate me*/ @@ -8594,8 +8585,7 @@ public static void staticSerialize( } else if (EvaluationHelper.equals(datapointType, KnxDatapointType.DPT_OpenClose)) { // BOOL // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 7, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 7, ((Number) (byte) 0x00).byteValue()); // Simple Field (value) boolean value = (boolean) _value.getBoolean(); /*TODO: migrate me*/ @@ -8603,8 +8593,7 @@ public static void staticSerialize( } else if (EvaluationHelper.equals(datapointType, KnxDatapointType.DPT_Start)) { // BOOL // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 7, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 7, ((Number) (byte) 0x00).byteValue()); // Simple Field (value) boolean value = (boolean) _value.getBoolean(); /*TODO: migrate me*/ @@ -8612,8 +8601,7 @@ public static void staticSerialize( } else if (EvaluationHelper.equals(datapointType, KnxDatapointType.DPT_State)) { // BOOL // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 7, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 7, ((Number) (byte) 0x00).byteValue()); // Simple Field (value) boolean value = (boolean) _value.getBoolean(); /*TODO: migrate me*/ @@ -8621,8 +8609,7 @@ public static void staticSerialize( } else if (EvaluationHelper.equals(datapointType, KnxDatapointType.DPT_Invert)) { // BOOL // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 7, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 7, ((Number) (byte) 0x00).byteValue()); // Simple Field (value) boolean value = (boolean) _value.getBoolean(); /*TODO: migrate me*/ @@ -8630,8 +8617,7 @@ public static void staticSerialize( } else if (EvaluationHelper.equals(datapointType, KnxDatapointType.DPT_DimSendStyle)) { // BOOL // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 7, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 7, ((Number) (byte) 0x00).byteValue()); // Simple Field (value) boolean value = (boolean) _value.getBoolean(); /*TODO: migrate me*/ @@ -8639,8 +8625,7 @@ public static void staticSerialize( } else if (EvaluationHelper.equals(datapointType, KnxDatapointType.DPT_InputSource)) { // BOOL // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 7, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 7, ((Number) (byte) 0x00).byteValue()); // Simple Field (value) boolean value = (boolean) _value.getBoolean(); /*TODO: migrate me*/ @@ -8648,8 +8633,7 @@ public static void staticSerialize( } else if (EvaluationHelper.equals(datapointType, KnxDatapointType.DPT_Reset)) { // BOOL // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 7, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 7, ((Number) (byte) 0x00).byteValue()); // Simple Field (value) boolean value = (boolean) _value.getBoolean(); /*TODO: migrate me*/ @@ -8657,8 +8641,7 @@ public static void staticSerialize( } else if (EvaluationHelper.equals(datapointType, KnxDatapointType.DPT_Ack)) { // BOOL // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 7, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 7, ((Number) (byte) 0x00).byteValue()); // Simple Field (value) boolean value = (boolean) _value.getBoolean(); /*TODO: migrate me*/ @@ -8666,8 +8649,7 @@ public static void staticSerialize( } else if (EvaluationHelper.equals(datapointType, KnxDatapointType.DPT_Trigger)) { // BOOL // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 7, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 7, ((Number) (byte) 0x00).byteValue()); // Simple Field (value) boolean value = (boolean) _value.getBoolean(); /*TODO: migrate me*/ @@ -8675,8 +8657,7 @@ public static void staticSerialize( } else if (EvaluationHelper.equals(datapointType, KnxDatapointType.DPT_Occupancy)) { // BOOL // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 7, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 7, ((Number) (byte) 0x00).byteValue()); // Simple Field (value) boolean value = (boolean) _value.getBoolean(); /*TODO: migrate me*/ @@ -8684,8 +8665,7 @@ public static void staticSerialize( } else if (EvaluationHelper.equals(datapointType, KnxDatapointType.DPT_Window_Door)) { // BOOL // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 7, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 7, ((Number) (byte) 0x00).byteValue()); // Simple Field (value) boolean value = (boolean) _value.getBoolean(); /*TODO: migrate me*/ @@ -8694,8 +8674,7 @@ public static void staticSerialize( datapointType, KnxDatapointType.DPT_LogicalFunction)) { // BOOL // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 7, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 7, ((Number) (byte) 0x00).byteValue()); // Simple Field (value) boolean value = (boolean) _value.getBoolean(); /*TODO: migrate me*/ @@ -8703,8 +8682,7 @@ public static void staticSerialize( } else if (EvaluationHelper.equals(datapointType, KnxDatapointType.DPT_Scene_AB)) { // BOOL // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 7, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 7, ((Number) (byte) 0x00).byteValue()); // Simple Field (value) boolean value = (boolean) _value.getBoolean(); /*TODO: migrate me*/ @@ -8713,8 +8691,7 @@ public static void staticSerialize( datapointType, KnxDatapointType.DPT_ShutterBlinds_Mode)) { // BOOL // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 7, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 7, ((Number) (byte) 0x00).byteValue()); // Simple Field (value) boolean value = (boolean) _value.getBoolean(); /*TODO: migrate me*/ @@ -8722,8 +8699,7 @@ public static void staticSerialize( } else if (EvaluationHelper.equals(datapointType, KnxDatapointType.DPT_DayNight)) { // BOOL // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 7, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 7, ((Number) (byte) 0x00).byteValue()); // Simple Field (value) boolean value = (boolean) _value.getBoolean(); /*TODO: migrate me*/ @@ -8731,8 +8707,7 @@ public static void staticSerialize( } else if (EvaluationHelper.equals(datapointType, KnxDatapointType.DPT_Heat_Cool)) { // BOOL // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 7, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 7, ((Number) (byte) 0x00).byteValue()); // Simple Field (value) boolean value = (boolean) _value.getBoolean(); /*TODO: migrate me*/ @@ -8741,8 +8716,7 @@ public static void staticSerialize( datapointType, KnxDatapointType.DPT_Switch_Control)) { // Struct // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 6, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 6, ((Number) (byte) 0x00).byteValue()); // Simple Field (control) boolean control = (boolean) _value.getStruct().get("control").getBoolean(); /*TODO: migrate me*/ @@ -8755,8 +8729,7 @@ public static void staticSerialize( datapointType, KnxDatapointType.DPT_Bool_Control)) { // Struct // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 6, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 6, ((Number) (byte) 0x00).byteValue()); // Simple Field (control) boolean control = (boolean) _value.getStruct().get("control").getBoolean(); /*TODO: migrate me*/ @@ -8769,8 +8742,7 @@ public static void staticSerialize( datapointType, KnxDatapointType.DPT_Enable_Control)) { // Struct // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 6, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 6, ((Number) (byte) 0x00).byteValue()); // Simple Field (control) boolean control = (boolean) _value.getStruct().get("control").getBoolean(); /*TODO: migrate me*/ @@ -8783,8 +8755,7 @@ public static void staticSerialize( datapointType, KnxDatapointType.DPT_Ramp_Control)) { // Struct // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 6, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 6, ((Number) (byte) 0x00).byteValue()); // Simple Field (control) boolean control = (boolean) _value.getStruct().get("control").getBoolean(); /*TODO: migrate me*/ @@ -8797,8 +8768,7 @@ public static void staticSerialize( datapointType, KnxDatapointType.DPT_Alarm_Control)) { // Struct // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 6, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 6, ((Number) (byte) 0x00).byteValue()); // Simple Field (control) boolean control = (boolean) _value.getStruct().get("control").getBoolean(); /*TODO: migrate me*/ @@ -8811,8 +8781,7 @@ public static void staticSerialize( datapointType, KnxDatapointType.DPT_BinaryValue_Control)) { // Struct // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 6, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 6, ((Number) (byte) 0x00).byteValue()); // Simple Field (control) boolean control = (boolean) _value.getStruct().get("control").getBoolean(); /*TODO: migrate me*/ @@ -8825,8 +8794,7 @@ public static void staticSerialize( datapointType, KnxDatapointType.DPT_Step_Control)) { // Struct // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 6, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 6, ((Number) (byte) 0x00).byteValue()); // Simple Field (control) boolean control = (boolean) _value.getStruct().get("control").getBoolean(); /*TODO: migrate me*/ @@ -8839,8 +8807,7 @@ public static void staticSerialize( datapointType, KnxDatapointType.DPT_Direction1_Control)) { // Struct // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 6, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 6, ((Number) (byte) 0x00).byteValue()); // Simple Field (control) boolean control = (boolean) _value.getStruct().get("control").getBoolean(); /*TODO: migrate me*/ @@ -8853,8 +8820,7 @@ public static void staticSerialize( datapointType, KnxDatapointType.DPT_Direction2_Control)) { // Struct // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 6, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 6, ((Number) (byte) 0x00).byteValue()); // Simple Field (control) boolean control = (boolean) _value.getStruct().get("control").getBoolean(); /*TODO: migrate me*/ @@ -8867,8 +8833,7 @@ public static void staticSerialize( datapointType, KnxDatapointType.DPT_Start_Control)) { // Struct // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 6, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 6, ((Number) (byte) 0x00).byteValue()); // Simple Field (control) boolean control = (boolean) _value.getStruct().get("control").getBoolean(); /*TODO: migrate me*/ @@ -8881,8 +8846,7 @@ public static void staticSerialize( datapointType, KnxDatapointType.DPT_State_Control)) { // Struct // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 6, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 6, ((Number) (byte) 0x00).byteValue()); // Simple Field (control) boolean control = (boolean) _value.getStruct().get("control").getBoolean(); /*TODO: migrate me*/ @@ -8895,8 +8859,7 @@ public static void staticSerialize( datapointType, KnxDatapointType.DPT_Invert_Control)) { // Struct // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 6, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 6, ((Number) (byte) 0x00).byteValue()); // Simple Field (control) boolean control = (boolean) _value.getStruct().get("control").getBoolean(); /*TODO: migrate me*/ @@ -9492,23 +9455,23 @@ public static void staticSerialize( /*TODO: migrate me*/ /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 3, ((Number) (day)).byteValue()); // Simple Field (hour) - short hour = (short) _value.getStruct().get("hour").getShort(); + byte hour = (byte) _value.getStruct().get("hour").getByte(); /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort("", 5, ((Number) (hour)).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 5, ((Number) (hour)).byteValue()); // Reserved Field /*TODO: migrate me*/ /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 2, ((Number) (byte) 0x00).byteValue()); // Simple Field (minutes) - short minutes = (short) _value.getStruct().get("minutes").getShort(); + byte minutes = (byte) _value.getStruct().get("minutes").getByte(); /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort("", 6, ((Number) (minutes)).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 6, ((Number) (minutes)).byteValue()); // Reserved Field /*TODO: migrate me*/ /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 2, ((Number) (byte) 0x00).byteValue()); // Simple Field (seconds) - short seconds = (short) _value.getStruct().get("seconds").getShort(); + byte seconds = (byte) _value.getStruct().get("seconds").getByte(); /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort("", 6, ((Number) (seconds)).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 6, ((Number) (seconds)).byteValue()); } else if (EvaluationHelper.equals(datapointType, KnxDatapointType.DPT_Date)) { // Struct // Reserved Field /*TODO: migrate me*/ @@ -9518,10 +9481,10 @@ public static void staticSerialize( /*TODO: migrate me*/ /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 3, ((Number) (byte) 0x00).byteValue()); // Simple Field (dayOfMonth) - short dayOfMonth = (short) _value.getStruct().get("dayOfMonth").getShort(); + byte dayOfMonth = (byte) _value.getStruct().get("dayOfMonth").getByte(); /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 5, ((Number) (dayOfMonth)).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte( + "", 5, ((Number) (dayOfMonth)).byteValue()); // Reserved Field /*TODO: migrate me*/ /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 4, ((Number) (byte) 0x00).byteValue()); @@ -9533,9 +9496,9 @@ public static void staticSerialize( /*TODO: migrate me*/ /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 1, ((Number) (byte) 0x00).byteValue()); // Simple Field (year) - short year = (short) _value.getStruct().get("year").getShort(); + byte year = (byte) _value.getStruct().get("year").getByte(); /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort("", 7, ((Number) (year)).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 7, ((Number) (year)).byteValue()); } else if (EvaluationHelper.equals( datapointType, KnxDatapointType.DPT_Value_4_Ucount)) { // UDINT // Reserved Field @@ -10606,9 +10569,9 @@ public static void staticSerialize( /*TODO: migrate me*/ /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 2, ((Number) (byte) 0x00).byteValue()); // Simple Field (value) - short value = (short) _value.getShort(); + byte value = (byte) _value.getByte(); /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort("", 6, ((Number) (value)).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 6, ((Number) (value)).byteValue()); } else if (EvaluationHelper.equals( datapointType, KnxDatapointType.DPT_SceneControl)) { // Struct // Reserved Field @@ -10629,10 +10592,10 @@ public static void staticSerialize( /*TODO: migrate me*/ /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 1, ((Number) (byte) 0x00).byteValue()); // Simple Field (sceneNumber) - short sceneNumber = (short) _value.getStruct().get("sceneNumber").getShort(); + byte sceneNumber = (byte) _value.getStruct().get("sceneNumber").getByte(); /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 6, ((Number) (sceneNumber)).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte( + "", 6, ((Number) (sceneNumber)).byteValue()); } else if (EvaluationHelper.equals(datapointType, KnxDatapointType.DPT_DateTime)) { // Struct // Reserved Field /*TODO: migrate me*/ @@ -10653,33 +10616,32 @@ public static void staticSerialize( /*TODO: migrate me*/ /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 3, ((Number) (byte) 0x00).byteValue()); // Simple Field (dayofmonth) - short dayofmonth = (short) _value.getStruct().get("dayofmonth").getShort(); + byte dayofmonth = (byte) _value.getStruct().get("dayofmonth").getByte(); /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 5, ((Number) (dayofmonth)).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte( + "", 5, ((Number) (dayofmonth)).byteValue()); // Simple Field (dayofweek) byte dayofweek = (byte) _value.getStruct().get("dayofweek").getByte(); /*TODO: migrate me*/ /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 3, ((Number) (dayofweek)).byteValue()); // Simple Field (hourofday) - short hourofday = (short) _value.getStruct().get("hourofday").getShort(); + byte hourofday = (byte) _value.getStruct().get("hourofday").getByte(); /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 5, ((Number) (hourofday)).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 5, ((Number) (hourofday)).byteValue()); // Reserved Field /*TODO: migrate me*/ /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 2, ((Number) (byte) 0x00).byteValue()); // Simple Field (minutes) - short minutes = (short) _value.getStruct().get("minutes").getShort(); + byte minutes = (byte) _value.getStruct().get("minutes").getByte(); /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort("", 6, ((Number) (minutes)).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 6, ((Number) (minutes)).byteValue()); // Reserved Field /*TODO: migrate me*/ /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 2, ((Number) (byte) 0x00).byteValue()); // Simple Field (seconds) - short seconds = (short) _value.getStruct().get("seconds").getShort(); + byte seconds = (byte) _value.getStruct().get("seconds").getByte(); /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort("", 6, ((Number) (seconds)).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 6, ((Number) (seconds)).byteValue()); // Simple Field (fault) boolean fault = (boolean) _value.getStruct().get("fault").getBoolean(); /*TODO: migrate me*/ @@ -10719,8 +10681,7 @@ public static void staticSerialize( /*TODO: migrate me*/ writeBuffer.writeBit("", (boolean) (qualityOfClock)); // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 7, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 7, ((Number) (byte) 0x00).byteValue()); } else if (EvaluationHelper.equals(datapointType, KnxDatapointType.DPT_SCLOMode)) { // USINT // Reserved Field /*TODO: migrate me*/ @@ -11308,8 +11269,7 @@ public static void staticSerialize( "", 8, ((Number) (short) 0x00).shortValue()); // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 5, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 5, ((Number) (byte) 0x00).byteValue()); // Simple Field (verifyModeIsOn) boolean verifyModeIsOn = (boolean) _value.getStruct().get("verifyModeIsOn").getBoolean(); /*TODO: migrate me*/ @@ -11369,8 +11329,7 @@ public static void staticSerialize( } else if (EvaluationHelper.equals(datapointType, KnxDatapointType.DPT_ForceSignCool)) { // BOOL // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 7, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 7, ((Number) (byte) 0x00).byteValue()); // Simple Field (value) boolean value = (boolean) _value.getBoolean(); /*TODO: migrate me*/ @@ -11420,8 +11379,7 @@ public static void staticSerialize( "", 8, ((Number) (short) 0x00).shortValue()); // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 5, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 5, ((Number) (byte) 0x00).byteValue()); // Simple Field (solarloadsufficient) boolean solarloadsufficient = (boolean) _value.getStruct().get("solarloadsufficient").getBoolean(); @@ -11442,8 +11400,7 @@ public static void staticSerialize( "", 8, ((Number) (short) 0x00).shortValue()); // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 5, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 5, ((Number) (byte) 0x00).byteValue()); // Simple Field (solidstate) boolean solidstate = (boolean) _value.getStruct().get("solidstate").getBoolean(); /*TODO: migrate me*/ @@ -11459,8 +11416,7 @@ public static void staticSerialize( } else if (EvaluationHelper.equals(datapointType, KnxDatapointType.DPT_StatusRCC)) { // BOOL // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 7, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 7, ((Number) (byte) 0x00).byteValue()); // Simple Field (value) boolean value = (boolean) _value.getBoolean(); /*TODO: migrate me*/ @@ -11569,8 +11525,7 @@ public static void staticSerialize( "", 8, ((Number) (short) 0x00).shortValue()); // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 5, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 5, ((Number) (byte) 0x00).byteValue()); // Simple Field (bibatSlave) boolean bibatSlave = (boolean) _value.getStruct().get("bibatSlave").getBoolean(); /*TODO: migrate me*/ @@ -11591,8 +11546,7 @@ public static void staticSerialize( "", 8, ((Number) (short) 0x00).shortValue()); // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 5, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 5, ((Number) (byte) 0x00).byteValue()); // Simple Field (doa) boolean doa = (boolean) _value.getStruct().get("doa").getBoolean(); /*TODO: migrate me*/ @@ -11773,8 +11727,7 @@ public static void staticSerialize( "", 8, ((Number) (short) 0x00).shortValue()); // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 7, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 7, ((Number) (byte) 0x00).byteValue()); // Simple Field (calibrationMode) boolean calibrationMode = (boolean) _value.getStruct().get("calibrationMode").getBoolean(); /*TODO: migrate me*/ @@ -11821,8 +11774,7 @@ public static void staticSerialize( "", 8, ((Number) (short) 0x00).shortValue()); // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 7, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 7, ((Number) (byte) 0x00).byteValue()); // Simple Field (coolingModeEnabled) boolean coolingModeEnabled = (boolean) _value.getStruct().get("coolingModeEnabled").getBoolean(); @@ -11872,7 +11824,8 @@ public static void staticSerialize( "", 8, ((Number) (short) 0x00).shortValue()); // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedInt("", 10, ((Number) (int) 0x00).intValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( + "", 10, ((Number) (short) 0x00).shortValue()); // Simple Field (knxIp) boolean knxIp = (boolean) _value.getStruct().get("knxIp").getBoolean(); /*TODO: migrate me*/ @@ -11984,8 +11937,7 @@ public static void staticSerialize( } else if (EvaluationHelper.equals(datapointType, KnxDatapointType.DPT_OnOffAction)) { // USINT // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 6, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 6, ((Number) (byte) 0x00).byteValue()); // Simple Field (value) byte value = (byte) _value.getByte(); /*TODO: migrate me*/ @@ -11994,8 +11946,7 @@ public static void staticSerialize( datapointType, KnxDatapointType.DPT_Alarm_Reaction)) { // USINT // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 6, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 6, ((Number) (byte) 0x00).byteValue()); // Simple Field (value) byte value = (byte) _value.getByte(); /*TODO: migrate me*/ @@ -12004,8 +11955,7 @@ public static void staticSerialize( datapointType, KnxDatapointType.DPT_UpDown_Action)) { // USINT // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 6, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 6, ((Number) (byte) 0x00).byteValue()); // Simple Field (value) byte value = (byte) _value.getByte(); /*TODO: migrate me*/ @@ -12014,8 +11964,7 @@ public static void staticSerialize( datapointType, KnxDatapointType.DPT_HVAC_PB_Action)) { // USINT // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 6, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 6, ((Number) (byte) 0x00).byteValue()); // Simple Field (value) byte value = (byte) _value.getByte(); /*TODO: migrate me*/ @@ -12047,10 +11996,10 @@ public static void staticSerialize( /*TODO: migrate me*/ /*TODO: migrate me*/ writeBuffer.writeBit("", (boolean) (sceneIsInactive)); // Simple Field (scenenumber) - short scenenumber = (short) _value.getStruct().get("scenenumber").getShort(); + byte scenenumber = (byte) _value.getStruct().get("scenenumber").getByte(); /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 6, ((Number) (scenenumber)).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte( + "", 6, ((Number) (scenenumber)).byteValue()); } else if (EvaluationHelper.equals( datapointType, KnxDatapointType.DPT_CombinedInfoOnOff)) { // Struct // Reserved Field @@ -12475,20 +12424,20 @@ public static void staticSerialize( /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( "", 8, ((Number) (short) 0x00).shortValue()); // Simple Field (magicNumber) - short magicNumber = (short) _value.getStruct().get("magicNumber").getShort(); + byte magicNumber = (byte) _value.getStruct().get("magicNumber").getByte(); /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 5, ((Number) (magicNumber)).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte( + "", 5, ((Number) (magicNumber)).byteValue()); // Simple Field (versionNumber) - short versionNumber = (short) _value.getStruct().get("versionNumber").getShort(); + byte versionNumber = (byte) _value.getStruct().get("versionNumber").getByte(); /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 5, ((Number) (versionNumber)).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte( + "", 5, ((Number) (versionNumber)).byteValue()); // Simple Field (revisionNumber) - short revisionNumber = (short) _value.getStruct().get("revisionNumber").getShort(); + byte revisionNumber = (byte) _value.getStruct().get("revisionNumber").getByte(); /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 6, ((Number) (revisionNumber)).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte( + "", 6, ((Number) (revisionNumber)).byteValue()); } else if (EvaluationHelper.equals(datapointType, KnxDatapointType.DPT_AlarmInfo)) { // Struct // Reserved Field /*TODO: migrate me*/ @@ -12535,8 +12484,7 @@ public static void staticSerialize( /*TODO: migrate me*/ writeBuffer.writeBit("", (boolean) (ackSup)); // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 5, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 5, ((Number) (byte) 0x00).byteValue()); // Simple Field (locked) boolean locked = (boolean) _value.getStruct().get("locked").getBoolean(); /*TODO: migrate me*/ @@ -12719,8 +12667,7 @@ public static void staticSerialize( /*TODO: migrate me*/ writeBuffer.writeUnsignedShort("", 8, ((Number) (tariff)).shortValue()); // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 6, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 6, ((Number) (byte) 0x00).byteValue()); // Simple Field (electricalengergyvalidity) boolean electricalengergyvalidity = (boolean) _value.getStruct().get("electricalengergyvalidity").getBoolean(); @@ -12758,8 +12705,7 @@ public static void staticSerialize( "", 8, ((Number) (short) 0x00).shortValue()); // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 5, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 5, ((Number) (byte) 0x00).byteValue()); // Simple Field (convertorError) boolean convertorError = (boolean) _value.getStruct().get("convertorError").getBoolean(); /*TODO: migrate me*/ @@ -12781,11 +12727,11 @@ public static void staticSerialize( /*TODO: migrate me*/ /*TODO: migrate me*/ writeBuffer.writeBit("", (boolean) (addressIndicator)); // Simple Field (daliDeviceAddressOrDaliGroupAddress) - short daliDeviceAddressOrDaliGroupAddress = - (short) _value.getStruct().get("daliDeviceAddressOrDaliGroupAddress").getShort(); + byte daliDeviceAddressOrDaliGroupAddress = + (byte) _value.getStruct().get("daliDeviceAddressOrDaliGroupAddress").getByte(); /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 6, ((Number) (daliDeviceAddressOrDaliGroupAddress)).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte( + "", 6, ((Number) (daliDeviceAddressOrDaliGroupAddress)).byteValue()); } else if (EvaluationHelper.equals( datapointType, KnxDatapointType.DPT_DALI_Diagnostics)) { // Struct // Reserved Field @@ -12801,10 +12747,10 @@ public static void staticSerialize( /*TODO: migrate me*/ /*TODO: migrate me*/ writeBuffer.writeBit("", (boolean) (lampFailure)); // Simple Field (deviceAddress) - short deviceAddress = (short) _value.getStruct().get("deviceAddress").getShort(); + byte deviceAddress = (byte) _value.getStruct().get("deviceAddress").getByte(); /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 6, ((Number) (deviceAddress)).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte( + "", 6, ((Number) (deviceAddress)).byteValue()); } else if (EvaluationHelper.equals( datapointType, KnxDatapointType.DPT_CombinedPosition)) { // Struct // Reserved Field @@ -12823,8 +12769,7 @@ public static void staticSerialize( "", 8, ((Number) (slatsPosition)).shortValue()); // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 6, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 6, ((Number) (byte) 0x00).byteValue()); // Simple Field (validitySlatsPosition) boolean validitySlatsPosition = (boolean) _value.getStruct().get("validitySlatsPosition").getBoolean(); @@ -12959,8 +12904,7 @@ public static void staticSerialize( "", 8, ((Number) (brightness)).shortValue()); // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 6, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 6, ((Number) (byte) 0x00).byteValue()); // Simple Field (validityXy) boolean validityXy = (boolean) _value.getStruct().get("validityXy").getBoolean(); /*TODO: migrate me*/ @@ -13072,8 +13016,7 @@ public static void staticSerialize( "", 8, ((Number) (short) 0x00).shortValue()); // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 5, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 5, ((Number) (byte) 0x00).byteValue()); // Simple Field (batteryFailure) boolean batteryFailure = (boolean) _value.getStruct().get("batteryFailure").getBoolean(); /*TODO: migrate me*/ @@ -13114,8 +13057,7 @@ public static void staticSerialize( /*TODO: migrate me*/ writeBuffer.writeUnsignedShort("", 8, ((Number) (percent)).shortValue()); // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 5, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 5, ((Number) (byte) 0x00).byteValue()); // Simple Field (validityOfTheTimePeriod) boolean validityOfTheTimePeriod = (boolean) _value.getStruct().get("validityOfTheTimePeriod").getBoolean(); @@ -13165,8 +13107,7 @@ public static void staticSerialize( "", 3, ((Number) (stepCodeBrightness)).byteValue()); // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 6, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 6, ((Number) (byte) 0x00).byteValue()); // Simple Field (cctAndStepCodeColourValidity) boolean cctAndStepCodeColourValidity = (boolean) _value.getStruct().get("cctAndStepCodeColourValidity").getBoolean(); diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxGroupAddress2Level.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxGroupAddress2Level.java index 7e0171a9e8f..03052b549ed 100644 --- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxGroupAddress2Level.java +++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxGroupAddress2Level.java @@ -43,20 +43,20 @@ public Byte getNumLevels() { } // Properties. - protected final short mainGroup; - protected final int subGroup; + protected final byte mainGroup; + protected final short subGroup; - public KnxGroupAddress2Level(short mainGroup, int subGroup) { + public KnxGroupAddress2Level(byte mainGroup, short subGroup) { super(); this.mainGroup = mainGroup; this.subGroup = subGroup; } - public short getMainGroup() { + public byte getMainGroup() { return mainGroup; } - public int getSubGroup() { + public short getSubGroup() { return subGroup; } @@ -68,10 +68,10 @@ protected void serializeKnxGroupAddressChild(WriteBuffer writeBuffer) writeBuffer.pushContext("KnxGroupAddress2Level"); // Simple Field (mainGroup) - writeSimpleField("mainGroup", mainGroup, writeUnsignedShort(writeBuffer, 5)); + writeSimpleField("mainGroup", mainGroup, writeUnsignedByte(writeBuffer, 5)); // Simple Field (subGroup) - writeSimpleField("subGroup", subGroup, writeUnsignedInt(writeBuffer, 11)); + writeSimpleField("subGroup", subGroup, writeUnsignedShort(writeBuffer, 11)); writeBuffer.popContext("KnxGroupAddress2Level"); } @@ -102,9 +102,9 @@ public static KnxGroupAddressBuilder staticParseKnxGroupAddressBuilder( PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - short mainGroup = readSimpleField("mainGroup", readUnsignedShort(readBuffer, 5)); + byte mainGroup = readSimpleField("mainGroup", readUnsignedByte(readBuffer, 5)); - int subGroup = readSimpleField("subGroup", readUnsignedInt(readBuffer, 11)); + short subGroup = readSimpleField("subGroup", readUnsignedShort(readBuffer, 11)); readBuffer.closeContext("KnxGroupAddress2Level"); // Create the instance @@ -113,10 +113,10 @@ public static KnxGroupAddressBuilder staticParseKnxGroupAddressBuilder( public static class KnxGroupAddress2LevelBuilderImpl implements KnxGroupAddress.KnxGroupAddressBuilder { - private final short mainGroup; - private final int subGroup; + private final byte mainGroup; + private final short subGroup; - public KnxGroupAddress2LevelBuilderImpl(short mainGroup, int subGroup) { + public KnxGroupAddress2LevelBuilderImpl(byte mainGroup, short subGroup) { this.mainGroup = mainGroup; this.subGroup = subGroup; } diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxGroupAddress3Level.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxGroupAddress3Level.java index 662651f085f..148bf4a0324 100644 --- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxGroupAddress3Level.java +++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxGroupAddress3Level.java @@ -43,18 +43,18 @@ public Byte getNumLevels() { } // Properties. - protected final short mainGroup; + protected final byte mainGroup; protected final byte middleGroup; protected final short subGroup; - public KnxGroupAddress3Level(short mainGroup, byte middleGroup, short subGroup) { + public KnxGroupAddress3Level(byte mainGroup, byte middleGroup, short subGroup) { super(); this.mainGroup = mainGroup; this.middleGroup = middleGroup; this.subGroup = subGroup; } - public short getMainGroup() { + public byte getMainGroup() { return mainGroup; } @@ -74,7 +74,7 @@ protected void serializeKnxGroupAddressChild(WriteBuffer writeBuffer) writeBuffer.pushContext("KnxGroupAddress3Level"); // Simple Field (mainGroup) - writeSimpleField("mainGroup", mainGroup, writeUnsignedShort(writeBuffer, 5)); + writeSimpleField("mainGroup", mainGroup, writeUnsignedByte(writeBuffer, 5)); // Simple Field (middleGroup) writeSimpleField("middleGroup", middleGroup, writeUnsignedByte(writeBuffer, 3)); @@ -114,7 +114,7 @@ public static KnxGroupAddressBuilder staticParseKnxGroupAddressBuilder( PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - short mainGroup = readSimpleField("mainGroup", readUnsignedShort(readBuffer, 5)); + byte mainGroup = readSimpleField("mainGroup", readUnsignedByte(readBuffer, 5)); byte middleGroup = readSimpleField("middleGroup", readUnsignedByte(readBuffer, 3)); @@ -127,11 +127,11 @@ public static KnxGroupAddressBuilder staticParseKnxGroupAddressBuilder( public static class KnxGroupAddress3LevelBuilderImpl implements KnxGroupAddress.KnxGroupAddressBuilder { - private final short mainGroup; + private final byte mainGroup; private final byte middleGroup; private final short subGroup; - public KnxGroupAddress3LevelBuilderImpl(short mainGroup, byte middleGroup, short subGroup) { + public KnxGroupAddress3LevelBuilderImpl(byte mainGroup, byte middleGroup, short subGroup) { this.mainGroup = mainGroup; this.middleGroup = middleGroup; this.subGroup = subGroup; diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxProperty.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxProperty.java index a8dd9183383..df08633b2e6 100644 --- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxProperty.java +++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/KnxProperty.java @@ -46,9 +46,9 @@ public static PlcValue staticParse( // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 7); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 7); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -110,8 +110,8 @@ public static PlcValue staticParse( } // Simple Field (dayOfMonth) - Short dayOfMonth = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 5); + Byte dayOfMonth = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 5); // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { @@ -137,12 +137,12 @@ public static PlcValue staticParse( } // Simple Field (year) - Short year = /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readUnsignedShort("", 7); + Byte year = /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readUnsignedByte("", 7); Map _map = new HashMap<>(); - _map.put("dayOfMonth", new PlcINT(dayOfMonth)); + _map.put("dayOfMonth", new PlcSINT(dayOfMonth)); _map.put("month", new PlcSINT(month)); - _map.put("year", new PlcINT(year)); + _map.put("year", new PlcSINT(year)); return new PlcStruct(_map); } else if (EvaluationHelper.equals(propertyType, KnxPropertyDataType.PDT_TIME)) { // Struct @@ -151,7 +151,7 @@ public static PlcValue staticParse( Byte day = /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readUnsignedByte("", 3); // Simple Field (hour) - Short hour = /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readUnsignedShort("", 5); + Byte hour = /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readUnsignedByte("", 5); // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { @@ -164,7 +164,7 @@ public static PlcValue staticParse( } // Simple Field (minutes) - Short minutes = /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readUnsignedShort("", 6); + Byte minutes = /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readUnsignedByte("", 6); // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { @@ -177,13 +177,13 @@ public static PlcValue staticParse( } // Simple Field (seconds) - Short seconds = /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readUnsignedShort("", 6); + Byte seconds = /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readUnsignedByte("", 6); Map _map = new HashMap<>(); _map.put("day", new PlcSINT(day)); - _map.put("hour", new PlcINT(hour)); - _map.put("minutes", new PlcINT(minutes)); - _map.put("seconds", new PlcINT(seconds)); + _map.put("hour", new PlcSINT(hour)); + _map.put("minutes", new PlcSINT(minutes)); + _map.put("seconds", new PlcSINT(seconds)); return new PlcStruct(_map); } else if (EvaluationHelper.equals(propertyType, KnxPropertyDataType.PDT_LONG)) { // DINT @@ -324,15 +324,14 @@ public static PlcValue staticParse( } // Simple Field (dayofmonth) - Short dayofmonth = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 5); + Byte dayofmonth = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 5); // Simple Field (dayofweek) Byte dayofweek = /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readUnsignedByte("", 3); // Simple Field (hourofday) - Short hourofday = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 5); + Byte hourofday = /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readUnsignedByte("", 5); // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { @@ -345,7 +344,7 @@ public static PlcValue staticParse( } // Simple Field (minutes) - Short minutes = /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readUnsignedShort("", 6); + Byte minutes = /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readUnsignedByte("", 6); // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { @@ -358,7 +357,7 @@ public static PlcValue staticParse( } // Simple Field (seconds) - Short seconds = /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readUnsignedShort("", 6); + Byte seconds = /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readUnsignedByte("", 6); // Simple Field (fault) Boolean fault = /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readBit(""); @@ -389,9 +388,9 @@ public static PlcValue staticParse( // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 7); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 7); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -400,11 +399,11 @@ public static PlcValue staticParse( Map _map = new HashMap<>(); _map.put("year", new PlcINT(year)); _map.put("month", new PlcSINT(month)); - _map.put("dayofmonth", new PlcINT(dayofmonth)); + _map.put("dayofmonth", new PlcSINT(dayofmonth)); _map.put("dayofweek", new PlcSINT(dayofweek)); - _map.put("hourofday", new PlcINT(hourofday)); - _map.put("minutes", new PlcINT(minutes)); - _map.put("seconds", new PlcINT(seconds)); + _map.put("hourofday", new PlcSINT(hourofday)); + _map.put("minutes", new PlcSINT(minutes)); + _map.put("seconds", new PlcSINT(seconds)); _map.put("fault", new PlcBOOL(fault)); _map.put("workingDay", new PlcBOOL(workingDay)); _map.put("noWd", new PlcBOOL(noWd)); @@ -832,21 +831,21 @@ public static PlcValue staticParse( } else if (EvaluationHelper.equals(propertyType, KnxPropertyDataType.PDT_VERSION)) { // Struct // Simple Field (magicNumber) - Short magicNumber = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 5); + Byte magicNumber = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 5); // Simple Field (versionNumber) - Short versionNumber = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 5); + Byte versionNumber = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 5); // Simple Field (revisionNumber) - Short revisionNumber = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 6); + Byte revisionNumber = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 6); Map _map = new HashMap<>(); - _map.put("magicNumber", new PlcINT(magicNumber)); - _map.put("versionNumber", new PlcINT(versionNumber)); - _map.put("revisionNumber", new PlcINT(revisionNumber)); + _map.put("magicNumber", new PlcSINT(magicNumber)); + _map.put("versionNumber", new PlcSINT(versionNumber)); + _map.put("revisionNumber", new PlcSINT(revisionNumber)); return new PlcStruct(_map); } else if (EvaluationHelper.equals( @@ -892,9 +891,9 @@ public static PlcValue staticParse( // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 5); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 5); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -928,9 +927,9 @@ public static PlcValue staticParse( // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 7); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 7); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -1037,8 +1036,7 @@ public static void staticSerialize( if (EvaluationHelper.equals(propertyType, KnxPropertyDataType.PDT_CONTROL)) { // BOOL // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 7, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 7, ((Number) (byte) 0x00).byteValue()); // Simple Field (value) boolean value = (boolean) _value.getBoolean(); /*TODO: migrate me*/ @@ -1081,10 +1079,10 @@ public static void staticSerialize( /*TODO: migrate me*/ /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 3, ((Number) (byte) 0x00).byteValue()); // Simple Field (dayOfMonth) - short dayOfMonth = (short) _value.getStruct().get("dayOfMonth").getShort(); + byte dayOfMonth = (byte) _value.getStruct().get("dayOfMonth").getByte(); /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 5, ((Number) (dayOfMonth)).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte( + "", 5, ((Number) (dayOfMonth)).byteValue()); // Reserved Field /*TODO: migrate me*/ /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 4, ((Number) (byte) 0x00).byteValue()); @@ -1096,32 +1094,32 @@ public static void staticSerialize( /*TODO: migrate me*/ /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 1, ((Number) (byte) 0x00).byteValue()); // Simple Field (year) - short year = (short) _value.getStruct().get("year").getShort(); + byte year = (byte) _value.getStruct().get("year").getByte(); /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort("", 7, ((Number) (year)).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 7, ((Number) (year)).byteValue()); } else if (EvaluationHelper.equals(propertyType, KnxPropertyDataType.PDT_TIME)) { // Struct // Simple Field (day) byte day = (byte) _value.getStruct().get("day").getByte(); /*TODO: migrate me*/ /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 3, ((Number) (day)).byteValue()); // Simple Field (hour) - short hour = (short) _value.getStruct().get("hour").getShort(); + byte hour = (byte) _value.getStruct().get("hour").getByte(); /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort("", 5, ((Number) (hour)).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 5, ((Number) (hour)).byteValue()); // Reserved Field /*TODO: migrate me*/ /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 2, ((Number) (byte) 0x00).byteValue()); // Simple Field (minutes) - short minutes = (short) _value.getStruct().get("minutes").getShort(); + byte minutes = (byte) _value.getStruct().get("minutes").getByte(); /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort("", 6, ((Number) (minutes)).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 6, ((Number) (minutes)).byteValue()); // Reserved Field /*TODO: migrate me*/ /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 2, ((Number) (byte) 0x00).byteValue()); // Simple Field (seconds) - short seconds = (short) _value.getStruct().get("seconds").getShort(); + byte seconds = (byte) _value.getStruct().get("seconds").getByte(); /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort("", 6, ((Number) (seconds)).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 6, ((Number) (seconds)).byteValue()); } else if (EvaluationHelper.equals(propertyType, KnxPropertyDataType.PDT_LONG)) { // DINT // Simple Field (value) int value = (int) _value.getInt(); @@ -1197,33 +1195,32 @@ public static void staticSerialize( /*TODO: migrate me*/ /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 3, ((Number) (byte) 0x00).byteValue()); // Simple Field (dayofmonth) - short dayofmonth = (short) _value.getStruct().get("dayofmonth").getShort(); + byte dayofmonth = (byte) _value.getStruct().get("dayofmonth").getByte(); /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 5, ((Number) (dayofmonth)).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte( + "", 5, ((Number) (dayofmonth)).byteValue()); // Simple Field (dayofweek) byte dayofweek = (byte) _value.getStruct().get("dayofweek").getByte(); /*TODO: migrate me*/ /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 3, ((Number) (dayofweek)).byteValue()); // Simple Field (hourofday) - short hourofday = (short) _value.getStruct().get("hourofday").getShort(); + byte hourofday = (byte) _value.getStruct().get("hourofday").getByte(); /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 5, ((Number) (hourofday)).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 5, ((Number) (hourofday)).byteValue()); // Reserved Field /*TODO: migrate me*/ /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 2, ((Number) (byte) 0x00).byteValue()); // Simple Field (minutes) - short minutes = (short) _value.getStruct().get("minutes").getShort(); + byte minutes = (byte) _value.getStruct().get("minutes").getByte(); /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort("", 6, ((Number) (minutes)).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 6, ((Number) (minutes)).byteValue()); // Reserved Field /*TODO: migrate me*/ /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 2, ((Number) (byte) 0x00).byteValue()); // Simple Field (seconds) - short seconds = (short) _value.getStruct().get("seconds").getShort(); + byte seconds = (byte) _value.getStruct().get("seconds").getByte(); /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort("", 6, ((Number) (seconds)).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 6, ((Number) (seconds)).byteValue()); // Simple Field (fault) boolean fault = (boolean) _value.getStruct().get("fault").getBoolean(); /*TODO: migrate me*/ @@ -1263,8 +1260,7 @@ public static void staticSerialize( /*TODO: migrate me*/ writeBuffer.writeBit("", (boolean) (qualityOfClock)); // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 7, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 7, ((Number) (byte) 0x00).byteValue()); } else if (EvaluationHelper.equals(propertyType, KnxPropertyDataType.PDT_GENERIC_01)) { // List PlcList values = (PlcList) _value; @@ -1427,20 +1423,20 @@ public static void staticSerialize( } else if (EvaluationHelper.equals(propertyType, KnxPropertyDataType.PDT_VERSION)) { // Struct // Simple Field (magicNumber) - short magicNumber = (short) _value.getStruct().get("magicNumber").getShort(); + byte magicNumber = (byte) _value.getStruct().get("magicNumber").getByte(); /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 5, ((Number) (magicNumber)).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte( + "", 5, ((Number) (magicNumber)).byteValue()); // Simple Field (versionNumber) - short versionNumber = (short) _value.getStruct().get("versionNumber").getShort(); + byte versionNumber = (byte) _value.getStruct().get("versionNumber").getByte(); /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 5, ((Number) (versionNumber)).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte( + "", 5, ((Number) (versionNumber)).byteValue()); // Simple Field (revisionNumber) - short revisionNumber = (short) _value.getStruct().get("revisionNumber").getShort(); + byte revisionNumber = (byte) _value.getStruct().get("revisionNumber").getByte(); /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 6, ((Number) (revisionNumber)).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte( + "", 6, ((Number) (revisionNumber)).byteValue()); } else if (EvaluationHelper.equals( propertyType, KnxPropertyDataType.PDT_ALARM_INFO)) { // Struct // Simple Field (logNumber) @@ -1484,8 +1480,7 @@ public static void staticSerialize( /*TODO: migrate me*/ writeBuffer.writeBit("", (boolean) (ackSup)); // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 5, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 5, ((Number) (byte) 0x00).byteValue()); // Simple Field (locked) boolean locked = (boolean) _value.getStruct().get("locked").getBoolean(); /*TODO: migrate me*/ @@ -1502,8 +1497,7 @@ public static void staticSerialize( propertyType, KnxPropertyDataType.PDT_BINARY_INFORMATION)) { // BOOL // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 7, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 7, ((Number) (byte) 0x00).byteValue()); // Simple Field (value) boolean value = (boolean) _value.getBoolean(); /*TODO: migrate me*/ diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/LPollData.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/LPollData.java index 88e6ea791d6..66bba214506 100644 --- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/LPollData.java +++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/LPollData.java @@ -49,7 +49,7 @@ public Boolean getPolling() { // Properties. protected final KnxAddress sourceAddress; protected final byte[] targetAddress; - protected final short numberExpectedPollData; + protected final byte numberExpectedPollData; public LPollData( boolean frameType, @@ -59,7 +59,7 @@ public LPollData( boolean errorFlag, KnxAddress sourceAddress, byte[] targetAddress, - short numberExpectedPollData) { + byte numberExpectedPollData) { super(frameType, notRepeated, priority, acknowledgeRequested, errorFlag); this.sourceAddress = sourceAddress; this.targetAddress = targetAddress; @@ -74,7 +74,7 @@ public byte[] getTargetAddress() { return targetAddress; } - public short getNumberExpectedPollData() { + public byte getNumberExpectedPollData() { return numberExpectedPollData; } @@ -95,7 +95,7 @@ protected void serializeLDataFrameChild(WriteBuffer writeBuffer) throws Serializ // Simple Field (numberExpectedPollData) writeSimpleField( - "numberExpectedPollData", numberExpectedPollData, writeUnsignedShort(writeBuffer, 6)); + "numberExpectedPollData", numberExpectedPollData, writeUnsignedByte(writeBuffer, 6)); writeBuffer.popContext("LPollData"); } @@ -144,8 +144,8 @@ public static LDataFrameBuilder staticParseLDataFrameBuilder(ReadBuffer readBuff Byte reservedField0 = readReservedField("reserved", readUnsignedByte(readBuffer, 4), (byte) 0x00); - short numberExpectedPollData = - readSimpleField("numberExpectedPollData", readUnsignedShort(readBuffer, 6)); + byte numberExpectedPollData = + readSimpleField("numberExpectedPollData", readUnsignedByte(readBuffer, 6)); readBuffer.closeContext("LPollData"); // Create the instance @@ -155,10 +155,10 @@ public static LDataFrameBuilder staticParseLDataFrameBuilder(ReadBuffer readBuff public static class LPollDataBuilderImpl implements LDataFrame.LDataFrameBuilder { private final KnxAddress sourceAddress; private final byte[] targetAddress; - private final short numberExpectedPollData; + private final byte numberExpectedPollData; public LPollDataBuilderImpl( - KnxAddress sourceAddress, byte[] targetAddress, short numberExpectedPollData) { + KnxAddress sourceAddress, byte[] targetAddress, byte numberExpectedPollData) { this.sourceAddress = sourceAddress; this.targetAddress = targetAddress; this.numberExpectedPollData = numberExpectedPollData; diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/MPropReadCon.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/MPropReadCon.java index 648d1ac0705..25152841eca 100644 --- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/MPropReadCon.java +++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/MPropReadCon.java @@ -47,7 +47,7 @@ public Short getMessageCode() { protected final short objectInstance; protected final short propertyId; protected final byte numberOfElements; - protected final int startIndex; + protected final short startIndex; protected final int data; public MPropReadCon( @@ -55,7 +55,7 @@ public MPropReadCon( short objectInstance, short propertyId, byte numberOfElements, - int startIndex, + short startIndex, int data) { super(); this.interfaceObjectType = interfaceObjectType; @@ -82,7 +82,7 @@ public byte getNumberOfElements() { return numberOfElements; } - public int getStartIndex() { + public short getStartIndex() { return startIndex; } @@ -109,7 +109,7 @@ protected void serializeCEMIChild(WriteBuffer writeBuffer) throws SerializationE writeSimpleField("numberOfElements", numberOfElements, writeUnsignedByte(writeBuffer, 4)); // Simple Field (startIndex) - writeSimpleField("startIndex", startIndex, writeUnsignedInt(writeBuffer, 12)); + writeSimpleField("startIndex", startIndex, writeUnsignedShort(writeBuffer, 12)); // Simple Field (data) writeSimpleField("data", data, writeUnsignedInt(writeBuffer, 16)); @@ -164,7 +164,7 @@ public static CEMIBuilder staticParseCEMIBuilder(ReadBuffer readBuffer, Integer byte numberOfElements = readSimpleField("numberOfElements", readUnsignedByte(readBuffer, 4)); - int startIndex = readSimpleField("startIndex", readUnsignedInt(readBuffer, 12)); + short startIndex = readSimpleField("startIndex", readUnsignedShort(readBuffer, 12)); int data = readSimpleField("data", readUnsignedInt(readBuffer, 16)); @@ -179,7 +179,7 @@ public static class MPropReadConBuilderImpl implements CEMI.CEMIBuilder { private final short objectInstance; private final short propertyId; private final byte numberOfElements; - private final int startIndex; + private final short startIndex; private final int data; public MPropReadConBuilderImpl( @@ -187,7 +187,7 @@ public MPropReadConBuilderImpl( short objectInstance, short propertyId, byte numberOfElements, - int startIndex, + short startIndex, int data) { this.interfaceObjectType = interfaceObjectType; this.objectInstance = objectInstance; diff --git a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/MPropReadReq.java b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/MPropReadReq.java index e10cb7941de..33e4e2f769f 100644 --- a/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/MPropReadReq.java +++ b/plc4j/drivers/knxnetip/src/main/generated/org/apache/plc4x/java/knxnetip/readwrite/MPropReadReq.java @@ -47,14 +47,14 @@ public Short getMessageCode() { protected final short objectInstance; protected final short propertyId; protected final byte numberOfElements; - protected final int startIndex; + protected final short startIndex; public MPropReadReq( int interfaceObjectType, short objectInstance, short propertyId, byte numberOfElements, - int startIndex) { + short startIndex) { super(); this.interfaceObjectType = interfaceObjectType; this.objectInstance = objectInstance; @@ -79,7 +79,7 @@ public byte getNumberOfElements() { return numberOfElements; } - public int getStartIndex() { + public short getStartIndex() { return startIndex; } @@ -102,7 +102,7 @@ protected void serializeCEMIChild(WriteBuffer writeBuffer) throws SerializationE writeSimpleField("numberOfElements", numberOfElements, writeUnsignedByte(writeBuffer, 4)); // Simple Field (startIndex) - writeSimpleField("startIndex", startIndex, writeUnsignedInt(writeBuffer, 12)); + writeSimpleField("startIndex", startIndex, writeUnsignedShort(writeBuffer, 12)); writeBuffer.popContext("MPropReadReq"); } @@ -151,7 +151,7 @@ public static CEMIBuilder staticParseCEMIBuilder(ReadBuffer readBuffer, Integer byte numberOfElements = readSimpleField("numberOfElements", readUnsignedByte(readBuffer, 4)); - int startIndex = readSimpleField("startIndex", readUnsignedInt(readBuffer, 12)); + short startIndex = readSimpleField("startIndex", readUnsignedShort(readBuffer, 12)); readBuffer.closeContext("MPropReadReq"); // Create the instance @@ -164,14 +164,14 @@ public static class MPropReadReqBuilderImpl implements CEMI.CEMIBuilder { private final short objectInstance; private final short propertyId; private final byte numberOfElements; - private final int startIndex; + private final short startIndex; public MPropReadReqBuilderImpl( int interfaceObjectType, short objectInstance, short propertyId, byte numberOfElements, - int startIndex) { + short startIndex) { this.interfaceObjectType = interfaceObjectType; this.objectInstance = objectInstance; this.propertyId = propertyId; diff --git a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/DataItem.java b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/DataItem.java index 119e3703ba0..355a74d186c 100644 --- a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/DataItem.java +++ b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/DataItem.java @@ -49,8 +49,9 @@ public static PlcValue staticParse( // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - int reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readUnsignedInt("", 15); - if (reserved != (int) 0x0000) { + short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedShort("", 15); + if (reserved != (short) 0x0000) { LOGGER.info( "Expected constant value " + 0x0000 @@ -304,7 +305,7 @@ public static PlcValue staticParse( value = new LinkedList<>(); for (int curItem = 0; curItem < itemCount; curItem++) { value.add( - new PlcUINT( + new PlcUSINT( (Short) /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readUnsignedShort("", 8))); } @@ -334,7 +335,7 @@ public static PlcValue staticParse( value = new LinkedList<>(); for (int curItem = 0; curItem < itemCount; curItem++) { value.add( - new PlcUDINT( + new PlcUINT( (Integer) /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readUnsignedInt("", 16))); } @@ -364,7 +365,7 @@ public static PlcValue staticParse( value = new LinkedList<>(); for (int curItem = 0; curItem < itemCount; curItem++) { value.add( - new PlcULINT( + new PlcUDINT( (Long) /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readUnsignedLong("", 32))); } @@ -395,7 +396,7 @@ public static PlcValue staticParse( value = new LinkedList<>(); for (int curItem = 0; curItem < itemCount; curItem++) { value.add( - new PlcLINT( + new PlcULINT( (BigInteger) /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readUnsignedBigInteger("", 64))); } @@ -544,7 +545,8 @@ public static void staticSerialize( && EvaluationHelper.equals(numberOfValues, 1)) { // BOOL // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedInt("", 15, ((Number) (int) 0x0000).intValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( + "", 15, ((Number) (short) 0x0000).shortValue()); // Simple Field (value) boolean value = (boolean) _value.getBoolean(); /*TODO: migrate me*/ diff --git a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusDeviceInformationConformityLevel.java b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusDeviceInformationConformityLevel.java index 5135d132581..e1a84c1934e 100644 --- a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusDeviceInformationConformityLevel.java +++ b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusDeviceInformationConformityLevel.java @@ -24,34 +24,34 @@ // Code generated by code-generation. DO NOT EDIT. public enum ModbusDeviceInformationConformityLevel { - BASIC_STREAM_ONLY((short) 0x01), - REGULAR_STREAM_ONLY((short) 0x02), - EXTENDED_STREAM_ONLY((short) 0x03); - private static final Map map; + BASIC_STREAM_ONLY((byte) 0x01), + REGULAR_STREAM_ONLY((byte) 0x02), + EXTENDED_STREAM_ONLY((byte) 0x03); + private static final Map map; static { map = new HashMap<>(); for (ModbusDeviceInformationConformityLevel value : ModbusDeviceInformationConformityLevel.values()) { - map.put((short) value.getValue(), value); + map.put((byte) value.getValue(), value); } } - private final short value; + private final byte value; - ModbusDeviceInformationConformityLevel(short value) { + ModbusDeviceInformationConformityLevel(byte value) { this.value = value; } - public short getValue() { + public byte getValue() { return value; } - public static ModbusDeviceInformationConformityLevel enumForValue(short value) { + public static ModbusDeviceInformationConformityLevel enumForValue(byte value) { return map.get(value); } - public static Boolean isDefined(short value) { + public static Boolean isDefined(byte value) { return map.containsKey(value); } } diff --git a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDU.java b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDU.java index da89f421b43..e27b97d33a8 100644 --- a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDU.java +++ b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDU.java @@ -40,7 +40,7 @@ public abstract class ModbusPDU implements Message { // Abstract accessors for discriminator values. public abstract Boolean getErrorFlag(); - public abstract Short getFunctionFlag(); + public abstract Byte getFunctionFlag(); public abstract Boolean getResponse(); @@ -60,7 +60,7 @@ public void serialize(WriteBuffer writeBuffer) throws SerializationException { writeDiscriminatorField("errorFlag", getErrorFlag(), writeBoolean(writeBuffer)); // Discriminator Field (functionFlag) (Used as input to a switch field) - writeDiscriminatorField("functionFlag", getFunctionFlag(), writeUnsignedShort(writeBuffer, 7)); + writeDiscriminatorField("functionFlag", getFunctionFlag(), writeUnsignedByte(writeBuffer, 7)); // Switch field (Serialize the sub-type) serializeModbusPDUChild(writeBuffer); @@ -117,190 +117,190 @@ public static ModbusPDU staticParse(ReadBuffer readBuffer, Boolean response) boolean errorFlag = readDiscriminatorField("errorFlag", readBoolean(readBuffer)); - short functionFlag = readDiscriminatorField("functionFlag", readUnsignedShort(readBuffer, 7)); + byte functionFlag = readDiscriminatorField("functionFlag", readUnsignedByte(readBuffer, 7)); // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) ModbusPDUBuilder builder = null; if (EvaluationHelper.equals(errorFlag, (boolean) true)) { builder = ModbusPDUError.staticParseModbusPDUBuilder(readBuffer, response); } else if (EvaluationHelper.equals(errorFlag, (boolean) false) - && EvaluationHelper.equals(functionFlag, (short) 0x02) + && EvaluationHelper.equals(functionFlag, (byte) 0x02) && EvaluationHelper.equals(response, (boolean) false)) { builder = ModbusPDUReadDiscreteInputsRequest.staticParseModbusPDUBuilder(readBuffer, response); } else if (EvaluationHelper.equals(errorFlag, (boolean) false) - && EvaluationHelper.equals(functionFlag, (short) 0x02) + && EvaluationHelper.equals(functionFlag, (byte) 0x02) && EvaluationHelper.equals(response, (boolean) true)) { builder = ModbusPDUReadDiscreteInputsResponse.staticParseModbusPDUBuilder(readBuffer, response); } else if (EvaluationHelper.equals(errorFlag, (boolean) false) - && EvaluationHelper.equals(functionFlag, (short) 0x01) + && EvaluationHelper.equals(functionFlag, (byte) 0x01) && EvaluationHelper.equals(response, (boolean) false)) { builder = ModbusPDUReadCoilsRequest.staticParseModbusPDUBuilder(readBuffer, response); } else if (EvaluationHelper.equals(errorFlag, (boolean) false) - && EvaluationHelper.equals(functionFlag, (short) 0x01) + && EvaluationHelper.equals(functionFlag, (byte) 0x01) && EvaluationHelper.equals(response, (boolean) true)) { builder = ModbusPDUReadCoilsResponse.staticParseModbusPDUBuilder(readBuffer, response); } else if (EvaluationHelper.equals(errorFlag, (boolean) false) - && EvaluationHelper.equals(functionFlag, (short) 0x05) + && EvaluationHelper.equals(functionFlag, (byte) 0x05) && EvaluationHelper.equals(response, (boolean) false)) { builder = ModbusPDUWriteSingleCoilRequest.staticParseModbusPDUBuilder(readBuffer, response); } else if (EvaluationHelper.equals(errorFlag, (boolean) false) - && EvaluationHelper.equals(functionFlag, (short) 0x05) + && EvaluationHelper.equals(functionFlag, (byte) 0x05) && EvaluationHelper.equals(response, (boolean) true)) { builder = ModbusPDUWriteSingleCoilResponse.staticParseModbusPDUBuilder(readBuffer, response); } else if (EvaluationHelper.equals(errorFlag, (boolean) false) - && EvaluationHelper.equals(functionFlag, (short) 0x0F) + && EvaluationHelper.equals(functionFlag, (byte) 0x0F) && EvaluationHelper.equals(response, (boolean) false)) { builder = ModbusPDUWriteMultipleCoilsRequest.staticParseModbusPDUBuilder(readBuffer, response); } else if (EvaluationHelper.equals(errorFlag, (boolean) false) - && EvaluationHelper.equals(functionFlag, (short) 0x0F) + && EvaluationHelper.equals(functionFlag, (byte) 0x0F) && EvaluationHelper.equals(response, (boolean) true)) { builder = ModbusPDUWriteMultipleCoilsResponse.staticParseModbusPDUBuilder(readBuffer, response); } else if (EvaluationHelper.equals(errorFlag, (boolean) false) - && EvaluationHelper.equals(functionFlag, (short) 0x04) + && EvaluationHelper.equals(functionFlag, (byte) 0x04) && EvaluationHelper.equals(response, (boolean) false)) { builder = ModbusPDUReadInputRegistersRequest.staticParseModbusPDUBuilder(readBuffer, response); } else if (EvaluationHelper.equals(errorFlag, (boolean) false) - && EvaluationHelper.equals(functionFlag, (short) 0x04) + && EvaluationHelper.equals(functionFlag, (byte) 0x04) && EvaluationHelper.equals(response, (boolean) true)) { builder = ModbusPDUReadInputRegistersResponse.staticParseModbusPDUBuilder(readBuffer, response); } else if (EvaluationHelper.equals(errorFlag, (boolean) false) - && EvaluationHelper.equals(functionFlag, (short) 0x03) + && EvaluationHelper.equals(functionFlag, (byte) 0x03) && EvaluationHelper.equals(response, (boolean) false)) { builder = ModbusPDUReadHoldingRegistersRequest.staticParseModbusPDUBuilder(readBuffer, response); } else if (EvaluationHelper.equals(errorFlag, (boolean) false) - && EvaluationHelper.equals(functionFlag, (short) 0x03) + && EvaluationHelper.equals(functionFlag, (byte) 0x03) && EvaluationHelper.equals(response, (boolean) true)) { builder = ModbusPDUReadHoldingRegistersResponse.staticParseModbusPDUBuilder(readBuffer, response); } else if (EvaluationHelper.equals(errorFlag, (boolean) false) - && EvaluationHelper.equals(functionFlag, (short) 0x06) + && EvaluationHelper.equals(functionFlag, (byte) 0x06) && EvaluationHelper.equals(response, (boolean) false)) { builder = ModbusPDUWriteSingleRegisterRequest.staticParseModbusPDUBuilder(readBuffer, response); } else if (EvaluationHelper.equals(errorFlag, (boolean) false) - && EvaluationHelper.equals(functionFlag, (short) 0x06) + && EvaluationHelper.equals(functionFlag, (byte) 0x06) && EvaluationHelper.equals(response, (boolean) true)) { builder = ModbusPDUWriteSingleRegisterResponse.staticParseModbusPDUBuilder(readBuffer, response); } else if (EvaluationHelper.equals(errorFlag, (boolean) false) - && EvaluationHelper.equals(functionFlag, (short) 0x10) + && EvaluationHelper.equals(functionFlag, (byte) 0x10) && EvaluationHelper.equals(response, (boolean) false)) { builder = ModbusPDUWriteMultipleHoldingRegistersRequest.staticParseModbusPDUBuilder( readBuffer, response); } else if (EvaluationHelper.equals(errorFlag, (boolean) false) - && EvaluationHelper.equals(functionFlag, (short) 0x10) + && EvaluationHelper.equals(functionFlag, (byte) 0x10) && EvaluationHelper.equals(response, (boolean) true)) { builder = ModbusPDUWriteMultipleHoldingRegistersResponse.staticParseModbusPDUBuilder( readBuffer, response); } else if (EvaluationHelper.equals(errorFlag, (boolean) false) - && EvaluationHelper.equals(functionFlag, (short) 0x17) + && EvaluationHelper.equals(functionFlag, (byte) 0x17) && EvaluationHelper.equals(response, (boolean) false)) { builder = ModbusPDUReadWriteMultipleHoldingRegistersRequest.staticParseModbusPDUBuilder( readBuffer, response); } else if (EvaluationHelper.equals(errorFlag, (boolean) false) - && EvaluationHelper.equals(functionFlag, (short) 0x17) + && EvaluationHelper.equals(functionFlag, (byte) 0x17) && EvaluationHelper.equals(response, (boolean) true)) { builder = ModbusPDUReadWriteMultipleHoldingRegistersResponse.staticParseModbusPDUBuilder( readBuffer, response); } else if (EvaluationHelper.equals(errorFlag, (boolean) false) - && EvaluationHelper.equals(functionFlag, (short) 0x16) + && EvaluationHelper.equals(functionFlag, (byte) 0x16) && EvaluationHelper.equals(response, (boolean) false)) { builder = ModbusPDUMaskWriteHoldingRegisterRequest.staticParseModbusPDUBuilder( readBuffer, response); } else if (EvaluationHelper.equals(errorFlag, (boolean) false) - && EvaluationHelper.equals(functionFlag, (short) 0x16) + && EvaluationHelper.equals(functionFlag, (byte) 0x16) && EvaluationHelper.equals(response, (boolean) true)) { builder = ModbusPDUMaskWriteHoldingRegisterResponse.staticParseModbusPDUBuilder( readBuffer, response); } else if (EvaluationHelper.equals(errorFlag, (boolean) false) - && EvaluationHelper.equals(functionFlag, (short) 0x18) + && EvaluationHelper.equals(functionFlag, (byte) 0x18) && EvaluationHelper.equals(response, (boolean) false)) { builder = ModbusPDUReadFifoQueueRequest.staticParseModbusPDUBuilder(readBuffer, response); } else if (EvaluationHelper.equals(errorFlag, (boolean) false) - && EvaluationHelper.equals(functionFlag, (short) 0x18) + && EvaluationHelper.equals(functionFlag, (byte) 0x18) && EvaluationHelper.equals(response, (boolean) true)) { builder = ModbusPDUReadFifoQueueResponse.staticParseModbusPDUBuilder(readBuffer, response); } else if (EvaluationHelper.equals(errorFlag, (boolean) false) - && EvaluationHelper.equals(functionFlag, (short) 0x14) + && EvaluationHelper.equals(functionFlag, (byte) 0x14) && EvaluationHelper.equals(response, (boolean) false)) { builder = ModbusPDUReadFileRecordRequest.staticParseModbusPDUBuilder(readBuffer, response); } else if (EvaluationHelper.equals(errorFlag, (boolean) false) - && EvaluationHelper.equals(functionFlag, (short) 0x14) + && EvaluationHelper.equals(functionFlag, (byte) 0x14) && EvaluationHelper.equals(response, (boolean) true)) { builder = ModbusPDUReadFileRecordResponse.staticParseModbusPDUBuilder(readBuffer, response); } else if (EvaluationHelper.equals(errorFlag, (boolean) false) - && EvaluationHelper.equals(functionFlag, (short) 0x15) + && EvaluationHelper.equals(functionFlag, (byte) 0x15) && EvaluationHelper.equals(response, (boolean) false)) { builder = ModbusPDUWriteFileRecordRequest.staticParseModbusPDUBuilder(readBuffer, response); } else if (EvaluationHelper.equals(errorFlag, (boolean) false) - && EvaluationHelper.equals(functionFlag, (short) 0x15) + && EvaluationHelper.equals(functionFlag, (byte) 0x15) && EvaluationHelper.equals(response, (boolean) true)) { builder = ModbusPDUWriteFileRecordResponse.staticParseModbusPDUBuilder(readBuffer, response); } else if (EvaluationHelper.equals(errorFlag, (boolean) false) - && EvaluationHelper.equals(functionFlag, (short) 0x07) + && EvaluationHelper.equals(functionFlag, (byte) 0x07) && EvaluationHelper.equals(response, (boolean) false)) { builder = ModbusPDUReadExceptionStatusRequest.staticParseModbusPDUBuilder(readBuffer, response); } else if (EvaluationHelper.equals(errorFlag, (boolean) false) - && EvaluationHelper.equals(functionFlag, (short) 0x07) + && EvaluationHelper.equals(functionFlag, (byte) 0x07) && EvaluationHelper.equals(response, (boolean) true)) { builder = ModbusPDUReadExceptionStatusResponse.staticParseModbusPDUBuilder(readBuffer, response); } else if (EvaluationHelper.equals(errorFlag, (boolean) false) - && EvaluationHelper.equals(functionFlag, (short) 0x08) + && EvaluationHelper.equals(functionFlag, (byte) 0x08) && EvaluationHelper.equals(response, (boolean) false)) { builder = ModbusPDUDiagnosticRequest.staticParseModbusPDUBuilder(readBuffer, response); } else if (EvaluationHelper.equals(errorFlag, (boolean) false) - && EvaluationHelper.equals(functionFlag, (short) 0x08) + && EvaluationHelper.equals(functionFlag, (byte) 0x08) && EvaluationHelper.equals(response, (boolean) true)) { builder = ModbusPDUDiagnosticResponse.staticParseModbusPDUBuilder(readBuffer, response); } else if (EvaluationHelper.equals(errorFlag, (boolean) false) - && EvaluationHelper.equals(functionFlag, (short) 0x0B) + && EvaluationHelper.equals(functionFlag, (byte) 0x0B) && EvaluationHelper.equals(response, (boolean) false)) { builder = ModbusPDUGetComEventCounterRequest.staticParseModbusPDUBuilder(readBuffer, response); } else if (EvaluationHelper.equals(errorFlag, (boolean) false) - && EvaluationHelper.equals(functionFlag, (short) 0x0B) + && EvaluationHelper.equals(functionFlag, (byte) 0x0B) && EvaluationHelper.equals(response, (boolean) true)) { builder = ModbusPDUGetComEventCounterResponse.staticParseModbusPDUBuilder(readBuffer, response); } else if (EvaluationHelper.equals(errorFlag, (boolean) false) - && EvaluationHelper.equals(functionFlag, (short) 0x0C) + && EvaluationHelper.equals(functionFlag, (byte) 0x0C) && EvaluationHelper.equals(response, (boolean) false)) { builder = ModbusPDUGetComEventLogRequest.staticParseModbusPDUBuilder(readBuffer, response); } else if (EvaluationHelper.equals(errorFlag, (boolean) false) - && EvaluationHelper.equals(functionFlag, (short) 0x0C) + && EvaluationHelper.equals(functionFlag, (byte) 0x0C) && EvaluationHelper.equals(response, (boolean) true)) { builder = ModbusPDUGetComEventLogResponse.staticParseModbusPDUBuilder(readBuffer, response); } else if (EvaluationHelper.equals(errorFlag, (boolean) false) - && EvaluationHelper.equals(functionFlag, (short) 0x11) + && EvaluationHelper.equals(functionFlag, (byte) 0x11) && EvaluationHelper.equals(response, (boolean) false)) { builder = ModbusPDUReportServerIdRequest.staticParseModbusPDUBuilder(readBuffer, response); } else if (EvaluationHelper.equals(errorFlag, (boolean) false) - && EvaluationHelper.equals(functionFlag, (short) 0x11) + && EvaluationHelper.equals(functionFlag, (byte) 0x11) && EvaluationHelper.equals(response, (boolean) true)) { builder = ModbusPDUReportServerIdResponse.staticParseModbusPDUBuilder(readBuffer, response); } else if (EvaluationHelper.equals(errorFlag, (boolean) false) - && EvaluationHelper.equals(functionFlag, (short) 0x2B) + && EvaluationHelper.equals(functionFlag, (byte) 0x2B) && EvaluationHelper.equals(response, (boolean) false)) { builder = ModbusPDUReadDeviceIdentificationRequest.staticParseModbusPDUBuilder( readBuffer, response); } else if (EvaluationHelper.equals(errorFlag, (boolean) false) - && EvaluationHelper.equals(functionFlag, (short) 0x2B) + && EvaluationHelper.equals(functionFlag, (byte) 0x2B) && EvaluationHelper.equals(response, (boolean) true)) { builder = ModbusPDUReadDeviceIdentificationResponse.staticParseModbusPDUBuilder( diff --git a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUDiagnosticRequest.java b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUDiagnosticRequest.java index 1bf6dd5445a..d40ec44b1a6 100644 --- a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUDiagnosticRequest.java +++ b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUDiagnosticRequest.java @@ -42,8 +42,8 @@ public Boolean getErrorFlag() { return (boolean) false; } - public Short getFunctionFlag() { - return (short) 0x08; + public Byte getFunctionFlag() { + return (byte) 0x08; } public Boolean getResponse() { diff --git a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUDiagnosticResponse.java b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUDiagnosticResponse.java index d8ce0d877c1..8fc31c50fc5 100644 --- a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUDiagnosticResponse.java +++ b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUDiagnosticResponse.java @@ -42,8 +42,8 @@ public Boolean getErrorFlag() { return (boolean) false; } - public Short getFunctionFlag() { - return (short) 0x08; + public Byte getFunctionFlag() { + return (byte) 0x08; } public Boolean getResponse() { diff --git a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUError.java b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUError.java index 4d0437b708d..ce365d77abc 100644 --- a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUError.java +++ b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUError.java @@ -42,7 +42,7 @@ public Boolean getErrorFlag() { return (boolean) true; } - public Short getFunctionFlag() { + public Byte getFunctionFlag() { return 0; } diff --git a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUGetComEventCounterRequest.java b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUGetComEventCounterRequest.java index 1705c1a9d4e..f0ba399b809 100644 --- a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUGetComEventCounterRequest.java +++ b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUGetComEventCounterRequest.java @@ -42,8 +42,8 @@ public Boolean getErrorFlag() { return (boolean) false; } - public Short getFunctionFlag() { - return (short) 0x0B; + public Byte getFunctionFlag() { + return (byte) 0x0B; } public Boolean getResponse() { diff --git a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUGetComEventCounterResponse.java b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUGetComEventCounterResponse.java index 342d993ab14..5d073a6e1ac 100644 --- a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUGetComEventCounterResponse.java +++ b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUGetComEventCounterResponse.java @@ -42,8 +42,8 @@ public Boolean getErrorFlag() { return (boolean) false; } - public Short getFunctionFlag() { - return (short) 0x0B; + public Byte getFunctionFlag() { + return (byte) 0x0B; } public Boolean getResponse() { diff --git a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUGetComEventLogRequest.java b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUGetComEventLogRequest.java index 4990ce028cc..424389e8086 100644 --- a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUGetComEventLogRequest.java +++ b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUGetComEventLogRequest.java @@ -42,8 +42,8 @@ public Boolean getErrorFlag() { return (boolean) false; } - public Short getFunctionFlag() { - return (short) 0x0C; + public Byte getFunctionFlag() { + return (byte) 0x0C; } public Boolean getResponse() { diff --git a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUGetComEventLogResponse.java b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUGetComEventLogResponse.java index 11de40e147e..0dda2fabd26 100644 --- a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUGetComEventLogResponse.java +++ b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUGetComEventLogResponse.java @@ -42,8 +42,8 @@ public Boolean getErrorFlag() { return (boolean) false; } - public Short getFunctionFlag() { - return (short) 0x0C; + public Byte getFunctionFlag() { + return (byte) 0x0C; } public Boolean getResponse() { diff --git a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUMaskWriteHoldingRegisterRequest.java b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUMaskWriteHoldingRegisterRequest.java index c1f658c99a1..f789b8b0042 100644 --- a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUMaskWriteHoldingRegisterRequest.java +++ b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUMaskWriteHoldingRegisterRequest.java @@ -42,8 +42,8 @@ public Boolean getErrorFlag() { return (boolean) false; } - public Short getFunctionFlag() { - return (short) 0x16; + public Byte getFunctionFlag() { + return (byte) 0x16; } public Boolean getResponse() { diff --git a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUMaskWriteHoldingRegisterResponse.java b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUMaskWriteHoldingRegisterResponse.java index 2dc8cf1793b..4e460f341c3 100644 --- a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUMaskWriteHoldingRegisterResponse.java +++ b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUMaskWriteHoldingRegisterResponse.java @@ -42,8 +42,8 @@ public Boolean getErrorFlag() { return (boolean) false; } - public Short getFunctionFlag() { - return (short) 0x16; + public Byte getFunctionFlag() { + return (byte) 0x16; } public Boolean getResponse() { diff --git a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadCoilsRequest.java b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadCoilsRequest.java index 09f8af917e4..272b06fbb87 100644 --- a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadCoilsRequest.java +++ b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadCoilsRequest.java @@ -42,8 +42,8 @@ public Boolean getErrorFlag() { return (boolean) false; } - public Short getFunctionFlag() { - return (short) 0x01; + public Byte getFunctionFlag() { + return (byte) 0x01; } public Boolean getResponse() { diff --git a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadCoilsResponse.java b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadCoilsResponse.java index f5a3838b5d8..2f512a26b1b 100644 --- a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadCoilsResponse.java +++ b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadCoilsResponse.java @@ -42,8 +42,8 @@ public Boolean getErrorFlag() { return (boolean) false; } - public Short getFunctionFlag() { - return (short) 0x01; + public Byte getFunctionFlag() { + return (byte) 0x01; } public Boolean getResponse() { diff --git a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadDeviceIdentificationRequest.java b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadDeviceIdentificationRequest.java index 761a9db69ff..2d06b223f27 100644 --- a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadDeviceIdentificationRequest.java +++ b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadDeviceIdentificationRequest.java @@ -42,8 +42,8 @@ public Boolean getErrorFlag() { return (boolean) false; } - public Short getFunctionFlag() { - return (short) 0x2B; + public Byte getFunctionFlag() { + return (byte) 0x2B; } public Boolean getResponse() { diff --git a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadDeviceIdentificationResponse.java b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadDeviceIdentificationResponse.java index 6dcbe514ec2..b8aa4139518 100644 --- a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadDeviceIdentificationResponse.java +++ b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadDeviceIdentificationResponse.java @@ -42,8 +42,8 @@ public Boolean getErrorFlag() { return (boolean) false; } - public Short getFunctionFlag() { - return (short) 0x2B; + public Byte getFunctionFlag() { + return (byte) 0x2B; } public Boolean getResponse() { @@ -135,7 +135,7 @@ protected void serializeModbusPDUChild(WriteBuffer writeBuffer) throws Serializa new DataWriterEnumDefault<>( ModbusDeviceInformationConformityLevel::getValue, ModbusDeviceInformationConformityLevel::name, - writeUnsignedShort(writeBuffer, 7))); + writeUnsignedByte(writeBuffer, 7))); // Simple Field (moreFollows) writeSimpleEnumField( @@ -232,7 +232,7 @@ public static ModbusPDUBuilder staticParseModbusPDUBuilder( "ModbusDeviceInformationConformityLevel", new DataReaderEnumDefault<>( ModbusDeviceInformationConformityLevel::enumForValue, - readUnsignedShort(readBuffer, 7))); + readUnsignedByte(readBuffer, 7))); ModbusDeviceInformationMoreFollows moreFollows = readEnumField( diff --git a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadDiscreteInputsRequest.java b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadDiscreteInputsRequest.java index f6d04d40051..65e4c6748e0 100644 --- a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadDiscreteInputsRequest.java +++ b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadDiscreteInputsRequest.java @@ -42,8 +42,8 @@ public Boolean getErrorFlag() { return (boolean) false; } - public Short getFunctionFlag() { - return (short) 0x02; + public Byte getFunctionFlag() { + return (byte) 0x02; } public Boolean getResponse() { diff --git a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadDiscreteInputsResponse.java b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadDiscreteInputsResponse.java index 52cf0a6cc6d..326f3a38a37 100644 --- a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadDiscreteInputsResponse.java +++ b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadDiscreteInputsResponse.java @@ -42,8 +42,8 @@ public Boolean getErrorFlag() { return (boolean) false; } - public Short getFunctionFlag() { - return (short) 0x02; + public Byte getFunctionFlag() { + return (byte) 0x02; } public Boolean getResponse() { diff --git a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadExceptionStatusRequest.java b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadExceptionStatusRequest.java index b8800ce1a08..1cf4a8384f8 100644 --- a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadExceptionStatusRequest.java +++ b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadExceptionStatusRequest.java @@ -42,8 +42,8 @@ public Boolean getErrorFlag() { return (boolean) false; } - public Short getFunctionFlag() { - return (short) 0x07; + public Byte getFunctionFlag() { + return (byte) 0x07; } public Boolean getResponse() { diff --git a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadExceptionStatusResponse.java b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadExceptionStatusResponse.java index fd41c705dd1..7e4d4efb1d1 100644 --- a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadExceptionStatusResponse.java +++ b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadExceptionStatusResponse.java @@ -42,8 +42,8 @@ public Boolean getErrorFlag() { return (boolean) false; } - public Short getFunctionFlag() { - return (short) 0x07; + public Byte getFunctionFlag() { + return (byte) 0x07; } public Boolean getResponse() { diff --git a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadFifoQueueRequest.java b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadFifoQueueRequest.java index 6d7266d3b58..c285e830f44 100644 --- a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadFifoQueueRequest.java +++ b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadFifoQueueRequest.java @@ -42,8 +42,8 @@ public Boolean getErrorFlag() { return (boolean) false; } - public Short getFunctionFlag() { - return (short) 0x18; + public Byte getFunctionFlag() { + return (byte) 0x18; } public Boolean getResponse() { diff --git a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadFifoQueueResponse.java b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadFifoQueueResponse.java index aedc33c773d..ff873ac190e 100644 --- a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadFifoQueueResponse.java +++ b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadFifoQueueResponse.java @@ -42,8 +42,8 @@ public Boolean getErrorFlag() { return (boolean) false; } - public Short getFunctionFlag() { - return (short) 0x18; + public Byte getFunctionFlag() { + return (byte) 0x18; } public Boolean getResponse() { diff --git a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadFileRecordRequest.java b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadFileRecordRequest.java index c9c1f8a6ea0..a7be03b7aa8 100644 --- a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadFileRecordRequest.java +++ b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadFileRecordRequest.java @@ -42,8 +42,8 @@ public Boolean getErrorFlag() { return (boolean) false; } - public Short getFunctionFlag() { - return (short) 0x14; + public Byte getFunctionFlag() { + return (byte) 0x14; } public Boolean getResponse() { diff --git a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadFileRecordResponse.java b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadFileRecordResponse.java index 4e0fdda67a3..2243f009b00 100644 --- a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadFileRecordResponse.java +++ b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadFileRecordResponse.java @@ -42,8 +42,8 @@ public Boolean getErrorFlag() { return (boolean) false; } - public Short getFunctionFlag() { - return (short) 0x14; + public Byte getFunctionFlag() { + return (byte) 0x14; } public Boolean getResponse() { diff --git a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadHoldingRegistersRequest.java b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadHoldingRegistersRequest.java index b8a9a37c3eb..8d764b53aa6 100644 --- a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadHoldingRegistersRequest.java +++ b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadHoldingRegistersRequest.java @@ -42,8 +42,8 @@ public Boolean getErrorFlag() { return (boolean) false; } - public Short getFunctionFlag() { - return (short) 0x03; + public Byte getFunctionFlag() { + return (byte) 0x03; } public Boolean getResponse() { diff --git a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadHoldingRegistersResponse.java b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadHoldingRegistersResponse.java index d2da65a1293..afb8e6ebe18 100644 --- a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadHoldingRegistersResponse.java +++ b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadHoldingRegistersResponse.java @@ -42,8 +42,8 @@ public Boolean getErrorFlag() { return (boolean) false; } - public Short getFunctionFlag() { - return (short) 0x03; + public Byte getFunctionFlag() { + return (byte) 0x03; } public Boolean getResponse() { diff --git a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadInputRegistersRequest.java b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadInputRegistersRequest.java index 880347d744b..9b03519b55f 100644 --- a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadInputRegistersRequest.java +++ b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadInputRegistersRequest.java @@ -42,8 +42,8 @@ public Boolean getErrorFlag() { return (boolean) false; } - public Short getFunctionFlag() { - return (short) 0x04; + public Byte getFunctionFlag() { + return (byte) 0x04; } public Boolean getResponse() { diff --git a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadInputRegistersResponse.java b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadInputRegistersResponse.java index f163d714b0b..b6a41dff014 100644 --- a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadInputRegistersResponse.java +++ b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadInputRegistersResponse.java @@ -42,8 +42,8 @@ public Boolean getErrorFlag() { return (boolean) false; } - public Short getFunctionFlag() { - return (short) 0x04; + public Byte getFunctionFlag() { + return (byte) 0x04; } public Boolean getResponse() { diff --git a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadWriteMultipleHoldingRegistersRequest.java b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadWriteMultipleHoldingRegistersRequest.java index 0d72edd8b7b..a464ca82c76 100644 --- a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadWriteMultipleHoldingRegistersRequest.java +++ b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadWriteMultipleHoldingRegistersRequest.java @@ -43,8 +43,8 @@ public Boolean getErrorFlag() { return (boolean) false; } - public Short getFunctionFlag() { - return (short) 0x17; + public Byte getFunctionFlag() { + return (byte) 0x17; } public Boolean getResponse() { diff --git a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadWriteMultipleHoldingRegistersResponse.java b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadWriteMultipleHoldingRegistersResponse.java index 5ad4724de0e..ef112dcb667 100644 --- a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadWriteMultipleHoldingRegistersResponse.java +++ b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReadWriteMultipleHoldingRegistersResponse.java @@ -43,8 +43,8 @@ public Boolean getErrorFlag() { return (boolean) false; } - public Short getFunctionFlag() { - return (short) 0x17; + public Byte getFunctionFlag() { + return (byte) 0x17; } public Boolean getResponse() { diff --git a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReportServerIdRequest.java b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReportServerIdRequest.java index 396c8ae2dc5..fd1d5f88b2a 100644 --- a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReportServerIdRequest.java +++ b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReportServerIdRequest.java @@ -42,8 +42,8 @@ public Boolean getErrorFlag() { return (boolean) false; } - public Short getFunctionFlag() { - return (short) 0x11; + public Byte getFunctionFlag() { + return (byte) 0x11; } public Boolean getResponse() { diff --git a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReportServerIdResponse.java b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReportServerIdResponse.java index 75394c0ed79..a32c019baf2 100644 --- a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReportServerIdResponse.java +++ b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUReportServerIdResponse.java @@ -42,8 +42,8 @@ public Boolean getErrorFlag() { return (boolean) false; } - public Short getFunctionFlag() { - return (short) 0x11; + public Byte getFunctionFlag() { + return (byte) 0x11; } public Boolean getResponse() { diff --git a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUWriteFileRecordRequest.java b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUWriteFileRecordRequest.java index aa356e6917e..8621a003d8c 100644 --- a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUWriteFileRecordRequest.java +++ b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUWriteFileRecordRequest.java @@ -42,8 +42,8 @@ public Boolean getErrorFlag() { return (boolean) false; } - public Short getFunctionFlag() { - return (short) 0x15; + public Byte getFunctionFlag() { + return (byte) 0x15; } public Boolean getResponse() { diff --git a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUWriteFileRecordResponse.java b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUWriteFileRecordResponse.java index a2c6c04c8f0..9f005480d6a 100644 --- a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUWriteFileRecordResponse.java +++ b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUWriteFileRecordResponse.java @@ -42,8 +42,8 @@ public Boolean getErrorFlag() { return (boolean) false; } - public Short getFunctionFlag() { - return (short) 0x15; + public Byte getFunctionFlag() { + return (byte) 0x15; } public Boolean getResponse() { diff --git a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUWriteMultipleCoilsRequest.java b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUWriteMultipleCoilsRequest.java index c46ae0f6c1e..83e180e0d9a 100644 --- a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUWriteMultipleCoilsRequest.java +++ b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUWriteMultipleCoilsRequest.java @@ -42,8 +42,8 @@ public Boolean getErrorFlag() { return (boolean) false; } - public Short getFunctionFlag() { - return (short) 0x0F; + public Byte getFunctionFlag() { + return (byte) 0x0F; } public Boolean getResponse() { diff --git a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUWriteMultipleCoilsResponse.java b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUWriteMultipleCoilsResponse.java index 3729078324a..6f442f3ac97 100644 --- a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUWriteMultipleCoilsResponse.java +++ b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUWriteMultipleCoilsResponse.java @@ -42,8 +42,8 @@ public Boolean getErrorFlag() { return (boolean) false; } - public Short getFunctionFlag() { - return (short) 0x0F; + public Byte getFunctionFlag() { + return (byte) 0x0F; } public Boolean getResponse() { diff --git a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUWriteMultipleHoldingRegistersRequest.java b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUWriteMultipleHoldingRegistersRequest.java index 22157d938bc..d8482b32805 100644 --- a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUWriteMultipleHoldingRegistersRequest.java +++ b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUWriteMultipleHoldingRegistersRequest.java @@ -42,8 +42,8 @@ public Boolean getErrorFlag() { return (boolean) false; } - public Short getFunctionFlag() { - return (short) 0x10; + public Byte getFunctionFlag() { + return (byte) 0x10; } public Boolean getResponse() { diff --git a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUWriteMultipleHoldingRegistersResponse.java b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUWriteMultipleHoldingRegistersResponse.java index 3cfa4d8c906..52f88ec8c03 100644 --- a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUWriteMultipleHoldingRegistersResponse.java +++ b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUWriteMultipleHoldingRegistersResponse.java @@ -42,8 +42,8 @@ public Boolean getErrorFlag() { return (boolean) false; } - public Short getFunctionFlag() { - return (short) 0x10; + public Byte getFunctionFlag() { + return (byte) 0x10; } public Boolean getResponse() { diff --git a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUWriteSingleCoilRequest.java b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUWriteSingleCoilRequest.java index 79c76f14052..67ee1b2e832 100644 --- a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUWriteSingleCoilRequest.java +++ b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUWriteSingleCoilRequest.java @@ -42,8 +42,8 @@ public Boolean getErrorFlag() { return (boolean) false; } - public Short getFunctionFlag() { - return (short) 0x05; + public Byte getFunctionFlag() { + return (byte) 0x05; } public Boolean getResponse() { diff --git a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUWriteSingleCoilResponse.java b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUWriteSingleCoilResponse.java index 7229a384a0b..bb9f369d39e 100644 --- a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUWriteSingleCoilResponse.java +++ b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUWriteSingleCoilResponse.java @@ -42,8 +42,8 @@ public Boolean getErrorFlag() { return (boolean) false; } - public Short getFunctionFlag() { - return (short) 0x05; + public Byte getFunctionFlag() { + return (byte) 0x05; } public Boolean getResponse() { diff --git a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUWriteSingleRegisterRequest.java b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUWriteSingleRegisterRequest.java index cc3bf793680..5a6b8bbdabb 100644 --- a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUWriteSingleRegisterRequest.java +++ b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUWriteSingleRegisterRequest.java @@ -42,8 +42,8 @@ public Boolean getErrorFlag() { return (boolean) false; } - public Short getFunctionFlag() { - return (short) 0x06; + public Byte getFunctionFlag() { + return (byte) 0x06; } public Boolean getResponse() { diff --git a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUWriteSingleRegisterResponse.java b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUWriteSingleRegisterResponse.java index a8eb30f1573..5466bfbc768 100644 --- a/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUWriteSingleRegisterResponse.java +++ b/plc4j/drivers/modbus/src/main/generated/org/apache/plc4x/java/modbus/readwrite/ModbusPDUWriteSingleRegisterResponse.java @@ -42,8 +42,8 @@ public Boolean getErrorFlag() { return (boolean) false; } - public Short getFunctionFlag() { - return (short) 0x06; + public Byte getFunctionFlag() { + return (byte) 0x06; } public Boolean getResponse() { diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AddReferencesItem.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AddReferencesItem.java index d6cae3c139a..680751ab9a6 100644 --- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AddReferencesItem.java +++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AddReferencesItem.java @@ -105,7 +105,7 @@ protected void serializeExtensionObjectDefinitionChild(WriteBuffer writeBuffer) "referenceTypeId", referenceTypeId, new DataWriterComplexDefault<>(writeBuffer)); // Reserved Field (reserved) - writeReservedField("reserved", (short) 0x00, writeUnsignedShort(writeBuffer, 7)); + writeReservedField("reserved", (byte) 0x00, writeUnsignedByte(writeBuffer, 7)); // Simple Field (isForward) writeSimpleField("isForward", isForward, writeBoolean(writeBuffer)); @@ -179,8 +179,8 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit "referenceTypeId", new DataReaderComplexDefault<>(() -> NodeId.staticParse(readBuffer), readBuffer)); - Short reservedField0 = - readReservedField("reserved", readUnsignedShort(readBuffer, 7), (short) 0x00); + Byte reservedField0 = + readReservedField("reserved", readUnsignedByte(readBuffer, 7), (byte) 0x00); boolean isForward = readSimpleField("isForward", readBoolean(readBuffer)); diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AggregateConfiguration.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AggregateConfiguration.java index 6a73b1cdee8..c3c865b96d8 100644 --- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AggregateConfiguration.java +++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/AggregateConfiguration.java @@ -91,7 +91,7 @@ protected void serializeExtensionObjectDefinitionChild(WriteBuffer writeBuffer) writeBuffer.pushContext("AggregateConfiguration"); // Reserved Field (reserved) - writeReservedField("reserved", (short) 0x00, writeUnsignedShort(writeBuffer, 6)); + writeReservedField("reserved", (byte) 0x00, writeUnsignedByte(writeBuffer, 6)); // Simple Field (treatUncertainAsBad) writeSimpleField("treatUncertainAsBad", treatUncertainAsBad, writeBoolean(writeBuffer)); @@ -107,7 +107,7 @@ protected void serializeExtensionObjectDefinitionChild(WriteBuffer writeBuffer) writeSimpleField("percentDataGood", percentDataGood, writeUnsignedShort(writeBuffer, 8)); // Reserved Field (reserved) - writeReservedField("reserved", (short) 0x00, writeUnsignedShort(writeBuffer, 7)); + writeReservedField("reserved", (byte) 0x00, writeUnsignedByte(writeBuffer, 7)); // Simple Field (useSlopedExtrapolation) writeSimpleField("useSlopedExtrapolation", useSlopedExtrapolation, writeBoolean(writeBuffer)); @@ -156,8 +156,8 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - Short reservedField0 = - readReservedField("reserved", readUnsignedShort(readBuffer, 6), (short) 0x00); + Byte reservedField0 = + readReservedField("reserved", readUnsignedByte(readBuffer, 6), (byte) 0x00); boolean treatUncertainAsBad = readSimpleField("treatUncertainAsBad", readBoolean(readBuffer)); @@ -168,8 +168,8 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit short percentDataGood = readSimpleField("percentDataGood", readUnsignedShort(readBuffer, 8)); - Short reservedField1 = - readReservedField("reserved", readUnsignedShort(readBuffer, 7), (short) 0x00); + Byte reservedField1 = + readReservedField("reserved", readUnsignedByte(readBuffer, 7), (byte) 0x00); boolean useSlopedExtrapolation = readSimpleField("useSlopedExtrapolation", readBoolean(readBuffer)); diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrowseDescription.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrowseDescription.java index 48b62949608..36b2a48068c 100644 --- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrowseDescription.java +++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrowseDescription.java @@ -113,7 +113,7 @@ protected void serializeExtensionObjectDefinitionChild(WriteBuffer writeBuffer) "referenceTypeId", referenceTypeId, new DataWriterComplexDefault<>(writeBuffer)); // Reserved Field (reserved) - writeReservedField("reserved", (short) 0x00, writeUnsignedShort(writeBuffer, 7)); + writeReservedField("reserved", (byte) 0x00, writeUnsignedByte(writeBuffer, 7)); // Simple Field (includeSubtypes) writeSimpleField("includeSubtypes", includeSubtypes, writeBoolean(writeBuffer)); @@ -185,8 +185,8 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit "referenceTypeId", new DataReaderComplexDefault<>(() -> NodeId.staticParse(readBuffer), readBuffer)); - Short reservedField0 = - readReservedField("reserved", readUnsignedShort(readBuffer, 7), (short) 0x00); + Byte reservedField0 = + readReservedField("reserved", readUnsignedByte(readBuffer, 7), (byte) 0x00); boolean includeSubtypes = readSimpleField("includeSubtypes", readBoolean(readBuffer)); diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrowseNextRequest.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrowseNextRequest.java index b2e7d825150..b8bc664635a 100644 --- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrowseNextRequest.java +++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/BrowseNextRequest.java @@ -87,7 +87,7 @@ protected void serializeExtensionObjectDefinitionChild(WriteBuffer writeBuffer) writeSimpleField("requestHeader", requestHeader, new DataWriterComplexDefault<>(writeBuffer)); // Reserved Field (reserved) - writeReservedField("reserved", (short) 0x00, writeUnsignedShort(writeBuffer, 7)); + writeReservedField("reserved", (byte) 0x00, writeUnsignedByte(writeBuffer, 7)); // Simple Field (releaseContinuationPoints) writeSimpleField( @@ -151,8 +151,8 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit () -> ExtensionObjectDefinition.staticParse(readBuffer, (String) ("391")), readBuffer)); - Short reservedField0 = - readReservedField("reserved", readUnsignedShort(readBuffer, 7), (short) 0x00); + Byte reservedField0 = + readReservedField("reserved", readUnsignedByte(readBuffer, 7), (byte) 0x00); boolean releaseContinuationPoints = readSimpleField("releaseContinuationPoints", readBoolean(readBuffer)); diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CloseSessionRequest.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CloseSessionRequest.java index 5ef81393fc3..a4f1c9713dc 100644 --- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CloseSessionRequest.java +++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CloseSessionRequest.java @@ -71,7 +71,7 @@ protected void serializeExtensionObjectDefinitionChild(WriteBuffer writeBuffer) writeSimpleField("requestHeader", requestHeader, new DataWriterComplexDefault<>(writeBuffer)); // Reserved Field (reserved) - writeReservedField("reserved", (short) 0x00, writeUnsignedShort(writeBuffer, 7)); + writeReservedField("reserved", (byte) 0x00, writeUnsignedByte(writeBuffer, 7)); // Simple Field (deleteSubscriptions) writeSimpleField("deleteSubscriptions", deleteSubscriptions, writeBoolean(writeBuffer)); @@ -115,8 +115,8 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit () -> ExtensionObjectDefinition.staticParse(readBuffer, (String) ("391")), readBuffer)); - Short reservedField0 = - readReservedField("reserved", readUnsignedShort(readBuffer, 7), (short) 0x00); + Byte reservedField0 = + readReservedField("reserved", readUnsignedByte(readBuffer, 7), (byte) 0x00); boolean deleteSubscriptions = readSimpleField("deleteSubscriptions", readBoolean(readBuffer)); diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CreateSubscriptionRequest.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CreateSubscriptionRequest.java index 1fb22ebf1fd..8015a4147f6 100644 --- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CreateSubscriptionRequest.java +++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/CreateSubscriptionRequest.java @@ -128,7 +128,7 @@ protected void serializeExtensionObjectDefinitionChild(WriteBuffer writeBuffer) writeUnsignedLong(writeBuffer, 32)); // Reserved Field (reserved) - writeReservedField("reserved", (short) 0x00, writeUnsignedShort(writeBuffer, 7)); + writeReservedField("reserved", (byte) 0x00, writeUnsignedByte(writeBuffer, 7)); // Simple Field (publishingEnabled) writeSimpleField("publishingEnabled", publishingEnabled, writeBoolean(writeBuffer)); @@ -202,8 +202,8 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit long maxNotificationsPerPublish = readSimpleField("maxNotificationsPerPublish", readUnsignedLong(readBuffer, 32)); - Short reservedField0 = - readReservedField("reserved", readUnsignedShort(readBuffer, 7), (short) 0x00); + Byte reservedField0 = + readReservedField("reserved", readUnsignedByte(readBuffer, 7), (byte) 0x00); boolean publishingEnabled = readSimpleField("publishingEnabled", readBoolean(readBuffer)); diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DataSetWriterDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DataSetWriterDataType.java index c1024aeecf1..05c2bd3ca2c 100644 --- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DataSetWriterDataType.java +++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DataSetWriterDataType.java @@ -129,7 +129,7 @@ protected void serializeExtensionObjectDefinitionChild(WriteBuffer writeBuffer) writeSimpleField("name", name, new DataWriterComplexDefault<>(writeBuffer)); // Reserved Field (reserved) - writeReservedField("reserved", (short) 0x00, writeUnsignedShort(writeBuffer, 7)); + writeReservedField("reserved", (byte) 0x00, writeUnsignedByte(writeBuffer, 7)); // Simple Field (enabled) writeSimpleField("enabled", enabled, writeBoolean(writeBuffer)); @@ -237,8 +237,8 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit "name", new DataReaderComplexDefault<>(() -> PascalString.staticParse(readBuffer), readBuffer)); - Short reservedField0 = - readReservedField("reserved", readUnsignedShort(readBuffer, 7), (short) 0x00); + Byte reservedField0 = + readReservedField("reserved", readUnsignedByte(readBuffer, 7), (byte) 0x00); boolean enabled = readSimpleField("enabled", readBoolean(readBuffer)); diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteNodesItem.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteNodesItem.java index de53bdd18f8..43002f8912c 100644 --- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteNodesItem.java +++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteNodesItem.java @@ -71,7 +71,7 @@ protected void serializeExtensionObjectDefinitionChild(WriteBuffer writeBuffer) writeSimpleField("nodeId", nodeId, new DataWriterComplexDefault<>(writeBuffer)); // Reserved Field (reserved) - writeReservedField("reserved", (short) 0x00, writeUnsignedShort(writeBuffer, 7)); + writeReservedField("reserved", (byte) 0x00, writeUnsignedByte(writeBuffer, 7)); // Simple Field (deleteTargetReferences) writeSimpleField("deleteTargetReferences", deleteTargetReferences, writeBoolean(writeBuffer)); @@ -113,8 +113,8 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit "nodeId", new DataReaderComplexDefault<>(() -> NodeId.staticParse(readBuffer), readBuffer)); - Short reservedField0 = - readReservedField("reserved", readUnsignedShort(readBuffer, 7), (short) 0x00); + Byte reservedField0 = + readReservedField("reserved", readUnsignedByte(readBuffer, 7), (byte) 0x00); boolean deleteTargetReferences = readSimpleField("deleteTargetReferences", readBoolean(readBuffer)); diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteReferencesItem.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteReferencesItem.java index c9f6f7d5938..848bcea8f11 100644 --- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteReferencesItem.java +++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/DeleteReferencesItem.java @@ -98,7 +98,7 @@ protected void serializeExtensionObjectDefinitionChild(WriteBuffer writeBuffer) "referenceTypeId", referenceTypeId, new DataWriterComplexDefault<>(writeBuffer)); // Reserved Field (reserved) - writeReservedField("reserved", (short) 0x00, writeUnsignedShort(writeBuffer, 7)); + writeReservedField("reserved", (byte) 0x00, writeUnsignedByte(writeBuffer, 7)); // Simple Field (isForward) writeSimpleField("isForward", isForward, writeBoolean(writeBuffer)); @@ -107,7 +107,7 @@ protected void serializeExtensionObjectDefinitionChild(WriteBuffer writeBuffer) writeSimpleField("targetNodeId", targetNodeId, new DataWriterComplexDefault<>(writeBuffer)); // Reserved Field (reserved) - writeReservedField("reserved", (short) 0x00, writeUnsignedShort(writeBuffer, 7)); + writeReservedField("reserved", (byte) 0x00, writeUnsignedByte(writeBuffer, 7)); // Simple Field (deleteBidirectional) writeSimpleField("deleteBidirectional", deleteBidirectional, writeBoolean(writeBuffer)); @@ -166,8 +166,8 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit "referenceTypeId", new DataReaderComplexDefault<>(() -> NodeId.staticParse(readBuffer), readBuffer)); - Short reservedField0 = - readReservedField("reserved", readUnsignedShort(readBuffer, 7), (short) 0x00); + Byte reservedField0 = + readReservedField("reserved", readUnsignedByte(readBuffer, 7), (byte) 0x00); boolean isForward = readSimpleField("isForward", readBoolean(readBuffer)); @@ -177,8 +177,8 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit new DataReaderComplexDefault<>( () -> ExpandedNodeId.staticParse(readBuffer), readBuffer)); - Short reservedField1 = - readReservedField("reserved", readUnsignedShort(readBuffer, 7), (short) 0x00); + Byte reservedField1 = + readReservedField("reserved", readUnsignedByte(readBuffer, 7), (byte) 0x00); boolean deleteBidirectional = readSimpleField("deleteBidirectional", readBoolean(readBuffer)); diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EndpointConfiguration.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EndpointConfiguration.java index 844791a4048..d3a0bcad7e7 100644 --- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EndpointConfiguration.java +++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/EndpointConfiguration.java @@ -122,7 +122,7 @@ protected void serializeExtensionObjectDefinitionChild(WriteBuffer writeBuffer) writeSimpleField("operationTimeout", operationTimeout, writeSignedInt(writeBuffer, 32)); // Reserved Field (reserved) - writeReservedField("reserved", (short) 0x00, writeUnsignedShort(writeBuffer, 7)); + writeReservedField("reserved", (byte) 0x00, writeUnsignedByte(writeBuffer, 7)); // Simple Field (useBinaryEncoding) writeSimpleField("useBinaryEncoding", useBinaryEncoding, writeBoolean(writeBuffer)); @@ -204,8 +204,8 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit int operationTimeout = readSimpleField("operationTimeout", readSignedInt(readBuffer, 32)); - Short reservedField0 = - readReservedField("reserved", readUnsignedShort(readBuffer, 7), (short) 0x00); + Byte reservedField0 = + readReservedField("reserved", readUnsignedByte(readBuffer, 7), (byte) 0x00); boolean useBinaryEncoding = readSimpleField("useBinaryEncoding", readBoolean(readBuffer)); diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryReadRequest.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryReadRequest.java index f20078daa17..f22b59f05ec 100644 --- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryReadRequest.java +++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/HistoryReadRequest.java @@ -115,7 +115,7 @@ protected void serializeExtensionObjectDefinitionChild(WriteBuffer writeBuffer) writeUnsignedLong(writeBuffer, 32))); // Reserved Field (reserved) - writeReservedField("reserved", (short) 0x00, writeUnsignedShort(writeBuffer, 7)); + writeReservedField("reserved", (byte) 0x00, writeUnsignedByte(writeBuffer, 7)); // Simple Field (releaseContinuationPoints) writeSimpleField( @@ -197,8 +197,8 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit new DataReaderEnumDefault<>( TimestampsToReturn::enumForValue, readUnsignedLong(readBuffer, 32))); - Short reservedField0 = - readReservedField("reserved", readUnsignedShort(readBuffer, 7), (short) 0x00); + Byte reservedField0 = + readReservedField("reserved", readUnsignedByte(readBuffer, 7), (byte) 0x00); boolean releaseContinuationPoints = readSimpleField("releaseContinuationPoints", readBoolean(readBuffer)); diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/LocalizedText.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/LocalizedText.java index cbe12600b1b..dac0c07549d 100644 --- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/LocalizedText.java +++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/LocalizedText.java @@ -74,7 +74,7 @@ public void serialize(WriteBuffer writeBuffer) throws SerializationException { writeBuffer.pushContext("LocalizedText"); // Reserved Field (reserved) - writeReservedField("reserved", (short) 0x00, writeUnsignedShort(writeBuffer, 6)); + writeReservedField("reserved", (byte) 0x00, writeUnsignedByte(writeBuffer, 6)); // Simple Field (textSpecified) writeSimpleField("textSpecified", textSpecified, writeBoolean(writeBuffer)); @@ -135,8 +135,8 @@ public static LocalizedText staticParse(ReadBuffer readBuffer) throws ParseExcep PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - Short reservedField0 = - readReservedField("reserved", readUnsignedShort(readBuffer, 6), (short) 0x00); + Byte reservedField0 = + readReservedField("reserved", readUnsignedByte(readBuffer, 6), (byte) 0x00); boolean textSpecified = readSimpleField("textSpecified", readBoolean(readBuffer)); diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/MonitoringParameters.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/MonitoringParameters.java index e7d1c8e5340..dd5292203c3 100644 --- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/MonitoringParameters.java +++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/MonitoringParameters.java @@ -103,7 +103,7 @@ protected void serializeExtensionObjectDefinitionChild(WriteBuffer writeBuffer) writeSimpleField("queueSize", queueSize, writeUnsignedLong(writeBuffer, 32)); // Reserved Field (reserved) - writeReservedField("reserved", (short) 0x00, writeUnsignedShort(writeBuffer, 7)); + writeReservedField("reserved", (byte) 0x00, writeUnsignedByte(writeBuffer, 7)); // Simple Field (discardOldest) writeSimpleField("discardOldest", discardOldest, writeBoolean(writeBuffer)); @@ -161,8 +161,8 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit long queueSize = readSimpleField("queueSize", readUnsignedLong(readBuffer, 32)); - Short reservedField0 = - readReservedField("reserved", readUnsignedShort(readBuffer, 7), (short) 0x00); + Byte reservedField0 = + readReservedField("reserved", readUnsignedByte(readBuffer, 7), (byte) 0x00); boolean discardOldest = readSimpleField("discardOldest", readBoolean(readBuffer)); diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/NodeIdType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/NodeIdType.java index 98ddc610091..cfcc5355a44 100644 --- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/NodeIdType.java +++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/NodeIdType.java @@ -24,36 +24,36 @@ // Code generated by code-generation. DO NOT EDIT. public enum NodeIdType { - nodeIdTypeTwoByte((short) 0), - nodeIdTypeFourByte((short) 1), - nodeIdTypeNumeric((short) 2), - nodeIdTypeString((short) 3), - nodeIdTypeGuid((short) 4), - nodeIdTypeByteString((short) 5); - private static final Map map; + nodeIdTypeTwoByte((byte) 0), + nodeIdTypeFourByte((byte) 1), + nodeIdTypeNumeric((byte) 2), + nodeIdTypeString((byte) 3), + nodeIdTypeGuid((byte) 4), + nodeIdTypeByteString((byte) 5); + private static final Map map; static { map = new HashMap<>(); for (NodeIdType value : NodeIdType.values()) { - map.put((short) value.getValue(), value); + map.put((byte) value.getValue(), value); } } - private final short value; + private final byte value; - NodeIdType(short value) { + NodeIdType(byte value) { this.value = value; } - public short getValue() { + public byte getValue() { return value; } - public static NodeIdType enumForValue(short value) { + public static NodeIdType enumForValue(byte value) { return map.get(value); } - public static Boolean isDefined(short value) { + public static Boolean isDefined(byte value) { return map.containsKey(value); } } diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/NodeIdTypeDefinition.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/NodeIdTypeDefinition.java index 23930b3bc14..69804a622c6 100644 --- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/NodeIdTypeDefinition.java +++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/NodeIdTypeDefinition.java @@ -60,7 +60,7 @@ public void serialize(WriteBuffer writeBuffer) throws SerializationException { "NodeIdType", getNodeType(), new DataWriterEnumDefault<>( - NodeIdType::getValue, NodeIdType::name, writeUnsignedShort(writeBuffer, 6))); + NodeIdType::getValue, NodeIdType::name, writeUnsignedByte(writeBuffer, 6))); // Switch field (Serialize the sub-type) serializeNodeIdTypeDefinitionChild(writeBuffer); @@ -101,8 +101,7 @@ public static NodeIdTypeDefinition staticParse(ReadBuffer readBuffer) throws Par NodeIdType nodeType = readDiscriminatorField( "nodeType", - new DataReaderEnumDefault<>( - NodeIdType::enumForValue, readUnsignedShort(readBuffer, 6))); + new DataReaderEnumDefault<>(NodeIdType::enumForValue, readUnsignedByte(readBuffer, 6))); // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) NodeIdTypeDefinitionBuilder builder = null; diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/NodeReference.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/NodeReference.java index 5fc7fe5ca50..bcf6eac1966 100644 --- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/NodeReference.java +++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/NodeReference.java @@ -98,7 +98,7 @@ protected void serializeExtensionObjectDefinitionChild(WriteBuffer writeBuffer) "referenceTypeId", referenceTypeId, new DataWriterComplexDefault<>(writeBuffer)); // Reserved Field (reserved) - writeReservedField("reserved", (short) 0x00, writeUnsignedShort(writeBuffer, 7)); + writeReservedField("reserved", (byte) 0x00, writeUnsignedByte(writeBuffer, 7)); // Simple Field (isForward) writeSimpleField("isForward", isForward, writeBoolean(writeBuffer)); @@ -167,8 +167,8 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit "referenceTypeId", new DataReaderComplexDefault<>(() -> NodeId.staticParse(readBuffer), readBuffer)); - Short reservedField0 = - readReservedField("reserved", readUnsignedShort(readBuffer, 7), (short) 0x00); + Byte reservedField0 = + readReservedField("reserved", readUnsignedByte(readBuffer, 7), (byte) 0x00); boolean isForward = readSimpleField("isForward", readBoolean(readBuffer)); diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/NodeTypeDescription.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/NodeTypeDescription.java index b2be2682b34..13c4fd9135b 100644 --- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/NodeTypeDescription.java +++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/NodeTypeDescription.java @@ -88,7 +88,7 @@ protected void serializeExtensionObjectDefinitionChild(WriteBuffer writeBuffer) "typeDefinitionNode", typeDefinitionNode, new DataWriterComplexDefault<>(writeBuffer)); // Reserved Field (reserved) - writeReservedField("reserved", (short) 0x00, writeUnsignedShort(writeBuffer, 7)); + writeReservedField("reserved", (byte) 0x00, writeUnsignedByte(writeBuffer, 7)); // Simple Field (includeSubTypes) writeSimpleField("includeSubTypes", includeSubTypes, writeBoolean(writeBuffer)); @@ -149,8 +149,8 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit new DataReaderComplexDefault<>( () -> ExpandedNodeId.staticParse(readBuffer), readBuffer)); - Short reservedField0 = - readReservedField("reserved", readUnsignedShort(readBuffer, 7), (short) 0x00); + Byte reservedField0 = + readReservedField("reserved", readUnsignedByte(readBuffer, 7), (byte) 0x00); boolean includeSubTypes = readSimpleField("includeSubTypes", readBoolean(readBuffer)); diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PubSubConfigurationDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PubSubConfigurationDataType.java index 56f39feb147..cf1551d9750 100644 --- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PubSubConfigurationDataType.java +++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PubSubConfigurationDataType.java @@ -104,7 +104,7 @@ protected void serializeExtensionObjectDefinitionChild(WriteBuffer writeBuffer) writeComplexTypeArrayField("connections", connections, writeBuffer); // Reserved Field (reserved) - writeReservedField("reserved", (short) 0x00, writeUnsignedShort(writeBuffer, 7)); + writeReservedField("reserved", (byte) 0x00, writeUnsignedByte(writeBuffer, 7)); // Simple Field (enabled) writeSimpleField("enabled", enabled, writeBoolean(writeBuffer)); @@ -183,8 +183,8 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit readBuffer), noOfConnections); - Short reservedField0 = - readReservedField("reserved", readUnsignedShort(readBuffer, 7), (short) 0x00); + Byte reservedField0 = + readReservedField("reserved", readUnsignedByte(readBuffer, 7), (byte) 0x00); boolean enabled = readSimpleField("enabled", readBoolean(readBuffer)); diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PubSubConnectionDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PubSubConnectionDataType.java index e9559a1d02a..11de966c4ed 100644 --- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PubSubConnectionDataType.java +++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PubSubConnectionDataType.java @@ -143,7 +143,7 @@ protected void serializeExtensionObjectDefinitionChild(WriteBuffer writeBuffer) writeSimpleField("name", name, new DataWriterComplexDefault<>(writeBuffer)); // Reserved Field (reserved) - writeReservedField("reserved", (short) 0x00, writeUnsignedShort(writeBuffer, 7)); + writeReservedField("reserved", (byte) 0x00, writeUnsignedByte(writeBuffer, 7)); // Simple Field (enabled) writeSimpleField("enabled", enabled, writeBoolean(writeBuffer)); @@ -266,8 +266,8 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit "name", new DataReaderComplexDefault<>(() -> PascalString.staticParse(readBuffer), readBuffer)); - Short reservedField0 = - readReservedField("reserved", readUnsignedShort(readBuffer, 7), (short) 0x00); + Byte reservedField0 = + readReservedField("reserved", readUnsignedByte(readBuffer, 7), (byte) 0x00); boolean enabled = readSimpleField("enabled", readBoolean(readBuffer)); diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PubSubGroupDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PubSubGroupDataType.java index 745fd63627c..980f305a43f 100644 --- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PubSubGroupDataType.java +++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PubSubGroupDataType.java @@ -122,7 +122,7 @@ protected void serializeExtensionObjectDefinitionChild(WriteBuffer writeBuffer) writeSimpleField("name", name, new DataWriterComplexDefault<>(writeBuffer)); // Reserved Field (reserved) - writeReservedField("reserved", (short) 0x00, writeUnsignedShort(writeBuffer, 7)); + writeReservedField("reserved", (byte) 0x00, writeUnsignedByte(writeBuffer, 7)); // Simple Field (enabled) writeSimpleField("enabled", enabled, writeBoolean(writeBuffer)); @@ -228,8 +228,8 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit "name", new DataReaderComplexDefault<>(() -> PascalString.staticParse(readBuffer), readBuffer)); - Short reservedField0 = - readReservedField("reserved", readUnsignedShort(readBuffer, 7), (short) 0x00); + Byte reservedField0 = + readReservedField("reserved", readUnsignedByte(readBuffer, 7), (byte) 0x00); boolean enabled = readSimpleField("enabled", readBoolean(readBuffer)); diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PublishResponse.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PublishResponse.java index 5822314dfe9..c784064e56e 100644 --- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PublishResponse.java +++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/PublishResponse.java @@ -142,7 +142,7 @@ protected void serializeExtensionObjectDefinitionChild(WriteBuffer writeBuffer) "availableSequenceNumbers", availableSequenceNumbers, writeUnsignedLong(writeBuffer, 32)); // Reserved Field (reserved) - writeReservedField("reserved", (short) 0x00, writeUnsignedShort(writeBuffer, 7)); + writeReservedField("reserved", (byte) 0x00, writeUnsignedByte(writeBuffer, 7)); // Simple Field (moreNotifications) writeSimpleField("moreNotifications", moreNotifications, writeBoolean(writeBuffer)); @@ -251,8 +251,8 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit readUnsignedLong(readBuffer, 32), noOfAvailableSequenceNumbers); - Short reservedField0 = - readReservedField("reserved", readUnsignedShort(readBuffer, 7), (short) 0x00); + Byte reservedField0 = + readReservedField("reserved", readUnsignedByte(readBuffer, 7), (byte) 0x00); boolean moreNotifications = readSimpleField("moreNotifications", readBoolean(readBuffer)); diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/QueryNextRequest.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/QueryNextRequest.java index b6159c51e85..bc2e73cf6d5 100644 --- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/QueryNextRequest.java +++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/QueryNextRequest.java @@ -80,7 +80,7 @@ protected void serializeExtensionObjectDefinitionChild(WriteBuffer writeBuffer) writeSimpleField("requestHeader", requestHeader, new DataWriterComplexDefault<>(writeBuffer)); // Reserved Field (reserved) - writeReservedField("reserved", (short) 0x00, writeUnsignedShort(writeBuffer, 7)); + writeReservedField("reserved", (byte) 0x00, writeUnsignedByte(writeBuffer, 7)); // Simple Field (releaseContinuationPoint) writeSimpleField( @@ -132,8 +132,8 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit () -> ExtensionObjectDefinition.staticParse(readBuffer, (String) ("391")), readBuffer)); - Short reservedField0 = - readReservedField("reserved", readUnsignedShort(readBuffer, 7), (short) 0x00); + Byte reservedField0 = + readReservedField("reserved", readUnsignedByte(readBuffer, 7), (byte) 0x00); boolean releaseContinuationPoint = readSimpleField("releaseContinuationPoint", readBoolean(readBuffer)); diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReferenceDescription.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReferenceDescription.java index 6a29b4c8884..0d4e652c40d 100644 --- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReferenceDescription.java +++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReferenceDescription.java @@ -109,7 +109,7 @@ protected void serializeExtensionObjectDefinitionChild(WriteBuffer writeBuffer) "referenceTypeId", referenceTypeId, new DataWriterComplexDefault<>(writeBuffer)); // Reserved Field (reserved) - writeReservedField("reserved", (short) 0x00, writeUnsignedShort(writeBuffer, 7)); + writeReservedField("reserved", (byte) 0x00, writeUnsignedByte(writeBuffer, 7)); // Simple Field (isForward) writeSimpleField("isForward", isForward, writeBoolean(writeBuffer)); @@ -186,8 +186,8 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit "referenceTypeId", new DataReaderComplexDefault<>(() -> NodeId.staticParse(readBuffer), readBuffer)); - Short reservedField0 = - readReservedField("reserved", readUnsignedShort(readBuffer, 7), (short) 0x00); + Byte reservedField0 = + readReservedField("reserved", readUnsignedByte(readBuffer, 7), (byte) 0x00); boolean isForward = readSimpleField("isForward", readBoolean(readBuffer)); diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReferenceNode.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReferenceNode.java index 264ee64e3fe..7875ada5e64 100644 --- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReferenceNode.java +++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/ReferenceNode.java @@ -78,7 +78,7 @@ protected void serializeExtensionObjectDefinitionChild(WriteBuffer writeBuffer) "referenceTypeId", referenceTypeId, new DataWriterComplexDefault<>(writeBuffer)); // Reserved Field (reserved) - writeReservedField("reserved", (short) 0x00, writeUnsignedShort(writeBuffer, 7)); + writeReservedField("reserved", (byte) 0x00, writeUnsignedByte(writeBuffer, 7)); // Simple Field (isInverse) writeSimpleField("isInverse", isInverse, writeBoolean(writeBuffer)); @@ -126,8 +126,8 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit "referenceTypeId", new DataReaderComplexDefault<>(() -> NodeId.staticParse(readBuffer), readBuffer)); - Short reservedField0 = - readReservedField("reserved", readUnsignedShort(readBuffer, 7), (short) 0x00); + Byte reservedField0 = + readReservedField("reserved", readUnsignedByte(readBuffer, 7), (byte) 0x00); boolean isInverse = readSimpleField("isInverse", readBoolean(readBuffer)); diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RegisteredServer.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RegisteredServer.java index 41d4fe933db..dad1be7c18a 100644 --- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RegisteredServer.java +++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RegisteredServer.java @@ -160,7 +160,7 @@ protected void serializeExtensionObjectDefinitionChild(WriteBuffer writeBuffer) "semaphoreFilePath", semaphoreFilePath, new DataWriterComplexDefault<>(writeBuffer)); // Reserved Field (reserved) - writeReservedField("reserved", (short) 0x00, writeUnsignedShort(writeBuffer, 7)); + writeReservedField("reserved", (byte) 0x00, writeUnsignedByte(writeBuffer, 7)); // Simple Field (isOnline) writeSimpleField("isOnline", isOnline, writeBoolean(writeBuffer)); @@ -276,8 +276,8 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit "semaphoreFilePath", new DataReaderComplexDefault<>(() -> PascalString.staticParse(readBuffer), readBuffer)); - Short reservedField0 = - readReservedField("reserved", readUnsignedShort(readBuffer, 7), (short) 0x00); + Byte reservedField0 = + readReservedField("reserved", readUnsignedByte(readBuffer, 7), (byte) 0x00); boolean isOnline = readSimpleField("isOnline", readBoolean(readBuffer)); diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RelativePathElement.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RelativePathElement.java index 09216da55b4..a0824d9e524 100644 --- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RelativePathElement.java +++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/RelativePathElement.java @@ -88,7 +88,7 @@ protected void serializeExtensionObjectDefinitionChild(WriteBuffer writeBuffer) "referenceTypeId", referenceTypeId, new DataWriterComplexDefault<>(writeBuffer)); // Reserved Field (reserved) - writeReservedField("reserved", (short) 0x00, writeUnsignedShort(writeBuffer, 6)); + writeReservedField("reserved", (byte) 0x00, writeUnsignedByte(writeBuffer, 6)); // Simple Field (includeSubtypes) writeSimpleField("includeSubtypes", includeSubtypes, writeBoolean(writeBuffer)); @@ -142,8 +142,8 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit "referenceTypeId", new DataReaderComplexDefault<>(() -> NodeId.staticParse(readBuffer), readBuffer)); - Short reservedField0 = - readReservedField("reserved", readUnsignedShort(readBuffer, 6), (short) 0x00); + Byte reservedField0 = + readReservedField("reserved", readUnsignedByte(readBuffer, 6), (byte) 0x00); boolean includeSubtypes = readSimpleField("includeSubtypes", readBoolean(readBuffer)); diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SetPublishingModeRequest.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SetPublishingModeRequest.java index 0cabbdc7c5e..5bfdef6e5b3 100644 --- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SetPublishingModeRequest.java +++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SetPublishingModeRequest.java @@ -87,7 +87,7 @@ protected void serializeExtensionObjectDefinitionChild(WriteBuffer writeBuffer) writeSimpleField("requestHeader", requestHeader, new DataWriterComplexDefault<>(writeBuffer)); // Reserved Field (reserved) - writeReservedField("reserved", (short) 0x00, writeUnsignedShort(writeBuffer, 7)); + writeReservedField("reserved", (byte) 0x00, writeUnsignedByte(writeBuffer, 7)); // Simple Field (publishingEnabled) writeSimpleField("publishingEnabled", publishingEnabled, writeBoolean(writeBuffer)); @@ -146,8 +146,8 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit () -> ExtensionObjectDefinition.staticParse(readBuffer, (String) ("391")), readBuffer)); - Short reservedField0 = - readReservedField("reserved", readUnsignedShort(readBuffer, 7), (short) 0x00); + Byte reservedField0 = + readReservedField("reserved", readUnsignedByte(readBuffer, 7), (byte) 0x00); boolean publishingEnabled = readSimpleField("publishingEnabled", readBoolean(readBuffer)); diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/StructureField.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/StructureField.java index fe8883049d1..425bdbf9e68 100644 --- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/StructureField.java +++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/StructureField.java @@ -134,7 +134,7 @@ protected void serializeExtensionObjectDefinitionChild(WriteBuffer writeBuffer) writeSimpleField("maxStringLength", maxStringLength, writeUnsignedLong(writeBuffer, 32)); // Reserved Field (reserved) - writeReservedField("reserved", (short) 0x00, writeUnsignedShort(writeBuffer, 7)); + writeReservedField("reserved", (byte) 0x00, writeUnsignedByte(writeBuffer, 7)); // Simple Field (isOptional) writeSimpleField("isOptional", isOptional, writeBoolean(writeBuffer)); @@ -217,8 +217,8 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit long maxStringLength = readSimpleField("maxStringLength", readUnsignedLong(readBuffer, 32)); - Short reservedField0 = - readReservedField("reserved", readUnsignedShort(readBuffer, 7), (short) 0x00); + Byte reservedField0 = + readReservedField("reserved", readUnsignedByte(readBuffer, 7), (byte) 0x00); boolean isOptional = readSimpleField("isOptional", readBoolean(readBuffer)); diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SubscriptionDiagnosticsDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SubscriptionDiagnosticsDataType.java index d51a3a8c2ca..3531d34314f 100644 --- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SubscriptionDiagnosticsDataType.java +++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/SubscriptionDiagnosticsDataType.java @@ -297,7 +297,7 @@ protected void serializeExtensionObjectDefinitionChild(WriteBuffer writeBuffer) writeUnsignedLong(writeBuffer, 32)); // Reserved Field (reserved) - writeReservedField("reserved", (short) 0x00, writeUnsignedShort(writeBuffer, 7)); + writeReservedField("reserved", (byte) 0x00, writeUnsignedByte(writeBuffer, 7)); // Simple Field (publishingEnabled) writeSimpleField("publishingEnabled", publishingEnabled, writeBoolean(writeBuffer)); @@ -539,8 +539,8 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit long maxNotificationsPerPublish = readSimpleField("maxNotificationsPerPublish", readUnsignedLong(readBuffer, 32)); - Short reservedField0 = - readReservedField("reserved", readUnsignedShort(readBuffer, 7), (short) 0x00); + Byte reservedField0 = + readReservedField("reserved", readUnsignedByte(readBuffer, 7), (byte) 0x00); boolean publishingEnabled = readSimpleField("publishingEnabled", readBoolean(readBuffer)); diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/TimeZoneDataType.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/TimeZoneDataType.java index 7f5532f693d..3c3e1c6c15e 100644 --- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/TimeZoneDataType.java +++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/TimeZoneDataType.java @@ -71,7 +71,7 @@ protected void serializeExtensionObjectDefinitionChild(WriteBuffer writeBuffer) writeSimpleField("offset", offset, writeSignedShort(writeBuffer, 16)); // Reserved Field (reserved) - writeReservedField("reserved", (short) 0x00, writeUnsignedShort(writeBuffer, 7)); + writeReservedField("reserved", (byte) 0x00, writeUnsignedByte(writeBuffer, 7)); // Simple Field (daylightSavingInOffset) writeSimpleField("daylightSavingInOffset", daylightSavingInOffset, writeBoolean(writeBuffer)); @@ -110,8 +110,8 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit short offset = readSimpleField("offset", readSignedShort(readBuffer, 16)); - Short reservedField0 = - readReservedField("reserved", readUnsignedShort(readBuffer, 7), (short) 0x00); + Byte reservedField0 = + readReservedField("reserved", readUnsignedByte(readBuffer, 7), (byte) 0x00); boolean daylightSavingInOffset = readSimpleField("daylightSavingInOffset", readBoolean(readBuffer)); diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/TransferSubscriptionsRequest.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/TransferSubscriptionsRequest.java index 992ab626082..523b282426d 100644 --- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/TransferSubscriptionsRequest.java +++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/TransferSubscriptionsRequest.java @@ -94,7 +94,7 @@ protected void serializeExtensionObjectDefinitionChild(WriteBuffer writeBuffer) "subscriptionIds", subscriptionIds, writeUnsignedLong(writeBuffer, 32)); // Reserved Field (reserved) - writeReservedField("reserved", (short) 0x00, writeUnsignedShort(writeBuffer, 7)); + writeReservedField("reserved", (byte) 0x00, writeUnsignedByte(writeBuffer, 7)); // Simple Field (sendInitialValues) writeSimpleField("sendInitialValues", sendInitialValues, writeBoolean(writeBuffer)); @@ -152,8 +152,8 @@ public static ExtensionObjectDefinitionBuilder staticParseExtensionObjectDefinit readCountArrayField( "subscriptionIds", readUnsignedLong(readBuffer, 32), noOfSubscriptionIds); - Short reservedField0 = - readReservedField("reserved", readUnsignedShort(readBuffer, 7), (short) 0x00); + Byte reservedField0 = + readReservedField("reserved", readUnsignedByte(readBuffer, 7), (byte) 0x00); boolean sendInitialValues = readSimpleField("sendInitialValues", readBoolean(readBuffer)); diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/Variant.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/Variant.java index b51684b4540..b421579c6fe 100644 --- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/Variant.java +++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/Variant.java @@ -38,7 +38,7 @@ public abstract class Variant implements Message { // Abstract accessors for discriminator values. - public abstract Short getVariantType(); + public abstract Byte getVariantType(); // Properties. protected final boolean arrayLengthSpecified; @@ -90,7 +90,7 @@ public void serialize(WriteBuffer writeBuffer) throws SerializationException { "arrayDimensionsSpecified", arrayDimensionsSpecified, writeBoolean(writeBuffer)); // Discriminator Field (VariantType) (Used as input to a switch field) - writeDiscriminatorField("VariantType", getVariantType(), writeUnsignedShort(writeBuffer, 6)); + writeDiscriminatorField("VariantType", getVariantType(), writeUnsignedByte(writeBuffer, 6)); // Switch field (Serialize the sub-type) serializeVariantChild(writeBuffer); @@ -154,59 +154,59 @@ public static Variant staticParse(ReadBuffer readBuffer) throws ParseException { boolean arrayDimensionsSpecified = readSimpleField("arrayDimensionsSpecified", readBoolean(readBuffer)); - short VariantType = readDiscriminatorField("VariantType", readUnsignedShort(readBuffer, 6)); + byte VariantType = readDiscriminatorField("VariantType", readUnsignedByte(readBuffer, 6)); // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) VariantBuilder builder = null; - if (EvaluationHelper.equals(VariantType, (short) 1)) { + if (EvaluationHelper.equals(VariantType, (byte) 1)) { builder = VariantBoolean.staticParseVariantBuilder(readBuffer, arrayLengthSpecified); - } else if (EvaluationHelper.equals(VariantType, (short) 2)) { + } else if (EvaluationHelper.equals(VariantType, (byte) 2)) { builder = VariantSByte.staticParseVariantBuilder(readBuffer, arrayLengthSpecified); - } else if (EvaluationHelper.equals(VariantType, (short) 3)) { + } else if (EvaluationHelper.equals(VariantType, (byte) 3)) { builder = VariantByte.staticParseVariantBuilder(readBuffer, arrayLengthSpecified); - } else if (EvaluationHelper.equals(VariantType, (short) 4)) { + } else if (EvaluationHelper.equals(VariantType, (byte) 4)) { builder = VariantInt16.staticParseVariantBuilder(readBuffer, arrayLengthSpecified); - } else if (EvaluationHelper.equals(VariantType, (short) 5)) { + } else if (EvaluationHelper.equals(VariantType, (byte) 5)) { builder = VariantUInt16.staticParseVariantBuilder(readBuffer, arrayLengthSpecified); - } else if (EvaluationHelper.equals(VariantType, (short) 6)) { + } else if (EvaluationHelper.equals(VariantType, (byte) 6)) { builder = VariantInt32.staticParseVariantBuilder(readBuffer, arrayLengthSpecified); - } else if (EvaluationHelper.equals(VariantType, (short) 7)) { + } else if (EvaluationHelper.equals(VariantType, (byte) 7)) { builder = VariantUInt32.staticParseVariantBuilder(readBuffer, arrayLengthSpecified); - } else if (EvaluationHelper.equals(VariantType, (short) 8)) { + } else if (EvaluationHelper.equals(VariantType, (byte) 8)) { builder = VariantInt64.staticParseVariantBuilder(readBuffer, arrayLengthSpecified); - } else if (EvaluationHelper.equals(VariantType, (short) 9)) { + } else if (EvaluationHelper.equals(VariantType, (byte) 9)) { builder = VariantUInt64.staticParseVariantBuilder(readBuffer, arrayLengthSpecified); - } else if (EvaluationHelper.equals(VariantType, (short) 10)) { + } else if (EvaluationHelper.equals(VariantType, (byte) 10)) { builder = VariantFloat.staticParseVariantBuilder(readBuffer, arrayLengthSpecified); - } else if (EvaluationHelper.equals(VariantType, (short) 11)) { + } else if (EvaluationHelper.equals(VariantType, (byte) 11)) { builder = VariantDouble.staticParseVariantBuilder(readBuffer, arrayLengthSpecified); - } else if (EvaluationHelper.equals(VariantType, (short) 12)) { + } else if (EvaluationHelper.equals(VariantType, (byte) 12)) { builder = VariantString.staticParseVariantBuilder(readBuffer, arrayLengthSpecified); - } else if (EvaluationHelper.equals(VariantType, (short) 13)) { + } else if (EvaluationHelper.equals(VariantType, (byte) 13)) { builder = VariantDateTime.staticParseVariantBuilder(readBuffer, arrayLengthSpecified); - } else if (EvaluationHelper.equals(VariantType, (short) 14)) { + } else if (EvaluationHelper.equals(VariantType, (byte) 14)) { builder = VariantGuid.staticParseVariantBuilder(readBuffer, arrayLengthSpecified); - } else if (EvaluationHelper.equals(VariantType, (short) 15)) { + } else if (EvaluationHelper.equals(VariantType, (byte) 15)) { builder = VariantByteString.staticParseVariantBuilder(readBuffer, arrayLengthSpecified); - } else if (EvaluationHelper.equals(VariantType, (short) 16)) { + } else if (EvaluationHelper.equals(VariantType, (byte) 16)) { builder = VariantXmlElement.staticParseVariantBuilder(readBuffer, arrayLengthSpecified); - } else if (EvaluationHelper.equals(VariantType, (short) 17)) { + } else if (EvaluationHelper.equals(VariantType, (byte) 17)) { builder = VariantNodeId.staticParseVariantBuilder(readBuffer, arrayLengthSpecified); - } else if (EvaluationHelper.equals(VariantType, (short) 18)) { + } else if (EvaluationHelper.equals(VariantType, (byte) 18)) { builder = VariantExpandedNodeId.staticParseVariantBuilder(readBuffer, arrayLengthSpecified); - } else if (EvaluationHelper.equals(VariantType, (short) 19)) { + } else if (EvaluationHelper.equals(VariantType, (byte) 19)) { builder = VariantStatusCode.staticParseVariantBuilder(readBuffer, arrayLengthSpecified); - } else if (EvaluationHelper.equals(VariantType, (short) 20)) { + } else if (EvaluationHelper.equals(VariantType, (byte) 20)) { builder = VariantQualifiedName.staticParseVariantBuilder(readBuffer, arrayLengthSpecified); - } else if (EvaluationHelper.equals(VariantType, (short) 21)) { + } else if (EvaluationHelper.equals(VariantType, (byte) 21)) { builder = VariantLocalizedText.staticParseVariantBuilder(readBuffer, arrayLengthSpecified); - } else if (EvaluationHelper.equals(VariantType, (short) 22)) { + } else if (EvaluationHelper.equals(VariantType, (byte) 22)) { builder = VariantExtensionObject.staticParseVariantBuilder(readBuffer, arrayLengthSpecified); - } else if (EvaluationHelper.equals(VariantType, (short) 23)) { + } else if (EvaluationHelper.equals(VariantType, (byte) 23)) { builder = VariantDataValue.staticParseVariantBuilder(readBuffer, arrayLengthSpecified); - } else if (EvaluationHelper.equals(VariantType, (short) 24)) { + } else if (EvaluationHelper.equals(VariantType, (byte) 24)) { builder = VariantVariant.staticParseVariantBuilder(readBuffer, arrayLengthSpecified); - } else if (EvaluationHelper.equals(VariantType, (short) 25)) { + } else if (EvaluationHelper.equals(VariantType, (byte) 25)) { builder = VariantDiagnosticInfo.staticParseVariantBuilder(readBuffer, arrayLengthSpecified); } if (builder == null) { diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantBoolean.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantBoolean.java index eb929f76c02..452894bc4d1 100644 --- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantBoolean.java +++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantBoolean.java @@ -38,8 +38,8 @@ public class VariantBoolean extends Variant implements Message { // Accessors for discriminator values. - public Short getVariantType() { - return (short) 1; + public Byte getVariantType() { + return (byte) 1; } // Properties. diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantByte.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantByte.java index d277cbf8aa8..d4bb68dfe94 100644 --- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantByte.java +++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantByte.java @@ -38,8 +38,8 @@ public class VariantByte extends Variant implements Message { // Accessors for discriminator values. - public Short getVariantType() { - return (short) 3; + public Byte getVariantType() { + return (byte) 3; } // Properties. diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantByteString.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantByteString.java index 3d76b2af182..d592377589a 100644 --- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantByteString.java +++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantByteString.java @@ -38,8 +38,8 @@ public class VariantByteString extends Variant implements Message { // Accessors for discriminator values. - public Short getVariantType() { - return (short) 15; + public Byte getVariantType() { + return (byte) 15; } // Properties. diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantDataValue.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantDataValue.java index 4919f4f600e..c7fad11805e 100644 --- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantDataValue.java +++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantDataValue.java @@ -38,8 +38,8 @@ public class VariantDataValue extends Variant implements Message { // Accessors for discriminator values. - public Short getVariantType() { - return (short) 23; + public Byte getVariantType() { + return (byte) 23; } // Properties. diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantDateTime.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantDateTime.java index 5db60ba29f6..68feac13707 100644 --- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantDateTime.java +++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantDateTime.java @@ -38,8 +38,8 @@ public class VariantDateTime extends Variant implements Message { // Accessors for discriminator values. - public Short getVariantType() { - return (short) 13; + public Byte getVariantType() { + return (byte) 13; } // Properties. diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantDiagnosticInfo.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantDiagnosticInfo.java index 11c6487b7fd..02ab90d220b 100644 --- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantDiagnosticInfo.java +++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantDiagnosticInfo.java @@ -38,8 +38,8 @@ public class VariantDiagnosticInfo extends Variant implements Message { // Accessors for discriminator values. - public Short getVariantType() { - return (short) 25; + public Byte getVariantType() { + return (byte) 25; } // Properties. diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantDouble.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantDouble.java index bea224f1161..6c7f9f33a2b 100644 --- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantDouble.java +++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantDouble.java @@ -38,8 +38,8 @@ public class VariantDouble extends Variant implements Message { // Accessors for discriminator values. - public Short getVariantType() { - return (short) 11; + public Byte getVariantType() { + return (byte) 11; } // Properties. diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantExpandedNodeId.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantExpandedNodeId.java index 379a5cee6d9..09d4c0aac7e 100644 --- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantExpandedNodeId.java +++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantExpandedNodeId.java @@ -38,8 +38,8 @@ public class VariantExpandedNodeId extends Variant implements Message { // Accessors for discriminator values. - public Short getVariantType() { - return (short) 18; + public Byte getVariantType() { + return (byte) 18; } // Properties. diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantExtensionObject.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantExtensionObject.java index 0a545484be8..61b29d3f8bd 100644 --- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantExtensionObject.java +++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantExtensionObject.java @@ -38,8 +38,8 @@ public class VariantExtensionObject extends Variant implements Message { // Accessors for discriminator values. - public Short getVariantType() { - return (short) 22; + public Byte getVariantType() { + return (byte) 22; } // Properties. diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantFloat.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantFloat.java index 23a988324f3..186aaed2a0c 100644 --- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantFloat.java +++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantFloat.java @@ -38,8 +38,8 @@ public class VariantFloat extends Variant implements Message { // Accessors for discriminator values. - public Short getVariantType() { - return (short) 10; + public Byte getVariantType() { + return (byte) 10; } // Properties. diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantGuid.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantGuid.java index 3290eadd566..cdab181c10a 100644 --- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantGuid.java +++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantGuid.java @@ -38,8 +38,8 @@ public class VariantGuid extends Variant implements Message { // Accessors for discriminator values. - public Short getVariantType() { - return (short) 14; + public Byte getVariantType() { + return (byte) 14; } // Properties. diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantInt16.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantInt16.java index 4a5629cb43b..ce6f2cd30c2 100644 --- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantInt16.java +++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantInt16.java @@ -38,8 +38,8 @@ public class VariantInt16 extends Variant implements Message { // Accessors for discriminator values. - public Short getVariantType() { - return (short) 4; + public Byte getVariantType() { + return (byte) 4; } // Properties. diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantInt32.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantInt32.java index 50db7582385..8cc8a9051fa 100644 --- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantInt32.java +++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantInt32.java @@ -38,8 +38,8 @@ public class VariantInt32 extends Variant implements Message { // Accessors for discriminator values. - public Short getVariantType() { - return (short) 6; + public Byte getVariantType() { + return (byte) 6; } // Properties. diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantInt64.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantInt64.java index 4b283e75e64..f5bf1d90259 100644 --- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantInt64.java +++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantInt64.java @@ -38,8 +38,8 @@ public class VariantInt64 extends Variant implements Message { // Accessors for discriminator values. - public Short getVariantType() { - return (short) 8; + public Byte getVariantType() { + return (byte) 8; } // Properties. diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantLocalizedText.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantLocalizedText.java index ccd5424ee20..dd02ebfcbe6 100644 --- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantLocalizedText.java +++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantLocalizedText.java @@ -38,8 +38,8 @@ public class VariantLocalizedText extends Variant implements Message { // Accessors for discriminator values. - public Short getVariantType() { - return (short) 21; + public Byte getVariantType() { + return (byte) 21; } // Properties. diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantNodeId.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantNodeId.java index 855072ac9eb..e0ae9c89848 100644 --- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantNodeId.java +++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantNodeId.java @@ -38,8 +38,8 @@ public class VariantNodeId extends Variant implements Message { // Accessors for discriminator values. - public Short getVariantType() { - return (short) 17; + public Byte getVariantType() { + return (byte) 17; } // Properties. diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantQualifiedName.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantQualifiedName.java index ea1a04190d9..c8556784f6b 100644 --- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantQualifiedName.java +++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantQualifiedName.java @@ -38,8 +38,8 @@ public class VariantQualifiedName extends Variant implements Message { // Accessors for discriminator values. - public Short getVariantType() { - return (short) 20; + public Byte getVariantType() { + return (byte) 20; } // Properties. diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantSByte.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantSByte.java index 953fe7dd0d0..9a5cdb3fa68 100644 --- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantSByte.java +++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantSByte.java @@ -38,8 +38,8 @@ public class VariantSByte extends Variant implements Message { // Accessors for discriminator values. - public Short getVariantType() { - return (short) 2; + public Byte getVariantType() { + return (byte) 2; } // Properties. diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantStatusCode.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantStatusCode.java index ad7fe8dd136..0aa8e6f9249 100644 --- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantStatusCode.java +++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantStatusCode.java @@ -38,8 +38,8 @@ public class VariantStatusCode extends Variant implements Message { // Accessors for discriminator values. - public Short getVariantType() { - return (short) 19; + public Byte getVariantType() { + return (byte) 19; } // Properties. diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantString.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantString.java index ff298236aa4..cbb421bcf5f 100644 --- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantString.java +++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantString.java @@ -38,8 +38,8 @@ public class VariantString extends Variant implements Message { // Accessors for discriminator values. - public Short getVariantType() { - return (short) 12; + public Byte getVariantType() { + return (byte) 12; } // Properties. diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantUInt16.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantUInt16.java index 2215b06dfbd..04bbc933d7c 100644 --- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantUInt16.java +++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantUInt16.java @@ -38,8 +38,8 @@ public class VariantUInt16 extends Variant implements Message { // Accessors for discriminator values. - public Short getVariantType() { - return (short) 5; + public Byte getVariantType() { + return (byte) 5; } // Properties. diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantUInt32.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantUInt32.java index 1c37b835b1a..c42a0c7acc0 100644 --- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantUInt32.java +++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantUInt32.java @@ -38,8 +38,8 @@ public class VariantUInt32 extends Variant implements Message { // Accessors for discriminator values. - public Short getVariantType() { - return (short) 7; + public Byte getVariantType() { + return (byte) 7; } // Properties. diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantUInt64.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantUInt64.java index 9dec857c215..054473830ce 100644 --- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantUInt64.java +++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantUInt64.java @@ -39,8 +39,8 @@ public class VariantUInt64 extends Variant implements Message { // Accessors for discriminator values. - public Short getVariantType() { - return (short) 9; + public Byte getVariantType() { + return (byte) 9; } // Properties. diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantVariant.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantVariant.java index b255e82f2c7..e0f80d2f791 100644 --- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantVariant.java +++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantVariant.java @@ -38,8 +38,8 @@ public class VariantVariant extends Variant implements Message { // Accessors for discriminator values. - public Short getVariantType() { - return (short) 24; + public Byte getVariantType() { + return (byte) 24; } // Properties. diff --git a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantXmlElement.java b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantXmlElement.java index b18ad1d0bc0..1ba615e00e2 100644 --- a/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantXmlElement.java +++ b/plc4j/drivers/opcua/src/main/generated/org/apache/plc4x/java/opcua/readwrite/VariantXmlElement.java @@ -38,8 +38,8 @@ public class VariantXmlElement extends Variant implements Message { // Accessors for discriminator values. - public Short getVariantType() { - return (short) 16; + public Byte getVariantType() { + return (byte) 16; } // Properties. diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessage.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessage.java index 0ee81b51036..58b18ef3158 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessage.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessage.java @@ -44,7 +44,7 @@ public abstract class OpenProtocolMessage implements Message { public static final Short END = 0x00; // Properties. - protected final Long midRevision; + protected final Integer midRevision; protected final Short noAckFlag; protected final Integer targetStationId; protected final Integer targetSpindleId; @@ -53,7 +53,7 @@ public abstract class OpenProtocolMessage implements Message { protected final Short messagePartNumber; public OpenProtocolMessage( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -70,7 +70,7 @@ public OpenProtocolMessage( this.messagePartNumber = messagePartNumber; } - public Long getMidRevision() { + public Integer getMidRevision() { return midRevision; } @@ -128,7 +128,7 @@ public void serialize(WriteBuffer writeBuffer) throws SerializationException { writeOptionalField( "midRevision", midRevision, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII"), WithOption.WithNullBytesHex("202020")); @@ -242,20 +242,20 @@ public static OpenProtocolMessage staticParse(ReadBuffer readBuffer, Object... a throw new PlcRuntimeException( "Wrong number of arguments, expected 1, but got " + args.length); } - Long revision; - if (args[0] instanceof Long) { - revision = (Long) args[0]; + Integer revision; + if (args[0] instanceof Integer) { + revision = (Integer) args[0]; } else if (args[0] instanceof String) { - revision = Long.valueOf((String) args[0]); + revision = Integer.valueOf((String) args[0]); } else { throw new PlcRuntimeException( - "Argument 0 expected to be of type Long or a string which is parseable but was " + "Argument 0 expected to be of type Integer or a string which is parseable but was " + args[0].getClass().getName()); } return staticParse(readBuffer, revision); } - public static OpenProtocolMessage staticParse(ReadBuffer readBuffer, Long revision) + public static OpenProtocolMessage staticParse(ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessage"); PositionAware positionAware = readBuffer; @@ -271,10 +271,10 @@ public static OpenProtocolMessage staticParse(ReadBuffer readBuffer, Long revisi new DataReaderEnumDefault<>(Mid::enumForValue, readUnsignedLong(readBuffer, 32)), WithOption.WithEncoding("ASCII")); - Long midRevision = + Integer midRevision = readOptionalField( "midRevision", - readUnsignedLong(readBuffer, 24), + readUnsignedInt(readBuffer, 24), WithOption.WithEncoding("ASCII"), WithOption.WithNullBytesHex("202020")); @@ -515,7 +515,7 @@ public static OpenProtocolMessage staticParse(ReadBuffer readBuffer, Long revisi public interface OpenProtocolMessageBuilder { OpenProtocolMessage build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageAlarm.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageAlarm.java index 83cbe90fb1a..8d2255b48e2 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageAlarm.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageAlarm.java @@ -43,10 +43,10 @@ public Mid getMid() { } // Abstract accessors for discriminator values. - public abstract Long getRevision(); + public abstract Integer getRevision(); public OpenProtocolMessageAlarm( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -96,18 +96,18 @@ public int getLengthInBits() { } public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageAlarm"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) OpenProtocolMessageAlarmBuilder builder = null; - if (EvaluationHelper.equals(revision, (long) 1)) { + if (EvaluationHelper.equals(revision, (int) 1)) { builder = OpenProtocolMessageAlarmRev1.staticParseOpenProtocolMessageAlarmBuilder( readBuffer, revision); - } else if (EvaluationHelper.equals(revision, (long) 2)) { + } else if (EvaluationHelper.equals(revision, (int) 2)) { builder = OpenProtocolMessageAlarmRev2.staticParseOpenProtocolMessageAlarmBuilder( readBuffer, revision); @@ -128,7 +128,7 @@ public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( public interface OpenProtocolMessageAlarmBuilder { OpenProtocolMessageAlarm build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -146,7 +146,7 @@ public OpenProtocolMessageAlarmBuilderImpl(OpenProtocolMessageAlarmBuilder build } public OpenProtocolMessageAlarm build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageAlarmAcknowledge.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageAlarmAcknowledge.java index 8d9a82feecd..6b902a99fb5 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageAlarmAcknowledge.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageAlarmAcknowledge.java @@ -44,10 +44,10 @@ public Mid getMid() { } // Abstract accessors for discriminator values. - public abstract Long getRevision(); + public abstract Integer getRevision(); public OpenProtocolMessageAlarmAcknowledge( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -97,14 +97,14 @@ public int getLengthInBits() { } public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageAlarmAcknowledge"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) OpenProtocolMessageAlarmAcknowledgeBuilder builder = null; - if (EvaluationHelper.equals(revision, (long) 1)) { + if (EvaluationHelper.equals(revision, (int) 1)) { builder = OpenProtocolMessageAlarmAcknowledgeRev1 .staticParseOpenProtocolMessageAlarmAcknowledgeBuilder(readBuffer, revision); @@ -125,7 +125,7 @@ public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( public interface OpenProtocolMessageAlarmAcknowledgeBuilder { OpenProtocolMessageAlarmAcknowledge build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -144,7 +144,7 @@ public OpenProtocolMessageAlarmAcknowledgeBuilderImpl( } public OpenProtocolMessageAlarmAcknowledge build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageAlarmAcknowledgeRev1.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageAlarmAcknowledgeRev1.java index 5d7a815c805..4e04198f156 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageAlarmAcknowledgeRev1.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageAlarmAcknowledgeRev1.java @@ -39,12 +39,12 @@ public class OpenProtocolMessageAlarmAcknowledgeRev1 extends OpenProtocolMessage implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 1; + public Integer getRevision() { + return (int) 1; } public OpenProtocolMessageAlarmAcknowledgeRev1( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -86,7 +86,7 @@ public int getLengthInBits() { } public static OpenProtocolMessageAlarmAcknowledgeBuilder - staticParseOpenProtocolMessageAlarmAcknowledgeBuilder(ReadBuffer readBuffer, Long revision) + staticParseOpenProtocolMessageAlarmAcknowledgeBuilder(ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageAlarmAcknowledgeRev1"); PositionAware positionAware = readBuffer; @@ -103,7 +103,7 @@ public static class OpenProtocolMessageAlarmAcknowledgeRev1BuilderImpl public OpenProtocolMessageAlarmAcknowledgeRev1BuilderImpl() {} public OpenProtocolMessageAlarmAcknowledgeRev1 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageAlarmRev1.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageAlarmRev1.java index baaee96a77c..e485f6e7efc 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageAlarmRev1.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageAlarmRev1.java @@ -38,8 +38,8 @@ public class OpenProtocolMessageAlarmRev1 extends OpenProtocolMessageAlarm implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 1; + public Integer getRevision() { + return (int) 1; } // Constant values. @@ -55,7 +55,7 @@ public Long getRevision() { protected final String alarmTime; public OpenProtocolMessageAlarmRev1( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -215,7 +215,7 @@ public int getLengthInBits() { } public static OpenProtocolMessageAlarmBuilder staticParseOpenProtocolMessageAlarmBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageAlarmRev1"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -290,7 +290,7 @@ public OpenProtocolMessageAlarmRev1BuilderImpl( } public OpenProtocolMessageAlarmRev1 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageAlarmRev2.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageAlarmRev2.java index 1f6ea372786..63d339f2fe1 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageAlarmRev2.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageAlarmRev2.java @@ -38,8 +38,8 @@ public class OpenProtocolMessageAlarmRev2 extends OpenProtocolMessageAlarm implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 2; + public Integer getRevision() { + return (int) 2; } // Constant values. @@ -57,7 +57,7 @@ public Long getRevision() { protected final String alarmText; public OpenProtocolMessageAlarmRev2( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -244,7 +244,7 @@ public int getLengthInBits() { } public static OpenProtocolMessageAlarmBuilder staticParseOpenProtocolMessageAlarmBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageAlarmRev2"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -335,7 +335,7 @@ public OpenProtocolMessageAlarmRev2BuilderImpl( } public OpenProtocolMessageAlarmRev2 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageAlarmStatus.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageAlarmStatus.java index f14346498fd..989f94cbf9a 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageAlarmStatus.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageAlarmStatus.java @@ -44,10 +44,10 @@ public Mid getMid() { } // Abstract accessors for discriminator values. - public abstract Long getRevision(); + public abstract Integer getRevision(); public OpenProtocolMessageAlarmStatus( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -97,18 +97,18 @@ public int getLengthInBits() { } public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageAlarmStatus"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) OpenProtocolMessageAlarmStatusBuilder builder = null; - if (EvaluationHelper.equals(revision, (long) 1)) { + if (EvaluationHelper.equals(revision, (int) 1)) { builder = OpenProtocolMessageAlarmStatusRev1.staticParseOpenProtocolMessageAlarmStatusBuilder( readBuffer, revision); - } else if (EvaluationHelper.equals(revision, (long) 2)) { + } else if (EvaluationHelper.equals(revision, (int) 2)) { builder = OpenProtocolMessageAlarmStatusRev2.staticParseOpenProtocolMessageAlarmStatusBuilder( readBuffer, revision); @@ -129,7 +129,7 @@ public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( public interface OpenProtocolMessageAlarmStatusBuilder { OpenProtocolMessageAlarmStatus build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -148,7 +148,7 @@ public OpenProtocolMessageAlarmStatusBuilderImpl( } public OpenProtocolMessageAlarmStatus build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageAlarmStatusAcknowledge.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageAlarmStatusAcknowledge.java index 91ba0324029..2018a819c85 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageAlarmStatusAcknowledge.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageAlarmStatusAcknowledge.java @@ -44,10 +44,10 @@ public Mid getMid() { } // Abstract accessors for discriminator values. - public abstract Long getRevision(); + public abstract Integer getRevision(); public OpenProtocolMessageAlarmStatusAcknowledge( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -97,14 +97,14 @@ public int getLengthInBits() { } public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageAlarmStatusAcknowledge"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) OpenProtocolMessageAlarmStatusAcknowledgeBuilder builder = null; - if (EvaluationHelper.equals(revision, (long) 1)) { + if (EvaluationHelper.equals(revision, (int) 1)) { builder = OpenProtocolMessageAlarmStatusAcknowledgeRev1 .staticParseOpenProtocolMessageAlarmStatusAcknowledgeBuilder(readBuffer, revision); @@ -125,7 +125,7 @@ public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( public interface OpenProtocolMessageAlarmStatusAcknowledgeBuilder { OpenProtocolMessageAlarmStatusAcknowledge build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -144,7 +144,7 @@ public OpenProtocolMessageAlarmStatusAcknowledgeBuilderImpl( } public OpenProtocolMessageAlarmStatusAcknowledge build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageAlarmStatusAcknowledgeRev1.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageAlarmStatusAcknowledgeRev1.java index 1af99c0ff4c..01b61766989 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageAlarmStatusAcknowledgeRev1.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageAlarmStatusAcknowledgeRev1.java @@ -39,12 +39,12 @@ public class OpenProtocolMessageAlarmStatusAcknowledgeRev1 extends OpenProtocolMessageAlarmStatusAcknowledge implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 1; + public Integer getRevision() { + return (int) 1; } public OpenProtocolMessageAlarmStatusAcknowledgeRev1( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -87,7 +87,7 @@ public int getLengthInBits() { public static OpenProtocolMessageAlarmStatusAcknowledgeBuilder staticParseOpenProtocolMessageAlarmStatusAcknowledgeBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageAlarmStatusAcknowledgeRev1"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -104,7 +104,7 @@ public static class OpenProtocolMessageAlarmStatusAcknowledgeRev1BuilderImpl public OpenProtocolMessageAlarmStatusAcknowledgeRev1BuilderImpl() {} public OpenProtocolMessageAlarmStatusAcknowledgeRev1 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageAlarmStatusRev1.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageAlarmStatusRev1.java index 09d9ad84957..57f0790a460 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageAlarmStatusRev1.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageAlarmStatusRev1.java @@ -39,8 +39,8 @@ public class OpenProtocolMessageAlarmStatusRev1 extends OpenProtocolMessageAlarm implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 1; + public Integer getRevision() { + return (int) 1; } // Constant values. @@ -58,7 +58,7 @@ public Long getRevision() { protected final String alarmTime; public OpenProtocolMessageAlarmStatusRev1( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -252,7 +252,7 @@ public int getLengthInBits() { } public static OpenProtocolMessageAlarmStatusBuilder - staticParseOpenProtocolMessageAlarmStatusBuilder(ReadBuffer readBuffer, Long revision) + staticParseOpenProtocolMessageAlarmStatusBuilder(ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageAlarmStatusRev1"); PositionAware positionAware = readBuffer; @@ -349,7 +349,7 @@ public OpenProtocolMessageAlarmStatusRev1BuilderImpl( } public OpenProtocolMessageAlarmStatusRev1 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageAlarmStatusRev2.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageAlarmStatusRev2.java index a474261baf7..2282ba8705e 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageAlarmStatusRev2.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageAlarmStatusRev2.java @@ -39,8 +39,8 @@ public class OpenProtocolMessageAlarmStatusRev2 extends OpenProtocolMessageAlarm implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 2; + public Integer getRevision() { + return (int) 2; } // Constant values. @@ -58,7 +58,7 @@ public Long getRevision() { protected final String alarmTime; public OpenProtocolMessageAlarmStatusRev2( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -252,7 +252,7 @@ public int getLengthInBits() { } public static OpenProtocolMessageAlarmStatusBuilder - staticParseOpenProtocolMessageAlarmStatusBuilder(ReadBuffer readBuffer, Long revision) + staticParseOpenProtocolMessageAlarmStatusBuilder(ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageAlarmStatusRev2"); PositionAware positionAware = readBuffer; @@ -349,7 +349,7 @@ public OpenProtocolMessageAlarmStatusRev2BuilderImpl( } public OpenProtocolMessageAlarmStatusRev2 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageAlarmSubscribe.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageAlarmSubscribe.java index beed7c35901..1f314a84868 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageAlarmSubscribe.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageAlarmSubscribe.java @@ -44,10 +44,10 @@ public Mid getMid() { } // Abstract accessors for discriminator values. - public abstract Long getRevision(); + public abstract Integer getRevision(); public OpenProtocolMessageAlarmSubscribe( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -97,14 +97,14 @@ public int getLengthInBits() { } public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageAlarmSubscribe"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) OpenProtocolMessageAlarmSubscribeBuilder builder = null; - if (EvaluationHelper.equals(revision, (long) 1)) { + if (EvaluationHelper.equals(revision, (int) 1)) { builder = OpenProtocolMessageAlarmSubscribeRev1.staticParseOpenProtocolMessageAlarmSubscribeBuilder( readBuffer, revision); @@ -125,7 +125,7 @@ public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( public interface OpenProtocolMessageAlarmSubscribeBuilder { OpenProtocolMessageAlarmSubscribe build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -144,7 +144,7 @@ public OpenProtocolMessageAlarmSubscribeBuilderImpl( } public OpenProtocolMessageAlarmSubscribe build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageAlarmSubscribeRev1.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageAlarmSubscribeRev1.java index ffda7226995..380a5de07ea 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageAlarmSubscribeRev1.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageAlarmSubscribeRev1.java @@ -39,12 +39,12 @@ public class OpenProtocolMessageAlarmSubscribeRev1 extends OpenProtocolMessageAl implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 1; + public Integer getRevision() { + return (int) 1; } public OpenProtocolMessageAlarmSubscribeRev1( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -86,7 +86,7 @@ public int getLengthInBits() { } public static OpenProtocolMessageAlarmSubscribeBuilder - staticParseOpenProtocolMessageAlarmSubscribeBuilder(ReadBuffer readBuffer, Long revision) + staticParseOpenProtocolMessageAlarmSubscribeBuilder(ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageAlarmSubscribeRev1"); PositionAware positionAware = readBuffer; @@ -103,7 +103,7 @@ public static class OpenProtocolMessageAlarmSubscribeRev1BuilderImpl public OpenProtocolMessageAlarmSubscribeRev1BuilderImpl() {} public OpenProtocolMessageAlarmSubscribeRev1 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageAlarmUnsubscribe.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageAlarmUnsubscribe.java index 2ce7b590301..61c98709f0b 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageAlarmUnsubscribe.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageAlarmUnsubscribe.java @@ -44,10 +44,10 @@ public Mid getMid() { } // Abstract accessors for discriminator values. - public abstract Long getRevision(); + public abstract Integer getRevision(); public OpenProtocolMessageAlarmUnsubscribe( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -97,14 +97,14 @@ public int getLengthInBits() { } public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageAlarmUnsubscribe"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) OpenProtocolMessageAlarmUnsubscribeBuilder builder = null; - if (EvaluationHelper.equals(revision, (long) 1)) { + if (EvaluationHelper.equals(revision, (int) 1)) { builder = OpenProtocolMessageAlarmUnsubscribeRev1 .staticParseOpenProtocolMessageAlarmUnsubscribeBuilder(readBuffer, revision); @@ -125,7 +125,7 @@ public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( public interface OpenProtocolMessageAlarmUnsubscribeBuilder { OpenProtocolMessageAlarmUnsubscribe build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -144,7 +144,7 @@ public OpenProtocolMessageAlarmUnsubscribeBuilderImpl( } public OpenProtocolMessageAlarmUnsubscribe build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageAlarmUnsubscribeRev1.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageAlarmUnsubscribeRev1.java index 85112350a16..fb40b874a37 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageAlarmUnsubscribeRev1.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageAlarmUnsubscribeRev1.java @@ -39,12 +39,12 @@ public class OpenProtocolMessageAlarmUnsubscribeRev1 extends OpenProtocolMessage implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 1; + public Integer getRevision() { + return (int) 1; } public OpenProtocolMessageAlarmUnsubscribeRev1( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -86,7 +86,7 @@ public int getLengthInBits() { } public static OpenProtocolMessageAlarmUnsubscribeBuilder - staticParseOpenProtocolMessageAlarmUnsubscribeBuilder(ReadBuffer readBuffer, Long revision) + staticParseOpenProtocolMessageAlarmUnsubscribeBuilder(ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageAlarmUnsubscribeRev1"); PositionAware positionAware = readBuffer; @@ -103,7 +103,7 @@ public static class OpenProtocolMessageAlarmUnsubscribeRev1BuilderImpl public OpenProtocolMessageAlarmUnsubscribeRev1BuilderImpl() {} public OpenProtocolMessageAlarmUnsubscribeRev1 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationCommandAccepted.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationCommandAccepted.java index 92c2c1d0f9c..7e3d9005a78 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationCommandAccepted.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationCommandAccepted.java @@ -44,10 +44,10 @@ public Mid getMid() { } // Abstract accessors for discriminator values. - public abstract Long getRevision(); + public abstract Integer getRevision(); public OpenProtocolMessageApplicationCommandAccepted( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -97,14 +97,14 @@ public int getLengthInBits() { } public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageApplicationCommandAccepted"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) OpenProtocolMessageApplicationCommandAcceptedBuilder builder = null; - if (EvaluationHelper.equals(revision, (long) 1)) { + if (EvaluationHelper.equals(revision, (int) 1)) { builder = OpenProtocolMessageApplicationCommandAcceptedRev1 .staticParseOpenProtocolMessageApplicationCommandAcceptedBuilder( @@ -126,7 +126,7 @@ public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( public interface OpenProtocolMessageApplicationCommandAcceptedBuilder { OpenProtocolMessageApplicationCommandAccepted build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -145,7 +145,7 @@ public OpenProtocolMessageApplicationCommandAcceptedBuilderImpl( } public OpenProtocolMessageApplicationCommandAccepted build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationCommandAcceptedRev1.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationCommandAcceptedRev1.java index 8617291bcf6..aa5adb98bb4 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationCommandAcceptedRev1.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationCommandAcceptedRev1.java @@ -39,15 +39,15 @@ public class OpenProtocolMessageApplicationCommandAcceptedRev1 extends OpenProtocolMessageApplicationCommandAccepted implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 1; + public Integer getRevision() { + return (int) 1; } // Properties. protected final Mid midNumberAccepted; public OpenProtocolMessageApplicationCommandAcceptedRev1( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -107,7 +107,7 @@ public int getLengthInBits() { public static OpenProtocolMessageApplicationCommandAcceptedBuilder staticParseOpenProtocolMessageApplicationCommandAcceptedBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageApplicationCommandAcceptedRev1"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -134,7 +134,7 @@ public OpenProtocolMessageApplicationCommandAcceptedRev1BuilderImpl(Mid midNumbe } public OpenProtocolMessageApplicationCommandAcceptedRev1 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationCommandError.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationCommandError.java index 5e85df2733b..cab3bdd5185 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationCommandError.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationCommandError.java @@ -44,10 +44,10 @@ public Mid getMid() { } // Abstract accessors for discriminator values. - public abstract Long getRevision(); + public abstract Integer getRevision(); public OpenProtocolMessageApplicationCommandError( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -97,14 +97,14 @@ public int getLengthInBits() { } public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageApplicationCommandError"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) OpenProtocolMessageApplicationCommandErrorBuilder builder = null; - if (EvaluationHelper.equals(revision, (long) 1)) { + if (EvaluationHelper.equals(revision, (int) 1)) { builder = OpenProtocolMessageApplicationCommandErrorRev1 .staticParseOpenProtocolMessageApplicationCommandErrorBuilder(readBuffer, revision); @@ -125,7 +125,7 @@ public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( public interface OpenProtocolMessageApplicationCommandErrorBuilder { OpenProtocolMessageApplicationCommandError build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -144,7 +144,7 @@ public OpenProtocolMessageApplicationCommandErrorBuilderImpl( } public OpenProtocolMessageApplicationCommandError build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationCommandErrorRev1.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationCommandErrorRev1.java index 575ea0d9141..f16ae20e8fd 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationCommandErrorRev1.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationCommandErrorRev1.java @@ -39,8 +39,8 @@ public class OpenProtocolMessageApplicationCommandErrorRev1 extends OpenProtocolMessageApplicationCommandError implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 1; + public Integer getRevision() { + return (int) 1; } // Properties. @@ -48,7 +48,7 @@ public Long getRevision() { protected final ApplicationCommunicationError error; public OpenProtocolMessageApplicationCommandErrorRev1( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -128,7 +128,7 @@ public int getLengthInBits() { public static OpenProtocolMessageApplicationCommandErrorBuilder staticParseOpenProtocolMessageApplicationCommandErrorBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageApplicationCommandErrorRev1"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -166,7 +166,7 @@ public OpenProtocolMessageApplicationCommandErrorRev1BuilderImpl( } public OpenProtocolMessageApplicationCommandErrorRev1 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationCommunicationStart.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationCommunicationStart.java index 955b7af36d0..b932e2cb82f 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationCommunicationStart.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationCommunicationStart.java @@ -44,7 +44,7 @@ public Mid getMid() { } public OpenProtocolMessageApplicationCommunicationStart( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -86,7 +86,7 @@ public int getLengthInBits() { } public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageApplicationCommunicationStart"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -102,7 +102,7 @@ public static class OpenProtocolMessageApplicationCommunicationStartBuilderImpl public OpenProtocolMessageApplicationCommunicationStartBuilderImpl() {} public OpenProtocolMessageApplicationCommunicationStart build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationCommunicationStartAcknowledge.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationCommunicationStartAcknowledge.java index 1336877d610..bc1b18a7047 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationCommunicationStartAcknowledge.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationCommunicationStartAcknowledge.java @@ -44,10 +44,10 @@ public Mid getMid() { } // Abstract accessors for discriminator values. - public abstract Long getRevision(); + public abstract Integer getRevision(); public OpenProtocolMessageApplicationCommunicationStartAcknowledge( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -97,39 +97,39 @@ public int getLengthInBits() { } public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageApplicationCommunicationStartAcknowledge"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) OpenProtocolMessageApplicationCommunicationStartAcknowledgeBuilder builder = null; - if (EvaluationHelper.equals(revision, (long) 1)) { + if (EvaluationHelper.equals(revision, (int) 1)) { builder = OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev1 .staticParseOpenProtocolMessageApplicationCommunicationStartAcknowledgeBuilder( readBuffer, revision); - } else if (EvaluationHelper.equals(revision, (long) 2)) { + } else if (EvaluationHelper.equals(revision, (int) 2)) { builder = OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev2 .staticParseOpenProtocolMessageApplicationCommunicationStartAcknowledgeBuilder( readBuffer, revision); - } else if (EvaluationHelper.equals(revision, (long) 3)) { + } else if (EvaluationHelper.equals(revision, (int) 3)) { builder = OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev3 .staticParseOpenProtocolMessageApplicationCommunicationStartAcknowledgeBuilder( readBuffer, revision); - } else if (EvaluationHelper.equals(revision, (long) 4)) { + } else if (EvaluationHelper.equals(revision, (int) 4)) { builder = OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev4 .staticParseOpenProtocolMessageApplicationCommunicationStartAcknowledgeBuilder( readBuffer, revision); - } else if (EvaluationHelper.equals(revision, (long) 5)) { + } else if (EvaluationHelper.equals(revision, (int) 5)) { builder = OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev5 .staticParseOpenProtocolMessageApplicationCommunicationStartAcknowledgeBuilder( readBuffer, revision); - } else if (EvaluationHelper.equals(revision, (long) 6)) { + } else if (EvaluationHelper.equals(revision, (int) 6)) { builder = OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev6 .staticParseOpenProtocolMessageApplicationCommunicationStartAcknowledgeBuilder( @@ -151,7 +151,7 @@ public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( public interface OpenProtocolMessageApplicationCommunicationStartAcknowledgeBuilder { OpenProtocolMessageApplicationCommunicationStartAcknowledge build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -170,7 +170,7 @@ public OpenProtocolMessageApplicationCommunicationStartAcknowledgeBuilderImpl( } public OpenProtocolMessageApplicationCommunicationStartAcknowledge build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev1.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev1.java index d94c741109e..39944333430 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev1.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev1.java @@ -39,8 +39,8 @@ public class OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev1 extends OpenProtocolMessageApplicationCommunicationStartAcknowledge implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 1; + public Integer getRevision() { + return (int) 1; } // Constant values. @@ -54,7 +54,7 @@ public Long getRevision() { protected final String controllerName; public OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev1( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -184,7 +184,7 @@ public int getLengthInBits() { public static OpenProtocolMessageApplicationCommunicationStartAcknowledgeBuilder staticParseOpenProtocolMessageApplicationCommunicationStartAcknowledgeBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev1"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -243,7 +243,7 @@ public OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev1BuilderImp } public OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev1 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev2.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev2.java index 55e8f28ebc5..c03f3244296 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev2.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev2.java @@ -39,8 +39,8 @@ public class OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev2 extends OpenProtocolMessageApplicationCommunicationStartAcknowledge implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 2; + public Integer getRevision() { + return (int) 2; } // Constant values. @@ -53,10 +53,10 @@ public Long getRevision() { protected final long cellId; protected final int channelId; protected final String controllerName; - protected final long supplierCode; + protected final int supplierCode; public OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev2( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -66,7 +66,7 @@ public OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev2( long cellId, int channelId, String controllerName, - long supplierCode) { + int supplierCode) { super( midRevision, noAckFlag, @@ -93,7 +93,7 @@ public String getControllerName() { return controllerName; } - public long getSupplierCode() { + public int getSupplierCode() { return supplierCode; } @@ -170,7 +170,7 @@ protected void serializeOpenProtocolMessageApplicationCommunicationStartAcknowle writeSimpleField( "supplierCode", supplierCode, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); writeBuffer.popContext("OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev2"); @@ -216,7 +216,7 @@ public int getLengthInBits() { public static OpenProtocolMessageApplicationCommunicationStartAcknowledgeBuilder staticParseOpenProtocolMessageApplicationCommunicationStartAcknowledgeBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev2"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -261,9 +261,9 @@ public int getLengthInBits() { OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev2.BLOCKIDSUPPLIERCODE, WithOption.WithEncoding("ASCII")); - long supplierCode = + int supplierCode = readSimpleField( - "supplierCode", readUnsignedLong(readBuffer, 24), WithOption.WithEncoding("ASCII")); + "supplierCode", readUnsignedInt(readBuffer, 24), WithOption.WithEncoding("ASCII")); readBuffer.closeContext("OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev2"); // Create the instance @@ -277,10 +277,10 @@ public static class OpenProtocolMessageApplicationCommunicationStartAcknowledgeR private final long cellId; private final int channelId; private final String controllerName; - private final long supplierCode; + private final int supplierCode; public OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev2BuilderImpl( - long cellId, int channelId, String controllerName, long supplierCode) { + long cellId, int channelId, String controllerName, int supplierCode) { this.cellId = cellId; this.channelId = channelId; this.controllerName = controllerName; @@ -288,7 +288,7 @@ public OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev2BuilderImp } public OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev2 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev3.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev3.java index 88b51586b26..36467dfc172 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev3.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev3.java @@ -39,8 +39,8 @@ public class OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev3 extends OpenProtocolMessageApplicationCommunicationStartAcknowledge implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 3; + public Integer getRevision() { + return (int) 3; } // Constant values. @@ -56,13 +56,13 @@ public Long getRevision() { protected final long cellId; protected final int channelId; protected final String controllerName; - protected final long supplierCode; + protected final int supplierCode; protected final String openProtocolVersion; protected final String controllerSoftwareVersion; protected final String toolSoftwareVersion; public OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev3( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -72,7 +72,7 @@ public OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev3( long cellId, int channelId, String controllerName, - long supplierCode, + int supplierCode, String openProtocolVersion, String controllerSoftwareVersion, String toolSoftwareVersion) { @@ -105,7 +105,7 @@ public String getControllerName() { return controllerName; } - public long getSupplierCode() { + public int getSupplierCode() { return supplierCode; } @@ -206,7 +206,7 @@ protected void serializeOpenProtocolMessageApplicationCommunicationStartAcknowle writeSimpleField( "supplierCode", supplierCode, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); // Const Field (blockIdOpenProtocolVersion) @@ -312,7 +312,7 @@ public int getLengthInBits() { public static OpenProtocolMessageApplicationCommunicationStartAcknowledgeBuilder staticParseOpenProtocolMessageApplicationCommunicationStartAcknowledgeBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev3"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -357,9 +357,9 @@ public int getLengthInBits() { OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev3.BLOCKIDSUPPLIERCODE, WithOption.WithEncoding("ASCII")); - long supplierCode = + int supplierCode = readSimpleField( - "supplierCode", readUnsignedLong(readBuffer, 24), WithOption.WithEncoding("ASCII")); + "supplierCode", readUnsignedInt(readBuffer, 24), WithOption.WithEncoding("ASCII")); int blockIdOpenProtocolVersion = readConstField( @@ -417,7 +417,7 @@ public static class OpenProtocolMessageApplicationCommunicationStartAcknowledgeR private final long cellId; private final int channelId; private final String controllerName; - private final long supplierCode; + private final int supplierCode; private final String openProtocolVersion; private final String controllerSoftwareVersion; private final String toolSoftwareVersion; @@ -426,7 +426,7 @@ public OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev3BuilderImp long cellId, int channelId, String controllerName, - long supplierCode, + int supplierCode, String openProtocolVersion, String controllerSoftwareVersion, String toolSoftwareVersion) { @@ -440,7 +440,7 @@ public OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev3BuilderImp } public OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev3 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev4.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev4.java index 99ad73007ce..68ceff0a65d 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev4.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev4.java @@ -39,8 +39,8 @@ public class OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev4 extends OpenProtocolMessageApplicationCommunicationStartAcknowledge implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 4; + public Integer getRevision() { + return (int) 4; } // Constant values. @@ -58,7 +58,7 @@ public Long getRevision() { protected final long cellId; protected final int channelId; protected final String controllerName; - protected final long supplierCode; + protected final int supplierCode; protected final String openProtocolVersion; protected final String controllerSoftwareVersion; protected final String toolSoftwareVersion; @@ -66,7 +66,7 @@ public Long getRevision() { protected final String controllerSerialNumber; public OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev4( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -76,7 +76,7 @@ public OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev4( long cellId, int channelId, String controllerName, - long supplierCode, + int supplierCode, String openProtocolVersion, String controllerSoftwareVersion, String toolSoftwareVersion, @@ -113,7 +113,7 @@ public String getControllerName() { return controllerName; } - public long getSupplierCode() { + public int getSupplierCode() { return supplierCode; } @@ -230,7 +230,7 @@ protected void serializeOpenProtocolMessageApplicationCommunicationStartAcknowle writeSimpleField( "supplierCode", supplierCode, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); // Const Field (blockIdOpenProtocolVersion) @@ -373,7 +373,7 @@ public int getLengthInBits() { public static OpenProtocolMessageApplicationCommunicationStartAcknowledgeBuilder staticParseOpenProtocolMessageApplicationCommunicationStartAcknowledgeBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev4"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -418,9 +418,9 @@ public int getLengthInBits() { OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev4.BLOCKIDSUPPLIERCODE, WithOption.WithEncoding("ASCII")); - long supplierCode = + int supplierCode = readSimpleField( - "supplierCode", readUnsignedLong(readBuffer, 24), WithOption.WithEncoding("ASCII")); + "supplierCode", readUnsignedInt(readBuffer, 24), WithOption.WithEncoding("ASCII")); int blockIdOpenProtocolVersion = readConstField( @@ -502,7 +502,7 @@ public static class OpenProtocolMessageApplicationCommunicationStartAcknowledgeR private final long cellId; private final int channelId; private final String controllerName; - private final long supplierCode; + private final int supplierCode; private final String openProtocolVersion; private final String controllerSoftwareVersion; private final String toolSoftwareVersion; @@ -513,7 +513,7 @@ public OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev4BuilderImp long cellId, int channelId, String controllerName, - long supplierCode, + int supplierCode, String openProtocolVersion, String controllerSoftwareVersion, String toolSoftwareVersion, @@ -531,7 +531,7 @@ public OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev4BuilderImp } public OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev4 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev5.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev5.java index c94f934d67c..d31c85fe70d 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev5.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev5.java @@ -39,8 +39,8 @@ public class OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev5 extends OpenProtocolMessageApplicationCommunicationStartAcknowledge implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 5; + public Integer getRevision() { + return (int) 5; } // Constant values. @@ -60,7 +60,7 @@ public Long getRevision() { protected final long cellId; protected final int channelId; protected final String controllerName; - protected final long supplierCode; + protected final int supplierCode; protected final String openProtocolVersion; protected final String controllerSoftwareVersion; protected final String toolSoftwareVersion; @@ -70,7 +70,7 @@ public Long getRevision() { protected final String systemSubtype; public OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev5( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -80,7 +80,7 @@ public OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev5( long cellId, int channelId, String controllerName, - long supplierCode, + int supplierCode, String openProtocolVersion, String controllerSoftwareVersion, String toolSoftwareVersion, @@ -121,7 +121,7 @@ public String getControllerName() { return controllerName; } - public long getSupplierCode() { + public int getSupplierCode() { return supplierCode; } @@ -254,7 +254,7 @@ protected void serializeOpenProtocolMessageApplicationCommunicationStartAcknowle writeSimpleField( "supplierCode", supplierCode, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); // Const Field (blockIdOpenProtocolVersion) @@ -434,7 +434,7 @@ public int getLengthInBits() { public static OpenProtocolMessageApplicationCommunicationStartAcknowledgeBuilder staticParseOpenProtocolMessageApplicationCommunicationStartAcknowledgeBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev5"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -479,9 +479,9 @@ public int getLengthInBits() { OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev5.BLOCKIDSUPPLIERCODE, WithOption.WithEncoding("ASCII")); - long supplierCode = + int supplierCode = readSimpleField( - "supplierCode", readUnsignedLong(readBuffer, 24), WithOption.WithEncoding("ASCII")); + "supplierCode", readUnsignedInt(readBuffer, 24), WithOption.WithEncoding("ASCII")); int blockIdOpenProtocolVersion = readConstField( @@ -586,7 +586,7 @@ public static class OpenProtocolMessageApplicationCommunicationStartAcknowledgeR private final long cellId; private final int channelId; private final String controllerName; - private final long supplierCode; + private final int supplierCode; private final String openProtocolVersion; private final String controllerSoftwareVersion; private final String toolSoftwareVersion; @@ -599,7 +599,7 @@ public OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev5BuilderImp long cellId, int channelId, String controllerName, - long supplierCode, + int supplierCode, String openProtocolVersion, String controllerSoftwareVersion, String toolSoftwareVersion, @@ -621,7 +621,7 @@ public OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev5BuilderImp } public OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev5 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev6.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev6.java index a530c9b5298..2a4cb48b08e 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev6.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev6.java @@ -39,8 +39,8 @@ public class OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev6 extends OpenProtocolMessageApplicationCommunicationStartAcknowledge implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 6; + public Integer getRevision() { + return (int) 6; } // Constant values. @@ -65,7 +65,7 @@ public Long getRevision() { protected final long cellId; protected final int channelId; protected final String controllerName; - protected final long supplierCode; + protected final int supplierCode; protected final String openProtocolVersion; protected final String controllerSoftwareVersion; protected final String toolSoftwareVersion; @@ -80,7 +80,7 @@ public Long getRevision() { protected final short clientId; public OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev6( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -90,7 +90,7 @@ public OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev6( long cellId, int channelId, String controllerName, - long supplierCode, + int supplierCode, String openProtocolVersion, String controllerSoftwareVersion, String toolSoftwareVersion, @@ -141,7 +141,7 @@ public String getControllerName() { return controllerName; } - public long getSupplierCode() { + public int getSupplierCode() { return supplierCode; } @@ -314,7 +314,7 @@ protected void serializeOpenProtocolMessageApplicationCommunicationStartAcknowle writeSimpleField( "supplierCode", supplierCode, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); // Const Field (blockIdOpenProtocolVersion) @@ -417,7 +417,7 @@ protected void serializeOpenProtocolMessageApplicationCommunicationStartAcknowle WithOption.WithEncoding("ASCII")); // Reserved Field (reserved) - writeReservedField("reserved", (short) 0x00, writeUnsignedShort(writeBuffer, 7)); + writeReservedField("reserved", (byte) 0x00, writeUnsignedByte(writeBuffer, 7)); // Simple Field (sequenceNumberSupport) writeSimpleField("sequenceNumberSupport", sequenceNumberSupport, writeBoolean(writeBuffer)); @@ -430,7 +430,7 @@ protected void serializeOpenProtocolMessageApplicationCommunicationStartAcknowle WithOption.WithEncoding("ASCII")); // Reserved Field (reserved) - writeReservedField("reserved", (short) 0x00, writeUnsignedShort(writeBuffer, 7)); + writeReservedField("reserved", (byte) 0x00, writeUnsignedByte(writeBuffer, 7)); // Simple Field (linkingHandlingSupport) writeSimpleField("linkingHandlingSupport", linkingHandlingSupport, writeBoolean(writeBuffer)); @@ -592,7 +592,7 @@ public int getLengthInBits() { public static OpenProtocolMessageApplicationCommunicationStartAcknowledgeBuilder staticParseOpenProtocolMessageApplicationCommunicationStartAcknowledgeBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev6"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -637,9 +637,9 @@ public int getLengthInBits() { OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev6.BLOCKIDSUPPLIERCODE, WithOption.WithEncoding("ASCII")); - long supplierCode = + int supplierCode = readSimpleField( - "supplierCode", readUnsignedLong(readBuffer, 24), WithOption.WithEncoding("ASCII")); + "supplierCode", readUnsignedInt(readBuffer, 24), WithOption.WithEncoding("ASCII")); int blockIdOpenProtocolVersion = readConstField( @@ -730,8 +730,8 @@ public int getLengthInBits() { .BLOCKIDSEQUENCENUMBERSUPPORT, WithOption.WithEncoding("ASCII")); - Short reservedField0 = - readReservedField("reserved", readUnsignedShort(readBuffer, 7), (short) 0x00); + Byte reservedField0 = + readReservedField("reserved", readUnsignedByte(readBuffer, 7), (byte) 0x00); boolean sequenceNumberSupport = readSimpleField("sequenceNumberSupport", readBoolean(readBuffer)); @@ -744,8 +744,8 @@ public int getLengthInBits() { .BLOCKIDLINKINGHANDLINGSUPPORT, WithOption.WithEncoding("ASCII")); - Short reservedField1 = - readReservedField("reserved", readUnsignedShort(readBuffer, 7), (short) 0x00); + Byte reservedField1 = + readReservedField("reserved", readUnsignedByte(readBuffer, 7), (byte) 0x00); boolean linkingHandlingSupport = readSimpleField("linkingHandlingSupport", readBoolean(readBuffer)); @@ -809,7 +809,7 @@ public static class OpenProtocolMessageApplicationCommunicationStartAcknowledgeR private final long cellId; private final int channelId; private final String controllerName; - private final long supplierCode; + private final int supplierCode; private final String openProtocolVersion; private final String controllerSoftwareVersion; private final String toolSoftwareVersion; @@ -827,7 +827,7 @@ public OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev6BuilderImp long cellId, int channelId, String controllerName, - long supplierCode, + int supplierCode, String openProtocolVersion, String controllerSoftwareVersion, String toolSoftwareVersion, @@ -859,7 +859,7 @@ public OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev6BuilderImp } public OpenProtocolMessageApplicationCommunicationStartAcknowledgeRev6 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationCommunicationStop.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationCommunicationStop.java index ed638e17bdf..10f022635aa 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationCommunicationStop.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationCommunicationStop.java @@ -44,7 +44,7 @@ public Mid getMid() { } public OpenProtocolMessageApplicationCommunicationStop( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -86,7 +86,7 @@ public int getLengthInBits() { } public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageApplicationCommunicationStop"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -102,7 +102,7 @@ public static class OpenProtocolMessageApplicationCommunicationStopBuilderImpl public OpenProtocolMessageApplicationCommunicationStopBuilderImpl() {} public OpenProtocolMessageApplicationCommunicationStop build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationGenericDataRequest.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationGenericDataRequest.java index 277616fa51e..a0355aac810 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationGenericDataRequest.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationGenericDataRequest.java @@ -44,10 +44,10 @@ public Mid getMid() { } // Abstract accessors for discriminator values. - public abstract Long getRevision(); + public abstract Integer getRevision(); public OpenProtocolMessageApplicationGenericDataRequest( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -97,14 +97,14 @@ public int getLengthInBits() { } public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageApplicationGenericDataRequest"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) OpenProtocolMessageApplicationGenericDataRequestBuilder builder = null; - if (EvaluationHelper.equals(revision, (long) 1)) { + if (EvaluationHelper.equals(revision, (int) 1)) { builder = OpenProtocolMessageApplicationGenericDataRequestRev1 .staticParseOpenProtocolMessageApplicationGenericDataRequestBuilder( @@ -126,7 +126,7 @@ public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( public interface OpenProtocolMessageApplicationGenericDataRequestBuilder { OpenProtocolMessageApplicationGenericDataRequest build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -145,7 +145,7 @@ public OpenProtocolMessageApplicationGenericDataRequestBuilderImpl( } public OpenProtocolMessageApplicationGenericDataRequest build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationGenericDataRequestRev1.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationGenericDataRequestRev1.java index 78eba7d9eb1..2a4d87e4925 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationGenericDataRequestRev1.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationGenericDataRequestRev1.java @@ -39,17 +39,17 @@ public class OpenProtocolMessageApplicationGenericDataRequestRev1 extends OpenProtocolMessageApplicationGenericDataRequest implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 1; + public Integer getRevision() { + return (int) 1; } // Properties. protected final Mid requestMid; - protected final long wantedRevision; + protected final int wantedRevision; protected final byte[] extraData; public OpenProtocolMessageApplicationGenericDataRequestRev1( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -57,7 +57,7 @@ public OpenProtocolMessageApplicationGenericDataRequestRev1( Short numberOfMessageParts, Short messagePartNumber, Mid requestMid, - long wantedRevision, + int wantedRevision, byte[] extraData) { super( midRevision, @@ -76,7 +76,7 @@ public Mid getRequestMid() { return requestMid; } - public long getWantedRevision() { + public int getWantedRevision() { return wantedRevision; } @@ -103,7 +103,7 @@ protected void serializeOpenProtocolMessageApplicationGenericDataRequestChild( writeSimpleField( "wantedRevision", wantedRevision, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); // Implicit Field (extraDataLength) (Used for parsing, but its value is not stored as it's @@ -151,7 +151,7 @@ public int getLengthInBits() { public static OpenProtocolMessageApplicationGenericDataRequestBuilder staticParseOpenProtocolMessageApplicationGenericDataRequestBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageApplicationGenericDataRequestRev1"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -163,9 +163,9 @@ public int getLengthInBits() { new DataReaderEnumDefault<>(Mid::enumForValue, readUnsignedLong(readBuffer, 32)), WithOption.WithEncoding("ASCII")); - long wantedRevision = + int wantedRevision = readSimpleField( - "wantedRevision", readUnsignedLong(readBuffer, 24), WithOption.WithEncoding("ASCII")); + "wantedRevision", readUnsignedInt(readBuffer, 24), WithOption.WithEncoding("ASCII")); int extraDataLength = readImplicitField( @@ -183,18 +183,18 @@ public static class OpenProtocolMessageApplicationGenericDataRequestRev1BuilderI implements OpenProtocolMessageApplicationGenericDataRequest .OpenProtocolMessageApplicationGenericDataRequestBuilder { private final Mid requestMid; - private final long wantedRevision; + private final int wantedRevision; private final byte[] extraData; public OpenProtocolMessageApplicationGenericDataRequestRev1BuilderImpl( - Mid requestMid, long wantedRevision, byte[] extraData) { + Mid requestMid, int wantedRevision, byte[] extraData) { this.requestMid = requestMid; this.wantedRevision = wantedRevision; this.extraData = extraData; } public OpenProtocolMessageApplicationGenericDataRequestRev1 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationGenericSubscription.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationGenericSubscription.java index c3663a00b6a..7eae1b60fcb 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationGenericSubscription.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationGenericSubscription.java @@ -44,10 +44,10 @@ public Mid getMid() { } // Abstract accessors for discriminator values. - public abstract Long getRevision(); + public abstract Integer getRevision(); public OpenProtocolMessageApplicationGenericSubscription( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -97,14 +97,14 @@ public int getLengthInBits() { } public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageApplicationGenericSubscription"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) OpenProtocolMessageApplicationGenericSubscriptionBuilder builder = null; - if (EvaluationHelper.equals(revision, (long) 1)) { + if (EvaluationHelper.equals(revision, (int) 1)) { builder = OpenProtocolMessageApplicationGenericSubscriptionRev1 .staticParseOpenProtocolMessageApplicationGenericSubscriptionBuilder( @@ -126,7 +126,7 @@ public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( public interface OpenProtocolMessageApplicationGenericSubscriptionBuilder { OpenProtocolMessageApplicationGenericSubscription build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -145,7 +145,7 @@ public OpenProtocolMessageApplicationGenericSubscriptionBuilderImpl( } public OpenProtocolMessageApplicationGenericSubscription build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationGenericSubscriptionRev1.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationGenericSubscriptionRev1.java index 03826ff8ae5..11e0aac8f3d 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationGenericSubscriptionRev1.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationGenericSubscriptionRev1.java @@ -39,17 +39,17 @@ public class OpenProtocolMessageApplicationGenericSubscriptionRev1 extends OpenProtocolMessageApplicationGenericSubscription implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 1; + public Integer getRevision() { + return (int) 1; } // Properties. protected final Mid subscriptionMid; - protected final long wantedRevision; + protected final int wantedRevision; protected final byte[] extraData; public OpenProtocolMessageApplicationGenericSubscriptionRev1( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -57,7 +57,7 @@ public OpenProtocolMessageApplicationGenericSubscriptionRev1( Short numberOfMessageParts, Short messagePartNumber, Mid subscriptionMid, - long wantedRevision, + int wantedRevision, byte[] extraData) { super( midRevision, @@ -76,7 +76,7 @@ public Mid getSubscriptionMid() { return subscriptionMid; } - public long getWantedRevision() { + public int getWantedRevision() { return wantedRevision; } @@ -103,7 +103,7 @@ protected void serializeOpenProtocolMessageApplicationGenericSubscriptionChild( writeSimpleField( "wantedRevision", wantedRevision, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); // Implicit Field (extraDataLength) (Used for parsing, but its value is not stored as it's @@ -151,7 +151,7 @@ public int getLengthInBits() { public static OpenProtocolMessageApplicationGenericSubscriptionBuilder staticParseOpenProtocolMessageApplicationGenericSubscriptionBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageApplicationGenericSubscriptionRev1"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -163,9 +163,9 @@ public int getLengthInBits() { new DataReaderEnumDefault<>(Mid::enumForValue, readUnsignedLong(readBuffer, 32)), WithOption.WithEncoding("ASCII")); - long wantedRevision = + int wantedRevision = readSimpleField( - "wantedRevision", readUnsignedLong(readBuffer, 24), WithOption.WithEncoding("ASCII")); + "wantedRevision", readUnsignedInt(readBuffer, 24), WithOption.WithEncoding("ASCII")); int extraDataLength = readImplicitField( @@ -183,18 +183,18 @@ public static class OpenProtocolMessageApplicationGenericSubscriptionRev1Builder implements OpenProtocolMessageApplicationGenericSubscription .OpenProtocolMessageApplicationGenericSubscriptionBuilder { private final Mid subscriptionMid; - private final long wantedRevision; + private final int wantedRevision; private final byte[] extraData; public OpenProtocolMessageApplicationGenericSubscriptionRev1BuilderImpl( - Mid subscriptionMid, long wantedRevision, byte[] extraData) { + Mid subscriptionMid, int wantedRevision, byte[] extraData) { this.subscriptionMid = subscriptionMid; this.wantedRevision = wantedRevision; this.extraData = extraData; } public OpenProtocolMessageApplicationGenericSubscriptionRev1 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationGenericUnsubscribe.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationGenericUnsubscribe.java index 8c45a27a870..83f4cada0e4 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationGenericUnsubscribe.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationGenericUnsubscribe.java @@ -44,10 +44,10 @@ public Mid getMid() { } // Abstract accessors for discriminator values. - public abstract Long getRevision(); + public abstract Integer getRevision(); public OpenProtocolMessageApplicationGenericUnsubscribe( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -97,14 +97,14 @@ public int getLengthInBits() { } public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageApplicationGenericUnsubscribe"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) OpenProtocolMessageApplicationGenericUnsubscribeBuilder builder = null; - if (EvaluationHelper.equals(revision, (long) 1)) { + if (EvaluationHelper.equals(revision, (int) 1)) { builder = OpenProtocolMessageApplicationGenericUnsubscribeRev1 .staticParseOpenProtocolMessageApplicationGenericUnsubscribeBuilder( @@ -126,7 +126,7 @@ public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( public interface OpenProtocolMessageApplicationGenericUnsubscribeBuilder { OpenProtocolMessageApplicationGenericUnsubscribe build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -145,7 +145,7 @@ public OpenProtocolMessageApplicationGenericUnsubscribeBuilderImpl( } public OpenProtocolMessageApplicationGenericUnsubscribe build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationGenericUnsubscribeRev1.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationGenericUnsubscribeRev1.java index a66d0023f25..9d63de11e22 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationGenericUnsubscribeRev1.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageApplicationGenericUnsubscribeRev1.java @@ -39,17 +39,17 @@ public class OpenProtocolMessageApplicationGenericUnsubscribeRev1 extends OpenProtocolMessageApplicationGenericUnsubscribe implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 1; + public Integer getRevision() { + return (int) 1; } // Properties. protected final Mid subscriptionMid; - protected final long extraDataRevision; + protected final int extraDataRevision; protected final byte[] extraData; public OpenProtocolMessageApplicationGenericUnsubscribeRev1( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -57,7 +57,7 @@ public OpenProtocolMessageApplicationGenericUnsubscribeRev1( Short numberOfMessageParts, Short messagePartNumber, Mid subscriptionMid, - long extraDataRevision, + int extraDataRevision, byte[] extraData) { super( midRevision, @@ -76,7 +76,7 @@ public Mid getSubscriptionMid() { return subscriptionMid; } - public long getExtraDataRevision() { + public int getExtraDataRevision() { return extraDataRevision; } @@ -103,7 +103,7 @@ protected void serializeOpenProtocolMessageApplicationGenericUnsubscribeChild( writeSimpleField( "extraDataRevision", extraDataRevision, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); // Implicit Field (extraDataLength) (Used for parsing, but its value is not stored as it's @@ -151,7 +151,7 @@ public int getLengthInBits() { public static OpenProtocolMessageApplicationGenericUnsubscribeBuilder staticParseOpenProtocolMessageApplicationGenericUnsubscribeBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageApplicationGenericUnsubscribeRev1"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -163,11 +163,9 @@ public int getLengthInBits() { new DataReaderEnumDefault<>(Mid::enumForValue, readUnsignedLong(readBuffer, 32)), WithOption.WithEncoding("ASCII")); - long extraDataRevision = + int extraDataRevision = readSimpleField( - "extraDataRevision", - readUnsignedLong(readBuffer, 24), - WithOption.WithEncoding("ASCII")); + "extraDataRevision", readUnsignedInt(readBuffer, 24), WithOption.WithEncoding("ASCII")); int extraDataLength = readImplicitField( @@ -185,18 +183,18 @@ public static class OpenProtocolMessageApplicationGenericUnsubscribeRev1BuilderI implements OpenProtocolMessageApplicationGenericUnsubscribe .OpenProtocolMessageApplicationGenericUnsubscribeBuilder { private final Mid subscriptionMid; - private final long extraDataRevision; + private final int extraDataRevision; private final byte[] extraData; public OpenProtocolMessageApplicationGenericUnsubscribeRev1BuilderImpl( - Mid subscriptionMid, long extraDataRevision, byte[] extraData) { + Mid subscriptionMid, int extraDataRevision, byte[] extraData) { this.subscriptionMid = subscriptionMid; this.extraDataRevision = extraDataRevision; this.extraData = extraData; } public OpenProtocolMessageApplicationGenericUnsubscribeRev1 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageDisableTool.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageDisableTool.java index 0980d69d693..696ecf1aa89 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageDisableTool.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageDisableTool.java @@ -44,10 +44,10 @@ public Mid getMid() { } // Abstract accessors for discriminator values. - public abstract Long getRevision(); + public abstract Integer getRevision(); public OpenProtocolMessageDisableTool( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -97,14 +97,14 @@ public int getLengthInBits() { } public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageDisableTool"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) OpenProtocolMessageDisableToolBuilder builder = null; - if (EvaluationHelper.equals(revision, (long) 1)) { + if (EvaluationHelper.equals(revision, (int) 1)) { builder = OpenProtocolMessageDisableToolRev1.staticParseOpenProtocolMessageDisableToolBuilder( readBuffer, revision); @@ -125,7 +125,7 @@ public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( public interface OpenProtocolMessageDisableToolBuilder { OpenProtocolMessageDisableTool build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -144,7 +144,7 @@ public OpenProtocolMessageDisableToolBuilderImpl( } public OpenProtocolMessageDisableTool build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageDisableToolRev1.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageDisableToolRev1.java index 095f35b7ba9..c23d531f72c 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageDisableToolRev1.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageDisableToolRev1.java @@ -39,12 +39,12 @@ public class OpenProtocolMessageDisableToolRev1 extends OpenProtocolMessageDisab implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 1; + public Integer getRevision() { + return (int) 1; } public OpenProtocolMessageDisableToolRev1( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -86,7 +86,7 @@ public int getLengthInBits() { } public static OpenProtocolMessageDisableToolBuilder - staticParseOpenProtocolMessageDisableToolBuilder(ReadBuffer readBuffer, Long revision) + staticParseOpenProtocolMessageDisableToolBuilder(ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageDisableToolRev1"); PositionAware positionAware = readBuffer; @@ -103,7 +103,7 @@ public static class OpenProtocolMessageDisableToolRev1BuilderImpl public OpenProtocolMessageDisableToolRev1BuilderImpl() {} public OpenProtocolMessageDisableToolRev1 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageDynamicPsetSelection.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageDynamicPsetSelection.java index 60f8812a545..5179bdacd09 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageDynamicPsetSelection.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageDynamicPsetSelection.java @@ -44,10 +44,10 @@ public Mid getMid() { } // Abstract accessors for discriminator values. - public abstract Long getRevision(); + public abstract Integer getRevision(); public OpenProtocolMessageDynamicPsetSelection( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -97,14 +97,14 @@ public int getLengthInBits() { } public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageDynamicPsetSelection"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) OpenProtocolMessageDynamicPsetSelectionBuilder builder = null; - if (EvaluationHelper.equals(revision, (long) 1)) { + if (EvaluationHelper.equals(revision, (int) 1)) { builder = OpenProtocolMessageDynamicPsetSelectionRev1 .staticParseOpenProtocolMessageDynamicPsetSelectionBuilder(readBuffer, revision); @@ -125,7 +125,7 @@ public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( public interface OpenProtocolMessageDynamicPsetSelectionBuilder { OpenProtocolMessageDynamicPsetSelection build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -144,7 +144,7 @@ public OpenProtocolMessageDynamicPsetSelectionBuilderImpl( } public OpenProtocolMessageDynamicPsetSelection build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageDynamicPsetSelectionRev1.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageDynamicPsetSelectionRev1.java index d45622dc472..df3a467b2dd 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageDynamicPsetSelectionRev1.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageDynamicPsetSelectionRev1.java @@ -39,23 +39,23 @@ public class OpenProtocolMessageDynamicPsetSelectionRev1 extends OpenProtocolMessageDynamicPsetSelection implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 1; + public Integer getRevision() { + return (int) 1; } // Properties. - protected final long parameterSetId; + protected final int parameterSetId; protected final List dataFields; public OpenProtocolMessageDynamicPsetSelectionRev1( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, Integer sequenceNumber, Short numberOfMessageParts, Short messagePartNumber, - long parameterSetId, + int parameterSetId, List dataFields) { super( midRevision, @@ -69,7 +69,7 @@ public OpenProtocolMessageDynamicPsetSelectionRev1( this.dataFields = dataFields; } - public long getParameterSetId() { + public int getParameterSetId() { return parameterSetId; } @@ -88,16 +88,16 @@ protected void serializeOpenProtocolMessageDynamicPsetSelectionChild(WriteBuffer writeSimpleField( "parameterSetId", parameterSetId, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); // Implicit Field (numberOfParameterDataFields) (Used for parsing, but its value is not stored // as it's implicitly given by the objects content) - long numberOfParameterDataFields = (long) (COUNT(getDataFields())); + int numberOfParameterDataFields = (int) (COUNT(getDataFields())); writeImplicitField( "numberOfParameterDataFields", numberOfParameterDataFields, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); // Array Field (dataFields) @@ -138,19 +138,19 @@ public int getLengthInBits() { public static OpenProtocolMessageDynamicPsetSelectionBuilder staticParseOpenProtocolMessageDynamicPsetSelectionBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageDynamicPsetSelectionRev1"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - long parameterSetId = + int parameterSetId = readSimpleField( - "parameterSetId", readUnsignedLong(readBuffer, 24), WithOption.WithEncoding("ASCII")); + "parameterSetId", readUnsignedInt(readBuffer, 24), WithOption.WithEncoding("ASCII")); - long numberOfParameterDataFields = + int numberOfParameterDataFields = readImplicitField( "numberOfParameterDataFields", - readUnsignedLong(readBuffer, 24), + readUnsignedInt(readBuffer, 24), WithOption.WithEncoding("ASCII")); List dataFields = @@ -169,17 +169,17 @@ public int getLengthInBits() { public static class OpenProtocolMessageDynamicPsetSelectionRev1BuilderImpl implements OpenProtocolMessageDynamicPsetSelection .OpenProtocolMessageDynamicPsetSelectionBuilder { - private final long parameterSetId; + private final int parameterSetId; private final List dataFields; public OpenProtocolMessageDynamicPsetSelectionRev1BuilderImpl( - long parameterSetId, List dataFields) { + int parameterSetId, List dataFields) { this.parameterSetId = parameterSetId; this.dataFields = dataFields; } public OpenProtocolMessageDynamicPsetSelectionRev1 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageEnableTool.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageEnableTool.java index cb711be2944..b2614585c67 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageEnableTool.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageEnableTool.java @@ -43,10 +43,10 @@ public Mid getMid() { } // Abstract accessors for discriminator values. - public abstract Long getRevision(); + public abstract Integer getRevision(); public OpenProtocolMessageEnableTool( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -96,14 +96,14 @@ public int getLengthInBits() { } public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageEnableTool"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) OpenProtocolMessageEnableToolBuilder builder = null; - if (EvaluationHelper.equals(revision, (long) 1)) { + if (EvaluationHelper.equals(revision, (int) 1)) { builder = OpenProtocolMessageEnableToolRev1.staticParseOpenProtocolMessageEnableToolBuilder( readBuffer, revision); @@ -124,7 +124,7 @@ public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( public interface OpenProtocolMessageEnableToolBuilder { OpenProtocolMessageEnableTool build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -142,7 +142,7 @@ public OpenProtocolMessageEnableToolBuilderImpl(OpenProtocolMessageEnableToolBui } public OpenProtocolMessageEnableTool build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageEnableToolRev1.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageEnableToolRev1.java index 3e757fbb1d2..7f478183e53 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageEnableToolRev1.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageEnableToolRev1.java @@ -39,12 +39,12 @@ public class OpenProtocolMessageEnableToolRev1 extends OpenProtocolMessageEnable implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 1; + public Integer getRevision() { + return (int) 1; } public OpenProtocolMessageEnableToolRev1( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -86,7 +86,7 @@ public int getLengthInBits() { } public static OpenProtocolMessageEnableToolBuilder - staticParseOpenProtocolMessageEnableToolBuilder(ReadBuffer readBuffer, Long revision) + staticParseOpenProtocolMessageEnableToolBuilder(ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageEnableToolRev1"); PositionAware positionAware = readBuffer; @@ -103,7 +103,7 @@ public static class OpenProtocolMessageEnableToolRev1BuilderImpl public OpenProtocolMessageEnableToolRev1BuilderImpl() {} public OpenProtocolMessageEnableToolRev1 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageExecuteDynamicJobRequest.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageExecuteDynamicJobRequest.java index 32023209228..4864a30299f 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageExecuteDynamicJobRequest.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageExecuteDynamicJobRequest.java @@ -44,10 +44,10 @@ public Mid getMid() { } // Abstract accessors for discriminator values. - public abstract Long getRevision(); + public abstract Integer getRevision(); public OpenProtocolMessageExecuteDynamicJobRequest( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -97,18 +97,18 @@ public int getLengthInBits() { } public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageExecuteDynamicJobRequest"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) OpenProtocolMessageExecuteDynamicJobRequestBuilder builder = null; - if (EvaluationHelper.equals(revision, (long) 1)) { + if (EvaluationHelper.equals(revision, (int) 1)) { builder = OpenProtocolMessageExecuteDynamicJobRequestRev1 .staticParseOpenProtocolMessageExecuteDynamicJobRequestBuilder(readBuffer, revision); - } else if (EvaluationHelper.equals(revision, (long) 999)) { + } else if (EvaluationHelper.equals(revision, (int) 999)) { builder = OpenProtocolMessageExecuteDynamicJobRequestRev999 .staticParseOpenProtocolMessageExecuteDynamicJobRequestBuilder(readBuffer, revision); @@ -129,7 +129,7 @@ public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( public interface OpenProtocolMessageExecuteDynamicJobRequestBuilder { OpenProtocolMessageExecuteDynamicJobRequest build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -148,7 +148,7 @@ public OpenProtocolMessageExecuteDynamicJobRequestBuilderImpl( } public OpenProtocolMessageExecuteDynamicJobRequest build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageExecuteDynamicJobRequestRev1.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageExecuteDynamicJobRequestRev1.java index 0625b46ff5b..07d9ed265db 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageExecuteDynamicJobRequestRev1.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageExecuteDynamicJobRequestRev1.java @@ -24,7 +24,6 @@ import static org.apache.plc4x.java.spi.codegen.io.DataWriterFactory.*; import static org.apache.plc4x.java.spi.generation.StaticHelper.*; -import java.math.BigInteger; import java.time.*; import java.util.*; import org.apache.plc4x.java.api.exceptions.*; @@ -40,8 +39,8 @@ public class OpenProtocolMessageExecuteDynamicJobRequestRev1 extends OpenProtocolMessageExecuteDynamicJobRequest implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 1; + public Integer getRevision() { + return (int) 1; } // Constant values. @@ -76,7 +75,7 @@ public Long getRevision() { protected final OkNok batchStatusAtIncrementBypass; protected final NoYes decrementBatchAtOkLoosening; protected final long maxTimeForFirstTightening; - protected final BigInteger maxTimeToCompleteJob; + protected final long maxTimeToCompleteJob; protected final long displayResultAtAutoSelect; protected final NoYes useLineControl; protected final IdentifierResult identifierResultPart; @@ -85,7 +84,7 @@ public Long getRevision() { protected final short jobRepair; public OpenProtocolMessageExecuteDynamicJobRequestRev1( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -102,7 +101,7 @@ public OpenProtocolMessageExecuteDynamicJobRequestRev1( OkNok batchStatusAtIncrementBypass, NoYes decrementBatchAtOkLoosening, long maxTimeForFirstTightening, - BigInteger maxTimeToCompleteJob, + long maxTimeToCompleteJob, long displayResultAtAutoSelect, NoYes useLineControl, IdentifierResult identifierResultPart, @@ -176,7 +175,7 @@ public long getMaxTimeForFirstTightening() { return maxTimeForFirstTightening; } - public BigInteger getMaxTimeToCompleteJob() { + public long getMaxTimeToCompleteJob() { return maxTimeToCompleteJob; } @@ -460,7 +459,7 @@ protected void serializeOpenProtocolMessageExecuteDynamicJobRequestChild(WriteBu writeSimpleField( "maxTimeToCompleteJob", maxTimeToCompleteJob, - writeUnsignedBigInteger(writeBuffer, 40), + writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdDisplayResultAtAutoSelect) @@ -682,7 +681,7 @@ public int getLengthInBits() { public static OpenProtocolMessageExecuteDynamicJobRequestBuilder staticParseOpenProtocolMessageExecuteDynamicJobRequestBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageExecuteDynamicJobRequestRev1"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -843,10 +842,10 @@ public int getLengthInBits() { OpenProtocolMessageExecuteDynamicJobRequestRev1.BLOCKIDMAXTIMETOCOMPLETEJOB, WithOption.WithEncoding("ASCII")); - BigInteger maxTimeToCompleteJob = + long maxTimeToCompleteJob = readSimpleField( "maxTimeToCompleteJob", - readUnsignedBigInteger(readBuffer, 40), + readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdDisplayResultAtAutoSelect = @@ -965,7 +964,7 @@ public static class OpenProtocolMessageExecuteDynamicJobRequestRev1BuilderImpl private final OkNok batchStatusAtIncrementBypass; private final NoYes decrementBatchAtOkLoosening; private final long maxTimeForFirstTightening; - private final BigInteger maxTimeToCompleteJob; + private final long maxTimeToCompleteJob; private final long displayResultAtAutoSelect; private final NoYes useLineControl; private final IdentifierResult identifierResultPart; @@ -984,7 +983,7 @@ public OpenProtocolMessageExecuteDynamicJobRequestRev1BuilderImpl( OkNok batchStatusAtIncrementBypass, NoYes decrementBatchAtOkLoosening, long maxTimeForFirstTightening, - BigInteger maxTimeToCompleteJob, + long maxTimeToCompleteJob, long displayResultAtAutoSelect, NoYes useLineControl, IdentifierResult identifierResultPart, @@ -1011,7 +1010,7 @@ public OpenProtocolMessageExecuteDynamicJobRequestRev1BuilderImpl( } public OpenProtocolMessageExecuteDynamicJobRequestRev1 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageExecuteDynamicJobRequestRev999.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageExecuteDynamicJobRequestRev999.java index 1c862abd585..7ca5f1edbe4 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageExecuteDynamicJobRequestRev999.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageExecuteDynamicJobRequestRev999.java @@ -24,7 +24,6 @@ import static org.apache.plc4x.java.spi.codegen.io.DataWriterFactory.*; import static org.apache.plc4x.java.spi.generation.StaticHelper.*; -import java.math.BigInteger; import java.time.*; import java.util.*; import org.apache.plc4x.java.api.exceptions.*; @@ -40,8 +39,8 @@ public class OpenProtocolMessageExecuteDynamicJobRequestRev999 extends OpenProtocolMessageExecuteDynamicJobRequest implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 999; + public Integer getRevision() { + return (int) 999; } // Constant values. @@ -76,7 +75,7 @@ public Long getRevision() { protected final OkNok batchStatusAtIncrementBypass; protected final NoYes decrementBatchAtOkLoosening; protected final long maxTimeForFirstTightening; - protected final BigInteger maxTimeToCompleteJob; + protected final long maxTimeToCompleteJob; protected final long displayResultAtAutoSelect; protected final NoYes useLineControl; protected final IdentifierResult identifierResultPart; @@ -85,7 +84,7 @@ public Long getRevision() { protected final short jobRepair; public OpenProtocolMessageExecuteDynamicJobRequestRev999( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -102,7 +101,7 @@ public OpenProtocolMessageExecuteDynamicJobRequestRev999( OkNok batchStatusAtIncrementBypass, NoYes decrementBatchAtOkLoosening, long maxTimeForFirstTightening, - BigInteger maxTimeToCompleteJob, + long maxTimeToCompleteJob, long displayResultAtAutoSelect, NoYes useLineControl, IdentifierResult identifierResultPart, @@ -176,7 +175,7 @@ public long getMaxTimeForFirstTightening() { return maxTimeForFirstTightening; } - public BigInteger getMaxTimeToCompleteJob() { + public long getMaxTimeToCompleteJob() { return maxTimeToCompleteJob; } @@ -460,7 +459,7 @@ protected void serializeOpenProtocolMessageExecuteDynamicJobRequestChild(WriteBu writeSimpleField( "maxTimeToCompleteJob", maxTimeToCompleteJob, - writeUnsignedBigInteger(writeBuffer, 40), + writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdDisplayResultAtAutoSelect) @@ -682,7 +681,7 @@ public int getLengthInBits() { public static OpenProtocolMessageExecuteDynamicJobRequestBuilder staticParseOpenProtocolMessageExecuteDynamicJobRequestBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageExecuteDynamicJobRequestRev999"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -843,10 +842,10 @@ public int getLengthInBits() { OpenProtocolMessageExecuteDynamicJobRequestRev999.BLOCKIDMAXTIMETOCOMPLETEJOB, WithOption.WithEncoding("ASCII")); - BigInteger maxTimeToCompleteJob = + long maxTimeToCompleteJob = readSimpleField( "maxTimeToCompleteJob", - readUnsignedBigInteger(readBuffer, 40), + readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdDisplayResultAtAutoSelect = @@ -965,7 +964,7 @@ public static class OpenProtocolMessageExecuteDynamicJobRequestRev999BuilderImpl private final OkNok batchStatusAtIncrementBypass; private final NoYes decrementBatchAtOkLoosening; private final long maxTimeForFirstTightening; - private final BigInteger maxTimeToCompleteJob; + private final long maxTimeToCompleteJob; private final long displayResultAtAutoSelect; private final NoYes useLineControl; private final IdentifierResult identifierResultPart; @@ -984,7 +983,7 @@ public OpenProtocolMessageExecuteDynamicJobRequestRev999BuilderImpl( OkNok batchStatusAtIncrementBypass, NoYes decrementBatchAtOkLoosening, long maxTimeForFirstTightening, - BigInteger maxTimeToCompleteJob, + long maxTimeToCompleteJob, long displayResultAtAutoSelect, NoYes useLineControl, IdentifierResult identifierResultPart, @@ -1011,7 +1010,7 @@ public OpenProtocolMessageExecuteDynamicJobRequestRev999BuilderImpl( } public OpenProtocolMessageExecuteDynamicJobRequestRev999 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageIdentifierDownloadRequest.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageIdentifierDownloadRequest.java index 358749c09e1..b2604e1a1b6 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageIdentifierDownloadRequest.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageIdentifierDownloadRequest.java @@ -44,10 +44,10 @@ public Mid getMid() { } // Abstract accessors for discriminator values. - public abstract Long getRevision(); + public abstract Integer getRevision(); public OpenProtocolMessageIdentifierDownloadRequest( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -97,14 +97,14 @@ public int getLengthInBits() { } public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageIdentifierDownloadRequest"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) OpenProtocolMessageIdentifierDownloadRequestBuilder builder = null; - if (EvaluationHelper.equals(revision, (long) 1)) { + if (EvaluationHelper.equals(revision, (int) 1)) { builder = OpenProtocolMessageIdentifierDownloadRequestRev1 .staticParseOpenProtocolMessageIdentifierDownloadRequestBuilder(readBuffer, revision); @@ -125,7 +125,7 @@ public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( public interface OpenProtocolMessageIdentifierDownloadRequestBuilder { OpenProtocolMessageIdentifierDownloadRequest build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -144,7 +144,7 @@ public OpenProtocolMessageIdentifierDownloadRequestBuilderImpl( } public OpenProtocolMessageIdentifierDownloadRequest build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageIdentifierDownloadRequestRev1.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageIdentifierDownloadRequestRev1.java index 31d5a257154..6493573c179 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageIdentifierDownloadRequestRev1.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageIdentifierDownloadRequestRev1.java @@ -39,15 +39,15 @@ public class OpenProtocolMessageIdentifierDownloadRequestRev1 extends OpenProtocolMessageIdentifierDownloadRequest implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 1; + public Integer getRevision() { + return (int) 1; } // Properties. protected final String identifierData; public OpenProtocolMessageIdentifierDownloadRequestRev1( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -106,7 +106,7 @@ public int getLengthInBits() { public static OpenProtocolMessageIdentifierDownloadRequestBuilder staticParseOpenProtocolMessageIdentifierDownloadRequestBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageIdentifierDownloadRequestRev1"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -130,7 +130,7 @@ public OpenProtocolMessageIdentifierDownloadRequestRev1BuilderImpl(String identi } public OpenProtocolMessageIdentifierDownloadRequestRev1 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageKeepAliveOpenProtocolCommunication.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageKeepAliveOpenProtocolCommunication.java index d504d26f88c..199b93e785f 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageKeepAliveOpenProtocolCommunication.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageKeepAliveOpenProtocolCommunication.java @@ -44,10 +44,10 @@ public Mid getMid() { } // Abstract accessors for discriminator values. - public abstract Long getRevision(); + public abstract Integer getRevision(); public OpenProtocolMessageKeepAliveOpenProtocolCommunication( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -97,14 +97,14 @@ public int getLengthInBits() { } public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageKeepAliveOpenProtocolCommunication"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) OpenProtocolMessageKeepAliveOpenProtocolCommunicationBuilder builder = null; - if (EvaluationHelper.equals(revision, (long) 1)) { + if (EvaluationHelper.equals(revision, (int) 1)) { builder = OpenProtocolMessageKeepAliveOpenProtocolCommunicationRev1 .staticParseOpenProtocolMessageKeepAliveOpenProtocolCommunicationBuilder( @@ -126,7 +126,7 @@ public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( public interface OpenProtocolMessageKeepAliveOpenProtocolCommunicationBuilder { OpenProtocolMessageKeepAliveOpenProtocolCommunication build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -145,7 +145,7 @@ public OpenProtocolMessageKeepAliveOpenProtocolCommunicationBuilderImpl( } public OpenProtocolMessageKeepAliveOpenProtocolCommunication build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageKeepAliveOpenProtocolCommunicationRev1.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageKeepAliveOpenProtocolCommunicationRev1.java index 8abf41fff56..893c7db3ded 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageKeepAliveOpenProtocolCommunicationRev1.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageKeepAliveOpenProtocolCommunicationRev1.java @@ -39,12 +39,12 @@ public class OpenProtocolMessageKeepAliveOpenProtocolCommunicationRev1 extends OpenProtocolMessageKeepAliveOpenProtocolCommunication implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 1; + public Integer getRevision() { + return (int) 1; } public OpenProtocolMessageKeepAliveOpenProtocolCommunicationRev1( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -87,7 +87,7 @@ public int getLengthInBits() { public static OpenProtocolMessageKeepAliveOpenProtocolCommunicationBuilder staticParseOpenProtocolMessageKeepAliveOpenProtocolCommunicationBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageKeepAliveOpenProtocolCommunicationRev1"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -104,7 +104,7 @@ public static class OpenProtocolMessageKeepAliveOpenProtocolCommunicationRev1Bui public OpenProtocolMessageKeepAliveOpenProtocolCommunicationRev1BuilderImpl() {} public OpenProtocolMessageKeepAliveOpenProtocolCommunicationRev1 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLastTighteningResultData.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLastTighteningResultData.java index ea59496f8d7..6fb463374a4 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLastTighteningResultData.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLastTighteningResultData.java @@ -44,10 +44,10 @@ public Mid getMid() { } // Abstract accessors for discriminator values. - public abstract Long getRevision(); + public abstract Integer getRevision(); public OpenProtocolMessageLastTighteningResultData( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -97,46 +97,46 @@ public int getLengthInBits() { } public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageLastTighteningResultData"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) OpenProtocolMessageLastTighteningResultDataBuilder builder = null; - if (EvaluationHelper.equals(revision, (long) 1)) { + if (EvaluationHelper.equals(revision, (int) 1)) { builder = OpenProtocolMessageLastTighteningResultDataRev1 .staticParseOpenProtocolMessageLastTighteningResultDataBuilder(readBuffer, revision); - } else if (EvaluationHelper.equals(revision, (long) 2)) { + } else if (EvaluationHelper.equals(revision, (int) 2)) { builder = OpenProtocolMessageLastTighteningResultDataRev2 .staticParseOpenProtocolMessageLastTighteningResultDataBuilder(readBuffer, revision); - } else if (EvaluationHelper.equals(revision, (long) 3)) { + } else if (EvaluationHelper.equals(revision, (int) 3)) { builder = OpenProtocolMessageLastTighteningResultDataRev3 .staticParseOpenProtocolMessageLastTighteningResultDataBuilder(readBuffer, revision); - } else if (EvaluationHelper.equals(revision, (long) 4)) { + } else if (EvaluationHelper.equals(revision, (int) 4)) { builder = OpenProtocolMessageLastTighteningResultDataRev4 .staticParseOpenProtocolMessageLastTighteningResultDataBuilder(readBuffer, revision); - } else if (EvaluationHelper.equals(revision, (long) 5)) { + } else if (EvaluationHelper.equals(revision, (int) 5)) { builder = OpenProtocolMessageLastTighteningResultDataRev5 .staticParseOpenProtocolMessageLastTighteningResultDataBuilder(readBuffer, revision); - } else if (EvaluationHelper.equals(revision, (long) 6)) { + } else if (EvaluationHelper.equals(revision, (int) 6)) { builder = OpenProtocolMessageLastTighteningResultDataRev6 .staticParseOpenProtocolMessageLastTighteningResultDataBuilder(readBuffer, revision); - } else if (EvaluationHelper.equals(revision, (long) 7)) { + } else if (EvaluationHelper.equals(revision, (int) 7)) { builder = OpenProtocolMessageLastTighteningResultDataRev7 .staticParseOpenProtocolMessageLastTighteningResultDataBuilder(readBuffer, revision); - } else if (EvaluationHelper.equals(revision, (long) 998)) { + } else if (EvaluationHelper.equals(revision, (int) 998)) { builder = OpenProtocolMessageLastTighteningResultDataRev998 .staticParseOpenProtocolMessageLastTighteningResultDataBuilder(readBuffer, revision); - } else if (EvaluationHelper.equals(revision, (long) 999)) { + } else if (EvaluationHelper.equals(revision, (int) 999)) { builder = OpenProtocolMessageLastTighteningResultDataRev999Light .staticParseOpenProtocolMessageLastTighteningResultDataBuilder(readBuffer, revision); @@ -157,7 +157,7 @@ public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( public interface OpenProtocolMessageLastTighteningResultDataBuilder { OpenProtocolMessageLastTighteningResultData build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -176,7 +176,7 @@ public OpenProtocolMessageLastTighteningResultDataBuilderImpl( } public OpenProtocolMessageLastTighteningResultData build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLastTighteningResultDataRev1.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLastTighteningResultDataRev1.java index 0640c4aa15b..4b0538f36f1 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLastTighteningResultDataRev1.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLastTighteningResultDataRev1.java @@ -24,7 +24,6 @@ import static org.apache.plc4x.java.spi.codegen.io.DataWriterFactory.*; import static org.apache.plc4x.java.spi.generation.StaticHelper.*; -import java.math.BigInteger; import java.time.*; import java.util.*; import org.apache.plc4x.java.api.exceptions.*; @@ -40,8 +39,8 @@ public class OpenProtocolMessageLastTighteningResultDataRev1 extends OpenProtocolMessageLastTighteningResultData implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 1; + public Integer getRevision() { + return (int) 1; } // Constant values. @@ -75,27 +74,27 @@ public Long getRevision() { protected final String torqueControllerName; protected final String vinNumber; protected final int jobId; - protected final long parameterSetId; + protected final int parameterSetId; protected final long batchSize; protected final long batchCounter; protected final NokOk tighteningStatus; protected final Status torqueStatus; protected final Status angleStatus; - protected final BigInteger torqueMinLimit; - protected final BigInteger torqueMaxLimit; - protected final BigInteger torqueFinalTarget; - protected final BigInteger torque; - protected final BigInteger angleMin; - protected final BigInteger angleMax; - protected final BigInteger finalAngleTarget; - protected final BigInteger angle; + protected final long torqueMinLimit; + protected final long torqueMaxLimit; + protected final long torqueFinalTarget; + protected final long torque; + protected final long angleMin; + protected final long angleMax; + protected final long finalAngleTarget; + protected final long angle; protected final String timeStamp; protected final String dateTimeOfLastChangeIndParameterSetSettings; protected final BatchStatus batchStatus; protected final String tighteningId; public OpenProtocolMessageLastTighteningResultDataRev1( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -107,20 +106,20 @@ public OpenProtocolMessageLastTighteningResultDataRev1( String torqueControllerName, String vinNumber, int jobId, - long parameterSetId, + int parameterSetId, long batchSize, long batchCounter, NokOk tighteningStatus, Status torqueStatus, Status angleStatus, - BigInteger torqueMinLimit, - BigInteger torqueMaxLimit, - BigInteger torqueFinalTarget, - BigInteger torque, - BigInteger angleMin, - BigInteger angleMax, - BigInteger finalAngleTarget, - BigInteger angle, + long torqueMinLimit, + long torqueMaxLimit, + long torqueFinalTarget, + long torque, + long angleMin, + long angleMax, + long finalAngleTarget, + long angle, String timeStamp, String dateTimeOfLastChangeIndParameterSetSettings, BatchStatus batchStatus, @@ -178,7 +177,7 @@ public int getJobId() { return jobId; } - public long getParameterSetId() { + public int getParameterSetId() { return parameterSetId; } @@ -202,35 +201,35 @@ public Status getAngleStatus() { return angleStatus; } - public BigInteger getTorqueMinLimit() { + public long getTorqueMinLimit() { return torqueMinLimit; } - public BigInteger getTorqueMaxLimit() { + public long getTorqueMaxLimit() { return torqueMaxLimit; } - public BigInteger getTorqueFinalTarget() { + public long getTorqueFinalTarget() { return torqueFinalTarget; } - public BigInteger getTorque() { + public long getTorque() { return torque; } - public BigInteger getAngleMin() { + public long getAngleMin() { return angleMin; } - public BigInteger getAngleMax() { + public long getAngleMax() { return angleMax; } - public BigInteger getFinalAngleTarget() { + public long getFinalAngleTarget() { return finalAngleTarget; } - public BigInteger getAngle() { + public long getAngle() { return angle; } @@ -421,7 +420,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "parameterSetId", parameterSetId, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); // Const Field (blockIdBatchSize) @@ -511,7 +510,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "torqueMinLimit", torqueMinLimit, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdTorqueMaxLimit) @@ -525,7 +524,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "torqueMaxLimit", torqueMaxLimit, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdTorqueFinalTarget) @@ -539,7 +538,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "torqueFinalTarget", torqueFinalTarget, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdTorque) @@ -551,10 +550,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu // Simple Field (torque) writeSimpleField( - "torque", - torque, - writeUnsignedBigInteger(writeBuffer, 48), - WithOption.WithEncoding("ASCII")); + "torque", torque, writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdAngleMin) writeConstField( @@ -565,10 +561,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu // Simple Field (angleMin) writeSimpleField( - "angleMin", - angleMin, - writeUnsignedBigInteger(writeBuffer, 40), - WithOption.WithEncoding("ASCII")); + "angleMin", angleMin, writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdAngleMax) writeConstField( @@ -579,10 +572,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu // Simple Field (angleMax) writeSimpleField( - "angleMax", - angleMax, - writeUnsignedBigInteger(writeBuffer, 40), - WithOption.WithEncoding("ASCII")); + "angleMax", angleMax, writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdFinalAngleTarget) writeConstField( @@ -595,7 +585,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "finalAngleTarget", finalAngleTarget, - writeUnsignedBigInteger(writeBuffer, 40), + writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdAngle) @@ -607,7 +597,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu // Simple Field (angle) writeSimpleField( - "angle", angle, writeUnsignedBigInteger(writeBuffer, 40), WithOption.WithEncoding("ASCII")); + "angle", angle, writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdTimeStamp) writeConstField( @@ -821,7 +811,7 @@ public int getLengthInBits() { public static OpenProtocolMessageLastTighteningResultDataBuilder staticParseOpenProtocolMessageLastTighteningResultDataBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageLastTighteningResultDataRev1"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -886,9 +876,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev1.BLOCKIDPARAMETERSETID, WithOption.WithEncoding("ASCII")); - long parameterSetId = + int parameterSetId = readSimpleField( - "parameterSetId", readUnsignedLong(readBuffer, 24), WithOption.WithEncoding("ASCII")); + "parameterSetId", readUnsignedInt(readBuffer, 24), WithOption.WithEncoding("ASCII")); int blockIdBatchSize = readConstField( @@ -961,11 +951,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev1.BLOCKIDTORQUEMINLIMIT, WithOption.WithEncoding("ASCII")); - BigInteger torqueMinLimit = + long torqueMinLimit = readSimpleField( - "torqueMinLimit", - readUnsignedBigInteger(readBuffer, 48), - WithOption.WithEncoding("ASCII")); + "torqueMinLimit", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdTorqueMaxLimit = readConstField( @@ -974,11 +962,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev1.BLOCKIDTORQUEMAXLIMIT, WithOption.WithEncoding("ASCII")); - BigInteger torqueMaxLimit = + long torqueMaxLimit = readSimpleField( - "torqueMaxLimit", - readUnsignedBigInteger(readBuffer, 48), - WithOption.WithEncoding("ASCII")); + "torqueMaxLimit", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdTorqueFinalTarget = readConstField( @@ -987,10 +973,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev1.BLOCKIDTORQUEFINALTARGET, WithOption.WithEncoding("ASCII")); - BigInteger torqueFinalTarget = + long torqueFinalTarget = readSimpleField( "torqueFinalTarget", - readUnsignedBigInteger(readBuffer, 48), + readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdTorque = @@ -1000,9 +986,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev1.BLOCKIDTORQUE, WithOption.WithEncoding("ASCII")); - BigInteger torque = + long torque = readSimpleField( - "torque", readUnsignedBigInteger(readBuffer, 48), WithOption.WithEncoding("ASCII")); + "torque", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdAngleMin = readConstField( @@ -1011,9 +997,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev1.BLOCKIDANGLEMIN, WithOption.WithEncoding("ASCII")); - BigInteger angleMin = + long angleMin = readSimpleField( - "angleMin", readUnsignedBigInteger(readBuffer, 40), WithOption.WithEncoding("ASCII")); + "angleMin", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdAngleMax = readConstField( @@ -1022,9 +1008,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev1.BLOCKIDANGLEMAX, WithOption.WithEncoding("ASCII")); - BigInteger angleMax = + long angleMax = readSimpleField( - "angleMax", readUnsignedBigInteger(readBuffer, 40), WithOption.WithEncoding("ASCII")); + "angleMax", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdFinalAngleTarget = readConstField( @@ -1033,11 +1019,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev1.BLOCKIDFINALANGLETARGET, WithOption.WithEncoding("ASCII")); - BigInteger finalAngleTarget = + long finalAngleTarget = readSimpleField( - "finalAngleTarget", - readUnsignedBigInteger(readBuffer, 40), - WithOption.WithEncoding("ASCII")); + "finalAngleTarget", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdAngle = readConstField( @@ -1046,9 +1030,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev1.BLOCKIDANGLE, WithOption.WithEncoding("ASCII")); - BigInteger angle = + long angle = readSimpleField( - "angle", readUnsignedBigInteger(readBuffer, 40), WithOption.WithEncoding("ASCII")); + "angle", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdTimeStamp = readConstField( @@ -1136,20 +1120,20 @@ public static class OpenProtocolMessageLastTighteningResultDataRev1BuilderImpl private final String torqueControllerName; private final String vinNumber; private final int jobId; - private final long parameterSetId; + private final int parameterSetId; private final long batchSize; private final long batchCounter; private final NokOk tighteningStatus; private final Status torqueStatus; private final Status angleStatus; - private final BigInteger torqueMinLimit; - private final BigInteger torqueMaxLimit; - private final BigInteger torqueFinalTarget; - private final BigInteger torque; - private final BigInteger angleMin; - private final BigInteger angleMax; - private final BigInteger finalAngleTarget; - private final BigInteger angle; + private final long torqueMinLimit; + private final long torqueMaxLimit; + private final long torqueFinalTarget; + private final long torque; + private final long angleMin; + private final long angleMax; + private final long finalAngleTarget; + private final long angle; private final String timeStamp; private final String dateTimeOfLastChangeIndParameterSetSettings; private final BatchStatus batchStatus; @@ -1161,20 +1145,20 @@ public OpenProtocolMessageLastTighteningResultDataRev1BuilderImpl( String torqueControllerName, String vinNumber, int jobId, - long parameterSetId, + int parameterSetId, long batchSize, long batchCounter, NokOk tighteningStatus, Status torqueStatus, Status angleStatus, - BigInteger torqueMinLimit, - BigInteger torqueMaxLimit, - BigInteger torqueFinalTarget, - BigInteger torque, - BigInteger angleMin, - BigInteger angleMax, - BigInteger finalAngleTarget, - BigInteger angle, + long torqueMinLimit, + long torqueMaxLimit, + long torqueFinalTarget, + long torque, + long angleMin, + long angleMax, + long finalAngleTarget, + long angle, String timeStamp, String dateTimeOfLastChangeIndParameterSetSettings, BatchStatus batchStatus, @@ -1206,7 +1190,7 @@ public OpenProtocolMessageLastTighteningResultDataRev1BuilderImpl( } public OpenProtocolMessageLastTighteningResultDataRev1 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLastTighteningResultDataRev2.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLastTighteningResultDataRev2.java index c472e14e2d5..2743bade4d0 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLastTighteningResultDataRev2.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLastTighteningResultDataRev2.java @@ -24,7 +24,6 @@ import static org.apache.plc4x.java.spi.codegen.io.DataWriterFactory.*; import static org.apache.plc4x.java.spi.generation.StaticHelper.*; -import java.math.BigInteger; import java.time.*; import java.util.*; import org.apache.plc4x.java.api.exceptions.*; @@ -40,8 +39,8 @@ public class OpenProtocolMessageLastTighteningResultDataRev2 extends OpenProtocolMessageLastTighteningResultData implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 2; + public Integer getRevision() { + return (int) 2; } // Constant values. @@ -98,7 +97,7 @@ public Long getRevision() { protected final String torqueControllerName; protected final String vinNumber; protected final long jobId; - protected final long parameterSetNumber; + protected final int parameterSetNumber; protected final Strategy strategy; protected final long strategyOptions; protected final long batchSize; @@ -113,35 +112,35 @@ public Long getRevision() { protected final Status prevailTorqueMonitoringStatus; protected final Status prevailTorqueCompensateStatus; protected final String tighteningErrorStatus; - protected final BigInteger torqueMinLimit; - protected final BigInteger torqueMaxLimit; - protected final BigInteger torqueFinalTarget; - protected final BigInteger torque; - protected final BigInteger angleMin; - protected final BigInteger angleMax; - protected final BigInteger finalAngleTarget; - protected final BigInteger angle; - protected final BigInteger rundownAngleMin; - protected final BigInteger rundownAngleMax; - protected final BigInteger rundownAngle; - protected final long currentMonitoringMin; - protected final long currentMonitoringMax; - protected final long currentMonitoringValue; - protected final BigInteger selfTapMin; - protected final BigInteger selfTapMax; - protected final BigInteger selfTapTorque; - protected final BigInteger prevailTorqueMonitoringMin; - protected final BigInteger prevailTorqueMonitoringMax; - protected final BigInteger prevailTorque; + protected final long torqueMinLimit; + protected final long torqueMaxLimit; + protected final long torqueFinalTarget; + protected final long torque; + protected final long angleMin; + protected final long angleMax; + protected final long finalAngleTarget; + protected final long angle; + protected final long rundownAngleMin; + protected final long rundownAngleMax; + protected final long rundownAngle; + protected final int currentMonitoringMin; + protected final int currentMonitoringMax; + protected final int currentMonitoringValue; + protected final long selfTapMin; + protected final long selfTapMax; + protected final long selfTapTorque; + protected final long prevailTorqueMonitoringMin; + protected final long prevailTorqueMonitoringMax; + protected final long prevailTorque; protected final String tighteningId; - protected final BigInteger jobSequenceNumber; - protected final BigInteger syncTighteningId; + protected final long jobSequenceNumber; + protected final long syncTighteningId; protected final String toolSerialNumber; protected final String timeStamp; protected final String dateTimeOfLastChangeIndParameterSetSettings; public OpenProtocolMessageLastTighteningResultDataRev2( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -153,7 +152,7 @@ public OpenProtocolMessageLastTighteningResultDataRev2( String torqueControllerName, String vinNumber, long jobId, - long parameterSetNumber, + int parameterSetNumber, Strategy strategy, long strategyOptions, long batchSize, @@ -168,29 +167,29 @@ public OpenProtocolMessageLastTighteningResultDataRev2( Status prevailTorqueMonitoringStatus, Status prevailTorqueCompensateStatus, String tighteningErrorStatus, - BigInteger torqueMinLimit, - BigInteger torqueMaxLimit, - BigInteger torqueFinalTarget, - BigInteger torque, - BigInteger angleMin, - BigInteger angleMax, - BigInteger finalAngleTarget, - BigInteger angle, - BigInteger rundownAngleMin, - BigInteger rundownAngleMax, - BigInteger rundownAngle, - long currentMonitoringMin, - long currentMonitoringMax, - long currentMonitoringValue, - BigInteger selfTapMin, - BigInteger selfTapMax, - BigInteger selfTapTorque, - BigInteger prevailTorqueMonitoringMin, - BigInteger prevailTorqueMonitoringMax, - BigInteger prevailTorque, + long torqueMinLimit, + long torqueMaxLimit, + long torqueFinalTarget, + long torque, + long angleMin, + long angleMax, + long finalAngleTarget, + long angle, + long rundownAngleMin, + long rundownAngleMax, + long rundownAngle, + int currentMonitoringMin, + int currentMonitoringMax, + int currentMonitoringValue, + long selfTapMin, + long selfTapMax, + long selfTapTorque, + long prevailTorqueMonitoringMin, + long prevailTorqueMonitoringMax, + long prevailTorque, String tighteningId, - BigInteger jobSequenceNumber, - BigInteger syncTighteningId, + long jobSequenceNumber, + long syncTighteningId, String toolSerialNumber, String timeStamp, String dateTimeOfLastChangeIndParameterSetSettings) { @@ -270,7 +269,7 @@ public long getJobId() { return jobId; } - public long getParameterSetNumber() { + public int getParameterSetNumber() { return parameterSetNumber; } @@ -330,83 +329,83 @@ public String getTighteningErrorStatus() { return tighteningErrorStatus; } - public BigInteger getTorqueMinLimit() { + public long getTorqueMinLimit() { return torqueMinLimit; } - public BigInteger getTorqueMaxLimit() { + public long getTorqueMaxLimit() { return torqueMaxLimit; } - public BigInteger getTorqueFinalTarget() { + public long getTorqueFinalTarget() { return torqueFinalTarget; } - public BigInteger getTorque() { + public long getTorque() { return torque; } - public BigInteger getAngleMin() { + public long getAngleMin() { return angleMin; } - public BigInteger getAngleMax() { + public long getAngleMax() { return angleMax; } - public BigInteger getFinalAngleTarget() { + public long getFinalAngleTarget() { return finalAngleTarget; } - public BigInteger getAngle() { + public long getAngle() { return angle; } - public BigInteger getRundownAngleMin() { + public long getRundownAngleMin() { return rundownAngleMin; } - public BigInteger getRundownAngleMax() { + public long getRundownAngleMax() { return rundownAngleMax; } - public BigInteger getRundownAngle() { + public long getRundownAngle() { return rundownAngle; } - public long getCurrentMonitoringMin() { + public int getCurrentMonitoringMin() { return currentMonitoringMin; } - public long getCurrentMonitoringMax() { + public int getCurrentMonitoringMax() { return currentMonitoringMax; } - public long getCurrentMonitoringValue() { + public int getCurrentMonitoringValue() { return currentMonitoringValue; } - public BigInteger getSelfTapMin() { + public long getSelfTapMin() { return selfTapMin; } - public BigInteger getSelfTapMax() { + public long getSelfTapMax() { return selfTapMax; } - public BigInteger getSelfTapTorque() { + public long getSelfTapTorque() { return selfTapTorque; } - public BigInteger getPrevailTorqueMonitoringMin() { + public long getPrevailTorqueMonitoringMin() { return prevailTorqueMonitoringMin; } - public BigInteger getPrevailTorqueMonitoringMax() { + public long getPrevailTorqueMonitoringMax() { return prevailTorqueMonitoringMax; } - public BigInteger getPrevailTorque() { + public long getPrevailTorque() { return prevailTorque; } @@ -414,11 +413,11 @@ public String getTighteningId() { return tighteningId; } - public BigInteger getJobSequenceNumber() { + public long getJobSequenceNumber() { return jobSequenceNumber; } - public BigInteger getSyncTighteningId() { + public long getSyncTighteningId() { return syncTighteningId; } @@ -933,7 +932,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "parameterSetNumber", parameterSetNumber, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); // Const Field (blockIdStrategy) @@ -1393,7 +1392,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "torqueMinLimit", torqueMinLimit, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdTorqueMaxLimit) @@ -1407,7 +1406,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "torqueMaxLimit", torqueMaxLimit, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdTorqueFinalTarget) @@ -1421,7 +1420,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "torqueFinalTarget", torqueFinalTarget, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdTorque) @@ -1433,10 +1432,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu // Simple Field (torque) writeSimpleField( - "torque", - torque, - writeUnsignedBigInteger(writeBuffer, 48), - WithOption.WithEncoding("ASCII")); + "torque", torque, writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdAngleMin) writeConstField( @@ -1447,10 +1443,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu // Simple Field (angleMin) writeSimpleField( - "angleMin", - angleMin, - writeUnsignedBigInteger(writeBuffer, 40), - WithOption.WithEncoding("ASCII")); + "angleMin", angleMin, writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdAngleMax) writeConstField( @@ -1461,10 +1454,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu // Simple Field (angleMax) writeSimpleField( - "angleMax", - angleMax, - writeUnsignedBigInteger(writeBuffer, 40), - WithOption.WithEncoding("ASCII")); + "angleMax", angleMax, writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdFinalAngleTarget) writeConstField( @@ -1477,7 +1467,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "finalAngleTarget", finalAngleTarget, - writeUnsignedBigInteger(writeBuffer, 40), + writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdAngle) @@ -1489,7 +1479,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu // Simple Field (angle) writeSimpleField( - "angle", angle, writeUnsignedBigInteger(writeBuffer, 40), WithOption.WithEncoding("ASCII")); + "angle", angle, writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdRundownAngleMin) writeConstField( @@ -1502,7 +1492,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "rundownAngleMin", rundownAngleMin, - writeUnsignedBigInteger(writeBuffer, 40), + writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdRundownAngleMax) @@ -1516,7 +1506,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "rundownAngleMax", rundownAngleMax, - writeUnsignedBigInteger(writeBuffer, 40), + writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdRundownAngle) @@ -1530,7 +1520,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "rundownAngle", rundownAngle, - writeUnsignedBigInteger(writeBuffer, 40), + writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdCurrentMonitoringMin) @@ -1544,7 +1534,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "currentMonitoringMin", currentMonitoringMin, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); // Const Field (blockIdCurrentMonitoringMax) @@ -1558,7 +1548,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "currentMonitoringMax", currentMonitoringMax, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); // Const Field (blockIdCurrentMonitoringValue) @@ -1572,7 +1562,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "currentMonitoringValue", currentMonitoringValue, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); // Const Field (blockIdSelfTapMin) @@ -1586,7 +1576,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "selfTapMin", selfTapMin, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdSelfTapMax) @@ -1600,7 +1590,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "selfTapMax", selfTapMax, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdSelfTapTorque) @@ -1614,7 +1604,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "selfTapTorque", selfTapTorque, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdPrevailTorqueMonitoringMin) @@ -1628,7 +1618,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "prevailTorqueMonitoringMin", prevailTorqueMonitoringMin, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdPrevailTorqueMonitoringMax) @@ -1642,7 +1632,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "prevailTorqueMonitoringMax", prevailTorqueMonitoringMax, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdPrevailTorque) @@ -1656,7 +1646,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "prevailTorque", prevailTorque, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdTighteningId) @@ -1684,7 +1674,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "jobSequenceNumber", jobSequenceNumber, - writeUnsignedBigInteger(writeBuffer, 40), + writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdSyncTighteningId) @@ -1698,7 +1688,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "syncTighteningId", syncTighteningId, - writeUnsignedBigInteger(writeBuffer, 40), + writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdToolSerialNumber) @@ -2124,7 +2114,7 @@ public int getLengthInBits() { public static OpenProtocolMessageLastTighteningResultDataBuilder staticParseOpenProtocolMessageLastTighteningResultDataBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageLastTighteningResultDataRev2"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -2190,10 +2180,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev2.BLOCKIDPARAMETERSETNUMBER, WithOption.WithEncoding("ASCII")); - long parameterSetNumber = + int parameterSetNumber = readSimpleField( "parameterSetNumber", - readUnsignedLong(readBuffer, 24), + readUnsignedInt(readBuffer, 24), WithOption.WithEncoding("ASCII")); int blockIdStrategy = @@ -2624,11 +2614,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev2.BLOCKIDTORQUEMINLIMIT, WithOption.WithEncoding("ASCII")); - BigInteger torqueMinLimit = + long torqueMinLimit = readSimpleField( - "torqueMinLimit", - readUnsignedBigInteger(readBuffer, 48), - WithOption.WithEncoding("ASCII")); + "torqueMinLimit", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdTorqueMaxLimit = readConstField( @@ -2637,11 +2625,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev2.BLOCKIDTORQUEMAXLIMIT, WithOption.WithEncoding("ASCII")); - BigInteger torqueMaxLimit = + long torqueMaxLimit = readSimpleField( - "torqueMaxLimit", - readUnsignedBigInteger(readBuffer, 48), - WithOption.WithEncoding("ASCII")); + "torqueMaxLimit", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdTorqueFinalTarget = readConstField( @@ -2650,10 +2636,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev2.BLOCKIDTORQUEFINALTARGET, WithOption.WithEncoding("ASCII")); - BigInteger torqueFinalTarget = + long torqueFinalTarget = readSimpleField( "torqueFinalTarget", - readUnsignedBigInteger(readBuffer, 48), + readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdTorque = @@ -2663,9 +2649,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev2.BLOCKIDTORQUE, WithOption.WithEncoding("ASCII")); - BigInteger torque = + long torque = readSimpleField( - "torque", readUnsignedBigInteger(readBuffer, 48), WithOption.WithEncoding("ASCII")); + "torque", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdAngleMin = readConstField( @@ -2674,9 +2660,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev2.BLOCKIDANGLEMIN, WithOption.WithEncoding("ASCII")); - BigInteger angleMin = + long angleMin = readSimpleField( - "angleMin", readUnsignedBigInteger(readBuffer, 40), WithOption.WithEncoding("ASCII")); + "angleMin", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdAngleMax = readConstField( @@ -2685,9 +2671,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev2.BLOCKIDANGLEMAX, WithOption.WithEncoding("ASCII")); - BigInteger angleMax = + long angleMax = readSimpleField( - "angleMax", readUnsignedBigInteger(readBuffer, 40), WithOption.WithEncoding("ASCII")); + "angleMax", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdFinalAngleTarget = readConstField( @@ -2696,11 +2682,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev2.BLOCKIDFINALANGLETARGET, WithOption.WithEncoding("ASCII")); - BigInteger finalAngleTarget = + long finalAngleTarget = readSimpleField( - "finalAngleTarget", - readUnsignedBigInteger(readBuffer, 40), - WithOption.WithEncoding("ASCII")); + "finalAngleTarget", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdAngle = readConstField( @@ -2709,9 +2693,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev2.BLOCKIDANGLE, WithOption.WithEncoding("ASCII")); - BigInteger angle = + long angle = readSimpleField( - "angle", readUnsignedBigInteger(readBuffer, 40), WithOption.WithEncoding("ASCII")); + "angle", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdRundownAngleMin = readConstField( @@ -2720,11 +2704,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev2.BLOCKIDRUNDOWNANGLEMIN, WithOption.WithEncoding("ASCII")); - BigInteger rundownAngleMin = + long rundownAngleMin = readSimpleField( - "rundownAngleMin", - readUnsignedBigInteger(readBuffer, 40), - WithOption.WithEncoding("ASCII")); + "rundownAngleMin", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdRundownAngleMax = readConstField( @@ -2733,11 +2715,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev2.BLOCKIDRUNDOWNANGLEMAX, WithOption.WithEncoding("ASCII")); - BigInteger rundownAngleMax = + long rundownAngleMax = readSimpleField( - "rundownAngleMax", - readUnsignedBigInteger(readBuffer, 40), - WithOption.WithEncoding("ASCII")); + "rundownAngleMax", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdRundownAngle = readConstField( @@ -2746,11 +2726,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev2.BLOCKIDRUNDOWNANGLE, WithOption.WithEncoding("ASCII")); - BigInteger rundownAngle = + long rundownAngle = readSimpleField( - "rundownAngle", - readUnsignedBigInteger(readBuffer, 40), - WithOption.WithEncoding("ASCII")); + "rundownAngle", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdCurrentMonitoringMin = readConstField( @@ -2759,10 +2737,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev2.BLOCKIDCURRENTMONITORINGMIN, WithOption.WithEncoding("ASCII")); - long currentMonitoringMin = + int currentMonitoringMin = readSimpleField( "currentMonitoringMin", - readUnsignedLong(readBuffer, 24), + readUnsignedInt(readBuffer, 24), WithOption.WithEncoding("ASCII")); int blockIdCurrentMonitoringMax = @@ -2772,10 +2750,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev2.BLOCKIDCURRENTMONITORINGMAX, WithOption.WithEncoding("ASCII")); - long currentMonitoringMax = + int currentMonitoringMax = readSimpleField( "currentMonitoringMax", - readUnsignedLong(readBuffer, 24), + readUnsignedInt(readBuffer, 24), WithOption.WithEncoding("ASCII")); int blockIdCurrentMonitoringValue = @@ -2785,10 +2763,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev2.BLOCKIDCURRENTMONITORINGVALUE, WithOption.WithEncoding("ASCII")); - long currentMonitoringValue = + int currentMonitoringValue = readSimpleField( "currentMonitoringValue", - readUnsignedLong(readBuffer, 24), + readUnsignedInt(readBuffer, 24), WithOption.WithEncoding("ASCII")); int blockIdSelfTapMin = @@ -2798,9 +2776,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev2.BLOCKIDSELFTAPMIN, WithOption.WithEncoding("ASCII")); - BigInteger selfTapMin = + long selfTapMin = readSimpleField( - "selfTapMin", readUnsignedBigInteger(readBuffer, 48), WithOption.WithEncoding("ASCII")); + "selfTapMin", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdSelfTapMax = readConstField( @@ -2809,9 +2787,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev2.BLOCKIDSELFTAPMAX, WithOption.WithEncoding("ASCII")); - BigInteger selfTapMax = + long selfTapMax = readSimpleField( - "selfTapMax", readUnsignedBigInteger(readBuffer, 48), WithOption.WithEncoding("ASCII")); + "selfTapMax", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdSelfTapTorque = readConstField( @@ -2820,11 +2798,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev2.BLOCKIDSELFTAPTORQUE, WithOption.WithEncoding("ASCII")); - BigInteger selfTapTorque = + long selfTapTorque = readSimpleField( - "selfTapTorque", - readUnsignedBigInteger(readBuffer, 48), - WithOption.WithEncoding("ASCII")); + "selfTapTorque", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdPrevailTorqueMonitoringMin = readConstField( @@ -2833,10 +2809,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev2.BLOCKIDPREVAILTORQUEMONITORINGMIN, WithOption.WithEncoding("ASCII")); - BigInteger prevailTorqueMonitoringMin = + long prevailTorqueMonitoringMin = readSimpleField( "prevailTorqueMonitoringMin", - readUnsignedBigInteger(readBuffer, 48), + readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdPrevailTorqueMonitoringMax = @@ -2846,10 +2822,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev2.BLOCKIDPREVAILTORQUEMONITORINGMAX, WithOption.WithEncoding("ASCII")); - BigInteger prevailTorqueMonitoringMax = + long prevailTorqueMonitoringMax = readSimpleField( "prevailTorqueMonitoringMax", - readUnsignedBigInteger(readBuffer, 48), + readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdPrevailTorque = @@ -2859,11 +2835,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev2.BLOCKIDPREVAILTORQUE, WithOption.WithEncoding("ASCII")); - BigInteger prevailTorque = + long prevailTorque = readSimpleField( - "prevailTorque", - readUnsignedBigInteger(readBuffer, 48), - WithOption.WithEncoding("ASCII")); + "prevailTorque", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdTighteningId = readConstField( @@ -2883,10 +2857,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev2.BLOCKIDJOBSEQUENCENUMBER, WithOption.WithEncoding("ASCII")); - BigInteger jobSequenceNumber = + long jobSequenceNumber = readSimpleField( "jobSequenceNumber", - readUnsignedBigInteger(readBuffer, 40), + readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdSyncTighteningId = @@ -2896,11 +2870,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev2.BLOCKIDSYNCTIGHTENINGID, WithOption.WithEncoding("ASCII")); - BigInteger syncTighteningId = + long syncTighteningId = readSimpleField( - "syncTighteningId", - readUnsignedBigInteger(readBuffer, 40), - WithOption.WithEncoding("ASCII")); + "syncTighteningId", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdToolSerialNumber = readConstField( @@ -2996,7 +2968,7 @@ public static class OpenProtocolMessageLastTighteningResultDataRev2BuilderImpl private final String torqueControllerName; private final String vinNumber; private final long jobId; - private final long parameterSetNumber; + private final int parameterSetNumber; private final Strategy strategy; private final long strategyOptions; private final long batchSize; @@ -3011,29 +2983,29 @@ public static class OpenProtocolMessageLastTighteningResultDataRev2BuilderImpl private final Status prevailTorqueMonitoringStatus; private final Status prevailTorqueCompensateStatus; private final String tighteningErrorStatus; - private final BigInteger torqueMinLimit; - private final BigInteger torqueMaxLimit; - private final BigInteger torqueFinalTarget; - private final BigInteger torque; - private final BigInteger angleMin; - private final BigInteger angleMax; - private final BigInteger finalAngleTarget; - private final BigInteger angle; - private final BigInteger rundownAngleMin; - private final BigInteger rundownAngleMax; - private final BigInteger rundownAngle; - private final long currentMonitoringMin; - private final long currentMonitoringMax; - private final long currentMonitoringValue; - private final BigInteger selfTapMin; - private final BigInteger selfTapMax; - private final BigInteger selfTapTorque; - private final BigInteger prevailTorqueMonitoringMin; - private final BigInteger prevailTorqueMonitoringMax; - private final BigInteger prevailTorque; + private final long torqueMinLimit; + private final long torqueMaxLimit; + private final long torqueFinalTarget; + private final long torque; + private final long angleMin; + private final long angleMax; + private final long finalAngleTarget; + private final long angle; + private final long rundownAngleMin; + private final long rundownAngleMax; + private final long rundownAngle; + private final int currentMonitoringMin; + private final int currentMonitoringMax; + private final int currentMonitoringValue; + private final long selfTapMin; + private final long selfTapMax; + private final long selfTapTorque; + private final long prevailTorqueMonitoringMin; + private final long prevailTorqueMonitoringMax; + private final long prevailTorque; private final String tighteningId; - private final BigInteger jobSequenceNumber; - private final BigInteger syncTighteningId; + private final long jobSequenceNumber; + private final long syncTighteningId; private final String toolSerialNumber; private final String timeStamp; private final String dateTimeOfLastChangeIndParameterSetSettings; @@ -3044,7 +3016,7 @@ public OpenProtocolMessageLastTighteningResultDataRev2BuilderImpl( String torqueControllerName, String vinNumber, long jobId, - long parameterSetNumber, + int parameterSetNumber, Strategy strategy, long strategyOptions, long batchSize, @@ -3059,29 +3031,29 @@ public OpenProtocolMessageLastTighteningResultDataRev2BuilderImpl( Status prevailTorqueMonitoringStatus, Status prevailTorqueCompensateStatus, String tighteningErrorStatus, - BigInteger torqueMinLimit, - BigInteger torqueMaxLimit, - BigInteger torqueFinalTarget, - BigInteger torque, - BigInteger angleMin, - BigInteger angleMax, - BigInteger finalAngleTarget, - BigInteger angle, - BigInteger rundownAngleMin, - BigInteger rundownAngleMax, - BigInteger rundownAngle, - long currentMonitoringMin, - long currentMonitoringMax, - long currentMonitoringValue, - BigInteger selfTapMin, - BigInteger selfTapMax, - BigInteger selfTapTorque, - BigInteger prevailTorqueMonitoringMin, - BigInteger prevailTorqueMonitoringMax, - BigInteger prevailTorque, + long torqueMinLimit, + long torqueMaxLimit, + long torqueFinalTarget, + long torque, + long angleMin, + long angleMax, + long finalAngleTarget, + long angle, + long rundownAngleMin, + long rundownAngleMax, + long rundownAngle, + int currentMonitoringMin, + int currentMonitoringMax, + int currentMonitoringValue, + long selfTapMin, + long selfTapMax, + long selfTapTorque, + long prevailTorqueMonitoringMin, + long prevailTorqueMonitoringMax, + long prevailTorque, String tighteningId, - BigInteger jobSequenceNumber, - BigInteger syncTighteningId, + long jobSequenceNumber, + long syncTighteningId, String toolSerialNumber, String timeStamp, String dateTimeOfLastChangeIndParameterSetSettings) { @@ -3135,7 +3107,7 @@ public OpenProtocolMessageLastTighteningResultDataRev2BuilderImpl( } public OpenProtocolMessageLastTighteningResultDataRev2 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLastTighteningResultDataRev3.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLastTighteningResultDataRev3.java index cc1a5dab13c..c037517f24c 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLastTighteningResultDataRev3.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLastTighteningResultDataRev3.java @@ -24,7 +24,6 @@ import static org.apache.plc4x.java.spi.codegen.io.DataWriterFactory.*; import static org.apache.plc4x.java.spi.generation.StaticHelper.*; -import java.math.BigInteger; import java.time.*; import java.util.*; import org.apache.plc4x.java.api.exceptions.*; @@ -40,8 +39,8 @@ public class OpenProtocolMessageLastTighteningResultDataRev3 extends OpenProtocolMessageLastTighteningResultData implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 3; + public Integer getRevision() { + return (int) 3; } // Constant values. @@ -101,7 +100,7 @@ public Long getRevision() { protected final String torqueControllerName; protected final String vinNumber; protected final long jobId; - protected final long parameterSetNumber; + protected final int parameterSetNumber; protected final Strategy strategy; protected final long batchSize; protected final long batchCounter; @@ -114,29 +113,29 @@ public Long getRevision() { protected final Status selfTapStatus; protected final Status prevailTorqueMonitoringStatus; protected final Status prevailTorqueCompensateStatus; - protected final BigInteger torqueMinLimit; - protected final BigInteger torqueMaxLimit; - protected final BigInteger torqueFinalTarget; - protected final BigInteger torque; - protected final BigInteger angleMin; - protected final BigInteger angleMax; - protected final BigInteger finalAngleTarget; - protected final BigInteger angle; - protected final BigInteger rundownAngleMin; - protected final BigInteger rundownAngleMax; - protected final BigInteger rundownAngle; - protected final long currentMonitoringMin; - protected final long currentMonitoringMax; - protected final long currentMonitoringValue; - protected final BigInteger selfTapMin; - protected final BigInteger selfTapMax; - protected final BigInteger selfTapTorque; - protected final BigInteger prevailTorqueMonitoringMin; - protected final BigInteger prevailTorqueMonitoringMax; - protected final BigInteger prevailTorque; + protected final long torqueMinLimit; + protected final long torqueMaxLimit; + protected final long torqueFinalTarget; + protected final long torque; + protected final long angleMin; + protected final long angleMax; + protected final long finalAngleTarget; + protected final long angle; + protected final long rundownAngleMin; + protected final long rundownAngleMax; + protected final long rundownAngle; + protected final int currentMonitoringMin; + protected final int currentMonitoringMax; + protected final int currentMonitoringValue; + protected final long selfTapMin; + protected final long selfTapMax; + protected final long selfTapTorque; + protected final long prevailTorqueMonitoringMin; + protected final long prevailTorqueMonitoringMax; + protected final long prevailTorque; protected final String tighteningId; - protected final BigInteger jobSequenceNumber; - protected final BigInteger syncTighteningId; + protected final long jobSequenceNumber; + protected final long syncTighteningId; protected final String toolSerialNumber; protected final String timeStamp; protected final String dateTimeOfLastChangeIndParameterSetSettings; @@ -145,7 +144,7 @@ public Long getRevision() { protected final ResultType resultType; public OpenProtocolMessageLastTighteningResultDataRev3( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -157,7 +156,7 @@ public OpenProtocolMessageLastTighteningResultDataRev3( String torqueControllerName, String vinNumber, long jobId, - long parameterSetNumber, + int parameterSetNumber, Strategy strategy, long batchSize, long batchCounter, @@ -170,29 +169,29 @@ public OpenProtocolMessageLastTighteningResultDataRev3( Status selfTapStatus, Status prevailTorqueMonitoringStatus, Status prevailTorqueCompensateStatus, - BigInteger torqueMinLimit, - BigInteger torqueMaxLimit, - BigInteger torqueFinalTarget, - BigInteger torque, - BigInteger angleMin, - BigInteger angleMax, - BigInteger finalAngleTarget, - BigInteger angle, - BigInteger rundownAngleMin, - BigInteger rundownAngleMax, - BigInteger rundownAngle, - long currentMonitoringMin, - long currentMonitoringMax, - long currentMonitoringValue, - BigInteger selfTapMin, - BigInteger selfTapMax, - BigInteger selfTapTorque, - BigInteger prevailTorqueMonitoringMin, - BigInteger prevailTorqueMonitoringMax, - BigInteger prevailTorque, + long torqueMinLimit, + long torqueMaxLimit, + long torqueFinalTarget, + long torque, + long angleMin, + long angleMax, + long finalAngleTarget, + long angle, + long rundownAngleMin, + long rundownAngleMax, + long rundownAngle, + int currentMonitoringMin, + int currentMonitoringMax, + int currentMonitoringValue, + long selfTapMin, + long selfTapMax, + long selfTapTorque, + long prevailTorqueMonitoringMin, + long prevailTorqueMonitoringMax, + long prevailTorque, String tighteningId, - BigInteger jobSequenceNumber, - BigInteger syncTighteningId, + long jobSequenceNumber, + long syncTighteningId, String toolSerialNumber, String timeStamp, String dateTimeOfLastChangeIndParameterSetSettings, @@ -276,7 +275,7 @@ public long getJobId() { return jobId; } - public long getParameterSetNumber() { + public int getParameterSetNumber() { return parameterSetNumber; } @@ -328,83 +327,83 @@ public Status getPrevailTorqueCompensateStatus() { return prevailTorqueCompensateStatus; } - public BigInteger getTorqueMinLimit() { + public long getTorqueMinLimit() { return torqueMinLimit; } - public BigInteger getTorqueMaxLimit() { + public long getTorqueMaxLimit() { return torqueMaxLimit; } - public BigInteger getTorqueFinalTarget() { + public long getTorqueFinalTarget() { return torqueFinalTarget; } - public BigInteger getTorque() { + public long getTorque() { return torque; } - public BigInteger getAngleMin() { + public long getAngleMin() { return angleMin; } - public BigInteger getAngleMax() { + public long getAngleMax() { return angleMax; } - public BigInteger getFinalAngleTarget() { + public long getFinalAngleTarget() { return finalAngleTarget; } - public BigInteger getAngle() { + public long getAngle() { return angle; } - public BigInteger getRundownAngleMin() { + public long getRundownAngleMin() { return rundownAngleMin; } - public BigInteger getRundownAngleMax() { + public long getRundownAngleMax() { return rundownAngleMax; } - public BigInteger getRundownAngle() { + public long getRundownAngle() { return rundownAngle; } - public long getCurrentMonitoringMin() { + public int getCurrentMonitoringMin() { return currentMonitoringMin; } - public long getCurrentMonitoringMax() { + public int getCurrentMonitoringMax() { return currentMonitoringMax; } - public long getCurrentMonitoringValue() { + public int getCurrentMonitoringValue() { return currentMonitoringValue; } - public BigInteger getSelfTapMin() { + public long getSelfTapMin() { return selfTapMin; } - public BigInteger getSelfTapMax() { + public long getSelfTapMax() { return selfTapMax; } - public BigInteger getSelfTapTorque() { + public long getSelfTapTorque() { return selfTapTorque; } - public BigInteger getPrevailTorqueMonitoringMin() { + public long getPrevailTorqueMonitoringMin() { return prevailTorqueMonitoringMin; } - public BigInteger getPrevailTorqueMonitoringMax() { + public long getPrevailTorqueMonitoringMax() { return prevailTorqueMonitoringMax; } - public BigInteger getPrevailTorque() { + public long getPrevailTorque() { return prevailTorque; } @@ -412,11 +411,11 @@ public String getTighteningId() { return tighteningId; } - public BigInteger getJobSequenceNumber() { + public long getJobSequenceNumber() { return jobSequenceNumber; } - public BigInteger getSyncTighteningId() { + public long getSyncTighteningId() { return syncTighteningId; } @@ -719,7 +718,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "parameterSetNumber", parameterSetNumber, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); // Const Field (blockIdStrategy) @@ -935,7 +934,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "torqueMinLimit", torqueMinLimit, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdTorqueMaxLimit) @@ -949,7 +948,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "torqueMaxLimit", torqueMaxLimit, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdTorqueFinalTarget) @@ -963,7 +962,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "torqueFinalTarget", torqueFinalTarget, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdTorque) @@ -975,10 +974,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu // Simple Field (torque) writeSimpleField( - "torque", - torque, - writeUnsignedBigInteger(writeBuffer, 48), - WithOption.WithEncoding("ASCII")); + "torque", torque, writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdAngleMin) writeConstField( @@ -989,10 +985,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu // Simple Field (angleMin) writeSimpleField( - "angleMin", - angleMin, - writeUnsignedBigInteger(writeBuffer, 40), - WithOption.WithEncoding("ASCII")); + "angleMin", angleMin, writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdAngleMax) writeConstField( @@ -1003,10 +996,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu // Simple Field (angleMax) writeSimpleField( - "angleMax", - angleMax, - writeUnsignedBigInteger(writeBuffer, 40), - WithOption.WithEncoding("ASCII")); + "angleMax", angleMax, writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdFinalAngleTarget) writeConstField( @@ -1019,7 +1009,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "finalAngleTarget", finalAngleTarget, - writeUnsignedBigInteger(writeBuffer, 40), + writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdAngle) @@ -1031,7 +1021,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu // Simple Field (angle) writeSimpleField( - "angle", angle, writeUnsignedBigInteger(writeBuffer, 40), WithOption.WithEncoding("ASCII")); + "angle", angle, writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdRundownAngleMin) writeConstField( @@ -1044,7 +1034,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "rundownAngleMin", rundownAngleMin, - writeUnsignedBigInteger(writeBuffer, 40), + writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdRundownAngleMax) @@ -1058,7 +1048,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "rundownAngleMax", rundownAngleMax, - writeUnsignedBigInteger(writeBuffer, 40), + writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdRundownAngle) @@ -1072,7 +1062,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "rundownAngle", rundownAngle, - writeUnsignedBigInteger(writeBuffer, 40), + writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdCurrentMonitoringMin) @@ -1086,7 +1076,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "currentMonitoringMin", currentMonitoringMin, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); // Const Field (blockIdCurrentMonitoringMax) @@ -1100,7 +1090,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "currentMonitoringMax", currentMonitoringMax, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); // Const Field (blockIdCurrentMonitoringValue) @@ -1114,7 +1104,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "currentMonitoringValue", currentMonitoringValue, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); // Const Field (blockIdSelfTapMin) @@ -1128,7 +1118,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "selfTapMin", selfTapMin, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdSelfTapMax) @@ -1142,7 +1132,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "selfTapMax", selfTapMax, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdSelfTapTorque) @@ -1156,7 +1146,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "selfTapTorque", selfTapTorque, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdPrevailTorqueMonitoringMin) @@ -1170,7 +1160,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "prevailTorqueMonitoringMin", prevailTorqueMonitoringMin, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdPrevailTorqueMonitoringMax) @@ -1184,7 +1174,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "prevailTorqueMonitoringMax", prevailTorqueMonitoringMax, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdPrevailTorque) @@ -1198,7 +1188,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "prevailTorque", prevailTorque, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdTighteningId) @@ -1226,7 +1216,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "jobSequenceNumber", jobSequenceNumber, - writeUnsignedBigInteger(writeBuffer, 40), + writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdSyncTighteningId) @@ -1240,7 +1230,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "syncTighteningId", syncTighteningId, - writeUnsignedBigInteger(writeBuffer, 40), + writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdToolSerialNumber) @@ -1634,7 +1624,7 @@ public int getLengthInBits() { public static OpenProtocolMessageLastTighteningResultDataBuilder staticParseOpenProtocolMessageLastTighteningResultDataBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageLastTighteningResultDataRev3"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -1700,10 +1690,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev3.BLOCKIDPARAMETERSETNUMBER, WithOption.WithEncoding("ASCII")); - long parameterSetNumber = + int parameterSetNumber = readSimpleField( "parameterSetNumber", - readUnsignedLong(readBuffer, 24), + readUnsignedInt(readBuffer, 24), WithOption.WithEncoding("ASCII")); int blockIdStrategy = @@ -1890,11 +1880,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev3.BLOCKIDTORQUEMINLIMIT, WithOption.WithEncoding("ASCII")); - BigInteger torqueMinLimit = + long torqueMinLimit = readSimpleField( - "torqueMinLimit", - readUnsignedBigInteger(readBuffer, 48), - WithOption.WithEncoding("ASCII")); + "torqueMinLimit", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdTorqueMaxLimit = readConstField( @@ -1903,11 +1891,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev3.BLOCKIDTORQUEMAXLIMIT, WithOption.WithEncoding("ASCII")); - BigInteger torqueMaxLimit = + long torqueMaxLimit = readSimpleField( - "torqueMaxLimit", - readUnsignedBigInteger(readBuffer, 48), - WithOption.WithEncoding("ASCII")); + "torqueMaxLimit", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdTorqueFinalTarget = readConstField( @@ -1916,10 +1902,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev3.BLOCKIDTORQUEFINALTARGET, WithOption.WithEncoding("ASCII")); - BigInteger torqueFinalTarget = + long torqueFinalTarget = readSimpleField( "torqueFinalTarget", - readUnsignedBigInteger(readBuffer, 48), + readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdTorque = @@ -1929,9 +1915,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev3.BLOCKIDTORQUE, WithOption.WithEncoding("ASCII")); - BigInteger torque = + long torque = readSimpleField( - "torque", readUnsignedBigInteger(readBuffer, 48), WithOption.WithEncoding("ASCII")); + "torque", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdAngleMin = readConstField( @@ -1940,9 +1926,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev3.BLOCKIDANGLEMIN, WithOption.WithEncoding("ASCII")); - BigInteger angleMin = + long angleMin = readSimpleField( - "angleMin", readUnsignedBigInteger(readBuffer, 40), WithOption.WithEncoding("ASCII")); + "angleMin", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdAngleMax = readConstField( @@ -1951,9 +1937,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev3.BLOCKIDANGLEMAX, WithOption.WithEncoding("ASCII")); - BigInteger angleMax = + long angleMax = readSimpleField( - "angleMax", readUnsignedBigInteger(readBuffer, 40), WithOption.WithEncoding("ASCII")); + "angleMax", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdFinalAngleTarget = readConstField( @@ -1962,11 +1948,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev3.BLOCKIDFINALANGLETARGET, WithOption.WithEncoding("ASCII")); - BigInteger finalAngleTarget = + long finalAngleTarget = readSimpleField( - "finalAngleTarget", - readUnsignedBigInteger(readBuffer, 40), - WithOption.WithEncoding("ASCII")); + "finalAngleTarget", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdAngle = readConstField( @@ -1975,9 +1959,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev3.BLOCKIDANGLE, WithOption.WithEncoding("ASCII")); - BigInteger angle = + long angle = readSimpleField( - "angle", readUnsignedBigInteger(readBuffer, 40), WithOption.WithEncoding("ASCII")); + "angle", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdRundownAngleMin = readConstField( @@ -1986,11 +1970,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev3.BLOCKIDRUNDOWNANGLEMIN, WithOption.WithEncoding("ASCII")); - BigInteger rundownAngleMin = + long rundownAngleMin = readSimpleField( - "rundownAngleMin", - readUnsignedBigInteger(readBuffer, 40), - WithOption.WithEncoding("ASCII")); + "rundownAngleMin", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdRundownAngleMax = readConstField( @@ -1999,11 +1981,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev3.BLOCKIDRUNDOWNANGLEMAX, WithOption.WithEncoding("ASCII")); - BigInteger rundownAngleMax = + long rundownAngleMax = readSimpleField( - "rundownAngleMax", - readUnsignedBigInteger(readBuffer, 40), - WithOption.WithEncoding("ASCII")); + "rundownAngleMax", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdRundownAngle = readConstField( @@ -2012,11 +1992,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev3.BLOCKIDRUNDOWNANGLE, WithOption.WithEncoding("ASCII")); - BigInteger rundownAngle = + long rundownAngle = readSimpleField( - "rundownAngle", - readUnsignedBigInteger(readBuffer, 40), - WithOption.WithEncoding("ASCII")); + "rundownAngle", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdCurrentMonitoringMin = readConstField( @@ -2025,10 +2003,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev3.BLOCKIDCURRENTMONITORINGMIN, WithOption.WithEncoding("ASCII")); - long currentMonitoringMin = + int currentMonitoringMin = readSimpleField( "currentMonitoringMin", - readUnsignedLong(readBuffer, 24), + readUnsignedInt(readBuffer, 24), WithOption.WithEncoding("ASCII")); int blockIdCurrentMonitoringMax = @@ -2038,10 +2016,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev3.BLOCKIDCURRENTMONITORINGMAX, WithOption.WithEncoding("ASCII")); - long currentMonitoringMax = + int currentMonitoringMax = readSimpleField( "currentMonitoringMax", - readUnsignedLong(readBuffer, 24), + readUnsignedInt(readBuffer, 24), WithOption.WithEncoding("ASCII")); int blockIdCurrentMonitoringValue = @@ -2051,10 +2029,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev3.BLOCKIDCURRENTMONITORINGVALUE, WithOption.WithEncoding("ASCII")); - long currentMonitoringValue = + int currentMonitoringValue = readSimpleField( "currentMonitoringValue", - readUnsignedLong(readBuffer, 24), + readUnsignedInt(readBuffer, 24), WithOption.WithEncoding("ASCII")); int blockIdSelfTapMin = @@ -2064,9 +2042,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev3.BLOCKIDSELFTAPMIN, WithOption.WithEncoding("ASCII")); - BigInteger selfTapMin = + long selfTapMin = readSimpleField( - "selfTapMin", readUnsignedBigInteger(readBuffer, 48), WithOption.WithEncoding("ASCII")); + "selfTapMin", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdSelfTapMax = readConstField( @@ -2075,9 +2053,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev3.BLOCKIDSELFTAPMAX, WithOption.WithEncoding("ASCII")); - BigInteger selfTapMax = + long selfTapMax = readSimpleField( - "selfTapMax", readUnsignedBigInteger(readBuffer, 48), WithOption.WithEncoding("ASCII")); + "selfTapMax", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdSelfTapTorque = readConstField( @@ -2086,11 +2064,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev3.BLOCKIDSELFTAPTORQUE, WithOption.WithEncoding("ASCII")); - BigInteger selfTapTorque = + long selfTapTorque = readSimpleField( - "selfTapTorque", - readUnsignedBigInteger(readBuffer, 48), - WithOption.WithEncoding("ASCII")); + "selfTapTorque", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdPrevailTorqueMonitoringMin = readConstField( @@ -2099,10 +2075,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev3.BLOCKIDPREVAILTORQUEMONITORINGMIN, WithOption.WithEncoding("ASCII")); - BigInteger prevailTorqueMonitoringMin = + long prevailTorqueMonitoringMin = readSimpleField( "prevailTorqueMonitoringMin", - readUnsignedBigInteger(readBuffer, 48), + readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdPrevailTorqueMonitoringMax = @@ -2112,10 +2088,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev3.BLOCKIDPREVAILTORQUEMONITORINGMAX, WithOption.WithEncoding("ASCII")); - BigInteger prevailTorqueMonitoringMax = + long prevailTorqueMonitoringMax = readSimpleField( "prevailTorqueMonitoringMax", - readUnsignedBigInteger(readBuffer, 48), + readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdPrevailTorque = @@ -2125,11 +2101,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev3.BLOCKIDPREVAILTORQUE, WithOption.WithEncoding("ASCII")); - BigInteger prevailTorque = + long prevailTorque = readSimpleField( - "prevailTorque", - readUnsignedBigInteger(readBuffer, 48), - WithOption.WithEncoding("ASCII")); + "prevailTorque", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdTighteningId = readConstField( @@ -2149,10 +2123,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev3.BLOCKIDJOBSEQUENCENUMBER, WithOption.WithEncoding("ASCII")); - BigInteger jobSequenceNumber = + long jobSequenceNumber = readSimpleField( "jobSequenceNumber", - readUnsignedBigInteger(readBuffer, 40), + readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdSyncTighteningId = @@ -2162,11 +2136,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev3.BLOCKIDSYNCTIGHTENINGID, WithOption.WithEncoding("ASCII")); - BigInteger syncTighteningId = + long syncTighteningId = readSimpleField( - "syncTighteningId", - readUnsignedBigInteger(readBuffer, 40), - WithOption.WithEncoding("ASCII")); + "syncTighteningId", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdToolSerialNumber = readConstField( @@ -2302,7 +2274,7 @@ public static class OpenProtocolMessageLastTighteningResultDataRev3BuilderImpl private final String torqueControllerName; private final String vinNumber; private final long jobId; - private final long parameterSetNumber; + private final int parameterSetNumber; private final Strategy strategy; private final long batchSize; private final long batchCounter; @@ -2315,29 +2287,29 @@ public static class OpenProtocolMessageLastTighteningResultDataRev3BuilderImpl private final Status selfTapStatus; private final Status prevailTorqueMonitoringStatus; private final Status prevailTorqueCompensateStatus; - private final BigInteger torqueMinLimit; - private final BigInteger torqueMaxLimit; - private final BigInteger torqueFinalTarget; - private final BigInteger torque; - private final BigInteger angleMin; - private final BigInteger angleMax; - private final BigInteger finalAngleTarget; - private final BigInteger angle; - private final BigInteger rundownAngleMin; - private final BigInteger rundownAngleMax; - private final BigInteger rundownAngle; - private final long currentMonitoringMin; - private final long currentMonitoringMax; - private final long currentMonitoringValue; - private final BigInteger selfTapMin; - private final BigInteger selfTapMax; - private final BigInteger selfTapTorque; - private final BigInteger prevailTorqueMonitoringMin; - private final BigInteger prevailTorqueMonitoringMax; - private final BigInteger prevailTorque; + private final long torqueMinLimit; + private final long torqueMaxLimit; + private final long torqueFinalTarget; + private final long torque; + private final long angleMin; + private final long angleMax; + private final long finalAngleTarget; + private final long angle; + private final long rundownAngleMin; + private final long rundownAngleMax; + private final long rundownAngle; + private final int currentMonitoringMin; + private final int currentMonitoringMax; + private final int currentMonitoringValue; + private final long selfTapMin; + private final long selfTapMax; + private final long selfTapTorque; + private final long prevailTorqueMonitoringMin; + private final long prevailTorqueMonitoringMax; + private final long prevailTorque; private final String tighteningId; - private final BigInteger jobSequenceNumber; - private final BigInteger syncTighteningId; + private final long jobSequenceNumber; + private final long syncTighteningId; private final String toolSerialNumber; private final String timeStamp; private final String dateTimeOfLastChangeIndParameterSetSettings; @@ -2351,7 +2323,7 @@ public OpenProtocolMessageLastTighteningResultDataRev3BuilderImpl( String torqueControllerName, String vinNumber, long jobId, - long parameterSetNumber, + int parameterSetNumber, Strategy strategy, long batchSize, long batchCounter, @@ -2364,29 +2336,29 @@ public OpenProtocolMessageLastTighteningResultDataRev3BuilderImpl( Status selfTapStatus, Status prevailTorqueMonitoringStatus, Status prevailTorqueCompensateStatus, - BigInteger torqueMinLimit, - BigInteger torqueMaxLimit, - BigInteger torqueFinalTarget, - BigInteger torque, - BigInteger angleMin, - BigInteger angleMax, - BigInteger finalAngleTarget, - BigInteger angle, - BigInteger rundownAngleMin, - BigInteger rundownAngleMax, - BigInteger rundownAngle, - long currentMonitoringMin, - long currentMonitoringMax, - long currentMonitoringValue, - BigInteger selfTapMin, - BigInteger selfTapMax, - BigInteger selfTapTorque, - BigInteger prevailTorqueMonitoringMin, - BigInteger prevailTorqueMonitoringMax, - BigInteger prevailTorque, + long torqueMinLimit, + long torqueMaxLimit, + long torqueFinalTarget, + long torque, + long angleMin, + long angleMax, + long finalAngleTarget, + long angle, + long rundownAngleMin, + long rundownAngleMax, + long rundownAngle, + int currentMonitoringMin, + int currentMonitoringMax, + int currentMonitoringValue, + long selfTapMin, + long selfTapMax, + long selfTapTorque, + long prevailTorqueMonitoringMin, + long prevailTorqueMonitoringMax, + long prevailTorque, String tighteningId, - BigInteger jobSequenceNumber, - BigInteger syncTighteningId, + long jobSequenceNumber, + long syncTighteningId, String toolSerialNumber, String timeStamp, String dateTimeOfLastChangeIndParameterSetSettings, @@ -2444,7 +2416,7 @@ public OpenProtocolMessageLastTighteningResultDataRev3BuilderImpl( } public OpenProtocolMessageLastTighteningResultDataRev3 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLastTighteningResultDataRev4.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLastTighteningResultDataRev4.java index 264ce420180..17ca383a193 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLastTighteningResultDataRev4.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLastTighteningResultDataRev4.java @@ -24,7 +24,6 @@ import static org.apache.plc4x.java.spi.codegen.io.DataWriterFactory.*; import static org.apache.plc4x.java.spi.generation.StaticHelper.*; -import java.math.BigInteger; import java.time.*; import java.util.*; import org.apache.plc4x.java.api.exceptions.*; @@ -40,8 +39,8 @@ public class OpenProtocolMessageLastTighteningResultDataRev4 extends OpenProtocolMessageLastTighteningResultData implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 4; + public Integer getRevision() { + return (int) 4; } // Constant values. @@ -104,7 +103,7 @@ public Long getRevision() { protected final String torqueControllerName; protected final String vinNumber; protected final long jobId; - protected final long parameterSetNumber; + protected final int parameterSetNumber; protected final Strategy strategy; protected final long batchSize; protected final long batchCounter; @@ -117,29 +116,29 @@ public Long getRevision() { protected final Status selfTapStatus; protected final Status prevailTorqueMonitoringStatus; protected final Status prevailTorqueCompensateStatus; - protected final BigInteger torqueMinLimit; - protected final BigInteger torqueMaxLimit; - protected final BigInteger torqueFinalTarget; - protected final BigInteger torque; - protected final BigInteger angleMin; - protected final BigInteger angleMax; - protected final BigInteger finalAngleTarget; - protected final BigInteger angle; - protected final BigInteger rundownAngleMin; - protected final BigInteger rundownAngleMax; - protected final BigInteger rundownAngle; - protected final long currentMonitoringMin; - protected final long currentMonitoringMax; - protected final long currentMonitoringValue; - protected final BigInteger selfTapMin; - protected final BigInteger selfTapMax; - protected final BigInteger selfTapTorque; - protected final BigInteger prevailTorqueMonitoringMin; - protected final BigInteger prevailTorqueMonitoringMax; - protected final BigInteger prevailTorque; + protected final long torqueMinLimit; + protected final long torqueMaxLimit; + protected final long torqueFinalTarget; + protected final long torque; + protected final long angleMin; + protected final long angleMax; + protected final long finalAngleTarget; + protected final long angle; + protected final long rundownAngleMin; + protected final long rundownAngleMax; + protected final long rundownAngle; + protected final int currentMonitoringMin; + protected final int currentMonitoringMax; + protected final int currentMonitoringValue; + protected final long selfTapMin; + protected final long selfTapMax; + protected final long selfTapTorque; + protected final long prevailTorqueMonitoringMin; + protected final long prevailTorqueMonitoringMax; + protected final long prevailTorque; protected final String tighteningId; - protected final BigInteger jobSequenceNumber; - protected final BigInteger syncTighteningId; + protected final long jobSequenceNumber; + protected final long syncTighteningId; protected final String toolSerialNumber; protected final String timeStamp; protected final String dateTimeOfLastChangeIndParameterSetSettings; @@ -151,7 +150,7 @@ public Long getRevision() { protected final String identifierResultPart4; public OpenProtocolMessageLastTighteningResultDataRev4( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -163,7 +162,7 @@ public OpenProtocolMessageLastTighteningResultDataRev4( String torqueControllerName, String vinNumber, long jobId, - long parameterSetNumber, + int parameterSetNumber, Strategy strategy, long batchSize, long batchCounter, @@ -176,29 +175,29 @@ public OpenProtocolMessageLastTighteningResultDataRev4( Status selfTapStatus, Status prevailTorqueMonitoringStatus, Status prevailTorqueCompensateStatus, - BigInteger torqueMinLimit, - BigInteger torqueMaxLimit, - BigInteger torqueFinalTarget, - BigInteger torque, - BigInteger angleMin, - BigInteger angleMax, - BigInteger finalAngleTarget, - BigInteger angle, - BigInteger rundownAngleMin, - BigInteger rundownAngleMax, - BigInteger rundownAngle, - long currentMonitoringMin, - long currentMonitoringMax, - long currentMonitoringValue, - BigInteger selfTapMin, - BigInteger selfTapMax, - BigInteger selfTapTorque, - BigInteger prevailTorqueMonitoringMin, - BigInteger prevailTorqueMonitoringMax, - BigInteger prevailTorque, + long torqueMinLimit, + long torqueMaxLimit, + long torqueFinalTarget, + long torque, + long angleMin, + long angleMax, + long finalAngleTarget, + long angle, + long rundownAngleMin, + long rundownAngleMax, + long rundownAngle, + int currentMonitoringMin, + int currentMonitoringMax, + int currentMonitoringValue, + long selfTapMin, + long selfTapMax, + long selfTapTorque, + long prevailTorqueMonitoringMin, + long prevailTorqueMonitoringMax, + long prevailTorque, String tighteningId, - BigInteger jobSequenceNumber, - BigInteger syncTighteningId, + long jobSequenceNumber, + long syncTighteningId, String toolSerialNumber, String timeStamp, String dateTimeOfLastChangeIndParameterSetSettings, @@ -288,7 +287,7 @@ public long getJobId() { return jobId; } - public long getParameterSetNumber() { + public int getParameterSetNumber() { return parameterSetNumber; } @@ -340,83 +339,83 @@ public Status getPrevailTorqueCompensateStatus() { return prevailTorqueCompensateStatus; } - public BigInteger getTorqueMinLimit() { + public long getTorqueMinLimit() { return torqueMinLimit; } - public BigInteger getTorqueMaxLimit() { + public long getTorqueMaxLimit() { return torqueMaxLimit; } - public BigInteger getTorqueFinalTarget() { + public long getTorqueFinalTarget() { return torqueFinalTarget; } - public BigInteger getTorque() { + public long getTorque() { return torque; } - public BigInteger getAngleMin() { + public long getAngleMin() { return angleMin; } - public BigInteger getAngleMax() { + public long getAngleMax() { return angleMax; } - public BigInteger getFinalAngleTarget() { + public long getFinalAngleTarget() { return finalAngleTarget; } - public BigInteger getAngle() { + public long getAngle() { return angle; } - public BigInteger getRundownAngleMin() { + public long getRundownAngleMin() { return rundownAngleMin; } - public BigInteger getRundownAngleMax() { + public long getRundownAngleMax() { return rundownAngleMax; } - public BigInteger getRundownAngle() { + public long getRundownAngle() { return rundownAngle; } - public long getCurrentMonitoringMin() { + public int getCurrentMonitoringMin() { return currentMonitoringMin; } - public long getCurrentMonitoringMax() { + public int getCurrentMonitoringMax() { return currentMonitoringMax; } - public long getCurrentMonitoringValue() { + public int getCurrentMonitoringValue() { return currentMonitoringValue; } - public BigInteger getSelfTapMin() { + public long getSelfTapMin() { return selfTapMin; } - public BigInteger getSelfTapMax() { + public long getSelfTapMax() { return selfTapMax; } - public BigInteger getSelfTapTorque() { + public long getSelfTapTorque() { return selfTapTorque; } - public BigInteger getPrevailTorqueMonitoringMin() { + public long getPrevailTorqueMonitoringMin() { return prevailTorqueMonitoringMin; } - public BigInteger getPrevailTorqueMonitoringMax() { + public long getPrevailTorqueMonitoringMax() { return prevailTorqueMonitoringMax; } - public BigInteger getPrevailTorque() { + public long getPrevailTorque() { return prevailTorque; } @@ -424,11 +423,11 @@ public String getTighteningId() { return tighteningId; } - public BigInteger getJobSequenceNumber() { + public long getJobSequenceNumber() { return jobSequenceNumber; } - public BigInteger getSyncTighteningId() { + public long getSyncTighteningId() { return syncTighteningId; } @@ -755,7 +754,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "parameterSetNumber", parameterSetNumber, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); // Const Field (blockIdStrategy) @@ -971,7 +970,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "torqueMinLimit", torqueMinLimit, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdTorqueMaxLimit) @@ -985,7 +984,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "torqueMaxLimit", torqueMaxLimit, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdTorqueFinalTarget) @@ -999,7 +998,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "torqueFinalTarget", torqueFinalTarget, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdTorque) @@ -1011,10 +1010,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu // Simple Field (torque) writeSimpleField( - "torque", - torque, - writeUnsignedBigInteger(writeBuffer, 48), - WithOption.WithEncoding("ASCII")); + "torque", torque, writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdAngleMin) writeConstField( @@ -1025,10 +1021,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu // Simple Field (angleMin) writeSimpleField( - "angleMin", - angleMin, - writeUnsignedBigInteger(writeBuffer, 40), - WithOption.WithEncoding("ASCII")); + "angleMin", angleMin, writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdAngleMax) writeConstField( @@ -1039,10 +1032,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu // Simple Field (angleMax) writeSimpleField( - "angleMax", - angleMax, - writeUnsignedBigInteger(writeBuffer, 40), - WithOption.WithEncoding("ASCII")); + "angleMax", angleMax, writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdFinalAngleTarget) writeConstField( @@ -1055,7 +1045,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "finalAngleTarget", finalAngleTarget, - writeUnsignedBigInteger(writeBuffer, 40), + writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdAngle) @@ -1067,7 +1057,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu // Simple Field (angle) writeSimpleField( - "angle", angle, writeUnsignedBigInteger(writeBuffer, 40), WithOption.WithEncoding("ASCII")); + "angle", angle, writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdRundownAngleMin) writeConstField( @@ -1080,7 +1070,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "rundownAngleMin", rundownAngleMin, - writeUnsignedBigInteger(writeBuffer, 40), + writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdRundownAngleMax) @@ -1094,7 +1084,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "rundownAngleMax", rundownAngleMax, - writeUnsignedBigInteger(writeBuffer, 40), + writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdRundownAngle) @@ -1108,7 +1098,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "rundownAngle", rundownAngle, - writeUnsignedBigInteger(writeBuffer, 40), + writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdCurrentMonitoringMin) @@ -1122,7 +1112,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "currentMonitoringMin", currentMonitoringMin, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); // Const Field (blockIdCurrentMonitoringMax) @@ -1136,7 +1126,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "currentMonitoringMax", currentMonitoringMax, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); // Const Field (blockIdCurrentMonitoringValue) @@ -1150,7 +1140,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "currentMonitoringValue", currentMonitoringValue, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); // Const Field (blockIdSelfTapMin) @@ -1164,7 +1154,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "selfTapMin", selfTapMin, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdSelfTapMax) @@ -1178,7 +1168,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "selfTapMax", selfTapMax, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdSelfTapTorque) @@ -1192,7 +1182,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "selfTapTorque", selfTapTorque, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdPrevailTorqueMonitoringMin) @@ -1206,7 +1196,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "prevailTorqueMonitoringMin", prevailTorqueMonitoringMin, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdPrevailTorqueMonitoringMax) @@ -1220,7 +1210,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "prevailTorqueMonitoringMax", prevailTorqueMonitoringMax, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdPrevailTorque) @@ -1234,7 +1224,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "prevailTorque", prevailTorque, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdTighteningId) @@ -1262,7 +1252,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "jobSequenceNumber", jobSequenceNumber, - writeUnsignedBigInteger(writeBuffer, 40), + writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdSyncTighteningId) @@ -1276,7 +1266,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "syncTighteningId", syncTighteningId, - writeUnsignedBigInteger(writeBuffer, 40), + writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdToolSerialNumber) @@ -1730,7 +1720,7 @@ public int getLengthInBits() { public static OpenProtocolMessageLastTighteningResultDataBuilder staticParseOpenProtocolMessageLastTighteningResultDataBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageLastTighteningResultDataRev4"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -1796,10 +1786,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev4.BLOCKIDPARAMETERSETNUMBER, WithOption.WithEncoding("ASCII")); - long parameterSetNumber = + int parameterSetNumber = readSimpleField( "parameterSetNumber", - readUnsignedLong(readBuffer, 24), + readUnsignedInt(readBuffer, 24), WithOption.WithEncoding("ASCII")); int blockIdStrategy = @@ -1986,11 +1976,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev4.BLOCKIDTORQUEMINLIMIT, WithOption.WithEncoding("ASCII")); - BigInteger torqueMinLimit = + long torqueMinLimit = readSimpleField( - "torqueMinLimit", - readUnsignedBigInteger(readBuffer, 48), - WithOption.WithEncoding("ASCII")); + "torqueMinLimit", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdTorqueMaxLimit = readConstField( @@ -1999,11 +1987,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev4.BLOCKIDTORQUEMAXLIMIT, WithOption.WithEncoding("ASCII")); - BigInteger torqueMaxLimit = + long torqueMaxLimit = readSimpleField( - "torqueMaxLimit", - readUnsignedBigInteger(readBuffer, 48), - WithOption.WithEncoding("ASCII")); + "torqueMaxLimit", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdTorqueFinalTarget = readConstField( @@ -2012,10 +1998,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev4.BLOCKIDTORQUEFINALTARGET, WithOption.WithEncoding("ASCII")); - BigInteger torqueFinalTarget = + long torqueFinalTarget = readSimpleField( "torqueFinalTarget", - readUnsignedBigInteger(readBuffer, 48), + readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdTorque = @@ -2025,9 +2011,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev4.BLOCKIDTORQUE, WithOption.WithEncoding("ASCII")); - BigInteger torque = + long torque = readSimpleField( - "torque", readUnsignedBigInteger(readBuffer, 48), WithOption.WithEncoding("ASCII")); + "torque", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdAngleMin = readConstField( @@ -2036,9 +2022,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev4.BLOCKIDANGLEMIN, WithOption.WithEncoding("ASCII")); - BigInteger angleMin = + long angleMin = readSimpleField( - "angleMin", readUnsignedBigInteger(readBuffer, 40), WithOption.WithEncoding("ASCII")); + "angleMin", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdAngleMax = readConstField( @@ -2047,9 +2033,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev4.BLOCKIDANGLEMAX, WithOption.WithEncoding("ASCII")); - BigInteger angleMax = + long angleMax = readSimpleField( - "angleMax", readUnsignedBigInteger(readBuffer, 40), WithOption.WithEncoding("ASCII")); + "angleMax", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdFinalAngleTarget = readConstField( @@ -2058,11 +2044,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev4.BLOCKIDFINALANGLETARGET, WithOption.WithEncoding("ASCII")); - BigInteger finalAngleTarget = + long finalAngleTarget = readSimpleField( - "finalAngleTarget", - readUnsignedBigInteger(readBuffer, 40), - WithOption.WithEncoding("ASCII")); + "finalAngleTarget", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdAngle = readConstField( @@ -2071,9 +2055,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev4.BLOCKIDANGLE, WithOption.WithEncoding("ASCII")); - BigInteger angle = + long angle = readSimpleField( - "angle", readUnsignedBigInteger(readBuffer, 40), WithOption.WithEncoding("ASCII")); + "angle", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdRundownAngleMin = readConstField( @@ -2082,11 +2066,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev4.BLOCKIDRUNDOWNANGLEMIN, WithOption.WithEncoding("ASCII")); - BigInteger rundownAngleMin = + long rundownAngleMin = readSimpleField( - "rundownAngleMin", - readUnsignedBigInteger(readBuffer, 40), - WithOption.WithEncoding("ASCII")); + "rundownAngleMin", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdRundownAngleMax = readConstField( @@ -2095,11 +2077,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev4.BLOCKIDRUNDOWNANGLEMAX, WithOption.WithEncoding("ASCII")); - BigInteger rundownAngleMax = + long rundownAngleMax = readSimpleField( - "rundownAngleMax", - readUnsignedBigInteger(readBuffer, 40), - WithOption.WithEncoding("ASCII")); + "rundownAngleMax", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdRundownAngle = readConstField( @@ -2108,11 +2088,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev4.BLOCKIDRUNDOWNANGLE, WithOption.WithEncoding("ASCII")); - BigInteger rundownAngle = + long rundownAngle = readSimpleField( - "rundownAngle", - readUnsignedBigInteger(readBuffer, 40), - WithOption.WithEncoding("ASCII")); + "rundownAngle", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdCurrentMonitoringMin = readConstField( @@ -2121,10 +2099,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev4.BLOCKIDCURRENTMONITORINGMIN, WithOption.WithEncoding("ASCII")); - long currentMonitoringMin = + int currentMonitoringMin = readSimpleField( "currentMonitoringMin", - readUnsignedLong(readBuffer, 24), + readUnsignedInt(readBuffer, 24), WithOption.WithEncoding("ASCII")); int blockIdCurrentMonitoringMax = @@ -2134,10 +2112,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev4.BLOCKIDCURRENTMONITORINGMAX, WithOption.WithEncoding("ASCII")); - long currentMonitoringMax = + int currentMonitoringMax = readSimpleField( "currentMonitoringMax", - readUnsignedLong(readBuffer, 24), + readUnsignedInt(readBuffer, 24), WithOption.WithEncoding("ASCII")); int blockIdCurrentMonitoringValue = @@ -2147,10 +2125,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev4.BLOCKIDCURRENTMONITORINGVALUE, WithOption.WithEncoding("ASCII")); - long currentMonitoringValue = + int currentMonitoringValue = readSimpleField( "currentMonitoringValue", - readUnsignedLong(readBuffer, 24), + readUnsignedInt(readBuffer, 24), WithOption.WithEncoding("ASCII")); int blockIdSelfTapMin = @@ -2160,9 +2138,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev4.BLOCKIDSELFTAPMIN, WithOption.WithEncoding("ASCII")); - BigInteger selfTapMin = + long selfTapMin = readSimpleField( - "selfTapMin", readUnsignedBigInteger(readBuffer, 48), WithOption.WithEncoding("ASCII")); + "selfTapMin", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdSelfTapMax = readConstField( @@ -2171,9 +2149,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev4.BLOCKIDSELFTAPMAX, WithOption.WithEncoding("ASCII")); - BigInteger selfTapMax = + long selfTapMax = readSimpleField( - "selfTapMax", readUnsignedBigInteger(readBuffer, 48), WithOption.WithEncoding("ASCII")); + "selfTapMax", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdSelfTapTorque = readConstField( @@ -2182,11 +2160,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev4.BLOCKIDSELFTAPTORQUE, WithOption.WithEncoding("ASCII")); - BigInteger selfTapTorque = + long selfTapTorque = readSimpleField( - "selfTapTorque", - readUnsignedBigInteger(readBuffer, 48), - WithOption.WithEncoding("ASCII")); + "selfTapTorque", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdPrevailTorqueMonitoringMin = readConstField( @@ -2195,10 +2171,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev4.BLOCKIDPREVAILTORQUEMONITORINGMIN, WithOption.WithEncoding("ASCII")); - BigInteger prevailTorqueMonitoringMin = + long prevailTorqueMonitoringMin = readSimpleField( "prevailTorqueMonitoringMin", - readUnsignedBigInteger(readBuffer, 48), + readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdPrevailTorqueMonitoringMax = @@ -2208,10 +2184,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev4.BLOCKIDPREVAILTORQUEMONITORINGMAX, WithOption.WithEncoding("ASCII")); - BigInteger prevailTorqueMonitoringMax = + long prevailTorqueMonitoringMax = readSimpleField( "prevailTorqueMonitoringMax", - readUnsignedBigInteger(readBuffer, 48), + readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdPrevailTorque = @@ -2221,11 +2197,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev4.BLOCKIDPREVAILTORQUE, WithOption.WithEncoding("ASCII")); - BigInteger prevailTorque = + long prevailTorque = readSimpleField( - "prevailTorque", - readUnsignedBigInteger(readBuffer, 48), - WithOption.WithEncoding("ASCII")); + "prevailTorque", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdTighteningId = readConstField( @@ -2245,10 +2219,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev4.BLOCKIDJOBSEQUENCENUMBER, WithOption.WithEncoding("ASCII")); - BigInteger jobSequenceNumber = + long jobSequenceNumber = readSimpleField( "jobSequenceNumber", - readUnsignedBigInteger(readBuffer, 40), + readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdSyncTighteningId = @@ -2258,11 +2232,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev4.BLOCKIDSYNCTIGHTENINGID, WithOption.WithEncoding("ASCII")); - BigInteger syncTighteningId = + long syncTighteningId = readSimpleField( - "syncTighteningId", - readUnsignedBigInteger(readBuffer, 40), - WithOption.WithEncoding("ASCII")); + "syncTighteningId", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdToolSerialNumber = readConstField( @@ -2434,7 +2406,7 @@ public static class OpenProtocolMessageLastTighteningResultDataRev4BuilderImpl private final String torqueControllerName; private final String vinNumber; private final long jobId; - private final long parameterSetNumber; + private final int parameterSetNumber; private final Strategy strategy; private final long batchSize; private final long batchCounter; @@ -2447,29 +2419,29 @@ public static class OpenProtocolMessageLastTighteningResultDataRev4BuilderImpl private final Status selfTapStatus; private final Status prevailTorqueMonitoringStatus; private final Status prevailTorqueCompensateStatus; - private final BigInteger torqueMinLimit; - private final BigInteger torqueMaxLimit; - private final BigInteger torqueFinalTarget; - private final BigInteger torque; - private final BigInteger angleMin; - private final BigInteger angleMax; - private final BigInteger finalAngleTarget; - private final BigInteger angle; - private final BigInteger rundownAngleMin; - private final BigInteger rundownAngleMax; - private final BigInteger rundownAngle; - private final long currentMonitoringMin; - private final long currentMonitoringMax; - private final long currentMonitoringValue; - private final BigInteger selfTapMin; - private final BigInteger selfTapMax; - private final BigInteger selfTapTorque; - private final BigInteger prevailTorqueMonitoringMin; - private final BigInteger prevailTorqueMonitoringMax; - private final BigInteger prevailTorque; + private final long torqueMinLimit; + private final long torqueMaxLimit; + private final long torqueFinalTarget; + private final long torque; + private final long angleMin; + private final long angleMax; + private final long finalAngleTarget; + private final long angle; + private final long rundownAngleMin; + private final long rundownAngleMax; + private final long rundownAngle; + private final int currentMonitoringMin; + private final int currentMonitoringMax; + private final int currentMonitoringValue; + private final long selfTapMin; + private final long selfTapMax; + private final long selfTapTorque; + private final long prevailTorqueMonitoringMin; + private final long prevailTorqueMonitoringMax; + private final long prevailTorque; private final String tighteningId; - private final BigInteger jobSequenceNumber; - private final BigInteger syncTighteningId; + private final long jobSequenceNumber; + private final long syncTighteningId; private final String toolSerialNumber; private final String timeStamp; private final String dateTimeOfLastChangeIndParameterSetSettings; @@ -2486,7 +2458,7 @@ public OpenProtocolMessageLastTighteningResultDataRev4BuilderImpl( String torqueControllerName, String vinNumber, long jobId, - long parameterSetNumber, + int parameterSetNumber, Strategy strategy, long batchSize, long batchCounter, @@ -2499,29 +2471,29 @@ public OpenProtocolMessageLastTighteningResultDataRev4BuilderImpl( Status selfTapStatus, Status prevailTorqueMonitoringStatus, Status prevailTorqueCompensateStatus, - BigInteger torqueMinLimit, - BigInteger torqueMaxLimit, - BigInteger torqueFinalTarget, - BigInteger torque, - BigInteger angleMin, - BigInteger angleMax, - BigInteger finalAngleTarget, - BigInteger angle, - BigInteger rundownAngleMin, - BigInteger rundownAngleMax, - BigInteger rundownAngle, - long currentMonitoringMin, - long currentMonitoringMax, - long currentMonitoringValue, - BigInteger selfTapMin, - BigInteger selfTapMax, - BigInteger selfTapTorque, - BigInteger prevailTorqueMonitoringMin, - BigInteger prevailTorqueMonitoringMax, - BigInteger prevailTorque, + long torqueMinLimit, + long torqueMaxLimit, + long torqueFinalTarget, + long torque, + long angleMin, + long angleMax, + long finalAngleTarget, + long angle, + long rundownAngleMin, + long rundownAngleMax, + long rundownAngle, + int currentMonitoringMin, + int currentMonitoringMax, + int currentMonitoringValue, + long selfTapMin, + long selfTapMax, + long selfTapTorque, + long prevailTorqueMonitoringMin, + long prevailTorqueMonitoringMax, + long prevailTorque, String tighteningId, - BigInteger jobSequenceNumber, - BigInteger syncTighteningId, + long jobSequenceNumber, + long syncTighteningId, String toolSerialNumber, String timeStamp, String dateTimeOfLastChangeIndParameterSetSettings, @@ -2585,7 +2557,7 @@ public OpenProtocolMessageLastTighteningResultDataRev4BuilderImpl( } public OpenProtocolMessageLastTighteningResultDataRev4 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLastTighteningResultDataRev5.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLastTighteningResultDataRev5.java index 8dd0164a5c2..be54d551db4 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLastTighteningResultDataRev5.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLastTighteningResultDataRev5.java @@ -24,7 +24,6 @@ import static org.apache.plc4x.java.spi.codegen.io.DataWriterFactory.*; import static org.apache.plc4x.java.spi.generation.StaticHelper.*; -import java.math.BigInteger; import java.time.*; import java.util.*; import org.apache.plc4x.java.api.exceptions.*; @@ -40,8 +39,8 @@ public class OpenProtocolMessageLastTighteningResultDataRev5 extends OpenProtocolMessageLastTighteningResultData implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 5; + public Integer getRevision() { + return (int) 5; } // Constant values. @@ -105,7 +104,7 @@ public Long getRevision() { protected final String torqueControllerName; protected final String vinNumber; protected final long jobId; - protected final long parameterSetNumber; + protected final int parameterSetNumber; protected final Strategy strategy; protected final long batchSize; protected final long batchCounter; @@ -118,29 +117,29 @@ public Long getRevision() { protected final Status selfTapStatus; protected final Status prevailTorqueMonitoringStatus; protected final Status prevailTorqueCompensateStatus; - protected final BigInteger torqueMinLimit; - protected final BigInteger torqueMaxLimit; - protected final BigInteger torqueFinalTarget; - protected final BigInteger torque; - protected final BigInteger angleMin; - protected final BigInteger angleMax; - protected final BigInteger finalAngleTarget; - protected final BigInteger angle; - protected final BigInteger rundownAngleMin; - protected final BigInteger rundownAngleMax; - protected final BigInteger rundownAngle; - protected final long currentMonitoringMin; - protected final long currentMonitoringMax; - protected final long currentMonitoringValue; - protected final BigInteger selfTapMin; - protected final BigInteger selfTapMax; - protected final BigInteger selfTapTorque; - protected final BigInteger prevailTorqueMonitoringMin; - protected final BigInteger prevailTorqueMonitoringMax; - protected final BigInteger prevailTorque; + protected final long torqueMinLimit; + protected final long torqueMaxLimit; + protected final long torqueFinalTarget; + protected final long torque; + protected final long angleMin; + protected final long angleMax; + protected final long finalAngleTarget; + protected final long angle; + protected final long rundownAngleMin; + protected final long rundownAngleMax; + protected final long rundownAngle; + protected final int currentMonitoringMin; + protected final int currentMonitoringMax; + protected final int currentMonitoringValue; + protected final long selfTapMin; + protected final long selfTapMax; + protected final long selfTapTorque; + protected final long prevailTorqueMonitoringMin; + protected final long prevailTorqueMonitoringMax; + protected final long prevailTorque; protected final String tighteningId; - protected final BigInteger jobSequenceNumber; - protected final BigInteger syncTighteningId; + protected final long jobSequenceNumber; + protected final long syncTighteningId; protected final String toolSerialNumber; protected final String timeStamp; protected final String dateTimeOfLastChangeIndParameterSetSettings; @@ -153,7 +152,7 @@ public Long getRevision() { protected final String customerTighteningError; public OpenProtocolMessageLastTighteningResultDataRev5( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -165,7 +164,7 @@ public OpenProtocolMessageLastTighteningResultDataRev5( String torqueControllerName, String vinNumber, long jobId, - long parameterSetNumber, + int parameterSetNumber, Strategy strategy, long batchSize, long batchCounter, @@ -178,29 +177,29 @@ public OpenProtocolMessageLastTighteningResultDataRev5( Status selfTapStatus, Status prevailTorqueMonitoringStatus, Status prevailTorqueCompensateStatus, - BigInteger torqueMinLimit, - BigInteger torqueMaxLimit, - BigInteger torqueFinalTarget, - BigInteger torque, - BigInteger angleMin, - BigInteger angleMax, - BigInteger finalAngleTarget, - BigInteger angle, - BigInteger rundownAngleMin, - BigInteger rundownAngleMax, - BigInteger rundownAngle, - long currentMonitoringMin, - long currentMonitoringMax, - long currentMonitoringValue, - BigInteger selfTapMin, - BigInteger selfTapMax, - BigInteger selfTapTorque, - BigInteger prevailTorqueMonitoringMin, - BigInteger prevailTorqueMonitoringMax, - BigInteger prevailTorque, + long torqueMinLimit, + long torqueMaxLimit, + long torqueFinalTarget, + long torque, + long angleMin, + long angleMax, + long finalAngleTarget, + long angle, + long rundownAngleMin, + long rundownAngleMax, + long rundownAngle, + int currentMonitoringMin, + int currentMonitoringMax, + int currentMonitoringValue, + long selfTapMin, + long selfTapMax, + long selfTapTorque, + long prevailTorqueMonitoringMin, + long prevailTorqueMonitoringMax, + long prevailTorque, String tighteningId, - BigInteger jobSequenceNumber, - BigInteger syncTighteningId, + long jobSequenceNumber, + long syncTighteningId, String toolSerialNumber, String timeStamp, String dateTimeOfLastChangeIndParameterSetSettings, @@ -292,7 +291,7 @@ public long getJobId() { return jobId; } - public long getParameterSetNumber() { + public int getParameterSetNumber() { return parameterSetNumber; } @@ -344,83 +343,83 @@ public Status getPrevailTorqueCompensateStatus() { return prevailTorqueCompensateStatus; } - public BigInteger getTorqueMinLimit() { + public long getTorqueMinLimit() { return torqueMinLimit; } - public BigInteger getTorqueMaxLimit() { + public long getTorqueMaxLimit() { return torqueMaxLimit; } - public BigInteger getTorqueFinalTarget() { + public long getTorqueFinalTarget() { return torqueFinalTarget; } - public BigInteger getTorque() { + public long getTorque() { return torque; } - public BigInteger getAngleMin() { + public long getAngleMin() { return angleMin; } - public BigInteger getAngleMax() { + public long getAngleMax() { return angleMax; } - public BigInteger getFinalAngleTarget() { + public long getFinalAngleTarget() { return finalAngleTarget; } - public BigInteger getAngle() { + public long getAngle() { return angle; } - public BigInteger getRundownAngleMin() { + public long getRundownAngleMin() { return rundownAngleMin; } - public BigInteger getRundownAngleMax() { + public long getRundownAngleMax() { return rundownAngleMax; } - public BigInteger getRundownAngle() { + public long getRundownAngle() { return rundownAngle; } - public long getCurrentMonitoringMin() { + public int getCurrentMonitoringMin() { return currentMonitoringMin; } - public long getCurrentMonitoringMax() { + public int getCurrentMonitoringMax() { return currentMonitoringMax; } - public long getCurrentMonitoringValue() { + public int getCurrentMonitoringValue() { return currentMonitoringValue; } - public BigInteger getSelfTapMin() { + public long getSelfTapMin() { return selfTapMin; } - public BigInteger getSelfTapMax() { + public long getSelfTapMax() { return selfTapMax; } - public BigInteger getSelfTapTorque() { + public long getSelfTapTorque() { return selfTapTorque; } - public BigInteger getPrevailTorqueMonitoringMin() { + public long getPrevailTorqueMonitoringMin() { return prevailTorqueMonitoringMin; } - public BigInteger getPrevailTorqueMonitoringMax() { + public long getPrevailTorqueMonitoringMax() { return prevailTorqueMonitoringMax; } - public BigInteger getPrevailTorque() { + public long getPrevailTorque() { return prevailTorque; } @@ -428,11 +427,11 @@ public String getTighteningId() { return tighteningId; } - public BigInteger getJobSequenceNumber() { + public long getJobSequenceNumber() { return jobSequenceNumber; } - public BigInteger getSyncTighteningId() { + public long getSyncTighteningId() { return syncTighteningId; } @@ -767,7 +766,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "parameterSetNumber", parameterSetNumber, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); // Const Field (blockIdStrategy) @@ -983,7 +982,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "torqueMinLimit", torqueMinLimit, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdTorqueMaxLimit) @@ -997,7 +996,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "torqueMaxLimit", torqueMaxLimit, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdTorqueFinalTarget) @@ -1011,7 +1010,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "torqueFinalTarget", torqueFinalTarget, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdTorque) @@ -1023,10 +1022,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu // Simple Field (torque) writeSimpleField( - "torque", - torque, - writeUnsignedBigInteger(writeBuffer, 48), - WithOption.WithEncoding("ASCII")); + "torque", torque, writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdAngleMin) writeConstField( @@ -1037,10 +1033,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu // Simple Field (angleMin) writeSimpleField( - "angleMin", - angleMin, - writeUnsignedBigInteger(writeBuffer, 40), - WithOption.WithEncoding("ASCII")); + "angleMin", angleMin, writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdAngleMax) writeConstField( @@ -1051,10 +1044,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu // Simple Field (angleMax) writeSimpleField( - "angleMax", - angleMax, - writeUnsignedBigInteger(writeBuffer, 40), - WithOption.WithEncoding("ASCII")); + "angleMax", angleMax, writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdFinalAngleTarget) writeConstField( @@ -1067,7 +1057,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "finalAngleTarget", finalAngleTarget, - writeUnsignedBigInteger(writeBuffer, 40), + writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdAngle) @@ -1079,7 +1069,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu // Simple Field (angle) writeSimpleField( - "angle", angle, writeUnsignedBigInteger(writeBuffer, 40), WithOption.WithEncoding("ASCII")); + "angle", angle, writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdRundownAngleMin) writeConstField( @@ -1092,7 +1082,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "rundownAngleMin", rundownAngleMin, - writeUnsignedBigInteger(writeBuffer, 40), + writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdRundownAngleMax) @@ -1106,7 +1096,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "rundownAngleMax", rundownAngleMax, - writeUnsignedBigInteger(writeBuffer, 40), + writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdRundownAngle) @@ -1120,7 +1110,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "rundownAngle", rundownAngle, - writeUnsignedBigInteger(writeBuffer, 40), + writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdCurrentMonitoringMin) @@ -1134,7 +1124,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "currentMonitoringMin", currentMonitoringMin, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); // Const Field (blockIdCurrentMonitoringMax) @@ -1148,7 +1138,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "currentMonitoringMax", currentMonitoringMax, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); // Const Field (blockIdCurrentMonitoringValue) @@ -1162,7 +1152,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "currentMonitoringValue", currentMonitoringValue, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); // Const Field (blockIdSelfTapMin) @@ -1176,7 +1166,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "selfTapMin", selfTapMin, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdSelfTapMax) @@ -1190,7 +1180,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "selfTapMax", selfTapMax, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdSelfTapTorque) @@ -1204,7 +1194,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "selfTapTorque", selfTapTorque, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdPrevailTorqueMonitoringMin) @@ -1218,7 +1208,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "prevailTorqueMonitoringMin", prevailTorqueMonitoringMin, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdPrevailTorqueMonitoringMax) @@ -1232,7 +1222,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "prevailTorqueMonitoringMax", prevailTorqueMonitoringMax, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdPrevailTorque) @@ -1246,7 +1236,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "prevailTorque", prevailTorque, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdTighteningId) @@ -1274,7 +1264,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "jobSequenceNumber", jobSequenceNumber, - writeUnsignedBigInteger(writeBuffer, 40), + writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdSyncTighteningId) @@ -1288,7 +1278,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "syncTighteningId", syncTighteningId, - writeUnsignedBigInteger(writeBuffer, 40), + writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdToolSerialNumber) @@ -1762,7 +1752,7 @@ public int getLengthInBits() { public static OpenProtocolMessageLastTighteningResultDataBuilder staticParseOpenProtocolMessageLastTighteningResultDataBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageLastTighteningResultDataRev5"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -1828,10 +1818,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev5.BLOCKIDPARAMETERSETNUMBER, WithOption.WithEncoding("ASCII")); - long parameterSetNumber = + int parameterSetNumber = readSimpleField( "parameterSetNumber", - readUnsignedLong(readBuffer, 24), + readUnsignedInt(readBuffer, 24), WithOption.WithEncoding("ASCII")); int blockIdStrategy = @@ -2018,11 +2008,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev5.BLOCKIDTORQUEMINLIMIT, WithOption.WithEncoding("ASCII")); - BigInteger torqueMinLimit = + long torqueMinLimit = readSimpleField( - "torqueMinLimit", - readUnsignedBigInteger(readBuffer, 48), - WithOption.WithEncoding("ASCII")); + "torqueMinLimit", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdTorqueMaxLimit = readConstField( @@ -2031,11 +2019,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev5.BLOCKIDTORQUEMAXLIMIT, WithOption.WithEncoding("ASCII")); - BigInteger torqueMaxLimit = + long torqueMaxLimit = readSimpleField( - "torqueMaxLimit", - readUnsignedBigInteger(readBuffer, 48), - WithOption.WithEncoding("ASCII")); + "torqueMaxLimit", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdTorqueFinalTarget = readConstField( @@ -2044,10 +2030,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev5.BLOCKIDTORQUEFINALTARGET, WithOption.WithEncoding("ASCII")); - BigInteger torqueFinalTarget = + long torqueFinalTarget = readSimpleField( "torqueFinalTarget", - readUnsignedBigInteger(readBuffer, 48), + readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdTorque = @@ -2057,9 +2043,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev5.BLOCKIDTORQUE, WithOption.WithEncoding("ASCII")); - BigInteger torque = + long torque = readSimpleField( - "torque", readUnsignedBigInteger(readBuffer, 48), WithOption.WithEncoding("ASCII")); + "torque", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdAngleMin = readConstField( @@ -2068,9 +2054,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev5.BLOCKIDANGLEMIN, WithOption.WithEncoding("ASCII")); - BigInteger angleMin = + long angleMin = readSimpleField( - "angleMin", readUnsignedBigInteger(readBuffer, 40), WithOption.WithEncoding("ASCII")); + "angleMin", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdAngleMax = readConstField( @@ -2079,9 +2065,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev5.BLOCKIDANGLEMAX, WithOption.WithEncoding("ASCII")); - BigInteger angleMax = + long angleMax = readSimpleField( - "angleMax", readUnsignedBigInteger(readBuffer, 40), WithOption.WithEncoding("ASCII")); + "angleMax", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdFinalAngleTarget = readConstField( @@ -2090,11 +2076,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev5.BLOCKIDFINALANGLETARGET, WithOption.WithEncoding("ASCII")); - BigInteger finalAngleTarget = + long finalAngleTarget = readSimpleField( - "finalAngleTarget", - readUnsignedBigInteger(readBuffer, 40), - WithOption.WithEncoding("ASCII")); + "finalAngleTarget", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdAngle = readConstField( @@ -2103,9 +2087,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev5.BLOCKIDANGLE, WithOption.WithEncoding("ASCII")); - BigInteger angle = + long angle = readSimpleField( - "angle", readUnsignedBigInteger(readBuffer, 40), WithOption.WithEncoding("ASCII")); + "angle", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdRundownAngleMin = readConstField( @@ -2114,11 +2098,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev5.BLOCKIDRUNDOWNANGLEMIN, WithOption.WithEncoding("ASCII")); - BigInteger rundownAngleMin = + long rundownAngleMin = readSimpleField( - "rundownAngleMin", - readUnsignedBigInteger(readBuffer, 40), - WithOption.WithEncoding("ASCII")); + "rundownAngleMin", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdRundownAngleMax = readConstField( @@ -2127,11 +2109,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev5.BLOCKIDRUNDOWNANGLEMAX, WithOption.WithEncoding("ASCII")); - BigInteger rundownAngleMax = + long rundownAngleMax = readSimpleField( - "rundownAngleMax", - readUnsignedBigInteger(readBuffer, 40), - WithOption.WithEncoding("ASCII")); + "rundownAngleMax", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdRundownAngle = readConstField( @@ -2140,11 +2120,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev5.BLOCKIDRUNDOWNANGLE, WithOption.WithEncoding("ASCII")); - BigInteger rundownAngle = + long rundownAngle = readSimpleField( - "rundownAngle", - readUnsignedBigInteger(readBuffer, 40), - WithOption.WithEncoding("ASCII")); + "rundownAngle", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdCurrentMonitoringMin = readConstField( @@ -2153,10 +2131,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev5.BLOCKIDCURRENTMONITORINGMIN, WithOption.WithEncoding("ASCII")); - long currentMonitoringMin = + int currentMonitoringMin = readSimpleField( "currentMonitoringMin", - readUnsignedLong(readBuffer, 24), + readUnsignedInt(readBuffer, 24), WithOption.WithEncoding("ASCII")); int blockIdCurrentMonitoringMax = @@ -2166,10 +2144,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev5.BLOCKIDCURRENTMONITORINGMAX, WithOption.WithEncoding("ASCII")); - long currentMonitoringMax = + int currentMonitoringMax = readSimpleField( "currentMonitoringMax", - readUnsignedLong(readBuffer, 24), + readUnsignedInt(readBuffer, 24), WithOption.WithEncoding("ASCII")); int blockIdCurrentMonitoringValue = @@ -2179,10 +2157,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev5.BLOCKIDCURRENTMONITORINGVALUE, WithOption.WithEncoding("ASCII")); - long currentMonitoringValue = + int currentMonitoringValue = readSimpleField( "currentMonitoringValue", - readUnsignedLong(readBuffer, 24), + readUnsignedInt(readBuffer, 24), WithOption.WithEncoding("ASCII")); int blockIdSelfTapMin = @@ -2192,9 +2170,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev5.BLOCKIDSELFTAPMIN, WithOption.WithEncoding("ASCII")); - BigInteger selfTapMin = + long selfTapMin = readSimpleField( - "selfTapMin", readUnsignedBigInteger(readBuffer, 48), WithOption.WithEncoding("ASCII")); + "selfTapMin", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdSelfTapMax = readConstField( @@ -2203,9 +2181,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev5.BLOCKIDSELFTAPMAX, WithOption.WithEncoding("ASCII")); - BigInteger selfTapMax = + long selfTapMax = readSimpleField( - "selfTapMax", readUnsignedBigInteger(readBuffer, 48), WithOption.WithEncoding("ASCII")); + "selfTapMax", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdSelfTapTorque = readConstField( @@ -2214,11 +2192,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev5.BLOCKIDSELFTAPTORQUE, WithOption.WithEncoding("ASCII")); - BigInteger selfTapTorque = + long selfTapTorque = readSimpleField( - "selfTapTorque", - readUnsignedBigInteger(readBuffer, 48), - WithOption.WithEncoding("ASCII")); + "selfTapTorque", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdPrevailTorqueMonitoringMin = readConstField( @@ -2227,10 +2203,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev5.BLOCKIDPREVAILTORQUEMONITORINGMIN, WithOption.WithEncoding("ASCII")); - BigInteger prevailTorqueMonitoringMin = + long prevailTorqueMonitoringMin = readSimpleField( "prevailTorqueMonitoringMin", - readUnsignedBigInteger(readBuffer, 48), + readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdPrevailTorqueMonitoringMax = @@ -2240,10 +2216,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev5.BLOCKIDPREVAILTORQUEMONITORINGMAX, WithOption.WithEncoding("ASCII")); - BigInteger prevailTorqueMonitoringMax = + long prevailTorqueMonitoringMax = readSimpleField( "prevailTorqueMonitoringMax", - readUnsignedBigInteger(readBuffer, 48), + readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdPrevailTorque = @@ -2253,11 +2229,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev5.BLOCKIDPREVAILTORQUE, WithOption.WithEncoding("ASCII")); - BigInteger prevailTorque = + long prevailTorque = readSimpleField( - "prevailTorque", - readUnsignedBigInteger(readBuffer, 48), - WithOption.WithEncoding("ASCII")); + "prevailTorque", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdTighteningId = readConstField( @@ -2277,10 +2251,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev5.BLOCKIDJOBSEQUENCENUMBER, WithOption.WithEncoding("ASCII")); - BigInteger jobSequenceNumber = + long jobSequenceNumber = readSimpleField( "jobSequenceNumber", - readUnsignedBigInteger(readBuffer, 40), + readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdSyncTighteningId = @@ -2290,11 +2264,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev5.BLOCKIDSYNCTIGHTENINGID, WithOption.WithEncoding("ASCII")); - BigInteger syncTighteningId = + long syncTighteningId = readSimpleField( - "syncTighteningId", - readUnsignedBigInteger(readBuffer, 40), - WithOption.WithEncoding("ASCII")); + "syncTighteningId", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdToolSerialNumber = readConstField( @@ -2480,7 +2452,7 @@ public static class OpenProtocolMessageLastTighteningResultDataRev5BuilderImpl private final String torqueControllerName; private final String vinNumber; private final long jobId; - private final long parameterSetNumber; + private final int parameterSetNumber; private final Strategy strategy; private final long batchSize; private final long batchCounter; @@ -2493,29 +2465,29 @@ public static class OpenProtocolMessageLastTighteningResultDataRev5BuilderImpl private final Status selfTapStatus; private final Status prevailTorqueMonitoringStatus; private final Status prevailTorqueCompensateStatus; - private final BigInteger torqueMinLimit; - private final BigInteger torqueMaxLimit; - private final BigInteger torqueFinalTarget; - private final BigInteger torque; - private final BigInteger angleMin; - private final BigInteger angleMax; - private final BigInteger finalAngleTarget; - private final BigInteger angle; - private final BigInteger rundownAngleMin; - private final BigInteger rundownAngleMax; - private final BigInteger rundownAngle; - private final long currentMonitoringMin; - private final long currentMonitoringMax; - private final long currentMonitoringValue; - private final BigInteger selfTapMin; - private final BigInteger selfTapMax; - private final BigInteger selfTapTorque; - private final BigInteger prevailTorqueMonitoringMin; - private final BigInteger prevailTorqueMonitoringMax; - private final BigInteger prevailTorque; + private final long torqueMinLimit; + private final long torqueMaxLimit; + private final long torqueFinalTarget; + private final long torque; + private final long angleMin; + private final long angleMax; + private final long finalAngleTarget; + private final long angle; + private final long rundownAngleMin; + private final long rundownAngleMax; + private final long rundownAngle; + private final int currentMonitoringMin; + private final int currentMonitoringMax; + private final int currentMonitoringValue; + private final long selfTapMin; + private final long selfTapMax; + private final long selfTapTorque; + private final long prevailTorqueMonitoringMin; + private final long prevailTorqueMonitoringMax; + private final long prevailTorque; private final String tighteningId; - private final BigInteger jobSequenceNumber; - private final BigInteger syncTighteningId; + private final long jobSequenceNumber; + private final long syncTighteningId; private final String toolSerialNumber; private final String timeStamp; private final String dateTimeOfLastChangeIndParameterSetSettings; @@ -2533,7 +2505,7 @@ public OpenProtocolMessageLastTighteningResultDataRev5BuilderImpl( String torqueControllerName, String vinNumber, long jobId, - long parameterSetNumber, + int parameterSetNumber, Strategy strategy, long batchSize, long batchCounter, @@ -2546,29 +2518,29 @@ public OpenProtocolMessageLastTighteningResultDataRev5BuilderImpl( Status selfTapStatus, Status prevailTorqueMonitoringStatus, Status prevailTorqueCompensateStatus, - BigInteger torqueMinLimit, - BigInteger torqueMaxLimit, - BigInteger torqueFinalTarget, - BigInteger torque, - BigInteger angleMin, - BigInteger angleMax, - BigInteger finalAngleTarget, - BigInteger angle, - BigInteger rundownAngleMin, - BigInteger rundownAngleMax, - BigInteger rundownAngle, - long currentMonitoringMin, - long currentMonitoringMax, - long currentMonitoringValue, - BigInteger selfTapMin, - BigInteger selfTapMax, - BigInteger selfTapTorque, - BigInteger prevailTorqueMonitoringMin, - BigInteger prevailTorqueMonitoringMax, - BigInteger prevailTorque, + long torqueMinLimit, + long torqueMaxLimit, + long torqueFinalTarget, + long torque, + long angleMin, + long angleMax, + long finalAngleTarget, + long angle, + long rundownAngleMin, + long rundownAngleMax, + long rundownAngle, + int currentMonitoringMin, + int currentMonitoringMax, + int currentMonitoringValue, + long selfTapMin, + long selfTapMax, + long selfTapTorque, + long prevailTorqueMonitoringMin, + long prevailTorqueMonitoringMax, + long prevailTorque, String tighteningId, - BigInteger jobSequenceNumber, - BigInteger syncTighteningId, + long jobSequenceNumber, + long syncTighteningId, String toolSerialNumber, String timeStamp, String dateTimeOfLastChangeIndParameterSetSettings, @@ -2634,7 +2606,7 @@ public OpenProtocolMessageLastTighteningResultDataRev5BuilderImpl( } public OpenProtocolMessageLastTighteningResultDataRev5 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLastTighteningResultDataRev6.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLastTighteningResultDataRev6.java index b2a49fc92ab..0f91174fa87 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLastTighteningResultDataRev6.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLastTighteningResultDataRev6.java @@ -24,7 +24,6 @@ import static org.apache.plc4x.java.spi.codegen.io.DataWriterFactory.*; import static org.apache.plc4x.java.spi.generation.StaticHelper.*; -import java.math.BigInteger; import java.time.*; import java.util.*; import org.apache.plc4x.java.api.exceptions.*; @@ -40,8 +39,8 @@ public class OpenProtocolMessageLastTighteningResultDataRev6 extends OpenProtocolMessageLastTighteningResultData implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 6; + public Integer getRevision() { + return (int) 6; } // Constant values. @@ -107,7 +106,7 @@ public Long getRevision() { protected final String torqueControllerName; protected final String vinNumber; protected final long jobId; - protected final long parameterSetNumber; + protected final int parameterSetNumber; protected final Strategy strategy; protected final long batchSize; protected final long batchCounter; @@ -120,29 +119,29 @@ public Long getRevision() { protected final Status selfTapStatus; protected final Status prevailTorqueMonitoringStatus; protected final Status prevailTorqueCompensateStatus; - protected final BigInteger torqueMinLimit; - protected final BigInteger torqueMaxLimit; - protected final BigInteger torqueFinalTarget; - protected final BigInteger torque; - protected final BigInteger angleMin; - protected final BigInteger angleMax; - protected final BigInteger finalAngleTarget; - protected final BigInteger angle; - protected final BigInteger rundownAngleMin; - protected final BigInteger rundownAngleMax; - protected final BigInteger rundownAngle; - protected final long currentMonitoringMin; - protected final long currentMonitoringMax; - protected final long currentMonitoringValue; - protected final BigInteger selfTapMin; - protected final BigInteger selfTapMax; - protected final BigInteger selfTapTorque; - protected final BigInteger prevailTorqueMonitoringMin; - protected final BigInteger prevailTorqueMonitoringMax; - protected final BigInteger prevailTorque; + protected final long torqueMinLimit; + protected final long torqueMaxLimit; + protected final long torqueFinalTarget; + protected final long torque; + protected final long angleMin; + protected final long angleMax; + protected final long finalAngleTarget; + protected final long angle; + protected final long rundownAngleMin; + protected final long rundownAngleMax; + protected final long rundownAngle; + protected final int currentMonitoringMin; + protected final int currentMonitoringMax; + protected final int currentMonitoringValue; + protected final long selfTapMin; + protected final long selfTapMax; + protected final long selfTapTorque; + protected final long prevailTorqueMonitoringMin; + protected final long prevailTorqueMonitoringMax; + protected final long prevailTorque; protected final String tighteningId; - protected final BigInteger jobSequenceNumber; - protected final BigInteger syncTighteningId; + protected final long jobSequenceNumber; + protected final long syncTighteningId; protected final String toolSerialNumber; protected final String timeStamp; protected final String dateTimeOfLastChangeIndParameterSetSettings; @@ -153,11 +152,11 @@ public Long getRevision() { protected final String identifierResultPart3; protected final String identifierResultPart4; protected final String customerTighteningError; - protected final BigInteger prevailTorqueCompensateValue; + protected final long prevailTorqueCompensateValue; protected final Status tighteningErrorStatus2; public OpenProtocolMessageLastTighteningResultDataRev6( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -169,7 +168,7 @@ public OpenProtocolMessageLastTighteningResultDataRev6( String torqueControllerName, String vinNumber, long jobId, - long parameterSetNumber, + int parameterSetNumber, Strategy strategy, long batchSize, long batchCounter, @@ -182,29 +181,29 @@ public OpenProtocolMessageLastTighteningResultDataRev6( Status selfTapStatus, Status prevailTorqueMonitoringStatus, Status prevailTorqueCompensateStatus, - BigInteger torqueMinLimit, - BigInteger torqueMaxLimit, - BigInteger torqueFinalTarget, - BigInteger torque, - BigInteger angleMin, - BigInteger angleMax, - BigInteger finalAngleTarget, - BigInteger angle, - BigInteger rundownAngleMin, - BigInteger rundownAngleMax, - BigInteger rundownAngle, - long currentMonitoringMin, - long currentMonitoringMax, - long currentMonitoringValue, - BigInteger selfTapMin, - BigInteger selfTapMax, - BigInteger selfTapTorque, - BigInteger prevailTorqueMonitoringMin, - BigInteger prevailTorqueMonitoringMax, - BigInteger prevailTorque, + long torqueMinLimit, + long torqueMaxLimit, + long torqueFinalTarget, + long torque, + long angleMin, + long angleMax, + long finalAngleTarget, + long angle, + long rundownAngleMin, + long rundownAngleMax, + long rundownAngle, + int currentMonitoringMin, + int currentMonitoringMax, + int currentMonitoringValue, + long selfTapMin, + long selfTapMax, + long selfTapTorque, + long prevailTorqueMonitoringMin, + long prevailTorqueMonitoringMax, + long prevailTorque, String tighteningId, - BigInteger jobSequenceNumber, - BigInteger syncTighteningId, + long jobSequenceNumber, + long syncTighteningId, String toolSerialNumber, String timeStamp, String dateTimeOfLastChangeIndParameterSetSettings, @@ -215,7 +214,7 @@ public OpenProtocolMessageLastTighteningResultDataRev6( String identifierResultPart3, String identifierResultPart4, String customerTighteningError, - BigInteger prevailTorqueCompensateValue, + long prevailTorqueCompensateValue, Status tighteningErrorStatus2) { super( midRevision, @@ -300,7 +299,7 @@ public long getJobId() { return jobId; } - public long getParameterSetNumber() { + public int getParameterSetNumber() { return parameterSetNumber; } @@ -352,83 +351,83 @@ public Status getPrevailTorqueCompensateStatus() { return prevailTorqueCompensateStatus; } - public BigInteger getTorqueMinLimit() { + public long getTorqueMinLimit() { return torqueMinLimit; } - public BigInteger getTorqueMaxLimit() { + public long getTorqueMaxLimit() { return torqueMaxLimit; } - public BigInteger getTorqueFinalTarget() { + public long getTorqueFinalTarget() { return torqueFinalTarget; } - public BigInteger getTorque() { + public long getTorque() { return torque; } - public BigInteger getAngleMin() { + public long getAngleMin() { return angleMin; } - public BigInteger getAngleMax() { + public long getAngleMax() { return angleMax; } - public BigInteger getFinalAngleTarget() { + public long getFinalAngleTarget() { return finalAngleTarget; } - public BigInteger getAngle() { + public long getAngle() { return angle; } - public BigInteger getRundownAngleMin() { + public long getRundownAngleMin() { return rundownAngleMin; } - public BigInteger getRundownAngleMax() { + public long getRundownAngleMax() { return rundownAngleMax; } - public BigInteger getRundownAngle() { + public long getRundownAngle() { return rundownAngle; } - public long getCurrentMonitoringMin() { + public int getCurrentMonitoringMin() { return currentMonitoringMin; } - public long getCurrentMonitoringMax() { + public int getCurrentMonitoringMax() { return currentMonitoringMax; } - public long getCurrentMonitoringValue() { + public int getCurrentMonitoringValue() { return currentMonitoringValue; } - public BigInteger getSelfTapMin() { + public long getSelfTapMin() { return selfTapMin; } - public BigInteger getSelfTapMax() { + public long getSelfTapMax() { return selfTapMax; } - public BigInteger getSelfTapTorque() { + public long getSelfTapTorque() { return selfTapTorque; } - public BigInteger getPrevailTorqueMonitoringMin() { + public long getPrevailTorqueMonitoringMin() { return prevailTorqueMonitoringMin; } - public BigInteger getPrevailTorqueMonitoringMax() { + public long getPrevailTorqueMonitoringMax() { return prevailTorqueMonitoringMax; } - public BigInteger getPrevailTorque() { + public long getPrevailTorque() { return prevailTorque; } @@ -436,11 +435,11 @@ public String getTighteningId() { return tighteningId; } - public BigInteger getJobSequenceNumber() { + public long getJobSequenceNumber() { return jobSequenceNumber; } - public BigInteger getSyncTighteningId() { + public long getSyncTighteningId() { return syncTighteningId; } @@ -484,7 +483,7 @@ public String getCustomerTighteningError() { return customerTighteningError; } - public BigInteger getPrevailTorqueCompensateValue() { + public long getPrevailTorqueCompensateValue() { return prevailTorqueCompensateValue; } @@ -791,7 +790,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "parameterSetNumber", parameterSetNumber, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); // Const Field (blockIdStrategy) @@ -1007,7 +1006,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "torqueMinLimit", torqueMinLimit, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdTorqueMaxLimit) @@ -1021,7 +1020,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "torqueMaxLimit", torqueMaxLimit, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdTorqueFinalTarget) @@ -1035,7 +1034,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "torqueFinalTarget", torqueFinalTarget, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdTorque) @@ -1047,10 +1046,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu // Simple Field (torque) writeSimpleField( - "torque", - torque, - writeUnsignedBigInteger(writeBuffer, 48), - WithOption.WithEncoding("ASCII")); + "torque", torque, writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdAngleMin) writeConstField( @@ -1061,10 +1057,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu // Simple Field (angleMin) writeSimpleField( - "angleMin", - angleMin, - writeUnsignedBigInteger(writeBuffer, 40), - WithOption.WithEncoding("ASCII")); + "angleMin", angleMin, writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdAngleMax) writeConstField( @@ -1075,10 +1068,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu // Simple Field (angleMax) writeSimpleField( - "angleMax", - angleMax, - writeUnsignedBigInteger(writeBuffer, 40), - WithOption.WithEncoding("ASCII")); + "angleMax", angleMax, writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdFinalAngleTarget) writeConstField( @@ -1091,7 +1081,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "finalAngleTarget", finalAngleTarget, - writeUnsignedBigInteger(writeBuffer, 40), + writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdAngle) @@ -1103,7 +1093,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu // Simple Field (angle) writeSimpleField( - "angle", angle, writeUnsignedBigInteger(writeBuffer, 40), WithOption.WithEncoding("ASCII")); + "angle", angle, writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdRundownAngleMin) writeConstField( @@ -1116,7 +1106,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "rundownAngleMin", rundownAngleMin, - writeUnsignedBigInteger(writeBuffer, 40), + writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdRundownAngleMax) @@ -1130,7 +1120,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "rundownAngleMax", rundownAngleMax, - writeUnsignedBigInteger(writeBuffer, 40), + writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdRundownAngle) @@ -1144,7 +1134,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "rundownAngle", rundownAngle, - writeUnsignedBigInteger(writeBuffer, 40), + writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdCurrentMonitoringMin) @@ -1158,7 +1148,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "currentMonitoringMin", currentMonitoringMin, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); // Const Field (blockIdCurrentMonitoringMax) @@ -1172,7 +1162,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "currentMonitoringMax", currentMonitoringMax, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); // Const Field (blockIdCurrentMonitoringValue) @@ -1186,7 +1176,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "currentMonitoringValue", currentMonitoringValue, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); // Const Field (blockIdSelfTapMin) @@ -1200,7 +1190,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "selfTapMin", selfTapMin, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdSelfTapMax) @@ -1214,7 +1204,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "selfTapMax", selfTapMax, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdSelfTapTorque) @@ -1228,7 +1218,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "selfTapTorque", selfTapTorque, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdPrevailTorqueMonitoringMin) @@ -1242,7 +1232,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "prevailTorqueMonitoringMin", prevailTorqueMonitoringMin, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdPrevailTorqueMonitoringMax) @@ -1256,7 +1246,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "prevailTorqueMonitoringMax", prevailTorqueMonitoringMax, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdPrevailTorque) @@ -1270,7 +1260,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "prevailTorque", prevailTorque, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdTighteningId) @@ -1298,7 +1288,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "jobSequenceNumber", jobSequenceNumber, - writeUnsignedBigInteger(writeBuffer, 40), + writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdSyncTighteningId) @@ -1312,7 +1302,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "syncTighteningId", syncTighteningId, - writeUnsignedBigInteger(writeBuffer, 40), + writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdToolSerialNumber) @@ -1466,7 +1456,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "prevailTorqueCompensateValue", prevailTorqueCompensateValue, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdTighteningErrorStatus2) @@ -1828,7 +1818,7 @@ public int getLengthInBits() { public static OpenProtocolMessageLastTighteningResultDataBuilder staticParseOpenProtocolMessageLastTighteningResultDataBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageLastTighteningResultDataRev6"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -1894,10 +1884,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev6.BLOCKIDPARAMETERSETNUMBER, WithOption.WithEncoding("ASCII")); - long parameterSetNumber = + int parameterSetNumber = readSimpleField( "parameterSetNumber", - readUnsignedLong(readBuffer, 24), + readUnsignedInt(readBuffer, 24), WithOption.WithEncoding("ASCII")); int blockIdStrategy = @@ -2084,11 +2074,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev6.BLOCKIDTORQUEMINLIMIT, WithOption.WithEncoding("ASCII")); - BigInteger torqueMinLimit = + long torqueMinLimit = readSimpleField( - "torqueMinLimit", - readUnsignedBigInteger(readBuffer, 48), - WithOption.WithEncoding("ASCII")); + "torqueMinLimit", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdTorqueMaxLimit = readConstField( @@ -2097,11 +2085,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev6.BLOCKIDTORQUEMAXLIMIT, WithOption.WithEncoding("ASCII")); - BigInteger torqueMaxLimit = + long torqueMaxLimit = readSimpleField( - "torqueMaxLimit", - readUnsignedBigInteger(readBuffer, 48), - WithOption.WithEncoding("ASCII")); + "torqueMaxLimit", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdTorqueFinalTarget = readConstField( @@ -2110,10 +2096,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev6.BLOCKIDTORQUEFINALTARGET, WithOption.WithEncoding("ASCII")); - BigInteger torqueFinalTarget = + long torqueFinalTarget = readSimpleField( "torqueFinalTarget", - readUnsignedBigInteger(readBuffer, 48), + readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdTorque = @@ -2123,9 +2109,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev6.BLOCKIDTORQUE, WithOption.WithEncoding("ASCII")); - BigInteger torque = + long torque = readSimpleField( - "torque", readUnsignedBigInteger(readBuffer, 48), WithOption.WithEncoding("ASCII")); + "torque", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdAngleMin = readConstField( @@ -2134,9 +2120,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev6.BLOCKIDANGLEMIN, WithOption.WithEncoding("ASCII")); - BigInteger angleMin = + long angleMin = readSimpleField( - "angleMin", readUnsignedBigInteger(readBuffer, 40), WithOption.WithEncoding("ASCII")); + "angleMin", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdAngleMax = readConstField( @@ -2145,9 +2131,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev6.BLOCKIDANGLEMAX, WithOption.WithEncoding("ASCII")); - BigInteger angleMax = + long angleMax = readSimpleField( - "angleMax", readUnsignedBigInteger(readBuffer, 40), WithOption.WithEncoding("ASCII")); + "angleMax", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdFinalAngleTarget = readConstField( @@ -2156,11 +2142,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev6.BLOCKIDFINALANGLETARGET, WithOption.WithEncoding("ASCII")); - BigInteger finalAngleTarget = + long finalAngleTarget = readSimpleField( - "finalAngleTarget", - readUnsignedBigInteger(readBuffer, 40), - WithOption.WithEncoding("ASCII")); + "finalAngleTarget", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdAngle = readConstField( @@ -2169,9 +2153,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev6.BLOCKIDANGLE, WithOption.WithEncoding("ASCII")); - BigInteger angle = + long angle = readSimpleField( - "angle", readUnsignedBigInteger(readBuffer, 40), WithOption.WithEncoding("ASCII")); + "angle", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdRundownAngleMin = readConstField( @@ -2180,11 +2164,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev6.BLOCKIDRUNDOWNANGLEMIN, WithOption.WithEncoding("ASCII")); - BigInteger rundownAngleMin = + long rundownAngleMin = readSimpleField( - "rundownAngleMin", - readUnsignedBigInteger(readBuffer, 40), - WithOption.WithEncoding("ASCII")); + "rundownAngleMin", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdRundownAngleMax = readConstField( @@ -2193,11 +2175,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev6.BLOCKIDRUNDOWNANGLEMAX, WithOption.WithEncoding("ASCII")); - BigInteger rundownAngleMax = + long rundownAngleMax = readSimpleField( - "rundownAngleMax", - readUnsignedBigInteger(readBuffer, 40), - WithOption.WithEncoding("ASCII")); + "rundownAngleMax", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdRundownAngle = readConstField( @@ -2206,11 +2186,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev6.BLOCKIDRUNDOWNANGLE, WithOption.WithEncoding("ASCII")); - BigInteger rundownAngle = + long rundownAngle = readSimpleField( - "rundownAngle", - readUnsignedBigInteger(readBuffer, 40), - WithOption.WithEncoding("ASCII")); + "rundownAngle", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdCurrentMonitoringMin = readConstField( @@ -2219,10 +2197,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev6.BLOCKIDCURRENTMONITORINGMIN, WithOption.WithEncoding("ASCII")); - long currentMonitoringMin = + int currentMonitoringMin = readSimpleField( "currentMonitoringMin", - readUnsignedLong(readBuffer, 24), + readUnsignedInt(readBuffer, 24), WithOption.WithEncoding("ASCII")); int blockIdCurrentMonitoringMax = @@ -2232,10 +2210,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev6.BLOCKIDCURRENTMONITORINGMAX, WithOption.WithEncoding("ASCII")); - long currentMonitoringMax = + int currentMonitoringMax = readSimpleField( "currentMonitoringMax", - readUnsignedLong(readBuffer, 24), + readUnsignedInt(readBuffer, 24), WithOption.WithEncoding("ASCII")); int blockIdCurrentMonitoringValue = @@ -2245,10 +2223,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev6.BLOCKIDCURRENTMONITORINGVALUE, WithOption.WithEncoding("ASCII")); - long currentMonitoringValue = + int currentMonitoringValue = readSimpleField( "currentMonitoringValue", - readUnsignedLong(readBuffer, 24), + readUnsignedInt(readBuffer, 24), WithOption.WithEncoding("ASCII")); int blockIdSelfTapMin = @@ -2258,9 +2236,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev6.BLOCKIDSELFTAPMIN, WithOption.WithEncoding("ASCII")); - BigInteger selfTapMin = + long selfTapMin = readSimpleField( - "selfTapMin", readUnsignedBigInteger(readBuffer, 48), WithOption.WithEncoding("ASCII")); + "selfTapMin", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdSelfTapMax = readConstField( @@ -2269,9 +2247,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev6.BLOCKIDSELFTAPMAX, WithOption.WithEncoding("ASCII")); - BigInteger selfTapMax = + long selfTapMax = readSimpleField( - "selfTapMax", readUnsignedBigInteger(readBuffer, 48), WithOption.WithEncoding("ASCII")); + "selfTapMax", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdSelfTapTorque = readConstField( @@ -2280,11 +2258,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev6.BLOCKIDSELFTAPTORQUE, WithOption.WithEncoding("ASCII")); - BigInteger selfTapTorque = + long selfTapTorque = readSimpleField( - "selfTapTorque", - readUnsignedBigInteger(readBuffer, 48), - WithOption.WithEncoding("ASCII")); + "selfTapTorque", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdPrevailTorqueMonitoringMin = readConstField( @@ -2293,10 +2269,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev6.BLOCKIDPREVAILTORQUEMONITORINGMIN, WithOption.WithEncoding("ASCII")); - BigInteger prevailTorqueMonitoringMin = + long prevailTorqueMonitoringMin = readSimpleField( "prevailTorqueMonitoringMin", - readUnsignedBigInteger(readBuffer, 48), + readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdPrevailTorqueMonitoringMax = @@ -2306,10 +2282,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev6.BLOCKIDPREVAILTORQUEMONITORINGMAX, WithOption.WithEncoding("ASCII")); - BigInteger prevailTorqueMonitoringMax = + long prevailTorqueMonitoringMax = readSimpleField( "prevailTorqueMonitoringMax", - readUnsignedBigInteger(readBuffer, 48), + readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdPrevailTorque = @@ -2319,11 +2295,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev6.BLOCKIDPREVAILTORQUE, WithOption.WithEncoding("ASCII")); - BigInteger prevailTorque = + long prevailTorque = readSimpleField( - "prevailTorque", - readUnsignedBigInteger(readBuffer, 48), - WithOption.WithEncoding("ASCII")); + "prevailTorque", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdTighteningId = readConstField( @@ -2343,10 +2317,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev6.BLOCKIDJOBSEQUENCENUMBER, WithOption.WithEncoding("ASCII")); - BigInteger jobSequenceNumber = + long jobSequenceNumber = readSimpleField( "jobSequenceNumber", - readUnsignedBigInteger(readBuffer, 40), + readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdSyncTighteningId = @@ -2356,11 +2330,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev6.BLOCKIDSYNCTIGHTENINGID, WithOption.WithEncoding("ASCII")); - BigInteger syncTighteningId = + long syncTighteningId = readSimpleField( - "syncTighteningId", - readUnsignedBigInteger(readBuffer, 40), - WithOption.WithEncoding("ASCII")); + "syncTighteningId", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdToolSerialNumber = readConstField( @@ -2489,10 +2461,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev6.BLOCKIDPREVAILTORQUECOMPENSATEVALUE, WithOption.WithEncoding("ASCII")); - BigInteger prevailTorqueCompensateValue = + long prevailTorqueCompensateValue = readSimpleField( "prevailTorqueCompensateValue", - readUnsignedBigInteger(readBuffer, 48), + readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdTighteningErrorStatus2 = @@ -2575,7 +2547,7 @@ public static class OpenProtocolMessageLastTighteningResultDataRev6BuilderImpl private final String torqueControllerName; private final String vinNumber; private final long jobId; - private final long parameterSetNumber; + private final int parameterSetNumber; private final Strategy strategy; private final long batchSize; private final long batchCounter; @@ -2588,29 +2560,29 @@ public static class OpenProtocolMessageLastTighteningResultDataRev6BuilderImpl private final Status selfTapStatus; private final Status prevailTorqueMonitoringStatus; private final Status prevailTorqueCompensateStatus; - private final BigInteger torqueMinLimit; - private final BigInteger torqueMaxLimit; - private final BigInteger torqueFinalTarget; - private final BigInteger torque; - private final BigInteger angleMin; - private final BigInteger angleMax; - private final BigInteger finalAngleTarget; - private final BigInteger angle; - private final BigInteger rundownAngleMin; - private final BigInteger rundownAngleMax; - private final BigInteger rundownAngle; - private final long currentMonitoringMin; - private final long currentMonitoringMax; - private final long currentMonitoringValue; - private final BigInteger selfTapMin; - private final BigInteger selfTapMax; - private final BigInteger selfTapTorque; - private final BigInteger prevailTorqueMonitoringMin; - private final BigInteger prevailTorqueMonitoringMax; - private final BigInteger prevailTorque; + private final long torqueMinLimit; + private final long torqueMaxLimit; + private final long torqueFinalTarget; + private final long torque; + private final long angleMin; + private final long angleMax; + private final long finalAngleTarget; + private final long angle; + private final long rundownAngleMin; + private final long rundownAngleMax; + private final long rundownAngle; + private final int currentMonitoringMin; + private final int currentMonitoringMax; + private final int currentMonitoringValue; + private final long selfTapMin; + private final long selfTapMax; + private final long selfTapTorque; + private final long prevailTorqueMonitoringMin; + private final long prevailTorqueMonitoringMax; + private final long prevailTorque; private final String tighteningId; - private final BigInteger jobSequenceNumber; - private final BigInteger syncTighteningId; + private final long jobSequenceNumber; + private final long syncTighteningId; private final String toolSerialNumber; private final String timeStamp; private final String dateTimeOfLastChangeIndParameterSetSettings; @@ -2621,7 +2593,7 @@ public static class OpenProtocolMessageLastTighteningResultDataRev6BuilderImpl private final String identifierResultPart3; private final String identifierResultPart4; private final String customerTighteningError; - private final BigInteger prevailTorqueCompensateValue; + private final long prevailTorqueCompensateValue; private final Status tighteningErrorStatus2; public OpenProtocolMessageLastTighteningResultDataRev6BuilderImpl( @@ -2630,7 +2602,7 @@ public OpenProtocolMessageLastTighteningResultDataRev6BuilderImpl( String torqueControllerName, String vinNumber, long jobId, - long parameterSetNumber, + int parameterSetNumber, Strategy strategy, long batchSize, long batchCounter, @@ -2643,29 +2615,29 @@ public OpenProtocolMessageLastTighteningResultDataRev6BuilderImpl( Status selfTapStatus, Status prevailTorqueMonitoringStatus, Status prevailTorqueCompensateStatus, - BigInteger torqueMinLimit, - BigInteger torqueMaxLimit, - BigInteger torqueFinalTarget, - BigInteger torque, - BigInteger angleMin, - BigInteger angleMax, - BigInteger finalAngleTarget, - BigInteger angle, - BigInteger rundownAngleMin, - BigInteger rundownAngleMax, - BigInteger rundownAngle, - long currentMonitoringMin, - long currentMonitoringMax, - long currentMonitoringValue, - BigInteger selfTapMin, - BigInteger selfTapMax, - BigInteger selfTapTorque, - BigInteger prevailTorqueMonitoringMin, - BigInteger prevailTorqueMonitoringMax, - BigInteger prevailTorque, + long torqueMinLimit, + long torqueMaxLimit, + long torqueFinalTarget, + long torque, + long angleMin, + long angleMax, + long finalAngleTarget, + long angle, + long rundownAngleMin, + long rundownAngleMax, + long rundownAngle, + int currentMonitoringMin, + int currentMonitoringMax, + int currentMonitoringValue, + long selfTapMin, + long selfTapMax, + long selfTapTorque, + long prevailTorqueMonitoringMin, + long prevailTorqueMonitoringMax, + long prevailTorque, String tighteningId, - BigInteger jobSequenceNumber, - BigInteger syncTighteningId, + long jobSequenceNumber, + long syncTighteningId, String toolSerialNumber, String timeStamp, String dateTimeOfLastChangeIndParameterSetSettings, @@ -2676,7 +2648,7 @@ public OpenProtocolMessageLastTighteningResultDataRev6BuilderImpl( String identifierResultPart3, String identifierResultPart4, String customerTighteningError, - BigInteger prevailTorqueCompensateValue, + long prevailTorqueCompensateValue, Status tighteningErrorStatus2) { this.cellId = cellId; this.channelId = channelId; @@ -2735,7 +2707,7 @@ public OpenProtocolMessageLastTighteningResultDataRev6BuilderImpl( } public OpenProtocolMessageLastTighteningResultDataRev6 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLastTighteningResultDataRev7.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLastTighteningResultDataRev7.java index a542021ea54..f138e1d8b4d 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLastTighteningResultDataRev7.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLastTighteningResultDataRev7.java @@ -24,7 +24,6 @@ import static org.apache.plc4x.java.spi.codegen.io.DataWriterFactory.*; import static org.apache.plc4x.java.spi.generation.StaticHelper.*; -import java.math.BigInteger; import java.time.*; import java.util.*; import org.apache.plc4x.java.api.exceptions.*; @@ -40,8 +39,8 @@ public class OpenProtocolMessageLastTighteningResultDataRev7 extends OpenProtocolMessageLastTighteningResultData implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 7; + public Integer getRevision() { + return (int) 7; } // Constant values. @@ -109,7 +108,7 @@ public Long getRevision() { protected final String torqueControllerName; protected final String vinNumber; protected final long jobId; - protected final long parameterSetNumber; + protected final int parameterSetNumber; protected final Strategy strategy; protected final long batchSize; protected final long batchCounter; @@ -122,29 +121,29 @@ public Long getRevision() { protected final Status selfTapStatus; protected final Status prevailTorqueMonitoringStatus; protected final Status prevailTorqueCompensateStatus; - protected final BigInteger torqueMinLimit; - protected final BigInteger torqueMaxLimit; - protected final BigInteger torqueFinalTarget; - protected final BigInteger torque; - protected final BigInteger angleMin; - protected final BigInteger angleMax; - protected final BigInteger finalAngleTarget; - protected final BigInteger angle; - protected final BigInteger rundownAngleMin; - protected final BigInteger rundownAngleMax; - protected final BigInteger rundownAngle; - protected final long currentMonitoringMin; - protected final long currentMonitoringMax; - protected final long currentMonitoringValue; - protected final BigInteger selfTapMin; - protected final BigInteger selfTapMax; - protected final BigInteger selfTapTorque; - protected final BigInteger prevailTorqueMonitoringMin; - protected final BigInteger prevailTorqueMonitoringMax; - protected final BigInteger prevailTorque; + protected final long torqueMinLimit; + protected final long torqueMaxLimit; + protected final long torqueFinalTarget; + protected final long torque; + protected final long angleMin; + protected final long angleMax; + protected final long finalAngleTarget; + protected final long angle; + protected final long rundownAngleMin; + protected final long rundownAngleMax; + protected final long rundownAngle; + protected final int currentMonitoringMin; + protected final int currentMonitoringMax; + protected final int currentMonitoringValue; + protected final long selfTapMin; + protected final long selfTapMax; + protected final long selfTapTorque; + protected final long prevailTorqueMonitoringMin; + protected final long prevailTorqueMonitoringMax; + protected final long prevailTorque; protected final String tighteningId; - protected final BigInteger jobSequenceNumber; - protected final BigInteger syncTighteningId; + protected final long jobSequenceNumber; + protected final long syncTighteningId; protected final String toolSerialNumber; protected final String timeStamp; protected final String dateTimeOfLastChangeIndParameterSetSettings; @@ -155,12 +154,12 @@ public Long getRevision() { protected final String identifierResultPart3; protected final String identifierResultPart4; protected final String customerTighteningError; - protected final BigInteger prevailTorqueCompensateValue; - protected final BigInteger compensatedAngle; - protected final BigInteger finalAngleDecimal; + protected final long prevailTorqueCompensateValue; + protected final long compensatedAngle; + protected final long finalAngleDecimal; public OpenProtocolMessageLastTighteningResultDataRev7( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -172,7 +171,7 @@ public OpenProtocolMessageLastTighteningResultDataRev7( String torqueControllerName, String vinNumber, long jobId, - long parameterSetNumber, + int parameterSetNumber, Strategy strategy, long batchSize, long batchCounter, @@ -185,29 +184,29 @@ public OpenProtocolMessageLastTighteningResultDataRev7( Status selfTapStatus, Status prevailTorqueMonitoringStatus, Status prevailTorqueCompensateStatus, - BigInteger torqueMinLimit, - BigInteger torqueMaxLimit, - BigInteger torqueFinalTarget, - BigInteger torque, - BigInteger angleMin, - BigInteger angleMax, - BigInteger finalAngleTarget, - BigInteger angle, - BigInteger rundownAngleMin, - BigInteger rundownAngleMax, - BigInteger rundownAngle, - long currentMonitoringMin, - long currentMonitoringMax, - long currentMonitoringValue, - BigInteger selfTapMin, - BigInteger selfTapMax, - BigInteger selfTapTorque, - BigInteger prevailTorqueMonitoringMin, - BigInteger prevailTorqueMonitoringMax, - BigInteger prevailTorque, + long torqueMinLimit, + long torqueMaxLimit, + long torqueFinalTarget, + long torque, + long angleMin, + long angleMax, + long finalAngleTarget, + long angle, + long rundownAngleMin, + long rundownAngleMax, + long rundownAngle, + int currentMonitoringMin, + int currentMonitoringMax, + int currentMonitoringValue, + long selfTapMin, + long selfTapMax, + long selfTapTorque, + long prevailTorqueMonitoringMin, + long prevailTorqueMonitoringMax, + long prevailTorque, String tighteningId, - BigInteger jobSequenceNumber, - BigInteger syncTighteningId, + long jobSequenceNumber, + long syncTighteningId, String toolSerialNumber, String timeStamp, String dateTimeOfLastChangeIndParameterSetSettings, @@ -218,9 +217,9 @@ public OpenProtocolMessageLastTighteningResultDataRev7( String identifierResultPart3, String identifierResultPart4, String customerTighteningError, - BigInteger prevailTorqueCompensateValue, - BigInteger compensatedAngle, - BigInteger finalAngleDecimal) { + long prevailTorqueCompensateValue, + long compensatedAngle, + long finalAngleDecimal) { super( midRevision, noAckFlag, @@ -305,7 +304,7 @@ public long getJobId() { return jobId; } - public long getParameterSetNumber() { + public int getParameterSetNumber() { return parameterSetNumber; } @@ -357,83 +356,83 @@ public Status getPrevailTorqueCompensateStatus() { return prevailTorqueCompensateStatus; } - public BigInteger getTorqueMinLimit() { + public long getTorqueMinLimit() { return torqueMinLimit; } - public BigInteger getTorqueMaxLimit() { + public long getTorqueMaxLimit() { return torqueMaxLimit; } - public BigInteger getTorqueFinalTarget() { + public long getTorqueFinalTarget() { return torqueFinalTarget; } - public BigInteger getTorque() { + public long getTorque() { return torque; } - public BigInteger getAngleMin() { + public long getAngleMin() { return angleMin; } - public BigInteger getAngleMax() { + public long getAngleMax() { return angleMax; } - public BigInteger getFinalAngleTarget() { + public long getFinalAngleTarget() { return finalAngleTarget; } - public BigInteger getAngle() { + public long getAngle() { return angle; } - public BigInteger getRundownAngleMin() { + public long getRundownAngleMin() { return rundownAngleMin; } - public BigInteger getRundownAngleMax() { + public long getRundownAngleMax() { return rundownAngleMax; } - public BigInteger getRundownAngle() { + public long getRundownAngle() { return rundownAngle; } - public long getCurrentMonitoringMin() { + public int getCurrentMonitoringMin() { return currentMonitoringMin; } - public long getCurrentMonitoringMax() { + public int getCurrentMonitoringMax() { return currentMonitoringMax; } - public long getCurrentMonitoringValue() { + public int getCurrentMonitoringValue() { return currentMonitoringValue; } - public BigInteger getSelfTapMin() { + public long getSelfTapMin() { return selfTapMin; } - public BigInteger getSelfTapMax() { + public long getSelfTapMax() { return selfTapMax; } - public BigInteger getSelfTapTorque() { + public long getSelfTapTorque() { return selfTapTorque; } - public BigInteger getPrevailTorqueMonitoringMin() { + public long getPrevailTorqueMonitoringMin() { return prevailTorqueMonitoringMin; } - public BigInteger getPrevailTorqueMonitoringMax() { + public long getPrevailTorqueMonitoringMax() { return prevailTorqueMonitoringMax; } - public BigInteger getPrevailTorque() { + public long getPrevailTorque() { return prevailTorque; } @@ -441,11 +440,11 @@ public String getTighteningId() { return tighteningId; } - public BigInteger getJobSequenceNumber() { + public long getJobSequenceNumber() { return jobSequenceNumber; } - public BigInteger getSyncTighteningId() { + public long getSyncTighteningId() { return syncTighteningId; } @@ -489,15 +488,15 @@ public String getCustomerTighteningError() { return customerTighteningError; } - public BigInteger getPrevailTorqueCompensateValue() { + public long getPrevailTorqueCompensateValue() { return prevailTorqueCompensateValue; } - public BigInteger getCompensatedAngle() { + public long getCompensatedAngle() { return compensatedAngle; } - public BigInteger getFinalAngleDecimal() { + public long getFinalAngleDecimal() { return finalAngleDecimal; } @@ -808,7 +807,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "parameterSetNumber", parameterSetNumber, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); // Const Field (blockIdStrategy) @@ -1024,7 +1023,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "torqueMinLimit", torqueMinLimit, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdTorqueMaxLimit) @@ -1038,7 +1037,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "torqueMaxLimit", torqueMaxLimit, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdTorqueFinalTarget) @@ -1052,7 +1051,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "torqueFinalTarget", torqueFinalTarget, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdTorque) @@ -1064,10 +1063,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu // Simple Field (torque) writeSimpleField( - "torque", - torque, - writeUnsignedBigInteger(writeBuffer, 48), - WithOption.WithEncoding("ASCII")); + "torque", torque, writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdAngleMin) writeConstField( @@ -1078,10 +1074,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu // Simple Field (angleMin) writeSimpleField( - "angleMin", - angleMin, - writeUnsignedBigInteger(writeBuffer, 40), - WithOption.WithEncoding("ASCII")); + "angleMin", angleMin, writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdAngleMax) writeConstField( @@ -1092,10 +1085,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu // Simple Field (angleMax) writeSimpleField( - "angleMax", - angleMax, - writeUnsignedBigInteger(writeBuffer, 40), - WithOption.WithEncoding("ASCII")); + "angleMax", angleMax, writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdFinalAngleTarget) writeConstField( @@ -1108,7 +1098,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "finalAngleTarget", finalAngleTarget, - writeUnsignedBigInteger(writeBuffer, 40), + writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdAngle) @@ -1120,7 +1110,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu // Simple Field (angle) writeSimpleField( - "angle", angle, writeUnsignedBigInteger(writeBuffer, 40), WithOption.WithEncoding("ASCII")); + "angle", angle, writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdRundownAngleMin) writeConstField( @@ -1133,7 +1123,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "rundownAngleMin", rundownAngleMin, - writeUnsignedBigInteger(writeBuffer, 40), + writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdRundownAngleMax) @@ -1147,7 +1137,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "rundownAngleMax", rundownAngleMax, - writeUnsignedBigInteger(writeBuffer, 40), + writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdRundownAngle) @@ -1161,7 +1151,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "rundownAngle", rundownAngle, - writeUnsignedBigInteger(writeBuffer, 40), + writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdCurrentMonitoringMin) @@ -1175,7 +1165,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "currentMonitoringMin", currentMonitoringMin, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); // Const Field (blockIdCurrentMonitoringMax) @@ -1189,7 +1179,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "currentMonitoringMax", currentMonitoringMax, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); // Const Field (blockIdCurrentMonitoringValue) @@ -1203,7 +1193,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "currentMonitoringValue", currentMonitoringValue, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); // Const Field (blockIdSelfTapMin) @@ -1217,7 +1207,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "selfTapMin", selfTapMin, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdSelfTapMax) @@ -1231,7 +1221,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "selfTapMax", selfTapMax, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdSelfTapTorque) @@ -1245,7 +1235,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "selfTapTorque", selfTapTorque, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdPrevailTorqueMonitoringMin) @@ -1259,7 +1249,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "prevailTorqueMonitoringMin", prevailTorqueMonitoringMin, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdPrevailTorqueMonitoringMax) @@ -1273,7 +1263,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "prevailTorqueMonitoringMax", prevailTorqueMonitoringMax, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdPrevailTorque) @@ -1287,7 +1277,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "prevailTorque", prevailTorque, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdTighteningId) @@ -1315,7 +1305,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "jobSequenceNumber", jobSequenceNumber, - writeUnsignedBigInteger(writeBuffer, 40), + writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdSyncTighteningId) @@ -1329,7 +1319,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "syncTighteningId", syncTighteningId, - writeUnsignedBigInteger(writeBuffer, 40), + writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdToolSerialNumber) @@ -1483,7 +1473,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "prevailTorqueCompensateValue", prevailTorqueCompensateValue, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdTighteningErrorStatus2) @@ -1504,7 +1494,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "compensatedAngle", compensatedAngle, - writeUnsignedBigInteger(writeBuffer, 56), + writeUnsignedLong(writeBuffer, 56), WithOption.WithEncoding("ASCII")); // Const Field (blockIdFinalAngleDecimal) @@ -1518,7 +1508,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "finalAngleDecimal", finalAngleDecimal, - writeUnsignedBigInteger(writeBuffer, 56), + writeUnsignedLong(writeBuffer, 56), WithOption.WithEncoding("ASCII")); writeBuffer.popContext("OpenProtocolMessageLastTighteningResultDataRev7"); @@ -1873,7 +1863,7 @@ public int getLengthInBits() { public static OpenProtocolMessageLastTighteningResultDataBuilder staticParseOpenProtocolMessageLastTighteningResultDataBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageLastTighteningResultDataRev7"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -1939,10 +1929,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev7.BLOCKIDPARAMETERSETNUMBER, WithOption.WithEncoding("ASCII")); - long parameterSetNumber = + int parameterSetNumber = readSimpleField( "parameterSetNumber", - readUnsignedLong(readBuffer, 24), + readUnsignedInt(readBuffer, 24), WithOption.WithEncoding("ASCII")); int blockIdStrategy = @@ -2129,11 +2119,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev7.BLOCKIDTORQUEMINLIMIT, WithOption.WithEncoding("ASCII")); - BigInteger torqueMinLimit = + long torqueMinLimit = readSimpleField( - "torqueMinLimit", - readUnsignedBigInteger(readBuffer, 48), - WithOption.WithEncoding("ASCII")); + "torqueMinLimit", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdTorqueMaxLimit = readConstField( @@ -2142,11 +2130,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev7.BLOCKIDTORQUEMAXLIMIT, WithOption.WithEncoding("ASCII")); - BigInteger torqueMaxLimit = + long torqueMaxLimit = readSimpleField( - "torqueMaxLimit", - readUnsignedBigInteger(readBuffer, 48), - WithOption.WithEncoding("ASCII")); + "torqueMaxLimit", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdTorqueFinalTarget = readConstField( @@ -2155,10 +2141,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev7.BLOCKIDTORQUEFINALTARGET, WithOption.WithEncoding("ASCII")); - BigInteger torqueFinalTarget = + long torqueFinalTarget = readSimpleField( "torqueFinalTarget", - readUnsignedBigInteger(readBuffer, 48), + readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdTorque = @@ -2168,9 +2154,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev7.BLOCKIDTORQUE, WithOption.WithEncoding("ASCII")); - BigInteger torque = + long torque = readSimpleField( - "torque", readUnsignedBigInteger(readBuffer, 48), WithOption.WithEncoding("ASCII")); + "torque", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdAngleMin = readConstField( @@ -2179,9 +2165,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev7.BLOCKIDANGLEMIN, WithOption.WithEncoding("ASCII")); - BigInteger angleMin = + long angleMin = readSimpleField( - "angleMin", readUnsignedBigInteger(readBuffer, 40), WithOption.WithEncoding("ASCII")); + "angleMin", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdAngleMax = readConstField( @@ -2190,9 +2176,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev7.BLOCKIDANGLEMAX, WithOption.WithEncoding("ASCII")); - BigInteger angleMax = + long angleMax = readSimpleField( - "angleMax", readUnsignedBigInteger(readBuffer, 40), WithOption.WithEncoding("ASCII")); + "angleMax", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdFinalAngleTarget = readConstField( @@ -2201,11 +2187,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev7.BLOCKIDFINALANGLETARGET, WithOption.WithEncoding("ASCII")); - BigInteger finalAngleTarget = + long finalAngleTarget = readSimpleField( - "finalAngleTarget", - readUnsignedBigInteger(readBuffer, 40), - WithOption.WithEncoding("ASCII")); + "finalAngleTarget", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdAngle = readConstField( @@ -2214,9 +2198,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev7.BLOCKIDANGLE, WithOption.WithEncoding("ASCII")); - BigInteger angle = + long angle = readSimpleField( - "angle", readUnsignedBigInteger(readBuffer, 40), WithOption.WithEncoding("ASCII")); + "angle", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdRundownAngleMin = readConstField( @@ -2225,11 +2209,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev7.BLOCKIDRUNDOWNANGLEMIN, WithOption.WithEncoding("ASCII")); - BigInteger rundownAngleMin = + long rundownAngleMin = readSimpleField( - "rundownAngleMin", - readUnsignedBigInteger(readBuffer, 40), - WithOption.WithEncoding("ASCII")); + "rundownAngleMin", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdRundownAngleMax = readConstField( @@ -2238,11 +2220,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev7.BLOCKIDRUNDOWNANGLEMAX, WithOption.WithEncoding("ASCII")); - BigInteger rundownAngleMax = + long rundownAngleMax = readSimpleField( - "rundownAngleMax", - readUnsignedBigInteger(readBuffer, 40), - WithOption.WithEncoding("ASCII")); + "rundownAngleMax", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdRundownAngle = readConstField( @@ -2251,11 +2231,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev7.BLOCKIDRUNDOWNANGLE, WithOption.WithEncoding("ASCII")); - BigInteger rundownAngle = + long rundownAngle = readSimpleField( - "rundownAngle", - readUnsignedBigInteger(readBuffer, 40), - WithOption.WithEncoding("ASCII")); + "rundownAngle", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdCurrentMonitoringMin = readConstField( @@ -2264,10 +2242,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev7.BLOCKIDCURRENTMONITORINGMIN, WithOption.WithEncoding("ASCII")); - long currentMonitoringMin = + int currentMonitoringMin = readSimpleField( "currentMonitoringMin", - readUnsignedLong(readBuffer, 24), + readUnsignedInt(readBuffer, 24), WithOption.WithEncoding("ASCII")); int blockIdCurrentMonitoringMax = @@ -2277,10 +2255,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev7.BLOCKIDCURRENTMONITORINGMAX, WithOption.WithEncoding("ASCII")); - long currentMonitoringMax = + int currentMonitoringMax = readSimpleField( "currentMonitoringMax", - readUnsignedLong(readBuffer, 24), + readUnsignedInt(readBuffer, 24), WithOption.WithEncoding("ASCII")); int blockIdCurrentMonitoringValue = @@ -2290,10 +2268,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev7.BLOCKIDCURRENTMONITORINGVALUE, WithOption.WithEncoding("ASCII")); - long currentMonitoringValue = + int currentMonitoringValue = readSimpleField( "currentMonitoringValue", - readUnsignedLong(readBuffer, 24), + readUnsignedInt(readBuffer, 24), WithOption.WithEncoding("ASCII")); int blockIdSelfTapMin = @@ -2303,9 +2281,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev7.BLOCKIDSELFTAPMIN, WithOption.WithEncoding("ASCII")); - BigInteger selfTapMin = + long selfTapMin = readSimpleField( - "selfTapMin", readUnsignedBigInteger(readBuffer, 48), WithOption.WithEncoding("ASCII")); + "selfTapMin", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdSelfTapMax = readConstField( @@ -2314,9 +2292,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev7.BLOCKIDSELFTAPMAX, WithOption.WithEncoding("ASCII")); - BigInteger selfTapMax = + long selfTapMax = readSimpleField( - "selfTapMax", readUnsignedBigInteger(readBuffer, 48), WithOption.WithEncoding("ASCII")); + "selfTapMax", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdSelfTapTorque = readConstField( @@ -2325,11 +2303,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev7.BLOCKIDSELFTAPTORQUE, WithOption.WithEncoding("ASCII")); - BigInteger selfTapTorque = + long selfTapTorque = readSimpleField( - "selfTapTorque", - readUnsignedBigInteger(readBuffer, 48), - WithOption.WithEncoding("ASCII")); + "selfTapTorque", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdPrevailTorqueMonitoringMin = readConstField( @@ -2338,10 +2314,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev7.BLOCKIDPREVAILTORQUEMONITORINGMIN, WithOption.WithEncoding("ASCII")); - BigInteger prevailTorqueMonitoringMin = + long prevailTorqueMonitoringMin = readSimpleField( "prevailTorqueMonitoringMin", - readUnsignedBigInteger(readBuffer, 48), + readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdPrevailTorqueMonitoringMax = @@ -2351,10 +2327,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev7.BLOCKIDPREVAILTORQUEMONITORINGMAX, WithOption.WithEncoding("ASCII")); - BigInteger prevailTorqueMonitoringMax = + long prevailTorqueMonitoringMax = readSimpleField( "prevailTorqueMonitoringMax", - readUnsignedBigInteger(readBuffer, 48), + readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdPrevailTorque = @@ -2364,11 +2340,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev7.BLOCKIDPREVAILTORQUE, WithOption.WithEncoding("ASCII")); - BigInteger prevailTorque = + long prevailTorque = readSimpleField( - "prevailTorque", - readUnsignedBigInteger(readBuffer, 48), - WithOption.WithEncoding("ASCII")); + "prevailTorque", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdTighteningId = readConstField( @@ -2388,10 +2362,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev7.BLOCKIDJOBSEQUENCENUMBER, WithOption.WithEncoding("ASCII")); - BigInteger jobSequenceNumber = + long jobSequenceNumber = readSimpleField( "jobSequenceNumber", - readUnsignedBigInteger(readBuffer, 40), + readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdSyncTighteningId = @@ -2401,11 +2375,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev7.BLOCKIDSYNCTIGHTENINGID, WithOption.WithEncoding("ASCII")); - BigInteger syncTighteningId = + long syncTighteningId = readSimpleField( - "syncTighteningId", - readUnsignedBigInteger(readBuffer, 40), - WithOption.WithEncoding("ASCII")); + "syncTighteningId", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdToolSerialNumber = readConstField( @@ -2534,10 +2506,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev7.BLOCKIDPREVAILTORQUECOMPENSATEVALUE, WithOption.WithEncoding("ASCII")); - BigInteger prevailTorqueCompensateValue = + long prevailTorqueCompensateValue = readSimpleField( "prevailTorqueCompensateValue", - readUnsignedBigInteger(readBuffer, 48), + readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdTighteningErrorStatus2 = @@ -2554,11 +2526,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev7.BLOCKIDCOMPENSATEDANGLE, WithOption.WithEncoding("ASCII")); - BigInteger compensatedAngle = + long compensatedAngle = readSimpleField( - "compensatedAngle", - readUnsignedBigInteger(readBuffer, 56), - WithOption.WithEncoding("ASCII")); + "compensatedAngle", readUnsignedLong(readBuffer, 56), WithOption.WithEncoding("ASCII")); int blockIdFinalAngleDecimal = readConstField( @@ -2567,10 +2537,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev7.BLOCKIDFINALANGLEDECIMAL, WithOption.WithEncoding("ASCII")); - BigInteger finalAngleDecimal = + long finalAngleDecimal = readSimpleField( "finalAngleDecimal", - readUnsignedBigInteger(readBuffer, 56), + readUnsignedLong(readBuffer, 56), WithOption.WithEncoding("ASCII")); readBuffer.closeContext("OpenProtocolMessageLastTighteningResultDataRev7"); @@ -2640,7 +2610,7 @@ public static class OpenProtocolMessageLastTighteningResultDataRev7BuilderImpl private final String torqueControllerName; private final String vinNumber; private final long jobId; - private final long parameterSetNumber; + private final int parameterSetNumber; private final Strategy strategy; private final long batchSize; private final long batchCounter; @@ -2653,29 +2623,29 @@ public static class OpenProtocolMessageLastTighteningResultDataRev7BuilderImpl private final Status selfTapStatus; private final Status prevailTorqueMonitoringStatus; private final Status prevailTorqueCompensateStatus; - private final BigInteger torqueMinLimit; - private final BigInteger torqueMaxLimit; - private final BigInteger torqueFinalTarget; - private final BigInteger torque; - private final BigInteger angleMin; - private final BigInteger angleMax; - private final BigInteger finalAngleTarget; - private final BigInteger angle; - private final BigInteger rundownAngleMin; - private final BigInteger rundownAngleMax; - private final BigInteger rundownAngle; - private final long currentMonitoringMin; - private final long currentMonitoringMax; - private final long currentMonitoringValue; - private final BigInteger selfTapMin; - private final BigInteger selfTapMax; - private final BigInteger selfTapTorque; - private final BigInteger prevailTorqueMonitoringMin; - private final BigInteger prevailTorqueMonitoringMax; - private final BigInteger prevailTorque; + private final long torqueMinLimit; + private final long torqueMaxLimit; + private final long torqueFinalTarget; + private final long torque; + private final long angleMin; + private final long angleMax; + private final long finalAngleTarget; + private final long angle; + private final long rundownAngleMin; + private final long rundownAngleMax; + private final long rundownAngle; + private final int currentMonitoringMin; + private final int currentMonitoringMax; + private final int currentMonitoringValue; + private final long selfTapMin; + private final long selfTapMax; + private final long selfTapTorque; + private final long prevailTorqueMonitoringMin; + private final long prevailTorqueMonitoringMax; + private final long prevailTorque; private final String tighteningId; - private final BigInteger jobSequenceNumber; - private final BigInteger syncTighteningId; + private final long jobSequenceNumber; + private final long syncTighteningId; private final String toolSerialNumber; private final String timeStamp; private final String dateTimeOfLastChangeIndParameterSetSettings; @@ -2686,9 +2656,9 @@ public static class OpenProtocolMessageLastTighteningResultDataRev7BuilderImpl private final String identifierResultPart3; private final String identifierResultPart4; private final String customerTighteningError; - private final BigInteger prevailTorqueCompensateValue; - private final BigInteger compensatedAngle; - private final BigInteger finalAngleDecimal; + private final long prevailTorqueCompensateValue; + private final long compensatedAngle; + private final long finalAngleDecimal; public OpenProtocolMessageLastTighteningResultDataRev7BuilderImpl( long cellId, @@ -2696,7 +2666,7 @@ public OpenProtocolMessageLastTighteningResultDataRev7BuilderImpl( String torqueControllerName, String vinNumber, long jobId, - long parameterSetNumber, + int parameterSetNumber, Strategy strategy, long batchSize, long batchCounter, @@ -2709,29 +2679,29 @@ public OpenProtocolMessageLastTighteningResultDataRev7BuilderImpl( Status selfTapStatus, Status prevailTorqueMonitoringStatus, Status prevailTorqueCompensateStatus, - BigInteger torqueMinLimit, - BigInteger torqueMaxLimit, - BigInteger torqueFinalTarget, - BigInteger torque, - BigInteger angleMin, - BigInteger angleMax, - BigInteger finalAngleTarget, - BigInteger angle, - BigInteger rundownAngleMin, - BigInteger rundownAngleMax, - BigInteger rundownAngle, - long currentMonitoringMin, - long currentMonitoringMax, - long currentMonitoringValue, - BigInteger selfTapMin, - BigInteger selfTapMax, - BigInteger selfTapTorque, - BigInteger prevailTorqueMonitoringMin, - BigInteger prevailTorqueMonitoringMax, - BigInteger prevailTorque, + long torqueMinLimit, + long torqueMaxLimit, + long torqueFinalTarget, + long torque, + long angleMin, + long angleMax, + long finalAngleTarget, + long angle, + long rundownAngleMin, + long rundownAngleMax, + long rundownAngle, + int currentMonitoringMin, + int currentMonitoringMax, + int currentMonitoringValue, + long selfTapMin, + long selfTapMax, + long selfTapTorque, + long prevailTorqueMonitoringMin, + long prevailTorqueMonitoringMax, + long prevailTorque, String tighteningId, - BigInteger jobSequenceNumber, - BigInteger syncTighteningId, + long jobSequenceNumber, + long syncTighteningId, String toolSerialNumber, String timeStamp, String dateTimeOfLastChangeIndParameterSetSettings, @@ -2742,9 +2712,9 @@ public OpenProtocolMessageLastTighteningResultDataRev7BuilderImpl( String identifierResultPart3, String identifierResultPart4, String customerTighteningError, - BigInteger prevailTorqueCompensateValue, - BigInteger compensatedAngle, - BigInteger finalAngleDecimal) { + long prevailTorqueCompensateValue, + long compensatedAngle, + long finalAngleDecimal) { this.cellId = cellId; this.channelId = channelId; this.torqueControllerName = torqueControllerName; @@ -2803,7 +2773,7 @@ public OpenProtocolMessageLastTighteningResultDataRev7BuilderImpl( } public OpenProtocolMessageLastTighteningResultDataRev7 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLastTighteningResultDataRev998.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLastTighteningResultDataRev998.java index bc3939a3539..124d42d7b1f 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLastTighteningResultDataRev998.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLastTighteningResultDataRev998.java @@ -24,7 +24,6 @@ import static org.apache.plc4x.java.spi.codegen.io.DataWriterFactory.*; import static org.apache.plc4x.java.spi.generation.StaticHelper.*; -import java.math.BigInteger; import java.time.*; import java.util.*; import org.apache.plc4x.java.api.exceptions.*; @@ -40,8 +39,8 @@ public class OpenProtocolMessageLastTighteningResultDataRev998 extends OpenProtocolMessageLastTighteningResultData implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 998; + public Integer getRevision() { + return (int) 998; } // Constant values. @@ -110,7 +109,7 @@ public Long getRevision() { protected final String torqueControllerName; protected final String vinNumber; protected final long jobId; - protected final long parameterSetNumber; + protected final int parameterSetNumber; protected final Strategy strategy; protected final long batchSize; protected final long batchCounter; @@ -123,29 +122,29 @@ public Long getRevision() { protected final Status selfTapStatus; protected final Status prevailTorqueMonitoringStatus; protected final Status prevailTorqueCompensateStatus; - protected final BigInteger torqueMinLimit; - protected final BigInteger torqueMaxLimit; - protected final BigInteger torqueFinalTarget; - protected final BigInteger torque; - protected final BigInteger angleMin; - protected final BigInteger angleMax; - protected final BigInteger finalAngleTarget; - protected final BigInteger angle; - protected final BigInteger rundownAngleMin; - protected final BigInteger rundownAngleMax; - protected final BigInteger rundownAngle; - protected final long currentMonitoringMin; - protected final long currentMonitoringMax; - protected final long currentMonitoringValue; - protected final BigInteger selfTapMin; - protected final BigInteger selfTapMax; - protected final BigInteger selfTapTorque; - protected final BigInteger prevailTorqueMonitoringMin; - protected final BigInteger prevailTorqueMonitoringMax; - protected final BigInteger prevailTorque; + protected final long torqueMinLimit; + protected final long torqueMaxLimit; + protected final long torqueFinalTarget; + protected final long torque; + protected final long angleMin; + protected final long angleMax; + protected final long finalAngleTarget; + protected final long angle; + protected final long rundownAngleMin; + protected final long rundownAngleMax; + protected final long rundownAngle; + protected final int currentMonitoringMin; + protected final int currentMonitoringMax; + protected final int currentMonitoringValue; + protected final long selfTapMin; + protected final long selfTapMax; + protected final long selfTapTorque; + protected final long prevailTorqueMonitoringMin; + protected final long prevailTorqueMonitoringMax; + protected final long prevailTorque; protected final String tighteningId; - protected final BigInteger jobSequenceNumber; - protected final BigInteger syncTighteningId; + protected final long jobSequenceNumber; + protected final long syncTighteningId; protected final String toolSerialNumber; protected final String timeStamp; protected final String dateTimeOfLastChangeIndParameterSetSettings; @@ -156,12 +155,12 @@ public Long getRevision() { protected final String identifierResultPart3; protected final String identifierResultPart4; protected final String customerTighteningError; - protected final BigInteger prevailTorqueCompensateValue; + protected final long prevailTorqueCompensateValue; protected final int numberOfStagesInMultistage; protected final List stageResults; public OpenProtocolMessageLastTighteningResultDataRev998( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -173,7 +172,7 @@ public OpenProtocolMessageLastTighteningResultDataRev998( String torqueControllerName, String vinNumber, long jobId, - long parameterSetNumber, + int parameterSetNumber, Strategy strategy, long batchSize, long batchCounter, @@ -186,29 +185,29 @@ public OpenProtocolMessageLastTighteningResultDataRev998( Status selfTapStatus, Status prevailTorqueMonitoringStatus, Status prevailTorqueCompensateStatus, - BigInteger torqueMinLimit, - BigInteger torqueMaxLimit, - BigInteger torqueFinalTarget, - BigInteger torque, - BigInteger angleMin, - BigInteger angleMax, - BigInteger finalAngleTarget, - BigInteger angle, - BigInteger rundownAngleMin, - BigInteger rundownAngleMax, - BigInteger rundownAngle, - long currentMonitoringMin, - long currentMonitoringMax, - long currentMonitoringValue, - BigInteger selfTapMin, - BigInteger selfTapMax, - BigInteger selfTapTorque, - BigInteger prevailTorqueMonitoringMin, - BigInteger prevailTorqueMonitoringMax, - BigInteger prevailTorque, + long torqueMinLimit, + long torqueMaxLimit, + long torqueFinalTarget, + long torque, + long angleMin, + long angleMax, + long finalAngleTarget, + long angle, + long rundownAngleMin, + long rundownAngleMax, + long rundownAngle, + int currentMonitoringMin, + int currentMonitoringMax, + int currentMonitoringValue, + long selfTapMin, + long selfTapMax, + long selfTapTorque, + long prevailTorqueMonitoringMin, + long prevailTorqueMonitoringMax, + long prevailTorque, String tighteningId, - BigInteger jobSequenceNumber, - BigInteger syncTighteningId, + long jobSequenceNumber, + long syncTighteningId, String toolSerialNumber, String timeStamp, String dateTimeOfLastChangeIndParameterSetSettings, @@ -219,7 +218,7 @@ public OpenProtocolMessageLastTighteningResultDataRev998( String identifierResultPart3, String identifierResultPart4, String customerTighteningError, - BigInteger prevailTorqueCompensateValue, + long prevailTorqueCompensateValue, int numberOfStagesInMultistage, List stageResults) { super( @@ -306,7 +305,7 @@ public long getJobId() { return jobId; } - public long getParameterSetNumber() { + public int getParameterSetNumber() { return parameterSetNumber; } @@ -358,83 +357,83 @@ public Status getPrevailTorqueCompensateStatus() { return prevailTorqueCompensateStatus; } - public BigInteger getTorqueMinLimit() { + public long getTorqueMinLimit() { return torqueMinLimit; } - public BigInteger getTorqueMaxLimit() { + public long getTorqueMaxLimit() { return torqueMaxLimit; } - public BigInteger getTorqueFinalTarget() { + public long getTorqueFinalTarget() { return torqueFinalTarget; } - public BigInteger getTorque() { + public long getTorque() { return torque; } - public BigInteger getAngleMin() { + public long getAngleMin() { return angleMin; } - public BigInteger getAngleMax() { + public long getAngleMax() { return angleMax; } - public BigInteger getFinalAngleTarget() { + public long getFinalAngleTarget() { return finalAngleTarget; } - public BigInteger getAngle() { + public long getAngle() { return angle; } - public BigInteger getRundownAngleMin() { + public long getRundownAngleMin() { return rundownAngleMin; } - public BigInteger getRundownAngleMax() { + public long getRundownAngleMax() { return rundownAngleMax; } - public BigInteger getRundownAngle() { + public long getRundownAngle() { return rundownAngle; } - public long getCurrentMonitoringMin() { + public int getCurrentMonitoringMin() { return currentMonitoringMin; } - public long getCurrentMonitoringMax() { + public int getCurrentMonitoringMax() { return currentMonitoringMax; } - public long getCurrentMonitoringValue() { + public int getCurrentMonitoringValue() { return currentMonitoringValue; } - public BigInteger getSelfTapMin() { + public long getSelfTapMin() { return selfTapMin; } - public BigInteger getSelfTapMax() { + public long getSelfTapMax() { return selfTapMax; } - public BigInteger getSelfTapTorque() { + public long getSelfTapTorque() { return selfTapTorque; } - public BigInteger getPrevailTorqueMonitoringMin() { + public long getPrevailTorqueMonitoringMin() { return prevailTorqueMonitoringMin; } - public BigInteger getPrevailTorqueMonitoringMax() { + public long getPrevailTorqueMonitoringMax() { return prevailTorqueMonitoringMax; } - public BigInteger getPrevailTorque() { + public long getPrevailTorque() { return prevailTorque; } @@ -442,11 +441,11 @@ public String getTighteningId() { return tighteningId; } - public BigInteger getJobSequenceNumber() { + public long getJobSequenceNumber() { return jobSequenceNumber; } - public BigInteger getSyncTighteningId() { + public long getSyncTighteningId() { return syncTighteningId; } @@ -490,7 +489,7 @@ public String getCustomerTighteningError() { return customerTighteningError; } - public BigInteger getPrevailTorqueCompensateValue() { + public long getPrevailTorqueCompensateValue() { return prevailTorqueCompensateValue; } @@ -813,7 +812,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "parameterSetNumber", parameterSetNumber, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); // Const Field (blockIdStrategy) @@ -1029,7 +1028,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "torqueMinLimit", torqueMinLimit, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdTorqueMaxLimit) @@ -1043,7 +1042,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "torqueMaxLimit", torqueMaxLimit, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdTorqueFinalTarget) @@ -1057,7 +1056,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "torqueFinalTarget", torqueFinalTarget, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdTorque) @@ -1069,10 +1068,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu // Simple Field (torque) writeSimpleField( - "torque", - torque, - writeUnsignedBigInteger(writeBuffer, 48), - WithOption.WithEncoding("ASCII")); + "torque", torque, writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdAngleMin) writeConstField( @@ -1083,10 +1079,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu // Simple Field (angleMin) writeSimpleField( - "angleMin", - angleMin, - writeUnsignedBigInteger(writeBuffer, 40), - WithOption.WithEncoding("ASCII")); + "angleMin", angleMin, writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdAngleMax) writeConstField( @@ -1097,10 +1090,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu // Simple Field (angleMax) writeSimpleField( - "angleMax", - angleMax, - writeUnsignedBigInteger(writeBuffer, 40), - WithOption.WithEncoding("ASCII")); + "angleMax", angleMax, writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdFinalAngleTarget) writeConstField( @@ -1113,7 +1103,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "finalAngleTarget", finalAngleTarget, - writeUnsignedBigInteger(writeBuffer, 40), + writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdAngle) @@ -1125,7 +1115,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu // Simple Field (angle) writeSimpleField( - "angle", angle, writeUnsignedBigInteger(writeBuffer, 40), WithOption.WithEncoding("ASCII")); + "angle", angle, writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdRundownAngleMin) writeConstField( @@ -1138,7 +1128,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "rundownAngleMin", rundownAngleMin, - writeUnsignedBigInteger(writeBuffer, 40), + writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdRundownAngleMax) @@ -1152,7 +1142,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "rundownAngleMax", rundownAngleMax, - writeUnsignedBigInteger(writeBuffer, 40), + writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdRundownAngle) @@ -1166,7 +1156,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "rundownAngle", rundownAngle, - writeUnsignedBigInteger(writeBuffer, 40), + writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdCurrentMonitoringMin) @@ -1180,7 +1170,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "currentMonitoringMin", currentMonitoringMin, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); // Const Field (blockIdCurrentMonitoringMax) @@ -1194,7 +1184,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "currentMonitoringMax", currentMonitoringMax, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); // Const Field (blockIdCurrentMonitoringValue) @@ -1208,7 +1198,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "currentMonitoringValue", currentMonitoringValue, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); // Const Field (blockIdSelfTapMin) @@ -1222,7 +1212,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "selfTapMin", selfTapMin, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdSelfTapMax) @@ -1236,7 +1226,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "selfTapMax", selfTapMax, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdSelfTapTorque) @@ -1250,7 +1240,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "selfTapTorque", selfTapTorque, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdPrevailTorqueMonitoringMin) @@ -1264,7 +1254,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "prevailTorqueMonitoringMin", prevailTorqueMonitoringMin, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdPrevailTorqueMonitoringMax) @@ -1278,7 +1268,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "prevailTorqueMonitoringMax", prevailTorqueMonitoringMax, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdPrevailTorque) @@ -1292,7 +1282,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "prevailTorque", prevailTorque, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdTighteningId) @@ -1320,7 +1310,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "jobSequenceNumber", jobSequenceNumber, - writeUnsignedBigInteger(writeBuffer, 40), + writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdSyncTighteningId) @@ -1334,7 +1324,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "syncTighteningId", syncTighteningId, - writeUnsignedBigInteger(writeBuffer, 40), + writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdToolSerialNumber) @@ -1488,7 +1478,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "prevailTorqueCompensateValue", prevailTorqueCompensateValue, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdTighteningErrorStatus2) @@ -1903,7 +1893,7 @@ public int getLengthInBits() { public static OpenProtocolMessageLastTighteningResultDataBuilder staticParseOpenProtocolMessageLastTighteningResultDataBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageLastTighteningResultDataRev998"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -1969,10 +1959,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev998.BLOCKIDPARAMETERSETNUMBER, WithOption.WithEncoding("ASCII")); - long parameterSetNumber = + int parameterSetNumber = readSimpleField( "parameterSetNumber", - readUnsignedLong(readBuffer, 24), + readUnsignedInt(readBuffer, 24), WithOption.WithEncoding("ASCII")); int blockIdStrategy = @@ -2159,11 +2149,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev998.BLOCKIDTORQUEMINLIMIT, WithOption.WithEncoding("ASCII")); - BigInteger torqueMinLimit = + long torqueMinLimit = readSimpleField( - "torqueMinLimit", - readUnsignedBigInteger(readBuffer, 48), - WithOption.WithEncoding("ASCII")); + "torqueMinLimit", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdTorqueMaxLimit = readConstField( @@ -2172,11 +2160,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev998.BLOCKIDTORQUEMAXLIMIT, WithOption.WithEncoding("ASCII")); - BigInteger torqueMaxLimit = + long torqueMaxLimit = readSimpleField( - "torqueMaxLimit", - readUnsignedBigInteger(readBuffer, 48), - WithOption.WithEncoding("ASCII")); + "torqueMaxLimit", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdTorqueFinalTarget = readConstField( @@ -2185,10 +2171,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev998.BLOCKIDTORQUEFINALTARGET, WithOption.WithEncoding("ASCII")); - BigInteger torqueFinalTarget = + long torqueFinalTarget = readSimpleField( "torqueFinalTarget", - readUnsignedBigInteger(readBuffer, 48), + readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdTorque = @@ -2198,9 +2184,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev998.BLOCKIDTORQUE, WithOption.WithEncoding("ASCII")); - BigInteger torque = + long torque = readSimpleField( - "torque", readUnsignedBigInteger(readBuffer, 48), WithOption.WithEncoding("ASCII")); + "torque", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdAngleMin = readConstField( @@ -2209,9 +2195,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev998.BLOCKIDANGLEMIN, WithOption.WithEncoding("ASCII")); - BigInteger angleMin = + long angleMin = readSimpleField( - "angleMin", readUnsignedBigInteger(readBuffer, 40), WithOption.WithEncoding("ASCII")); + "angleMin", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdAngleMax = readConstField( @@ -2220,9 +2206,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev998.BLOCKIDANGLEMAX, WithOption.WithEncoding("ASCII")); - BigInteger angleMax = + long angleMax = readSimpleField( - "angleMax", readUnsignedBigInteger(readBuffer, 40), WithOption.WithEncoding("ASCII")); + "angleMax", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdFinalAngleTarget = readConstField( @@ -2231,11 +2217,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev998.BLOCKIDFINALANGLETARGET, WithOption.WithEncoding("ASCII")); - BigInteger finalAngleTarget = + long finalAngleTarget = readSimpleField( - "finalAngleTarget", - readUnsignedBigInteger(readBuffer, 40), - WithOption.WithEncoding("ASCII")); + "finalAngleTarget", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdAngle = readConstField( @@ -2244,9 +2228,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev998.BLOCKIDANGLE, WithOption.WithEncoding("ASCII")); - BigInteger angle = + long angle = readSimpleField( - "angle", readUnsignedBigInteger(readBuffer, 40), WithOption.WithEncoding("ASCII")); + "angle", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdRundownAngleMin = readConstField( @@ -2255,11 +2239,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev998.BLOCKIDRUNDOWNANGLEMIN, WithOption.WithEncoding("ASCII")); - BigInteger rundownAngleMin = + long rundownAngleMin = readSimpleField( - "rundownAngleMin", - readUnsignedBigInteger(readBuffer, 40), - WithOption.WithEncoding("ASCII")); + "rundownAngleMin", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdRundownAngleMax = readConstField( @@ -2268,11 +2250,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev998.BLOCKIDRUNDOWNANGLEMAX, WithOption.WithEncoding("ASCII")); - BigInteger rundownAngleMax = + long rundownAngleMax = readSimpleField( - "rundownAngleMax", - readUnsignedBigInteger(readBuffer, 40), - WithOption.WithEncoding("ASCII")); + "rundownAngleMax", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdRundownAngle = readConstField( @@ -2281,11 +2261,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev998.BLOCKIDRUNDOWNANGLE, WithOption.WithEncoding("ASCII")); - BigInteger rundownAngle = + long rundownAngle = readSimpleField( - "rundownAngle", - readUnsignedBigInteger(readBuffer, 40), - WithOption.WithEncoding("ASCII")); + "rundownAngle", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdCurrentMonitoringMin = readConstField( @@ -2294,10 +2272,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev998.BLOCKIDCURRENTMONITORINGMIN, WithOption.WithEncoding("ASCII")); - long currentMonitoringMin = + int currentMonitoringMin = readSimpleField( "currentMonitoringMin", - readUnsignedLong(readBuffer, 24), + readUnsignedInt(readBuffer, 24), WithOption.WithEncoding("ASCII")); int blockIdCurrentMonitoringMax = @@ -2307,10 +2285,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev998.BLOCKIDCURRENTMONITORINGMAX, WithOption.WithEncoding("ASCII")); - long currentMonitoringMax = + int currentMonitoringMax = readSimpleField( "currentMonitoringMax", - readUnsignedLong(readBuffer, 24), + readUnsignedInt(readBuffer, 24), WithOption.WithEncoding("ASCII")); int blockIdCurrentMonitoringValue = @@ -2320,10 +2298,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev998.BLOCKIDCURRENTMONITORINGVALUE, WithOption.WithEncoding("ASCII")); - long currentMonitoringValue = + int currentMonitoringValue = readSimpleField( "currentMonitoringValue", - readUnsignedLong(readBuffer, 24), + readUnsignedInt(readBuffer, 24), WithOption.WithEncoding("ASCII")); int blockIdSelfTapMin = @@ -2333,9 +2311,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev998.BLOCKIDSELFTAPMIN, WithOption.WithEncoding("ASCII")); - BigInteger selfTapMin = + long selfTapMin = readSimpleField( - "selfTapMin", readUnsignedBigInteger(readBuffer, 48), WithOption.WithEncoding("ASCII")); + "selfTapMin", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdSelfTapMax = readConstField( @@ -2344,9 +2322,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev998.BLOCKIDSELFTAPMAX, WithOption.WithEncoding("ASCII")); - BigInteger selfTapMax = + long selfTapMax = readSimpleField( - "selfTapMax", readUnsignedBigInteger(readBuffer, 48), WithOption.WithEncoding("ASCII")); + "selfTapMax", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdSelfTapTorque = readConstField( @@ -2355,11 +2333,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev998.BLOCKIDSELFTAPTORQUE, WithOption.WithEncoding("ASCII")); - BigInteger selfTapTorque = + long selfTapTorque = readSimpleField( - "selfTapTorque", - readUnsignedBigInteger(readBuffer, 48), - WithOption.WithEncoding("ASCII")); + "selfTapTorque", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdPrevailTorqueMonitoringMin = readConstField( @@ -2368,10 +2344,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev998.BLOCKIDPREVAILTORQUEMONITORINGMIN, WithOption.WithEncoding("ASCII")); - BigInteger prevailTorqueMonitoringMin = + long prevailTorqueMonitoringMin = readSimpleField( "prevailTorqueMonitoringMin", - readUnsignedBigInteger(readBuffer, 48), + readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdPrevailTorqueMonitoringMax = @@ -2381,10 +2357,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev998.BLOCKIDPREVAILTORQUEMONITORINGMAX, WithOption.WithEncoding("ASCII")); - BigInteger prevailTorqueMonitoringMax = + long prevailTorqueMonitoringMax = readSimpleField( "prevailTorqueMonitoringMax", - readUnsignedBigInteger(readBuffer, 48), + readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdPrevailTorque = @@ -2394,11 +2370,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev998.BLOCKIDPREVAILTORQUE, WithOption.WithEncoding("ASCII")); - BigInteger prevailTorque = + long prevailTorque = readSimpleField( - "prevailTorque", - readUnsignedBigInteger(readBuffer, 48), - WithOption.WithEncoding("ASCII")); + "prevailTorque", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdTighteningId = readConstField( @@ -2418,10 +2392,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev998.BLOCKIDJOBSEQUENCENUMBER, WithOption.WithEncoding("ASCII")); - BigInteger jobSequenceNumber = + long jobSequenceNumber = readSimpleField( "jobSequenceNumber", - readUnsignedBigInteger(readBuffer, 40), + readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdSyncTighteningId = @@ -2431,11 +2405,9 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev998.BLOCKIDSYNCTIGHTENINGID, WithOption.WithEncoding("ASCII")); - BigInteger syncTighteningId = + long syncTighteningId = readSimpleField( - "syncTighteningId", - readUnsignedBigInteger(readBuffer, 40), - WithOption.WithEncoding("ASCII")); + "syncTighteningId", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdToolSerialNumber = readConstField( @@ -2564,10 +2536,10 @@ public int getLengthInBits() { OpenProtocolMessageLastTighteningResultDataRev998.BLOCKIDPREVAILTORQUECOMPENSATEVALUE, WithOption.WithEncoding("ASCII")); - BigInteger prevailTorqueCompensateValue = + long prevailTorqueCompensateValue = readSimpleField( "prevailTorqueCompensateValue", - readUnsignedBigInteger(readBuffer, 48), + readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdTighteningErrorStatus2 = @@ -2684,7 +2656,7 @@ public static class OpenProtocolMessageLastTighteningResultDataRev998BuilderImpl private final String torqueControllerName; private final String vinNumber; private final long jobId; - private final long parameterSetNumber; + private final int parameterSetNumber; private final Strategy strategy; private final long batchSize; private final long batchCounter; @@ -2697,29 +2669,29 @@ public static class OpenProtocolMessageLastTighteningResultDataRev998BuilderImpl private final Status selfTapStatus; private final Status prevailTorqueMonitoringStatus; private final Status prevailTorqueCompensateStatus; - private final BigInteger torqueMinLimit; - private final BigInteger torqueMaxLimit; - private final BigInteger torqueFinalTarget; - private final BigInteger torque; - private final BigInteger angleMin; - private final BigInteger angleMax; - private final BigInteger finalAngleTarget; - private final BigInteger angle; - private final BigInteger rundownAngleMin; - private final BigInteger rundownAngleMax; - private final BigInteger rundownAngle; - private final long currentMonitoringMin; - private final long currentMonitoringMax; - private final long currentMonitoringValue; - private final BigInteger selfTapMin; - private final BigInteger selfTapMax; - private final BigInteger selfTapTorque; - private final BigInteger prevailTorqueMonitoringMin; - private final BigInteger prevailTorqueMonitoringMax; - private final BigInteger prevailTorque; + private final long torqueMinLimit; + private final long torqueMaxLimit; + private final long torqueFinalTarget; + private final long torque; + private final long angleMin; + private final long angleMax; + private final long finalAngleTarget; + private final long angle; + private final long rundownAngleMin; + private final long rundownAngleMax; + private final long rundownAngle; + private final int currentMonitoringMin; + private final int currentMonitoringMax; + private final int currentMonitoringValue; + private final long selfTapMin; + private final long selfTapMax; + private final long selfTapTorque; + private final long prevailTorqueMonitoringMin; + private final long prevailTorqueMonitoringMax; + private final long prevailTorque; private final String tighteningId; - private final BigInteger jobSequenceNumber; - private final BigInteger syncTighteningId; + private final long jobSequenceNumber; + private final long syncTighteningId; private final String toolSerialNumber; private final String timeStamp; private final String dateTimeOfLastChangeIndParameterSetSettings; @@ -2730,7 +2702,7 @@ public static class OpenProtocolMessageLastTighteningResultDataRev998BuilderImpl private final String identifierResultPart3; private final String identifierResultPart4; private final String customerTighteningError; - private final BigInteger prevailTorqueCompensateValue; + private final long prevailTorqueCompensateValue; private final int numberOfStagesInMultistage; private final List stageResults; @@ -2740,7 +2712,7 @@ public OpenProtocolMessageLastTighteningResultDataRev998BuilderImpl( String torqueControllerName, String vinNumber, long jobId, - long parameterSetNumber, + int parameterSetNumber, Strategy strategy, long batchSize, long batchCounter, @@ -2753,29 +2725,29 @@ public OpenProtocolMessageLastTighteningResultDataRev998BuilderImpl( Status selfTapStatus, Status prevailTorqueMonitoringStatus, Status prevailTorqueCompensateStatus, - BigInteger torqueMinLimit, - BigInteger torqueMaxLimit, - BigInteger torqueFinalTarget, - BigInteger torque, - BigInteger angleMin, - BigInteger angleMax, - BigInteger finalAngleTarget, - BigInteger angle, - BigInteger rundownAngleMin, - BigInteger rundownAngleMax, - BigInteger rundownAngle, - long currentMonitoringMin, - long currentMonitoringMax, - long currentMonitoringValue, - BigInteger selfTapMin, - BigInteger selfTapMax, - BigInteger selfTapTorque, - BigInteger prevailTorqueMonitoringMin, - BigInteger prevailTorqueMonitoringMax, - BigInteger prevailTorque, + long torqueMinLimit, + long torqueMaxLimit, + long torqueFinalTarget, + long torque, + long angleMin, + long angleMax, + long finalAngleTarget, + long angle, + long rundownAngleMin, + long rundownAngleMax, + long rundownAngle, + int currentMonitoringMin, + int currentMonitoringMax, + int currentMonitoringValue, + long selfTapMin, + long selfTapMax, + long selfTapTorque, + long prevailTorqueMonitoringMin, + long prevailTorqueMonitoringMax, + long prevailTorque, String tighteningId, - BigInteger jobSequenceNumber, - BigInteger syncTighteningId, + long jobSequenceNumber, + long syncTighteningId, String toolSerialNumber, String timeStamp, String dateTimeOfLastChangeIndParameterSetSettings, @@ -2786,7 +2758,7 @@ public OpenProtocolMessageLastTighteningResultDataRev998BuilderImpl( String identifierResultPart3, String identifierResultPart4, String customerTighteningError, - BigInteger prevailTorqueCompensateValue, + long prevailTorqueCompensateValue, int numberOfStagesInMultistage, List stageResults) { this.cellId = cellId; @@ -2847,7 +2819,7 @@ public OpenProtocolMessageLastTighteningResultDataRev998BuilderImpl( } public OpenProtocolMessageLastTighteningResultDataRev998 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLastTighteningResultDataRev999Light.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLastTighteningResultDataRev999Light.java index 8be67ca5b5c..a42a010c041 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLastTighteningResultDataRev999Light.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLastTighteningResultDataRev999Light.java @@ -24,7 +24,6 @@ import static org.apache.plc4x.java.spi.codegen.io.DataWriterFactory.*; import static org.apache.plc4x.java.spi.generation.StaticHelper.*; -import java.math.BigInteger; import java.time.*; import java.util.*; import org.apache.plc4x.java.api.exceptions.*; @@ -40,28 +39,28 @@ public class OpenProtocolMessageLastTighteningResultDataRev999Light extends OpenProtocolMessageLastTighteningResultData implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 999; + public Integer getRevision() { + return (int) 999; } // Properties. protected final String vinNumber; protected final int jobId; - protected final long parameterSetId; + protected final int parameterSetId; protected final long batchSize; protected final long batchCounter; protected final BatchStatus batchStatus; protected final NokOk tighteningStatus; protected final Status torqueStatus; protected final Status angleStatus; - protected final BigInteger torque; - protected final BigInteger angle; + protected final long torque; + protected final long angle; protected final String timeStamp; protected final String dateTimeOfLastChangeIndParameterSetSettings; protected final String tighteningId; public OpenProtocolMessageLastTighteningResultDataRev999Light( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -70,15 +69,15 @@ public OpenProtocolMessageLastTighteningResultDataRev999Light( Short messagePartNumber, String vinNumber, int jobId, - long parameterSetId, + int parameterSetId, long batchSize, long batchCounter, BatchStatus batchStatus, NokOk tighteningStatus, Status torqueStatus, Status angleStatus, - BigInteger torque, - BigInteger angle, + long torque, + long angle, String timeStamp, String dateTimeOfLastChangeIndParameterSetSettings, String tighteningId) { @@ -114,7 +113,7 @@ public int getJobId() { return jobId; } - public long getParameterSetId() { + public int getParameterSetId() { return parameterSetId; } @@ -142,11 +141,11 @@ public Status getAngleStatus() { return angleStatus; } - public BigInteger getTorque() { + public long getTorque() { return torque; } - public BigInteger getAngle() { + public long getAngle() { return angle; } @@ -181,7 +180,7 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu writeSimpleField( "parameterSetId", parameterSetId, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); // Simple Field (batchSize) @@ -236,14 +235,11 @@ protected void serializeOpenProtocolMessageLastTighteningResultDataChild(WriteBu // Simple Field (torque) writeSimpleField( - "torque", - torque, - writeUnsignedBigInteger(writeBuffer, 48), - WithOption.WithEncoding("ASCII")); + "torque", torque, writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Simple Field (angle) writeSimpleField( - "angle", angle, writeUnsignedBigInteger(writeBuffer, 40), WithOption.WithEncoding("ASCII")); + "angle", angle, writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Simple Field (timeStamp) writeSimpleField( @@ -324,7 +320,7 @@ public int getLengthInBits() { public static OpenProtocolMessageLastTighteningResultDataBuilder staticParseOpenProtocolMessageLastTighteningResultDataBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageLastTighteningResultDataRev999Light"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -335,9 +331,9 @@ public int getLengthInBits() { int jobId = readSimpleField("jobId", readUnsignedInt(readBuffer, 16), WithOption.WithEncoding("ASCII")); - long parameterSetId = + int parameterSetId = readSimpleField( - "parameterSetId", readUnsignedLong(readBuffer, 24), WithOption.WithEncoding("ASCII")); + "parameterSetId", readUnsignedInt(readBuffer, 24), WithOption.WithEncoding("ASCII")); long batchSize = readSimpleField( @@ -376,13 +372,13 @@ public int getLengthInBits() { new DataReaderEnumDefault<>(Status::enumForValue, readUnsignedShort(readBuffer, 8)), WithOption.WithEncoding("ASCII")); - BigInteger torque = + long torque = readSimpleField( - "torque", readUnsignedBigInteger(readBuffer, 48), WithOption.WithEncoding("ASCII")); + "torque", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); - BigInteger angle = + long angle = readSimpleField( - "angle", readUnsignedBigInteger(readBuffer, 40), WithOption.WithEncoding("ASCII")); + "angle", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); String timeStamp = readSimpleField("timeStamp", readString(readBuffer, 152), WithOption.WithEncoding("ASCII")); @@ -421,15 +417,15 @@ public static class OpenProtocolMessageLastTighteningResultDataRev999LightBuilde .OpenProtocolMessageLastTighteningResultDataBuilder { private final String vinNumber; private final int jobId; - private final long parameterSetId; + private final int parameterSetId; private final long batchSize; private final long batchCounter; private final BatchStatus batchStatus; private final NokOk tighteningStatus; private final Status torqueStatus; private final Status angleStatus; - private final BigInteger torque; - private final BigInteger angle; + private final long torque; + private final long angle; private final String timeStamp; private final String dateTimeOfLastChangeIndParameterSetSettings; private final String tighteningId; @@ -437,15 +433,15 @@ public static class OpenProtocolMessageLastTighteningResultDataRev999LightBuilde public OpenProtocolMessageLastTighteningResultDataRev999LightBuilderImpl( String vinNumber, int jobId, - long parameterSetId, + int parameterSetId, long batchSize, long batchCounter, BatchStatus batchStatus, NokOk tighteningStatus, Status torqueStatus, Status angleStatus, - BigInteger torque, - BigInteger angle, + long torque, + long angle, String timeStamp, String dateTimeOfLastChangeIndParameterSetSettings, String tighteningId) { @@ -467,7 +463,7 @@ public OpenProtocolMessageLastTighteningResultDataRev999LightBuilderImpl( } public OpenProtocolMessageLastTighteningResultDataRev999Light build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLastTighteningResultDataSubscribe.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLastTighteningResultDataSubscribe.java index c9a974ae822..2a6a6360b58 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLastTighteningResultDataSubscribe.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLastTighteningResultDataSubscribe.java @@ -44,10 +44,10 @@ public Mid getMid() { } // Abstract accessors for discriminator values. - public abstract Long getRevision(); + public abstract Integer getRevision(); public OpenProtocolMessageLastTighteningResultDataSubscribe( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -97,14 +97,14 @@ public int getLengthInBits() { } public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageLastTighteningResultDataSubscribe"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) OpenProtocolMessageLastTighteningResultDataSubscribeBuilder builder = null; - if (EvaluationHelper.equals(revision, (long) 1)) { + if (EvaluationHelper.equals(revision, (int) 1)) { builder = OpenProtocolMessageLastTighteningResultDataSubscribeRev1 .staticParseOpenProtocolMessageLastTighteningResultDataSubscribeBuilder( @@ -126,7 +126,7 @@ public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( public interface OpenProtocolMessageLastTighteningResultDataSubscribeBuilder { OpenProtocolMessageLastTighteningResultDataSubscribe build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -145,7 +145,7 @@ public OpenProtocolMessageLastTighteningResultDataSubscribeBuilderImpl( } public OpenProtocolMessageLastTighteningResultDataSubscribe build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLastTighteningResultDataSubscribeRev1.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLastTighteningResultDataSubscribeRev1.java index 1aa987d406b..91cfaf53ea8 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLastTighteningResultDataSubscribeRev1.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLastTighteningResultDataSubscribeRev1.java @@ -39,12 +39,12 @@ public class OpenProtocolMessageLastTighteningResultDataSubscribeRev1 extends OpenProtocolMessageLastTighteningResultDataSubscribe implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 1; + public Integer getRevision() { + return (int) 1; } public OpenProtocolMessageLastTighteningResultDataSubscribeRev1( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -87,7 +87,7 @@ public int getLengthInBits() { public static OpenProtocolMessageLastTighteningResultDataSubscribeBuilder staticParseOpenProtocolMessageLastTighteningResultDataSubscribeBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageLastTighteningResultDataSubscribeRev1"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -104,7 +104,7 @@ public static class OpenProtocolMessageLastTighteningResultDataSubscribeRev1Buil public OpenProtocolMessageLastTighteningResultDataSubscribeRev1BuilderImpl() {} public OpenProtocolMessageLastTighteningResultDataSubscribeRev1 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLinkLevelNegativeAcknowledge.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLinkLevelNegativeAcknowledge.java index fc960b8004d..6a37a08d1db 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLinkLevelNegativeAcknowledge.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLinkLevelNegativeAcknowledge.java @@ -44,10 +44,10 @@ public Mid getMid() { } // Abstract accessors for discriminator values. - public abstract Long getRevision(); + public abstract Integer getRevision(); public OpenProtocolMessageLinkLevelNegativeAcknowledge( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -97,14 +97,14 @@ public int getLengthInBits() { } public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageLinkLevelNegativeAcknowledge"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) OpenProtocolMessageLinkLevelNegativeAcknowledgeBuilder builder = null; - if (EvaluationHelper.equals(revision, (long) 1)) { + if (EvaluationHelper.equals(revision, (int) 1)) { builder = OpenProtocolMessageLinkLevelNegativeAcknowledgeRev1 .staticParseOpenProtocolMessageLinkLevelNegativeAcknowledgeBuilder( @@ -126,7 +126,7 @@ public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( public interface OpenProtocolMessageLinkLevelNegativeAcknowledgeBuilder { OpenProtocolMessageLinkLevelNegativeAcknowledge build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -145,7 +145,7 @@ public OpenProtocolMessageLinkLevelNegativeAcknowledgeBuilderImpl( } public OpenProtocolMessageLinkLevelNegativeAcknowledge build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLinkLevelNegativeAcknowledgeRev1.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLinkLevelNegativeAcknowledgeRev1.java index 125fb2405f4..3a5c88440d3 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLinkLevelNegativeAcknowledgeRev1.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLinkLevelNegativeAcknowledgeRev1.java @@ -39,8 +39,8 @@ public class OpenProtocolMessageLinkLevelNegativeAcknowledgeRev1 extends OpenProtocolMessageLinkLevelNegativeAcknowledge implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 1; + public Integer getRevision() { + return (int) 1; } // Properties. @@ -48,7 +48,7 @@ public Long getRevision() { protected final LinkLevelNegativeAcknowledgeError error; public OpenProtocolMessageLinkLevelNegativeAcknowledgeRev1( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -128,7 +128,7 @@ public int getLengthInBits() { public static OpenProtocolMessageLinkLevelNegativeAcknowledgeBuilder staticParseOpenProtocolMessageLinkLevelNegativeAcknowledgeBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageLinkLevelNegativeAcknowledgeRev1"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -166,7 +166,7 @@ public OpenProtocolMessageLinkLevelNegativeAcknowledgeRev1BuilderImpl( } public OpenProtocolMessageLinkLevelNegativeAcknowledgeRev1 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLinkLevelPositiveAcknowledge.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLinkLevelPositiveAcknowledge.java index 8fe38289d9c..c2ec62b0eee 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLinkLevelPositiveAcknowledge.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLinkLevelPositiveAcknowledge.java @@ -44,10 +44,10 @@ public Mid getMid() { } // Abstract accessors for discriminator values. - public abstract Long getRevision(); + public abstract Integer getRevision(); public OpenProtocolMessageLinkLevelPositiveAcknowledge( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -97,14 +97,14 @@ public int getLengthInBits() { } public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageLinkLevelPositiveAcknowledge"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) OpenProtocolMessageLinkLevelPositiveAcknowledgeBuilder builder = null; - if (EvaluationHelper.equals(revision, (long) 1)) { + if (EvaluationHelper.equals(revision, (int) 1)) { builder = OpenProtocolMessageLinkLevelPositiveAcknowledgeRev1 .staticParseOpenProtocolMessageLinkLevelPositiveAcknowledgeBuilder( @@ -126,7 +126,7 @@ public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( public interface OpenProtocolMessageLinkLevelPositiveAcknowledgeBuilder { OpenProtocolMessageLinkLevelPositiveAcknowledge build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -145,7 +145,7 @@ public OpenProtocolMessageLinkLevelPositiveAcknowledgeBuilderImpl( } public OpenProtocolMessageLinkLevelPositiveAcknowledge build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLinkLevelPositiveAcknowledgeRev1.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLinkLevelPositiveAcknowledgeRev1.java index 85940f55427..753218e2131 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLinkLevelPositiveAcknowledgeRev1.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLinkLevelPositiveAcknowledgeRev1.java @@ -39,15 +39,15 @@ public class OpenProtocolMessageLinkLevelPositiveAcknowledgeRev1 extends OpenProtocolMessageLinkLevelPositiveAcknowledge implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 1; + public Integer getRevision() { + return (int) 1; } // Properties. protected final Mid midNumber; public OpenProtocolMessageLinkLevelPositiveAcknowledgeRev1( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -107,7 +107,7 @@ public int getLengthInBits() { public static OpenProtocolMessageLinkLevelPositiveAcknowledgeBuilder staticParseOpenProtocolMessageLinkLevelPositiveAcknowledgeBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageLinkLevelPositiveAcknowledgeRev1"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -134,7 +134,7 @@ public OpenProtocolMessageLinkLevelPositiveAcknowledgeRev1BuilderImpl(Mid midNum } public OpenProtocolMessageLinkLevelPositiveAcknowledgeRev1 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLockAtBatchDoneSubscribe.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLockAtBatchDoneSubscribe.java index f2b73ab357e..06fca538ff6 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLockAtBatchDoneSubscribe.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLockAtBatchDoneSubscribe.java @@ -44,10 +44,10 @@ public Mid getMid() { } // Abstract accessors for discriminator values. - public abstract Long getRevision(); + public abstract Integer getRevision(); public OpenProtocolMessageLockAtBatchDoneSubscribe( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -97,14 +97,14 @@ public int getLengthInBits() { } public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageLockAtBatchDoneSubscribe"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) OpenProtocolMessageLockAtBatchDoneSubscribeBuilder builder = null; - if (EvaluationHelper.equals(revision, (long) 1)) { + if (EvaluationHelper.equals(revision, (int) 1)) { builder = OpenProtocolMessageLockAtBatchDoneSubscribeRev1 .staticParseOpenProtocolMessageLockAtBatchDoneSubscribeBuilder(readBuffer, revision); @@ -125,7 +125,7 @@ public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( public interface OpenProtocolMessageLockAtBatchDoneSubscribeBuilder { OpenProtocolMessageLockAtBatchDoneSubscribe build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -144,7 +144,7 @@ public OpenProtocolMessageLockAtBatchDoneSubscribeBuilderImpl( } public OpenProtocolMessageLockAtBatchDoneSubscribe build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLockAtBatchDoneSubscribeRev1.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLockAtBatchDoneSubscribeRev1.java index 8ea6aa22c3a..4131145a026 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLockAtBatchDoneSubscribeRev1.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLockAtBatchDoneSubscribeRev1.java @@ -39,12 +39,12 @@ public class OpenProtocolMessageLockAtBatchDoneSubscribeRev1 extends OpenProtocolMessageLockAtBatchDoneSubscribe implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 1; + public Integer getRevision() { + return (int) 1; } public OpenProtocolMessageLockAtBatchDoneSubscribeRev1( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -87,7 +87,7 @@ public int getLengthInBits() { public static OpenProtocolMessageLockAtBatchDoneSubscribeBuilder staticParseOpenProtocolMessageLockAtBatchDoneSubscribeBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageLockAtBatchDoneSubscribeRev1"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -104,7 +104,7 @@ public static class OpenProtocolMessageLockAtBatchDoneSubscribeRev1BuilderImpl public OpenProtocolMessageLockAtBatchDoneSubscribeRev1BuilderImpl() {} public OpenProtocolMessageLockAtBatchDoneSubscribeRev1 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLockAtBatchDoneUnsubscribe.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLockAtBatchDoneUnsubscribe.java index d595cc5c67b..dc4ffc93d3a 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLockAtBatchDoneUnsubscribe.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLockAtBatchDoneUnsubscribe.java @@ -44,10 +44,10 @@ public Mid getMid() { } // Abstract accessors for discriminator values. - public abstract Long getRevision(); + public abstract Integer getRevision(); public OpenProtocolMessageLockAtBatchDoneUnsubscribe( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -97,14 +97,14 @@ public int getLengthInBits() { } public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageLockAtBatchDoneUnsubscribe"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) OpenProtocolMessageLockAtBatchDoneUnsubscribeBuilder builder = null; - if (EvaluationHelper.equals(revision, (long) 1)) { + if (EvaluationHelper.equals(revision, (int) 1)) { builder = OpenProtocolMessageLockAtBatchDoneUnsubscribeRev1 .staticParseOpenProtocolMessageLockAtBatchDoneUnsubscribeBuilder( @@ -126,7 +126,7 @@ public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( public interface OpenProtocolMessageLockAtBatchDoneUnsubscribeBuilder { OpenProtocolMessageLockAtBatchDoneUnsubscribe build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -145,7 +145,7 @@ public OpenProtocolMessageLockAtBatchDoneUnsubscribeBuilderImpl( } public OpenProtocolMessageLockAtBatchDoneUnsubscribe build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLockAtBatchDoneUnsubscribeRev1.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLockAtBatchDoneUnsubscribeRev1.java index 9bfbfcd019f..350616e80ff 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLockAtBatchDoneUnsubscribeRev1.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLockAtBatchDoneUnsubscribeRev1.java @@ -39,12 +39,12 @@ public class OpenProtocolMessageLockAtBatchDoneUnsubscribeRev1 extends OpenProtocolMessageLockAtBatchDoneUnsubscribe implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 1; + public Integer getRevision() { + return (int) 1; } public OpenProtocolMessageLockAtBatchDoneUnsubscribeRev1( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -87,7 +87,7 @@ public int getLengthInBits() { public static OpenProtocolMessageLockAtBatchDoneUnsubscribeBuilder staticParseOpenProtocolMessageLockAtBatchDoneUnsubscribeBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageLockAtBatchDoneUnsubscribeRev1"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -104,7 +104,7 @@ public static class OpenProtocolMessageLockAtBatchDoneUnsubscribeRev1BuilderImpl public OpenProtocolMessageLockAtBatchDoneUnsubscribeRev1BuilderImpl() {} public OpenProtocolMessageLockAtBatchDoneUnsubscribeRev1 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLockAtBatchDoneUpload.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLockAtBatchDoneUpload.java index c4c26ed04b1..941f4fe40ef 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLockAtBatchDoneUpload.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLockAtBatchDoneUpload.java @@ -44,10 +44,10 @@ public Mid getMid() { } // Abstract accessors for discriminator values. - public abstract Long getRevision(); + public abstract Integer getRevision(); public OpenProtocolMessageLockAtBatchDoneUpload( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -97,14 +97,14 @@ public int getLengthInBits() { } public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageLockAtBatchDoneUpload"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) OpenProtocolMessageLockAtBatchDoneUploadBuilder builder = null; - if (EvaluationHelper.equals(revision, (long) 1)) { + if (EvaluationHelper.equals(revision, (int) 1)) { builder = OpenProtocolMessageLockAtBatchDoneUploadRev1 .staticParseOpenProtocolMessageLockAtBatchDoneUploadBuilder(readBuffer, revision); @@ -125,7 +125,7 @@ public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( public interface OpenProtocolMessageLockAtBatchDoneUploadBuilder { OpenProtocolMessageLockAtBatchDoneUpload build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -144,7 +144,7 @@ public OpenProtocolMessageLockAtBatchDoneUploadBuilderImpl( } public OpenProtocolMessageLockAtBatchDoneUpload build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLockAtBatchDoneUploadAcknowledge.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLockAtBatchDoneUploadAcknowledge.java index 96ad99db9f9..a2afe047dc6 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLockAtBatchDoneUploadAcknowledge.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLockAtBatchDoneUploadAcknowledge.java @@ -44,10 +44,10 @@ public Mid getMid() { } // Abstract accessors for discriminator values. - public abstract Long getRevision(); + public abstract Integer getRevision(); public OpenProtocolMessageLockAtBatchDoneUploadAcknowledge( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -97,14 +97,14 @@ public int getLengthInBits() { } public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageLockAtBatchDoneUploadAcknowledge"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) OpenProtocolMessageLockAtBatchDoneUploadAcknowledgeBuilder builder = null; - if (EvaluationHelper.equals(revision, (long) 1)) { + if (EvaluationHelper.equals(revision, (int) 1)) { builder = OpenProtocolMessageLockAtBatchDoneUploadAcknowledgeRev1 .staticParseOpenProtocolMessageLockAtBatchDoneUploadAcknowledgeBuilder( @@ -126,7 +126,7 @@ public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( public interface OpenProtocolMessageLockAtBatchDoneUploadAcknowledgeBuilder { OpenProtocolMessageLockAtBatchDoneUploadAcknowledge build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -145,7 +145,7 @@ public OpenProtocolMessageLockAtBatchDoneUploadAcknowledgeBuilderImpl( } public OpenProtocolMessageLockAtBatchDoneUploadAcknowledge build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLockAtBatchDoneUploadAcknowledgeRev1.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLockAtBatchDoneUploadAcknowledgeRev1.java index f937d3add5d..5594dd697ed 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLockAtBatchDoneUploadAcknowledgeRev1.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLockAtBatchDoneUploadAcknowledgeRev1.java @@ -39,12 +39,12 @@ public class OpenProtocolMessageLockAtBatchDoneUploadAcknowledgeRev1 extends OpenProtocolMessageLockAtBatchDoneUploadAcknowledge implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 1; + public Integer getRevision() { + return (int) 1; } public OpenProtocolMessageLockAtBatchDoneUploadAcknowledgeRev1( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -87,7 +87,7 @@ public int getLengthInBits() { public static OpenProtocolMessageLockAtBatchDoneUploadAcknowledgeBuilder staticParseOpenProtocolMessageLockAtBatchDoneUploadAcknowledgeBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageLockAtBatchDoneUploadAcknowledgeRev1"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -104,7 +104,7 @@ public static class OpenProtocolMessageLockAtBatchDoneUploadAcknowledgeRev1Build public OpenProtocolMessageLockAtBatchDoneUploadAcknowledgeRev1BuilderImpl() {} public OpenProtocolMessageLockAtBatchDoneUploadAcknowledgeRev1 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLockAtBatchDoneUploadRev1.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLockAtBatchDoneUploadRev1.java index 9762ebe1fd2..0160c7c2e17 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLockAtBatchDoneUploadRev1.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageLockAtBatchDoneUploadRev1.java @@ -39,15 +39,15 @@ public class OpenProtocolMessageLockAtBatchDoneUploadRev1 extends OpenProtocolMessageLockAtBatchDoneUpload implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 1; + public Integer getRevision() { + return (int) 1; } // Properties. protected final short relayStatus; public OpenProtocolMessageLockAtBatchDoneUploadRev1( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -106,7 +106,7 @@ public int getLengthInBits() { public static OpenProtocolMessageLockAtBatchDoneUploadBuilder staticParseOpenProtocolMessageLockAtBatchDoneUploadBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageLockAtBatchDoneUploadRev1"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -130,7 +130,7 @@ public OpenProtocolMessageLockAtBatchDoneUploadRev1BuilderImpl(short relayStatus } public OpenProtocolMessageLockAtBatchDoneUploadRev1 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetDataUploadReply.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetDataUploadReply.java index 414e0db914d..e6616e42aa2 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetDataUploadReply.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetDataUploadReply.java @@ -44,10 +44,10 @@ public Mid getMid() { } // Abstract accessors for discriminator values. - public abstract Long getRevision(); + public abstract Integer getRevision(); public OpenProtocolMessageParameterSetDataUploadReply( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -97,19 +97,19 @@ public int getLengthInBits() { } public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageParameterSetDataUploadReply"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) OpenProtocolMessageParameterSetDataUploadReplyBuilder builder = null; - if (EvaluationHelper.equals(revision, (long) 1)) { + if (EvaluationHelper.equals(revision, (int) 1)) { builder = OpenProtocolMessageParameterSetDataUploadReplyRev1 .staticParseOpenProtocolMessageParameterSetDataUploadReplyBuilder( readBuffer, revision); - } else if (EvaluationHelper.equals(revision, (long) 2)) { + } else if (EvaluationHelper.equals(revision, (int) 2)) { builder = OpenProtocolMessageParameterSetDataUploadReplyRev2 .staticParseOpenProtocolMessageParameterSetDataUploadReplyBuilder( @@ -131,7 +131,7 @@ public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( public interface OpenProtocolMessageParameterSetDataUploadReplyBuilder { OpenProtocolMessageParameterSetDataUploadReply build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -150,7 +150,7 @@ public OpenProtocolMessageParameterSetDataUploadReplyBuilderImpl( } public OpenProtocolMessageParameterSetDataUploadReply build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetDataUploadReplyRev1.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetDataUploadReplyRev1.java index da0480b2e45..b7b73bb148b 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetDataUploadReplyRev1.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetDataUploadReplyRev1.java @@ -24,7 +24,6 @@ import static org.apache.plc4x.java.spi.codegen.io.DataWriterFactory.*; import static org.apache.plc4x.java.spi.generation.StaticHelper.*; -import java.math.BigInteger; import java.time.*; import java.util.*; import org.apache.plc4x.java.api.exceptions.*; @@ -40,8 +39,8 @@ public class OpenProtocolMessageParameterSetDataUploadReplyRev1 extends OpenProtocolMessageParameterSetDataUploadReply implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 1; + public Integer getRevision() { + return (int) 1; } // Constant values. @@ -57,35 +56,35 @@ public Long getRevision() { public static final Integer BLOCKIDFINALANGLETARGET = 10; // Properties. - protected final long parameterSetId; + protected final int parameterSetId; protected final String parameterSetName; protected final RotationDirection rotationDirection; protected final int batchSize; - protected final BigInteger torqueMin; - protected final BigInteger torqueMax; - protected final BigInteger torqueFinalTarget; - protected final BigInteger angleMin; - protected final BigInteger angleMax; - protected final BigInteger finalAngleTarget; + protected final long torqueMin; + protected final long torqueMax; + protected final long torqueFinalTarget; + protected final long angleMin; + protected final long angleMax; + protected final long finalAngleTarget; public OpenProtocolMessageParameterSetDataUploadReplyRev1( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, Integer sequenceNumber, Short numberOfMessageParts, Short messagePartNumber, - long parameterSetId, + int parameterSetId, String parameterSetName, RotationDirection rotationDirection, int batchSize, - BigInteger torqueMin, - BigInteger torqueMax, - BigInteger torqueFinalTarget, - BigInteger angleMin, - BigInteger angleMax, - BigInteger finalAngleTarget) { + long torqueMin, + long torqueMax, + long torqueFinalTarget, + long angleMin, + long angleMax, + long finalAngleTarget) { super( midRevision, noAckFlag, @@ -106,7 +105,7 @@ public OpenProtocolMessageParameterSetDataUploadReplyRev1( this.finalAngleTarget = finalAngleTarget; } - public long getParameterSetId() { + public int getParameterSetId() { return parameterSetId; } @@ -122,27 +121,27 @@ public int getBatchSize() { return batchSize; } - public BigInteger getTorqueMin() { + public long getTorqueMin() { return torqueMin; } - public BigInteger getTorqueMax() { + public long getTorqueMax() { return torqueMax; } - public BigInteger getTorqueFinalTarget() { + public long getTorqueFinalTarget() { return torqueFinalTarget; } - public BigInteger getAngleMin() { + public long getAngleMin() { return angleMin; } - public BigInteger getAngleMax() { + public long getAngleMax() { return angleMax; } - public BigInteger getFinalAngleTarget() { + public long getFinalAngleTarget() { return finalAngleTarget; } @@ -204,7 +203,7 @@ protected void serializeOpenProtocolMessageParameterSetDataUploadReplyChild( writeSimpleField( "parameterSetId", parameterSetId, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); // Const Field (blockIdParameterSetName) @@ -264,7 +263,7 @@ protected void serializeOpenProtocolMessageParameterSetDataUploadReplyChild( writeSimpleField( "torqueMin", torqueMin, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdTorqueMax) @@ -278,7 +277,7 @@ protected void serializeOpenProtocolMessageParameterSetDataUploadReplyChild( writeSimpleField( "torqueMax", torqueMax, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdTorqueFinalTarget) @@ -292,7 +291,7 @@ protected void serializeOpenProtocolMessageParameterSetDataUploadReplyChild( writeSimpleField( "torqueFinalTarget", torqueFinalTarget, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdAngleMin) @@ -304,10 +303,7 @@ protected void serializeOpenProtocolMessageParameterSetDataUploadReplyChild( // Simple Field (angleMin) writeSimpleField( - "angleMin", - angleMin, - writeUnsignedBigInteger(writeBuffer, 40), - WithOption.WithEncoding("ASCII")); + "angleMin", angleMin, writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdAngleMax) writeConstField( @@ -318,10 +314,7 @@ protected void serializeOpenProtocolMessageParameterSetDataUploadReplyChild( // Simple Field (angleMax) writeSimpleField( - "angleMax", - angleMax, - writeUnsignedBigInteger(writeBuffer, 40), - WithOption.WithEncoding("ASCII")); + "angleMax", angleMax, writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdFinalAngleTarget) writeConstField( @@ -334,7 +327,7 @@ protected void serializeOpenProtocolMessageParameterSetDataUploadReplyChild( writeSimpleField( "finalAngleTarget", finalAngleTarget, - writeUnsignedBigInteger(writeBuffer, 40), + writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); writeBuffer.popContext("OpenProtocolMessageParameterSetDataUploadReplyRev1"); @@ -416,7 +409,7 @@ public int getLengthInBits() { public static OpenProtocolMessageParameterSetDataUploadReplyBuilder staticParseOpenProtocolMessageParameterSetDataUploadReplyBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageParameterSetDataUploadReplyRev1"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -428,9 +421,9 @@ public int getLengthInBits() { OpenProtocolMessageParameterSetDataUploadReplyRev1.BLOCKIDPARAMETERSETID, WithOption.WithEncoding("ASCII")); - long parameterSetId = + int parameterSetId = readSimpleField( - "parameterSetId", readUnsignedLong(readBuffer, 24), WithOption.WithEncoding("ASCII")); + "parameterSetId", readUnsignedInt(readBuffer, 24), WithOption.WithEncoding("ASCII")); int blockIdParameterSetName = readConstField( @@ -476,9 +469,9 @@ public int getLengthInBits() { OpenProtocolMessageParameterSetDataUploadReplyRev1.BLOCKIDTORQUEMIN, WithOption.WithEncoding("ASCII")); - BigInteger torqueMin = + long torqueMin = readSimpleField( - "torqueMin", readUnsignedBigInteger(readBuffer, 48), WithOption.WithEncoding("ASCII")); + "torqueMin", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdTorqueMax = readConstField( @@ -487,9 +480,9 @@ public int getLengthInBits() { OpenProtocolMessageParameterSetDataUploadReplyRev1.BLOCKIDTORQUEMAX, WithOption.WithEncoding("ASCII")); - BigInteger torqueMax = + long torqueMax = readSimpleField( - "torqueMax", readUnsignedBigInteger(readBuffer, 48), WithOption.WithEncoding("ASCII")); + "torqueMax", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdTorqueFinalTarget = readConstField( @@ -498,10 +491,10 @@ public int getLengthInBits() { OpenProtocolMessageParameterSetDataUploadReplyRev1.BLOCKIDTORQUEFINALTARGET, WithOption.WithEncoding("ASCII")); - BigInteger torqueFinalTarget = + long torqueFinalTarget = readSimpleField( "torqueFinalTarget", - readUnsignedBigInteger(readBuffer, 48), + readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdAngleMin = @@ -511,9 +504,9 @@ public int getLengthInBits() { OpenProtocolMessageParameterSetDataUploadReplyRev1.BLOCKIDANGLEMIN, WithOption.WithEncoding("ASCII")); - BigInteger angleMin = + long angleMin = readSimpleField( - "angleMin", readUnsignedBigInteger(readBuffer, 40), WithOption.WithEncoding("ASCII")); + "angleMin", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdAngleMax = readConstField( @@ -522,9 +515,9 @@ public int getLengthInBits() { OpenProtocolMessageParameterSetDataUploadReplyRev1.BLOCKIDANGLEMAX, WithOption.WithEncoding("ASCII")); - BigInteger angleMax = + long angleMax = readSimpleField( - "angleMax", readUnsignedBigInteger(readBuffer, 40), WithOption.WithEncoding("ASCII")); + "angleMax", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdFinalAngleTarget = readConstField( @@ -533,11 +526,9 @@ public int getLengthInBits() { OpenProtocolMessageParameterSetDataUploadReplyRev1.BLOCKIDFINALANGLETARGET, WithOption.WithEncoding("ASCII")); - BigInteger finalAngleTarget = + long finalAngleTarget = readSimpleField( - "finalAngleTarget", - readUnsignedBigInteger(readBuffer, 40), - WithOption.WithEncoding("ASCII")); + "finalAngleTarget", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); readBuffer.closeContext("OpenProtocolMessageParameterSetDataUploadReplyRev1"); // Create the instance @@ -557,28 +548,28 @@ public int getLengthInBits() { public static class OpenProtocolMessageParameterSetDataUploadReplyRev1BuilderImpl implements OpenProtocolMessageParameterSetDataUploadReply .OpenProtocolMessageParameterSetDataUploadReplyBuilder { - private final long parameterSetId; + private final int parameterSetId; private final String parameterSetName; private final RotationDirection rotationDirection; private final int batchSize; - private final BigInteger torqueMin; - private final BigInteger torqueMax; - private final BigInteger torqueFinalTarget; - private final BigInteger angleMin; - private final BigInteger angleMax; - private final BigInteger finalAngleTarget; + private final long torqueMin; + private final long torqueMax; + private final long torqueFinalTarget; + private final long angleMin; + private final long angleMax; + private final long finalAngleTarget; public OpenProtocolMessageParameterSetDataUploadReplyRev1BuilderImpl( - long parameterSetId, + int parameterSetId, String parameterSetName, RotationDirection rotationDirection, int batchSize, - BigInteger torqueMin, - BigInteger torqueMax, - BigInteger torqueFinalTarget, - BigInteger angleMin, - BigInteger angleMax, - BigInteger finalAngleTarget) { + long torqueMin, + long torqueMax, + long torqueFinalTarget, + long angleMin, + long angleMax, + long finalAngleTarget) { this.parameterSetId = parameterSetId; this.parameterSetName = parameterSetName; this.rotationDirection = rotationDirection; @@ -592,7 +583,7 @@ public OpenProtocolMessageParameterSetDataUploadReplyRev1BuilderImpl( } public OpenProtocolMessageParameterSetDataUploadReplyRev1 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetDataUploadReplyRev2.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetDataUploadReplyRev2.java index ee4d5989ad6..04a2353c0a3 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetDataUploadReplyRev2.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetDataUploadReplyRev2.java @@ -24,7 +24,6 @@ import static org.apache.plc4x.java.spi.codegen.io.DataWriterFactory.*; import static org.apache.plc4x.java.spi.generation.StaticHelper.*; -import java.math.BigInteger; import java.time.*; import java.util.*; import org.apache.plc4x.java.api.exceptions.*; @@ -40,8 +39,8 @@ public class OpenProtocolMessageParameterSetDataUploadReplyRev2 extends OpenProtocolMessageParameterSetDataUploadReply implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 2; + public Integer getRevision() { + return (int) 2; } // Constant values. @@ -59,39 +58,39 @@ public Long getRevision() { public static final Integer BLOCKIDSTARTFINALANGLE = 12; // Properties. - protected final long parameterSetId; + protected final int parameterSetId; protected final String parameterSetName; protected final RotationDirection rotationDirection; protected final int batchSize; - protected final BigInteger torqueMin; - protected final BigInteger torqueMax; - protected final BigInteger torqueFinalTarget; - protected final BigInteger angleMin; - protected final BigInteger angleMax; - protected final BigInteger finalAngleTarget; - protected final BigInteger firstTarget; - protected final BigInteger startFinalAngle; + protected final long torqueMin; + protected final long torqueMax; + protected final long torqueFinalTarget; + protected final long angleMin; + protected final long angleMax; + protected final long finalAngleTarget; + protected final long firstTarget; + protected final long startFinalAngle; public OpenProtocolMessageParameterSetDataUploadReplyRev2( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, Integer sequenceNumber, Short numberOfMessageParts, Short messagePartNumber, - long parameterSetId, + int parameterSetId, String parameterSetName, RotationDirection rotationDirection, int batchSize, - BigInteger torqueMin, - BigInteger torqueMax, - BigInteger torqueFinalTarget, - BigInteger angleMin, - BigInteger angleMax, - BigInteger finalAngleTarget, - BigInteger firstTarget, - BigInteger startFinalAngle) { + long torqueMin, + long torqueMax, + long torqueFinalTarget, + long angleMin, + long angleMax, + long finalAngleTarget, + long firstTarget, + long startFinalAngle) { super( midRevision, noAckFlag, @@ -114,7 +113,7 @@ public OpenProtocolMessageParameterSetDataUploadReplyRev2( this.startFinalAngle = startFinalAngle; } - public long getParameterSetId() { + public int getParameterSetId() { return parameterSetId; } @@ -130,35 +129,35 @@ public int getBatchSize() { return batchSize; } - public BigInteger getTorqueMin() { + public long getTorqueMin() { return torqueMin; } - public BigInteger getTorqueMax() { + public long getTorqueMax() { return torqueMax; } - public BigInteger getTorqueFinalTarget() { + public long getTorqueFinalTarget() { return torqueFinalTarget; } - public BigInteger getAngleMin() { + public long getAngleMin() { return angleMin; } - public BigInteger getAngleMax() { + public long getAngleMax() { return angleMax; } - public BigInteger getFinalAngleTarget() { + public long getFinalAngleTarget() { return finalAngleTarget; } - public BigInteger getFirstTarget() { + public long getFirstTarget() { return firstTarget; } - public BigInteger getStartFinalAngle() { + public long getStartFinalAngle() { return startFinalAngle; } @@ -228,7 +227,7 @@ protected void serializeOpenProtocolMessageParameterSetDataUploadReplyChild( writeSimpleField( "parameterSetId", parameterSetId, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); // Const Field (blockIdParameterSetName) @@ -288,7 +287,7 @@ protected void serializeOpenProtocolMessageParameterSetDataUploadReplyChild( writeSimpleField( "torqueMin", torqueMin, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdTorqueMax) @@ -302,7 +301,7 @@ protected void serializeOpenProtocolMessageParameterSetDataUploadReplyChild( writeSimpleField( "torqueMax", torqueMax, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdTorqueFinalTarget) @@ -316,7 +315,7 @@ protected void serializeOpenProtocolMessageParameterSetDataUploadReplyChild( writeSimpleField( "torqueFinalTarget", torqueFinalTarget, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdAngleMin) @@ -328,10 +327,7 @@ protected void serializeOpenProtocolMessageParameterSetDataUploadReplyChild( // Simple Field (angleMin) writeSimpleField( - "angleMin", - angleMin, - writeUnsignedBigInteger(writeBuffer, 40), - WithOption.WithEncoding("ASCII")); + "angleMin", angleMin, writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdAngleMax) writeConstField( @@ -342,10 +338,7 @@ protected void serializeOpenProtocolMessageParameterSetDataUploadReplyChild( // Simple Field (angleMax) writeSimpleField( - "angleMax", - angleMax, - writeUnsignedBigInteger(writeBuffer, 40), - WithOption.WithEncoding("ASCII")); + "angleMax", angleMax, writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdFinalAngleTarget) writeConstField( @@ -358,7 +351,7 @@ protected void serializeOpenProtocolMessageParameterSetDataUploadReplyChild( writeSimpleField( "finalAngleTarget", finalAngleTarget, - writeUnsignedBigInteger(writeBuffer, 40), + writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdFirstTarget) @@ -372,7 +365,7 @@ protected void serializeOpenProtocolMessageParameterSetDataUploadReplyChild( writeSimpleField( "firstTarget", firstTarget, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdStartFinalAngle) @@ -386,7 +379,7 @@ protected void serializeOpenProtocolMessageParameterSetDataUploadReplyChild( writeSimpleField( "startFinalAngle", startFinalAngle, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); writeBuffer.popContext("OpenProtocolMessageParameterSetDataUploadReplyRev2"); @@ -480,7 +473,7 @@ public int getLengthInBits() { public static OpenProtocolMessageParameterSetDataUploadReplyBuilder staticParseOpenProtocolMessageParameterSetDataUploadReplyBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageParameterSetDataUploadReplyRev2"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -492,9 +485,9 @@ public int getLengthInBits() { OpenProtocolMessageParameterSetDataUploadReplyRev2.BLOCKIDPARAMETERSETID, WithOption.WithEncoding("ASCII")); - long parameterSetId = + int parameterSetId = readSimpleField( - "parameterSetId", readUnsignedLong(readBuffer, 24), WithOption.WithEncoding("ASCII")); + "parameterSetId", readUnsignedInt(readBuffer, 24), WithOption.WithEncoding("ASCII")); int blockIdParameterSetName = readConstField( @@ -540,9 +533,9 @@ public int getLengthInBits() { OpenProtocolMessageParameterSetDataUploadReplyRev2.BLOCKIDTORQUEMIN, WithOption.WithEncoding("ASCII")); - BigInteger torqueMin = + long torqueMin = readSimpleField( - "torqueMin", readUnsignedBigInteger(readBuffer, 48), WithOption.WithEncoding("ASCII")); + "torqueMin", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdTorqueMax = readConstField( @@ -551,9 +544,9 @@ public int getLengthInBits() { OpenProtocolMessageParameterSetDataUploadReplyRev2.BLOCKIDTORQUEMAX, WithOption.WithEncoding("ASCII")); - BigInteger torqueMax = + long torqueMax = readSimpleField( - "torqueMax", readUnsignedBigInteger(readBuffer, 48), WithOption.WithEncoding("ASCII")); + "torqueMax", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdTorqueFinalTarget = readConstField( @@ -562,10 +555,10 @@ public int getLengthInBits() { OpenProtocolMessageParameterSetDataUploadReplyRev2.BLOCKIDTORQUEFINALTARGET, WithOption.WithEncoding("ASCII")); - BigInteger torqueFinalTarget = + long torqueFinalTarget = readSimpleField( "torqueFinalTarget", - readUnsignedBigInteger(readBuffer, 48), + readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdAngleMin = @@ -575,9 +568,9 @@ public int getLengthInBits() { OpenProtocolMessageParameterSetDataUploadReplyRev2.BLOCKIDANGLEMIN, WithOption.WithEncoding("ASCII")); - BigInteger angleMin = + long angleMin = readSimpleField( - "angleMin", readUnsignedBigInteger(readBuffer, 40), WithOption.WithEncoding("ASCII")); + "angleMin", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdAngleMax = readConstField( @@ -586,9 +579,9 @@ public int getLengthInBits() { OpenProtocolMessageParameterSetDataUploadReplyRev2.BLOCKIDANGLEMAX, WithOption.WithEncoding("ASCII")); - BigInteger angleMax = + long angleMax = readSimpleField( - "angleMax", readUnsignedBigInteger(readBuffer, 40), WithOption.WithEncoding("ASCII")); + "angleMax", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdFinalAngleTarget = readConstField( @@ -597,11 +590,9 @@ public int getLengthInBits() { OpenProtocolMessageParameterSetDataUploadReplyRev2.BLOCKIDFINALANGLETARGET, WithOption.WithEncoding("ASCII")); - BigInteger finalAngleTarget = + long finalAngleTarget = readSimpleField( - "finalAngleTarget", - readUnsignedBigInteger(readBuffer, 40), - WithOption.WithEncoding("ASCII")); + "finalAngleTarget", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdFirstTarget = readConstField( @@ -610,11 +601,9 @@ public int getLengthInBits() { OpenProtocolMessageParameterSetDataUploadReplyRev2.BLOCKIDFIRSTTARGET, WithOption.WithEncoding("ASCII")); - BigInteger firstTarget = + long firstTarget = readSimpleField( - "firstTarget", - readUnsignedBigInteger(readBuffer, 48), - WithOption.WithEncoding("ASCII")); + "firstTarget", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdStartFinalAngle = readConstField( @@ -623,11 +612,9 @@ public int getLengthInBits() { OpenProtocolMessageParameterSetDataUploadReplyRev2.BLOCKIDSTARTFINALANGLE, WithOption.WithEncoding("ASCII")); - BigInteger startFinalAngle = + long startFinalAngle = readSimpleField( - "startFinalAngle", - readUnsignedBigInteger(readBuffer, 48), - WithOption.WithEncoding("ASCII")); + "startFinalAngle", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); readBuffer.closeContext("OpenProtocolMessageParameterSetDataUploadReplyRev2"); // Create the instance @@ -649,32 +636,32 @@ public int getLengthInBits() { public static class OpenProtocolMessageParameterSetDataUploadReplyRev2BuilderImpl implements OpenProtocolMessageParameterSetDataUploadReply .OpenProtocolMessageParameterSetDataUploadReplyBuilder { - private final long parameterSetId; + private final int parameterSetId; private final String parameterSetName; private final RotationDirection rotationDirection; private final int batchSize; - private final BigInteger torqueMin; - private final BigInteger torqueMax; - private final BigInteger torqueFinalTarget; - private final BigInteger angleMin; - private final BigInteger angleMax; - private final BigInteger finalAngleTarget; - private final BigInteger firstTarget; - private final BigInteger startFinalAngle; + private final long torqueMin; + private final long torqueMax; + private final long torqueFinalTarget; + private final long angleMin; + private final long angleMax; + private final long finalAngleTarget; + private final long firstTarget; + private final long startFinalAngle; public OpenProtocolMessageParameterSetDataUploadReplyRev2BuilderImpl( - long parameterSetId, + int parameterSetId, String parameterSetName, RotationDirection rotationDirection, int batchSize, - BigInteger torqueMin, - BigInteger torqueMax, - BigInteger torqueFinalTarget, - BigInteger angleMin, - BigInteger angleMax, - BigInteger finalAngleTarget, - BigInteger firstTarget, - BigInteger startFinalAngle) { + long torqueMin, + long torqueMax, + long torqueFinalTarget, + long angleMin, + long angleMax, + long finalAngleTarget, + long firstTarget, + long startFinalAngle) { this.parameterSetId = parameterSetId; this.parameterSetName = parameterSetName; this.rotationDirection = rotationDirection; @@ -690,7 +677,7 @@ public OpenProtocolMessageParameterSetDataUploadReplyRev2BuilderImpl( } public OpenProtocolMessageParameterSetDataUploadReplyRev2 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetDataUploadRequest.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetDataUploadRequest.java index 14b87e4e8cb..286ba729387 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetDataUploadRequest.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetDataUploadRequest.java @@ -44,10 +44,10 @@ public Mid getMid() { } // Abstract accessors for discriminator values. - public abstract Long getRevision(); + public abstract Integer getRevision(); public OpenProtocolMessageParameterSetDataUploadRequest( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -97,19 +97,19 @@ public int getLengthInBits() { } public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageParameterSetDataUploadRequest"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) OpenProtocolMessageParameterSetDataUploadRequestBuilder builder = null; - if (EvaluationHelper.equals(revision, (long) 1)) { + if (EvaluationHelper.equals(revision, (int) 1)) { builder = OpenProtocolMessageParameterSetDataUploadRequestRev1 .staticParseOpenProtocolMessageParameterSetDataUploadRequestBuilder( readBuffer, revision); - } else if (EvaluationHelper.equals(revision, (long) 2)) { + } else if (EvaluationHelper.equals(revision, (int) 2)) { builder = OpenProtocolMessageParameterSetDataUploadRequestRev2 .staticParseOpenProtocolMessageParameterSetDataUploadRequestBuilder( @@ -131,7 +131,7 @@ public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( public interface OpenProtocolMessageParameterSetDataUploadRequestBuilder { OpenProtocolMessageParameterSetDataUploadRequest build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -150,7 +150,7 @@ public OpenProtocolMessageParameterSetDataUploadRequestBuilderImpl( } public OpenProtocolMessageParameterSetDataUploadRequest build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetDataUploadRequestRev1.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetDataUploadRequestRev1.java index 29f8b7b5837..e2e80a882f7 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetDataUploadRequestRev1.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetDataUploadRequestRev1.java @@ -39,22 +39,22 @@ public class OpenProtocolMessageParameterSetDataUploadRequestRev1 extends OpenProtocolMessageParameterSetDataUploadRequest implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 1; + public Integer getRevision() { + return (int) 1; } // Properties. - protected final long parameterSetId; + protected final int parameterSetId; public OpenProtocolMessageParameterSetDataUploadRequestRev1( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, Integer sequenceNumber, Short numberOfMessageParts, Short messagePartNumber, - long parameterSetId) { + int parameterSetId) { super( midRevision, noAckFlag, @@ -66,7 +66,7 @@ public OpenProtocolMessageParameterSetDataUploadRequestRev1( this.parameterSetId = parameterSetId; } - public long getParameterSetId() { + public int getParameterSetId() { return parameterSetId; } @@ -81,7 +81,7 @@ protected void serializeOpenProtocolMessageParameterSetDataUploadRequestChild( writeSimpleField( "parameterSetId", parameterSetId, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); writeBuffer.popContext("OpenProtocolMessageParameterSetDataUploadRequestRev1"); @@ -106,14 +106,14 @@ public int getLengthInBits() { public static OpenProtocolMessageParameterSetDataUploadRequestBuilder staticParseOpenProtocolMessageParameterSetDataUploadRequestBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageParameterSetDataUploadRequestRev1"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - long parameterSetId = + int parameterSetId = readSimpleField( - "parameterSetId", readUnsignedLong(readBuffer, 24), WithOption.WithEncoding("ASCII")); + "parameterSetId", readUnsignedInt(readBuffer, 24), WithOption.WithEncoding("ASCII")); readBuffer.closeContext("OpenProtocolMessageParameterSetDataUploadRequestRev1"); // Create the instance @@ -123,14 +123,14 @@ public int getLengthInBits() { public static class OpenProtocolMessageParameterSetDataUploadRequestRev1BuilderImpl implements OpenProtocolMessageParameterSetDataUploadRequest .OpenProtocolMessageParameterSetDataUploadRequestBuilder { - private final long parameterSetId; + private final int parameterSetId; - public OpenProtocolMessageParameterSetDataUploadRequestRev1BuilderImpl(long parameterSetId) { + public OpenProtocolMessageParameterSetDataUploadRequestRev1BuilderImpl(int parameterSetId) { this.parameterSetId = parameterSetId; } public OpenProtocolMessageParameterSetDataUploadRequestRev1 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetDataUploadRequestRev2.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetDataUploadRequestRev2.java index 3a011ff76b1..ab3900f76a5 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetDataUploadRequestRev2.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetDataUploadRequestRev2.java @@ -39,22 +39,22 @@ public class OpenProtocolMessageParameterSetDataUploadRequestRev2 extends OpenProtocolMessageParameterSetDataUploadRequest implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 2; + public Integer getRevision() { + return (int) 2; } // Properties. - protected final long parameterSetId; + protected final int parameterSetId; public OpenProtocolMessageParameterSetDataUploadRequestRev2( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, Integer sequenceNumber, Short numberOfMessageParts, Short messagePartNumber, - long parameterSetId) { + int parameterSetId) { super( midRevision, noAckFlag, @@ -66,7 +66,7 @@ public OpenProtocolMessageParameterSetDataUploadRequestRev2( this.parameterSetId = parameterSetId; } - public long getParameterSetId() { + public int getParameterSetId() { return parameterSetId; } @@ -81,7 +81,7 @@ protected void serializeOpenProtocolMessageParameterSetDataUploadRequestChild( writeSimpleField( "parameterSetId", parameterSetId, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); writeBuffer.popContext("OpenProtocolMessageParameterSetDataUploadRequestRev2"); @@ -106,14 +106,14 @@ public int getLengthInBits() { public static OpenProtocolMessageParameterSetDataUploadRequestBuilder staticParseOpenProtocolMessageParameterSetDataUploadRequestBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageParameterSetDataUploadRequestRev2"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - long parameterSetId = + int parameterSetId = readSimpleField( - "parameterSetId", readUnsignedLong(readBuffer, 24), WithOption.WithEncoding("ASCII")); + "parameterSetId", readUnsignedInt(readBuffer, 24), WithOption.WithEncoding("ASCII")); readBuffer.closeContext("OpenProtocolMessageParameterSetDataUploadRequestRev2"); // Create the instance @@ -123,14 +123,14 @@ public int getLengthInBits() { public static class OpenProtocolMessageParameterSetDataUploadRequestRev2BuilderImpl implements OpenProtocolMessageParameterSetDataUploadRequest .OpenProtocolMessageParameterSetDataUploadRequestBuilder { - private final long parameterSetId; + private final int parameterSetId; - public OpenProtocolMessageParameterSetDataUploadRequestRev2BuilderImpl(long parameterSetId) { + public OpenProtocolMessageParameterSetDataUploadRequestRev2BuilderImpl(int parameterSetId) { this.parameterSetId = parameterSetId; } public OpenProtocolMessageParameterSetDataUploadRequestRev2 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetIdUploadReply.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetIdUploadReply.java index c3f18221821..94e837f25d0 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetIdUploadReply.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetIdUploadReply.java @@ -44,10 +44,10 @@ public Mid getMid() { } // Abstract accessors for discriminator values. - public abstract Long getRevision(); + public abstract Integer getRevision(); public OpenProtocolMessageParameterSetIdUploadReply( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -97,22 +97,22 @@ public int getLengthInBits() { } public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageParameterSetIdUploadReply"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) OpenProtocolMessageParameterSetIdUploadReplyBuilder builder = null; - if (EvaluationHelper.equals(revision, (long) 1)) { + if (EvaluationHelper.equals(revision, (int) 1)) { builder = OpenProtocolMessageParameterSetIdUploadReplyRev1 .staticParseOpenProtocolMessageParameterSetIdUploadReplyBuilder(readBuffer, revision); - } else if (EvaluationHelper.equals(revision, (long) 2)) { + } else if (EvaluationHelper.equals(revision, (int) 2)) { builder = OpenProtocolMessageParameterSetIdUploadReplyRev2 .staticParseOpenProtocolMessageParameterSetIdUploadReplyBuilder(readBuffer, revision); - } else if (EvaluationHelper.equals(revision, (long) 3)) { + } else if (EvaluationHelper.equals(revision, (int) 3)) { builder = OpenProtocolMessageParameterSetIdUploadReplyRev3 .staticParseOpenProtocolMessageParameterSetIdUploadReplyBuilder(readBuffer, revision); @@ -133,7 +133,7 @@ public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( public interface OpenProtocolMessageParameterSetIdUploadReplyBuilder { OpenProtocolMessageParameterSetIdUploadReply build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -152,7 +152,7 @@ public OpenProtocolMessageParameterSetIdUploadReplyBuilderImpl( } public OpenProtocolMessageParameterSetIdUploadReply build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetIdUploadReplyRev1.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetIdUploadReplyRev1.java index 1d23b2fb96d..c4c0ba33227 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetIdUploadReplyRev1.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetIdUploadReplyRev1.java @@ -39,22 +39,22 @@ public class OpenProtocolMessageParameterSetIdUploadReplyRev1 extends OpenProtocolMessageParameterSetIdUploadReply implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 1; + public Integer getRevision() { + return (int) 1; } // Properties. - protected final List parameters; + protected final List parameters; public OpenProtocolMessageParameterSetIdUploadReplyRev1( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, Integer sequenceNumber, Short numberOfMessageParts, Short messagePartNumber, - List parameters) { + List parameters) { super( midRevision, noAckFlag, @@ -66,7 +66,7 @@ public OpenProtocolMessageParameterSetIdUploadReplyRev1( this.parameters = parameters; } - public List getParameters() { + public List getParameters() { return parameters; } @@ -79,18 +79,18 @@ protected void serializeOpenProtocolMessageParameterSetIdUploadReplyChild(WriteB // Implicit Field (numParameters) (Used for parsing, but its value is not stored as it's // implicitly given by the objects content) - long numParameters = (long) (COUNT(getParameters())); + int numParameters = (int) (COUNT(getParameters())); writeImplicitField( "numParameters", numParameters, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); // Array Field (parameters) writeSimpleTypeArrayField( "parameters", parameters, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); writeBuffer.popContext("OpenProtocolMessageParameterSetIdUploadReplyRev1"); @@ -120,19 +120,19 @@ public int getLengthInBits() { public static OpenProtocolMessageParameterSetIdUploadReplyBuilder staticParseOpenProtocolMessageParameterSetIdUploadReplyBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageParameterSetIdUploadReplyRev1"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - long numParameters = + int numParameters = readImplicitField( - "numParameters", readUnsignedLong(readBuffer, 24), WithOption.WithEncoding("ASCII")); + "numParameters", readUnsignedInt(readBuffer, 24), WithOption.WithEncoding("ASCII")); - List parameters = + List parameters = readCountArrayField( "parameters", - readUnsignedLong(readBuffer, 24), + readUnsignedInt(readBuffer, 24), numParameters, WithOption.WithEncoding("ASCII")); @@ -144,14 +144,14 @@ public int getLengthInBits() { public static class OpenProtocolMessageParameterSetIdUploadReplyRev1BuilderImpl implements OpenProtocolMessageParameterSetIdUploadReply .OpenProtocolMessageParameterSetIdUploadReplyBuilder { - private final List parameters; + private final List parameters; - public OpenProtocolMessageParameterSetIdUploadReplyRev1BuilderImpl(List parameters) { + public OpenProtocolMessageParameterSetIdUploadReplyRev1BuilderImpl(List parameters) { this.parameters = parameters; } public OpenProtocolMessageParameterSetIdUploadReplyRev1 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetIdUploadReplyRev2.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetIdUploadReplyRev2.java index 1a5c23956a3..d35719a3120 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetIdUploadReplyRev2.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetIdUploadReplyRev2.java @@ -39,23 +39,23 @@ public class OpenProtocolMessageParameterSetIdUploadReplyRev2 extends OpenProtocolMessageParameterSetIdUploadReply implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 2; + public Integer getRevision() { + return (int) 2; } // Properties. - protected final List parameters; + protected final List parameters; protected final List numberOfCycles; public OpenProtocolMessageParameterSetIdUploadReplyRev2( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, Integer sequenceNumber, Short numberOfMessageParts, Short messagePartNumber, - List parameters, + List parameters, List numberOfCycles) { super( midRevision, @@ -69,7 +69,7 @@ public OpenProtocolMessageParameterSetIdUploadReplyRev2( this.numberOfCycles = numberOfCycles; } - public List getParameters() { + public List getParameters() { return parameters; } @@ -86,18 +86,18 @@ protected void serializeOpenProtocolMessageParameterSetIdUploadReplyChild(WriteB // Implicit Field (numParameters) (Used for parsing, but its value is not stored as it's // implicitly given by the objects content) - long numParameters = (long) (COUNT(getParameters())); + int numParameters = (int) (COUNT(getParameters())); writeImplicitField( "numParameters", numParameters, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); // Array Field (parameters) writeSimpleTypeArrayField( "parameters", parameters, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); // Array Field (numberOfCycles) @@ -139,19 +139,19 @@ public int getLengthInBits() { public static OpenProtocolMessageParameterSetIdUploadReplyBuilder staticParseOpenProtocolMessageParameterSetIdUploadReplyBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageParameterSetIdUploadReplyRev2"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - long numParameters = + int numParameters = readImplicitField( - "numParameters", readUnsignedLong(readBuffer, 24), WithOption.WithEncoding("ASCII")); + "numParameters", readUnsignedInt(readBuffer, 24), WithOption.WithEncoding("ASCII")); - List parameters = + List parameters = readCountArrayField( "parameters", - readUnsignedLong(readBuffer, 24), + readUnsignedInt(readBuffer, 24), numParameters, WithOption.WithEncoding("ASCII")); @@ -171,17 +171,17 @@ public int getLengthInBits() { public static class OpenProtocolMessageParameterSetIdUploadReplyRev2BuilderImpl implements OpenProtocolMessageParameterSetIdUploadReply .OpenProtocolMessageParameterSetIdUploadReplyBuilder { - private final List parameters; + private final List parameters; private final List numberOfCycles; public OpenProtocolMessageParameterSetIdUploadReplyRev2BuilderImpl( - List parameters, List numberOfCycles) { + List parameters, List numberOfCycles) { this.parameters = parameters; this.numberOfCycles = numberOfCycles; } public OpenProtocolMessageParameterSetIdUploadReplyRev2 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetIdUploadReplyRev3.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetIdUploadReplyRev3.java index 5f2218b590b..494505e2433 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetIdUploadReplyRev3.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetIdUploadReplyRev3.java @@ -39,24 +39,24 @@ public class OpenProtocolMessageParameterSetIdUploadReplyRev3 extends OpenProtocolMessageParameterSetIdUploadReply implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 3; + public Integer getRevision() { + return (int) 3; } // Properties. - protected final List parameters; + protected final List parameters; protected final List numberOfCycles; protected final List typeOfProgram; public OpenProtocolMessageParameterSetIdUploadReplyRev3( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, Integer sequenceNumber, Short numberOfMessageParts, Short messagePartNumber, - List parameters, + List parameters, List numberOfCycles, List typeOfProgram) { super( @@ -72,7 +72,7 @@ public OpenProtocolMessageParameterSetIdUploadReplyRev3( this.typeOfProgram = typeOfProgram; } - public List getParameters() { + public List getParameters() { return parameters; } @@ -93,18 +93,18 @@ protected void serializeOpenProtocolMessageParameterSetIdUploadReplyChild(WriteB // Implicit Field (numParameters) (Used for parsing, but its value is not stored as it's // implicitly given by the objects content) - long numParameters = (long) (COUNT(getParameters())); + int numParameters = (int) (COUNT(getParameters())); writeImplicitField( "numParameters", numParameters, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); // Array Field (parameters) writeSimpleTypeArrayField( "parameters", parameters, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); // Array Field (numberOfCycles) @@ -158,19 +158,19 @@ public int getLengthInBits() { public static OpenProtocolMessageParameterSetIdUploadReplyBuilder staticParseOpenProtocolMessageParameterSetIdUploadReplyBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageParameterSetIdUploadReplyRev3"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - long numParameters = + int numParameters = readImplicitField( - "numParameters", readUnsignedLong(readBuffer, 24), WithOption.WithEncoding("ASCII")); + "numParameters", readUnsignedInt(readBuffer, 24), WithOption.WithEncoding("ASCII")); - List parameters = + List parameters = readCountArrayField( "parameters", - readUnsignedLong(readBuffer, 24), + readUnsignedInt(readBuffer, 24), numParameters, WithOption.WithEncoding("ASCII")); @@ -197,19 +197,19 @@ public int getLengthInBits() { public static class OpenProtocolMessageParameterSetIdUploadReplyRev3BuilderImpl implements OpenProtocolMessageParameterSetIdUploadReply .OpenProtocolMessageParameterSetIdUploadReplyBuilder { - private final List parameters; + private final List parameters; private final List numberOfCycles; private final List typeOfProgram; public OpenProtocolMessageParameterSetIdUploadReplyRev3BuilderImpl( - List parameters, List numberOfCycles, List typeOfProgram) { + List parameters, List numberOfCycles, List typeOfProgram) { this.parameters = parameters; this.numberOfCycles = numberOfCycles; this.typeOfProgram = typeOfProgram; } public OpenProtocolMessageParameterSetIdUploadReplyRev3 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetIdUploadRequest.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetIdUploadRequest.java index ec4aeb24767..81f1b503e1b 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetIdUploadRequest.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetIdUploadRequest.java @@ -44,10 +44,10 @@ public Mid getMid() { } // Abstract accessors for discriminator values. - public abstract Long getRevision(); + public abstract Integer getRevision(); public OpenProtocolMessageParameterSetIdUploadRequest( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -97,14 +97,14 @@ public int getLengthInBits() { } public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageParameterSetIdUploadRequest"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) OpenProtocolMessageParameterSetIdUploadRequestBuilder builder = null; - if (EvaluationHelper.equals(revision, (long) 1)) { + if (EvaluationHelper.equals(revision, (int) 1)) { builder = OpenProtocolMessageParameterSetIdUploadRequestRev1 .staticParseOpenProtocolMessageParameterSetIdUploadRequestBuilder( @@ -126,7 +126,7 @@ public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( public interface OpenProtocolMessageParameterSetIdUploadRequestBuilder { OpenProtocolMessageParameterSetIdUploadRequest build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -145,7 +145,7 @@ public OpenProtocolMessageParameterSetIdUploadRequestBuilderImpl( } public OpenProtocolMessageParameterSetIdUploadRequest build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetIdUploadRequestRev1.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetIdUploadRequestRev1.java index 6e6cbebd7ea..636d658f5f6 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetIdUploadRequestRev1.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetIdUploadRequestRev1.java @@ -39,12 +39,12 @@ public class OpenProtocolMessageParameterSetIdUploadRequestRev1 extends OpenProtocolMessageParameterSetIdUploadRequest implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 1; + public Integer getRevision() { + return (int) 1; } public OpenProtocolMessageParameterSetIdUploadRequestRev1( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -87,7 +87,7 @@ public int getLengthInBits() { public static OpenProtocolMessageParameterSetIdUploadRequestBuilder staticParseOpenProtocolMessageParameterSetIdUploadRequestBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageParameterSetIdUploadRequestRev1"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -104,7 +104,7 @@ public static class OpenProtocolMessageParameterSetIdUploadRequestRev1BuilderImp public OpenProtocolMessageParameterSetIdUploadRequestRev1BuilderImpl() {} public OpenProtocolMessageParameterSetIdUploadRequestRev1 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetSelected.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetSelected.java index 6aa5a844623..11eb4b55884 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetSelected.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetSelected.java @@ -44,10 +44,10 @@ public Mid getMid() { } // Abstract accessors for discriminator values. - public abstract Long getRevision(); + public abstract Integer getRevision(); public OpenProtocolMessageParameterSetSelected( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -97,18 +97,18 @@ public int getLengthInBits() { } public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageParameterSetSelected"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) OpenProtocolMessageParameterSetSelectedBuilder builder = null; - if (EvaluationHelper.equals(revision, (long) 1)) { + if (EvaluationHelper.equals(revision, (int) 1)) { builder = OpenProtocolMessageParameterSetSelectedRev1 .staticParseOpenProtocolMessageParameterSetSelectedBuilder(readBuffer, revision); - } else if (EvaluationHelper.equals(revision, (long) 2)) { + } else if (EvaluationHelper.equals(revision, (int) 2)) { builder = OpenProtocolMessageParameterSetSelectedRev2 .staticParseOpenProtocolMessageParameterSetSelectedBuilder(readBuffer, revision); @@ -129,7 +129,7 @@ public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( public interface OpenProtocolMessageParameterSetSelectedBuilder { OpenProtocolMessageParameterSetSelected build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -148,7 +148,7 @@ public OpenProtocolMessageParameterSetSelectedBuilderImpl( } public OpenProtocolMessageParameterSetSelected build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetSelectedAcknowledge.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetSelectedAcknowledge.java index 3de4f726e8b..bfcb876be4d 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetSelectedAcknowledge.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetSelectedAcknowledge.java @@ -44,10 +44,10 @@ public Mid getMid() { } // Abstract accessors for discriminator values. - public abstract Long getRevision(); + public abstract Integer getRevision(); public OpenProtocolMessageParameterSetSelectedAcknowledge( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -97,14 +97,14 @@ public int getLengthInBits() { } public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageParameterSetSelectedAcknowledge"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) OpenProtocolMessageParameterSetSelectedAcknowledgeBuilder builder = null; - if (EvaluationHelper.equals(revision, (long) 1)) { + if (EvaluationHelper.equals(revision, (int) 1)) { builder = OpenProtocolMessageParameterSetSelectedAcknowledgeRev1 .staticParseOpenProtocolMessageParameterSetSelectedAcknowledgeBuilder( @@ -126,7 +126,7 @@ public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( public interface OpenProtocolMessageParameterSetSelectedAcknowledgeBuilder { OpenProtocolMessageParameterSetSelectedAcknowledge build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -145,7 +145,7 @@ public OpenProtocolMessageParameterSetSelectedAcknowledgeBuilderImpl( } public OpenProtocolMessageParameterSetSelectedAcknowledge build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetSelectedAcknowledgeRev1.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetSelectedAcknowledgeRev1.java index 7dfeb8965a0..a2effc6b9ee 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetSelectedAcknowledgeRev1.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetSelectedAcknowledgeRev1.java @@ -39,12 +39,12 @@ public class OpenProtocolMessageParameterSetSelectedAcknowledgeRev1 extends OpenProtocolMessageParameterSetSelectedAcknowledge implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 1; + public Integer getRevision() { + return (int) 1; } public OpenProtocolMessageParameterSetSelectedAcknowledgeRev1( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -87,7 +87,7 @@ public int getLengthInBits() { public static OpenProtocolMessageParameterSetSelectedAcknowledgeBuilder staticParseOpenProtocolMessageParameterSetSelectedAcknowledgeBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageParameterSetSelectedAcknowledgeRev1"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -104,7 +104,7 @@ public static class OpenProtocolMessageParameterSetSelectedAcknowledgeRev1Builde public OpenProtocolMessageParameterSetSelectedAcknowledgeRev1BuilderImpl() {} public OpenProtocolMessageParameterSetSelectedAcknowledgeRev1 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetSelectedRev1.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetSelectedRev1.java index 3aeff7118c2..2c949898b49 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetSelectedRev1.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetSelectedRev1.java @@ -39,23 +39,23 @@ public class OpenProtocolMessageParameterSetSelectedRev1 extends OpenProtocolMessageParameterSetSelected implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 1; + public Integer getRevision() { + return (int) 1; } // Properties. - protected final long parameterSetId; + protected final int parameterSetId; protected final String dateOfLastChangeInParameterSetSetting; public OpenProtocolMessageParameterSetSelectedRev1( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, Integer sequenceNumber, Short numberOfMessageParts, Short messagePartNumber, - long parameterSetId, + int parameterSetId, String dateOfLastChangeInParameterSetSetting) { super( midRevision, @@ -69,7 +69,7 @@ public OpenProtocolMessageParameterSetSelectedRev1( this.dateOfLastChangeInParameterSetSetting = dateOfLastChangeInParameterSetSetting; } - public long getParameterSetId() { + public int getParameterSetId() { return parameterSetId; } @@ -88,7 +88,7 @@ protected void serializeOpenProtocolMessageParameterSetSelectedChild(WriteBuffer writeSimpleField( "parameterSetId", parameterSetId, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); // Simple Field (dateOfLastChangeInParameterSetSetting) @@ -123,14 +123,14 @@ public int getLengthInBits() { public static OpenProtocolMessageParameterSetSelectedBuilder staticParseOpenProtocolMessageParameterSetSelectedBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageParameterSetSelectedRev1"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - long parameterSetId = + int parameterSetId = readSimpleField( - "parameterSetId", readUnsignedLong(readBuffer, 24), WithOption.WithEncoding("ASCII")); + "parameterSetId", readUnsignedInt(readBuffer, 24), WithOption.WithEncoding("ASCII")); String dateOfLastChangeInParameterSetSetting = readSimpleField( @@ -147,17 +147,17 @@ public int getLengthInBits() { public static class OpenProtocolMessageParameterSetSelectedRev1BuilderImpl implements OpenProtocolMessageParameterSetSelected .OpenProtocolMessageParameterSetSelectedBuilder { - private final long parameterSetId; + private final int parameterSetId; private final String dateOfLastChangeInParameterSetSetting; public OpenProtocolMessageParameterSetSelectedRev1BuilderImpl( - long parameterSetId, String dateOfLastChangeInParameterSetSetting) { + int parameterSetId, String dateOfLastChangeInParameterSetSetting) { this.parameterSetId = parameterSetId; this.dateOfLastChangeInParameterSetSetting = dateOfLastChangeInParameterSetSetting; } public OpenProtocolMessageParameterSetSelectedRev1 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetSelectedRev2.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetSelectedRev2.java index 44380aa6256..5060a3c687d 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetSelectedRev2.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetSelectedRev2.java @@ -24,7 +24,6 @@ import static org.apache.plc4x.java.spi.codegen.io.DataWriterFactory.*; import static org.apache.plc4x.java.spi.generation.StaticHelper.*; -import java.math.BigInteger; import java.time.*; import java.util.*; import org.apache.plc4x.java.api.exceptions.*; @@ -40,8 +39,8 @@ public class OpenProtocolMessageParameterSetSelectedRev2 extends OpenProtocolMessageParameterSetSelected implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 2; + public Integer getRevision() { + return (int) 2; } // Constant values. @@ -60,41 +59,41 @@ public Long getRevision() { public static final Integer BLOCKIDSTARTFINALANGLE = 13; // Properties. - protected final long parameterSetId; + protected final int parameterSetId; protected final String parameterSetName; protected final String dateOfLastChangeInParameterSetSetting; protected final RotationDirection rotationDirection; protected final int batchSize; - protected final BigInteger torqueMin; - protected final BigInteger torqueMax; - protected final BigInteger torqueFinalTarget; - protected final BigInteger angleMin; - protected final BigInteger angleMax; - protected final BigInteger finalAngleTarget; - protected final BigInteger firstTarget; - protected final BigInteger startFinalAngle; + protected final long torqueMin; + protected final long torqueMax; + protected final long torqueFinalTarget; + protected final long angleMin; + protected final long angleMax; + protected final long finalAngleTarget; + protected final long firstTarget; + protected final long startFinalAngle; public OpenProtocolMessageParameterSetSelectedRev2( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, Integer sequenceNumber, Short numberOfMessageParts, Short messagePartNumber, - long parameterSetId, + int parameterSetId, String parameterSetName, String dateOfLastChangeInParameterSetSetting, RotationDirection rotationDirection, int batchSize, - BigInteger torqueMin, - BigInteger torqueMax, - BigInteger torqueFinalTarget, - BigInteger angleMin, - BigInteger angleMax, - BigInteger finalAngleTarget, - BigInteger firstTarget, - BigInteger startFinalAngle) { + long torqueMin, + long torqueMax, + long torqueFinalTarget, + long angleMin, + long angleMax, + long finalAngleTarget, + long firstTarget, + long startFinalAngle) { super( midRevision, noAckFlag, @@ -118,7 +117,7 @@ public OpenProtocolMessageParameterSetSelectedRev2( this.startFinalAngle = startFinalAngle; } - public long getParameterSetId() { + public int getParameterSetId() { return parameterSetId; } @@ -138,35 +137,35 @@ public int getBatchSize() { return batchSize; } - public BigInteger getTorqueMin() { + public long getTorqueMin() { return torqueMin; } - public BigInteger getTorqueMax() { + public long getTorqueMax() { return torqueMax; } - public BigInteger getTorqueFinalTarget() { + public long getTorqueFinalTarget() { return torqueFinalTarget; } - public BigInteger getAngleMin() { + public long getAngleMin() { return angleMin; } - public BigInteger getAngleMax() { + public long getAngleMax() { return angleMax; } - public BigInteger getFinalAngleTarget() { + public long getFinalAngleTarget() { return finalAngleTarget; } - public BigInteger getFirstTarget() { + public long getFirstTarget() { return firstTarget; } - public BigInteger getStartFinalAngle() { + public long getStartFinalAngle() { return startFinalAngle; } @@ -240,7 +239,7 @@ protected void serializeOpenProtocolMessageParameterSetSelectedChild(WriteBuffer writeSimpleField( "parameterSetId", parameterSetId, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); // Const Field (blockIdParameterSetName) @@ -314,7 +313,7 @@ protected void serializeOpenProtocolMessageParameterSetSelectedChild(WriteBuffer writeSimpleField( "torqueMin", torqueMin, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdTorqueMax) @@ -328,7 +327,7 @@ protected void serializeOpenProtocolMessageParameterSetSelectedChild(WriteBuffer writeSimpleField( "torqueMax", torqueMax, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdTorqueFinalTarget) @@ -342,7 +341,7 @@ protected void serializeOpenProtocolMessageParameterSetSelectedChild(WriteBuffer writeSimpleField( "torqueFinalTarget", torqueFinalTarget, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdAngleMin) @@ -354,10 +353,7 @@ protected void serializeOpenProtocolMessageParameterSetSelectedChild(WriteBuffer // Simple Field (angleMin) writeSimpleField( - "angleMin", - angleMin, - writeUnsignedBigInteger(writeBuffer, 40), - WithOption.WithEncoding("ASCII")); + "angleMin", angleMin, writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdAngleMax) writeConstField( @@ -368,10 +364,7 @@ protected void serializeOpenProtocolMessageParameterSetSelectedChild(WriteBuffer // Simple Field (angleMax) writeSimpleField( - "angleMax", - angleMax, - writeUnsignedBigInteger(writeBuffer, 40), - WithOption.WithEncoding("ASCII")); + "angleMax", angleMax, writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdFinalAngleTarget) writeConstField( @@ -384,7 +377,7 @@ protected void serializeOpenProtocolMessageParameterSetSelectedChild(WriteBuffer writeSimpleField( "finalAngleTarget", finalAngleTarget, - writeUnsignedBigInteger(writeBuffer, 40), + writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Const Field (blockIdFirstTarget) @@ -398,7 +391,7 @@ protected void serializeOpenProtocolMessageParameterSetSelectedChild(WriteBuffer writeSimpleField( "firstTarget", firstTarget, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Const Field (blockIdStartFinalAngle) @@ -412,7 +405,7 @@ protected void serializeOpenProtocolMessageParameterSetSelectedChild(WriteBuffer writeSimpleField( "startFinalAngle", startFinalAngle, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); writeBuffer.popContext("OpenProtocolMessageParameterSetSelectedRev2"); @@ -512,7 +505,7 @@ public int getLengthInBits() { public static OpenProtocolMessageParameterSetSelectedBuilder staticParseOpenProtocolMessageParameterSetSelectedBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageParameterSetSelectedRev2"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -524,9 +517,9 @@ public int getLengthInBits() { OpenProtocolMessageParameterSetSelectedRev2.BLOCKIDPARAMETERSETID, WithOption.WithEncoding("ASCII")); - long parameterSetId = + int parameterSetId = readSimpleField( - "parameterSetId", readUnsignedLong(readBuffer, 24), WithOption.WithEncoding("ASCII")); + "parameterSetId", readUnsignedInt(readBuffer, 24), WithOption.WithEncoding("ASCII")); int blockIdParameterSetName = readConstField( @@ -586,9 +579,9 @@ public int getLengthInBits() { OpenProtocolMessageParameterSetSelectedRev2.BLOCKIDTORQUEMIN, WithOption.WithEncoding("ASCII")); - BigInteger torqueMin = + long torqueMin = readSimpleField( - "torqueMin", readUnsignedBigInteger(readBuffer, 48), WithOption.WithEncoding("ASCII")); + "torqueMin", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdTorqueMax = readConstField( @@ -597,9 +590,9 @@ public int getLengthInBits() { OpenProtocolMessageParameterSetSelectedRev2.BLOCKIDTORQUEMAX, WithOption.WithEncoding("ASCII")); - BigInteger torqueMax = + long torqueMax = readSimpleField( - "torqueMax", readUnsignedBigInteger(readBuffer, 48), WithOption.WithEncoding("ASCII")); + "torqueMax", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdTorqueFinalTarget = readConstField( @@ -608,10 +601,10 @@ public int getLengthInBits() { OpenProtocolMessageParameterSetSelectedRev2.BLOCKIDTORQUEFINALTARGET, WithOption.WithEncoding("ASCII")); - BigInteger torqueFinalTarget = + long torqueFinalTarget = readSimpleField( "torqueFinalTarget", - readUnsignedBigInteger(readBuffer, 48), + readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdAngleMin = @@ -621,9 +614,9 @@ public int getLengthInBits() { OpenProtocolMessageParameterSetSelectedRev2.BLOCKIDANGLEMIN, WithOption.WithEncoding("ASCII")); - BigInteger angleMin = + long angleMin = readSimpleField( - "angleMin", readUnsignedBigInteger(readBuffer, 40), WithOption.WithEncoding("ASCII")); + "angleMin", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdAngleMax = readConstField( @@ -632,9 +625,9 @@ public int getLengthInBits() { OpenProtocolMessageParameterSetSelectedRev2.BLOCKIDANGLEMAX, WithOption.WithEncoding("ASCII")); - BigInteger angleMax = + long angleMax = readSimpleField( - "angleMax", readUnsignedBigInteger(readBuffer, 40), WithOption.WithEncoding("ASCII")); + "angleMax", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdFinalAngleTarget = readConstField( @@ -643,11 +636,9 @@ public int getLengthInBits() { OpenProtocolMessageParameterSetSelectedRev2.BLOCKIDFINALANGLETARGET, WithOption.WithEncoding("ASCII")); - BigInteger finalAngleTarget = + long finalAngleTarget = readSimpleField( - "finalAngleTarget", - readUnsignedBigInteger(readBuffer, 40), - WithOption.WithEncoding("ASCII")); + "finalAngleTarget", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); int blockIdFirstTarget = readConstField( @@ -656,11 +647,9 @@ public int getLengthInBits() { OpenProtocolMessageParameterSetSelectedRev2.BLOCKIDFIRSTTARGET, WithOption.WithEncoding("ASCII")); - BigInteger firstTarget = + long firstTarget = readSimpleField( - "firstTarget", - readUnsignedBigInteger(readBuffer, 48), - WithOption.WithEncoding("ASCII")); + "firstTarget", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); int blockIdStartFinalAngle = readConstField( @@ -669,11 +658,9 @@ public int getLengthInBits() { OpenProtocolMessageParameterSetSelectedRev2.BLOCKIDSTARTFINALANGLE, WithOption.WithEncoding("ASCII")); - BigInteger startFinalAngle = + long startFinalAngle = readSimpleField( - "startFinalAngle", - readUnsignedBigInteger(readBuffer, 48), - WithOption.WithEncoding("ASCII")); + "startFinalAngle", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); readBuffer.closeContext("OpenProtocolMessageParameterSetSelectedRev2"); // Create the instance @@ -696,34 +683,34 @@ public int getLengthInBits() { public static class OpenProtocolMessageParameterSetSelectedRev2BuilderImpl implements OpenProtocolMessageParameterSetSelected .OpenProtocolMessageParameterSetSelectedBuilder { - private final long parameterSetId; + private final int parameterSetId; private final String parameterSetName; private final String dateOfLastChangeInParameterSetSetting; private final RotationDirection rotationDirection; private final int batchSize; - private final BigInteger torqueMin; - private final BigInteger torqueMax; - private final BigInteger torqueFinalTarget; - private final BigInteger angleMin; - private final BigInteger angleMax; - private final BigInteger finalAngleTarget; - private final BigInteger firstTarget; - private final BigInteger startFinalAngle; + private final long torqueMin; + private final long torqueMax; + private final long torqueFinalTarget; + private final long angleMin; + private final long angleMax; + private final long finalAngleTarget; + private final long firstTarget; + private final long startFinalAngle; public OpenProtocolMessageParameterSetSelectedRev2BuilderImpl( - long parameterSetId, + int parameterSetId, String parameterSetName, String dateOfLastChangeInParameterSetSetting, RotationDirection rotationDirection, int batchSize, - BigInteger torqueMin, - BigInteger torqueMax, - BigInteger torqueFinalTarget, - BigInteger angleMin, - BigInteger angleMax, - BigInteger finalAngleTarget, - BigInteger firstTarget, - BigInteger startFinalAngle) { + long torqueMin, + long torqueMax, + long torqueFinalTarget, + long angleMin, + long angleMax, + long finalAngleTarget, + long firstTarget, + long startFinalAngle) { this.parameterSetId = parameterSetId; this.parameterSetName = parameterSetName; this.dateOfLastChangeInParameterSetSetting = dateOfLastChangeInParameterSetSetting; @@ -740,7 +727,7 @@ public OpenProtocolMessageParameterSetSelectedRev2BuilderImpl( } public OpenProtocolMessageParameterSetSelectedRev2 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetSelectedSubscribe.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetSelectedSubscribe.java index d3b691318c6..57cc4e03d43 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetSelectedSubscribe.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetSelectedSubscribe.java @@ -44,10 +44,10 @@ public Mid getMid() { } // Abstract accessors for discriminator values. - public abstract Long getRevision(); + public abstract Integer getRevision(); public OpenProtocolMessageParameterSetSelectedSubscribe( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -97,14 +97,14 @@ public int getLengthInBits() { } public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageParameterSetSelectedSubscribe"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) OpenProtocolMessageParameterSetSelectedSubscribeBuilder builder = null; - if (EvaluationHelper.equals(revision, (long) 1)) { + if (EvaluationHelper.equals(revision, (int) 1)) { builder = OpenProtocolMessageParameterSetSelectedSubscribeRev1 .staticParseOpenProtocolMessageParameterSetSelectedSubscribeBuilder( @@ -126,7 +126,7 @@ public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( public interface OpenProtocolMessageParameterSetSelectedSubscribeBuilder { OpenProtocolMessageParameterSetSelectedSubscribe build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -145,7 +145,7 @@ public OpenProtocolMessageParameterSetSelectedSubscribeBuilderImpl( } public OpenProtocolMessageParameterSetSelectedSubscribe build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetSelectedSubscribeRev1.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetSelectedSubscribeRev1.java index 5e691caa74c..0640702a1dc 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetSelectedSubscribeRev1.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetSelectedSubscribeRev1.java @@ -39,12 +39,12 @@ public class OpenProtocolMessageParameterSetSelectedSubscribeRev1 extends OpenProtocolMessageParameterSetSelectedSubscribe implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 1; + public Integer getRevision() { + return (int) 1; } public OpenProtocolMessageParameterSetSelectedSubscribeRev1( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -87,7 +87,7 @@ public int getLengthInBits() { public static OpenProtocolMessageParameterSetSelectedSubscribeBuilder staticParseOpenProtocolMessageParameterSetSelectedSubscribeBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageParameterSetSelectedSubscribeRev1"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -104,7 +104,7 @@ public static class OpenProtocolMessageParameterSetSelectedSubscribeRev1BuilderI public OpenProtocolMessageParameterSetSelectedSubscribeRev1BuilderImpl() {} public OpenProtocolMessageParameterSetSelectedSubscribeRev1 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetSelectedUnsubscribe.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetSelectedUnsubscribe.java index 04116053fe5..33e338e8881 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetSelectedUnsubscribe.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetSelectedUnsubscribe.java @@ -44,10 +44,10 @@ public Mid getMid() { } // Abstract accessors for discriminator values. - public abstract Long getRevision(); + public abstract Integer getRevision(); public OpenProtocolMessageParameterSetSelectedUnsubscribe( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -97,14 +97,14 @@ public int getLengthInBits() { } public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageParameterSetSelectedUnsubscribe"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) OpenProtocolMessageParameterSetSelectedUnsubscribeBuilder builder = null; - if (EvaluationHelper.equals(revision, (long) 1)) { + if (EvaluationHelper.equals(revision, (int) 1)) { builder = OpenProtocolMessageParameterSetSelectedUnsubscribeRev1 .staticParseOpenProtocolMessageParameterSetSelectedUnsubscribeBuilder( @@ -126,7 +126,7 @@ public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( public interface OpenProtocolMessageParameterSetSelectedUnsubscribeBuilder { OpenProtocolMessageParameterSetSelectedUnsubscribe build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -145,7 +145,7 @@ public OpenProtocolMessageParameterSetSelectedUnsubscribeBuilderImpl( } public OpenProtocolMessageParameterSetSelectedUnsubscribe build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetSelectedUnsubscribeRev1.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetSelectedUnsubscribeRev1.java index cdd78526a99..fadc5cf6ede 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetSelectedUnsubscribeRev1.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageParameterSetSelectedUnsubscribeRev1.java @@ -39,12 +39,12 @@ public class OpenProtocolMessageParameterSetSelectedUnsubscribeRev1 extends OpenProtocolMessageParameterSetSelectedUnsubscribe implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 1; + public Integer getRevision() { + return (int) 1; } public OpenProtocolMessageParameterSetSelectedUnsubscribeRev1( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -87,7 +87,7 @@ public int getLengthInBits() { public static OpenProtocolMessageParameterSetSelectedUnsubscribeBuilder staticParseOpenProtocolMessageParameterSetSelectedUnsubscribeBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageParameterSetSelectedUnsubscribeRev1"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -104,7 +104,7 @@ public static class OpenProtocolMessageParameterSetSelectedUnsubscribeRev1Builde public OpenProtocolMessageParameterSetSelectedUnsubscribeRev1BuilderImpl() {} public OpenProtocolMessageParameterSetSelectedUnsubscribeRev1 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageProgramPsetSelectionInDynamicJob.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageProgramPsetSelectionInDynamicJob.java index df0f97f7bd8..0106970396a 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageProgramPsetSelectionInDynamicJob.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageProgramPsetSelectionInDynamicJob.java @@ -44,10 +44,10 @@ public Mid getMid() { } // Abstract accessors for discriminator values. - public abstract Long getRevision(); + public abstract Integer getRevision(); public OpenProtocolMessageProgramPsetSelectionInDynamicJob( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -97,14 +97,14 @@ public int getLengthInBits() { } public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageProgramPsetSelectionInDynamicJob"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) OpenProtocolMessageProgramPsetSelectionInDynamicJobBuilder builder = null; - if (EvaluationHelper.equals(revision, (long) 1)) { + if (EvaluationHelper.equals(revision, (int) 1)) { builder = OpenProtocolMessageProgramPsetSelectionInDynamicJobRev1 .staticParseOpenProtocolMessageProgramPsetSelectionInDynamicJobBuilder( @@ -126,7 +126,7 @@ public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( public interface OpenProtocolMessageProgramPsetSelectionInDynamicJobBuilder { OpenProtocolMessageProgramPsetSelectionInDynamicJob build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -145,7 +145,7 @@ public OpenProtocolMessageProgramPsetSelectionInDynamicJobBuilderImpl( } public OpenProtocolMessageProgramPsetSelectionInDynamicJob build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageProgramPsetSelectionInDynamicJobRev1.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageProgramPsetSelectionInDynamicJobRev1.java index 3c8f9e8320f..a4f9bd064ab 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageProgramPsetSelectionInDynamicJobRev1.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageProgramPsetSelectionInDynamicJobRev1.java @@ -39,22 +39,22 @@ public class OpenProtocolMessageProgramPsetSelectionInDynamicJobRev1 extends OpenProtocolMessageProgramPsetSelectionInDynamicJob implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 1; + public Integer getRevision() { + return (int) 1; } // Properties. - protected final long parameterSetId; + protected final int parameterSetId; public OpenProtocolMessageProgramPsetSelectionInDynamicJobRev1( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, Integer sequenceNumber, Short numberOfMessageParts, Short messagePartNumber, - long parameterSetId) { + int parameterSetId) { super( midRevision, noAckFlag, @@ -66,7 +66,7 @@ public OpenProtocolMessageProgramPsetSelectionInDynamicJobRev1( this.parameterSetId = parameterSetId; } - public long getParameterSetId() { + public int getParameterSetId() { return parameterSetId; } @@ -81,7 +81,7 @@ protected void serializeOpenProtocolMessageProgramPsetSelectionInDynamicJobChild writeSimpleField( "parameterSetId", parameterSetId, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); writeBuffer.popContext("OpenProtocolMessageProgramPsetSelectionInDynamicJobRev1"); @@ -106,14 +106,14 @@ public int getLengthInBits() { public static OpenProtocolMessageProgramPsetSelectionInDynamicJobBuilder staticParseOpenProtocolMessageProgramPsetSelectionInDynamicJobBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageProgramPsetSelectionInDynamicJobRev1"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - long parameterSetId = + int parameterSetId = readSimpleField( - "parameterSetId", readUnsignedLong(readBuffer, 24), WithOption.WithEncoding("ASCII")); + "parameterSetId", readUnsignedInt(readBuffer, 24), WithOption.WithEncoding("ASCII")); readBuffer.closeContext("OpenProtocolMessageProgramPsetSelectionInDynamicJobRev1"); // Create the instance @@ -123,14 +123,14 @@ public int getLengthInBits() { public static class OpenProtocolMessageProgramPsetSelectionInDynamicJobRev1BuilderImpl implements OpenProtocolMessageProgramPsetSelectionInDynamicJob .OpenProtocolMessageProgramPsetSelectionInDynamicJobBuilder { - private final long parameterSetId; + private final int parameterSetId; - public OpenProtocolMessageProgramPsetSelectionInDynamicJobRev1BuilderImpl(long parameterSetId) { + public OpenProtocolMessageProgramPsetSelectionInDynamicJobRev1BuilderImpl(int parameterSetId) { this.parameterSetId = parameterSetId; } public OpenProtocolMessageProgramPsetSelectionInDynamicJobRev1 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageResetParameterSetBatchCounter.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageResetParameterSetBatchCounter.java index 1848d5cb791..a0cbfda203e 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageResetParameterSetBatchCounter.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageResetParameterSetBatchCounter.java @@ -44,10 +44,10 @@ public Mid getMid() { } // Abstract accessors for discriminator values. - public abstract Long getRevision(); + public abstract Integer getRevision(); public OpenProtocolMessageResetParameterSetBatchCounter( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -97,14 +97,14 @@ public int getLengthInBits() { } public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageResetParameterSetBatchCounter"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) OpenProtocolMessageResetParameterSetBatchCounterBuilder builder = null; - if (EvaluationHelper.equals(revision, (long) 1)) { + if (EvaluationHelper.equals(revision, (int) 1)) { builder = OpenProtocolMessageResetParameterSetBatchCounterRev1 .staticParseOpenProtocolMessageResetParameterSetBatchCounterBuilder( @@ -126,7 +126,7 @@ public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( public interface OpenProtocolMessageResetParameterSetBatchCounterBuilder { OpenProtocolMessageResetParameterSetBatchCounter build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -145,7 +145,7 @@ public OpenProtocolMessageResetParameterSetBatchCounterBuilderImpl( } public OpenProtocolMessageResetParameterSetBatchCounter build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageResetParameterSetBatchCounterRev1.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageResetParameterSetBatchCounterRev1.java index 4c12c0e3a66..8dcdc32d251 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageResetParameterSetBatchCounterRev1.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageResetParameterSetBatchCounterRev1.java @@ -39,22 +39,22 @@ public class OpenProtocolMessageResetParameterSetBatchCounterRev1 extends OpenProtocolMessageResetParameterSetBatchCounter implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 1; + public Integer getRevision() { + return (int) 1; } // Properties. - protected final long parameterSetId; + protected final int parameterSetId; public OpenProtocolMessageResetParameterSetBatchCounterRev1( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, Integer sequenceNumber, Short numberOfMessageParts, Short messagePartNumber, - long parameterSetId) { + int parameterSetId) { super( midRevision, noAckFlag, @@ -66,7 +66,7 @@ public OpenProtocolMessageResetParameterSetBatchCounterRev1( this.parameterSetId = parameterSetId; } - public long getParameterSetId() { + public int getParameterSetId() { return parameterSetId; } @@ -81,7 +81,7 @@ protected void serializeOpenProtocolMessageResetParameterSetBatchCounterChild( writeSimpleField( "parameterSetId", parameterSetId, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); writeBuffer.popContext("OpenProtocolMessageResetParameterSetBatchCounterRev1"); @@ -106,14 +106,14 @@ public int getLengthInBits() { public static OpenProtocolMessageResetParameterSetBatchCounterBuilder staticParseOpenProtocolMessageResetParameterSetBatchCounterBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageResetParameterSetBatchCounterRev1"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - long parameterSetId = + int parameterSetId = readSimpleField( - "parameterSetId", readUnsignedLong(readBuffer, 24), WithOption.WithEncoding("ASCII")); + "parameterSetId", readUnsignedInt(readBuffer, 24), WithOption.WithEncoding("ASCII")); readBuffer.closeContext("OpenProtocolMessageResetParameterSetBatchCounterRev1"); // Create the instance @@ -123,14 +123,14 @@ public int getLengthInBits() { public static class OpenProtocolMessageResetParameterSetBatchCounterRev1BuilderImpl implements OpenProtocolMessageResetParameterSetBatchCounter .OpenProtocolMessageResetParameterSetBatchCounterBuilder { - private final long parameterSetId; + private final int parameterSetId; - public OpenProtocolMessageResetParameterSetBatchCounterRev1BuilderImpl(long parameterSetId) { + public OpenProtocolMessageResetParameterSetBatchCounterRev1BuilderImpl(int parameterSetId) { this.parameterSetId = parameterSetId; } public OpenProtocolMessageResetParameterSetBatchCounterRev1 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageResultTracesCurve.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageResultTracesCurve.java index e405fa13162..e11b27aa614 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageResultTracesCurve.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageResultTracesCurve.java @@ -44,10 +44,10 @@ public Mid getMid() { } // Abstract accessors for discriminator values. - public abstract Long getRevision(); + public abstract Integer getRevision(); public OpenProtocolMessageResultTracesCurve( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -97,14 +97,14 @@ public int getLengthInBits() { } public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageResultTracesCurve"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) OpenProtocolMessageResultTracesCurveBuilder builder = null; - if (EvaluationHelper.equals(revision, (long) 1)) { + if (EvaluationHelper.equals(revision, (int) 1)) { builder = OpenProtocolMessageResultTracesCurveRev1 .staticParseOpenProtocolMessageResultTracesCurveBuilder(readBuffer, revision); @@ -125,7 +125,7 @@ public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( public interface OpenProtocolMessageResultTracesCurveBuilder { OpenProtocolMessageResultTracesCurve build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -144,7 +144,7 @@ public OpenProtocolMessageResultTracesCurveBuilderImpl( } public OpenProtocolMessageResultTracesCurve build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageResultTracesCurvePlotData.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageResultTracesCurvePlotData.java index e06b910a825..0a922f58ed3 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageResultTracesCurvePlotData.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageResultTracesCurvePlotData.java @@ -44,10 +44,10 @@ public Mid getMid() { } // Abstract accessors for discriminator values. - public abstract Long getRevision(); + public abstract Integer getRevision(); public OpenProtocolMessageResultTracesCurvePlotData( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -97,14 +97,14 @@ public int getLengthInBits() { } public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageResultTracesCurvePlotData"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) OpenProtocolMessageResultTracesCurvePlotDataBuilder builder = null; - if (EvaluationHelper.equals(revision, (long) 1)) { + if (EvaluationHelper.equals(revision, (int) 1)) { builder = OpenProtocolMessageResultTracesCurvePlotDataRev1 .staticParseOpenProtocolMessageResultTracesCurvePlotDataBuilder(readBuffer, revision); @@ -125,7 +125,7 @@ public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( public interface OpenProtocolMessageResultTracesCurvePlotDataBuilder { OpenProtocolMessageResultTracesCurvePlotData build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -144,7 +144,7 @@ public OpenProtocolMessageResultTracesCurvePlotDataBuilderImpl( } public OpenProtocolMessageResultTracesCurvePlotData build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageResultTracesCurvePlotDataRev1.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageResultTracesCurvePlotDataRev1.java index 2d6d07260bf..05a881bfc9f 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageResultTracesCurvePlotDataRev1.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageResultTracesCurvePlotDataRev1.java @@ -39,8 +39,8 @@ public class OpenProtocolMessageResultTracesCurvePlotDataRev1 extends OpenProtocolMessageResultTracesCurvePlotData implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 1; + public Integer getRevision() { + return (int) 1; } // Properties. @@ -49,7 +49,7 @@ public Long getRevision() { protected final List dataFields; public OpenProtocolMessageResultTracesCurvePlotDataRev1( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -104,11 +104,11 @@ protected void serializeOpenProtocolMessageResultTracesCurvePlotDataChild(WriteB // Implicit Field (numberOfParameterDataFields) (Used for parsing, but its value is not stored // as it's implicitly given by the objects content) - long numberOfParameterDataFields = (long) (COUNT(getDataFields())); + int numberOfParameterDataFields = (int) (COUNT(getDataFields())); writeImplicitField( "numberOfParameterDataFields", numberOfParameterDataFields, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); // Array Field (dataFields) @@ -152,7 +152,7 @@ public int getLengthInBits() { public static OpenProtocolMessageResultTracesCurvePlotDataBuilder staticParseOpenProtocolMessageResultTracesCurvePlotDataBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageResultTracesCurvePlotDataRev1"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -164,10 +164,10 @@ public int getLengthInBits() { String timeStamp = readSimpleField("timeStamp", readString(readBuffer, 152), WithOption.WithEncoding("ASCII")); - long numberOfParameterDataFields = + int numberOfParameterDataFields = readImplicitField( "numberOfParameterDataFields", - readUnsignedLong(readBuffer, 24), + readUnsignedInt(readBuffer, 24), WithOption.WithEncoding("ASCII")); List dataFields = @@ -199,7 +199,7 @@ public OpenProtocolMessageResultTracesCurvePlotDataRev1BuilderImpl( } public OpenProtocolMessageResultTracesCurvePlotDataRev1 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageResultTracesCurveRev1.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageResultTracesCurveRev1.java index fe0e17c0734..a44d6ce2e99 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageResultTracesCurveRev1.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageResultTracesCurveRev1.java @@ -39,12 +39,12 @@ public class OpenProtocolMessageResultTracesCurveRev1 extends OpenProtocolMessag implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 1; + public Integer getRevision() { + return (int) 1; } public OpenProtocolMessageResultTracesCurveRev1( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -86,8 +86,8 @@ public int getLengthInBits() { } public static OpenProtocolMessageResultTracesCurveBuilder - staticParseOpenProtocolMessageResultTracesCurveBuilder(ReadBuffer readBuffer, Long revision) - throws ParseException { + staticParseOpenProtocolMessageResultTracesCurveBuilder( + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageResultTracesCurveRev1"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -103,7 +103,7 @@ public static class OpenProtocolMessageResultTracesCurveRev1BuilderImpl public OpenProtocolMessageResultTracesCurveRev1BuilderImpl() {} public OpenProtocolMessageResultTracesCurveRev1 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageSelectParameterSet.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageSelectParameterSet.java index c393c9a7031..55d18600a6b 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageSelectParameterSet.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageSelectParameterSet.java @@ -44,10 +44,10 @@ public Mid getMid() { } // Abstract accessors for discriminator values. - public abstract Long getRevision(); + public abstract Integer getRevision(); public OpenProtocolMessageSelectParameterSet( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -97,14 +97,14 @@ public int getLengthInBits() { } public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageSelectParameterSet"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) OpenProtocolMessageSelectParameterSetBuilder builder = null; - if (EvaluationHelper.equals(revision, (long) 1)) { + if (EvaluationHelper.equals(revision, (int) 1)) { builder = OpenProtocolMessageSelectParameterSetRev1 .staticParseOpenProtocolMessageSelectParameterSetBuilder(readBuffer, revision); @@ -125,7 +125,7 @@ public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( public interface OpenProtocolMessageSelectParameterSetBuilder { OpenProtocolMessageSelectParameterSet build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -144,7 +144,7 @@ public OpenProtocolMessageSelectParameterSetBuilderImpl( } public OpenProtocolMessageSelectParameterSet build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageSelectParameterSetRev1.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageSelectParameterSetRev1.java index a1fcada8d36..51187047c27 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageSelectParameterSetRev1.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageSelectParameterSetRev1.java @@ -39,22 +39,22 @@ public class OpenProtocolMessageSelectParameterSetRev1 extends OpenProtocolMessa implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 1; + public Integer getRevision() { + return (int) 1; } // Properties. - protected final long parameterSetId; + protected final int parameterSetId; public OpenProtocolMessageSelectParameterSetRev1( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, Integer sequenceNumber, Short numberOfMessageParts, Short messagePartNumber, - long parameterSetId) { + int parameterSetId) { super( midRevision, noAckFlag, @@ -66,7 +66,7 @@ public OpenProtocolMessageSelectParameterSetRev1( this.parameterSetId = parameterSetId; } - public long getParameterSetId() { + public int getParameterSetId() { return parameterSetId; } @@ -81,7 +81,7 @@ protected void serializeOpenProtocolMessageSelectParameterSetChild(WriteBuffer w writeSimpleField( "parameterSetId", parameterSetId, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); writeBuffer.popContext("OpenProtocolMessageSelectParameterSetRev1"); @@ -105,15 +105,15 @@ public int getLengthInBits() { } public static OpenProtocolMessageSelectParameterSetBuilder - staticParseOpenProtocolMessageSelectParameterSetBuilder(ReadBuffer readBuffer, Long revision) - throws ParseException { + staticParseOpenProtocolMessageSelectParameterSetBuilder( + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageSelectParameterSetRev1"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - long parameterSetId = + int parameterSetId = readSimpleField( - "parameterSetId", readUnsignedLong(readBuffer, 24), WithOption.WithEncoding("ASCII")); + "parameterSetId", readUnsignedInt(readBuffer, 24), WithOption.WithEncoding("ASCII")); readBuffer.closeContext("OpenProtocolMessageSelectParameterSetRev1"); // Create the instance @@ -123,14 +123,14 @@ public int getLengthInBits() { public static class OpenProtocolMessageSelectParameterSetRev1BuilderImpl implements OpenProtocolMessageSelectParameterSet .OpenProtocolMessageSelectParameterSetBuilder { - private final long parameterSetId; + private final int parameterSetId; - public OpenProtocolMessageSelectParameterSetRev1BuilderImpl(long parameterSetId) { + public OpenProtocolMessageSelectParameterSetRev1BuilderImpl(int parameterSetId) { this.parameterSetId = parameterSetId; } public OpenProtocolMessageSelectParameterSetRev1 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageSetParameterSetBatchSize.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageSetParameterSetBatchSize.java index 5f1c27d1efc..9d67e20db7f 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageSetParameterSetBatchSize.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageSetParameterSetBatchSize.java @@ -44,10 +44,10 @@ public Mid getMid() { } // Abstract accessors for discriminator values. - public abstract Long getRevision(); + public abstract Integer getRevision(); public OpenProtocolMessageSetParameterSetBatchSize( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -97,14 +97,14 @@ public int getLengthInBits() { } public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageSetParameterSetBatchSize"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) OpenProtocolMessageSetParameterSetBatchSizeBuilder builder = null; - if (EvaluationHelper.equals(revision, (long) 1)) { + if (EvaluationHelper.equals(revision, (int) 1)) { builder = OpenProtocolMessageSetParameterSetBatchSizeRev1 .staticParseOpenProtocolMessageSetParameterSetBatchSizeBuilder(readBuffer, revision); @@ -125,7 +125,7 @@ public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( public interface OpenProtocolMessageSetParameterSetBatchSizeBuilder { OpenProtocolMessageSetParameterSetBatchSize build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -144,7 +144,7 @@ public OpenProtocolMessageSetParameterSetBatchSizeBuilderImpl( } public OpenProtocolMessageSetParameterSetBatchSize build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageSetParameterSetBatchSizeRev1.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageSetParameterSetBatchSizeRev1.java index f3a0d5348ec..6a5f6df83e9 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageSetParameterSetBatchSizeRev1.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageSetParameterSetBatchSizeRev1.java @@ -39,23 +39,23 @@ public class OpenProtocolMessageSetParameterSetBatchSizeRev1 extends OpenProtocolMessageSetParameterSetBatchSize implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 1; + public Integer getRevision() { + return (int) 1; } // Properties. - protected final long parameterSetId; + protected final int parameterSetId; protected final int batchSize; public OpenProtocolMessageSetParameterSetBatchSizeRev1( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, Integer sequenceNumber, Short numberOfMessageParts, Short messagePartNumber, - long parameterSetId, + int parameterSetId, int batchSize) { super( midRevision, @@ -69,7 +69,7 @@ public OpenProtocolMessageSetParameterSetBatchSizeRev1( this.batchSize = batchSize; } - public long getParameterSetId() { + public int getParameterSetId() { return parameterSetId; } @@ -88,7 +88,7 @@ protected void serializeOpenProtocolMessageSetParameterSetBatchSizeChild(WriteBu writeSimpleField( "parameterSetId", parameterSetId, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); // Simple Field (batchSize) @@ -123,14 +123,14 @@ public int getLengthInBits() { public static OpenProtocolMessageSetParameterSetBatchSizeBuilder staticParseOpenProtocolMessageSetParameterSetBatchSizeBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageSetParameterSetBatchSizeRev1"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - long parameterSetId = + int parameterSetId = readSimpleField( - "parameterSetId", readUnsignedLong(readBuffer, 24), WithOption.WithEncoding("ASCII")); + "parameterSetId", readUnsignedInt(readBuffer, 24), WithOption.WithEncoding("ASCII")); int batchSize = readSimpleField( @@ -145,17 +145,17 @@ public int getLengthInBits() { public static class OpenProtocolMessageSetParameterSetBatchSizeRev1BuilderImpl implements OpenProtocolMessageSetParameterSetBatchSize .OpenProtocolMessageSetParameterSetBatchSizeBuilder { - private final long parameterSetId; + private final int parameterSetId; private final int batchSize; public OpenProtocolMessageSetParameterSetBatchSizeRev1BuilderImpl( - long parameterSetId, int batchSize) { + int parameterSetId, int batchSize) { this.parameterSetId = parameterSetId; this.batchSize = batchSize; } public OpenProtocolMessageSetParameterSetBatchSizeRev1 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageSetTime.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageSetTime.java index f55c07d060a..b89010c9e3c 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageSetTime.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageSetTime.java @@ -43,10 +43,10 @@ public Mid getMid() { } // Abstract accessors for discriminator values. - public abstract Long getRevision(); + public abstract Integer getRevision(); public OpenProtocolMessageSetTime( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -96,14 +96,14 @@ public int getLengthInBits() { } public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageSetTime"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); // Switch Field (Depending on the discriminator values, passes the instantiation to a sub-type) OpenProtocolMessageSetTimeBuilder builder = null; - if (EvaluationHelper.equals(revision, (long) 1)) { + if (EvaluationHelper.equals(revision, (int) 1)) { builder = OpenProtocolMessageSetTimeRev1.staticParseOpenProtocolMessageSetTimeBuilder( readBuffer, revision); @@ -124,7 +124,7 @@ public static OpenProtocolMessageBuilder staticParseOpenProtocolMessageBuilder( public interface OpenProtocolMessageSetTimeBuilder { OpenProtocolMessageSetTime build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -142,7 +142,7 @@ public OpenProtocolMessageSetTimeBuilderImpl(OpenProtocolMessageSetTimeBuilder b } public OpenProtocolMessageSetTime build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageSetTimeRev1.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageSetTimeRev1.java index 5f632113147..466642413db 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageSetTimeRev1.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/OpenProtocolMessageSetTimeRev1.java @@ -38,15 +38,15 @@ public class OpenProtocolMessageSetTimeRev1 extends OpenProtocolMessageSetTime implements Message { // Accessors for discriminator values. - public Long getRevision() { - return (long) 1; + public Integer getRevision() { + return (int) 1; } // Properties. protected final String timeToSet; public OpenProtocolMessageSetTimeRev1( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, @@ -101,7 +101,7 @@ public int getLengthInBits() { } public static OpenProtocolMessageSetTimeBuilder staticParseOpenProtocolMessageSetTimeBuilder( - ReadBuffer readBuffer, Long revision) throws ParseException { + ReadBuffer readBuffer, Integer revision) throws ParseException { readBuffer.pullContext("OpenProtocolMessageSetTimeRev1"); PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); @@ -123,7 +123,7 @@ public OpenProtocolMessageSetTimeRev1BuilderImpl(String timeToSet) { } public OpenProtocolMessageSetTimeRev1 build( - Long midRevision, + Integer midRevision, Short noAckFlag, Integer targetStationId, Integer targetSpindleId, diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/StageResult.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/StageResult.java index 249af8f9b62..4f4460067b8 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/StageResult.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/StageResult.java @@ -24,7 +24,6 @@ import static org.apache.plc4x.java.spi.codegen.io.DataWriterFactory.*; import static org.apache.plc4x.java.spi.generation.StaticHelper.*; -import java.math.BigInteger; import java.time.*; import java.util.*; import org.apache.plc4x.java.api.exceptions.*; @@ -39,20 +38,20 @@ public class StageResult implements Message { // Properties. - protected final BigInteger stageTorqueValue; - protected final BigInteger stageTurningAngleValue; + protected final long stageTorqueValue; + protected final long stageTurningAngleValue; - public StageResult(BigInteger stageTorqueValue, BigInteger stageTurningAngleValue) { + public StageResult(long stageTorqueValue, long stageTurningAngleValue) { super(); this.stageTorqueValue = stageTorqueValue; this.stageTurningAngleValue = stageTurningAngleValue; } - public BigInteger getStageTorqueValue() { + public long getStageTorqueValue() { return stageTorqueValue; } - public BigInteger getStageTurningAngleValue() { + public long getStageTurningAngleValue() { return stageTurningAngleValue; } @@ -65,14 +64,14 @@ public void serialize(WriteBuffer writeBuffer) throws SerializationException { writeSimpleField( "stageTorqueValue", stageTorqueValue, - writeUnsignedBigInteger(writeBuffer, 48), + writeUnsignedLong(writeBuffer, 48), WithOption.WithEncoding("ASCII")); // Simple Field (stageTurningAngleValue) writeSimpleField( "stageTurningAngleValue", stageTurningAngleValue, - writeUnsignedBigInteger(writeBuffer, 40), + writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); writeBuffer.popContext("StageResult"); @@ -109,16 +108,14 @@ public static StageResult staticParse(ReadBuffer readBuffer) throws ParseExcepti PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - BigInteger stageTorqueValue = + long stageTorqueValue = readSimpleField( - "stageTorqueValue", - readUnsignedBigInteger(readBuffer, 48), - WithOption.WithEncoding("ASCII")); + "stageTorqueValue", readUnsignedLong(readBuffer, 48), WithOption.WithEncoding("ASCII")); - BigInteger stageTurningAngleValue = + long stageTurningAngleValue = readSimpleField( "stageTurningAngleValue", - readUnsignedBigInteger(readBuffer, 40), + readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); readBuffer.closeContext("StageResult"); diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/TraceType.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/TraceType.java index 1151791f51d..7ad1ae6a066 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/TraceType.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/TraceType.java @@ -24,37 +24,37 @@ // Code generated by code-generation. DO NOT EDIT. public enum TraceType { - AngleTrace((long) 1), - TorqueTrace((long) 2), - CurrentTrace((long) 3), - GradientTrace((long) 4), - StrokeTrace((long) 5), - ForceTrace((long) 6), - UnsubscribeOnAll((long) 999); - private static final Map map; + AngleTrace((int) 1), + TorqueTrace((int) 2), + CurrentTrace((int) 3), + GradientTrace((int) 4), + StrokeTrace((int) 5), + ForceTrace((int) 6), + UnsubscribeOnAll((int) 999); + private static final Map map; static { map = new HashMap<>(); for (TraceType value : TraceType.values()) { - map.put((long) value.getValue(), value); + map.put((int) value.getValue(), value); } } - private final long value; + private final int value; - TraceType(long value) { + TraceType(int value) { this.value = value; } - public long getValue() { + public int getValue() { return value; } - public static TraceType enumForValue(long value) { + public static TraceType enumForValue(int value) { return map.get(value); } - public static Boolean isDefined(long value) { + public static Boolean isDefined(int value) { return map.containsKey(value); } } diff --git a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/VariableDataField.java b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/VariableDataField.java index c556ac9abdc..ebdcc2264ac 100644 --- a/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/VariableDataField.java +++ b/plc4j/drivers/open-protocol/src/main/generated/org/apache/plc4x/java/openprotocol/readwrite/VariableDataField.java @@ -24,7 +24,6 @@ import static org.apache.plc4x.java.spi.codegen.io.DataWriterFactory.*; import static org.apache.plc4x.java.spi.generation.StaticHelper.*; -import java.math.BigInteger; import java.time.*; import java.util.*; import org.apache.plc4x.java.api.exceptions.*; @@ -39,14 +38,14 @@ public class VariableDataField implements Message { // Properties. - protected final BigInteger parameterId; + protected final long parameterId; protected final int dataType; - protected final long unit; - protected final long stepNumber; + protected final int unit; + protected final int stepNumber; protected final byte[] dataValue; public VariableDataField( - BigInteger parameterId, int dataType, long unit, long stepNumber, byte[] dataValue) { + long parameterId, int dataType, int unit, int stepNumber, byte[] dataValue) { super(); this.parameterId = parameterId; this.dataType = dataType; @@ -55,7 +54,7 @@ public VariableDataField( this.dataValue = dataValue; } - public BigInteger getParameterId() { + public long getParameterId() { return parameterId; } @@ -63,11 +62,11 @@ public int getDataType() { return dataType; } - public long getUnit() { + public int getUnit() { return unit; } - public long getStepNumber() { + public int getStepNumber() { return stepNumber; } @@ -84,14 +83,14 @@ public void serialize(WriteBuffer writeBuffer) throws SerializationException { writeSimpleField( "parameterId", parameterId, - writeUnsignedBigInteger(writeBuffer, 40), + writeUnsignedLong(writeBuffer, 40), WithOption.WithEncoding("ASCII")); // Implicit Field (length) (Used for parsing, but its value is not stored as it's implicitly // given by the objects content) - long length = (long) (COUNT(getDataValue())); + int length = (int) (COUNT(getDataValue())); writeImplicitField( - "length", length, writeUnsignedLong(writeBuffer, 24), WithOption.WithEncoding("ASCII")); + "length", length, writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); // Simple Field (dataType) writeSimpleField( @@ -99,13 +98,13 @@ public void serialize(WriteBuffer writeBuffer) throws SerializationException { // Simple Field (unit) writeSimpleField( - "unit", unit, writeUnsignedLong(writeBuffer, 24), WithOption.WithEncoding("ASCII")); + "unit", unit, writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); // Simple Field (stepNumber) writeSimpleField( "stepNumber", stepNumber, - writeUnsignedLong(writeBuffer, 24), + writeUnsignedInt(writeBuffer, 24), WithOption.WithEncoding("ASCII")); // Array Field (dataValue) @@ -160,26 +159,24 @@ public static VariableDataField staticParse(ReadBuffer readBuffer) throws ParseE PositionAware positionAware = readBuffer; boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get(); - BigInteger parameterId = + long parameterId = readSimpleField( - "parameterId", - readUnsignedBigInteger(readBuffer, 40), - WithOption.WithEncoding("ASCII")); + "parameterId", readUnsignedLong(readBuffer, 40), WithOption.WithEncoding("ASCII")); - long length = + int length = readImplicitField( - "length", readUnsignedLong(readBuffer, 24), WithOption.WithEncoding("ASCII")); + "length", readUnsignedInt(readBuffer, 24), WithOption.WithEncoding("ASCII")); int dataType = readSimpleField( "dataType", readUnsignedInt(readBuffer, 16), WithOption.WithEncoding("ASCII")); - long unit = - readSimpleField("unit", readUnsignedLong(readBuffer, 24), WithOption.WithEncoding("ASCII")); + int unit = + readSimpleField("unit", readUnsignedInt(readBuffer, 24), WithOption.WithEncoding("ASCII")); - long stepNumber = + int stepNumber = readSimpleField( - "stepNumber", readUnsignedLong(readBuffer, 24), WithOption.WithEncoding("ASCII")); + "stepNumber", readUnsignedInt(readBuffer, 24), WithOption.WithEncoding("ASCII")); byte[] dataValue = readBuffer.readByteArray( diff --git a/plc4j/drivers/plc4x/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xValue.java b/plc4j/drivers/plc4x/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xValue.java index 6d856ea4487..df01b18ac31 100644 --- a/plc4j/drivers/plc4x/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xValue.java +++ b/plc4j/drivers/plc4x/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xValue.java @@ -47,9 +47,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, Plc4xValueType valueTy // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 7); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 7); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -237,8 +237,7 @@ public static void staticSerialize( if (EvaluationHelper.equals(valueType, Plc4xValueType.BOOL)) { // BOOL // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 7, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 7, ((Number) (byte) 0x00).byteValue()); // Simple Field (value) boolean value = (boolean) _value.getBoolean(); /*TODO: migrate me*/ diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPPacketData.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPPacketData.java index d02dc78b246..233483c1a72 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPPacketData.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/COTPPacketData.java @@ -44,10 +44,10 @@ public Short getTpduCode() { // Properties. protected final boolean eot; - protected final short tpduRef; + protected final byte tpduRef; public COTPPacketData( - List parameters, S7Message payload, boolean eot, short tpduRef) { + List parameters, S7Message payload, boolean eot, byte tpduRef) { super(parameters, payload); this.eot = eot; this.tpduRef = tpduRef; @@ -57,7 +57,7 @@ public boolean getEot() { return eot; } - public short getTpduRef() { + public byte getTpduRef() { return tpduRef; } @@ -71,7 +71,7 @@ protected void serializeCOTPPacketChild(WriteBuffer writeBuffer) throws Serializ writeSimpleField("eot", eot, writeBoolean(writeBuffer)); // Simple Field (tpduRef) - writeSimpleField("tpduRef", tpduRef, writeUnsignedShort(writeBuffer, 7)); + writeSimpleField("tpduRef", tpduRef, writeUnsignedByte(writeBuffer, 7)); writeBuffer.popContext("COTPPacketData"); } @@ -104,7 +104,7 @@ public static COTPPacketBuilder staticParseCOTPPacketBuilder( boolean eot = readSimpleField("eot", readBoolean(readBuffer)); - short tpduRef = readSimpleField("tpduRef", readUnsignedShort(readBuffer, 7)); + byte tpduRef = readSimpleField("tpduRef", readUnsignedByte(readBuffer, 7)); readBuffer.closeContext("COTPPacketData"); // Create the instance @@ -113,9 +113,9 @@ public static COTPPacketBuilder staticParseCOTPPacketBuilder( public static class COTPPacketDataBuilderImpl implements COTPPacket.COTPPacketBuilder { private final boolean eot; - private final short tpduRef; + private final byte tpduRef; - public COTPPacketDataBuilderImpl(boolean eot, short tpduRef) { + public COTPPacketDataBuilderImpl(boolean eot, byte tpduRef) { this.eot = eot; this.tpduRef = tpduRef; } diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/CycServiceItemAnyType.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/CycServiceItemAnyType.java index 0f0016d5795..6676675a724 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/CycServiceItemAnyType.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/CycServiceItemAnyType.java @@ -44,7 +44,7 @@ public class CycServiceItemAnyType extends CycServiceItemType implements Message protected final int length; protected final int dbNumber; protected final MemoryArea memoryArea; - protected final long address; + protected final int address; public CycServiceItemAnyType( short byteLength, @@ -53,7 +53,7 @@ public CycServiceItemAnyType( int length, int dbNumber, MemoryArea memoryArea, - long address) { + int address) { super(byteLength, syntaxId); this.transportSize = transportSize; this.length = length; @@ -78,7 +78,7 @@ public MemoryArea getMemoryArea() { return memoryArea; } - public long getAddress() { + public int getAddress() { return address; } @@ -112,7 +112,7 @@ protected void serializeCycServiceItemTypeChild(WriteBuffer writeBuffer) MemoryArea::getValue, MemoryArea::name, writeUnsignedShort(writeBuffer, 8))); // Simple Field (address) - writeSimpleField("address", address, writeUnsignedLong(writeBuffer, 24)); + writeSimpleField("address", address, writeUnsignedInt(writeBuffer, 24)); writeBuffer.popContext("CycServiceItemAnyType"); } @@ -170,7 +170,7 @@ public static CycServiceItemTypeBuilder staticParseCycServiceItemTypeBuilder( new DataReaderEnumDefault<>( MemoryArea::enumForValue, readUnsignedShort(readBuffer, 8))); - long address = readSimpleField("address", readUnsignedLong(readBuffer, 24)); + int address = readSimpleField("address", readUnsignedInt(readBuffer, 24)); readBuffer.closeContext("CycServiceItemAnyType"); // Create the instance @@ -184,14 +184,10 @@ public static class CycServiceItemAnyTypeBuilderImpl private final int length; private final int dbNumber; private final MemoryArea memoryArea; - private final long address; + private final int address; public CycServiceItemAnyTypeBuilderImpl( - TransportSize transportSize, - int length, - int dbNumber, - MemoryArea memoryArea, - long address) { + TransportSize transportSize, int length, int dbNumber, MemoryArea memoryArea, int address) { this.transportSize = transportSize; this.length = length; this.dbNumber = dbNumber; diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/DataItem.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/DataItem.java index 7c5fb803efa..fb5aaf564e2 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/DataItem.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/DataItem.java @@ -47,9 +47,9 @@ public static PlcValue staticParse( // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 7); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 7); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -268,8 +268,7 @@ public static void staticSerialize( if (EvaluationHelper.equals(dataProtocolId, "IEC61131_BOOL")) { // BOOL // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 7, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 7, ((Number) (byte) 0x00).byteValue()); // Simple Field (value) boolean value = (boolean) _value.getBoolean(); /*TODO: migrate me*/ diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/DateAndTime.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/DateAndTime.java index fa0b0e1fbaa..6b52808638f 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/DateAndTime.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/DateAndTime.java @@ -44,7 +44,7 @@ public class DateAndTime implements Message { protected final short hour; protected final short minutes; protected final short seconds; - protected final int msec; + protected final short msec; protected final byte dow; public DateAndTime( @@ -54,7 +54,7 @@ public DateAndTime( short hour, short minutes, short seconds, - int msec, + short msec, byte dow) { super(); this.year = year; @@ -91,7 +91,7 @@ public short getSeconds() { return seconds; } - public int getMsec() { + public short getMsec() { return msec; } @@ -249,12 +249,12 @@ public static DateAndTime staticParse(ReadBuffer readBuffer) throws ParseExcepti (short) (org.apache.plc4x.java.s7.readwrite.utils.StaticHelper.BcdToInt(readBuffer))); - int msec = + short msec = readManualField( "msec", readBuffer, () -> - (int) + (short) (org.apache.plc4x.java.s7.readwrite.utils.StaticHelper.S7msecToInt( readBuffer))); diff --git a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7AddressAny.java b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7AddressAny.java index b9e124e6be8..d990a8d900d 100644 --- a/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7AddressAny.java +++ b/plc4j/drivers/s7/src/main/generated/org/apache/plc4x/java/s7/readwrite/S7AddressAny.java @@ -119,7 +119,7 @@ protected void serializeS7AddressChild(WriteBuffer writeBuffer) throws Serializa MemoryArea::getValue, MemoryArea::name, writeUnsignedShort(writeBuffer, 8))); // Reserved Field (reserved) - writeReservedField("reserved", (short) 0x00, writeUnsignedShort(writeBuffer, 5)); + writeReservedField("reserved", (byte) 0x00, writeUnsignedByte(writeBuffer, 5)); // Simple Field (byteAddress) writeSimpleField("byteAddress", byteAddress, writeUnsignedInt(writeBuffer, 16)); @@ -188,8 +188,8 @@ public static S7AddressBuilder staticParseS7AddressBuilder(ReadBuffer readBuffer new DataReaderEnumDefault<>( MemoryArea::enumForValue, readUnsignedShort(readBuffer, 8))); - Short reservedField0 = - readReservedField("reserved", readUnsignedShort(readBuffer, 5), (short) 0x00); + Byte reservedField0 = + readReservedField("reserved", readUnsignedByte(readBuffer, 5), (byte) 0x00); int byteAddress = readSimpleField("byteAddress", readUnsignedInt(readBuffer, 16)); diff --git a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7ProtocolLogic.java b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7ProtocolLogic.java index 05b9e14cc82..a5a1de7bca0 100644 --- a/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7ProtocolLogic.java +++ b/plc4j/drivers/s7/src/main/java/org/apache/plc4x/java/s7/readwrite/protocol/S7ProtocolLogic.java @@ -228,7 +228,7 @@ public void onConnect(ConversationContext context) { public void onDisconnect(ConversationContext context) { //1. Clear all pending requests and their associated transaction cleanFutures(); - //2. Here we shutdown the local task executor. + //2. Here we shut down the local task executor. clientExecutorService.shutdown(); //3. Performs the shutdown of the transaction executor. tm.shutdown(); @@ -253,9 +253,9 @@ public CompletableFuture read(PlcReadRequest readRequest) { if (request.getTags().get(0) instanceof S7SzlTag) { S7SzlTag szltag = (S7SzlTag) request.getTags().get(0); - final S7MessageUserData s7SzlMessageRequest = new S7MessageUserData(1, new S7ParameterUserData(Arrays.asList( + final S7MessageUserData s7SzlMessageRequest = new S7MessageUserData(1, new S7ParameterUserData(List.of( new S7ParameterUserDataItemCPUFunctions((short) 0x11, (byte) 0x4, (byte) 0x4, (short) 0x01, (short) 0x00, null, null, null) - )), new S7PayloadUserData(Arrays.asList( + )), new S7PayloadUserData(List.of( new S7PayloadUserDataItemCpuFunctionReadSzlRequest(DataTransportErrorCode.OK, DataTransportSize.OCTET_STRING, 0x04, @@ -344,7 +344,7 @@ private CompletableFuture readInternal(S7Message request) { new S7MessageUserData(tpduId, request.getParameter(), request.getPayload()) : new S7MessageRequest(tpduId, request.getParameter(), request.getPayload()); - TPKTPacket tpktPacket = new TPKTPacket(new COTPPacketData(null, message, true, (short) tpduId)); + TPKTPacket tpktPacket = new TPKTPacket(new COTPPacketData(null, message, true, (byte) tpduId)); // Start a new request-transaction (Is ended in the response-handler) RequestTransactionManager.RequestTransaction transaction = tm.startRequest(); @@ -409,7 +409,7 @@ public CompletableFuture write(PlcWriteRequest writeRequest) { new S7PayloadWriteVarRequest(payloadItems) ), true, - (short) tpduId + (byte) tpduId ) ); @@ -508,7 +508,7 @@ public CompletableFuture subscribe(PlcSubscriptionReque new S7MessageUserData(tpduId, new S7ParameterUserData(parameterItems), new S7PayloadUserData(payloadItems)), - true, (short) tpduId)); + true, (byte) tpduId)); // Start a new request-transaction (Is ended in the response-handler) RequestTransactionManager.RequestTransaction transaction = tm.startRequest(); @@ -574,10 +574,9 @@ public CompletableFuture unsubscribe(PlcUnsubscriptio future.completeExceptionally(new PlcRuntimeException("Not Supported")); return future; } - CompletableFuture future = new CompletableFuture<>(); - DefaultPlcUnsubscriptionRequest request = (DefaultPlcUnsubscriptionRequest) unsubscriptionRequest; - - return future; + /*CompletableFuture future =*/ return new CompletableFuture<>(); + // TODO: It seems the unsubscription hasn't been implemented yet. + //DefaultPlcUnsubscriptionRequest request = (DefaultPlcUnsubscriptionRequest) unsubscriptionRequest; } private void encodeEventSubscriptionRequest(DefaultPlcSubscriptionRequest request, @@ -627,13 +626,13 @@ private void encodeEventSubscriptionRequest(DefaultPlcSubscriptionRequest reques alarmtype = AlarmStateType.ALARM_S_INITIATE; } - short auxsubsevent = (short) (subsevent & 0xFF); + short auxSubsEvent = (short) (subsevent & 0xFF); payload = new S7PayloadUserDataItemCpuFunctionMsgSubscriptionRequest( DataTransportErrorCode.OK, DataTransportSize.OCTET_STRING, (short) 0x0c, - auxsubsevent, + auxSubsEvent, "HmiRtm ", alarmtype, (short) 0x00); @@ -652,13 +651,14 @@ private PlcSubscriptionResponse decodeEventSubscriptionRequest(String strTagName Map> values = new HashMap<>(); short errorClass = 0; short errorCode = 0; - if (responseMessage instanceof S7MessageUserData) { + // TODO: It seems this hasn't been implemented yet. + /*if (responseMessage instanceof S7MessageUserData) { S7MessageUserData messageUserData = (S7MessageUserData) responseMessage; S7PayloadUserData payload = (S7PayloadUserData) messageUserData.getPayload(); // errorClass = payload.getItems()[0]. // errorCode = messageUserData.getParameter(). - } else if (responseMessage instanceof S7MessageResponse) { + } else*/ if (responseMessage instanceof S7MessageResponse) { S7MessageResponse messageResponse = (S7MessageResponse) responseMessage; errorClass = messageResponse.getErrorClass(); errorCode = messageResponse.getErrorCode(); @@ -748,9 +748,9 @@ private PlcSubscriptionResponse decodeEventSubscriptionRequest(String strTagName } else if (payloadItems.get(0) instanceof S7PayloadUserDataItemCpuFunctionAlarmAckErrorResponse) { - S7PayloadUserDataItemCpuFunctionAlarmAckResponse items = + /*S7PayloadUserDataItemCpuFunctionAlarmAckResponse items = (S7PayloadUserDataItemCpuFunctionAlarmAckResponse) - payloadItems.get(0); + payloadItems.get(0);*/ //String fieldName = (String) S7PayloadUserDataItemCyclicServicesPush .getFieldNames().toArray()[0]; logger.warn("Request field: {}: {} {}", strTagName, S7ParamErrorCode.valueOf(errorCode), S7ParamErrorCode.valueOf(errorCode).getEvent()); values.put(strTagName, new ResponseItem<>(PlcResponseCode.NOT_FOUND, null)); @@ -762,18 +762,18 @@ private PlcSubscriptionResponse decodeEventSubscriptionRequest(String strTagName (S7PayloadUserDataItemCpuFunctionAlarmQueryResponse) payloadItems.get(0); ByteBuf buffer = Unpooled.directBuffer(items.getItems().length * 2); - ByteBuf rxbuffer = Unpooled.directBuffer(items.getItems().length * 2); + ByteBuf rxBuffer = Unpooled.directBuffer(items.getItems().length * 2); buffer.writeBytes(items.getItems()); - int numberOfItems = 1; + //int numberOfItems = 1; if (itemparameter.getLastDataUnit() == 1) { short loop = 0xff; - CompletableFuture loopfuture = null; - S7MessageUserData msg = null; - S7ParameterUserDataItemCPUFunctions loopparameter = null; + CompletableFuture loopfuture; + S7MessageUserData msg; + S7ParameterUserDataItemCPUFunctions loopparameter; S7PayloadUserDataItemCpuFunctionAlarmQueryResponse looppayload = null; do { @@ -797,19 +797,19 @@ private PlcSubscriptionResponse decodeEventSubscriptionRequest(String strTagName } } while (loop > 0x00); - rxbuffer.writeByte(looppayload.getReturnCode().getValue()); - rxbuffer.writeByte(looppayload.getTransportSize().getValue()); - rxbuffer.writeShort(looppayload.getDataLength()); - rxbuffer.writeBytes(buffer); + rxBuffer.writeByte(looppayload.getReturnCode().getValue()); + rxBuffer.writeByte(looppayload.getTransportSize().getValue()); + rxBuffer.writeShort(looppayload.getDataLength()); + rxBuffer.writeBytes(buffer); } else { - rxbuffer.writeByte(payloadItems.get(0).getReturnCode().getValue()); - rxbuffer.writeByte(payloadItems.get(0).getTransportSize().getValue()); - rxbuffer.writeShort(payloadItems.get(0).getDataLength()); - rxbuffer.writeBytes(buffer); + rxBuffer.writeByte(payloadItems.get(0).getReturnCode().getValue()); + rxBuffer.writeByte(payloadItems.get(0).getTransportSize().getValue()); + rxBuffer.writeShort(payloadItems.get(0).getDataLength()); + rxBuffer.writeBytes(buffer); } - ReadBuffer readBuffer = new ReadBufferByteBased(ByteBufUtil.getBytes(rxbuffer)); + ReadBuffer readBuffer = new ReadBufferByteBased(ByteBufUtil.getBytes(rxBuffer)); try { @@ -830,18 +830,18 @@ private PlcSubscriptionResponse decodeEventSubscriptionRequest(String strTagName logger.info(ex.toString()); } - PlcResponseCode rescode = (items.getReturnCode() == DataTransportErrorCode.OK) ? PlcResponseCode.OK : PlcResponseCode.INTERNAL_ERROR; - values.put(strTagName, new ResponseItem<>(rescode, null)); + PlcResponseCode resCode = (items.getReturnCode() == DataTransportErrorCode.OK) ? PlcResponseCode.OK : PlcResponseCode.INTERNAL_ERROR; + values.put(strTagName, new ResponseItem<>(resCode, null)); return new DefaultPlcSubscriptionResponse(plcSubscriptionRequest, values); } else if (payloadItems.get(0) instanceof S7PayloadUserDataItemCyclicServicesSubscribeResponse) { //S7ParameterUserData parameter = (S7ParameterUserData) responseMessage.getParameter(); //logger.info("Aqui debe responder a Cyclic transfer"); - S7ParameterUserDataItemCPUFunctions msgparameter = (S7ParameterUserDataItemCPUFunctions) + S7ParameterUserDataItemCPUFunctions msgParameter = (S7ParameterUserDataItemCPUFunctions) parameter.getItems().get(0); S7CyclicEvent cycevent = new S7CyclicEvent(plcSubscriptionRequest, - msgparameter.getSequenceNumber(), + msgParameter.getSequenceNumber(), (S7PayloadUserDataItemCyclicServicesSubscribeResponse) payloadItems.get(0)); eventQueue.add(cycevent); @@ -850,18 +850,19 @@ private PlcSubscriptionResponse decodeEventSubscriptionRequest(String strTagName } else if (payloadItems.get(0) instanceof S7PayloadUserDataItemCyclicServicesChangeDrivenSubscribeResponse) { //logger.info("Aqui debe responder a Cyclic transfer Change Driven"); - S7ParameterUserDataItemCPUFunctions msgparameter = (S7ParameterUserDataItemCPUFunctions) + S7ParameterUserDataItemCPUFunctions msgParameter = (S7ParameterUserDataItemCPUFunctions) parameter.getItems().get(0); - S7CyclicEvent cycevent = new S7CyclicEvent(plcSubscriptionRequest, - msgparameter.getSequenceNumber(), + S7CyclicEvent cycEvent = new S7CyclicEvent(plcSubscriptionRequest, + msgParameter.getSequenceNumber(), (S7PayloadUserDataItemCyclicServicesChangeDrivenSubscribeResponse) payloadItems.get(0)); - eventQueue.add(cycevent); + eventQueue.add(cycEvent); values.put(strTagName, new ResponseItem<>(PlcResponseCode.OK, cycHandle)); return new DefaultPlcSubscriptionResponse(plcSubscriptionRequest, values); } else if (payloadItems.get(0) instanceof S7PayloadUserDataItemCyclicServicesErrorResponse) { + // TODO: It seems this isn't fully implemented. //S7ParameterUserData parameter = (S7ParameterUserData) responseMessage.getParameter(); //S7ParameterUserDataItem[] parameters = parameter.getItems(); //S7ParameterUserDataItemCPUFunctions itemparameter = (S7ParameterUserDataItemCPUFunctions) parameters[0]; @@ -927,7 +928,7 @@ private void encodeAlarmAckRequest(DefaultPlcReadRequest request, parameterItems.add(parameter); ArrayList messageObjects = null; - BitSet bs = new BitSet(); + BitSet bs; for (String fieldName : request.getTagNames()) { if (request.getTag(fieldName) instanceof S7AckTag) { PlcTag field = request.getTag(fieldName); @@ -935,7 +936,7 @@ private void encodeAlarmAckRequest(DefaultPlcReadRequest request, ArrayList arrAlarmIds = ((S7AckTag) field).getAlarmIds(); ArrayList arrAlarmSigs = ((S7AckTag) field).getAlarmSigs(); //messageObjects = new AlarmMessageObjectAckType[arrAlarmIds.size()]; - messageObjects = new ArrayList(); + messageObjects = new ArrayList<>(); int j = 0; for (int i = 0; i < arrAlarmIds.size(); i++) { bs = BitSet.valueOf(new byte[]{arrAlarmSigs.get(i).byteValue()}); @@ -1038,7 +1039,7 @@ private void encodeCycledS7ANYSubscriptionRequest(PlcSubscriptionTag plctag, userfield.getNumberOfElements(), userfield.getBlockNumber(), userfield.getMemoryArea(), - ((((long) userfield.getByteOffset() << 3) | (userfield.getBitOffset() & 0x0007))) + (((userfield.getByteOffset() << 3) | (userfield.getBitOffset() & 0x0007))) )); i++; } @@ -1226,20 +1227,20 @@ protected void decode(ConversationContext context, TPKTPacket msg) t eventQueue.add(cycevent); } else if ((myparameter.getCpuFunctionGroup() == 0x02) && (myparameter.getCpuFunctionType() == 0x00) && (myparameter.getCpuSubfunction() == 0x05)) { - S7ParameterUserDataItemCPUFunctions parameteritem = + S7ParameterUserDataItemCPUFunctions parameterItem = (S7ParameterUserDataItemCPUFunctions) ((S7ParameterUserData) parameter).getItems().get(0); S7PayloadUserData payload = (S7PayloadUserData) s7msg.getPayload(); - S7PayloadUserDataItemCyclicServicesChangeDrivenPush payloaditem = + S7PayloadUserDataItemCyclicServicesChangeDrivenPush payloadItem = (S7PayloadUserDataItemCyclicServicesChangeDrivenPush) payload.getItems().get(0); - S7CyclicEvent cycevent = new S7CyclicEvent(null, - parameteritem.getSequenceNumber(), - payloaditem); - eventQueue.add(cycevent); + S7CyclicEvent cycEvent = new S7CyclicEvent(null, + parameterItem.getSequenceNumber(), + payloadItem); + eventQueue.add(cycEvent); } else if ((myparameter.getCpuFunctionType() == 0x08) && (myparameter.getCpuSubfunction() == 0x01)) { @@ -1295,7 +1296,7 @@ private TPKTPacket createIdentifyRemoteMessage() { SzlSublist.MODULE_IDENTIFICATION), 0x0000) ))); - COTPPacketData cotpPacketData = new COTPPacketData(null, identifyRemoteMessage, true, (short) 2); + COTPPacketData cotpPacketData = new COTPPacketData(null, identifyRemoteMessage, true, (byte) 2); return new TPKTPacket(cotpPacketData); } @@ -1324,7 +1325,7 @@ private TPKTPacket createS7ConnectionRequest(COTPPacketConnectionResponse cotpPa s7DriverContext.getMaxAmqCaller(), s7DriverContext.getMaxAmqCallee(), s7DriverContext.getPduSize()); S7Message s7Message = new S7MessageRequest(0, s7ParameterSetupCommunication, null); - COTPPacketData cotpPacketData = new COTPPacketData(null, s7Message, true, (short) 1); + COTPPacketData cotpPacketData = new COTPPacketData(null, s7Message, true, (byte) 1); return new TPKTPacket(cotpPacketData); } @@ -1449,9 +1450,9 @@ private PlcResponse decodeReadResponse(S7Message responseMessage, PlcReadRequest (S7PayloadUserDataItemCpuFunctionAlarmAckResponse) payloadItems.get(index); responseCode = decodeResponseCode(payloadItem.getReturnCode()); List data = payloadItem.getMessageObjects(); - LinkedList plcvalues = new LinkedList<>(); - for (short b : data) plcvalues.add(new PlcSINT((byte) b)); - plcValue = new PlcList(plcvalues); + LinkedList plcValues = new LinkedList<>(); + for (short b : data) plcValues.add(new PlcSINT((byte) b)); + plcValue = new PlcList(plcValues); } ResponseItem result = new ResponseItem<>(responseCode, plcValue); @@ -1782,7 +1783,7 @@ private TPKTPacket createSzlReassembledRequest(int tpduId, short sequenceNumber) DataTransportSize.NULL, 0x00) ))); - COTPPacketData cotpPacketData = new COTPPacketData(null, identifyRemoteMessage, true, (short) 2); + COTPPacketData cotpPacketData = new COTPPacketData(null, identifyRemoteMessage, true, (byte) 2); return new TPKTPacket(cotpPacketData); } @@ -1822,7 +1823,7 @@ private TPKTPacket createAlarmQueryReassembledRequest(int tpduId, short sequence DataTransportSize.NULL, 0x00) ))); - COTPPacketData cotpPacketData = new COTPPacketData(null, identifyRemoteMessage, true, (short) 2); + COTPPacketData cotpPacketData = new COTPPacketData(null, identifyRemoteMessage, true, (byte) 2); return new TPKTPacket(cotpPacketData); } diff --git a/plc4j/drivers/s7/src/test/java/S7IoTest.java b/plc4j/drivers/s7/src/test/java/S7IoTest.java index e110c5b5f62..a9ebf93204b 100644 --- a/plc4j/drivers/s7/src/test/java/S7IoTest.java +++ b/plc4j/drivers/s7/src/test/java/S7IoTest.java @@ -338,7 +338,7 @@ void TestS7MessageBytes() throws Exception { (short) 0 ), false, - (short) 13 + (byte) 13 ) ); // To string diff --git a/plc4j/drivers/simulated/src/main/generated/org/apache/plc4x/java/simulated/readwrite/DataItem.java b/plc4j/drivers/simulated/src/main/generated/org/apache/plc4x/java/simulated/readwrite/DataItem.java index 978d10d7410..09429091538 100644 --- a/plc4j/drivers/simulated/src/main/generated/org/apache/plc4x/java/simulated/readwrite/DataItem.java +++ b/plc4j/drivers/simulated/src/main/generated/org/apache/plc4x/java/simulated/readwrite/DataItem.java @@ -95,7 +95,7 @@ public static PlcValue staticParse(ReadBuffer readBuffer, String dataType, Integ value = new LinkedList<>(); for (int curItem = 0; curItem < itemCount; curItem++) { value.add( - new PlcUINT( + new PlcUSINT( (Short) /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readUnsignedShort("", 8))); } @@ -125,7 +125,7 @@ public static PlcValue staticParse(ReadBuffer readBuffer, String dataType, Integ value = new LinkedList<>(); for (int curItem = 0; curItem < itemCount; curItem++) { value.add( - new PlcUDINT( + new PlcUINT( (Integer) /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readUnsignedInt("", 16))); } @@ -155,7 +155,7 @@ public static PlcValue staticParse(ReadBuffer readBuffer, String dataType, Integ value = new LinkedList<>(); for (int curItem = 0; curItem < itemCount; curItem++) { value.add( - new PlcULINT( + new PlcUDINT( (Long) /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readUnsignedLong("", 32))); } @@ -186,7 +186,7 @@ public static PlcValue staticParse(ReadBuffer readBuffer, String dataType, Integ value = new LinkedList<>(); for (int curItem = 0; curItem < itemCount; curItem++) { value.add( - new PlcLINT( + new PlcULINT( (BigInteger) /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readUnsignedBigInteger("", 64))); } @@ -333,7 +333,7 @@ public static PlcValue staticParse(ReadBuffer readBuffer, String dataType, Integ value = new LinkedList<>(); for (int curItem = 0; curItem < itemCount; curItem++) { value.add( - new PlcUINT( + new PlcUSINT( (Short) /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readUnsignedShort("", 8))); } @@ -363,7 +363,7 @@ public static PlcValue staticParse(ReadBuffer readBuffer, String dataType, Integ value = new LinkedList<>(); for (int curItem = 0; curItem < itemCount; curItem++) { value.add( - new PlcUDINT( + new PlcUINT( (Integer) /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readUnsignedInt("", 16))); } @@ -393,7 +393,7 @@ public static PlcValue staticParse(ReadBuffer readBuffer, String dataType, Integ value = new LinkedList<>(); for (int curItem = 0; curItem < itemCount; curItem++) { value.add( - new PlcULINT( + new PlcUDINT( (Long) /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readUnsignedLong("", 32))); } @@ -424,7 +424,7 @@ public static PlcValue staticParse(ReadBuffer readBuffer, String dataType, Integ value = new LinkedList<>(); for (int curItem = 0; curItem < itemCount; curItem++) { value.add( - new PlcLINT( + new PlcULINT( (BigInteger) /*TODO: migrate me*/ /*TODO: migrate me*/ readBuffer.readUnsignedBigInteger("", 64))); } diff --git a/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/values/PlcBINT.java b/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/values/PlcBINT.java new file mode 100644 index 00000000000..7592fb9521e --- /dev/null +++ b/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/values/PlcBINT.java @@ -0,0 +1,232 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.plc4x.java.spi.values; + +import org.apache.plc4x.java.api.types.PlcValueType; +import org.apache.plc4x.java.spi.generation.SerializationException; +import org.apache.plc4x.java.spi.generation.WriteBuffer; + +import java.math.BigDecimal; +import java.math.BigInteger; + +public class PlcBINT extends PlcIECValue { + + public static PlcBINT of(Object value) { + if (value instanceof Boolean) { + return new PlcBINT((Boolean) value); + } else if (value instanceof Byte) { + return new PlcBINT((Byte) value); + } else if (value instanceof Short) { + return new PlcBINT((Short) value); + } else if (value instanceof Integer) { + return new PlcBINT((Integer) value); + } else if (value instanceof Long) { + return new PlcBINT((Long) value); + } else if (value instanceof Float) { + return new PlcBINT((Float) value); + } else if (value instanceof Double) { + return new PlcBINT((Double) value); + } else if (value instanceof BigInteger) { + return new PlcBINT((BigInteger) value); + } else if (value instanceof BigDecimal) { + return new PlcBINT((BigDecimal) value); + } else { + return new PlcBINT((String) value); + } + } + + public PlcBINT(Boolean value) { + this.value = value ? BigInteger.valueOf(1) : BigInteger.valueOf(0); + this.isNullable = false; + } + + public PlcBINT(Byte value) { + this.value = BigInteger.valueOf(value);; + this.isNullable = false; + } + + public PlcBINT(Short value) { + this.value = BigInteger.valueOf(value);; + this.isNullable = false; + } + + public PlcBINT(Integer value) { + this.value = BigInteger.valueOf(value);; + this.isNullable = false; + } + + public PlcBINT(Long value) { + this.value = BigInteger.valueOf(value);; + this.isNullable = false; + } + + public PlcBINT(Float value) { + this.value = BigDecimal.valueOf(value).toBigInteger(); + this.isNullable = false; + } + + public PlcBINT(Double value) { + this.value = BigDecimal.valueOf(value).toBigInteger(); + this.isNullable = false; + } + + public PlcBINT(BigInteger value) { + this.value = value; + this.isNullable = false; + } + + public PlcBINT(BigDecimal value) { + this.value = value.toBigInteger(); + this.isNullable = false; + } + + public PlcBINT(String value) { + this.value = new BigInteger(value.trim());; + this.isNullable = false; + } + + @Override + public PlcValueType getPlcValueType() { + return PlcValueType.ULINT; + } + + @Override + public boolean isBoolean() { + return true; + } + + @Override + public boolean getBoolean() { + return (value != null) && !value.equals(BigInteger.ZERO); + } + + @Override + public boolean isByte() { + return (value != null) && (value.compareTo(BigInteger.valueOf(Byte.MAX_VALUE)) <= 0) && (value.compareTo(BigInteger.valueOf(Byte.MIN_VALUE)) >= 0); + } + + @Override + public byte getByte() { + return value.byteValue(); + } + + @Override + public boolean isShort() { + return (value != null) && (value.compareTo(BigInteger.valueOf(Short.MAX_VALUE)) <= 0) && (value.compareTo(BigInteger.valueOf(Short.MIN_VALUE)) >= 0); + } + + @Override + public short getShort() { + return value.shortValue(); + } + + @Override + public boolean isInteger() { + return (value != null) && (value.compareTo(BigInteger.valueOf(Integer.MAX_VALUE)) <= 0) && (value.compareTo(BigInteger.valueOf(Integer.MIN_VALUE)) >= 0); + } + + @Override + public int getInteger() { + return value.intValue(); + } + + @Override + public boolean isLong() { + return (value != null) && (value.compareTo(BigInteger.valueOf(Long.MAX_VALUE)) <= 0) && (value.compareTo(BigInteger.valueOf(Long.MIN_VALUE)) >= 0); + } + + @Override + public long getLong() { + return value.longValue(); + } + + @Override + public boolean isBigInteger() { + return true; + } + + @Override + public BigInteger getBigInteger() { + return value; + } + + @Override + public boolean isFloat() { + return true; + } + + @Override + public float getFloat() { + return value.floatValue(); + } + + @Override + public boolean isDouble() { + return true; + } + + @Override + public double getDouble() { + return value.doubleValue(); + } + + @Override + public boolean isBigDecimal() { + return true; + } + + @Override + public BigDecimal getBigDecimal() { + return new BigDecimal(value); + } + + @Override + public boolean isString() { + return true; + } + + @Override + public String getString() { + return toString(); + } + + @Override + public String toString() { + return value.toString(); + } + + public byte[] getBytes() { + byte[] tmp = value.toByteArray(); + byte[] bytes = new byte[8]; + for (int i = 0; i < bytes.length; i++) { + if (i >= (bytes.length - tmp.length)) { + bytes[i] = tmp[i - (bytes.length - tmp.length)]; + } else { + bytes[i] = 0x00; + } + } + return bytes; + } + + @Override + public void serialize(WriteBuffer writeBuffer) throws SerializationException { + writeBuffer.writeBigInteger(getClass().getSimpleName(), 64, value); + } + +} diff --git a/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/values/PlcBREAL.java b/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/values/PlcBREAL.java new file mode 100644 index 00000000000..8fd5aac9886 --- /dev/null +++ b/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/values/PlcBREAL.java @@ -0,0 +1,233 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.plc4x.java.spi.values; + +import org.apache.plc4x.java.api.types.PlcValueType; +import org.apache.plc4x.java.spi.generation.SerializationException; +import org.apache.plc4x.java.spi.generation.WriteBuffer; + +import java.math.BigDecimal; +import java.math.BigInteger; + +public class PlcBREAL extends PlcIECValue { + + public static PlcBREAL of(Object value) { + if (value instanceof Boolean) { + return new PlcBREAL((Boolean) value); + } else if (value instanceof Byte) { + return new PlcBREAL((Byte) value); + } else if (value instanceof Short) { + return new PlcBREAL((Short) value); + } else if (value instanceof Integer) { + return new PlcBREAL((Integer) value); + } else if (value instanceof Long) { + return new PlcBREAL((Long) value); + } else if (value instanceof Float) { + return new PlcBREAL((Float) value); + } else if (value instanceof Double) { + return new PlcBREAL((Double) value); + } else if (value instanceof BigInteger) { + return new PlcBREAL((BigInteger) value); + } else if (value instanceof BigDecimal) { + return new PlcBREAL((BigDecimal) value); + } else { + return new PlcBREAL((String) value); + } + } + + public PlcBREAL(Boolean value) { + this.value = value ? BigDecimal.valueOf(1) : BigDecimal.valueOf(0); + this.isNullable = false; + } + + public PlcBREAL(Byte value) { + this.value = BigDecimal.valueOf(value);; + this.isNullable = false; + } + + public PlcBREAL(Short value) { + this.value = BigDecimal.valueOf(value);; + this.isNullable = false; + } + + public PlcBREAL(Integer value) { + this.value = BigDecimal.valueOf(value);; + this.isNullable = false; + } + + public PlcBREAL(Long value) { + this.value = BigDecimal.valueOf(value);; + this.isNullable = false; + } + + public PlcBREAL(Float value) { + this.value = BigDecimal.valueOf(value); + this.isNullable = false; + } + + public PlcBREAL(Double value) { + this.value = BigDecimal.valueOf(value); + this.isNullable = false; + } + + public PlcBREAL(BigInteger value) { + this.value = new BigDecimal(value); + this.isNullable = false; + } + + public PlcBREAL(BigDecimal value) { + this.value = value; + this.isNullable = false; + } + + public PlcBREAL(String value) { + this.value = new BigDecimal(value.trim());; + this.isNullable = false; + } + + @Override + public PlcValueType getPlcValueType() { + return PlcValueType.ULINT; + } + + @Override + public boolean isBoolean() { + return true; + } + + @Override + public boolean getBoolean() { + return (value != null) && !value.equals(BigDecimal.ZERO); + } + + @Override + public boolean isByte() { + return (value != null) && (value.compareTo(BigDecimal.valueOf(Byte.MAX_VALUE)) <= 0) && (value.compareTo(BigDecimal.valueOf(Byte.MIN_VALUE)) >= 0); + } + + @Override + public byte getByte() { + return value.byteValue(); + } + + @Override + public boolean isShort() { + return (value != null) && (value.compareTo(BigDecimal.valueOf(Short.MAX_VALUE)) <= 0) && (value.compareTo(BigDecimal.valueOf(Short.MIN_VALUE)) >= 0); + } + + @Override + public short getShort() { + return value.shortValue(); + } + + @Override + public boolean isInteger() { + return (value != null) && (value.compareTo(BigDecimal.valueOf(Integer.MAX_VALUE)) <= 0) && (value.compareTo(BigDecimal.valueOf(Integer.MIN_VALUE)) >= 0); + } + + @Override + public int getInteger() { + return value.intValue(); + } + + @Override + public boolean isLong() { + return (value != null) && (value.compareTo(BigDecimal.valueOf(Long.MAX_VALUE)) <= 0) && (value.compareTo(BigDecimal.valueOf(Long.MIN_VALUE)) >= 0); + } + + @Override + public long getLong() { + return value.longValue(); + } + + @Override + public boolean isBigInteger() { + return true; + } + + @Override + public BigInteger getBigInteger() { + return value.toBigInteger(); + } + + @Override + public boolean isFloat() { + return true; + } + + @Override + public float getFloat() { + return value.floatValue(); + } + + @Override + public boolean isDouble() { + return true; + } + + @Override + public double getDouble() { + return value.doubleValue(); + } + + @Override + public boolean isBigDecimal() { + return true; + } + + @Override + public BigDecimal getBigDecimal() { + return value; + } + + @Override + public boolean isString() { + return true; + } + + @Override + public String getString() { + return toString(); + } + + @Override + public String toString() { + return value.toString(); + } + + public byte[] getBytes() { + // TODO: Not sure if this is correct ... + byte[] tmp = value.unscaledValue().toByteArray(); + byte[] bytes = new byte[8]; + for (int i = 0; i < bytes.length; i++) { + if (i >= (bytes.length - tmp.length)) { + bytes[i] = tmp[i - (bytes.length - tmp.length)]; + } else { + bytes[i] = 0x00; + } + } + return bytes; + } + + @Override + public void serialize(WriteBuffer writeBuffer) throws SerializationException { + writeBuffer.writeBigDecimal(getClass().getSimpleName(), 64, value); + } + +} diff --git a/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/values/PlcUBINT.java b/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/values/PlcUBINT.java new file mode 100644 index 00000000000..ab389453c4f --- /dev/null +++ b/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/values/PlcUBINT.java @@ -0,0 +1,287 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.plc4x.java.spi.values; + +import org.apache.plc4x.java.api.exceptions.PlcInvalidTagException; +import org.apache.plc4x.java.api.types.PlcValueType; +import org.apache.plc4x.java.spi.generation.SerializationException; +import org.apache.plc4x.java.spi.generation.WriteBuffer; + +import java.math.BigDecimal; +import java.math.BigInteger; + +public class PlcUBINT extends PlcIECValue { + + private static final String VALUE_OUT_OF_RANGE = "Value of type %s is out of range %d - infinity for a %s Value"; + static final BigInteger minValue = BigInteger.valueOf(0); + + public static PlcUBINT of(Object value) { + if (value instanceof Boolean) { + return new PlcUBINT((Boolean) value); + } else if (value instanceof Byte) { + return new PlcUBINT((Byte) value); + } else if (value instanceof Short) { + return new PlcUBINT((Short) value); + } else if (value instanceof Integer) { + return new PlcUBINT((Integer) value); + } else if (value instanceof Long) { + return new PlcUBINT((Long) value); + } else if (value instanceof Float) { + return new PlcUBINT((Float) value); + } else if (value instanceof Double) { + return new PlcUBINT((Double) value); + } else if (value instanceof BigInteger) { + return new PlcUBINT((BigInteger) value); + } else if (value instanceof BigDecimal) { + return new PlcUBINT((BigDecimal) value); + } else { + return new PlcUBINT((String) value); + } + } + + public PlcUBINT(Boolean value) { + this.value = value ? BigInteger.valueOf(1) : BigInteger.valueOf(0); + this.isNullable = false; + } + + public PlcUBINT(Byte value) { + BigInteger val = BigInteger.valueOf(value); + if (val.compareTo(minValue) < 0) { + throw new PlcInvalidTagException(String.format(VALUE_OUT_OF_RANGE, value, minValue, this.getClass().getSimpleName())); + } + this.value = val; + this.isNullable = false; + } + + public PlcUBINT(Short value) { + BigInteger val = BigInteger.valueOf(value); + if (val.compareTo(minValue) < 0) { + throw new PlcInvalidTagException(String.format(VALUE_OUT_OF_RANGE, value, minValue, this.getClass().getSimpleName())); + } + this.value = val; + this.isNullable = false; + } + + public PlcUBINT(Integer value) { + BigInteger val = BigInteger.valueOf(value); + if (val.compareTo(minValue) < 0) { + throw new PlcInvalidTagException(String.format(VALUE_OUT_OF_RANGE, value, minValue, this.getClass().getSimpleName())); + } + this.value = val; + this.isNullable = false; + } + + public PlcUBINT(Long value) { + BigInteger val = BigInteger.valueOf(value); + if (val.compareTo(minValue) < 0) { + throw new PlcInvalidTagException(String.format(VALUE_OUT_OF_RANGE, value, minValue, this.getClass().getSimpleName())); + } + this.value = val; + this.isNullable = false; + } + + public PlcUBINT(Float value) { + try { + BigInteger val = BigDecimal.valueOf(value).toBigInteger(); + if (val.compareTo(minValue) < 0) { + throw new PlcInvalidTagException(String.format(VALUE_OUT_OF_RANGE, value, minValue, this.getClass().getSimpleName())); + } + this.value = val; + this.isNullable = false; + } catch (Exception e) { + throw new PlcInvalidTagException(String.format(VALUE_OUT_OF_RANGE, value, minValue, this.getClass().getSimpleName()), e); + } + } + + public PlcUBINT(Double value) { + try { + BigInteger val = BigDecimal.valueOf(value).toBigInteger(); + if (val.compareTo(minValue) < 0) { + throw new PlcInvalidTagException(String.format(VALUE_OUT_OF_RANGE, value, minValue, this.getClass().getSimpleName())); + } + this.value = val; + this.isNullable = false; + } catch (Exception e) { + throw new PlcInvalidTagException(String.format(VALUE_OUT_OF_RANGE, value, minValue, this.getClass().getSimpleName()), e); + } + } + + public PlcUBINT(BigInteger value) { + if (value.compareTo(minValue) < 0) { + throw new PlcInvalidTagException(String.format(VALUE_OUT_OF_RANGE, value, minValue, this.getClass().getSimpleName())); + } + this.value = value; + this.isNullable = false; + } + + public PlcUBINT(BigDecimal value) { + try { + BigInteger val = value.toBigInteger(); + if (val.compareTo(minValue) < 0) { + throw new PlcInvalidTagException(String.format(VALUE_OUT_OF_RANGE, value, minValue, this.getClass().getSimpleName())); + } + this.value = val; + this.isNullable = false; + } catch (Exception e) { + throw new PlcInvalidTagException(String.format(VALUE_OUT_OF_RANGE, value, minValue, this.getClass().getSimpleName()), e); + } + } + + public PlcUBINT(String value) { + try { + BigInteger val = new BigInteger(value.trim()); + if (val.compareTo(minValue) < 0) { + throw new PlcInvalidTagException(String.format(VALUE_OUT_OF_RANGE, value, minValue, this.getClass().getSimpleName())); + } + this.value = val; + this.isNullable = false; + } catch (Exception e) { + throw new PlcInvalidTagException(String.format(VALUE_OUT_OF_RANGE, value, minValue, this.getClass().getSimpleName()), e); + } + } + + @Override + public PlcValueType getPlcValueType() { + return PlcValueType.ULINT; + } + + @Override + public boolean isBoolean() { + return true; + } + + @Override + public boolean getBoolean() { + return (value != null) && !value.equals(BigInteger.ZERO); + } + + @Override + public boolean isByte() { + return (value != null) && (value.compareTo(BigInteger.valueOf(Byte.MAX_VALUE)) <= 0) && (value.compareTo(BigInteger.valueOf(Byte.MIN_VALUE)) >= 0); + } + + @Override + public byte getByte() { + return value.byteValue(); + } + + @Override + public boolean isShort() { + return (value != null) && (value.compareTo(BigInteger.valueOf(Short.MAX_VALUE)) <= 0) && (value.compareTo(BigInteger.valueOf(Short.MIN_VALUE)) >= 0); + } + + @Override + public short getShort() { + return value.shortValue(); + } + + @Override + public boolean isInteger() { + return (value != null) && (value.compareTo(BigInteger.valueOf(Integer.MAX_VALUE)) <= 0) && (value.compareTo(BigInteger.valueOf(Integer.MIN_VALUE)) >= 0); + } + + @Override + public int getInteger() { + return value.intValue(); + } + + @Override + public boolean isLong() { + return (value != null) && (value.compareTo(BigInteger.valueOf(Long.MAX_VALUE)) <= 0) && (value.compareTo(BigInteger.valueOf(Long.MIN_VALUE)) >= 0); + } + + @Override + public long getLong() { + return value.longValue(); + } + + @Override + public boolean isBigInteger() { + return true; + } + + @Override + public BigInteger getBigInteger() { + return value; + } + + @Override + public boolean isFloat() { + return true; + } + + @Override + public float getFloat() { + return value.floatValue(); + } + + @Override + public boolean isDouble() { + return true; + } + + @Override + public double getDouble() { + return value.doubleValue(); + } + + @Override + public boolean isBigDecimal() { + return true; + } + + @Override + public BigDecimal getBigDecimal() { + return new BigDecimal(value); + } + + @Override + public boolean isString() { + return true; + } + + @Override + public String getString() { + return toString(); + } + + @Override + public String toString() { + return value.toString(); + } + + public byte[] getBytes() { + byte[] tmp = value.toByteArray(); + byte[] bytes = new byte[8]; + for (int i = 0; i < bytes.length; i++) { + if (i >= (bytes.length - tmp.length)) { + bytes[i] = tmp[i - (bytes.length - tmp.length)]; + } else { + bytes[i] = 0x00; + } + } + return bytes; + } + + @Override + public void serialize(WriteBuffer writeBuffer) throws SerializationException { + writeBuffer.writeBigInteger(getClass().getSimpleName(), 64, value); + } + +} diff --git a/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xValue.java b/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xValue.java index 6d856ea4487..df01b18ac31 100644 --- a/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xValue.java +++ b/plc4j/tools/plc4x-server/src/main/generated/org/apache/plc4x/java/plc4x/readwrite/Plc4xValue.java @@ -47,9 +47,9 @@ public static PlcValue staticParse(ReadBuffer readBuffer, Plc4xValueType valueTy // Reserved Field (Compartmentalized so the "reserved" variable can't leak) { - short reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ - readBuffer.readUnsignedShort("", 7); - if (reserved != (short) 0x00) { + byte reserved = /*TODO: migrate me*/ /*TODO: migrate me*/ + readBuffer.readUnsignedByte("", 7); + if (reserved != (byte) 0x00) { LOGGER.info( "Expected constant value " + 0x00 + " but got " + reserved + " for reserved field."); } @@ -237,8 +237,7 @@ public static void staticSerialize( if (EvaluationHelper.equals(valueType, Plc4xValueType.BOOL)) { // BOOL // Reserved Field /*TODO: migrate me*/ - /*TODO: migrate me*/ writeBuffer.writeUnsignedShort( - "", 7, ((Number) (short) 0x00).shortValue()); + /*TODO: migrate me*/ writeBuffer.writeUnsignedByte("", 7, ((Number) (byte) 0x00).byteValue()); // Simple Field (value) boolean value = (boolean) _value.getBoolean(); /*TODO: migrate me*/ diff --git a/plc4j/utils/plc-simulator/src/main/java/org/apache/plc4x/simulator/server/bacnet/protocol/BacnetServerAdapter.java b/plc4j/utils/plc-simulator/src/main/java/org/apache/plc4x/simulator/server/bacnet/protocol/BacnetServerAdapter.java index 8f21eca0a00..ab38975bc26 100644 --- a/plc4j/utils/plc-simulator/src/main/java/org/apache/plc4x/simulator/server/bacnet/protocol/BacnetServerAdapter.java +++ b/plc4j/utils/plc-simulator/src/main/java/org/apache/plc4x/simulator/server/bacnet/protocol/BacnetServerAdapter.java @@ -169,7 +169,7 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception null, null, new BACnetServiceAckReadProperty( - StaticHelper.createBACnetContextTagObjectIdentifier((byte) 0, 2, 1L), + StaticHelper.createBACnetContextTagObjectIdentifier((byte) 0, (short) 2, 1), StaticHelper.createBACnetPropertyIdentifierTagged((byte) 1, 85), null, new BACnetConstructedDataAnalogValuePresentValue( diff --git a/plc4j/utils/plc-simulator/src/main/java/org/apache/plc4x/simulator/server/cbus/protocol/CBusServerAdapter.java b/plc4j/utils/plc-simulator/src/main/java/org/apache/plc4x/simulator/server/cbus/protocol/CBusServerAdapter.java index 879eeaed13d..aa0f9d729ac 100644 --- a/plc4j/utils/plc-simulator/src/main/java/org/apache/plc4x/simulator/server/cbus/protocol/CBusServerAdapter.java +++ b/plc4j/utils/plc-simulator/src/main/java/org/apache/plc4x/simulator/server/cbus/protocol/CBusServerAdapter.java @@ -498,7 +498,7 @@ private static void sendStatusBytes(ChannelHandlerContext ctx, String logMessage } private void handleCalDataIdentify(ChannelHandlerContext ctx, CALDataIdentify calDataIdentify, Alpha alpha) { - short numBytes; + byte numBytes; IdentifyReplyCommand identifyReplyCommand; switch (calDataIdentify.getAttribute()) { case Manufacturer: diff --git a/plc4j/utils/plc-simulator/src/main/java/org/apache/plc4x/simulator/server/s7/protocol/S7Step7ServerAdapter.java b/plc4j/utils/plc-simulator/src/main/java/org/apache/plc4x/simulator/server/s7/protocol/S7Step7ServerAdapter.java index 2a38958a0fe..795e0d1d894 100644 --- a/plc4j/utils/plc-simulator/src/main/java/org/apache/plc4x/simulator/server/s7/protocol/S7Step7ServerAdapter.java +++ b/plc4j/utils/plc-simulator/src/main/java/org/apache/plc4x/simulator/server/s7/protocol/S7Step7ServerAdapter.java @@ -123,7 +123,7 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception } COTPPacketData packetData = (COTPPacketData) cotpPacket; - final short cotpTpduRef = packetData.getTpduRef(); + final byte cotpTpduRef = packetData.getTpduRef(); final S7Message payload = packetData.getPayload(); if (!(payload instanceof S7MessageRequest)) { LOGGER.error("Expecting S7 Message Request"); @@ -160,7 +160,7 @@ public void channelRead(ChannelHandlerContext ctx, Object msg) throws Exception } COTPPacketData packetData = (COTPPacketData) cotpPacket; - final short cotpTpduRef = packetData.getTpduRef(); + final byte cotpTpduRef = packetData.getTpduRef(); final S7Message payload = packetData.getPayload(); if (payload instanceof S7MessageUserData) { S7MessageUserData s7MessageUserData = (S7MessageUserData) payload; diff --git a/protocols/canopen/src/main/resources/protocols/can/canopen.mspec b/protocols/canopen/src/main/resources/protocols/can/canopen.mspec index 1303e0dfd38..0dd435af137 100644 --- a/protocols/canopen/src/main/resources/protocols/can/canopen.mspec +++ b/protocols/canopen/src/main/resources/protocols/can/canopen.mspec @@ -235,9 +235,9 @@ [type CANOpenTime // CiA 301 - section 7.1.6.5 and 7.1.6.6 - [simple uint 28 millis] - [reserved int 4 '0x00'] - [simple uint 16 days] + [simple uint 32 millis] + [virtual uint 28 cleanMillis 'millis & 0x0FFFFFFF'] + [simple uint 16 days] ] [enum CANOpenDataType (uint 8 numBits, vstring plcValueName) diff --git a/protocols/canopen/src/test/resources/protocols/canopen/CANOpenPayloadTestSuite.xml b/protocols/canopen/src/test/resources/protocols/canopen/CANOpenPayloadTestSuite.xml index e215399cc29..f63c34b5d91 100644 --- a/protocols/canopen/src/test/resources/protocols/canopen/CANOpenPayloadTestSuite.xml +++ b/protocols/canopen/src/test/resources/protocols/canopen/CANOpenPayloadTestSuite.xml @@ -40,8 +40,7 @@ - 3631939850 - 0 + 2159876000 13392 @@ -55,7 +54,7 @@ - 7019BE805034 + 7019BE835034 CANOpenPayload TIME @@ -65,8 +64,7 @@ - 3902472455 - 0 + 2210273648 13392