This is an automated email from the ASF dual-hosted git repository.
apupier pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
The following commit(s) were added to refs/heads/main by this push:
new 8377dcc22b5b Replace deprecated methods and attributes in milo
component
8377dcc22b5b is described below
commit 8377dcc22b5b60dd1cd44e676f0f80e81921f855
Author: Aurélien Pupier <[email protected]>
AuthorDate: Thu Jul 9 12:10:51 2026 +0200
Replace deprecated methods and attributes in milo component
Signed-off-by: Aurélien Pupier <[email protected]>
---
.../camel/component/milo/browse/MiloBrowseEndpoint.java | 4 ++--
.../component/milo/client/internal/SubscriptionManager.java | 6 +++---
.../camel/component/milo/server/internal/CallMethod.java | 6 +++---
.../component/milo/server/internal/CamelNamespace.java | 12 ++++++------
.../camel/component/milo/browse/BrowseServerTest.java | 6 +++---
.../apache/camel/component/milo/call/MockCallMethod.java | 6 +++---
.../camel/component/milo/call/MockCamelNamespace.java | 10 +++++-----
.../apache/camel/component/milo/server/ServerLocalTest.java | 13 +++++++------
8 files changed, 32 insertions(+), 31 deletions(-)
diff --git
a/components/camel-milo/src/main/java/org/apache/camel/component/milo/browse/MiloBrowseEndpoint.java
b/components/camel-milo/src/main/java/org/apache/camel/component/milo/browse/MiloBrowseEndpoint.java
index b8faeeb450e3..9752ac6aa38c 100644
---
a/components/camel-milo/src/main/java/org/apache/camel/component/milo/browse/MiloBrowseEndpoint.java
+++
b/components/camel-milo/src/main/java/org/apache/camel/component/milo/browse/MiloBrowseEndpoint.java
@@ -31,7 +31,7 @@ import org.apache.camel.spi.UriEndpoint;
import org.apache.camel.spi.UriParam;
import org.apache.camel.spi.UriPath;
import org.apache.camel.support.DefaultEndpoint;
-import org.eclipse.milo.opcua.stack.core.Identifiers;
+import org.eclipse.milo.opcua.stack.core.NodeIds0;
import org.eclipse.milo.opcua.stack.core.types.builtin.NodeId;
import org.eclipse.milo.opcua.stack.core.types.enumerated.BrowseDirection;
import org.eclipse.milo.opcua.stack.core.types.enumerated.NodeClass;
@@ -62,7 +62,7 @@ public class MiloBrowseEndpoint extends DefaultEndpoint {
* The node definition (see Node ID)
*/
@UriParam(defaultValue = "ns=0;id=84", defaultValueNote = "Root folder as
per OPC-UA spec")
- private String node = Identifiers.RootFolder.toParseableString();
+ private String node = NodeIds0.RootFolder.toParseableString();
/**
* The direction to browse (forward, inverse, ...)
diff --git
a/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/internal/SubscriptionManager.java
b/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/internal/SubscriptionManager.java
index 75d6ec23f0b9..88b23845f71f 100644
---
a/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/internal/SubscriptionManager.java
+++
b/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/internal/SubscriptionManager.java
@@ -54,7 +54,7 @@ import
org.eclipse.milo.opcua.sdk.client.identity.UsernameProvider;
import org.eclipse.milo.opcua.sdk.client.subscriptions.OpcUaMonitoredItem;
import org.eclipse.milo.opcua.sdk.client.subscriptions.OpcUaSubscription;
import org.eclipse.milo.opcua.stack.core.AttributeId;
-import org.eclipse.milo.opcua.stack.core.Identifiers;
+import org.eclipse.milo.opcua.stack.core.NodeIds0;
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.ByteString;
@@ -279,7 +279,7 @@ public class SubscriptionManager {
// = this.client.readValue(0,
TimestampsToReturn.Neither, Identifiers.Server_NamespaceArray);
CompletableFuture<DataValue> future = this.client
.readValuesAsync(0, TimestampsToReturn.Neither,
-
Collections.singletonList(Identifiers.Server_NamespaceArray))
+
Collections.singletonList(NodeIds0.Server_NamespaceArray))
.thenApply(r -> r.get(0));
return future.thenApply(value -> {
@@ -573,7 +573,7 @@ public class SubscriptionManager {
.collect(Collectors.toList());
return completedFuture(nodeIds.stream().map(nodeId ->
new BrowseDescription(
- nodeId, direction, Identifiers.References,
includeSubTypes, uint(nodeClasses),
+ nodeId, direction, NodeIds0.References,
includeSubTypes, uint(nodeClasses),
uint(BrowseResultMask.All.getValue()))).collect(Collectors.toList()));
})
diff --git
a/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/internal/CallMethod.java
b/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/internal/CallMethod.java
index 9eb812874c18..ec6f52a01fa0 100644
---
a/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/internal/CallMethod.java
+++
b/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/internal/CallMethod.java
@@ -20,7 +20,7 @@ package org.apache.camel.component.milo.server.internal;
import org.eclipse.milo.opcua.sdk.core.ValueRanks;
import
org.eclipse.milo.opcua.sdk.server.methods.AbstractMethodInvocationHandler;
import org.eclipse.milo.opcua.sdk.server.nodes.UaMethodNode;
-import org.eclipse.milo.opcua.stack.core.Identifiers;
+import org.eclipse.milo.opcua.stack.core.NodeIds0;
import org.eclipse.milo.opcua.stack.core.types.builtin.LocalizedText;
import org.eclipse.milo.opcua.stack.core.types.builtin.Variant;
import org.eclipse.milo.opcua.stack.core.types.structured.Argument;
@@ -31,14 +31,14 @@ public class CallMethod extends
AbstractMethodInvocationHandler {
public static final Argument IN = new Argument(
"in",
- Identifiers.String,
+ NodeIds0.String,
ValueRanks.Scalar,
null,
new LocalizedText("A value."));
public static final Argument OUT = new Argument(
"out",
- Identifiers.String,
+ NodeIds0.String,
ValueRanks.Scalar,
null,
new LocalizedText("A value."));
diff --git
a/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/internal/CamelNamespace.java
b/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/internal/CamelNamespace.java
index 1a076c375074..ff8d029baeb4 100644
---
a/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/internal/CamelNamespace.java
+++
b/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/internal/CamelNamespace.java
@@ -31,7 +31,7 @@ import org.eclipse.milo.opcua.sdk.server.items.MonitoredItem;
import org.eclipse.milo.opcua.sdk.server.nodes.UaFolderNode;
import org.eclipse.milo.opcua.sdk.server.nodes.UaObjectNode;
import org.eclipse.milo.opcua.sdk.server.util.SubscriptionModel;
-import org.eclipse.milo.opcua.stack.core.Identifiers;
+import org.eclipse.milo.opcua.stack.core.NodeIds0;
import org.eclipse.milo.opcua.stack.core.types.builtin.LocalizedText;
import org.eclipse.milo.opcua.stack.core.types.builtin.NodeId;
import org.eclipse.milo.opcua.stack.core.types.builtin.QualifiedName;
@@ -82,7 +82,7 @@ public class CamelNamespace extends
ManagedNamespaceWithLifecycle {
.setNodeId(nodeId2)
.setBrowseName(name2)
.setDisplayName(displayName2)
- .setTypeDefinition(Identifiers.FolderType)
+ .setTypeDefinition(NodeIds0.FolderType)
.buildAndAdd());
this.folder.addComponent(this.itemsObject);
this.getNodeManager().addNode(this.itemsObject);
@@ -91,14 +91,14 @@ public class CamelNamespace extends
ManagedNamespaceWithLifecycle {
folder.addReference(new Reference(
folder.getNodeId(),
- Identifiers.Organizes,
- Identifiers.ObjectsFolder.expanded(),
+ NodeIds0.Organizes,
+ NodeIds0.ObjectsFolder.expanded(),
false));
itemsObject.addReference(new Reference(
nodeId,
- Identifiers.HasComponent,
- Identifiers.ObjectNode.expanded(),
+ NodeIds0.HasComponent,
+ NodeIds0.ObjectNode.expanded(),
Reference.Direction.INVERSE));
}
diff --git
a/components/camel-milo/src/test/java/org/apache/camel/component/milo/browse/BrowseServerTest.java
b/components/camel-milo/src/test/java/org/apache/camel/component/milo/browse/BrowseServerTest.java
index 5cc8506687c6..47b8faab0501 100644
---
a/components/camel-milo/src/test/java/org/apache/camel/component/milo/browse/BrowseServerTest.java
+++
b/components/camel-milo/src/test/java/org/apache/camel/component/milo/browse/BrowseServerTest.java
@@ -34,7 +34,7 @@ import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.milo.AbstractMiloServerTest;
import org.apache.camel.component.milo.MiloConstants;
import org.apache.camel.component.mock.MockEndpoint;
-import org.eclipse.milo.opcua.stack.core.Identifiers;
+import org.eclipse.milo.opcua.stack.core.NodeIds0;
import org.eclipse.milo.opcua.stack.core.types.builtin.ExpandedNodeId;
import org.eclipse.milo.opcua.stack.core.types.builtin.LocalizedText;
import org.eclipse.milo.opcua.stack.core.types.structured.BrowseResult;
@@ -354,7 +354,7 @@ public class BrowseServerTest extends
AbstractMiloServerTest {
mock5.expectedMessagesMatches(assertPredicate(e ->
assertBrowseResult(e.getMessage(), "Root")));
producer5.send(ExchangeBuilder.anExchange(context)
.withHeader(MiloConstants.HEADER_NODE_IDS,
-
Collections.singletonList(Identifiers.TypesFolder.toParseableString()))
+
Collections.singletonList(NodeIds0.TypesFolder.toParseableString()))
.build());
assertIsSatisfied(5, TimeUnit.SECONDS, mock5);
}
@@ -390,7 +390,7 @@ public class BrowseServerTest extends
AbstractMiloServerTest {
mock7.setExpectedCount(1);
mock7.expectedMessagesMatches(assertPredicate(e ->
assertBrowseResults(e.getMessage(), 1, 0)));
producer7.send(ExchangeBuilder.anExchange(context)
- .withHeader(MiloConstants.HEADER_NODE_IDS,
Collections.singletonList(Identifiers.String.toParseableString()))
+ .withHeader(MiloConstants.HEADER_NODE_IDS,
Collections.singletonList(NodeIds0.String.toParseableString()))
.build());
assertIsSatisfied(5, TimeUnit.SECONDS, mock7);
}
diff --git
a/components/camel-milo/src/test/java/org/apache/camel/component/milo/call/MockCallMethod.java
b/components/camel-milo/src/test/java/org/apache/camel/component/milo/call/MockCallMethod.java
index 3a2092aaef20..257ae6b26b0f 100644
---
a/components/camel-milo/src/test/java/org/apache/camel/component/milo/call/MockCallMethod.java
+++
b/components/camel-milo/src/test/java/org/apache/camel/component/milo/call/MockCallMethod.java
@@ -23,7 +23,7 @@ import java.util.List;
import org.eclipse.milo.opcua.sdk.core.ValueRanks;
import
org.eclipse.milo.opcua.sdk.server.methods.AbstractMethodInvocationHandler;
import org.eclipse.milo.opcua.sdk.server.nodes.UaMethodNode;
-import org.eclipse.milo.opcua.stack.core.Identifiers;
+import org.eclipse.milo.opcua.stack.core.NodeIds0;
import org.eclipse.milo.opcua.stack.core.types.builtin.LocalizedText;
import org.eclipse.milo.opcua.stack.core.types.builtin.Variant;
import org.eclipse.milo.opcua.stack.core.types.structured.Argument;
@@ -32,14 +32,14 @@ public class MockCallMethod extends
AbstractMethodInvocationHandler {
public static final Argument IN = new Argument(
"in",
- Identifiers.String,
+ NodeIds0.String,
ValueRanks.Scalar,
null,
new LocalizedText("A value."));
public static final Argument OUT = new Argument(
"out",
- Identifiers.String,
+ NodeIds0.String,
ValueRanks.Scalar,
null,
new LocalizedText("A value."));
diff --git
a/components/camel-milo/src/test/java/org/apache/camel/component/milo/call/MockCamelNamespace.java
b/components/camel-milo/src/test/java/org/apache/camel/component/milo/call/MockCamelNamespace.java
index e8c2c763305b..339b5727f4df 100644
---
a/components/camel-milo/src/test/java/org/apache/camel/component/milo/call/MockCamelNamespace.java
+++
b/components/camel-milo/src/test/java/org/apache/camel/component/milo/call/MockCamelNamespace.java
@@ -30,7 +30,7 @@ import
org.eclipse.milo.opcua.sdk.server.methods.AbstractMethodInvocationHandler
import org.eclipse.milo.opcua.sdk.server.nodes.UaFolderNode;
import org.eclipse.milo.opcua.sdk.server.nodes.UaMethodNode;
import org.eclipse.milo.opcua.sdk.server.util.SubscriptionModel;
-import org.eclipse.milo.opcua.stack.core.Identifiers;
+import org.eclipse.milo.opcua.stack.core.NodeIds0;
import org.eclipse.milo.opcua.stack.core.types.builtin.LocalizedText;
import org.eclipse.milo.opcua.stack.core.types.builtin.NodeId;
import org.eclipse.milo.opcua.stack.core.types.builtin.QualifiedName;
@@ -88,8 +88,8 @@ public class MockCamelNamespace extends
ManagedNamespaceWithLifecycle {
folder.addReference(new Reference(
folder.getNodeId(),
- Identifiers.Organizes,
- Identifiers.ObjectsFolder.expanded(),
+ NodeIds0.Organizes,
+ NodeIds0.ObjectsFolder.expanded(),
false));
addCallMethod(folder);
@@ -113,13 +113,13 @@ public class MockCamelNamespace extends
ManagedNamespaceWithLifecycle {
methodNode.addReference(new Reference(
methodNode.getNodeId(),
- Identifiers.HasComponent,
+ NodeIds0.HasComponent,
folderNode.getNodeId().expanded(),
false));
methodNode.addReference(new Reference(
methodNode.getNodeId(),
- Identifiers.HasComponent,
+ NodeIds0.HasComponent,
folderNode.getNodeId().expanded(),
false));
}
diff --git
a/components/camel-milo/src/test/java/org/apache/camel/component/milo/server/ServerLocalTest.java
b/components/camel-milo/src/test/java/org/apache/camel/component/milo/server/ServerLocalTest.java
index c84603e5ed3c..805f9ff4cf67 100644
---
a/components/camel-milo/src/test/java/org/apache/camel/component/milo/server/ServerLocalTest.java
+++
b/components/camel-milo/src/test/java/org/apache/camel/component/milo/server/ServerLocalTest.java
@@ -23,6 +23,7 @@ import
org.apache.camel.component.milo.converter.ConverterTest;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.test.AvailablePortFinder;
import org.apache.camel.test.junit6.CamelTestSupport;
+import org.apache.camel.test.junit6.TestSupport;
import org.eclipse.milo.opcua.stack.core.types.builtin.DataValue;
import org.eclipse.milo.opcua.stack.core.types.builtin.Variant;
import org.junit.jupiter.api.Assertions;
@@ -76,31 +77,31 @@ public class ServerLocalTest extends CamelTestSupport {
@Test
public void testAcceptVariantString() {
- Assertions.assertDoesNotThrow(() -> sendBody(MILO_ITEM_1, new
Variant("Foo")));
+ Assertions.assertDoesNotThrow(() -> TestSupport.sendBody(template,
MILO_ITEM_1, new Variant("Foo")));
}
@Test
public void testAcceptVariantDouble() {
- Assertions.assertDoesNotThrow(() -> sendBody(MILO_ITEM_1, new
Variant(0.0)));
+ Assertions.assertDoesNotThrow(() -> TestSupport.sendBody(template,
MILO_ITEM_1, new Variant(0.0)));
}
@Test
public void testAcceptString() {
- Assertions.assertDoesNotThrow(() -> sendBody(MILO_ITEM_1, "Foo"));
+ Assertions.assertDoesNotThrow(() -> TestSupport.sendBody(template,
MILO_ITEM_1, "Foo"));
}
@Test
public void testAcceptDouble() {
- Assertions.assertDoesNotThrow(() -> sendBody(MILO_ITEM_1, 0.0));
+ Assertions.assertDoesNotThrow(() -> TestSupport.sendBody(template,
MILO_ITEM_1, 0.0));
}
@Test
public void testAcceptDataValueString() {
- Assertions.assertDoesNotThrow(() -> sendBody(MILO_ITEM_1, new
DataValue(new Variant("Foo"))));
+ Assertions.assertDoesNotThrow(() -> TestSupport.sendBody(template,
MILO_ITEM_1, new DataValue(new Variant("Foo"))));
}
@Test
public void testAcceptDataValueDouble() {
- Assertions.assertDoesNotThrow(() -> sendBody(MILO_ITEM_1, new
DataValue(new Variant(0.0))));
+ Assertions.assertDoesNotThrow(() -> TestSupport.sendBody(template,
MILO_ITEM_1, new DataValue(new Variant(0.0))));
}
}
