You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@plc4x.apache.org by na...@apache.org on 2019/12/08 22:59:04 UTC
[plc4x] branch PLC4X-157OPC-UADisablediscovery updated: [feature]
Changed parameter from nDiscovery to discovery
This is an automated email from the ASF dual-hosted git repository.
nalim2 pushed a commit to branch PLC4X-157OPC-UADisablediscovery
in repository https://gitbox.apache.org/repos/asf/plc4x.git
The following commit(s) were added to refs/heads/PLC4X-157OPC-UADisablediscovery by this push:
new 447bc14 [feature] Changed parameter from nDiscovery to discovery
447bc14 is described below
commit 447bc14569cd3ca4e8d3630032b01598cb9d7619
Author: Matthias Milan Strljic <ma...@gmail.com>
AuthorDate: Sun Dec 8 14:58:48 2019 -0800
[feature] Changed parameter from nDiscovery to discovery
Signed-off-by: Matthias Milan Strljic <Ma...@gmail.com>
---
.../apache/plc4x/java/opcua/connection/BaseOpcuaPlcConnection.java | 4 ++--
.../test/java/org/apache/plc4x/java/opcua/OpcuaPlcDriverTest.java | 4 ++--
.../plc4x/java/opcua/connection/OpcuaTcpPlcConnectionTest.java | 5 +----
3 files changed, 5 insertions(+), 8 deletions(-)
diff --git a/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/connection/BaseOpcuaPlcConnection.java b/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/connection/BaseOpcuaPlcConnection.java
index b4bafdc..aeaa92f 100644
--- a/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/connection/BaseOpcuaPlcConnection.java
+++ b/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/connection/BaseOpcuaPlcConnection.java
@@ -50,8 +50,8 @@ public abstract class BaseOpcuaPlcConnection extends AbstractPlcConnection imple
if (paramElements.length == 2) {
String paramValue = paramElements[1];
switch (paramName) {
- case "nDiscovery":
- skipDiscovery = Boolean.valueOf(paramValue);
+ case "discovery":
+ skipDiscovery = !Boolean.valueOf(paramValue);
break;
default:
logger.debug("Unknown parameter {} with value {}", paramName, paramValue);
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
index b138ba3..de041ac 100644
--- 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
@@ -62,8 +62,8 @@ public class OpcuaPlcDriverTest {
assertMatching(OPCUA_URI_PATTERN, "opcua:tcp://254.254.254.254:1337");
assertMatching(OPCUA_URI_PATTERN, "opcua:tcp://254.254.254.254");
- assertMatching(OPCUA_URI_PATTERN, "opcua:tcp://127.0.0.1&nDiscovery=true");
- assertMatching(OPCUA_URI_PATTERN, "opcua:tcp://opcua.demo-this.com:51210/UA/SampleServer&nDiscovery=true");
+ assertMatching(OPCUA_URI_PATTERN, "opcua:tcp://127.0.0.1&discovery=false");
+ assertMatching(OPCUA_URI_PATTERN, "opcua:tcp://opcua.demo-this.com:51210/UA/SampleServer&discovery=false");
}
diff --git a/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/connection/OpcuaTcpPlcConnectionTest.java b/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/connection/OpcuaTcpPlcConnectionTest.java
index d81d9ed..8ebf365 100644
--- a/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/connection/OpcuaTcpPlcConnectionTest.java
+++ b/plc4j/drivers/opcua/src/test/java/org/apache/plc4x/java/opcua/connection/OpcuaTcpPlcConnectionTest.java
@@ -47,7 +47,7 @@ public class OpcuaTcpPlcConnectionTest {
24152
};
private final String[] nDiscoveryParams = {
- "nDiscovery=true"
+ "discovery=false"
};
@BeforeEach
@@ -68,9 +68,6 @@ public class OpcuaTcpPlcConnectionTest {
for (String discoveryParam :
nDiscoveryParams) {
String param = "";
- if (!param.isEmpty()) {
- param += "&";
- }
param += discoveryParam;
OpcuaConnectionFactory opcuaConnectionFactory = new OpcuaConnectionFactory();