Skip to content

Register requested consumers with opc ua subscriptions #2251

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
JonasH-munters wants to merge 1 commit into from
Closed

Register requested consumers with opc ua subscriptions #2251

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions .../drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/OpcuaProtocolLogic.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -811,6 +811,15 @@ public CompletableFuture<PlcSubscriptionResponse> subscribe(PlcSubscriptionReque
long subscriptionId = response.getSubscriptionId();
OpcuaSubscriptionHandle handle = new OpcuaSubscriptionHandle(this, tm,
conversation, subscriptionRequest, subscriptionId, cycleTime);
if (subscriptionRequest.getConsumer() != null) {
handle.register(subscriptionRequest.getConsumer());
}
subscriptionRequest.getTagNames().forEach(tagName -> {
Consumer<PlcSubscriptionEvent> tagConsumer = subscriptionRequest.getTagConsumer(tagName);
if (tagConsumer != null) {
handle.registerTagConsumer(tagName, tagConsumer);
}
});
subscriptions.put(handle.getSubscriptionId(), handle);
return handle;
})
Expand Down
17 changes: 16 additions & 1 deletion ...ers/opcua/src/main/java/org/apache/plc4x/java/opcua/protocol/OpcuaSubscriptionHandle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@ public class OpcuaSubscriptionHandle extends DefaultPlcSubscriptionHandle {

private final Logger logger = LoggerFactory.getLogger(OpcuaSubscriptionHandle.class);
private final Set<Consumer<PlcSubscriptionEvent>> consumers;
private final Map<String, Consumer<PlcSubscriptionEvent>> tagConsumers;
private final List<String> tagNames;
private final Conversation conversation;
private final PlcSubscriptionRequest subscriptionRequest;
Expand All @@ -83,6 +84,7 @@ public OpcuaSubscriptionHandle(OpcuaProtocolLogic plcSubscriber, RequestTransact
super(plcSubscriber);
this.tm = tm;
this.consumers = new HashSet<>();
this.tagConsumers = new HashMap<>();
this.subscriptionRequest = subscriptionRequest;
this.tagNames = new ArrayList<>(subscriptionRequest.getTagNames());
this.conversation = conversation;
Expand Down Expand Up @@ -292,8 +294,15 @@ private void onMonitoredValue(List<MonitoredItemNotification> values) {
Map<String, PlcTag> tagMap = new LinkedHashMap<>();
for (MonitoredItemNotification value : values) {
String tagName = tagNames.get((int) value.getClientHandle() - 1);
tagMap.put(tagName, subscriptionRequest.getTag(tagName).getTag());
PlcTag tag = subscriptionRequest.getTag(tagName).getTag();
tagMap.put(tagName, tag);
dataValues.add(value.getValue());
Consumer<PlcSubscriptionEvent> tagConsumer = tagConsumers.get(tagName);
if (tagConsumer != null) {
Entry<Map<String, Metadata>, Map<String, PlcResponseItem<PlcValue>>> mappedResponse = plcSubscriber.readResponse(Map.of(tagName, tag), List.of(value.getValue()), responseMetadata);
PlcSubscriptionEvent event = new DefaultPlcSubscriptionEvent(Instant.ofEpochMilli(receiveTs), mappedResponse.getValue(), mappedResponse.getKey());
tagConsumer.accept(event);
}
}

Entry<Map<String, Metadata>, Map<String, PlcResponseItem<PlcValue>>> mappedResponse = plcSubscriber.readResponse(tagMap, dataValues, responseMetadata);
Expand Down Expand Up @@ -346,6 +355,12 @@ public PlcConsumerRegistration register(Consumer<PlcSubscriptionEvent> consumer)
return new DefaultPlcConsumerRegistration(plcSubscriber, consumer, this);
}

public PlcConsumerRegistration registerTagConsumer(String tagName, Consumer<PlcSubscriptionEvent> consumer) {
logger.info("Registering a new OPCUA subscription consumer for tag with name " + tagName);
tagConsumers.put(tagName, consumer);
return new DefaultPlcConsumerRegistration(plcSubscriber, consumer, this);
}

public Long getSubscriptionId() {
return subscriptionId;
}
Expand Down
Loading