feat: Got the first tests working with UMAS.

Author: chrisdutz

plc4j/drivers/umas/pom.xml

@@ -110,6 +110,10 @@
       <groupId>io.netty</groupId>
       <artifactId>netty-buffer</artifactId>
     </dependency>
+    <dependency>
+      <groupId>io.netty</groupId>
+      <artifactId>netty-transport</artifactId>
+    </dependency>
 
     <dependency>
       <groupId>org.slf4j</groupId>

plc4j/drivers/umas/src/main/generated/org/apache/plc4x/java/umas/readwrite/DataItem.java

@@ -61,11 +61,16 @@ public static PlcValue staticParse(
       return new PlcBOOL(value);
     } else if (EvaluationHelper.equals(dataType, UmasDataType.BYTE)
         && EvaluationHelper.equals(numberOfValues, (int) 1)) { // BYTE
-      byte value = readSimpleField("value", readByte(readBuffer, 8));
+      short value = readSimpleField("value", readUnsignedShort(readBuffer, 8));
       return new PlcBYTE(value);
     } else if (EvaluationHelper.equals(dataType, UmasDataType.BYTE)) { // List
-      byte[] value = readBuffer.readByteArray("value", Math.toIntExact(numberOfValues));
-      return new PlcRawByteArray(value);
+      List<Short> _value =
+          readCountArrayField("value", readUnsignedShort(readBuffer, 8), numberOfValues);
+      List<PlcValue> value = new ArrayList<>(_value.size());
+      for (short _item : _value) {
+        value.add(new PlcUSINT(_item));
+      }
+      return new PlcList(value);
     } else if (EvaluationHelper.equals(dataType, UmasDataType.WORD)) { // WORD
       int value = readSimpleField("value", readUnsignedInt(readBuffer, 16));
       return new PlcWORD(value);
@@ -240,7 +245,7 @@ public static int getLengthInBits(
     } else if (EvaluationHelper.equals(dataType, UmasDataType.BYTE)) { // List
       // Array field
       if (_value != null) {
-        lengthInBits += 8 * _value.getRaw().length;
+        lengthInBits += 8 * _value.getList().size();
       }
     } else if (EvaluationHelper.equals(dataType, UmasDataType.WORD)) { // WORD
       // Simple field (value)
@@ -387,10 +392,13 @@ public static void staticSerialize(
     } else if (EvaluationHelper.equals(dataType, UmasDataType.BYTE)
         && EvaluationHelper.equals(numberOfValues, (int) 1)) { // BYTE
       // Simple Field (value)
-      writeSimpleField("value", (byte) _value.getByte(), writeByte(writeBuffer, 8));
+      writeSimpleField("value", (short) _value.getShort(), writeUnsignedShort(writeBuffer, 8));
     } else if (EvaluationHelper.equals(dataType, UmasDataType.BYTE)) { // List
       // Array Field (value)
-      writeByteArrayField("value", _value.getRaw(), writeByteArray(writeBuffer, 8));
+      writeSimpleTypeArrayField(
+          "value",
+          _value.getList().stream().map(PlcValue::getShort).collect(Collectors.toList()),
+          writeUnsignedShort(writeBuffer, 8));
     } else if (EvaluationHelper.equals(dataType, UmasDataType.WORD)) { // WORD
       // Simple Field (value)
       writeSimpleField("value", (int) _value.getInteger(), writeUnsignedInt(writeBuffer, 16));

plc4j/drivers/umas/src/main/generated/org/apache/plc4x/java/umas/readwrite/MonitorPlcReadAll.java

@@ -0,0 +1,126 @@
+/*
+ * 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
+ *
+ *   https://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.umas.readwrite;
+
+import static org.apache.plc4x.java.spi.codegen.fields.FieldReaderFactory.*;
+import static org.apache.plc4x.java.spi.codegen.fields.FieldWriterFactory.*;
+import static org.apache.plc4x.java.spi.codegen.io.DataReaderFactory.*;
+import static org.apache.plc4x.java.spi.codegen.io.DataWriterFactory.*;
+import static org.apache.plc4x.java.spi.generation.StaticHelper.*;
+
+import java.time.*;
+import java.util.*;
+import org.apache.plc4x.java.api.exceptions.*;
+import org.apache.plc4x.java.api.value.*;
+import org.apache.plc4x.java.spi.codegen.*;
+import org.apache.plc4x.java.spi.codegen.fields.*;
+import org.apache.plc4x.java.spi.codegen.io.*;
+import org.apache.plc4x.java.spi.generation.*;
+
+// Code generated by code-generation. DO NOT EDIT.
+
+/**
+ * Read current values for all registered variables. Returns concatenated raw values in the response
+ * — the driver must know each variable's data type to parse the byte stream.
+ */
+public class MonitorPlcReadAll extends MonitorPlcSubOperation implements Message {
+
+  // Accessors for discriminator values.
+  public Short getOperationType() {
+    return (short) 0x07;
+  }
+
+  public MonitorPlcReadAll() {
+    super();
+  }
+
+  @Override
+  protected void serializeMonitorPlcSubOperationChild(WriteBuffer writeBuffer)
+      throws SerializationException {
+    PositionAware positionAware = writeBuffer;
+    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
+    writeBuffer.pushContext("MonitorPlcReadAll");
+
+    writeBuffer.popContext("MonitorPlcReadAll");
+  }
+
+  @Override
+  public int getLengthInBytes() {
+    return (int) Math.ceil((float) getLengthInBits() / 8.0);
+  }
+
+  @Override
+  public int getLengthInBits() {
+    int lengthInBits = super.getLengthInBits();
+    MonitorPlcReadAll _value = this;
+    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
+
+    return lengthInBits;
+  }
+
+  public static MonitorPlcSubOperationBuilder staticParseMonitorPlcSubOperationBuilder(
+      ReadBuffer readBuffer) throws ParseException {
+    readBuffer.pullContext("MonitorPlcReadAll");
+    PositionAware positionAware = readBuffer;
+    boolean _lastItem = ThreadLocalHelper.lastItemThreadLocal.get();
+
+    readBuffer.closeContext("MonitorPlcReadAll");
+    // Create the instance
+    return new MonitorPlcReadAllBuilderImpl();
+  }
+
+  public static class MonitorPlcReadAllBuilderImpl
+      implements MonitorPlcSubOperation.MonitorPlcSubOperationBuilder {
+
+    public MonitorPlcReadAllBuilderImpl() {}
+
+    public MonitorPlcReadAll build() {
+      MonitorPlcReadAll monitorPlcReadAll = new MonitorPlcReadAll();
+      return monitorPlcReadAll;
+    }
+  }
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (!(o instanceof MonitorPlcReadAll)) {
+      return false;
+    }
+    MonitorPlcReadAll that = (MonitorPlcReadAll) o;
+    return super.equals(that) && true;
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(super.hashCode());
+  }
+
+  @Override
+  public String toString() {
+    WriteBufferBoxBased writeBufferBoxBased = new WriteBufferBoxBased(true, true);
+    try {
+      writeBufferBoxBased.writeSerializable(this);
+    } catch (SerializationException e) {
+      throw new RuntimeException(e);
+    }
+    return "\n" + writeBufferBoxBased.getBox().toString() + "\n";
+  }
+}

plc4j/drivers/umas/src/main/generated/org/apache/plc4x/java/umas/readwrite/MonitorPlcRegisterAction.java

@@ -0,0 +1,55 @@
+/*
+ * 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
+ *
+ *   https://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.umas.readwrite;
+
+import java.util.HashMap;
+import java.util.Map;
+
+// Code generated by code-generation. DO NOT EDIT.
+
+public enum MonitorPlcRegisterAction {
+  DEREGISTER((short) 0x01),
+  REGISTER((short) 0x02);
+  private static final Map<Short, MonitorPlcRegisterAction> map;
+
+  static {
+    map = new HashMap<>();
+    for (MonitorPlcRegisterAction value : MonitorPlcRegisterAction.values()) {
+      map.put((short) value.getValue(), value);
+    }
+  }
+
+  private final short value;
+
+  MonitorPlcRegisterAction(short value) {
+    this.value = value;
+  }
+
+  public short getValue() {
+    return value;
+  }
+
+  public static MonitorPlcRegisterAction enumForValue(short value) {
+    return map.get(value);
+  }
+
+  public static Boolean isDefined(short value) {
+    return map.containsKey(value);
+  }
+}