This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 9ac7a51272c9b1d8d7ea90c6db34c10e7ee021bd
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Thu May 26 12:12:33 2022 +0200
CAMEL-18144: Upgrade to Milo 0.6.6
---
.../milo/client/MiloClientEndpointConfigurer.java | 6 +++++
.../milo/client/MiloClientEndpointUriFactory.java | 3 ++-
.../milo/server/MiloServerComponentConfigurer.java | 4 +--
.../camel/component/milo/client/milo-client.json | 1 +
.../camel/component/milo/server/milo-server.json | 2 +-
.../component/milo/client/MiloClientConsumer.java | 6 ++---
.../component/milo/client/MiloClientEndpoint.java | 8 +++---
.../milo/server/internal/CamelNamespace.java | 16 ++++++------
.../milo/server/internal/CamelServerItem.java | 29 +++++++++++-----------
.../MiloClientCachingConnectionManagerTest.java | 4 +--
.../milo/MonitorItemMultiConnectionsCertTest.java | 8 +++---
.../milo/MonitorItemMultiConnectionsTest.java | 8 +++---
.../camel/component/milo/MonitorItemTest.java | 18 ++++++--------
.../camel/component/milo/ReadValuesClientTest.java | 8 +++---
.../camel/component/milo/WriteClientTest.java | 10 ++++----
.../component/milo/browse/BrowseServerTest.java | 8 +++---
.../camel/component/milo/call/CallClientTest.java | 22 ++++++++--------
.../component/milo/call/MockCamelNamespace.java | 12 ++++-----
.../camel/component/milo/client/NodeIdTest.java | 6 ++---
.../component/milo/converter/ConverterTest.java | 6 ++---
.../component/milo/server/ServerLocalTest.java | 4 +--
.../server/ServerSetCertificateManagerTest.java | 6 ++---
.../milo/server/ServerSetSecurityPoliciesTest.java | 6 ++---
parent/pom.xml | 2 +-
24 files changed, 105 insertions(+), 98 deletions(-)
diff --git
a/components/camel-milo/src/generated/java/org/apache/camel/component/milo/client/MiloClientEndpointConfigurer.java
b/components/camel-milo/src/generated/java/org/apache/camel/component/milo/client/MiloClientEndpointConfigurer.java
index ce5ec336637..3c2798f3b28 100644
---
a/components/camel-milo/src/generated/java/org/apache/camel/component/milo/client/MiloClientEndpointConfigurer.java
+++
b/components/camel-milo/src/generated/java/org/apache/camel/component/milo/client/MiloClientEndpointConfigurer.java
@@ -69,6 +69,8 @@ public class MiloClientEndpointConfigurer extends
PropertyConfigurerSupport impl
case "monitorfiltertype":
case "monitorFilterType":
target.getMonitorFilterConfiguration().setMonitorFilterType(property(camelContext,
org.apache.camel.component.milo.client.MonitorFilterType.class, value));
return true;
case "node": target.setNode(property(camelContext,
java.lang.String.class, value)); return true;
+ case "omitnullvalues":
+ case "omitNullValues": target.setOmitNullValues(property(camelContext,
boolean.class, value)); return true;
case "overridehost":
case "overrideHost":
target.getConfiguration().setOverrideHost(property(camelContext, boolean.class,
value)); return true;
case "producturi":
@@ -138,6 +140,8 @@ public class MiloClientEndpointConfigurer extends
PropertyConfigurerSupport impl
case "monitorfiltertype":
case "monitorFilterType": return
org.apache.camel.component.milo.client.MonitorFilterType.class;
case "node": return java.lang.String.class;
+ case "omitnullvalues":
+ case "omitNullValues": return boolean.class;
case "overridehost":
case "overrideHost": return boolean.class;
case "producturi":
@@ -208,6 +212,8 @@ public class MiloClientEndpointConfigurer extends
PropertyConfigurerSupport impl
case "monitorfiltertype":
case "monitorFilterType": return
target.getMonitorFilterConfiguration().getMonitorFilterType();
case "node": return target.getNode();
+ case "omitnullvalues":
+ case "omitNullValues": return target.isOmitNullValues();
case "overridehost":
case "overrideHost": return target.getConfiguration().isOverrideHost();
case "producturi":
diff --git
a/components/camel-milo/src/generated/java/org/apache/camel/component/milo/client/MiloClientEndpointUriFactory.java
b/components/camel-milo/src/generated/java/org/apache/camel/component/milo/client/MiloClientEndpointUriFactory.java
index 8b8bc45bed0..904120ebf41 100644
---
a/components/camel-milo/src/generated/java/org/apache/camel/component/milo/client/MiloClientEndpointUriFactory.java
+++
b/components/camel-milo/src/generated/java/org/apache/camel/component/milo/client/MiloClientEndpointUriFactory.java
@@ -21,7 +21,7 @@ public class MiloClientEndpointUriFactory extends
org.apache.camel.support.compo
private static final Set<String> SECRET_PROPERTY_NAMES;
private static final Set<String> MULTI_VALUE_PREFIXES;
static {
- Set<String> props = new HashSet<>(33);
+ Set<String> props = new HashSet<>(34);
props.add("allowedSecurityPolicies");
props.add("applicationName");
props.add("applicationUri");
@@ -48,6 +48,7 @@ public class MiloClientEndpointUriFactory extends
org.apache.camel.support.compo
props.add("method");
props.add("monitorFilterType");
props.add("node");
+ props.add("omitNullValues");
props.add("overrideHost");
props.add("productUri");
props.add("requestTimeout");
diff --git
a/components/camel-milo/src/generated/java/org/apache/camel/component/milo/server/MiloServerComponentConfigurer.java
b/components/camel-milo/src/generated/java/org/apache/camel/component/milo/server/MiloServerComponentConfigurer.java
index 76560509863..5b4f44f6017 100644
---
a/components/camel-milo/src/generated/java/org/apache/camel/component/milo/server/MiloServerComponentConfigurer.java
+++
b/components/camel-milo/src/generated/java/org/apache/camel/component/milo/server/MiloServerComponentConfigurer.java
@@ -37,7 +37,7 @@ public class MiloServerComponentConfigurer extends
PropertyConfigurerSupport imp
case "certificatemanager":
case "certificateManager":
target.setCertificateManager(property(camelContext,
org.eclipse.milo.opcua.stack.core.security.CertificateManager.class, value));
return true;
case "certificatevalidator":
- case "certificateValidator":
target.setCertificateValidator(property(camelContext,
org.eclipse.milo.opcua.stack.core.security.CertificateValidator.class, value));
return true;
+ case "certificateValidator":
target.setCertificateValidator(property(camelContext,
org.eclipse.milo.opcua.stack.server.security.ServerCertificateValidator.class,
value)); return true;
case "defaultcertificatevalidator":
case "defaultCertificateValidator":
target.setDefaultCertificateValidator(property(camelContext,
java.lang.String.class, value)); return true;
case "enableanonymousauthentication":
@@ -81,7 +81,7 @@ public class MiloServerComponentConfigurer extends
PropertyConfigurerSupport imp
case "certificatemanager":
case "certificateManager": return
org.eclipse.milo.opcua.stack.core.security.CertificateManager.class;
case "certificatevalidator":
- case "certificateValidator": return
org.eclipse.milo.opcua.stack.core.security.CertificateValidator.class;
+ case "certificateValidator": return
org.eclipse.milo.opcua.stack.server.security.ServerCertificateValidator.class;
case "defaultcertificatevalidator":
case "defaultCertificateValidator": return java.lang.String.class;
case "enableanonymousauthentication":
diff --git
a/components/camel-milo/src/generated/resources/org/apache/camel/component/milo/client/milo-client.json
b/components/camel-milo/src/generated/resources/org/apache/camel/component/milo/client/milo-client.json
index 83aec39aee5..18ca6075d1c 100644
---
a/components/camel-milo/src/generated/resources/org/apache/camel/component/milo/client/milo-client.json
+++
b/components/camel-milo/src/generated/resources/org/apache/camel/component/milo/client/milo-client.json
@@ -64,6 +64,7 @@
"method": { "kind": "parameter", "displayName": "Method", "group":
"common", "label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "The method definition (see Method ID)" },
"monitorFilterType": { "kind": "parameter", "displayName": "Monitor Filter
Type", "group": "common", "label": "", "required": false, "type": "object",
"javaType": "org.apache.camel.component.milo.client.MonitorFilterType", "enum":
[ "dataChangeFilter" ], "deprecated": false, "autowired": false, "secret":
false, "configurationClass":
"org.apache.camel.component.milo.client.MonitorFilterConfiguration",
"configurationField": "monitorFilterConfiguration", "description": "Monitor
Filter T [...]
"node": { "kind": "parameter", "displayName": "Node", "group": "common",
"label": "", "required": false, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "autowired": false, "secret": false,
"description": "The node definition (see Node ID)" },
+ "omitNullValues": { "kind": "parameter", "displayName": "Omit Null
Values", "group": "common", "label": "", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "autowired": false, "secret":
false, "defaultValue": true, "description": "Omit notifications in case of null
values" },
"samplingInterval": { "kind": "parameter", "displayName": "Sampling
Interval", "group": "common", "label": "", "required": false, "type": "number",
"javaType": "java.lang.Double", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": "0.0", "description": "The sampling interval
in milliseconds" },
"bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error
Handler", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Allows for bridging the
consumer to the Camel routing Error Handler, which mean any exceptions occurred
while the consumer is trying to pickup incoming messages, or the likes, will
now be processed as a m [...]
"exceptionHandler": { "kind": "parameter", "displayName": "Exception
Handler", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "object", "javaType":
"org.apache.camel.spi.ExceptionHandler", "optionalPrefix": "consumer.",
"deprecated": false, "autowired": false, "secret": false, "description": "To
let the consumer use a custom ExceptionHandler. Notice if the option
bridgeErrorHandler is enabled then this option is not in use. By default the
con [...]
diff --git
a/components/camel-milo/src/generated/resources/org/apache/camel/component/milo/server/milo-server.json
b/components/camel-milo/src/generated/resources/org/apache/camel/component/milo/server/milo-server.json
index e8dbdc9c4a8..746d0521fe3 100644
---
a/components/camel-milo/src/generated/resources/org/apache/camel/component/milo/server/milo-server.json
+++
b/components/camel-milo/src/generated/resources/org/apache/camel/component/milo/server/milo-server.json
@@ -35,7 +35,7 @@
"autowiredEnabled": { "kind": "property", "displayName": "Autowired
Enabled", "group": "advanced", "label": "advanced", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": true, "description": "Whether autowiring is
enabled. This is used for automatic autowiring options (the option must be
marked as autowired) by looking up in the registry to find if there is a single
instance of matching type, which t [...]
"certificate": { "kind": "property", "displayName": "Certificate",
"group": "security", "label": "security", "required": false, "type": "object",
"javaType": "java.security.cert.X509Certificate", "deprecated": false,
"autowired": false, "secret": false, "description": "Server certificate" },
"certificateManager": { "kind": "property", "displayName": "Certificate
Manager", "group": "security", "label": "security", "required": false, "type":
"object", "javaType":
"org.eclipse.milo.opcua.stack.core.security.CertificateManager", "deprecated":
false, "autowired": false, "secret": false, "description": "Server certificate
manager" },
- "certificateValidator": { "kind": "property", "displayName": "Certificate
Validator", "group": "security", "label": "security", "required": false,
"type": "object", "javaType":
"org.eclipse.milo.opcua.stack.core.security.CertificateValidator",
"deprecated": false, "autowired": false, "secret": false, "description":
"Validator for client certificates" },
+ "certificateValidator": { "kind": "property", "displayName": "Certificate
Validator", "group": "security", "label": "security", "required": false,
"type": "object", "javaType":
"org.eclipse.milo.opcua.stack.server.security.ServerCertificateValidator",
"deprecated": false, "autowired": false, "secret": false, "description":
"Validator for client certificates" },
"defaultCertificateValidator": { "kind": "property", "displayName":
"Default Certificate Validator", "group": "security", "label": "security",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description":
"Validator for client certificates using default file based approach" },
"enableAnonymousAuthentication": { "kind": "property", "displayName":
"Enable Anonymous Authentication", "group": "security", "label": "security",
"required": false, "type": "boolean", "javaType": "boolean", "deprecated":
false, "autowired": false, "secret": false, "defaultValue": false,
"description": "Enable anonymous authentication, disabled by default" },
"securityPolicies": { "kind": "property", "displayName": "Security
Policies", "group": "security", "label": "security", "required": false, "type":
"object", "javaType":
"java.util.Set<org.eclipse.milo.opcua.stack.core.security.SecurityPolicy>",
"deprecated": false, "autowired": false, "secret": false, "description":
"Security policies" },
diff --git
a/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/MiloClientConsumer.java
b/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/MiloClientConsumer.java
index 15572a0cdd2..c71d87fd30d 100644
---
a/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/MiloClientConsumer.java
+++
b/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/MiloClientConsumer.java
@@ -70,12 +70,12 @@ public class MiloClientConsumer extends DefaultConsumer {
private void handleValueUpdate(final DataValue value) {
LOG.debug("Handle item update - {} = {}", node, value);
-
- if(omitNullValues && (value == null || value.getValue() == null ||
value.getValue().getValue() == null)){
+
+ if (omitNullValues && (value == null || value.getValue() == null ||
value.getValue().getValue() == null)) {
LOG.debug("Handle item update omitted due to null values (see
omitNullValues parameter)");
return;
}
-
+
final Exchange exchange = createExchange(true);
try {
mapToMessage(value, exchange.getMessage());
diff --git
a/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/MiloClientEndpoint.java
b/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/MiloClientEndpoint.java
index e7a6de742f1..6073a192a5f 100644
---
a/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/MiloClientEndpoint.java
+++
b/components/camel-milo/src/main/java/org/apache/camel/component/milo/client/MiloClientEndpoint.java
@@ -77,13 +77,13 @@ public class MiloClientEndpoint extends DefaultEndpoint {
*/
@UriParam
private boolean defaultAwaitWrites;
-
+
/**
* Omit notifications in case of null values
*/
@UriParam(defaultValue = "true")
private boolean omitNullValues = true;
-
+
@UriParam
private MonitorFilterConfiguration monitorFilterConfiguration;
@@ -195,11 +195,11 @@ public class MiloClientEndpoint extends DefaultEndpoint {
public void setMonitorFilterType(MonitorFilterType monitorFilterType) {
this.monitorFilterType = monitorFilterType;
}
-
+
public boolean isOmitNullValues() {
return omitNullValues;
}
-
+
public void setOmitNullValues(boolean omitNullValues) {
this.omitNullValues = omitNullValues;
}
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 2c7720501a6..a398a856a5a 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
@@ -44,23 +44,23 @@ public class CamelNamespace extends
ManagedNamespaceWithLifecycle {
private UaFolderNode folder;
private final Map<String, CamelServerItem> itemMap = new HashMap<>();
-
+
private final DataTypeDictionaryManager dictionaryManager;
-
+
private final Logger log = LoggerFactory.getLogger(CamelNamespace.class);
-
+
public CamelNamespace(final String namespaceUri, final OpcUaServer server)
{
super(server, namespaceUri);
-
+
this.subscriptionModel = new SubscriptionModel(server, this);
this.dictionaryManager = new
DataTypeDictionaryManager(getNodeContext(), namespaceUri);
-
+
getLifecycleManager().addLifecycle(dictionaryManager);
getLifecycleManager().addLifecycle(subscriptionModel);
-
+
getLifecycleManager().addStartupTask(this::createNodes);
}
-
+
protected void createNodes() {
// create structure
@@ -74,7 +74,7 @@ public class CamelNamespace extends
ManagedNamespaceWithLifecycle {
final NodeId nodeId2 = newNodeId("items");
final QualifiedName name2 = newQualifiedName("items");
final LocalizedText displayName2 = LocalizedText.english("Items");
-
+
this.itemsObject = UaObjectNode.build(getNodeContext(), builder ->
builder
.setNodeId(nodeId2)
.setBrowseName(name2)
diff --git
a/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/internal/CamelServerItem.java
b/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/internal/CamelServerItem.java
index b19791f3dfd..1b9799d7875 100644
---
a/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/internal/CamelServerItem.java
+++
b/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/internal/CamelServerItem.java
@@ -61,36 +61,37 @@ public class CamelServerItem {
final NodeId nodeId = new NodeId(namespaceIndex, itemId);
final QualifiedName qname = new QualifiedName(namespaceIndex, itemId);
final LocalizedText displayName = LocalizedText.english(itemId);
-
+
// create variable node
-
+
final Predicate<AttributeId> filter = AttributeId.Value::equals;
- this.item = UaVariableNode.build(nodeContext, builder->
- builder
+ this.item = UaVariableNode.build(nodeContext, builder -> builder
.setNodeId(nodeId)
.setBrowseName(qname)
.setDisplayName(displayName)
.setAccessLevel(AccessLevel.toValue(AccessLevel.READ_WRITE))
.setUserAccessLevel(AccessLevel.toValue(AccessLevel.READ_WRITE))
- .addAttributeFilter(new AttributeFilter(){
-
+ .addAttributeFilter(new AttributeFilter() {
+
@Override
- public Object
getAttribute(AttributeFilterContext.GetAttributeContext ctx, AttributeId
attributeId){
- if(filter.test(attributeId) &&
ctx.getSession().isPresent()) {
+ public Object
getAttribute(AttributeFilterContext.GetAttributeContext ctx, AttributeId
attributeId) {
+ if (filter.test(attributeId) &&
ctx.getSession().isPresent()) {
return getDataValue();
}
return ctx.getAttribute(attributeId);
}
-
+
@Override
- public void
setAttribute(AttributeFilterContext.SetAttributeContext ctx, AttributeId
attributeId, Object value){
- if(filter.test(attributeId) &&
ctx.getSession().isPresent()) {
- setDataValue((DataValue)value);
+ public void setAttribute(
+ AttributeFilterContext.SetAttributeContext ctx,
AttributeId attributeId, Object value) {
+ if (filter.test(attributeId) &&
ctx.getSession().isPresent()) {
+ setDataValue((DataValue) value);
}
ctx.setAttribute(attributeId, value);
- }})
+ }
+ })
.buildAndAdd());
-
+
baseNode.addComponent(this.item);
}
diff --git
a/components/camel-milo/src/test/java/org/apache/camel/component/milo/MiloClientCachingConnectionManagerTest.java
b/components/camel-milo/src/test/java/org/apache/camel/component/milo/MiloClientCachingConnectionManagerTest.java
index 3e11f89b733..d1768f21fb6 100644
---
a/components/camel-milo/src/test/java/org/apache/camel/component/milo/MiloClientCachingConnectionManagerTest.java
+++
b/components/camel-milo/src/test/java/org/apache/camel/component/milo/MiloClientCachingConnectionManagerTest.java
@@ -30,12 +30,12 @@ import org.slf4j.LoggerFactory;
public class MiloClientCachingConnectionManagerTest {
private static final Logger LOG =
LoggerFactory.getLogger(MiloClientCachingConnectionManagerTest.class);
-
+
private MiloClientCachingConnectionManager instance;
@BeforeEach
public void setup(TestInfo testInfo) {
- final var displayName=testInfo.getDisplayName();
+ final var displayName = testInfo.getDisplayName();
LOG.info("********************************************************************************");
LOG.info(displayName);
LOG.info("********************************************************************************");
diff --git
a/components/camel-milo/src/test/java/org/apache/camel/component/milo/MonitorItemMultiConnectionsCertTest.java
b/components/camel-milo/src/test/java/org/apache/camel/component/milo/MonitorItemMultiConnectionsCertTest.java
index 89d5cae692b..6a58bbdec42 100644
---
a/components/camel-milo/src/test/java/org/apache/camel/component/milo/MonitorItemMultiConnectionsCertTest.java
+++
b/components/camel-milo/src/test/java/org/apache/camel/component/milo/MonitorItemMultiConnectionsCertTest.java
@@ -70,7 +70,7 @@ public class MonitorItemMultiConnectionsCertTest extends
AbstractMiloServerTest
private static final String MOCK_TEST_3 = "mock:test3";
private static final Logger LOG =
LoggerFactory.getLogger(MonitorItemMultiConnectionsCertTest.class);
-
+
@EndpointInject(MOCK_TEST_1)
protected MockEndpoint test1Endpoint;
@@ -82,15 +82,15 @@ public class MonitorItemMultiConnectionsCertTest extends
AbstractMiloServerTest
@Produce(DIRECT_START_1)
protected ProducerTemplate producer1;
-
+
@BeforeEach
public void setup(TestInfo testInfo) {
- final var displayName=testInfo.getDisplayName();
+ final var displayName = testInfo.getDisplayName();
LOG.info("********************************************************************************");
LOG.info(displayName);
LOG.info("********************************************************************************");
}
-
+
@Override
protected void configureMiloServer(final MiloServerComponent server)
throws Exception {
super.configureMiloServer(server);
diff --git
a/components/camel-milo/src/test/java/org/apache/camel/component/milo/MonitorItemMultiConnectionsTest.java
b/components/camel-milo/src/test/java/org/apache/camel/component/milo/MonitorItemMultiConnectionsTest.java
index a4a16818d54..af212f9e903 100644
---
a/components/camel-milo/src/test/java/org/apache/camel/component/milo/MonitorItemMultiConnectionsTest.java
+++
b/components/camel-milo/src/test/java/org/apache/camel/component/milo/MonitorItemMultiConnectionsTest.java
@@ -58,7 +58,7 @@ public class MonitorItemMultiConnectionsTest extends
AbstractMiloServerTest {
private static final String MOCK_TEST_3 = "mock:test3";
private static final Logger LOG =
LoggerFactory.getLogger(MonitorItemMultiConnectionsTest.class);
-
+
@EndpointInject(MOCK_TEST_1)
protected MockEndpoint test1Endpoint;
@@ -70,15 +70,15 @@ public class MonitorItemMultiConnectionsTest extends
AbstractMiloServerTest {
@Produce(DIRECT_START_1)
protected ProducerTemplate producer1;
-
+
@BeforeEach
public void setup(TestInfo testInfo) {
- final var displayName=testInfo.getDisplayName();
+ final var displayName = testInfo.getDisplayName();
LOG.info("********************************************************************************");
LOG.info(displayName);
LOG.info("********************************************************************************");
}
-
+
@Override
protected RoutesBuilder createRouteBuilder() {
return new RouteBuilder() {
diff --git
a/components/camel-milo/src/test/java/org/apache/camel/component/milo/MonitorItemTest.java
b/components/camel-milo/src/test/java/org/apache/camel/component/milo/MonitorItemTest.java
index 228fd9b9c0e..68c6e13a9ab 100644
---
a/components/camel-milo/src/test/java/org/apache/camel/component/milo/MonitorItemTest.java
+++
b/components/camel-milo/src/test/java/org/apache/camel/component/milo/MonitorItemTest.java
@@ -31,8 +31,6 @@ import org.junit.jupiter.api.TestInfo;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import static org.apache.camel.LoggingLevel.INFO;
-
/**
* Testing the monitor functionality for item
*/
@@ -50,7 +48,7 @@ public class MonitorItemTest extends AbstractMiloServerTest {
private static final String MOCK_TEST_1 = "mock:test1";
private static final Logger LOG =
LoggerFactory.getLogger(MonitorItemTest.class);
-
+
@EndpointInject(MOCK_TEST_1)
protected MockEndpoint test1Endpoint;
@@ -68,15 +66,15 @@ public class MonitorItemTest extends AbstractMiloServerTest
{
}
};
}
-
+
@BeforeEach
public void setup(TestInfo testInfo) {
- final var displayName=testInfo.getDisplayName();
+ final var displayName = testInfo.getDisplayName();
LOG.info("********************************************************************************");
LOG.info(displayName);
LOG.info("********************************************************************************");
}
-
+
/**
* Monitor multiple events
*/
@@ -86,12 +84,12 @@ public class MonitorItemTest extends AbstractMiloServerTest
{
* we will wait 2 * 1_000 milliseconds between server updates since the
* default server update rate is 1_000 milliseconds
*/
- final var time=2 * 1_000;
-
+ final var time = 2 * 1_000;
+
// item 1 ... only this one receives
test1Endpoint.reset();
test1Endpoint.setExpectedCount(3);
-
+
// set server values
this.producer1.sendBody("Foo");
Thread.sleep(time);
@@ -106,6 +104,6 @@ public class MonitorItemTest extends AbstractMiloServerTest
{
testBody(this.test1Endpoint.message(2), assertGoodValue("Baz"));
// assert
- assertMockEndpointsSatisfied(time,TimeUnit.MILLISECONDS);
+ assertMockEndpointsSatisfied(time, TimeUnit.MILLISECONDS);
}
}
diff --git
a/components/camel-milo/src/test/java/org/apache/camel/component/milo/ReadValuesClientTest.java
b/components/camel-milo/src/test/java/org/apache/camel/component/milo/ReadValuesClientTest.java
index a2b277ad2e8..97500ac124c 100644
---
a/components/camel-milo/src/test/java/org/apache/camel/component/milo/ReadValuesClientTest.java
+++
b/components/camel-milo/src/test/java/org/apache/camel/component/milo/ReadValuesClientTest.java
@@ -45,7 +45,7 @@ public class ReadValuesClientTest extends
AbstractMiloServerTest {
private static final String MOCK_TEST_1 = "mock:test1";
private static final Logger LOG =
LoggerFactory.getLogger(ReadValuesClientTest.class);
-
+
@EndpointInject(MOCK_TEST_1)
protected MockEndpoint test1Endpoint;
@@ -54,15 +54,15 @@ public class ReadValuesClientTest extends
AbstractMiloServerTest {
@Produce(DIRECT_START_2)
protected ProducerTemplate producer2;
-
+
@BeforeEach
public void setup(TestInfo testInfo) {
- final var displayName=testInfo.getDisplayName();
+ final var displayName = testInfo.getDisplayName();
LOG.info("********************************************************************************");
LOG.info(displayName);
LOG.info("********************************************************************************");
}
-
+
@Override
protected RoutesBuilder createRouteBuilder() {
return new RouteBuilder() {
diff --git
a/components/camel-milo/src/test/java/org/apache/camel/component/milo/WriteClientTest.java
b/components/camel-milo/src/test/java/org/apache/camel/component/milo/WriteClientTest.java
index 8158b032984..7d9c6f6afdf 100644
---
a/components/camel-milo/src/test/java/org/apache/camel/component/milo/WriteClientTest.java
+++
b/components/camel-milo/src/test/java/org/apache/camel/component/milo/WriteClientTest.java
@@ -64,9 +64,9 @@ public class WriteClientTest extends AbstractMiloServerTest {
private static final String MOCK_TEST_1 = "mock:test1";
private static final String MOCK_TEST_2 = "mock:test2";
-
+
private static final Logger LOG =
LoggerFactory.getLogger(WriteClientTest.class);
-
+
@EndpointInject(MOCK_TEST_1)
protected MockEndpoint test1Endpoint;
@@ -102,15 +102,15 @@ public class WriteClientTest extends
AbstractMiloServerTest {
}
};
}
-
+
@BeforeEach
public void setup(TestInfo testInfo) {
- final var displayName=testInfo.getDisplayName();
+ final var displayName = testInfo.getDisplayName();
LOG.info("********************************************************************************");
LOG.info(displayName);
LOG.info("********************************************************************************");
}
-
+
@Test
public void testWrite1() throws Exception {
// item 1
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 1a006c9a4a6..eeefc6cd03d 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
@@ -106,7 +106,7 @@ public class BrowseServerTest extends
AbstractMiloServerTest {
private static final String MILO_BROWSE_NODE_VIA_ENDPOINT
= MILO_BROWSE_ROOT + "&node=RAW(ns=0;i=86)";
-
+
private static final Logger LOG =
LoggerFactory.getLogger(BrowseServerTest.class);
@EndpointInject(MOCK_TEST_1)
@@ -162,15 +162,15 @@ public class BrowseServerTest extends
AbstractMiloServerTest {
@Produce(DIRECT_START_9)
protected ProducerTemplate producer9;
-
+
@BeforeEach
public void setup(TestInfo testInfo) {
- final var displayName=testInfo.getDisplayName();
+ final var displayName = testInfo.getDisplayName();
LOG.info("********************************************************************************");
LOG.info(displayName);
LOG.info("********************************************************************************");
}
-
+
@Override
protected RoutesBuilder createRouteBuilder() {
return new RouteBuilder() {
diff --git
a/components/camel-milo/src/test/java/org/apache/camel/component/milo/call/CallClientTest.java
b/components/camel-milo/src/test/java/org/apache/camel/component/milo/call/CallClientTest.java
index 846f4140889..208cf732e15 100644
---
a/components/camel-milo/src/test/java/org/apache/camel/component/milo/call/CallClientTest.java
+++
b/components/camel-milo/src/test/java/org/apache/camel/component/milo/call/CallClientTest.java
@@ -67,17 +67,17 @@ public class CallClientTest extends AbstractMiloServerTest {
+ "&method=" + nodeValue(MockCamelNamespace.URI,
MockCamelNamespace.CALL_ID) + "&overrideHost=true";
private static final Logger LOG =
LoggerFactory.getLogger(CallClientTest.class);
-
+
private OpcUaServer server;
private MockCamelNamespace namespace;
private MockCallMethod callMethod;
@Produce(DIRECT_START_1)
private ProducerTemplate producer1;
-
+
@BeforeEach
public void setup(TestInfo testInfo) {
- final var displayName=testInfo.getDisplayName();
+ final var displayName = testInfo.getDisplayName();
LOG.info("********************************************************************************");
LOG.info(displayName);
LOG.info("********************************************************************************");
@@ -188,20 +188,20 @@ public class CallClientTest extends
AbstractMiloServerTest {
// we always write synchronously since we do need the message order
producerTemplate.sendBodyAndHeader(input, "await", true);
}
-
- private static final class InsecureCertificateValidator implements
ServerCertificateValidator{
-
+
+ private static final class InsecureCertificateValidator implements
ServerCertificateValidator {
+
public static final ServerCertificateValidator INSTANCE = new
CallClientTest.InsecureCertificateValidator();
-
+
private InsecureCertificateValidator() {
}
-
+
@Override
- public void validateCertificateChain(List<X509Certificate> list,String
s) throws UaException {
+ public void validateCertificateChain(List<X509Certificate> list,
String s) throws UaException {
}
-
+
@Override
- public void validateCertificateChain(List<X509Certificate> list)
throws UaException{
+ public void validateCertificateChain(List<X509Certificate> list)
throws UaException {
}
}
}
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 b8240cf3b4b..2893153ba2e 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
@@ -40,7 +40,7 @@ import
org.eclipse.milo.opcua.stack.core.types.builtin.QualifiedName;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-public class MockCamelNamespace extends ManagedNamespaceWithLifecycle{
+public class MockCamelNamespace extends ManagedNamespaceWithLifecycle {
public static final String URI = "urn:org:apache:camel:mock";
public static final int FOLDER_ID = 1;
@@ -62,24 +62,24 @@ public class MockCamelNamespace extends
ManagedNamespaceWithLifecycle{
this.subscriptionModel = new SubscriptionModel(server, this);
this.callMethodCreator = callMethodCreator;
-
+
super.getLifecycleManager().addLifecycle(new Lifecycle() {
-
+
@Override
public void startup() {
LOG.trace("CamelNamespace startup");
createNodes();
}
-
+
@Override
public void shutdown() {
LOG.trace("CamelNamespace shutdown");
}
});
}
-
+
private void createNodes() {
-
+
// create structure
final NodeId nodeId = newNodeId(FOLDER_ID);
diff --git
a/components/camel-milo/src/test/java/org/apache/camel/component/milo/client/NodeIdTest.java
b/components/camel-milo/src/test/java/org/apache/camel/component/milo/client/NodeIdTest.java
index f5ad99980b9..1869d639429 100644
---
a/components/camel-milo/src/test/java/org/apache/camel/component/milo/client/NodeIdTest.java
+++
b/components/camel-milo/src/test/java/org/apache/camel/component/milo/client/NodeIdTest.java
@@ -39,9 +39,9 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
* Testing different ways to specify node IDs
*/
public class NodeIdTest extends AbstractMiloServerTest {
-
+
private static final Logger LOG =
LoggerFactory.getLogger(NodeIdTest.class);
-
+
@BeforeEach
public void setup(TestInfo testInfo) {
final var displayName = testInfo.getDisplayName();
@@ -49,7 +49,7 @@ public class NodeIdTest extends AbstractMiloServerTest {
LOG.info(displayName);
LOG.info("********************************************************************************");
}
-
+
@Test
public void testFull1() {
final String s = String.format("nsu=%s;s=%s", DEFAULT_NAMESPACE_URI,
"item-1");
diff --git
a/components/camel-milo/src/test/java/org/apache/camel/component/milo/converter/ConverterTest.java
b/components/camel-milo/src/test/java/org/apache/camel/component/milo/converter/ConverterTest.java
index b771fec3043..c6bea708738 100644
---
a/components/camel-milo/src/test/java/org/apache/camel/component/milo/converter/ConverterTest.java
+++
b/components/camel-milo/src/test/java/org/apache/camel/component/milo/converter/ConverterTest.java
@@ -30,9 +30,9 @@ import static org.junit.jupiter.api.Assertions.assertNotNull;
import static org.junit.jupiter.api.Assertions.assertTrue;
public class ConverterTest extends CamelTestSupport {
-
+
private static final Logger LOG =
LoggerFactory.getLogger(ConverterTest.class);
-
+
@BeforeEach
public void setup(TestInfo testInfo) {
final var displayName = testInfo.getDisplayName();
@@ -40,7 +40,7 @@ public class ConverterTest extends CamelTestSupport {
LOG.info(displayName);
LOG.info("********************************************************************************");
}
-
+
@Test
public void testDataValueToVariant() {
final Variant value = testConvertDataValue("Foo", Variant.class);
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 e757b707b96..998e3ac1805 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
@@ -40,12 +40,12 @@ public class ServerLocalTest extends CamelTestSupport {
private static final String MILO_ITEM_1 = "milo-server:myitem1";
private static final String MOCK_TEST = "mock:test";
-
+
private static final Logger LOG =
LoggerFactory.getLogger(ConverterTest.class);
@EndpointInject(MOCK_TEST)
protected MockEndpoint testEndpoint;
-
+
@BeforeEach
public void pickFreePort(TestInfo testInfo) {
final var displayName = testInfo.getDisplayName();
diff --git
a/components/camel-milo/src/test/java/org/apache/camel/component/milo/server/ServerSetCertificateManagerTest.java
b/components/camel-milo/src/test/java/org/apache/camel/component/milo/server/ServerSetCertificateManagerTest.java
index e9b0840b613..dece0fee534 100644
---
a/components/camel-milo/src/test/java/org/apache/camel/component/milo/server/ServerSetCertificateManagerTest.java
+++
b/components/camel-milo/src/test/java/org/apache/camel/component/milo/server/ServerSetCertificateManagerTest.java
@@ -33,9 +33,9 @@ import static
java.nio.file.StandardCopyOption.REPLACE_EXISTING;
* Test setting the certificate manager
*/
public class ServerSetCertificateManagerTest extends AbstractMiloServerTest {
-
+
private static final Logger LOG =
LoggerFactory.getLogger(ServerSetCertificateManagerTest.class);
-
+
@BeforeEach
public void setup(TestInfo testInfo) {
final var displayName = testInfo.getDisplayName();
@@ -43,7 +43,7 @@ public class ServerSetCertificateManagerTest extends
AbstractMiloServerTest {
LOG.info(displayName);
LOG.info("********************************************************************************");
}
-
+
@Override
protected void configureMiloServer(final MiloServerComponent server)
throws Exception {
super.configureMiloServer(server);
diff --git
a/components/camel-milo/src/test/java/org/apache/camel/component/milo/server/ServerSetSecurityPoliciesTest.java
b/components/camel-milo/src/test/java/org/apache/camel/component/milo/server/ServerSetSecurityPoliciesTest.java
index 3156a7d4806..6238aa193a3 100644
---
a/components/camel-milo/src/test/java/org/apache/camel/component/milo/server/ServerSetSecurityPoliciesTest.java
+++
b/components/camel-milo/src/test/java/org/apache/camel/component/milo/server/ServerSetSecurityPoliciesTest.java
@@ -28,9 +28,9 @@ import org.slf4j.LoggerFactory;
* Test setting security policies
*/
public class ServerSetSecurityPoliciesTest extends CamelTestSupport {
-
+
private static final Logger LOG =
LoggerFactory.getLogger(ServerSetSecurityPoliciesTest.class);
-
+
@BeforeEach
public void setup(TestInfo testInfo) {
final var displayName = testInfo.getDisplayName();
@@ -38,7 +38,7 @@ public class ServerSetSecurityPoliciesTest extends
CamelTestSupport {
LOG.info(displayName);
LOG.info("********************************************************************************");
}
-
+
@Test
public void testSetSecurityPolicies1() {
final MiloServerComponent component = new MiloServerComponent();
diff --git a/parent/pom.xml b/parent/pom.xml
index 7d220ca09e1..5e5885c1a7c 100644
--- a/parent/pom.xml
+++ b/parent/pom.xml
@@ -390,7 +390,7 @@
<microprofile-config-version>2.0.1</microprofile-config-version>
<microprofile-metrics-version>3.0.1</microprofile-metrics-version>
<microprofile-fault-tolerance-version>3.0</microprofile-fault-tolerance-version>
- <milo-version>0.3.7</milo-version>
+ <milo-version>0.6.6</milo-version>
<milo-guava-version>26.0-jre</milo-guava-version>
<mina-version>2.1.5</mina-version>
<minidns-version>0.3.4</minidns-version>
