Package re-organization in sdk-server

eclipse · Dec 10, 2022 · c96c519 · c96c519
1 parent 20ffe84
commit c96c519
Show file tree

Hide file tree

Showing 67 changed files with 259 additions and 329 deletions.
diff --git a/...ples/server-examples/src/main/java/org/eclipse/milo/examples/server/ExampleNamespace.java b/...ples/server-examples/src/main/java/org/eclipse/milo/examples/server/ExampleNamespace.java
@@ -26,11 +26,11 @@
 import org.eclipse.milo.opcua.sdk.core.ValueRanks;
 import org.eclipse.milo.opcua.sdk.core.dtd.BinaryDataTypeCodec;
 import org.eclipse.milo.opcua.sdk.server.Lifecycle;
-import org.eclipse.milo.opcua.sdk.server.ManagedNamespaceWithLifecycle;
-import org.eclipse.milo.opcua.sdk.server.MonitoredItem;
 import org.eclipse.milo.opcua.sdk.server.OpcUaServer;
+import org.eclipse.milo.opcua.sdk.server.asx.ManagedNamespaceWithLifecycle;
 import org.eclipse.milo.opcua.sdk.server.dtd.BinaryDataTypeDictionaryManager;
 import org.eclipse.milo.opcua.sdk.server.items.DataItem;
+import org.eclipse.milo.opcua.sdk.server.items.MonitoredItem;
 import org.eclipse.milo.opcua.sdk.server.model.objects.BaseEventTypeNode;
 import org.eclipse.milo.opcua.sdk.server.model.objects.ServerTypeNode;
 import org.eclipse.milo.opcua.sdk.server.model.variables.AnalogItemTypeNode;

diff --git a/.../src/main/java/org/eclipse/milo/opcua/sdk/server/dtd/BinaryDataTypeDictionaryManager.java b/.../src/main/java/org/eclipse/milo/opcua/sdk/server/dtd/BinaryDataTypeDictionaryManager.java
@@ -36,9 +36,9 @@
 import org.eclipse.milo.opcua.sdk.core.dtd.BinaryDataTypeCodec;
 import org.eclipse.milo.opcua.sdk.core.dtd.BinaryDataTypeDictionary;
 import org.eclipse.milo.opcua.sdk.core.dtd.BsdGenerator;
-import org.eclipse.milo.opcua.sdk.server.AddressSpaceManager;
 import org.eclipse.milo.opcua.sdk.server.Lifecycle;
 import org.eclipse.milo.opcua.sdk.server.UaNodeManager;
+import org.eclipse.milo.opcua.sdk.server.asx.AddressSpaceManager;
 import org.eclipse.milo.opcua.sdk.server.model.objects.DataTypeEncodingTypeNode;
 import org.eclipse.milo.opcua.sdk.server.model.variables.DataTypeDescriptionTypeNode;
 import org.eclipse.milo.opcua.sdk.server.model.variables.DataTypeDictionaryType;

diff --git a/...ua-sdk/integration-tests/src/test/java/org/eclipse/milo/opcua/sdk/test/TestNamespace.java b/...ua-sdk/integration-tests/src/test/java/org/eclipse/milo/opcua/sdk/test/TestNamespace.java
@@ -18,11 +18,11 @@
 import org.eclipse.milo.opcua.sdk.core.Reference;
 import org.eclipse.milo.opcua.sdk.core.ValueRanks;
 import org.eclipse.milo.opcua.sdk.server.Lifecycle;
-import org.eclipse.milo.opcua.sdk.server.ManagedNamespaceWithLifecycle;
-import org.eclipse.milo.opcua.sdk.server.MonitoredItem;
 import org.eclipse.milo.opcua.sdk.server.OpcUaServer;
 import org.eclipse.milo.opcua.sdk.server.UaNodeManager;
+import org.eclipse.milo.opcua.sdk.server.asx.ManagedNamespaceWithLifecycle;
 import org.eclipse.milo.opcua.sdk.server.items.DataItem;
+import org.eclipse.milo.opcua.sdk.server.items.MonitoredItem;
 import org.eclipse.milo.opcua.sdk.server.methods.AbstractMethodInvocationHandler;
 import org.eclipse.milo.opcua.sdk.server.methods.InvalidArgumentException;
 import org.eclipse.milo.opcua.sdk.server.model.objects.BaseEventTypeNode;

diff --git a/...dk/sdk-server/src/main/java/org/eclipse/milo/opcua/sdk/server/AbstractServiceHandler.java b/...dk/sdk-server/src/main/java/org/eclipse/milo/opcua/sdk/server/AbstractServiceHandler.java
@@ -15,15 +15,15 @@
 import java.util.concurrent.ConcurrentMap;
 import java.util.function.Function;
 
-import org.eclipse.milo.opcua.sdk.server.services.AttributeServiceSet;
-import org.eclipse.milo.opcua.sdk.server.services.DiscoveryServiceSet;
-import org.eclipse.milo.opcua.sdk.server.services.MethodServiceSet;
-import org.eclipse.milo.opcua.sdk.server.services.MonitoredItemServiceSet;
-import org.eclipse.milo.opcua.sdk.server.services.NodeManagementServiceSet;
-import org.eclipse.milo.opcua.sdk.server.services.Service;
-import org.eclipse.milo.opcua.sdk.server.services.SessionServiceSet;
-import org.eclipse.milo.opcua.sdk.server.services.SubscriptionServiceSet;
-import org.eclipse.milo.opcua.sdk.server.services.ViewServiceSet;
+import org.eclipse.milo.opcua.sdk.server.servicesets.AttributeServiceSet;
+import org.eclipse.milo.opcua.sdk.server.servicesets.DiscoveryServiceSet;
+import org.eclipse.milo.opcua.sdk.server.servicesets.MethodServiceSet;
+import org.eclipse.milo.opcua.sdk.server.servicesets.MonitoredItemServiceSet;
+import org.eclipse.milo.opcua.sdk.server.servicesets.NodeManagementServiceSet;
+import org.eclipse.milo.opcua.sdk.server.servicesets.Service;
+import org.eclipse.milo.opcua.sdk.server.servicesets.SessionServiceSet;
+import org.eclipse.milo.opcua.sdk.server.servicesets.SubscriptionServiceSet;
+import org.eclipse.milo.opcua.sdk.server.servicesets.ViewServiceSet;
 import org.eclipse.milo.opcua.stack.core.types.UaRequestMessageType;
 import org.eclipse.milo.opcua.stack.core.types.UaResponseMessageType;
 import org.eclipse.milo.opcua.stack.core.types.structured.ActivateSessionRequest;

diff --git a/opc-ua-sdk/sdk-server/src/main/java/org/eclipse/milo/opcua/sdk/server/OpcUaServer.java b/opc-ua-sdk/sdk-server/src/main/java/org/eclipse/milo/opcua/sdk/server/OpcUaServer.java
@@ -31,22 +31,23 @@
 
 import com.google.common.collect.Sets;
 import com.google.common.eventbus.EventBus;
+import org.eclipse.milo.opcua.sdk.server.asx.AddressSpaceManager;
 import org.eclipse.milo.opcua.sdk.server.diagnostics.ServerDiagnosticsSummary;
 import org.eclipse.milo.opcua.sdk.server.model.ObjectTypeInitializer;
 import org.eclipse.milo.opcua.sdk.server.model.VariableTypeInitializer;
 import org.eclipse.milo.opcua.sdk.server.model.objects.BaseEventTypeNode;
 import org.eclipse.milo.opcua.sdk.server.namespaces.OpcUaNamespace;
 import org.eclipse.milo.opcua.sdk.server.namespaces.ServerNamespace;
 import org.eclipse.milo.opcua.sdk.server.nodes.factories.EventFactory;
-import org.eclipse.milo.opcua.sdk.server.services.Service;
-import org.eclipse.milo.opcua.sdk.server.services.impl.DefaultAttributeServiceSet;
-import org.eclipse.milo.opcua.sdk.server.services.impl.DefaultDiscoveryServiceSet;
-import org.eclipse.milo.opcua.sdk.server.services.impl.DefaultMethodServiceSet;
-import org.eclipse.milo.opcua.sdk.server.services.impl.DefaultMonitoredItemServiceSet;
-import org.eclipse.milo.opcua.sdk.server.services.impl.DefaultNodeManagementServiceSet;
-import org.eclipse.milo.opcua.sdk.server.services.impl.DefaultSessionServiceSet;
-import org.eclipse.milo.opcua.sdk.server.services.impl.DefaultSubscriptionServiceSet;
-import org.eclipse.milo.opcua.sdk.server.services.impl.DefaultViewServiceSet;
+import org.eclipse.milo.opcua.sdk.server.servicesets.Service;
+import org.eclipse.milo.opcua.sdk.server.servicesets.impl.DefaultAttributeServiceSet;
+import org.eclipse.milo.opcua.sdk.server.servicesets.impl.DefaultDiscoveryServiceSet;
+import org.eclipse.milo.opcua.sdk.server.servicesets.impl.DefaultMethodServiceSet;
+import org.eclipse.milo.opcua.sdk.server.servicesets.impl.DefaultMonitoredItemServiceSet;
+import org.eclipse.milo.opcua.sdk.server.servicesets.impl.DefaultNodeManagementServiceSet;
+import org.eclipse.milo.opcua.sdk.server.servicesets.impl.DefaultSessionServiceSet;
+import org.eclipse.milo.opcua.sdk.server.servicesets.impl.DefaultSubscriptionServiceSet;
+import org.eclipse.milo.opcua.sdk.server.servicesets.impl.DefaultViewServiceSet;
 import org.eclipse.milo.opcua.sdk.server.subscriptions.Subscription;
 import org.eclipse.milo.opcua.stack.core.BuiltinReferenceType;
 import org.eclipse.milo.opcua.stack.core.NamespaceTable;

diff --git a/opc-ua-sdk/sdk-server/src/main/java/org/eclipse/milo/opcua/sdk/server/Session.java b/opc-ua-sdk/sdk-server/src/main/java/org/eclipse/milo/opcua/sdk/server/Session.java
@@ -24,7 +24,7 @@
 
 import org.eclipse.milo.opcua.sdk.server.diagnostics.SessionDiagnostics;
 import org.eclipse.milo.opcua.sdk.server.diagnostics.SessionSecurityDiagnostics;
-import org.eclipse.milo.opcua.sdk.server.services.impl.helpers.BrowseHelper.BrowseContinuationPoint;
+import org.eclipse.milo.opcua.sdk.server.servicesets.impl.helpers.BrowseHelper.BrowseContinuationPoint;
 import org.eclipse.milo.opcua.sdk.server.subscriptions.SubscriptionManager;
 import org.eclipse.milo.opcua.stack.core.types.builtin.ByteString;
 import org.eclipse.milo.opcua.stack.core.types.builtin.DateTime;

diff --git a/opc-ua-sdk/sdk-server/src/main/java/org/eclipse/milo/opcua/sdk/server/SessionManager.java b/opc-ua-sdk/sdk-server/src/main/java/org/eclipse/milo/opcua/sdk/server/SessionManager.java
@@ -68,7 +68,7 @@
 import org.slf4j.LoggerFactory;
 
 import static java.util.Objects.requireNonNullElse;
-import static org.eclipse.milo.opcua.sdk.server.services.AbstractServiceSet.createResponseHeader;
+import static org.eclipse.milo.opcua.sdk.server.servicesets.AbstractServiceSet.createResponseHeader;
 import static org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.Unsigned.uint;
 import static org.eclipse.milo.opcua.stack.core.util.DigestUtil.sha1;
 

diff --git a/...k-server/src/main/java/org/eclipse/milo/opcua/sdk/server/annotations/UaInputArgument.java b/...k-server/src/main/java/org/eclipse/milo/opcua/sdk/server/annotations/UaInputArgument.java
diff --git a/...-sdk/sdk-server/src/main/java/org/eclipse/milo/opcua/sdk/server/annotations/UaMethod.java b/...-sdk/sdk-server/src/main/java/org/eclipse/milo/opcua/sdk/server/annotations/UaMethod.java
diff --git a/...-server/src/main/java/org/eclipse/milo/opcua/sdk/server/annotations/UaOutputArgument.java b/...-server/src/main/java/org/eclipse/milo/opcua/sdk/server/annotations/UaOutputArgument.java
diff --git a/...e/milo/opcua/sdk/server/AddressSpace.java → ...lo/opcua/sdk/server/asx/AddressSpace.java b/...e/milo/opcua/sdk/server/AddressSpace.java → ...lo/opcua/sdk/server/asx/AddressSpace.java
@@ -8,20 +8,18 @@
  * SPDX-License-Identifier: EPL-2.0
  */
 
-package org.eclipse.milo.opcua.sdk.server;
+package org.eclipse.milo.opcua.sdk.server.asx;
 
-import org.eclipse.milo.opcua.sdk.server.services.AttributeHistoryServices;
-import org.eclipse.milo.opcua.sdk.server.services.AttributeServices;
-import org.eclipse.milo.opcua.sdk.server.services.MethodServices;
-import org.eclipse.milo.opcua.sdk.server.services.MonitoredItemServices;
-import org.eclipse.milo.opcua.sdk.server.services.NodeManagementServices;
-import org.eclipse.milo.opcua.sdk.server.services.ViewServices;
+import org.eclipse.milo.opcua.sdk.server.asx.services.AttributeServices;
+import org.eclipse.milo.opcua.sdk.server.asx.services.MethodServices;
+import org.eclipse.milo.opcua.sdk.server.asx.services.MonitoredItemServices;
+import org.eclipse.milo.opcua.sdk.server.asx.services.NodeManagementServices;
+import org.eclipse.milo.opcua.sdk.server.asx.services.ViewServices;
 
 /**
  * A composite interface composed of service sub-interfaces an {@link AddressSpace} must implement:
  * <ul>
  * <li>{@link AttributeServices}</li>
- * <li>{@link AttributeHistoryServices}</li>
  * <li>{@link MethodServices}</li>
  * <li>{@link MonitoredItemServices}</li>
  * <li>{@link NodeManagementServices}</li>
@@ -30,7 +28,6 @@
  */
 public interface AddressSpace extends
     AttributeServices,
-    AttributeHistoryServices,
     MethodServices,
     MonitoredItemServices,
     NodeManagementServices,

diff --git a/...cua/sdk/server/AddressSpaceComposite.java → ...sdk/server/asx/AddressSpaceComposite.java b/...cua/sdk/server/AddressSpaceComposite.java → ...sdk/server/asx/AddressSpaceComposite.java
@@ -8,7 +8,7 @@
  * SPDX-License-Identifier: EPL-2.0
  */
 
-package org.eclipse.milo.opcua.sdk.server;
+package org.eclipse.milo.opcua.sdk.server.asx;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -21,9 +21,11 @@
 import java.util.function.Predicate;
 
 import org.eclipse.milo.opcua.sdk.core.Reference;
+import org.eclipse.milo.opcua.sdk.server.OpcUaServer;
+import org.eclipse.milo.opcua.sdk.server.asx.services.MonitoredItemServices;
 import org.eclipse.milo.opcua.sdk.server.items.DataItem;
 import org.eclipse.milo.opcua.sdk.server.items.EventItem;
-import org.eclipse.milo.opcua.sdk.server.services.MonitoredItemServices;
+import org.eclipse.milo.opcua.sdk.server.items.MonitoredItem;
 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.DataValue;

diff --git a/.../opcua/sdk/server/AddressSpaceFilter.java → ...ua/sdk/server/asx/AddressSpaceFilter.java b/.../opcua/sdk/server/AddressSpaceFilter.java → ...ua/sdk/server/asx/AddressSpaceFilter.java
@@ -8,21 +8,21 @@
  * SPDX-License-Identifier: EPL-2.0
  */
 
-package org.eclipse.milo.opcua.sdk.server;
+package org.eclipse.milo.opcua.sdk.server.asx;
 
 import java.util.List;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 
-import org.eclipse.milo.opcua.sdk.server.services.AttributeHistoryServices;
-import org.eclipse.milo.opcua.sdk.server.services.AttributeHistoryServices.HistoryReadContext;
-import org.eclipse.milo.opcua.sdk.server.services.AttributeHistoryServices.HistoryUpdateContext;
-import org.eclipse.milo.opcua.sdk.server.services.AttributeServices;
-import org.eclipse.milo.opcua.sdk.server.services.MethodServices;
-import org.eclipse.milo.opcua.sdk.server.services.MonitoredItemServices;
-import org.eclipse.milo.opcua.sdk.server.services.NodeManagementServices;
-import org.eclipse.milo.opcua.sdk.server.services.NodeManagementServices.AddNodesContext;
-import org.eclipse.milo.opcua.sdk.server.services.ViewServices;
+import org.eclipse.milo.opcua.sdk.server.OpcUaServer;
+import org.eclipse.milo.opcua.sdk.server.asx.services.AttributeServices;
+import org.eclipse.milo.opcua.sdk.server.asx.services.AttributeServices.HistoryReadContext;
+import org.eclipse.milo.opcua.sdk.server.asx.services.AttributeServices.HistoryUpdateContext;
+import org.eclipse.milo.opcua.sdk.server.asx.services.MethodServices;
+import org.eclipse.milo.opcua.sdk.server.asx.services.MonitoredItemServices;
+import org.eclipse.milo.opcua.sdk.server.asx.services.NodeManagementServices;
+import org.eclipse.milo.opcua.sdk.server.asx.services.NodeManagementServices.AddNodesContext;
+import org.eclipse.milo.opcua.sdk.server.asx.services.ViewServices;
 import org.eclipse.milo.opcua.stack.core.types.builtin.NodeId;
 import org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.UInteger;
 import org.eclipse.milo.opcua.stack.core.types.enumerated.TimestampsToReturn;
@@ -38,15 +38,15 @@
 import org.eclipse.milo.opcua.stack.core.types.structured.ViewDescription;
 import org.eclipse.milo.opcua.stack.core.types.structured.WriteValue;
 
-import static org.eclipse.milo.opcua.sdk.server.services.AttributeServices.ReadContext;
-import static org.eclipse.milo.opcua.sdk.server.services.AttributeServices.WriteContext;
-import static org.eclipse.milo.opcua.sdk.server.services.MethodServices.CallContext;
-import static org.eclipse.milo.opcua.sdk.server.services.NodeManagementServices.AddReferencesContext;
-import static org.eclipse.milo.opcua.sdk.server.services.NodeManagementServices.DeleteNodesContext;
-import static org.eclipse.milo.opcua.sdk.server.services.NodeManagementServices.DeleteReferencesContext;
-import static org.eclipse.milo.opcua.sdk.server.services.ViewServices.BrowseContext;
-import static org.eclipse.milo.opcua.sdk.server.services.ViewServices.RegisterNodesContext;
-import static org.eclipse.milo.opcua.sdk.server.services.ViewServices.UnregisterNodesContext;
+import static org.eclipse.milo.opcua.sdk.server.asx.services.AttributeServices.ReadContext;
+import static org.eclipse.milo.opcua.sdk.server.asx.services.AttributeServices.WriteContext;
+import static org.eclipse.milo.opcua.sdk.server.asx.services.MethodServices.CallContext;
+import static org.eclipse.milo.opcua.sdk.server.asx.services.NodeManagementServices.AddReferencesContext;
+import static org.eclipse.milo.opcua.sdk.server.asx.services.NodeManagementServices.DeleteNodesContext;
+import static org.eclipse.milo.opcua.sdk.server.asx.services.NodeManagementServices.DeleteReferencesContext;
+import static org.eclipse.milo.opcua.sdk.server.asx.services.ViewServices.BrowseContext;
+import static org.eclipse.milo.opcua.sdk.server.asx.services.ViewServices.RegisterNodesContext;
+import static org.eclipse.milo.opcua.sdk.server.asx.services.ViewServices.UnregisterNodesContext;
 
 public interface AddressSpaceFilter {
 
@@ -124,7 +124,7 @@ public interface AddressSpaceFilter {
      * @param historyReadValueId the {@link HistoryReadValueId} from the history read operation.
      * @return {@code true} if the history read operation for {@code historyReadValueId} should be handled by the
      * {@link AddressSpace} this filter belongs to.
-     * @see AttributeHistoryServices#historyRead(HistoryReadContext, HistoryReadDetails, TimestampsToReturn, List)
+     * @see AttributeServices#historyRead(HistoryReadContext, HistoryReadDetails, TimestampsToReturn, List)
      */
     boolean filterHistoryRead(OpcUaServer server, HistoryReadValueId historyReadValueId);
 
@@ -136,7 +136,7 @@ public interface AddressSpaceFilter {
      * @param historyUpdateDetails the {@link HistoryUpdateDetails} from the history update operation.
      * @return {@code true} if the history update operation for {@code historyUpdateDetails} should be handled by the
      * {@link AddressSpace} this filter belongs to.
-     * @see AttributeHistoryServices#historyUpdate(HistoryUpdateContext, List)
+     * @see AttributeServices#historyUpdate(HistoryUpdateContext, List)
      */
     boolean filterHistoryUpdate(OpcUaServer server, HistoryUpdateDetails historyUpdateDetails);
 

diff --git a/...pcua/sdk/server/AddressSpaceFragment.java → .../sdk/server/asx/AddressSpaceFragment.java b/...pcua/sdk/server/AddressSpaceFragment.java → .../sdk/server/asx/AddressSpaceFragment.java
@@ -8,7 +8,7 @@
  * SPDX-License-Identifier: EPL-2.0
  */
 
-package org.eclipse.milo.opcua.sdk.server;
+package org.eclipse.milo.opcua.sdk.server.asx;
 
 /**
  * An {@link AddressSpace} fragment that is part of an {@link AddressSpaceComposite}.

diff --git a/...opcua/sdk/server/AddressSpaceManager.java → ...a/sdk/server/asx/AddressSpaceManager.java b/...opcua/sdk/server/AddressSpaceManager.java → ...a/sdk/server/asx/AddressSpaceManager.java
@@ -8,7 +8,7 @@
  * SPDX-License-Identifier: EPL-2.0
  */
 
-package org.eclipse.milo.opcua.sdk.server;
+package org.eclipse.milo.opcua.sdk.server.asx;
 
 import java.util.Collection;
 import java.util.List;
@@ -18,6 +18,8 @@
 import java.util.stream.Collectors;
 
 import org.eclipse.milo.opcua.sdk.core.Reference;
+import org.eclipse.milo.opcua.sdk.server.NodeManager;
+import org.eclipse.milo.opcua.sdk.server.OpcUaServer;
 import org.eclipse.milo.opcua.sdk.server.nodes.UaNode;
 import org.eclipse.milo.opcua.stack.core.types.builtin.ExpandedNodeId;
 import org.eclipse.milo.opcua.stack.core.types.builtin.NodeId;

diff --git a/...ua/sdk/server/ForwardingAddressSpace.java → ...dk/server/asx/ForwardingAddressSpace.java b/...ua/sdk/server/ForwardingAddressSpace.java → ...dk/server/asx/ForwardingAddressSpace.java
@@ -8,14 +8,15 @@
  * SPDX-License-Identifier: EPL-2.0
  */
 
-package org.eclipse.milo.opcua.sdk.server;
+package org.eclipse.milo.opcua.sdk.server.asx;
 
 import java.util.List;
 import java.util.function.BiConsumer;
 import java.util.function.Consumer;
 
 import org.eclipse.milo.opcua.sdk.server.items.DataItem;
 import org.eclipse.milo.opcua.sdk.server.items.EventItem;
+import org.eclipse.milo.opcua.sdk.server.items.MonitoredItem;
 import org.eclipse.milo.opcua.stack.core.types.builtin.NodeId;
 import org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.UInteger;
 import org.eclipse.milo.opcua.stack.core.types.enumerated.TimestampsToReturn;

diff --git a/...opcua/sdk/server/ManagedAddressSpace.java → ...a/sdk/server/asx/ManagedAddressSpace.java b/...opcua/sdk/server/ManagedAddressSpace.java → ...a/sdk/server/asx/ManagedAddressSpace.java
@@ -8,13 +8,17 @@
  * SPDX-License-Identifier: EPL-2.0
  */
 
-package org.eclipse.milo.opcua.sdk.server;
+package org.eclipse.milo.opcua.sdk.server.asx;
 
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
 
 import org.eclipse.milo.opcua.sdk.core.Reference;
+import org.eclipse.milo.opcua.sdk.server.NodeManager;
+import org.eclipse.milo.opcua.sdk.server.OpcUaServer;
+import org.eclipse.milo.opcua.sdk.server.UaNodeManager;
+import org.eclipse.milo.opcua.sdk.server.asx.services.MethodServices;
 import org.eclipse.milo.opcua.sdk.server.methods.MethodInvocationHandler;
 import org.eclipse.milo.opcua.sdk.server.nodes.AttributeContext;
 import org.eclipse.milo.opcua.sdk.server.nodes.UaMethodNode;
@@ -24,7 +28,6 @@
 import org.eclipse.milo.opcua.sdk.server.nodes.UaObjectTypeNode;
 import org.eclipse.milo.opcua.sdk.server.nodes.UaServerNode;
 import org.eclipse.milo.opcua.sdk.server.nodes.factories.NodeFactory;
-import org.eclipse.milo.opcua.sdk.server.services.MethodServices;
 import org.eclipse.milo.opcua.stack.core.AttributeId;
 import org.eclipse.milo.opcua.stack.core.StatusCodes;
 import org.eclipse.milo.opcua.stack.core.UaException;