You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by cd...@apache.org on 2020/10/29 18:18:58 UTC
[plc4x] 03/03: - Major refactoring regarding the FieldHandlers,
ValueHandlers - Refactored out all of the "Internal" interfaces
This is an automated email from the ASF dual-hosted git repository.
cdutz pushed a commit to branch feature/plc4go
in repository https://gitbox.apache.org/repos/asf/plc4x.git
commit 5ba46d9be24931275c93c22a81e1de9601baee88
Author: Christofer Dutz <ch...@c-ware.de>
AuthorDate: Thu Oct 29 19:18:39 2020 +0100
- Major refactoring regarding the FieldHandlers, ValueHandlers
- Refactored out all of the "Internal" interfaces
---
.../apache/plc4x/java/opcua/connection/OpcuaTcpPlcConnection.java | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/connection/OpcuaTcpPlcConnection.java b/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/connection/OpcuaTcpPlcConnection.java
index 236be6c..56f445b 100644
--- a/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/connection/OpcuaTcpPlcConnection.java
+++ b/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/connection/OpcuaTcpPlcConnection.java
@@ -19,7 +19,6 @@
*/
package org.apache.plc4x.java.opcua.connection;
-import org.apache.commons.lang3.tuple.Pair;
import org.apache.plc4x.java.api.exceptions.PlcConnectionException;
import org.apache.plc4x.java.api.messages.*;
import org.apache.plc4x.java.api.model.PlcConsumerRegistration;
@@ -33,7 +32,6 @@ import org.apache.plc4x.java.opcua.protocol.OpcuaSubsriptionHandle;
import org.apache.plc4x.java.spi.messages.*;
import org.apache.plc4x.java.spi.messages.utils.ResponseItem;
import org.apache.plc4x.java.spi.model.DefaultPlcConsumerRegistration;
-import org.apache.plc4x.java.spi.model.DefaultPlcSubscriptionField;
import org.apache.plc4x.java.spi.values.*;
import org.eclipse.milo.opcua.sdk.client.OpcUaClient;
import org.eclipse.milo.opcua.sdk.client.api.config.OpcUaClientConfig;
@@ -65,7 +63,6 @@ import java.util.concurrent.atomic.AtomicLong;
import java.util.function.BiConsumer;
import java.util.function.Consumer;
import java.util.function.Predicate;
-import java.util.stream.Collectors;
import static org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.Unsigned.uint;
import static org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.Unsigned.ulong;
@@ -358,7 +355,7 @@ public class OpcuaTcpPlcConnection extends BaseOpcuaPlcConnection {
@Override
public CompletableFuture<PlcUnsubscriptionResponse> unsubscribe(PlcUnsubscriptionRequest unsubscriptionRequest) {
-/* unsubscriptionRequest.getPlcSubscriptionHandles().forEach(o -> {
+ unsubscriptionRequest.getSubscriptionHandles().forEach(o -> {
OpcuaSubsriptionHandle opcSubHandle = (OpcuaSubsriptionHandle) o;
try {
client.getSubscriptionManager().deleteSubscription(opcSubHandle.getClientHandle()).get();
@@ -368,7 +365,7 @@ public class OpcuaTcpPlcConnection extends BaseOpcuaPlcConnection {
} catch (ExecutionException e) {
logger.warn("Unable to unsubscribe Elements because of: {}", e.getMessage());
}
- });*/
+ });
return null;
}