This is an automated email from the ASF dual-hosted git repository.
acosentino 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 dab8a15e3e9 [create-pull-request] automated change
dab8a15e3e9 is described below
commit dab8a15e3e9b6b57748d7d6a5b793d06459aac2d
Author: oscerd <osc...@users.noreply.github.com>
AuthorDate: Wed Sep 14 01:21:23 2022 +0000
[create-pull-request] automated change
---
.../springboot/catalog/components/google-pubsub.json | 1 +
.../apache/camel/springboot/catalog/components/xj.json | 2 ++
.../camel/springboot/catalog/components/xslt-saxon.json | 2 ++
components-starter/camel-xj-starter/src/main/docs/xj.json | 7 +++++++
.../component/xj/springboot/XJComponentConfiguration.java | 15 +++++++++++++++
.../src/main/docs/xslt-saxon.json | 7 +++++++
.../saxon/springboot/XsltSaxonComponentConfiguration.java | 15 +++++++++++++++
7 files changed, 49 insertions(+)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-pubsub.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-pubsub.json
index 281232c2805..03f50c9c53f 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-pubsub.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/google-pubsub.json
@@ -48,6 +48,7 @@
"serviceAccountKey": { "kind": "parameter", "displayName": "Service
Account Key", "group": "common", "label": "common", "required": false, "type":
"string", "javaType": "java.lang.String", "deprecated": false, "autowired":
false, "secret": false, "description": "The Service account key that can be
used as credentials for the PubSub publisher\/subscriber. It can be loaded by
default from classpath, but you can prefix with classpath:, file:, or http: to
load the resource from different [...]
"ackMode": { "kind": "parameter", "displayName": "Ack Mode", "group":
"consumer", "label": "consumer", "required": false, "type": "object",
"javaType":
"org.apache.camel.component.google.pubsub.GooglePubsubConstants.AckMode",
"enum": [ "AUTO", "NONE" ], "deprecated": false, "autowired": false, "secret":
false, "defaultValue": "AUTO", "description": "AUTO = exchange gets
ack'ed\/nack'ed on completion. NONE = downstream process has to ack\/nack
explicitly" },
"concurrentConsumers": { "kind": "parameter", "displayName": "Concurrent
Consumers", "group": "consumer", "label": "consumer", "required": false,
"type": "integer", "javaType": "java.lang.Integer", "deprecated": false,
"autowired": false, "secret": false, "defaultValue": "1", "description": "The
number of parallel streams consuming from the subscription" },
+ "maxAckExtensionPeriod": { "kind": "parameter", "displayName": "Max Ack
Extension Period", "group": "consumer", "label": "consumer", "required": false,
"type": "integer", "javaType": "int", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": 3600, "description": "Set the maximum period a
message ack deadline will be extended. Value in seconds" },
"maxMessagesPerPoll": { "kind": "parameter", "displayName": "Max Messages
Per Poll", "group": "consumer", "label": "consumer", "required": false, "type":
"integer", "javaType": "java.lang.Integer", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": "1", "description": "The max number of
messages to receive from the server in a single API call" },
"synchronousPull": { "kind": "parameter", "displayName": "Synchronous
Pull", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "autowired": false,
"secret": false, "defaultValue": false, "description": "Synchronously pull
batches of messages" },
"bridgeErrorHandler": { "kind": "parameter", "displayName": "Bridge Error
Handler", "group": "consumer (advanced)", "label": "consumer,advanced",
"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 [...]
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/xj.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/xj.json
index 1e66d2b61d6..24a46ce8744 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/xj.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/xj.json
@@ -28,6 +28,7 @@
"saxonConfiguration": { "kind": "property", "displayName": "Saxon
Configuration", "group": "advanced", "label": "advanced", "required": false,
"type": "object", "javaType": "net.sf.saxon.Configuration", "deprecated":
false, "autowired": false, "secret": false, "description": "To use a custom
Saxon configuration" },
"saxonConfigurationProperties": { "kind": "property", "displayName":
"Saxon Configuration Properties", "group": "advanced", "label": "advanced",
"required": false, "type": "object", "javaType":
"java.util.Map<java.lang.String, java.lang.Object>", "deprecated": false,
"autowired": false, "secret": false, "description": "To set custom Saxon
configuration properties" },
"saxonExtensionFunctions": { "kind": "property", "displayName": "Saxon
Extension Functions", "group": "advanced", "label": "advanced", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Allows you to use a custom
net.sf.saxon.lib.ExtensionFunctionDefinition. You would need to add camel-saxon
to the classpath. The function is looked up in the registry, where you can
comma to separate multiple v [...]
+ "secureProcessing": { "kind": "property", "displayName": "Secure
Processing", "group": "advanced", "label": "advanced", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": true, "description": "Feature for XML
secure processing (see javax.xml.XMLConstants). This is enabled by default.
However, when using Saxon Professional you may need to turn this off to allow
Saxon to be able to use Java extension fu [...]
"transformerFactoryClass": { "kind": "property", "displayName":
"Transformer Factory Class", "group": "advanced", "label": "advanced",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description": "To
use a custom XSLT transformer factory, specified as a FQN class name" },
"transformerFactoryConfigurationStrategy": { "kind": "property",
"displayName": "Transformer Factory Configuration Strategy", "group":
"advanced", "label": "advanced", "required": false, "type": "object",
"javaType":
"org.apache.camel.component.xslt.TransformerFactoryConfigurationStrategy",
"deprecated": false, "autowired": false, "secret": false, "description": "A
configuration strategy to apply on freshly created instances of
TransformerFactory." },
"uriResolver": { "kind": "property", "displayName": "Uri Resolver",
"group": "advanced", "label": "advanced", "required": false, "type": "object",
"javaType": "javax.xml.transform.URIResolver", "deprecated": false,
"autowired": false, "secret": false, "description": "To use a custom
UriResolver. Should not be used together with the option 'uriResolverFactory'."
},
@@ -51,6 +52,7 @@
"resultHandlerFactory": { "kind": "parameter", "displayName": "Result
Handler Factory", "group": "advanced", "label": "advanced", "required": false,
"type": "object", "javaType":
"org.apache.camel.component.xslt.ResultHandlerFactory", "deprecated": false,
"autowired": false, "secret": false, "description": "Allows you to use a custom
org.apache.camel.builder.xml.ResultHandlerFactory which is capable of using
custom org.apache.camel.builder.xml.ResultHandler types." },
"saxonConfiguration": { "kind": "parameter", "displayName": "Saxon
Configuration", "group": "advanced", "label": "advanced", "required": false,
"type": "object", "javaType": "net.sf.saxon.Configuration", "deprecated":
false, "autowired": false, "secret": false, "description": "To use a custom
Saxon configuration" },
"saxonExtensionFunctions": { "kind": "parameter", "displayName": "Saxon
Extension Functions", "group": "advanced", "label": "advanced", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Allows you to use a custom
net.sf.saxon.lib.ExtensionFunctionDefinition. You would need to add camel-saxon
to the classpath. The function is looked up in the registry, where you can
comma to separate multiple [...]
+ "secureProcessing": { "kind": "parameter", "displayName": "Secure
Processing", "group": "advanced", "label": "advanced", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": true, "description": "Feature for XML
secure processing (see javax.xml.XMLConstants). This is enabled by default.
However, when using Saxon Professional you may need to turn this off to allow
Saxon to be able to use Java extension f [...]
"transformerFactory": { "kind": "parameter", "displayName": "Transformer
Factory", "group": "advanced", "label": "advanced", "required": false, "type":
"object", "javaType": "javax.xml.transform.TransformerFactory", "deprecated":
false, "autowired": false, "secret": false, "description": "To use a custom
XSLT transformer factory" },
"transformerFactoryClass": { "kind": "parameter", "displayName":
"Transformer Factory Class", "group": "advanced", "label": "advanced",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description": "To
use a custom XSLT transformer factory, specified as a FQN class name" },
"transformerFactoryConfigurationStrategy": { "kind": "parameter",
"displayName": "Transformer Factory Configuration Strategy", "group":
"advanced", "label": "advanced", "required": false, "type": "object",
"javaType":
"org.apache.camel.component.xslt.TransformerFactoryConfigurationStrategy",
"deprecated": false, "autowired": false, "secret": false, "description": "A
configuration strategy to apply on freshly created instances of
TransformerFactory." },
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/xslt-saxon.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/xslt-saxon.json
index d28e193b2f9..c62f704ee46 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/xslt-saxon.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/xslt-saxon.json
@@ -28,6 +28,7 @@
"saxonConfiguration": { "kind": "property", "displayName": "Saxon
Configuration", "group": "advanced", "label": "advanced", "required": false,
"type": "object", "javaType": "net.sf.saxon.Configuration", "deprecated":
false, "autowired": false, "secret": false, "description": "To use a custom
Saxon configuration" },
"saxonConfigurationProperties": { "kind": "property", "displayName":
"Saxon Configuration Properties", "group": "advanced", "label": "advanced",
"required": false, "type": "object", "javaType":
"java.util.Map<java.lang.String, java.lang.Object>", "deprecated": false,
"autowired": false, "secret": false, "description": "To set custom Saxon
configuration properties" },
"saxonExtensionFunctions": { "kind": "property", "displayName": "Saxon
Extension Functions", "group": "advanced", "label": "advanced", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Allows you to use a custom
net.sf.saxon.lib.ExtensionFunctionDefinition. You would need to add camel-saxon
to the classpath. The function is looked up in the registry, where you can
comma to separate multiple v [...]
+ "secureProcessing": { "kind": "property", "displayName": "Secure
Processing", "group": "advanced", "label": "advanced", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": true, "description": "Feature for XML
secure processing (see javax.xml.XMLConstants). This is enabled by default.
However, when using Saxon Professional you may need to turn this off to allow
Saxon to be able to use Java extension fu [...]
"transformerFactoryClass": { "kind": "property", "displayName":
"Transformer Factory Class", "group": "advanced", "label": "advanced",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description": "To
use a custom XSLT transformer factory, specified as a FQN class name" },
"transformerFactoryConfigurationStrategy": { "kind": "property",
"displayName": "Transformer Factory Configuration Strategy", "group":
"advanced", "label": "advanced", "required": false, "type": "object",
"javaType":
"org.apache.camel.component.xslt.TransformerFactoryConfigurationStrategy",
"deprecated": false, "autowired": false, "secret": false, "description": "A
configuration strategy to apply on freshly created instances of
TransformerFactory." },
"uriResolver": { "kind": "property", "displayName": "Uri Resolver",
"group": "advanced", "label": "advanced", "required": false, "type": "object",
"javaType": "javax.xml.transform.URIResolver", "deprecated": false,
"autowired": false, "secret": false, "description": "To use a custom
UriResolver. Should not be used together with the option 'uriResolverFactory'."
},
@@ -47,6 +48,7 @@
"resultHandlerFactory": { "kind": "parameter", "displayName": "Result
Handler Factory", "group": "advanced", "label": "advanced", "required": false,
"type": "object", "javaType":
"org.apache.camel.component.xslt.ResultHandlerFactory", "deprecated": false,
"autowired": false, "secret": false, "description": "Allows you to use a custom
org.apache.camel.builder.xml.ResultHandlerFactory which is capable of using
custom org.apache.camel.builder.xml.ResultHandler types." },
"saxonConfiguration": { "kind": "parameter", "displayName": "Saxon
Configuration", "group": "advanced", "label": "advanced", "required": false,
"type": "object", "javaType": "net.sf.saxon.Configuration", "deprecated":
false, "autowired": false, "secret": false, "description": "To use a custom
Saxon configuration" },
"saxonExtensionFunctions": { "kind": "parameter", "displayName": "Saxon
Extension Functions", "group": "advanced", "label": "advanced", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Allows you to use a custom
net.sf.saxon.lib.ExtensionFunctionDefinition. You would need to add camel-saxon
to the classpath. The function is looked up in the registry, where you can
comma to separate multiple [...]
+ "secureProcessing": { "kind": "parameter", "displayName": "Secure
Processing", "group": "advanced", "label": "advanced", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "autowired":
false, "secret": false, "defaultValue": true, "description": "Feature for XML
secure processing (see javax.xml.XMLConstants). This is enabled by default.
However, when using Saxon Professional you may need to turn this off to allow
Saxon to be able to use Java extension f [...]
"transformerFactory": { "kind": "parameter", "displayName": "Transformer
Factory", "group": "advanced", "label": "advanced", "required": false, "type":
"object", "javaType": "javax.xml.transform.TransformerFactory", "deprecated":
false, "autowired": false, "secret": false, "description": "To use a custom
XSLT transformer factory" },
"transformerFactoryClass": { "kind": "parameter", "displayName":
"Transformer Factory Class", "group": "advanced", "label": "advanced",
"required": false, "type": "string", "javaType": "java.lang.String",
"deprecated": false, "autowired": false, "secret": false, "description": "To
use a custom XSLT transformer factory, specified as a FQN class name" },
"transformerFactoryConfigurationStrategy": { "kind": "parameter",
"displayName": "Transformer Factory Configuration Strategy", "group":
"advanced", "label": "advanced", "required": false, "type": "object",
"javaType":
"org.apache.camel.component.xslt.TransformerFactoryConfigurationStrategy",
"deprecated": false, "autowired": false, "secret": false, "description": "A
configuration strategy to apply on freshly created instances of
TransformerFactory." },
diff --git a/components-starter/camel-xj-starter/src/main/docs/xj.json
b/components-starter/camel-xj-starter/src/main/docs/xj.json
index f1130a0a671..849544499db 100644
--- a/components-starter/camel-xj-starter/src/main/docs/xj.json
+++ b/components-starter/camel-xj-starter/src/main/docs/xj.json
@@ -63,6 +63,13 @@
"description": "Allows you to use a custom
net.sf.saxon.lib.ExtensionFunctionDefinition. You would need to add camel-saxon
to the classpath. The function is looked up in the registry, where you can
comma to separate multiple values to lookup.",
"sourceType":
"org.apache.camel.component.xj.springboot.XJComponentConfiguration"
},
+ {
+ "name": "camel.component.xj.secure-processing",
+ "type": "java.lang.Boolean",
+ "description": "Feature for XML secure processing (see
javax.xml.XMLConstants). This is enabled by default. However, when using Saxon
Professional you may need to turn this off to allow Saxon to be able to use
Java extension functions.",
+ "sourceType":
"org.apache.camel.component.xj.springboot.XJComponentConfiguration",
+ "defaultValue": true
+ },
{
"name": "camel.component.xj.transformer-factory-class",
"type": "java.lang.String",
diff --git
a/components-starter/camel-xj-starter/src/main/java/org/apache/camel/component/xj/springboot/XJComponentConfiguration.java
b/components-starter/camel-xj-starter/src/main/java/org/apache/camel/component/xj/springboot/XJComponentConfiguration.java
index 1465aa27f1c..174a4ee3779 100644
---
a/components-starter/camel-xj-starter/src/main/java/org/apache/camel/component/xj/springboot/XJComponentConfiguration.java
+++
b/components-starter/camel-xj-starter/src/main/java/org/apache/camel/component/xj/springboot/XJComponentConfiguration.java
@@ -85,6 +85,13 @@ public class XJComponentConfiguration
* values to lookup.
*/
private String saxonExtensionFunctions;
+ /**
+ * Feature for XML secure processing (see javax.xml.XMLConstants). This is
+ * enabled by default. However, when using Saxon Professional you may need
+ * to turn this off to allow Saxon to be able to use Java extension
+ * functions.
+ */
+ private Boolean secureProcessing = true;
/**
* To use a custom XSLT transformer factory, specified as a FQN class name
*/
@@ -158,6 +165,14 @@ public class XJComponentConfiguration
this.saxonExtensionFunctions = saxonExtensionFunctions;
}
+ public Boolean getSecureProcessing() {
+ return secureProcessing;
+ }
+
+ public void setSecureProcessing(Boolean secureProcessing) {
+ this.secureProcessing = secureProcessing;
+ }
+
public String getTransformerFactoryClass() {
return transformerFactoryClass;
}
diff --git
a/components-starter/camel-xslt-saxon-starter/src/main/docs/xslt-saxon.json
b/components-starter/camel-xslt-saxon-starter/src/main/docs/xslt-saxon.json
index af846d1a075..8904f1fd97f 100644
--- a/components-starter/camel-xslt-saxon-starter/src/main/docs/xslt-saxon.json
+++ b/components-starter/camel-xslt-saxon-starter/src/main/docs/xslt-saxon.json
@@ -63,6 +63,13 @@
"description": "Allows you to use a custom
net.sf.saxon.lib.ExtensionFunctionDefinition. You would need to add camel-saxon
to the classpath. The function is looked up in the registry, where you can
comma to separate multiple values to lookup.",
"sourceType":
"org.apache.camel.component.xslt.saxon.springboot.XsltSaxonComponentConfiguration"
},
+ {
+ "name": "camel.component.xslt-saxon.secure-processing",
+ "type": "java.lang.Boolean",
+ "description": "Feature for XML secure processing (see
javax.xml.XMLConstants). This is enabled by default. However, when using Saxon
Professional you may need to turn this off to allow Saxon to be able to use
Java extension functions.",
+ "sourceType":
"org.apache.camel.component.xslt.saxon.springboot.XsltSaxonComponentConfiguration",
+ "defaultValue": true
+ },
{
"name": "camel.component.xslt-saxon.transformer-factory-class",
"type": "java.lang.String",
diff --git
a/components-starter/camel-xslt-saxon-starter/src/main/java/org/apache/camel/component/xslt/saxon/springboot/XsltSaxonComponentConfiguration.java
b/components-starter/camel-xslt-saxon-starter/src/main/java/org/apache/camel/component/xslt/saxon/springboot/XsltSaxonComponentConfiguration.java
index 06edc8b8b34..accd7c103d7 100644
---
a/components-starter/camel-xslt-saxon-starter/src/main/java/org/apache/camel/component/xslt/saxon/springboot/XsltSaxonComponentConfiguration.java
+++
b/components-starter/camel-xslt-saxon-starter/src/main/java/org/apache/camel/component/xslt/saxon/springboot/XsltSaxonComponentConfiguration.java
@@ -85,6 +85,13 @@ public class XsltSaxonComponentConfiguration
* values to lookup.
*/
private String saxonExtensionFunctions;
+ /**
+ * Feature for XML secure processing (see javax.xml.XMLConstants). This is
+ * enabled by default. However, when using Saxon Professional you may need
+ * to turn this off to allow Saxon to be able to use Java extension
+ * functions.
+ */
+ private Boolean secureProcessing = true;
/**
* To use a custom XSLT transformer factory, specified as a FQN class name
*/
@@ -158,6 +165,14 @@ public class XsltSaxonComponentConfiguration
this.saxonExtensionFunctions = saxonExtensionFunctions;
}
+ public Boolean getSecureProcessing() {
+ return secureProcessing;
+ }
+
+ public void setSecureProcessing(Boolean secureProcessing) {
+ this.secureProcessing = secureProcessing;
+ }
+
public String getTransformerFactoryClass() {
return transformerFactoryClass;
}
