feat(plc4j/opcua): Add support of PlcDINT for BigInteger in PlcValueH…

…andler (#962) * Add support of PlcDINT for BigInteger in PlcValueHandler Enable OpcuaPlcDriverTest. * Add support of PlcLINT for BigInteger in PlcValueHandler. * Update plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/OpcuaProtocolLogic.java --------- Co-authored-by: PatrykGala <patrykkacpergala@gmail.com> Co-authored-by: Sebastian Rühl <sebastian.ruehl.os@pm.me>
apache · Jun 5, 2023 · bd13295 · bd13295
1 parent 853c4ef
commit bd13295
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/.../drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/OpcuaProtocolLogic.java b/.../drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/OpcuaProtocolLogic.java
@@ -195,7 +195,7 @@ public CompletableFuture<PlcReadResponse> read(PlcReadRequest readRequest) {
                         future.complete(new DefaultPlcReadResponse(request, status));
                         return;
                     }
-                } catch (ParseException e) {
+                } catch (ParseException|PlcRuntimeException e) {
                     future.completeExceptionally(new PlcRuntimeException(e));
                 }
             };

diff --git a/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/OpcuaPlcDriverTest.java b/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/OpcuaPlcDriverTest.java
@@ -43,7 +43,6 @@
 import java.nio.file.Paths;
 import java.util.concurrent.ExecutionException;
 
-@Disabled("Currently seems to block")
 public class OpcuaPlcDriverTest {
 
     @BeforeAll

diff --git a/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/values/PlcValueHandler.java b/plc4j/spi/src/main/java/org/apache/plc4x/java/spi/values/PlcValueHandler.java
@@ -83,6 +83,9 @@ public static PlcValue of(Object[] values) {
         if (value instanceof Long) {
             return PlcLINT.of(value);
         }
+        if (value instanceof BigInteger) {
+            return PlcLINT.of(value);
+        }
         if (value instanceof Float) {
             return PlcREAL.of(value);
         }