hutcheb commented on code in PR #1376:
URL: https://github.com/apache/plc4x/pull/1376#discussion_r1477182373
##########
plc4j/drivers/ads/src/main/generated/org/apache/plc4x/java/ads/readwrite/DataItem.java:
##########
@@ -45,490 +48,376 @@ public static PlcValue staticParse(
ReadBuffer readBuffer, PlcValueType plcValueType, Integer stringLength)
throws ParseException {
if (EvaluationHelper.equals(plcValueType, PlcValueType.BOOL)) { // BOOL
+ Byte reservedField0 =
+ readReservedField("reserved", readUnsignedByte(readBuffer, 7),
(byte) 0x00);
- // Reserved Field (Compartmentalized so the "reserved" variable can't
leak)
- {
- 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.");
- }
- }
-
- // Simple Field (value)
- Boolean value = /*TODO: migrate me*/ /*TODO: migrate me*/
readBuffer.readBit("");
-
+ boolean value = readSimpleField("value", readBoolean(readBuffer));
return new PlcBOOL(value);
} else if (EvaluationHelper.equals(plcValueType, PlcValueType.BYTE)) { //
BYTE
-
- // Simple Field (value)
- Short value = /*TODO: migrate me*/ /*TODO: migrate me*/
readBuffer.readUnsignedShort("", 8);
-
+ short value = readSimpleField("value", readUnsignedShort(readBuffer, 8));
return new PlcBYTE(value);
} else if (EvaluationHelper.equals(plcValueType, PlcValueType.WORD)) { //
WORD
-
- // Simple Field (value)
- Integer value = /*TODO: migrate me*/ /*TODO: migrate me*/
readBuffer.readUnsignedInt("", 16);
-
+ int value = readSimpleField("value", readUnsignedInt(readBuffer, 16));
return new PlcWORD(value);
} else if (EvaluationHelper.equals(plcValueType, PlcValueType.DWORD)) { //
DWORD
-
- // Simple Field (value)
- Long value = /*TODO: migrate me*/ /*TODO: migrate me*/
readBuffer.readUnsignedLong("", 32);
-
+ long value = readSimpleField("value", readUnsignedLong(readBuffer, 32));
return new PlcDWORD(value);
} else if (EvaluationHelper.equals(plcValueType, PlcValueType.LWORD)) { //
LWORD
-
- // Simple Field (value)
- BigInteger value = /*TODO: migrate me*/ /*TODO: migrate me*/
- readBuffer.readUnsignedBigInteger("", 64);
-
+ BigInteger value = readSimpleField("value",
readUnsignedBigInteger(readBuffer, 64));
return new PlcLWORD(value);
} else if (EvaluationHelper.equals(plcValueType, PlcValueType.SINT)) { //
SINT
-
- // Simple Field (value)
- Byte value = /*TODO: migrate me*/ /*TODO: migrate me*/
readBuffer.readSignedByte("", 8);
-
+ byte value = readSimpleField("value", readSignedByte(readBuffer, 8));
return new PlcSINT(value);
} else if (EvaluationHelper.equals(plcValueType, PlcValueType.USINT)) { //
USINT
-
- // Simple Field (value)
- Short value = /*TODO: migrate me*/ /*TODO: migrate me*/
readBuffer.readUnsignedShort("", 8);
-
+ short value = readSimpleField("value", readUnsignedShort(readBuffer, 8));
return new PlcUSINT(value);
} else if (EvaluationHelper.equals(plcValueType, PlcValueType.INT)) { //
INT
-
- // Simple Field (value)
- Short value = /*TODO: migrate me*/ /*TODO: migrate me*/
readBuffer.readShort("", 16);
-
+ short value = readSimpleField("value", readSignedShort(readBuffer, 16));
return new PlcINT(value);
} else if (EvaluationHelper.equals(plcValueType, PlcValueType.UINT)) { //
UINT
-
- // Simple Field (value)
- Integer value = /*TODO: migrate me*/ /*TODO: migrate me*/
readBuffer.readUnsignedInt("", 16);
-
+ int value = readSimpleField("value", readUnsignedInt(readBuffer, 16));
return new PlcUINT(value);
} else if (EvaluationHelper.equals(plcValueType, PlcValueType.DINT)) { //
DINT
-
- // Simple Field (value)
- Integer value = /*TODO: migrate me*/ /*TODO: migrate me*/
readBuffer.readInt("", 32);
-
+ int value = readSimpleField("value", readSignedInt(readBuffer, 32));
return new PlcDINT(value);
} else if (EvaluationHelper.equals(plcValueType, PlcValueType.UDINT)) { //
UDINT
-
- // Simple Field (value)
- Long value = /*TODO: migrate me*/ /*TODO: migrate me*/
readBuffer.readUnsignedLong("", 32);
-
+ long value = readSimpleField("value", readUnsignedLong(readBuffer, 32));
return new PlcUDINT(value);
} else if (EvaluationHelper.equals(plcValueType, PlcValueType.LINT)) { //
LINT
-
- // Simple Field (value)
- Long value = /*TODO: migrate me*/ /*TODO: migrate me*/
readBuffer.readLong("", 64);
-
+ long value = readSimpleField("value", readSignedLong(readBuffer, 64));
return new PlcLINT(value);
} else if (EvaluationHelper.equals(plcValueType, PlcValueType.ULINT)) { //
ULINT
-
- // Simple Field (value)
- BigInteger value = /*TODO: migrate me*/ /*TODO: migrate me*/
- readBuffer.readUnsignedBigInteger("", 64);
-
+ BigInteger value = readSimpleField("value",
readUnsignedBigInteger(readBuffer, 64));
return new PlcULINT(value);
} else if (EvaluationHelper.equals(plcValueType, PlcValueType.REAL)) { //
REAL
-
- // Simple Field (value)
- Float value = /*TODO: migrate me*/ /*TODO: migrate me*/
readBuffer.readFloat("", 32);
-
+ float value = readSimpleField("value", readFloat(readBuffer, 32));
return new PlcREAL(value);
} else if (EvaluationHelper.equals(plcValueType, PlcValueType.LREAL)) { //
LREAL
-
- // Simple Field (value)
- Double value = /*TODO: migrate me*/ /*TODO: migrate me*/
readBuffer.readDouble("", 64);
-
+ double value = readSimpleField("value", readDouble(readBuffer, 64));
return new PlcLREAL(value);
} else if (EvaluationHelper.equals(plcValueType, PlcValueType.CHAR)) { //
CHAR
-
- // Simple Field (value)
- String value = /*TODO: migrate me*/ /*TODO: migrate me*/
- readBuffer.readString("", 8,
WithOption.WithEncoding("Windows-1252"));
-
+ String value =
+ readSimpleField(
+ "value", readString(readBuffer, 8),
WithOption.WithEncoding("Windows-1252"));
return new PlcCHAR(value);
} else if (EvaluationHelper.equals(plcValueType, PlcValueType.WCHAR)) { //
WCHAR
-
- // Simple Field (value)
- String value = /*TODO: migrate me*/ /*TODO: migrate me*/
- readBuffer.readString("", 16, WithOption.WithEncoding("UTF-16LE"));
-
+ String value =
+ readSimpleField("value", readString(readBuffer, 16),
WithOption.WithEncoding("UTF-16LE"));
Review Comment:
Is this right, looks like readString gets called without the encoding info?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: dev-unsubscr...@plc4x.apache.org
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
