From 8364212e3349404e40a66397ce650f34a5bc24c6 Mon Sep 17 00:00:00 2001 From: Kevin Herron Date: Thu, 29 Jan 2026 06:18:58 -0800 Subject: [PATCH 1/6] Add SimpleAddressSpaceComposite for O(1) address space routing Provides an alternative to AddressSpaceComposite when routing decisions can be made directly from NodeId, enabling HashMap-based O(1) lookups instead of O(n) filter iteration. --- .../server/SimpleAddressSpaceComposite.java | 692 ++++++++++++++++++ 1 file changed, 692 insertions(+) create mode 100644 opc-ua-sdk/sdk-server/src/main/java/org/eclipse/milo/opcua/sdk/server/SimpleAddressSpaceComposite.java diff --git a/opc-ua-sdk/sdk-server/src/main/java/org/eclipse/milo/opcua/sdk/server/SimpleAddressSpaceComposite.java b/opc-ua-sdk/sdk-server/src/main/java/org/eclipse/milo/opcua/sdk/server/SimpleAddressSpaceComposite.java new file mode 100644 index 000000000..8df9db89b --- /dev/null +++ b/opc-ua-sdk/sdk-server/src/main/java/org/eclipse/milo/opcua/sdk/server/SimpleAddressSpaceComposite.java @@ -0,0 +1,692 @@ +package org.eclipse.milo.opcua.sdk.server; + +import static java.util.stream.Collectors.groupingBy; +import static org.eclipse.milo.opcua.sdk.core.util.GroupMapCollate.groupMapCollate; +import static org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.Unsigned.uint; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Map; +import java.util.Optional; +import java.util.function.Function; +import java.util.stream.Stream; +import org.eclipse.milo.opcua.sdk.core.Reference; +import org.eclipse.milo.opcua.sdk.server.AddressSpace.ReferenceResult.ReferenceList; +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.NamespaceTable; +import org.eclipse.milo.opcua.stack.core.types.builtin.DataValue; +import org.eclipse.milo.opcua.stack.core.types.builtin.ExpandedNodeId; +import org.eclipse.milo.opcua.stack.core.types.builtin.NodeId; +import org.eclipse.milo.opcua.stack.core.types.builtin.StatusCode; +import org.eclipse.milo.opcua.stack.core.types.builtin.unsigned.UInteger; +import org.eclipse.milo.opcua.stack.core.types.enumerated.TimestampsToReturn; +import org.eclipse.milo.opcua.stack.core.types.structured.AddNodesItem; +import org.eclipse.milo.opcua.stack.core.types.structured.AddNodesResult; +import org.eclipse.milo.opcua.stack.core.types.structured.AddReferencesItem; +import org.eclipse.milo.opcua.stack.core.types.structured.CallMethodRequest; +import org.eclipse.milo.opcua.stack.core.types.structured.CallMethodResult; +import org.eclipse.milo.opcua.stack.core.types.structured.DeleteAtTimeDetails; +import org.eclipse.milo.opcua.stack.core.types.structured.DeleteEventDetails; +import org.eclipse.milo.opcua.stack.core.types.structured.DeleteNodesItem; +import org.eclipse.milo.opcua.stack.core.types.structured.DeleteRawModifiedDetails; +import org.eclipse.milo.opcua.stack.core.types.structured.DeleteReferencesItem; +import org.eclipse.milo.opcua.stack.core.types.structured.HistoryReadDetails; +import org.eclipse.milo.opcua.stack.core.types.structured.HistoryReadResult; +import org.eclipse.milo.opcua.stack.core.types.structured.HistoryReadValueId; +import org.eclipse.milo.opcua.stack.core.types.structured.HistoryUpdateDetails; +import org.eclipse.milo.opcua.stack.core.types.structured.HistoryUpdateResult; +import org.eclipse.milo.opcua.stack.core.types.structured.ReadValueId; +import org.eclipse.milo.opcua.stack.core.types.structured.UpdateDataDetails; +import org.eclipse.milo.opcua.stack.core.types.structured.UpdateEventDetails; +import org.eclipse.milo.opcua.stack.core.types.structured.UpdateStructureDataDetails; +import org.eclipse.milo.opcua.stack.core.types.structured.ViewDescription; +import org.eclipse.milo.opcua.stack.core.types.structured.WriteValue; +import org.eclipse.milo.opcua.stack.core.util.Unit; + +/** + * An abstract {@link AddressSpaceFragment} composite that provides O(1) address space lookup when + * the routing decision can be made directly from a {@link NodeId}. + * + *

This class differs from {@link AddressSpaceComposite} in how it routes operations to address + * spaces: + * + *

+ * + *

When to use SimpleAddressSpaceComposite: + * + *

+ * + *

When to use AddressSpaceComposite instead: + * + *

+ * + *

Example implementation: + * + *

Consider a scenario where the composite manages devices, each represented by an {@link + * AddressSpaceFragment}. Nodes use String-based identifiers with a device prefix syntax like {@code + * "[device]Foo.Bar.Baz"}: + * + * 

{@code
+ * public class DeviceBasedComposite extends SimpleAddressSpaceComposite {
+ *   private static final Pattern DEVICE_PATTERN = Pattern.compile("^\\[(.+?)].*");
+ *
+ *   private final Map fragmentsByDevice = new HashMap<>();
+ *
+ *   public DeviceBasedComposite(OpcUaServer server) {
+ *     super(server);
+ *   }
+ *
+ *   public void addDevice(String deviceName, AddressSpaceFragment fragment) {
+ *     fragmentsByDevice.put(deviceName, fragment);
+ *   }
+ *
+ *   @Override
+ *   protected List getAddressSpaces() {
+ *     return new ArrayList<>(fragmentsByDevice.values());
+ *   }
+ *
+ *   @Override
+ *   protected Optional getAddressSpace(NodeId nodeId) {
+ *     return parseDeviceName(nodeId)
+ *         .map(fragmentsByDevice::get);
+ *   }
+ *
+ *   private Optional parseDeviceName(NodeId nodeId) {
+ *     Object identifier = nodeId.getIdentifier();
+ *     if (identifier instanceof String s) {
+ *       Matcher matcher = DEVICE_PATTERN.matcher(s);
+ *       if (matcher.matches()) {
+ *         return Optional.of(matcher.group(1));
+ *       }
+ *     }
+ *     return Optional.empty();
+ *   }
+ * }
+ * }
+ * + * @see AddressSpaceComposite + * @see AddressSpaceFragment + */ +public abstract class SimpleAddressSpaceComposite implements AddressSpaceFragment { + + private final AddressSpaceFilter filter = + SimpleAddressSpaceFilter.create(nodeId -> getAddressSpace(nodeId).isPresent()); + + private final OpcUaServer server; + + public SimpleAddressSpaceComposite(OpcUaServer server) { + this.server = server; + } + + @Override + public AddressSpaceFilter getFilter() { + return filter; + } + + /** + * Returns the {@link OpcUaServer} instance this composite belongs to. + * + * @return the {@link OpcUaServer} instance. + */ + protected OpcUaServer getServer() { + return server; + } + + /** + * Returns the list of all {@link AddressSpaceFragment}s managed by this composite. + * + * @return a list of all {@link AddressSpaceFragment}s in this composite. + */ + protected abstract List getAddressSpaces(); + + /** + * Returns the {@link AddressSpaceFragment} responsible for the given {@link NodeId}, if one + * exists. + * + *

If no address space is responsible for the given {@link NodeId}, return {@link + * Optional#empty()}. + * + * @param nodeId the {@link NodeId} to find the responsible address space for. + * @return an {@link Optional} containing the responsible {@link AddressSpaceFragment}, or empty + * if none exists. + */ + protected abstract Optional getAddressSpace(NodeId nodeId); + + private AddressSpaceFragment getAddressSpaceInternal(NodeId nodeId) { + return getAddressSpace(nodeId).orElse(new EmptyAddressSpaceFragment(server)); + } + + // region ViewServices + + @Override + public List browse( + BrowseContext context, ViewDescription view, List nodeIds) { + + List initialResults = + groupMapCollate( + nodeIds, + this::getAddressSpaceInternal, + (AddressSpace asx) -> + group -> { + var ctx = new BrowseContext(server, context.getSession().orElse(null)); + + return asx.browse(ctx, view, group); + }); + + final var finalResults = new ArrayList(); + + for (int i = 0; i < initialResults.size(); i++) { + NodeId nodeId = nodeIds.get(i); + ReferenceResult initialResult = initialResults.get(i); + + if (initialResult instanceof ReferenceList rl) { + final var references = new LinkedHashSet<>(rl.references()); + + // Gather additional references from all AddressSpaces except + // the first, which is the one we called browse on above. + + var browseContext = new BrowseContext(server, context.getSession().orElse(null)); + + AddressSpaceFragment first = getAddressSpaceInternal(nodeId); + + for (AddressSpace asx : getAddressSpaces()) { + if (asx != first) { + ReferenceList gatherResult = asx.gather(browseContext, view, nodeId); + + references.addAll(gatherResult.references()); + } + } + + finalResults.add(ReferenceResult.of(new ArrayList<>(references))); + } else { + finalResults.add(initialResult); + } + } + + return finalResults; + } + + @Override + public ReferenceList gather(BrowseContext context, ViewDescription view, NodeId nodeId) { + var referenceStreams = new ArrayList>(); + + for (AddressSpace asx : getAddressSpaces()) { + var browseContext = new BrowseContext(server, context.getSession().orElse(null)); + + ReferenceList result = asx.gather(browseContext, view, nodeId); + referenceStreams.add(result.references().stream()); + } + + List references = + referenceStreams.stream().flatMap(Function.identity()).distinct().toList(); + + return ReferenceResult.of(references); + } + + @Override + public List registerNodes(RegisterNodesContext context, List nodeIds) { + return groupMapCollate( + nodeIds, + this::getAddressSpaceInternal, + (AddressSpace asx) -> + group -> { + var ctx = + new RegisterNodesContext( + server, + context.getSession().orElse(null), + context.getDiagnosticsContext(), + context.getAuditEntryId(), + context.getTimeoutHint(), + context.getAdditionalHeader()); + + return asx.registerNodes(ctx, group); + }); + } + + @Override + public void unregisterNodes(UnregisterNodesContext context, List nodeIds) { + groupMapCollate( + nodeIds, + this::getAddressSpaceInternal, + (AddressSpace asx) -> + group -> { + var ctx = + new UnregisterNodesContext( + server, + context.getSession().orElse(null), + context.getDiagnosticsContext(), + context.getAuditEntryId(), + context.getTimeoutHint(), + context.getAdditionalHeader()); + + asx.unregisterNodes(ctx, group); + + return Collections.nCopies(group.size(), Unit.VALUE); + }); + } + + @Override + public UInteger getViewCount() { + return getAddressSpaces().stream() + .map(AddressSpace::getViewCount) + .reduce(uint(0), UInteger::add); + } + + // endregion + + // region AttributeServices + + @Override + public List read( + ReadContext context, + Double maxAge, + TimestampsToReturn timestamps, + List readValueIds) { + + return groupMapCollate( + readValueIds, + readValueId -> + getAddressSpace(readValueId.getNodeId()).orElse(new EmptyAddressSpaceFragment(server)), + (AddressSpace asx) -> + group -> { + var ctx = + new ReadContext( + server, + context.getSession().orElse(null), + context.getDiagnosticsContext(), + context.getAuditEntryId(), + context.getTimeoutHint(), + context.getAdditionalHeader()); + + return asx.read(ctx, maxAge, timestamps, group); + }); + } + + @Override + public List write(WriteContext context, List writeValues) { + return groupMapCollate( + writeValues, + writeValue -> + getAddressSpace(writeValue.getNodeId()).orElse(new EmptyAddressSpaceFragment(server)), + (AddressSpace asx) -> + group -> { + var ctx = + new WriteContext( + server, + context.getSession().orElse(null), + context.getDiagnosticsContext(), + context.getAuditEntryId(), + context.getTimeoutHint(), + context.getAdditionalHeader()); + + return asx.write(ctx, group); + }); + } + + // endregion + + // region AttributeHistoryServices + + @Override + public List historyRead( + HistoryReadContext context, + HistoryReadDetails details, + TimestampsToReturn timestamps, + List readValueIds) { + + return groupMapCollate( + readValueIds, + historyReadValueId -> getAddressSpaceInternal(historyReadValueId.getNodeId()), + (AddressSpace asx) -> + group -> { + var ctx = + new HistoryReadContext( + server, + context.getSession().orElse(null), + context.getDiagnosticsContext(), + context.getAuditEntryId(), + context.getTimeoutHint(), + context.getAdditionalHeader()); + + return asx.historyRead(ctx, details, timestamps, group); + }); + } + + @Override + public List historyUpdate( + HistoryUpdateContext context, List updateDetailsList) { + + return groupMapCollate( + updateDetailsList, + historyUpdateDetails -> { + if (historyUpdateDetails instanceof DeleteAtTimeDetails details) { + return getAddressSpaceInternal(details.getNodeId()); + } else if (historyUpdateDetails instanceof DeleteEventDetails details) { + return getAddressSpaceInternal(details.getNodeId()); + } else if (historyUpdateDetails instanceof DeleteRawModifiedDetails details) { + return getAddressSpaceInternal(details.getNodeId()); + } else if (historyUpdateDetails instanceof UpdateDataDetails details) { + return getAddressSpaceInternal(details.getNodeId()); + } else if (historyUpdateDetails instanceof UpdateEventDetails details) { + return getAddressSpaceInternal(details.getNodeId()); + } else if (historyUpdateDetails instanceof UpdateStructureDataDetails details) { + return getAddressSpaceInternal(details.getNodeId()); + } else { + throw new IllegalArgumentException( + "unexpected HistoryUpdateDetails: " + historyUpdateDetails); + } + }, + (AddressSpace asx) -> + group -> { + var ctx = + new HistoryUpdateContext( + server, + context.getSession().orElse(null), + context.getDiagnosticsContext(), + context.getAuditEntryId(), + context.getTimeoutHint(), + context.getAdditionalHeader()); + + return asx.historyUpdate(ctx, group); + }); + } + + // endregion + + // region MethodServices + + @Override + public List call(CallContext context, List requests) { + return groupMapCollate( + requests, + callMethodRequest -> getAddressSpaceInternal(callMethodRequest.getObjectId()), + (AddressSpace asx) -> + group -> { + var ctx = + new CallContext( + server, + context.getSession().orElse(null), + context.getDiagnosticsContext(), + context.getAuditEntryId(), + context.getTimeoutHint(), + context.getAdditionalHeader()); + + return asx.call(ctx, group); + }); + } + + // endregion + + // region MonitoredItemServices + + @Override + public RevisedDataItemParameters onCreateDataItem( + ReadValueId itemToMonitor, Double requestedSamplingInterval, UInteger requestedQueueSize) { + + AddressSpace addressSpace = getAddressSpaceInternal(itemToMonitor.getNodeId()); + + return addressSpace.onCreateDataItem( + itemToMonitor, requestedSamplingInterval, requestedQueueSize); + } + + @Override + public RevisedDataItemParameters onModifyDataItem( + ReadValueId itemToModify, Double requestedSamplingInterval, UInteger requestedQueueSize) { + + AddressSpace addressSpace = getAddressSpaceInternal(itemToModify.getNodeId()); + + return addressSpace.onModifyDataItem( + itemToModify, requestedSamplingInterval, requestedQueueSize); + } + + @Override + public RevisedEventItemParameters onCreateEventItem( + ReadValueId itemToMonitor, UInteger requestedQueueSize) { + + AddressSpace addressSpace = getAddressSpaceInternal(itemToMonitor.getNodeId()); + + return addressSpace.onCreateEventItem(itemToMonitor, requestedQueueSize); + } + + @Override + public RevisedEventItemParameters onModifyEventItem( + ReadValueId itemToModify, UInteger requestedQueueSize) { + + AddressSpace addressSpace = getAddressSpaceInternal(itemToModify.getNodeId()); + + return addressSpace.onModifyEventItem(itemToModify, requestedQueueSize); + } + + @Override + public void onDataItemsCreated(List dataItems) { + Map> byAddressSpace = + dataItems.stream() + .collect( + groupingBy(item -> getAddressSpaceInternal(item.getReadValueId().getNodeId()))); + + byAddressSpace.forEach(AddressSpace::onDataItemsCreated); + } + + @Override + public void onDataItemsModified(List dataItems) { + Map> byAddressSpace = + dataItems.stream() + .collect( + groupingBy(item -> getAddressSpaceInternal(item.getReadValueId().getNodeId()))); + + byAddressSpace.forEach(AddressSpace::onDataItemsModified); + } + + @Override + public void onDataItemsDeleted(List dataItems) { + Map> byAddressSpace = + dataItems.stream() + .collect( + groupingBy(item -> getAddressSpaceInternal(item.getReadValueId().getNodeId()))); + + byAddressSpace.forEach(AddressSpace::onDataItemsDeleted); + } + + @Override + public void onEventItemsCreated(List eventItems) { + Map> byAddressSpace = + eventItems.stream() + .collect( + groupingBy(item -> getAddressSpaceInternal(item.getReadValueId().getNodeId()))); + + byAddressSpace.forEach(AddressSpace::onEventItemsCreated); + } + + @Override + public void onEventItemsModified(List eventItems) { + Map> byAddressSpace = + eventItems.stream() + .collect( + groupingBy(item -> getAddressSpaceInternal(item.getReadValueId().getNodeId()))); + + byAddressSpace.forEach(AddressSpace::onEventItemsModified); + } + + @Override + public void onEventItemsDeleted(List eventItems) { + Map> byAddressSpace = + eventItems.stream() + .collect( + groupingBy(item -> getAddressSpaceInternal(item.getReadValueId().getNodeId()))); + + byAddressSpace.forEach(AddressSpace::onEventItemsDeleted); + } + + @Override + public void onMonitoringModeChanged(List monitoredItems) { + Map> byAddressSpace = + monitoredItems.stream() + .collect( + groupingBy(item -> getAddressSpaceInternal(item.getReadValueId().getNodeId()))); + + byAddressSpace.forEach(AddressSpace::onMonitoringModeChanged); + } + + // endregion + + // region NodeManagementServices + + @Override + public List addNodes(AddNodesContext context, List nodesToAdd) { + return groupMapCollate( + nodesToAdd, + addNodesItem -> { + NamespaceTable namespaceTable = server.getNamespaceTable(); + + ExpandedNodeId requestedNewNodeId = addNodesItem.getRequestedNewNodeId(); + + if (requestedNewNodeId.isNotNull()) { + return requestedNewNodeId + .toNodeId(namespaceTable) + .map(this::getAddressSpaceInternal) + .orElse(new EmptyAddressSpaceFragment(server)); + } else { + return addNodesItem + .getParentNodeId() + .toNodeId(namespaceTable) + .map(this::getAddressSpaceInternal) + .orElse(new EmptyAddressSpaceFragment(server)); + } + }, + (AddressSpace asx) -> + group -> { + var ctx = + new AddNodesContext( + server, + context.getSession().orElse(null), + context.getDiagnosticsContext(), + context.getAuditEntryId(), + context.getTimeoutHint(), + context.getAdditionalHeader()); + + return asx.addNodes(ctx, group); + }); + } + + @Override + public List deleteNodes( + DeleteNodesContext context, List nodesToDelete) { + return groupMapCollate( + nodesToDelete, + deleteNodesItem -> getAddressSpaceInternal(deleteNodesItem.getNodeId()), + (AddressSpace asx) -> + group -> { + var ctx = + new DeleteNodesContext( + server, + context.getSession().orElse(null), + context.getDiagnosticsContext(), + context.getAuditEntryId(), + context.getTimeoutHint(), + context.getAdditionalHeader()); + + return asx.deleteNodes(ctx, group); + }); + } + + @Override + public List addReferences( + AddReferencesContext context, List referencesToAdd) { + return groupMapCollate( + referencesToAdd, + addReferencesItem -> getAddressSpaceInternal(addReferencesItem.getSourceNodeId()), + (AddressSpace asx) -> + group -> { + var ctx = + new AddReferencesContext( + server, + context.getSession().orElse(null), + context.getDiagnosticsContext(), + context.getAuditEntryId(), + context.getTimeoutHint(), + context.getAdditionalHeader()); + + return asx.addReferences(ctx, group); + }); + } + + @Override + public List deleteReferences( + DeleteReferencesContext context, List referencesToDelete) { + return groupMapCollate( + referencesToDelete, + deleteReferencesItem -> getAddressSpaceInternal(deleteReferencesItem.getSourceNodeId()), + (AddressSpace asx) -> + group -> { + var ctx = + new DeleteReferencesContext( + server, + context.getSession().orElse(null), + context.getDiagnosticsContext(), + context.getAuditEntryId(), + context.getTimeoutHint(), + context.getAdditionalHeader()); + + return asx.deleteReferences(ctx, group); + }); + } + + // endregion + + /** EmptyAddressSpace is used ephemerally and should never be registered. */ + private static class EmptyAddressSpaceFragment extends ManagedAddressSpace + implements AddressSpaceFragment { + + private EmptyAddressSpaceFragment(OpcUaServer server) { + super(server); + } + + @Override + public AddressSpaceFilter getFilter() { + return new SimpleAddressSpaceFilter() { + @Override + protected boolean filterNode(NodeId nodeId) { + return true; + } + + @Override + protected boolean filterMonitoredItem(NodeId nodeId) { + return true; + } + }; + } + + @Override + public void onDataItemsCreated(List dataItems) {} + + @Override + public void onDataItemsModified(List dataItems) {} + + @Override + public void onDataItemsDeleted(List dataItems) {} + + @Override + public void onMonitoringModeChanged(List monitoredItems) {} + } +} From 745e6c0a91c1f545b92c027287cbdb612923495e Mon Sep 17 00:00:00 2001 From: Kevin Herron Date: Fri, 30 Jan 2026 08:01:42 -0800 Subject: [PATCH 2/6] Update opc-ua-sdk/sdk-server/src/main/java/org/eclipse/milo/opcua/sdk/server/SimpleAddressSpaceComposite.java Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- .../milo/opcua/sdk/server/SimpleAddressSpaceComposite.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/opc-ua-sdk/sdk-server/src/main/java/org/eclipse/milo/opcua/sdk/server/SimpleAddressSpaceComposite.java b/opc-ua-sdk/sdk-server/src/main/java/org/eclipse/milo/opcua/sdk/server/SimpleAddressSpaceComposite.java index 8df9db89b..390c51e51 100644 --- a/opc-ua-sdk/sdk-server/src/main/java/org/eclipse/milo/opcua/sdk/server/SimpleAddressSpaceComposite.java +++ b/opc-ua-sdk/sdk-server/src/main/java/org/eclipse/milo/opcua/sdk/server/SimpleAddressSpaceComposite.java @@ -654,7 +654,7 @@ public List deleteReferences( // endregion - /** EmptyAddressSpace is used ephemerally and should never be registered. */ + /** EmptyAddressSpaceFragment is used ephemerally and should never be registered. */ private static class EmptyAddressSpaceFragment extends ManagedAddressSpace implements AddressSpaceFragment { From b8e4c6d97a8392049a2b5554c8fe23af94d67f19 Mon Sep 17 00:00:00 2001 From: Copilot <198982749+Copilot@users.noreply.github.com> Date: Fri, 30 Jan 2026 08:32:18 -0800 Subject: [PATCH 3/6] Add copyright header to SimpleAddressSpaceComposite (#1701) * Initial plan * Add copyright header to SimpleAddressSpaceComposite Co-authored-by: kevinherron <340273+kevinherron@users.noreply.github.com> --------- Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com> Co-authored-by: kevinherron <340273+kevinherron@users.noreply.github.com> --- .../opcua/sdk/server/SimpleAddressSpaceComposite.java | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/opc-ua-sdk/sdk-server/src/main/java/org/eclipse/milo/opcua/sdk/server/SimpleAddressSpaceComposite.java b/opc-ua-sdk/sdk-server/src/main/java/org/eclipse/milo/opcua/sdk/server/SimpleAddressSpaceComposite.java index 390c51e51..1858be5a4 100644 --- a/opc-ua-sdk/sdk-server/src/main/java/org/eclipse/milo/opcua/sdk/server/SimpleAddressSpaceComposite.java +++ b/opc-ua-sdk/sdk-server/src/main/java/org/eclipse/milo/opcua/sdk/server/SimpleAddressSpaceComposite.java @@ -1,3 +1,13 @@ +/* + * Copyright (c) 2024 the Eclipse Milo Authors + * + * This program and the accompanying materials are made + * available under the terms of the Eclipse Public License 2.0 + * which is available at https://www.eclipse.org/legal/epl-2.0/ + * + * SPDX-License-Identifier: EPL-2.0 + */ + package org.eclipse.milo.opcua.sdk.server; import static java.util.stream.Collectors.groupingBy; From 00e87b7f28adaf26760f6fa33741fdc28e4c5b85 Mon Sep 17 00:00:00 2001 From: Kevin Herron Date: Thu, 5 Feb 2026 15:35:39 -0800 Subject: [PATCH 4/6] ~ use `getAddressSpaceInternal` --- .../milo/opcua/sdk/server/SimpleAddressSpaceComposite.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/opc-ua-sdk/sdk-server/src/main/java/org/eclipse/milo/opcua/sdk/server/SimpleAddressSpaceComposite.java b/opc-ua-sdk/sdk-server/src/main/java/org/eclipse/milo/opcua/sdk/server/SimpleAddressSpaceComposite.java index 1858be5a4..70be49fec 100644 --- a/opc-ua-sdk/sdk-server/src/main/java/org/eclipse/milo/opcua/sdk/server/SimpleAddressSpaceComposite.java +++ b/opc-ua-sdk/sdk-server/src/main/java/org/eclipse/milo/opcua/sdk/server/SimpleAddressSpaceComposite.java @@ -317,7 +317,7 @@ public List read( return groupMapCollate( readValueIds, readValueId -> - getAddressSpace(readValueId.getNodeId()).orElse(new EmptyAddressSpaceFragment(server)), + getAddressSpaceInternal(readValueId.getNodeId()), (AddressSpace asx) -> group -> { var ctx = @@ -338,7 +338,7 @@ public List write(WriteContext context, List writeValues return groupMapCollate( writeValues, writeValue -> - getAddressSpace(writeValue.getNodeId()).orElse(new EmptyAddressSpaceFragment(server)), + getAddressSpaceInternal(writeValue.getNodeId()), (AddressSpace asx) -> group -> { var ctx = From f985d3c1a492b16d64c6afa60b2152dc473a354a Mon Sep 17 00:00:00 2001 From: Kevin Herron Date: Thu, 5 Feb 2026 18:38:40 -0800 Subject: [PATCH 5/6] ~ formatting --- .../milo/opcua/sdk/server/SimpleAddressSpaceComposite.java | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/opc-ua-sdk/sdk-server/src/main/java/org/eclipse/milo/opcua/sdk/server/SimpleAddressSpaceComposite.java b/opc-ua-sdk/sdk-server/src/main/java/org/eclipse/milo/opcua/sdk/server/SimpleAddressSpaceComposite.java index 70be49fec..3782dc265 100644 --- a/opc-ua-sdk/sdk-server/src/main/java/org/eclipse/milo/opcua/sdk/server/SimpleAddressSpaceComposite.java +++ b/opc-ua-sdk/sdk-server/src/main/java/org/eclipse/milo/opcua/sdk/server/SimpleAddressSpaceComposite.java @@ -316,8 +316,7 @@ public List read( return groupMapCollate( readValueIds, - readValueId -> - getAddressSpaceInternal(readValueId.getNodeId()), + readValueId -> getAddressSpaceInternal(readValueId.getNodeId()), (AddressSpace asx) -> group -> { var ctx = @@ -337,8 +336,7 @@ public List read( public List write(WriteContext context, List writeValues) { return groupMapCollate( writeValues, - writeValue -> - getAddressSpaceInternal(writeValue.getNodeId()), + writeValue -> getAddressSpaceInternal(writeValue.getNodeId()), (AddressSpace asx) -> group -> { var ctx = From a6bbf67ff107c0153bad56ca9475a3163b3cf7d5 Mon Sep 17 00:00:00 2001 From: Kevin Herron Date: Sun, 8 Feb 2026 06:50:59 -0800 Subject: [PATCH 6/6] ~ rename `first` to `primary` in `browse` --- .../milo/opcua/sdk/server/SimpleAddressSpaceComposite.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/opc-ua-sdk/sdk-server/src/main/java/org/eclipse/milo/opcua/sdk/server/SimpleAddressSpaceComposite.java b/opc-ua-sdk/sdk-server/src/main/java/org/eclipse/milo/opcua/sdk/server/SimpleAddressSpaceComposite.java index 3782dc265..221b9e6bd 100644 --- a/opc-ua-sdk/sdk-server/src/main/java/org/eclipse/milo/opcua/sdk/server/SimpleAddressSpaceComposite.java +++ b/opc-ua-sdk/sdk-server/src/main/java/org/eclipse/milo/opcua/sdk/server/SimpleAddressSpaceComposite.java @@ -214,14 +214,14 @@ public List browse( final var references = new LinkedHashSet<>(rl.references()); // Gather additional references from all AddressSpaces except - // the first, which is the one we called browse on above. + // the "primary", which is the one we called browse on above. var browseContext = new BrowseContext(server, context.getSession().orElse(null)); - AddressSpaceFragment first = getAddressSpaceInternal(nodeId); + AddressSpaceFragment primary = getAddressSpaceInternal(nodeId); for (AddressSpace asx : getAddressSpaces()) { - if (asx != first) { + if (asx != primary) { ReferenceList gatherResult = asx.gather(browseContext, view, nodeId); references.addAll(gatherResult.references());