Generate ReferenceTypes, start moving away from BuiltinReferenceType

eclipse · Sep 17, 2022 · 0419f22 · 0419f22
1 parent 6dae1fa
commit 0419f22
Show file tree

Hide file tree

Showing 4 changed files with 336 additions and 10 deletions.
diff --git a/...k/integration-tests/src/test/java/org/eclipse/milo/opcua/sdk/client/AddressSpaceTest.java b/...k/integration-tests/src/test/java/org/eclipse/milo/opcua/sdk/client/AddressSpaceTest.java
@@ -19,8 +19,8 @@
 import org.eclipse.milo.opcua.sdk.client.nodes.UaNode;
 import org.eclipse.milo.opcua.sdk.client.nodes.UaVariableNode;
 import org.eclipse.milo.opcua.sdk.test.AbstractClientServerTest;
-import org.eclipse.milo.opcua.stack.core.BuiltinReferenceType;
 import org.eclipse.milo.opcua.stack.core.NodeIds;
+import org.eclipse.milo.opcua.stack.core.ReferenceTypes;
 import org.eclipse.milo.opcua.stack.core.StatusCodes;
 import org.eclipse.milo.opcua.stack.core.UaException;
 import org.eclipse.milo.opcua.stack.core.types.builtin.NodeId;
@@ -83,7 +83,7 @@ public void browseWithBrowseDirection() throws UaException {
             );
 
             List<? extends UaNode> nodes = addressSpace.browseNodes(objectsFolderNode, browseOptions);
-            
+
             assertEquals(9, nodes.size());
             assertTrue(nodes.stream().anyMatch(n -> n.getNodeId().equals(NodeIds.RootFolder)));
             assertTrue(nodes.stream().anyMatch(n -> n.getNodeId().equals(NodeIds.Server)));
@@ -99,7 +99,7 @@ public void browseWithReferenceType() throws UaException {
 
         BrowseOptions browseOptions = addressSpace.getBrowseOptions().copy(
             b ->
-                b.setReferenceType(BuiltinReferenceType.HasProperty)
+                b.setReferenceType(ReferenceTypes.HasProperty)
         );
 
         List<? extends UaNode> nodes = addressSpace.browseNodes(serverNode, browseOptions);

diff --git a/opc-ua-sdk/integration-tests/src/test/java/org/eclipse/milo/opcua/sdk/client/UaNodeTest.java b/opc-ua-sdk/integration-tests/src/test/java/org/eclipse/milo/opcua/sdk/client/UaNodeTest.java
@@ -23,6 +23,7 @@
 import org.eclipse.milo.opcua.sdk.test.AbstractClientServerTest;
 import org.eclipse.milo.opcua.stack.core.AttributeId;
 import org.eclipse.milo.opcua.stack.core.NodeIds;
+import org.eclipse.milo.opcua.stack.core.ReferenceTypes;
 import org.eclipse.milo.opcua.stack.core.UaException;
 import org.eclipse.milo.opcua.stack.core.types.builtin.DataValue;
 import org.eclipse.milo.opcua.stack.core.types.builtin.NodeId;
@@ -51,7 +52,7 @@ public void browse() throws UaException {
         UaNode serverNode = addressSpace.getNode(NodeIds.Server);
 
         BrowseOptions browseOptions = BrowseOptions.builder()
-            .setReferenceType(NodeIds.HasProperty)
+            .setReferenceType(ReferenceTypes.HasProperty)
             .build();
 
         List<ReferenceDescription> references = serverNode.browse(browseOptions);
@@ -72,7 +73,7 @@ public void browseNodes() throws UaException {
         UaNode serverNode = addressSpace.getNode(NodeIds.Server);
 
         BrowseOptions browseOptions = BrowseOptions.builder()
-            .setReferenceType(NodeIds.HasProperty)
+            .setReferenceType(ReferenceTypes.HasProperty)
             .build();
 
         List<? extends UaNode> nodes = serverNode.browseNodes(browseOptions);

diff --git a/opc-ua-sdk/sdk-client/src/main/java/org/eclipse/milo/opcua/sdk/client/AddressSpace.java b/opc-ua-sdk/sdk-client/src/main/java/org/eclipse/milo/opcua/sdk/client/AddressSpace.java
@@ -35,7 +35,6 @@
 import org.eclipse.milo.opcua.sdk.client.nodes.UaVariableTypeNode;
 import org.eclipse.milo.opcua.sdk.client.nodes.UaViewNode;
 import org.eclipse.milo.opcua.stack.core.AttributeId;
-import org.eclipse.milo.opcua.stack.core.BuiltinReferenceType;
 import org.eclipse.milo.opcua.stack.core.NodeIds;
 import org.eclipse.milo.opcua.stack.core.StatusCodes;
 import org.eclipse.milo.opcua.stack.core.UaException;
@@ -1795,10 +1794,6 @@ public Builder setBrowseDirection(BrowseDirection browseDirection) {
                 return this;
             }
 
-            public Builder setReferenceType(BuiltinReferenceType referenceType) {
-                return setReferenceType(referenceType.getNodeId());
-            }
-
             public Builder setReferenceType(NodeId referenceTypeId) {
                 this.referenceTypeId = referenceTypeId;
                 return this;