rafactor method

FraunhoferIOSB · Oct 30, 2024 · 76340cb · 76340cb
1 parent 8a3bc08
commit 76340cb
Showing 1 changed file with 22 additions and 32 deletions.
diff --git a/...e/fraunhofer/iosb/ilt/faaast/service/assetconnection/opcua/conversion/ValueConverter.java b/...e/fraunhofer/iosb/ilt/faaast/service/assetconnection/opcua/conversion/ValueConverter.java
@@ -79,42 +79,12 @@ public TypedValue<?> convert(Variant value, Datatype targetType) throws ValueCon
         });
         register(Datatype.HEX_BINARY, Identifiers.ByteString, new OpcUaToAasValueConverter() {
             public TypedValue<?> convert(Variant value, Datatype targetType) throws ValueConversionException {
-                if (Objects.isNull(value) || value.isNull()) {
-                    return null;
-                }
-                try {
-                    String txt;
-                    if (value.getValue() instanceof ByteString bs) {
-                        txt = ByteBufUtil.hexDump(bs.bytesOrEmpty());
-                    }
-                    else {
-                        txt = value.getValue().toString();
-                    }
-                    return TypedValueFactory.create(targetType, txt);
-                }
-                catch (NumberFormatException | ValueFormatException e) {
-                    throw new ValueConversionException(e);
-                }
+                return convertByteString(value, targetType);
             }
         });
         register(Datatype.BASE64_BINARY, Identifiers.ByteString, new OpcUaToAasValueConverter() {
             public TypedValue<?> convert(Variant value, Datatype targetType) throws ValueConversionException {
-                if (Objects.isNull(value) || value.isNull()) {
-                    return null;
-                }
-                try {
-                    String txt;
-                    if (value.getValue() instanceof ByteString bs) {
-                        txt = ByteBufUtil.hexDump(bs.bytesOrEmpty());
-                    }
-                    else {
-                        txt = value.getValue().toString();
-                    }
-                    return TypedValueFactory.create(targetType, txt);
-                }
-                catch (NumberFormatException | ValueFormatException e) {
-                    throw new ValueConversionException(e);
-                }
+                return convertByteString(value, targetType);
             }
         });
     }
@@ -188,6 +158,26 @@ public TypedValue<?> convert(Variant value, Datatype targetType) throws ValueCon
         return converter.convert(value, targetType);
     }
 
+
+    private TypedValue<?> convertByteString(Variant value, Datatype targetType) throws ValueConversionException {
+        if (Objects.isNull(value) || value.isNull()) {
+            return null;
+        }
+        try {
+            String txt;
+            if (value.getValue() instanceof ByteString bs) {
+                txt = ByteBufUtil.hexDump(bs.bytesOrEmpty());
+            }
+            else {
+                txt = value.getValue().toString();
+            }
+            return TypedValueFactory.create(targetType, txt);
+        }
+        catch (NumberFormatException | ValueFormatException e) {
+            throw new ValueConversionException(e);
+        }
+    }
+
     private static class DefaultConverter implements AasToOpcUaValueConverter, OpcUaToAasValueConverter {
 
         @Override