This is an automated email from the ASF dual-hosted git repository.
acosentino pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/camel-spring-boot.git
The following commit(s) were added to refs/heads/master by this push:
new 4e649e6 Regen
4e649e6 is described below
commit 4e649e653039ce660b670de31dce519852838eb6
Author: Andrea Cosentino <[email protected]>
AuthorDate: Thu May 28 14:27:17 2020 +0200
Regen
---
.../apache/camel/springboot/catalog/components/jslt.json | 3 ++-
components-starter/camel-corda-starter/pom.xml | 12 ++++++++++++
components-starter/camel-iota-starter/pom.xml | 12 ++++++++++++
.../camel-jslt-starter/src/main/docs/jslt-starter.adoc | 3 ++-
.../jslt/springboot/JsltComponentConfiguration.java | 13 +++++++++++++
docs/modules/ROOT/pages/jslt-starter.adoc | 3 ++-
6 files changed, 43 insertions(+), 3 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jslt.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jslt.json
index 8fc4402..ea87d9e 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jslt.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/jslt.json
@@ -24,7 +24,8 @@
"allowTemplateFromHeader": { "kind": "property", "displayName": "Allow
Template From Header", "group": "producer", "label": "", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": "false", "description": "Whether to allow to use resource
template from header or not (default false). Enabling this allows to specify
dynamic templates via message header. However this can be seen as a potential
security vulnerability if the he [...]
"lazyStartProducer": { "kind": "property", "displayName": "Lazy Start
Producer", "group": "producer", "label": "producer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": false, "description": "Whether the producer should be started
lazy (on the first message). By starting lazy you can use this to allow
CamelContext and routes to startup in situations where a producer may otherwise
fail during starting and cause the r [...]
"basicPropertyBinding": { "kind": "property", "displayName": "Basic
Property Binding", "group": "advanced", "label": "advanced", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": false, "description": "Whether the component should use basic
property binding (Camel 2.x) or the newer property binding with additional
capabilities" },
- "functions": { "kind": "property", "displayName": "Functions", "group":
"advanced", "label": "advanced", "required": false, "type": "array",
"javaType": "java.util.Collection<com.schibsted.spt.data.jslt.Function>",
"deprecated": false, "secret": false, "description": "JSLT can be extended by
plugging in functions written in Java." }
+ "functions": { "kind": "property", "displayName": "Functions", "group":
"advanced", "label": "advanced", "required": false, "type": "array",
"javaType": "java.util.Collection<com.schibsted.spt.data.jslt.Function>",
"deprecated": false, "secret": false, "description": "JSLT can be extended by
plugging in functions written in Java." },
+ "objectFilter": { "kind": "property", "displayName": "Object Filter",
"group": "advanced", "label": "advanced", "required": false, "type": "object",
"javaType": "com.schibsted.spt.data.jslt.filters.JsonFilter", "deprecated":
false, "secret": false, "description": "JSLT can be extended by plugging in a
custom jslt object filter" }
},
"properties": {
"resourceUri": { "kind": "path", "displayName": "Resource Uri", "group":
"producer", "label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "secret":
false, "description": "Path to the resource. You can prefix with: classpath,
file, http, ref, or bean. classpath, file and http loads the resource using
these protocols (classpath is default). ref will lookup the resource in the
registry. bean will call a method on a [...]
diff --git a/components-starter/camel-corda-starter/pom.xml
b/components-starter/camel-corda-starter/pom.xml
index 8559a29..9ae10f6 100644
--- a/components-starter/camel-corda-starter/pom.xml
+++ b/components-starter/camel-corda-starter/pom.xml
@@ -38,6 +38,18 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-corda</artifactId>
<version>${camel-version}</version>
+ <!--START OF GENERATED CODE-->
+ <exclusions>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ </exclusion>
+ </exclusions>
+ <!--END OF GENERATED CODE-->
</dependency>
<!--START OF GENERATED CODE-->
<dependency>
diff --git a/components-starter/camel-iota-starter/pom.xml
b/components-starter/camel-iota-starter/pom.xml
index 0ccac9f..45084aa 100644
--- a/components-starter/camel-iota-starter/pom.xml
+++ b/components-starter/camel-iota-starter/pom.xml
@@ -38,6 +38,18 @@
<groupId>org.apache.camel</groupId>
<artifactId>camel-iota</artifactId>
<version>${camel-version}</version>
+ <!--START OF GENERATED CODE-->
+ <exclusions>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-classic</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>ch.qos.logback</groupId>
+ <artifactId>logback-core</artifactId>
+ </exclusion>
+ </exclusions>
+ <!--END OF GENERATED CODE-->
</dependency>
<!--START OF GENERATED CODE-->
<dependency>
diff --git
a/components-starter/camel-jslt-starter/src/main/docs/jslt-starter.adoc
b/components-starter/camel-jslt-starter/src/main/docs/jslt-starter.adoc
index aef4d34..aaf39e7 100644
--- a/components-starter/camel-jslt-starter/src/main/docs/jslt-starter.adoc
+++ b/components-starter/camel-jslt-starter/src/main/docs/jslt-starter.adoc
@@ -17,7 +17,7 @@ When using jslt with Spring Boot make sure to use the
following Maven dependency
----
-The component supports 5 options, which are listed below.
+The component supports 6 options, which are listed below.
@@ -29,5 +29,6 @@ The component supports 5 options, which are listed below.
| *camel.component.jslt.enabled* | Whether to enable auto configuration of the
jslt component. This is enabled by default. | | Boolean
| *camel.component.jslt.functions* | JSLT can be extended by plugging in
functions written in Java. | | Collection
| *camel.component.jslt.lazy-start-producer* | Whether the producer should be
started lazy (on the first message). By starting lazy you can use this to allow
CamelContext and routes to startup in situations where a producer may otherwise
fail during starting and cause the route to fail being started. By deferring
this startup to be lazy then the startup failure can be handled during routing
messages via Camel's routing error handlers. Beware that when the first message
is processed then [...]
+| *camel.component.jslt.object-filter* | JSLT can be extended by plugging in a
custom jslt object filter. The option is a
com.schibsted.spt.data.jslt.filters.JsonFilter type. | | String
|===
// spring-boot-auto-configure options: END
diff --git
a/components-starter/camel-jslt-starter/src/main/java/org/apache/camel/component/jslt/springboot/JsltComponentConfiguration.java
b/components-starter/camel-jslt-starter/src/main/java/org/apache/camel/component/jslt/springboot/JsltComponentConfiguration.java
index bb587cb..ec9e02a 100644
---
a/components-starter/camel-jslt-starter/src/main/java/org/apache/camel/component/jslt/springboot/JsltComponentConfiguration.java
+++
b/components-starter/camel-jslt-starter/src/main/java/org/apache/camel/component/jslt/springboot/JsltComponentConfiguration.java
@@ -65,6 +65,11 @@ public class JsltComponentConfiguration
* JSLT can be extended by plugging in functions written in Java.
*/
private Collection<Function> functions;
+ /**
+ * JSLT can be extended by plugging in a custom jslt object filter. The
+ * option is a com.schibsted.spt.data.jslt.filters.JsonFilter type.
+ */
+ private String objectFilter;
public Boolean getAllowTemplateFromHeader() {
return allowTemplateFromHeader;
@@ -97,4 +102,12 @@ public class JsltComponentConfiguration
public void setFunctions(Collection<Function> functions) {
this.functions = functions;
}
+
+ public String getObjectFilter() {
+ return objectFilter;
+ }
+
+ public void setObjectFilter(String objectFilter) {
+ this.objectFilter = objectFilter;
+ }
}
\ No newline at end of file
diff --git a/docs/modules/ROOT/pages/jslt-starter.adoc
b/docs/modules/ROOT/pages/jslt-starter.adoc
index aef4d34..aaf39e7 100644
--- a/docs/modules/ROOT/pages/jslt-starter.adoc
+++ b/docs/modules/ROOT/pages/jslt-starter.adoc
@@ -17,7 +17,7 @@ When using jslt with Spring Boot make sure to use the
following Maven dependency
----
-The component supports 5 options, which are listed below.
+The component supports 6 options, which are listed below.
@@ -29,5 +29,6 @@ The component supports 5 options, which are listed below.
| *camel.component.jslt.enabled* | Whether to enable auto configuration of the
jslt component. This is enabled by default. | | Boolean
| *camel.component.jslt.functions* | JSLT can be extended by plugging in
functions written in Java. | | Collection
| *camel.component.jslt.lazy-start-producer* | Whether the producer should be
started lazy (on the first message). By starting lazy you can use this to allow
CamelContext and routes to startup in situations where a producer may otherwise
fail during starting and cause the route to fail being started. By deferring
this startup to be lazy then the startup failure can be handled during routing
messages via Camel's routing error handlers. Beware that when the first message
is processed then [...]
+| *camel.component.jslt.object-filter* | JSLT can be extended by plugging in a
custom jslt object filter. The option is a
com.schibsted.spt.data.jslt.filters.JsonFilter type. | | String
|===
// spring-boot-auto-configure options: END
