You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@streampipes.apache.org by ri...@apache.org on 2026/03/26 19:46:38 UTC
(streampipes) 01/01: feat: Extend OPC-UA extension object support, bump milo to 1.1.1
This is an automated email from the ASF dual-hosted git repository.
riemer pushed a commit to branch support-extension-arrays
in repository https://gitbox.apache.org/repos/asf/streampipes.git
commit 77b06186f9edbe3623ac3ef6f1d2b18be08c0379
Author: Dominik Riemer <do...@gmail.com>
AuthorDate: Thu Mar 26 20:46:00 2026 +0100
feat: Extend OPC-UA extension object support, bump milo to 1.1.1
---
pom.xml | 14 +-
.../streampipes-connectors-opcua/pom.xml | 16 +-
.../connectors/opcua/adapter/OpcUaAdapter.java | 6 +-
.../connectors/opcua/adapter/OpcUaNodeBrowser.java | 3 +-
.../opcua/adapter/OpcUaNodeMetadataExtractor.java | 11 +-
.../opcua/adapter/OpcUaSchemaProvider.java | 4 +-
.../opcua/client/ConnectedOpcUaClient.java | 118 ++++----
.../connectors/opcua/client/SpOpcUaClient.java | 18 +-
.../config/MiloOpcUaConfigurationProvider.java | 4 +-
.../config/identity/AnonymousIdentityConfig.java | 4 +-
.../opcua/config/identity/IdentityConfig.java | 2 +-
.../identity/UsernamePasswordIdentityConfig.java | 4 +-
.../opcua/config/identity/X509IdentityConfig.java | 4 +-
.../security/CompositeCertificateValidator.java | 103 +++++--
.../opcua/config/security/SecurityConfig.java | 6 +-
.../connectors/opcua/model/OpcUaNodeFactory.java | 7 +-
.../opcua/model/node/ExtensionObjectOpcUaNode.java | 298 +++++++++++++++++++--
.../extensions/connectors/opcua/sink/OpcUa.java | 10 +-
.../opcua/utils/OpcUaCertificateUtils.java | 6 +-
.../connectors/opcua/utils/OpcUaTypes.java | 8 +-
.../connectors/opcua/utils/OpcUaUtils.java | 15 +-
.../streampipes-sinks-databases-jvm/pom.xml | 2 +-
22 files changed, 475 insertions(+), 188 deletions(-)
diff --git a/pom.xml b/pom.xml
index 7d45f2e858..e0d24ddccf 100644
--- a/pom.xml
+++ b/pom.xml
@@ -68,7 +68,7 @@
<jgrapht.version>1.5.1</jgrapht.version>
<jjwt.version>0.11.2</jjwt.version>
<lightcouch.version>0.2.0</lightcouch.version>
- <eclipse.milo.version>0.6.16</eclipse.milo.version>
+ <eclipse.milo.version>1.1.1</eclipse.milo.version>
<fogsy-qudt.version>1.0</fogsy-qudt.version>
<httpclient.version>4.5.13</httpclient.version>
<httpcore.version>4.4.9</httpcore.version>
@@ -703,7 +703,12 @@
</dependency>
<dependency>
<groupId>org.eclipse.milo</groupId>
- <artifactId>sdk-client</artifactId>
+ <artifactId>milo-sdk-client</artifactId>
+ <version>${eclipse.milo.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.eclipse.milo</groupId>
+ <artifactId>milo-dtd-reader</artifactId>
<version>${eclipse.milo.version}</version>
</dependency>
<dependency>
@@ -711,11 +716,6 @@
<artifactId>ditto-client</artifactId>
<version>${ditto-client.version}</version>
</dependency>
- <dependency>
- <groupId>org.eclipse.milo</groupId>
- <artifactId>dictionary-reader</artifactId>
- <version>${eclipse.milo.version}</version>
- </dependency>
<dependency>
<groupId>org.eclipse.rdf4j</groupId>
<artifactId>rdf4j-rio-turtle</artifactId>
diff --git a/streampipes-extensions/streampipes-connectors-opcua/pom.xml b/streampipes-extensions/streampipes-connectors-opcua/pom.xml
index 3a2a1caa24..c466c67151 100644
--- a/streampipes-extensions/streampipes-connectors-opcua/pom.xml
+++ b/streampipes-extensions/streampipes-connectors-opcua/pom.xml
@@ -52,16 +52,22 @@
<dependency>
<groupId>org.eclipse.milo</groupId>
- <artifactId>sdk-client</artifactId>
+ <artifactId>milo-sdk-client</artifactId>
</dependency>
<dependency>
<groupId>org.eclipse.milo</groupId>
- <artifactId>dictionary-reader</artifactId>
+ <artifactId>milo-dtd-reader</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>jakarta.activation</artifactId>
+ </exclusion>
+ </exclusions>
</dependency>
-
<dependency>
- <groupId>org.glassfish.jaxb</groupId>
- <artifactId>jaxb-runtime</artifactId>
+ <groupId>com.sun.activation</groupId>
+ <artifactId>jakarta.activation</artifactId>
+ <version>2.0.1</version>
</dependency>
<!-- Test dependencies -->
diff --git a/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/adapter/OpcUaAdapter.java b/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/adapter/OpcUaAdapter.java
index c3969a4063..7f4a86c1ec 100644
--- a/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/adapter/OpcUaAdapter.java
+++ b/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/adapter/OpcUaAdapter.java
@@ -47,7 +47,7 @@ import org.apache.streampipes.sdk.helpers.Alternatives;
import org.apache.streampipes.sdk.helpers.Labels;
import org.apache.streampipes.sdk.helpers.Locales;
-import org.eclipse.milo.opcua.sdk.client.api.subscriptions.UaMonitoredItem;
+import org.eclipse.milo.opcua.sdk.client.subscriptions.OpcUaMonitoredItem;
import org.eclipse.milo.opcua.stack.core.types.builtin.DataValue;
import org.eclipse.milo.opcua.stack.core.types.builtin.StatusCode;
import org.eclipse.milo.opcua.stack.core.types.enumerated.TimestampsToReturn;
@@ -141,7 +141,7 @@ public class OpcUaAdapter implements StreamPipesAdapter, IPullAdapter, SupportsR
@Override
public void pullData() throws ExecutionException, RuntimeException, InterruptedException, TimeoutException {
var response =
- this.connectedClient.getClient().readValues(
+ this.connectedClient.getClient().readValuesAsync(
0,
TimestampsToReturn.Both,
this.allNodes.stream().map(o -> o.nodeInfo().getNodeId()).toList());
@@ -177,7 +177,7 @@ public class OpcUaAdapter implements StreamPipesAdapter, IPullAdapter, SupportsR
.equalsIgnoreCase(SharedUserConfiguration.INCOMPLETE_OPTION_IGNORE);
}
- public void onSubscriptionValue(UaMonitoredItem item,
+ public void onSubscriptionValue(OpcUaMonitoredItem item,
DataValue value) {
String key = this.nodeIdToLabelMapping.get(item.getReadValueId().getNodeId().toString());
diff --git a/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/adapter/OpcUaNodeBrowser.java b/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/adapter/OpcUaNodeBrowser.java
index 63740d924e..38dcacf530 100644
--- a/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/adapter/OpcUaNodeBrowser.java
+++ b/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/adapter/OpcUaNodeBrowser.java
@@ -26,7 +26,6 @@ import org.apache.streampipes.model.staticproperty.TreeInputNode;
import org.eclipse.milo.opcua.sdk.client.AddressSpace;
import org.eclipse.milo.opcua.sdk.client.OpcUaClient;
-import org.eclipse.milo.opcua.sdk.client.api.UaClient;
import org.eclipse.milo.opcua.sdk.client.nodes.UaNode;
import org.eclipse.milo.opcua.sdk.client.nodes.UaVariableNode;
import org.eclipse.milo.opcua.sdk.core.nodes.VariableNode;
@@ -122,7 +121,7 @@ public class OpcUaNodeBrowser {
}
private List<TreeInputNode> findChildren(
- UaClient client,
+ OpcUaClient client,
NodeId nodeId
) throws UaException {
return client
diff --git a/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/adapter/OpcUaNodeMetadataExtractor.java b/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/adapter/OpcUaNodeMetadataExtractor.java
index 7ade7783b0..82cc8c57e4 100644
--- a/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/adapter/OpcUaNodeMetadataExtractor.java
+++ b/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/adapter/OpcUaNodeMetadataExtractor.java
@@ -18,7 +18,7 @@
package org.apache.streampipes.extensions.connectors.opcua.adapter;
-import org.eclipse.milo.opcua.sdk.client.api.UaClient;
+import org.eclipse.milo.opcua.sdk.client.OpcUaClient;
import org.eclipse.milo.opcua.sdk.client.nodes.UaNode;
import org.eclipse.milo.opcua.sdk.client.nodes.UaVariableNode;
import org.eclipse.milo.opcua.stack.core.StatusCodes;
@@ -30,15 +30,14 @@ import org.eclipse.milo.opcua.stack.core.types.enumerated.TimestampsToReturn;
import java.util.HashMap;
import java.util.Map;
-import java.util.concurrent.ExecutionException;
public class OpcUaNodeMetadataExtractor {
- private final UaClient client;
+ private final OpcUaClient client;
private final UaNode node;
private final Map<String, Object> metadata;
- public OpcUaNodeMetadataExtractor(UaClient client, UaNode node) {
+ public OpcUaNodeMetadataExtractor(OpcUaClient client, UaNode node) {
this.client = client;
this.node = node;
this.metadata = new HashMap<>();
@@ -56,7 +55,7 @@ public class OpcUaNodeMetadataExtractor {
try {
var dataTypeNodeId = ((UaVariableNode) node).getDataType();
var dataTypeNode = client.getAddressSpace().getNode(dataTypeNodeId);
- var value = client.readValue(0, TimestampsToReturn.Both, node.getNodeId()).get();
+ var value = client.readValue(0, TimestampsToReturn.Both, node.getNodeId());
extractNodeId((UaVariableNode) node);
extractSourceTime(value);
@@ -64,7 +63,7 @@ public class OpcUaNodeMetadataExtractor {
extractStatusCode(value);
extractDataType(dataTypeNode);
extractDataTypeNodeId(dataTypeNodeId);
- } catch (UaException | ExecutionException | InterruptedException e) {
+ } catch (UaException e) {
throw new RuntimeException(e);
}
}
diff --git a/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/adapter/OpcUaSchemaProvider.java b/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/adapter/OpcUaSchemaProvider.java
index 57a245eca7..61acfbeee0 100644
--- a/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/adapter/OpcUaSchemaProvider.java
+++ b/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/adapter/OpcUaSchemaProvider.java
@@ -69,10 +69,8 @@ public class OpcUaSchemaProvider {
var nodeIds = selectedNodes.stream()
.map(node -> node.nodeInfo().getNodeId())
.collect(Collectors.toList());
- var response = connectedClient.getClient()
+ var returnValues = connectedClient.getClient()
.readValues(0, TimestampsToReturn.Both, nodeIds);
-
- var returnValues = response.get();
makeEventPreview(connectedClient.getClient(), selectedNodes, eventPreview, fieldStatusInfos, returnValues);
diff --git a/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/client/ConnectedOpcUaClient.java b/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/client/ConnectedOpcUaClient.java
index 125f23b01d..7f1a92cacc 100644
--- a/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/client/ConnectedOpcUaClient.java
+++ b/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/client/ConnectedOpcUaClient.java
@@ -21,27 +21,19 @@ package org.apache.streampipes.extensions.connectors.opcua.client;
import org.apache.streampipes.extensions.connectors.opcua.adapter.OpcUaAdapter;
import org.eclipse.milo.opcua.sdk.client.OpcUaClient;
-import org.eclipse.milo.opcua.sdk.client.api.subscriptions.UaMonitoredItem;
-import org.eclipse.milo.opcua.sdk.client.api.subscriptions.UaSubscription;
-import org.eclipse.milo.opcua.sdk.client.api.subscriptions.UaSubscriptionManager;
-import org.eclipse.milo.opcua.stack.core.AttributeId;
-import org.eclipse.milo.opcua.stack.core.types.builtin.DataValue;
+import org.eclipse.milo.opcua.sdk.client.subscriptions.MonitoredItemServiceOperationResult;
+import org.eclipse.milo.opcua.sdk.client.subscriptions.OpcUaMonitoredItem;
+import org.eclipse.milo.opcua.sdk.client.subscriptions.OpcUaSubscription;
+import org.eclipse.milo.opcua.stack.core.UaException;
import org.eclipse.milo.opcua.stack.core.types.builtin.NodeId;
-import org.eclipse.milo.opcua.stack.core.types.builtin.QualifiedName;
import org.eclipse.milo.opcua.stack.core.types.builtin.StatusCode;
-import org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.UInteger;
-import org.eclipse.milo.opcua.stack.core.types.enumerated.MonitoringMode;
import org.eclipse.milo.opcua.stack.core.types.enumerated.TimestampsToReturn;
-import org.eclipse.milo.opcua.stack.core.types.structured.MonitoredItemCreateRequest;
-import org.eclipse.milo.opcua.stack.core.types.structured.MonitoringParameters;
-import org.eclipse.milo.opcua.stack.core.types.structured.ReadValueId;
+import org.jspecify.annotations.NonNull;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import java.util.ArrayList;
import java.util.List;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.atomic.AtomicLong;
import static org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.Unsigned.uint;
@@ -49,7 +41,6 @@ public class ConnectedOpcUaClient {
private static final Logger LOG = LoggerFactory.getLogger(ConnectedOpcUaClient.class);
private final OpcUaClient client;
- private static final AtomicLong clientHandles = new AtomicLong(1L);
public ConnectedOpcUaClient(OpcUaClient client) {
this.client = client;
@@ -63,83 +54,64 @@ public class ConnectedOpcUaClient {
*/
public void createListSubscription(List<NodeId> nodes,
OpcUaAdapter opcUaAdapter) throws Exception {
- client.getSubscriptionManager().addSubscriptionListener(new UaSubscriptionManager.SubscriptionListener() {
- @Override
- public void onSubscriptionTransferFailed(UaSubscription subscription, StatusCode statusCode) {
- LOG.warn("Transfer for subscriptionId={} failed: {}", subscription.getSubscriptionId(), statusCode);
- try {
- initSubscription(nodes, opcUaAdapter);
- } catch (Exception e) {
- LOG.error("Re-creating the subscription failed", e);
- }
- }
- });
-
initSubscription(nodes, opcUaAdapter);
}
public void initSubscription(List<NodeId> nodes,
OpcUaAdapter opcUaAdapter) throws Exception {
- /*
- * create a subscription @ 1000ms
- */
- UaSubscription subscription = this.client.getSubscriptionManager().createSubscription(1000.0).get();
-
- List<CompletableFuture<DataValue>> values = new ArrayList<>();
+ var subscription = getOpcUaSubscription(nodes, opcUaAdapter);
for (NodeId node : nodes) {
- values.add(this.client.readValue(0, TimestampsToReturn.Both, node));
- }
-
- for (CompletableFuture<DataValue> value : values) {
- if (value.get().getValue().toString().contains("null")) {
+ var value = this.client.readValue(0, TimestampsToReturn.Both, node);
+ if (value == null || value.getValue().getValue() == null) {
LOG.error("Node has no value");
}
}
-
- List<ReadValueId> readValues = new ArrayList<>();
- // Read a specific value attribute
+ List<OpcUaMonitoredItem> items = new ArrayList<>();
for (NodeId node : nodes) {
- readValues.add(new ReadValueId(node, AttributeId.Value.uid(), null, QualifiedName.NULL_VALUE));
+ var item = OpcUaMonitoredItem.newDataItem(node);
+ item.setSamplingInterval(1000.0);
+ item.setQueueSize(uint(10));
+ item.setDiscardOldest(true);
+ item.setDataValueListener(opcUaAdapter::onSubscriptionValue);
+ items.add(item);
}
- List<MonitoredItemCreateRequest> requests = new ArrayList<>();
-
- for (ReadValueId readValue : readValues) {
- // important: client handle must be unique per item
- UInteger clientHandle = uint(clientHandles.getAndIncrement());
+ subscription.addMonitoredItems(items);
+ List<MonitoredItemServiceOperationResult> results = subscription.createMonitoredItems();
- MonitoringParameters parameters = new MonitoringParameters(
- clientHandle,
- 1000.0, // sampling interval
- null, // filter, null means use default
- uint(10), // queue size
- true // discard oldest
- );
-
- requests.add(new MonitoredItemCreateRequest(readValue, MonitoringMode.Reporting, parameters));
- }
-
- UaSubscription.ItemCreationCallback onItemCreated =
- (item, i) -> item.setValueConsumer(opcUaAdapter::onSubscriptionValue);
- List<UaMonitoredItem> items = subscription.createMonitoredItems(
- TimestampsToReturn.Both,
- requests,
- onItemCreated
- ).get();
-
- for (UaMonitoredItem item : items) {
- NodeId tagId = item.getReadValueId().getNodeId();
- if (item.getStatusCode().isGood()) {
- LOG.info("item created for nodeId=" + tagId);
+ for (MonitoredItemServiceOperationResult result : results) {
+ var monitoredItem = result.monitoredItem();
+ NodeId tagId = monitoredItem.getReadValueId().getNodeId();
+ if (result.isGood()) {
+ LOG.info("item created for nodeId={}", tagId);
} else {
- LOG.error("failed to create item for " + item.getReadValueId().getNodeId() + item.getStatusCode());
+ var statusCode = result.operationResult().orElse(result.serviceResult());
+ LOG.error("failed to create item for {} {}", tagId, statusCode);
}
}
}
+ private @NonNull OpcUaSubscription getOpcUaSubscription(List<NodeId> nodes,
+ OpcUaAdapter opcUaAdapter) throws UaException {
+ var subscription = new OpcUaSubscription(this.client, 1000.0);
+ subscription.setSubscriptionListener(new OpcUaSubscription.SubscriptionListener() {
+ @Override
+ public void onTransferFailed(OpcUaSubscription subscription, StatusCode statusCode) {
+ LOG.warn("Transfer for subscriptionId={} failed: {}", subscription.getSubscriptionId(), statusCode);
+ try {
+ initSubscription(nodes, opcUaAdapter);
+ } catch (Exception e) {
+ LOG.error("Re-creating the subscription failed", e);
+ }
+ }
+ });
+ subscription.create();
+ return subscription;
+ }
+
/***
*
* @return current {@link org.eclipse.milo.opcua.sdk.client.OpcUaClient}
@@ -149,6 +121,10 @@ public class ConnectedOpcUaClient {
}
public void disconnect() {
- client.disconnect();
+ try {
+ client.disconnect();
+ } catch (UaException e) {
+ LOG.warn("Disconnect failed", e);
+ }
}
}
diff --git a/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/client/SpOpcUaClient.java b/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/client/SpOpcUaClient.java
index c0a8787d65..824ec06987 100644
--- a/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/client/SpOpcUaClient.java
+++ b/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/client/SpOpcUaClient.java
@@ -23,10 +23,10 @@ import org.apache.streampipes.commons.exceptions.SpConfigurationException;
import org.apache.streampipes.extensions.connectors.opcua.config.MiloOpcUaConfigurationProvider;
import org.apache.streampipes.extensions.connectors.opcua.config.OpcUaConfig;
-import org.eclipse.milo.opcua.binaryschema.GenericBsdParser;
import org.eclipse.milo.opcua.sdk.client.OpcUaClient;
-import org.eclipse.milo.opcua.sdk.client.api.config.OpcUaClientConfig;
-import org.eclipse.milo.opcua.sdk.client.dtd.DataTypeDictionarySessionInitializer;
+import org.eclipse.milo.opcua.sdk.client.OpcUaClientConfig;
+import org.eclipse.milo.opcua.sdk.client.dtd.LegacyDataTypeManagerInitializer;
+import org.eclipse.milo.opcua.sdk.client.typetree.DataTypeManagerFactory;
import org.eclipse.milo.opcua.stack.core.UaException;
import java.net.URISyntaxException;
@@ -52,12 +52,18 @@ public class SpOpcUaClient<T extends OpcUaConfig> {
throws UaException, ExecutionException, InterruptedException, SpConfigurationException, URISyntaxException {
OpcUaClientConfig clientConfig = new MiloOpcUaConfigurationProvider().makeClientConfig(spOpcConfig);
var client = OpcUaClient.create(clientConfig);
- client.addSessionInitializer(new DataTypeDictionarySessionInitializer(new GenericBsdParser()));
+ var legacyInitializer = new LegacyDataTypeManagerInitializer(client);
+ var defaultInitializer = new DataTypeManagerFactory.DefaultInitializer();
+ client.setDynamicDataTypeManagerFactory(DataTypeManagerFactory.eager((namespaceTable, dataTypeTree, dataTypeManager) -> {
+ // Register legacy BSD codecs first and let modern DataTypeDefinition codecs override when available.
+ legacyInitializer.initialize(namespaceTable, dataTypeTree, dataTypeManager);
+ defaultInitializer.initialize(namespaceTable, dataTypeTree, dataTypeManager);
+ }));
try {
- client.connect().get();
+ client.connect();
return new ConnectedOpcUaClient(client);
} catch (Exception e) {
- client.disconnect().get();
+ client.disconnect();
throw e;
}
}
diff --git a/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/config/MiloOpcUaConfigurationProvider.java b/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/config/MiloOpcUaConfigurationProvider.java
index d1f3564fb9..95acc30bdb 100644
--- a/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/config/MiloOpcUaConfigurationProvider.java
+++ b/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/config/MiloOpcUaConfigurationProvider.java
@@ -21,8 +21,8 @@ package org.apache.streampipes.extensions.connectors.opcua.config;
import org.apache.streampipes.commons.environment.Environments;
import org.apache.streampipes.commons.exceptions.SpConfigurationException;
-import org.eclipse.milo.opcua.sdk.client.api.config.OpcUaClientConfig;
-import org.eclipse.milo.opcua.stack.client.DiscoveryClient;
+import org.eclipse.milo.opcua.sdk.client.DiscoveryClient;
+import org.eclipse.milo.opcua.sdk.client.OpcUaClientConfig;
import org.eclipse.milo.opcua.stack.core.types.builtin.LocalizedText;
import org.eclipse.milo.opcua.stack.core.types.structured.EndpointDescription;
diff --git a/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/config/identity/AnonymousIdentityConfig.java b/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/config/identity/AnonymousIdentityConfig.java
index ecaad661df..f2edbb27f9 100644
--- a/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/config/identity/AnonymousIdentityConfig.java
+++ b/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/config/identity/AnonymousIdentityConfig.java
@@ -18,8 +18,8 @@
package org.apache.streampipes.extensions.connectors.opcua.config.identity;
-import org.eclipse.milo.opcua.sdk.client.api.config.OpcUaClientConfigBuilder;
-import org.eclipse.milo.opcua.sdk.client.api.identity.AnonymousProvider;
+import org.eclipse.milo.opcua.sdk.client.OpcUaClientConfigBuilder;
+import org.eclipse.milo.opcua.sdk.client.identity.AnonymousProvider;
public class AnonymousIdentityConfig implements IdentityConfig {
diff --git a/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/config/identity/IdentityConfig.java b/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/config/identity/IdentityConfig.java
index db51fd3449..3328237df5 100644
--- a/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/config/identity/IdentityConfig.java
+++ b/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/config/identity/IdentityConfig.java
@@ -18,7 +18,7 @@
package org.apache.streampipes.extensions.connectors.opcua.config.identity;
-import org.eclipse.milo.opcua.sdk.client.api.config.OpcUaClientConfigBuilder;
+import org.eclipse.milo.opcua.sdk.client.OpcUaClientConfigBuilder;
public interface IdentityConfig {
diff --git a/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/config/identity/UsernamePasswordIdentityConfig.java b/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/config/identity/UsernamePasswordIdentityConfig.java
index 825fe1fd9a..6197552f13 100644
--- a/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/config/identity/UsernamePasswordIdentityConfig.java
+++ b/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/config/identity/UsernamePasswordIdentityConfig.java
@@ -19,8 +19,8 @@
package org.apache.streampipes.extensions.connectors.opcua.config.identity;
import org.apache.commons.codec.digest.DigestUtils;
-import org.eclipse.milo.opcua.sdk.client.api.config.OpcUaClientConfigBuilder;
-import org.eclipse.milo.opcua.sdk.client.api.identity.UsernameProvider;
+import org.eclipse.milo.opcua.sdk.client.OpcUaClientConfigBuilder;
+import org.eclipse.milo.opcua.sdk.client.identity.UsernameProvider;
public class UsernamePasswordIdentityConfig implements IdentityConfig {
diff --git a/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/config/identity/X509IdentityConfig.java b/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/config/identity/X509IdentityConfig.java
index 19509c6744..367aeec09b 100644
--- a/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/config/identity/X509IdentityConfig.java
+++ b/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/config/identity/X509IdentityConfig.java
@@ -19,8 +19,8 @@
package org.apache.streampipes.extensions.connectors.opcua.config.identity;
import org.apache.commons.codec.digest.DigestUtils;
-import org.eclipse.milo.opcua.sdk.client.api.config.OpcUaClientConfigBuilder;
-import org.eclipse.milo.opcua.sdk.client.api.identity.X509IdentityProvider;
+import org.eclipse.milo.opcua.sdk.client.OpcUaClientConfigBuilder;
+import org.eclipse.milo.opcua.sdk.client.identity.X509IdentityProvider;
import java.io.ByteArrayInputStream;
import java.nio.charset.StandardCharsets;
diff --git a/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/config/security/CompositeCertificateValidator.java b/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/config/security/CompositeCertificateValidator.java
index b228c8be5e..51c63a092b 100644
--- a/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/config/security/CompositeCertificateValidator.java
+++ b/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/config/security/CompositeCertificateValidator.java
@@ -25,25 +25,27 @@ import org.apache.streampipes.model.opcua.CertificateBuilder;
import org.apache.streampipes.model.opcua.CertificateState;
import org.apache.streampipes.model.opcua.CertificateUtils;
-import org.eclipse.milo.opcua.stack.client.security.ClientCertificateValidator;
import org.eclipse.milo.opcua.stack.core.StatusCodes;
import org.eclipse.milo.opcua.stack.core.UaException;
+import org.eclipse.milo.opcua.stack.core.security.CertificateValidator;
import org.eclipse.milo.opcua.stack.core.security.TrustListManager;
import org.eclipse.milo.opcua.stack.core.util.validation.CertificateValidationUtil;
import org.eclipse.milo.opcua.stack.core.util.validation.ValidationCheck;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import java.net.URI;
import java.security.NoSuchAlgorithmException;
import java.security.cert.CertificateEncodingException;
import java.security.cert.PKIXCertPathBuilderResult;
import java.security.cert.X509CRL;
import java.security.cert.X509Certificate;
import java.util.ArrayList;
+import java.util.Arrays;
import java.util.List;
import java.util.stream.Stream;
-public class CompositeCertificateValidator implements ClientCertificateValidator {
+public class CompositeCertificateValidator implements CertificateValidator {
private static final Logger LOG = LoggerFactory.getLogger(CompositeCertificateValidator.class);
@@ -74,8 +76,7 @@ public class CompositeCertificateValidator implements ClientCertificateValidator
this.streamPipesClient = streamPipesClient;
}
- @Override
- public void validateCertificateChain(List<X509Certificate> certificateChain) throws UaException {
+ private void validateCertificateChain(List<X509Certificate> certificateChain) throws UaException {
PKIXCertPathBuilderResult certPathResult;
X509Certificate peer = getEndEntity(certificateChain);
@@ -132,30 +133,57 @@ public class CompositeCertificateValidator implements ClientCertificateValidator
validateCertificateChain(certificateChain);
X509Certificate certificate = certificateChain.get(0);
+ String effectiveApplicationUri = resolveApplicationUri(certificate, applicationUri);
- try {
- CertificateValidationUtil.checkApplicationUri(certificate, applicationUri);
- } catch (UaException e) {
+ if (effectiveApplicationUri == null) {
if (validationChecks.contains(ValidationCheck.APPLICATION_URI)) {
- throw e;
+ throw new UaException(
+ StatusCodes.Bad_CertificateUriInvalid,
+ "Cannot validate server certificate ApplicationUri: endpoint and certificate URI are both missing"
+ );
} else {
LOG.warn(
- "check suppressed: certificate failed application uri check: {} != {}",
- applicationUri, CertificateValidationUtil.getSubjectAltNameUri(certificate)
+ "check suppressed: server endpoint does not provide an application uri and certificate has no URI SAN"
);
}
+ } else {
+ try {
+ CertificateValidationUtil.checkApplicationUri(certificate, effectiveApplicationUri);
+ } catch (UaException e) {
+ if (validationChecks.contains(ValidationCheck.APPLICATION_URI)) {
+ throw e;
+ } else {
+ LOG.warn(
+ "check suppressed: certificate failed application uri check: {} != {}",
+ effectiveApplicationUri, CertificateValidationUtil.getSubjectAltNameUri(certificate)
+ );
+ }
+ }
}
- try {
- CertificateValidationUtil.checkHostnameOrIpAddress(certificate, validHostNames);
- } catch (UaException e) {
+ String[] effectiveHostNames = resolveValidHostNames(validHostNames);
+
+ if (effectiveHostNames.length == 0) {
if (validationChecks.contains(ValidationCheck.HOSTNAME)) {
- throw e;
- } else {
- LOG.warn(
- "check suppressed: certificate failed hostname check: {}",
- certificate.getSubjectX500Principal().getName()
+ throw new UaException(
+ StatusCodes.Bad_CertificateHostNameInvalid,
+ "Cannot validate server certificate host name: endpoint host is unavailable"
);
+ } else {
+ LOG.warn("check suppressed: no endpoint host available for hostname validation");
+ }
+ } else {
+ try {
+ CertificateValidationUtil.checkHostnameOrIpAddress(certificate, effectiveHostNames);
+ } catch (UaException e) {
+ if (validationChecks.contains(ValidationCheck.HOSTNAME)) {
+ throw e;
+ } else {
+ LOG.warn(
+ "check suppressed: certificate failed hostname check: {}",
+ certificate.getSubjectX500Principal().getName()
+ );
+ }
}
}
}
@@ -173,4 +201,43 @@ public class CompositeCertificateValidator implements ClientCertificateValidator
private boolean isCertificateRejected(long statusCode) {
return REJECTED_STATUS_CODES.contains(statusCode);
}
+
+ private String resolveApplicationUri(X509Certificate certificate, String applicationUri) throws UaException {
+ if (applicationUri != null && !applicationUri.isBlank()) {
+ return applicationUri;
+ }
+
+ String certificateUri = CertificateValidationUtil.getSubjectAltNameUri(certificate);
+ if (certificateUri != null && !certificateUri.isBlank()) {
+ LOG.debug("Server endpoint applicationUri is missing, falling back to certificate URI SAN {}", certificateUri);
+ return certificateUri;
+ }
+
+ return null;
+ }
+
+ private String[] resolveValidHostNames(String... validHostNames) {
+ if (validHostNames != null) {
+ String[] sanitizedHostNames = Arrays.stream(validHostNames)
+ .filter(hostName -> hostName != null && !hostName.isBlank())
+ .toArray(String[]::new);
+
+ if (sanitizedHostNames.length > 0) {
+ return sanitizedHostNames;
+ }
+ }
+
+ try {
+ URI endpointUri = new URI(opcUaConfig.getOpcServerURL());
+ String endpointHost = endpointUri.getHost();
+ if (endpointHost != null && !endpointHost.isBlank()) {
+ LOG.debug("Server endpoint hostnames are missing, falling back to configured OPC UA host {}", endpointHost);
+ return new String[]{endpointHost};
+ }
+ } catch (Exception e) {
+ LOG.debug("Could not derive endpoint host from OPC UA URL {}", opcUaConfig.getOpcServerURL(), e);
+ }
+
+ return new String[0];
+ }
}
diff --git a/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/config/security/SecurityConfig.java b/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/config/security/SecurityConfig.java
index 87e624e22d..fe508e1826 100644
--- a/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/config/security/SecurityConfig.java
+++ b/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/config/security/SecurityConfig.java
@@ -25,8 +25,8 @@ import org.apache.streampipes.extensions.connectors.opcua.config.OpcUaConfig;
import org.apache.streampipes.extensions.connectors.opcua.utils.OpcUaCertificateUtils;
import org.apache.streampipes.model.opcua.Certificate;
-import org.eclipse.milo.opcua.sdk.client.api.config.OpcUaClientConfigBuilder;
-import org.eclipse.milo.opcua.stack.core.security.DefaultTrustListManager;
+import org.eclipse.milo.opcua.sdk.client.OpcUaClientConfigBuilder;
+import org.eclipse.milo.opcua.stack.core.security.FileBasedTrustListManager;
import org.eclipse.milo.opcua.stack.core.security.SecurityPolicy;
import org.eclipse.milo.opcua.stack.core.types.enumerated.MessageSecurityMode;
import org.eclipse.milo.opcua.stack.core.types.structured.EndpointDescription;
@@ -83,7 +83,7 @@ public class SecurityConfig {
try {
var env = Environments.getEnvironment();
var securityDir = Paths.get(env.getOpcUaSecurityDir().getValueOrDefault());
- var trustListManager = new DefaultTrustListManager(securityDir.resolve("pki").toFile());
+ var trustListManager = FileBasedTrustListManager.createAndInitialize(securityDir.resolve("pki"));
var loadedCerts = new AtomicReference<>(fetchTrustedCertsFromRest());
diff --git a/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/model/OpcUaNodeFactory.java b/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/model/OpcUaNodeFactory.java
index eef29fcd05..666e95c2a4 100644
--- a/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/model/OpcUaNodeFactory.java
+++ b/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/model/OpcUaNodeFactory.java
@@ -23,7 +23,7 @@ import org.apache.streampipes.extensions.connectors.opcua.model.node.ExtensionOb
import org.apache.streampipes.extensions.connectors.opcua.model.node.OpcUaNode;
import org.apache.streampipes.extensions.connectors.opcua.model.node.PrimitiveOpcUaNode;
-import org.eclipse.milo.opcua.stack.core.BuiltinDataType;
+import org.eclipse.milo.opcua.stack.core.Identifiers;
import org.eclipse.milo.opcua.stack.core.types.builtin.DataValue;
import org.eclipse.milo.opcua.stack.core.types.builtin.ExtensionObject;
import org.eclipse.milo.opcua.stack.core.types.builtin.NodeId;
@@ -96,7 +96,7 @@ public class OpcUaNodeFactory {
/**
* Conservative fallback based on declared DataType only.
- * Treat only ExtensionObject itself as "extension" here.
+ * Treat only Structure/ExtensionObject data type itself as "extension" here.
*
* Why so conservative? Because abstract standard types like Integer/Number
* are NOT builtins but are still "primitive-ish" and should not be treated
@@ -104,7 +104,6 @@ public class OpcUaNodeFactory {
*/
private static boolean isExtensionByDataType(BasicVariableNodeInfo nodeInfo) {
NodeId dt = nodeInfo.getNode().getDataType();
- return Objects.equals(dt, BuiltinDataType.ExtensionObject.getNodeId());
+ return Objects.equals(dt, Identifiers.Structure);
}
}
-
diff --git a/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/model/node/ExtensionObjectOpcUaNode.java b/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/model/node/ExtensionObjectOpcUaNode.java
index 0e8c428b09..fed48abbd0 100644
--- a/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/model/node/ExtensionObjectOpcUaNode.java
+++ b/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/model/node/ExtensionObjectOpcUaNode.java
@@ -18,19 +18,44 @@
package org.apache.streampipes.extensions.connectors.opcua.model.node;
-import org.apache.streampipes.commons.exceptions.SpRuntimeException;
import org.apache.streampipes.model.connect.guess.FieldStatus;
import org.apache.streampipes.model.connect.guess.FieldStatusInfo;
-import org.eclipse.milo.opcua.binaryschema.Struct;
import org.eclipse.milo.opcua.sdk.client.OpcUaClient;
+import org.eclipse.milo.opcua.sdk.core.dtd.BsdStructWrapper;
+import org.eclipse.milo.opcua.sdk.core.dtd.generic.Struct;
+import org.eclipse.milo.opcua.sdk.core.types.DynamicEnumType;
+import org.eclipse.milo.opcua.sdk.core.types.DynamicOptionSetType;
+import org.eclipse.milo.opcua.sdk.core.types.DynamicStructType;
+import org.eclipse.milo.opcua.sdk.core.types.DynamicUnionType;
+import org.eclipse.milo.opcua.stack.core.types.UaEnumeratedType;
+import org.eclipse.milo.opcua.stack.core.types.UaStructuredType;
+import org.eclipse.milo.opcua.stack.core.types.builtin.ByteString;
+import org.eclipse.milo.opcua.stack.core.types.builtin.DateTime;
+import org.eclipse.milo.opcua.stack.core.types.builtin.ExpandedNodeId;
import org.eclipse.milo.opcua.stack.core.types.builtin.ExtensionObject;
+import org.eclipse.milo.opcua.stack.core.types.builtin.LocalizedText;
+import org.eclipse.milo.opcua.stack.core.types.builtin.Matrix;
+import org.eclipse.milo.opcua.stack.core.types.builtin.NodeId;
+import org.eclipse.milo.opcua.stack.core.types.builtin.QualifiedName;
+import org.eclipse.milo.opcua.stack.core.types.builtin.StatusCode;
import org.eclipse.milo.opcua.stack.core.types.builtin.Variant;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import java.lang.reflect.Array;
+import java.lang.reflect.Modifier;
+import java.util.ArrayList;
+import java.util.Base64;
+import java.util.LinkedHashMap;
+import java.util.List;
import java.util.Map;
public class ExtensionObjectOpcUaNode implements OpcUaNode {
+ private static final Logger LOG = LoggerFactory.getLogger(ExtensionObjectOpcUaNode.class);
+ private static final int MAX_DEPTH = 20;
+
private final BasicVariableNodeInfo nodeInfo;
public ExtensionObjectOpcUaNode(BasicVariableNodeInfo nodeInfo) {
@@ -44,20 +69,15 @@ public class ExtensionObjectOpcUaNode implements OpcUaNode {
@Override
public int getNumberOfEventProperties(OpcUaClient client) {
- var struct = extractStruct(client, nodeInfo.getNode().getValue().getValue());
- return struct.getMembers().size();
+ return 1;
}
@Override
public void addToEvent(OpcUaClient client,
Map<String, Object> event,
Variant variant) {
- var struct = extractStruct(client, variant);
-
- struct.getMembers().forEach((key, member) -> {
- var nodeName = nodeInfo.getDesiredName(key);
- event.put(nodeName, member.getValue());
- });
+ var nodeName = nodeInfo.getDesiredName("");
+ event.put(nodeName, normalizeVariant(client, variant));
}
@Override
@@ -66,26 +86,248 @@ public class ExtensionObjectOpcUaNode implements OpcUaNode {
Map<String, FieldStatusInfo> fieldStatusInfos,
Variant variant,
FieldStatusInfo fieldStatusInfo) {
+ var nodeName = nodeInfo().getBaseNodeName();
if (fieldStatusInfo.getFieldStatus() == FieldStatus.GOOD) {
- var struct = extractStruct(client, variant);
- struct.getMembers().forEach((key, member) -> {
- var nodeName = nodeInfo.getDesiredName(key);
- eventPreview.put(nodeName, member.getValue());
- fieldStatusInfos.put(nodeName, fieldStatusInfo);
- });
- } else {
- throw new SpRuntimeException("Could not read value for " + nodeInfo.getBaseNodeName());
- }
- }
-
- private Struct extractStruct(OpcUaClient client,
- Variant variant) {
- if (variant.getValue() instanceof ExtensionObject extensionObject) {
- var decoded = extensionObject.decode(client.getDynamicSerializationContext());
- if (decoded instanceof Struct struct) {
- return struct;
+ eventPreview.put(nodeName, normalizeVariant(client, variant));
+ }
+ fieldStatusInfos.put(nodeName, fieldStatusInfo);
+ }
+
+ private Object normalizeVariant(OpcUaClient client,
+ Variant variant) {
+ if (variant == null) {
+ return null;
+ }
+ return normalizeValue(client, variant.getValue(), 0);
+ }
+
+ private Object normalizeValue(OpcUaClient client,
+ Object value,
+ int depth) {
+ if (value == null) {
+ return null;
+ }
+ if (depth > MAX_DEPTH) {
+ return String.valueOf(value);
+ }
+
+ if (value instanceof ExtensionObject extensionObject) {
+ return decodeExtensionObject(client, extensionObject, depth + 1);
+ }
+
+ if (value instanceof Struct struct) {
+ return structToMap(client, struct, depth + 1);
+ }
+
+ if (value instanceof BsdStructWrapper<?> wrapper) {
+ return normalizeValue(client, wrapper.object(), depth + 1);
+ }
+
+ if (value instanceof DynamicStructType dynamicStructType) {
+ return dynamicStructToMap(client, dynamicStructType, depth + 1);
+ }
+
+ if (value instanceof DynamicUnionType dynamicUnionType) {
+ return dynamicUnionToMap(client, dynamicUnionType, depth + 1);
+ }
+
+ if (value instanceof DynamicOptionSetType dynamicOptionSetType) {
+ return dynamicOptionSetToMap(client, dynamicOptionSetType, depth + 1);
+ }
+
+ if (value instanceof DynamicEnumType dynamicEnumType) {
+ return dynamicEnumToValue(dynamicEnumType);
+ }
+
+ if (value instanceof ByteString byteString) {
+ var bytes = byteString.bytes();
+ return bytes == null ? null : Base64.getEncoder().encodeToString(bytes);
+ }
+
+ if (value instanceof Matrix matrix) {
+ return normalizeValue(client, matrix.nestedArrayValue(), depth + 1);
+ }
+
+ if (value instanceof DateTime dateTime) {
+ return dateTime.getJavaTime();
+ }
+
+ if (value instanceof NodeId nodeId) {
+ return nodeId.toParseableString();
+ }
+
+ if (value instanceof ExpandedNodeId expandedNodeId) {
+ return expandedNodeId.toParseableString();
+ }
+
+ if (value instanceof QualifiedName qualifiedName) {
+ return qualifiedName.toParseableString();
+ }
+
+ if (value instanceof LocalizedText localizedText) {
+ return localizedText.getText();
+ }
+
+ if (value instanceof StatusCode statusCode) {
+ return statusCode.getValue();
+ }
+
+ if (value instanceof UaEnumeratedType uaEnumeratedType) {
+ return uaEnumeratedType.getName() != null ? uaEnumeratedType.getName() : uaEnumeratedType.getValue();
+ }
+
+ if (isScalar(value)) {
+ return value;
+ }
+
+ if (value instanceof Map<?, ?> mapValue) {
+ return mapToMap(client, mapValue, depth + 1);
+ }
+
+ if (value instanceof Iterable<?> iterable) {
+ var listValue = new ArrayList<>();
+ for (Object element : iterable) {
+ listValue.add(normalizeValue(client, element, depth + 1));
+ }
+ return listValue;
+ }
+
+ if (value.getClass().isArray()) {
+ int length = Array.getLength(value);
+ List<Object> arrayValue = new ArrayList<>(length);
+ for (int i = 0; i < length; i++) {
+ arrayValue.add(normalizeValue(client, Array.get(value, i), depth + 1));
+ }
+ return arrayValue;
+ }
+
+ if (value instanceof UaStructuredType) {
+ return objectToMap(client, value, depth + 1);
+ }
+
+ if (value instanceof Enum<?> enumValue) {
+ return enumValue.name();
+ }
+
+ return objectToMap(client, value, depth + 1);
+ }
+
+ private Map<String, Object> structToMap(OpcUaClient client,
+ Struct struct,
+ int depth) {
+ var result = new LinkedHashMap<String, Object>();
+ struct.getMembers().forEach((key, member) ->
+ result.put(key, normalizeValue(client, member.getValue(), depth + 1)));
+ return result;
+ }
+
+ private Map<String, Object> mapToMap(OpcUaClient client,
+ Map<?, ?> mapValue,
+ int depth) {
+ var result = new LinkedHashMap<String, Object>();
+ mapValue.forEach((key, entryValue) ->
+ result.put(String.valueOf(key), normalizeValue(client, entryValue, depth + 1)));
+ return result;
+ }
+
+ private Map<String, Object> dynamicStructToMap(OpcUaClient client,
+ DynamicStructType dynamicStructType,
+ int depth) {
+ var result = new LinkedHashMap<String, Object>();
+ dynamicStructType.getMembers().forEach((key, memberValue) ->
+ result.put(key, normalizeValue(client, memberValue, depth + 1)));
+ return result;
+ }
+
+ private Map<String, Object> dynamicUnionToMap(OpcUaClient client,
+ DynamicUnionType dynamicUnionType,
+ int depth) {
+ var result = new LinkedHashMap<String, Object>();
+ dynamicUnionType.getValue().ifPresent(unionValue ->
+ result.put(unionValue.fieldName(), normalizeValue(client, unionValue.fieldValue(), depth + 1)));
+ return result;
+ }
+
+ private Map<String, Object> dynamicOptionSetToMap(OpcUaClient client,
+ DynamicOptionSetType dynamicOptionSetType,
+ int depth) {
+ var result = new LinkedHashMap<String, Object>();
+ result.put("value", normalizeValue(client, dynamicOptionSetType.getValue(), depth + 1));
+ result.put("validBits", normalizeValue(client, dynamicOptionSetType.getValidBits(), depth + 1));
+ return result;
+ }
+
+ private Object dynamicEnumToValue(DynamicEnumType dynamicEnumType) {
+ var enumName = dynamicEnumType.getName();
+ return enumName != null ? enumName : dynamicEnumType.getValue();
+ }
+
+ private Object decodeExtensionObject(OpcUaClient client,
+ ExtensionObject extensionObject,
+ int depth) {
+ try {
+ var decoded = extensionObject.decode(client.getDynamicEncodingContext());
+ return normalizeValue(client, decoded, depth + 1);
+ } catch (Exception e) {
+ return undecodedExtensionObjectToMap(client, extensionObject, e.getMessage(), depth + 1);
+ }
+ }
+
+ private Map<String, Object> undecodedExtensionObjectToMap(OpcUaClient client,
+ ExtensionObject extensionObject,
+ String error,
+ int depth) {
+ var result = new LinkedHashMap<String, Object>();
+ var encodingId = extensionObject.getEncodingOrTypeId() != null
+ ? extensionObject.getEncodingOrTypeId().toParseableString()
+ : "null";
+ LOG.warn("Could not decode ExtensionObject with encodingId {}: {}", encodingId, error);
+
+ result.put("_decodeError", error);
+ result.put("_encodingId", encodingId);
+ var body = extensionObject.getBody();
+ result.put("_bodyType", body == null ? "null" : body.getClass().getSimpleName());
+ result.put("_rawBody", normalizeValue(client, body, depth + 1));
+ return result;
+ }
+
+ private Map<String, Object> objectToMap(OpcUaClient client,
+ Object value,
+ int depth) {
+ var result = new LinkedHashMap<String, Object>();
+ result.put("_javaType", value.getClass().getName());
+
+ var hasFields = false;
+ Class<?> currentClass = value.getClass();
+ while (currentClass != null && currentClass != Object.class) {
+ for (var field : currentClass.getDeclaredFields()) {
+ if (Modifier.isStatic(field.getModifiers()) || field.isSynthetic() || result.containsKey(field.getName())) {
+ continue;
+ }
+
+ try {
+ field.setAccessible(true);
+ var fieldValue = field.get(value);
+ result.put(field.getName(), normalizeValue(client, fieldValue, depth + 1));
+ hasFields = true;
+ } catch (Exception e) {
+ result.put(field.getName(), "unavailable");
+ }
}
+ currentClass = currentClass.getSuperclass();
}
- throw new SpRuntimeException("Decoded value is not a Struct");
+
+ if (!hasFields) {
+ result.put("_value", String.valueOf(value));
+ }
+
+ return result;
+ }
+
+ private boolean isScalar(Object value) {
+ return value instanceof String
+ || value instanceof Number
+ || value instanceof Boolean
+ || value instanceof Character;
}
}
diff --git a/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/sink/OpcUa.java b/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/sink/OpcUa.java
index 265fd805e5..13d896680f 100644
--- a/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/sink/OpcUa.java
+++ b/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/sink/OpcUa.java
@@ -36,8 +36,7 @@ import org.slf4j.LoggerFactory;
import java.util.Arrays;
import java.util.HashMap;
-import java.util.concurrent.CompletableFuture;
-import java.util.concurrent.ExecutionException;
+import java.util.List;
public class OpcUa {
@@ -120,10 +119,9 @@ public class OpcUa {
} else {
DataValue value = new DataValue(v);
- CompletableFuture<StatusCode> f = this.connectedClient.getClient().writeValue(node, value);
-
try {
- StatusCode status = f.get();
+ List<StatusCode> statuses = this.connectedClient.getClient().writeValues(List.of(node), List.of(value));
+ StatusCode status = statuses.get(0);
if (status.isBad()) {
if (status.getValue() == 0x80740000L) {
LOG.error("Type missmatch! Tried to write value of type {} ", this.params.mappingPropertyType()
@@ -137,7 +135,7 @@ public class OpcUa {
node.getIdentifier(),
params.config().getOpcServerURL());
}
- } catch (InterruptedException | ExecutionException e) {
+ } catch (UaException e) {
LOG.error(
"Exception: Value {} could not be written to node Id {} on OPC_UA server {}",
value.getValue().toString(),
diff --git a/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/utils/OpcUaCertificateUtils.java b/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/utils/OpcUaCertificateUtils.java
index ef4769bb7b..a9b5d40dd0 100644
--- a/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/utils/OpcUaCertificateUtils.java
+++ b/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/utils/OpcUaCertificateUtils.java
@@ -26,8 +26,6 @@ import org.eclipse.milo.opcua.stack.core.UaException;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import java.util.concurrent.ExecutionException;
-
public class OpcUaCertificateUtils {
private static final Logger LOG = LoggerFactory.getLogger(OpcUaCertificateUtils.class);
@@ -44,7 +42,7 @@ public class OpcUaCertificateUtils {
return getCoreCertificatePath() + "/trusted";
}
- public static boolean isCertificateException(ExecutionException e) {
+ public static boolean isCertificateException(UaException e) {
Throwable cause = e.getCause();
if (cause instanceof UaException uaException) {
@@ -70,7 +68,7 @@ public class OpcUaCertificateUtils {
return containsRejectedStatusCode;
}
- public static String makeExceptionMessage(ExecutionException e) {
+ public static String makeExceptionMessage(UaException e) {
StringBuilder message = new StringBuilder(
"The provided certificate could not be trusted. Administrators can accept this certificate in the settings. "
);
diff --git a/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/utils/OpcUaTypes.java b/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/utils/OpcUaTypes.java
index 4fed5b4ecf..1a891f40d4 100644
--- a/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/utils/OpcUaTypes.java
+++ b/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/utils/OpcUaTypes.java
@@ -21,7 +21,7 @@ package org.apache.streampipes.extensions.connectors.opcua.utils;
import org.apache.streampipes.sdk.utils.Datatypes;
import org.eclipse.milo.opcua.sdk.core.nodes.VariableNode;
-import org.eclipse.milo.opcua.stack.core.BuiltinDataType;
+import org.eclipse.milo.opcua.stack.core.Identifiers;
import org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.UInteger;
import java.util.Objects;
@@ -83,9 +83,9 @@ public class OpcUaTypes {
* @return true if the node is an ExtensionObject or custom data type
*/
public static boolean isExtensionOrCustom(VariableNode node) {
- return !BuiltinDataType.isBuiltin(node.getDataType())
- || Objects.equals(node.getDataType(), BuiltinDataType.ExtensionObject.getNodeId());
+ var dataType = node.getDataType();
+ return Objects.equals(dataType, Identifiers.Structure)
+ || (dataType != null && dataType.getNamespaceIndex().intValue() != 0);
}
}
-
diff --git a/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/utils/OpcUaUtils.java b/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/utils/OpcUaUtils.java
index d446168817..0ba215e055 100644
--- a/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/utils/OpcUaUtils.java
+++ b/streampipes-extensions/streampipes-connectors-opcua/src/main/java/org/apache/streampipes/extensions/connectors/opcua/utils/OpcUaUtils.java
@@ -29,7 +29,7 @@ import org.apache.streampipes.extensions.connectors.opcua.config.SpOpcUaConfigEx
import org.apache.streampipes.extensions.management.client.StreamPipesClientResolver;
import org.apache.streampipes.model.staticproperty.RuntimeResolvableTreeInputStaticProperty;
-import org.eclipse.milo.opcua.sdk.client.api.UaClient;
+import org.eclipse.milo.opcua.sdk.client.OpcUaClient;
import org.eclipse.milo.opcua.stack.core.AttributeId;
import org.eclipse.milo.opcua.stack.core.UaException;
import org.eclipse.milo.opcua.stack.core.types.builtin.NodeId;
@@ -100,21 +100,20 @@ public class OpcUaUtils {
return config;
} catch (UaException e) {
- throw new SpConfigurationException(ExceptionMessageExtractor.getDescription(e), e);
- } catch (ExecutionException | InterruptedException | URISyntaxException e) {
- if (e instanceof ExecutionException && OpcUaCertificateUtils.isCertificateException((ExecutionException) e)) {
+ if (OpcUaCertificateUtils.isCertificateException(e)) {
throw new SpConfigurationException(
- OpcUaCertificateUtils.makeExceptionMessage((ExecutionException) e)
+ OpcUaCertificateUtils.makeExceptionMessage(e)
);
- } else {
- throw new SpConfigurationException("Could not connect to the OPC UA server with the provided settings", e);
}
+ throw new SpConfigurationException(ExceptionMessageExtractor.getDescription(e), e);
+ } catch (ExecutionException | InterruptedException | URISyntaxException e) {
+ throw new SpConfigurationException("Could not connect to the OPC UA server with the provided settings", e);
} finally {
clientProvider.releaseClient(opcUaConfig);
}
}
- public static List<String> filterMissingNodes(UaClient opcUaClient,
+ public static List<String> filterMissingNodes(OpcUaClient opcUaClient,
List<String> selectedNodes) {
return selectedNodes.stream().filter(selectedNode -> {
try {
diff --git a/streampipes-extensions/streampipes-sinks-databases-jvm/pom.xml b/streampipes-extensions/streampipes-sinks-databases-jvm/pom.xml
index fa711c46c5..9eff2fb1c8 100644
--- a/streampipes-extensions/streampipes-sinks-databases-jvm/pom.xml
+++ b/streampipes-extensions/streampipes-sinks-databases-jvm/pom.xml
@@ -69,7 +69,7 @@
</dependency>
<dependency>
<groupId>org.eclipse.milo</groupId>
- <artifactId>sdk-client</artifactId>
+ <artifactId>milo-sdk-client</artifactId>
<exclusions>
<exclusion>
<groupId>org.graalvm.nativeimage</groupId>