You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by da...@apache.org on 2020/03/22 09:07:18 UTC
[camel] 11/13: CAMEL-14762: Regen and fixed some components had
invalid setter/getter pairs
This is an automated email from the ASF dual-hosted git repository.
davsclaus pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel.git
commit 1387dee0d8926a41552f7e8ad6ad26a12187b3ce
Author: Claus Ibsen <cl...@gmail.com>
AuthorDate: Sun Mar 22 09:57:28 2020 +0100
CAMEL-14762: Regen and fixed some components had invalid setter/getter pairs
---
.../org/apache/camel/component/milo/server/MiloServerComponent.java | 6 +++++-
.../camel/component/milo/server/ServerSetSecurityPoliciesTest.java | 5 -----
2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/MiloServerComponent.java b/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/MiloServerComponent.java
index dc0f6be..e47f5db 100644
--- a/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/MiloServerComponent.java
+++ b/components/camel-milo/src/main/java/org/apache/camel/component/milo/server/MiloServerComponent.java
@@ -131,6 +131,8 @@ public class MiloServerComponent extends DefaultComponent {
private OpcUaServerConfig buildServerConfig() {
OpcUaServerConfigBuilder serverConfig = this.opcServerConfig != null ? this.opcServerConfig : createDefaultConfiguration();
+ this.securityPolicies = createSecurityPolicies();
+
Map<String, String> userMap = createUserMap();
if (!userMap.isEmpty() || enableAnonymousAuthentication != null) {
// set identity validator
@@ -204,7 +206,7 @@ public class MiloServerComponent extends DefaultComponent {
}
private Set<EndpointConfiguration> createEndpointConfigurations(List<UserTokenPolicy> userTokenPolicies) {
- return createEndpointConfigurations(userTokenPolicies, createSecurityPolicies());
+ return createEndpointConfigurations(userTokenPolicies, securityPolicies);
}
private Set<EndpointConfiguration> createEndpointConfigurations(List<UserTokenPolicy> userTokenPolicies, Set<SecurityPolicy> securityPolicies) {
@@ -491,6 +493,8 @@ public class MiloServerComponent extends DefaultComponent {
} else {
this.securityPolicies = EnumSet.copyOf(securityPolicies);
}
+ // clear id as we set explicit these policies
+ this.securityPoliciesById = null;
}
/**
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 5750890..d73f3fa 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
@@ -42,9 +42,4 @@ public class ServerSetSecurityPoliciesTest extends CamelTestSupport {
component.setSecurityPoliciesById("None,http://opcfoundation.org/UA/SecurityPolicy#Basic256Sha256");
}
- @Test(expected = IllegalArgumentException.class)
- public void testSetSecurityPolicies4() {
- final MiloServerComponent component = new MiloServerComponent();
- component.setSecurityPoliciesById("I just made that up");
- }
}