fix(opcua): fix address pattern

apache · Aug 7, 2023 · 8464f58 · 8464f58
1 parent 503af35
commit 8464f58
Show file tree

Hide file tree

Showing 3 changed files with 2 additions and 11 deletions.
diff --git a/plc4go/internal/opcua/TagHandler.go b/plc4go/internal/opcua/TagHandler.go
@@ -37,7 +37,7 @@ type TagHandler struct {
 
 func NewTagHandler() TagHandler {
 	return TagHandler{
-		tagAddress: regexp.MustCompile(`^ns=(?P<namespace>\d+);(?P<identifierType>[isgb])=(?P<identifier>[^;]+)?(;(?P<datatype>[a-zA-Z_]+))?`),
+		tagAddress: regexp.MustCompile(`^ns=(?P<namespace>\d+);(?P<identifierType>[isgb])=(?P<identifier>[^;]+)?(;(?P<datatype>[a-zA-Z_]+))?$`),
 	}
 }
 

diff --git a/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/tag/OpcuaTag.java b/plc4j/drivers/opcua/src/main/java/org/apache/plc4x/java/opcua/tag/OpcuaTag.java
@@ -37,7 +37,7 @@
 
 public class OpcuaTag implements PlcSubscriptionTag {
 
-    public static final Pattern ADDRESS_PATTERN = Pattern.compile("^ns=(?<namespace>\\d+);(?<identifierType>[isgb])=(?<identifier>[^;]+)?(;(?<datatype>[a-zA-Z_]+))?");
+    public static final Pattern ADDRESS_PATTERN = Pattern.compile("^ns=(?<namespace>\\d+);(?<identifierType>[isgb])=(?<identifier>[^;]+)?(;(?<datatype>[a-zA-Z_]+))?$");
 
     private final OpcuaIdentifierType identifierType;
 

diff --git a/...opcua/src/test/java/org/apache/plc4x/java/opcua/protocol/OpcuaSubscriptionHandleTest.java b/...opcua/src/test/java/org/apache/plc4x/java/opcua/protocol/OpcuaSubscriptionHandleTest.java
@@ -77,15 +77,6 @@ public class OpcuaSubscriptionHandleTest {
 
     private static PlcConnection opcuaConnection;
 
-    @BeforeEach
-    public void before() {
-    }
-
-    @AfterEach
-    public void after() {
-
-    }
-
     // ! If this test fails, see comment at the top of the class before investigating.
     @BeforeAll
     public static void setup() throws Exception {