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-spring-boot.git
The following commit(s) were added to refs/heads/main by this push:
new 5d41e64b10a Regen
5d41e64b10a is described below
commit 5d41e64b10ae9fa9ca671132ef9ce4be8abd7974
Author: Claus Ibsen <claus.ib...@gmail.com>
AuthorDate: Thu May 26 12:16:18 2022 +0200
Regen
---
.../camel/springboot/catalog/components/milo-client.json | 1 +
.../camel/springboot/catalog/components/milo-server.json | 2 +-
components-starter/camel-milo-starter/src/main/docs/milo.json | 4 ++--
.../server/springboot/MiloServerComponentConfiguration.java | 11 ++++++-----
.../milo/server/springboot/MiloServerComponentConverter.java | 4 ++--
5 files changed, 12 insertions(+), 10 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/milo-client.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/milo-client.json
index 66c5da9c0cb..64208a33b5c 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/milo-client.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/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/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/milo-server.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/milo-server.json
index ff678566c53..fcfb89e4820 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/milo-server.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/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-starter/camel-milo-starter/src/main/docs/milo.json
b/components-starter/camel-milo-starter/src/main/docs/milo.json
index e33a3a8107c..213ad9ff9e1 100644
--- a/components-starter/camel-milo-starter/src/main/docs/milo.json
+++ b/components-starter/camel-milo-starter/src/main/docs/milo.json
@@ -416,8 +416,8 @@
},
{
"name": "camel.component.milo-server.certificate-validator",
- "type":
"org.eclipse.milo.opcua.stack.core.security.CertificateValidator",
- "description": "Validator for client certificates. The option is a
org.eclipse.milo.opcua.stack.core.security.CertificateValidator type.",
+ "type":
"org.eclipse.milo.opcua.stack.server.security.ServerCertificateValidator",
+ "description": "Validator for client certificates. The option is a
org.eclipse.milo.opcua.stack.server.security.ServerCertificateValidator type.",
"sourceType":
"org.apache.camel.component.milo.server.springboot.MiloServerComponentConfiguration"
},
{
diff --git
a/components-starter/camel-milo-starter/src/main/java/org/apache/camel/component/milo/server/springboot/MiloServerComponentConfiguration.java
b/components-starter/camel-milo-starter/src/main/java/org/apache/camel/component/milo/server/springboot/MiloServerComponentConfiguration.java
index 13988d722e2..53a3a9a9d31 100644
---
a/components-starter/camel-milo-starter/src/main/java/org/apache/camel/component/milo/server/springboot/MiloServerComponentConfiguration.java
+++
b/components-starter/camel-milo-starter/src/main/java/org/apache/camel/component/milo/server/springboot/MiloServerComponentConfiguration.java
@@ -21,9 +21,9 @@ import java.util.Set;
import javax.annotation.Generated;
import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
import org.eclipse.milo.opcua.stack.core.security.CertificateManager;
-import org.eclipse.milo.opcua.stack.core.security.CertificateValidator;
import org.eclipse.milo.opcua.stack.core.security.SecurityPolicy;
import org.eclipse.milo.opcua.stack.core.types.structured.BuildInfo;
+import org.eclipse.milo.opcua.stack.server.security.ServerCertificateValidator;
import org.springframework.boot.context.properties.ConfigurationProperties;
/**
@@ -117,9 +117,10 @@ public class MiloServerComponentConfiguration
private CertificateManager certificateManager;
/**
* Validator for client certificates. The option is a
- * org.eclipse.milo.opcua.stack.core.security.CertificateValidator type.
+ * org.eclipse.milo.opcua.stack.server.security.ServerCertificateValidator
+ * type.
*/
- private CertificateValidator certificateValidator;
+ private ServerCertificateValidator certificateValidator;
/**
* Validator for client certificates using default file based approach
*/
@@ -251,12 +252,12 @@ public class MiloServerComponentConfiguration
this.certificateManager = certificateManager;
}
- public CertificateValidator getCertificateValidator() {
+ public ServerCertificateValidator getCertificateValidator() {
return certificateValidator;
}
public void setCertificateValidator(
- CertificateValidator certificateValidator) {
+ ServerCertificateValidator certificateValidator) {
this.certificateValidator = certificateValidator;
}
diff --git
a/components-starter/camel-milo-starter/src/main/java/org/apache/camel/component/milo/server/springboot/MiloServerComponentConverter.java
b/components-starter/camel-milo-starter/src/main/java/org/apache/camel/component/milo/server/springboot/MiloServerComponentConverter.java
index b6fd142fcb4..017dc56a9ad 100644
---
a/components-starter/camel-milo-starter/src/main/java/org/apache/camel/component/milo/server/springboot/MiloServerComponentConverter.java
+++
b/components-starter/camel-milo-starter/src/main/java/org/apache/camel/component/milo/server/springboot/MiloServerComponentConverter.java
@@ -44,7 +44,7 @@ public class MiloServerComponentConverter implements
GenericConverter {
answer.add(new ConvertiblePair(String.class,
org.eclipse.milo.opcua.stack.core.types.structured.BuildInfo.class));
answer.add(new ConvertiblePair(String.class,
java.security.cert.X509Certificate.class));
answer.add(new ConvertiblePair(String.class,
org.eclipse.milo.opcua.stack.core.security.CertificateManager.class));
- answer.add(new ConvertiblePair(String.class,
org.eclipse.milo.opcua.stack.core.security.CertificateValidator.class));
+ answer.add(new ConvertiblePair(String.class,
org.eclipse.milo.opcua.stack.server.security.ServerCertificateValidator.class));
return answer;
}
@@ -64,7 +64,7 @@ public class MiloServerComponentConverter implements
GenericConverter {
case
"org.eclipse.milo.opcua.stack.core.types.structured.BuildInfo": return
applicationContext.getBean(ref,
org.eclipse.milo.opcua.stack.core.types.structured.BuildInfo.class);
case "java.security.cert.X509Certificate": return
applicationContext.getBean(ref, java.security.cert.X509Certificate.class);
case
"org.eclipse.milo.opcua.stack.core.security.CertificateManager": return
applicationContext.getBean(ref,
org.eclipse.milo.opcua.stack.core.security.CertificateManager.class);
- case
"org.eclipse.milo.opcua.stack.core.security.CertificateValidator": return
applicationContext.getBean(ref,
org.eclipse.milo.opcua.stack.core.security.CertificateValidator.class);
+ case
"org.eclipse.milo.opcua.stack.server.security.ServerCertificateValidator":
return applicationContext.getBean(ref,
org.eclipse.milo.opcua.stack.server.security.ServerCertificateValidator.class);
}
return null;
}
