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 30ac594 [create-pull-request] automated change
30ac594 is described below
commit 30ac59474034b5263be17567e586c25a81607c13
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Fri Oct 9 01:27:58 2020 +0000
[create-pull-request] automated change
---
.../springboot/catalog/components/rabbitmq.json | 1 +
.../camel/springboot/catalog/languages/bean.json | 1 +
.../src/main/docs/bean-starter.adoc | 3 ++-
.../bean/springboot/BeanLanguageConfiguration.java | 24 ++++++++++++++++++++++
components-starter/camel-corda-starter/pom.xml | 8 --------
components-starter/camel-iota-starter/pom.xml | 12 -----------
docs/modules/ROOT/pages/bean-starter.adoc | 3 ++-
7 files changed, 30 insertions(+), 22 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rabbitmq.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rabbitmq.json
index 82d7968..611a246 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rabbitmq.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/rabbitmq.json
@@ -111,6 +111,7 @@
"prefetchEnabled": { "kind": "parameter", "displayName": "Prefetch
Enabled", "group": "consumer", "label": "consumer", "required": false, "type":
"boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": false, "description": "Enables the quality of service on the
RabbitMQConsumer side. You need to specify the option of prefetchSize,
prefetchCount, prefetchGlobal at the same time" },
"prefetchGlobal": { "kind": "parameter", "displayName": "Prefetch Global",
"group": "consumer", "label": "consumer", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "secret": false, "defaultValue":
false, "description": "If the settings should be applied to the entire channel
rather than each consumer You need to specify the option of prefetchSize,
prefetchCount, prefetchGlobal at the same time" },
"prefetchSize": { "kind": "parameter", "displayName": "Prefetch Size",
"group": "consumer", "label": "consumer", "required": false, "type": "integer",
"javaType": "int", "deprecated": false, "secret": false, "description": "The
maximum amount of content (measured in octets) that the server will deliver, 0
if unlimited. You need to specify the option of prefetchSize, prefetchCount,
prefetchGlobal at the same time" },
+ "reQueue": { "kind": "parameter", "displayName": "Re Queue", "group":
"consumer", "label": "consumer", "required": false, "type": "boolean",
"javaType": "boolean", "deprecated": false, "secret": false, "defaultValue":
false, "description": "This is used by the consumer to control rejection of the
message. When the consumer is complete processing the exchange, and if the
exchange failed, then the consumer is going to reject the message from the
RabbitMQ broker. If the header CamelRabb [...]
"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, "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 consumer will deal with [...]
"exchangePattern": { "kind": "parameter", "displayName": "Exchange
Pattern", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "object", "javaType":
"org.apache.camel.ExchangePattern", "enum": [ "InOnly", "InOut",
"InOptionalOut" ], "deprecated": false, "secret": false, "description": "Sets
the exchange pattern when the consumer creates an exchange." },
"threadPoolSize": { "kind": "parameter", "displayName": "Thread Pool
Size", "group": "consumer (advanced)", "label": "consumer,advanced",
"required": false, "type": "integer", "javaType": "int", "deprecated": false,
"secret": false, "defaultValue": "10", "description": "The consumer uses a
Thread Pool Executor with a fixed number of threads. This setting allows you to
set that number of threads." },
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/bean.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/bean.json
index 915b7f2..b82165c 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/bean.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/languages/bean.json
@@ -19,6 +19,7 @@
"ref": { "kind": "attribute", "displayName": "Ref", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"secret": false, "description": "Reference to bean to lookup in the registry" },
"method": { "kind": "attribute", "displayName": "Method", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"secret": false, "description": "Name of method to call" },
"beanType": { "kind": "attribute", "displayName": "Bean Type", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"secret": false, "description": "Class name of the bean to use" },
+ "scope": { "kind": "attribute", "displayName": "Scope", "required": false,
"type": "enum", "javaType": "java.lang.String", "enum": [ "Prototype",
"Request", "Singleton" ], "deprecated": false, "secret": false, "defaultValue":
"Singleton", "description": "Scope of bean. When using singleton scope
(default) the bean is created or looked up only once and reused for the
lifetime of the endpoint. The bean should be thread-safe in case concurrent
threads is calling the bean at the same tim [...]
"trim": { "kind": "attribute", "displayName": "Trim", "required": false,
"type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"secret": false, "defaultValue": true, "description": "Whether to trim the
value to remove leading and trailing whitespaces and line breaks" },
"id": { "kind": "attribute", "displayName": "Id", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"secret": false, "description": "Sets the id of this node" }
}
diff --git
a/components-starter/camel-bean-starter/src/main/docs/bean-starter.adoc
b/components-starter/camel-bean-starter/src/main/docs/bean-starter.adoc
index 605dfb7..827fdb9 100644
--- a/components-starter/camel-bean-starter/src/main/docs/bean-starter.adoc
+++ b/components-starter/camel-bean-starter/src/main/docs/bean-starter.adoc
@@ -17,7 +17,7 @@ When using bean with Spring Boot make sure to use the
following Maven dependency
----
-The component supports 12 options, which are listed below.
+The component supports 13 options, which are listed below.
@@ -31,6 +31,7 @@ The component supports 12 options, which are listed below.
| *camel.component.class.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.class.scope* | Scope of bean. When using singleton scope
(default) the bean is created or looked up only once and reused for the
lifetime of the endpoint. The bean should be thread-safe in case concurrent
threads is calling the bean at the same time. When using request scope the bean
is created or looked up once per request (exchange). This can be used if you
want to store state on a bean while processing a request and you want to call
the same bean instance multiple t [...]
| *camel.language.bean.enabled* | Whether to enable auto configuration of the
bean language. This is enabled by default. | | Boolean
+| *camel.language.bean.scope* | Scope of bean. When using singleton scope
(default) the bean is created or looked up only once and reused for the
lifetime of the endpoint. The bean should be thread-safe in case concurrent
threads is calling the bean at the same time. When using request scope the bean
is created or looked up once per request (exchange). This can be used if you
want to store state on a bean while processing a request and you want to call
the same bean instance multiple tim [...]
| *camel.language.bean.trim* | Whether to trim the value to remove leading and
trailing whitespaces and line breaks | true | Boolean
| *camel.component.bean.basic-property-binding* | *Deprecated* Whether the
component should use basic property binding (Camel 2.x) or the newer property
binding with additional capabilities | false | Boolean
| *camel.component.bean.cache* | *Deprecated* Use singleton option instead. |
true | Boolean
diff --git
a/components-starter/camel-bean-starter/src/main/java/org/apache/camel/language/bean/springboot/BeanLanguageConfiguration.java
b/components-starter/camel-bean-starter/src/main/java/org/apache/camel/language/bean/springboot/BeanLanguageConfiguration.java
index f649dfe..e6409e6 100644
---
a/components-starter/camel-bean-starter/src/main/java/org/apache/camel/language/bean/springboot/BeanLanguageConfiguration.java
+++
b/components-starter/camel-bean-starter/src/main/java/org/apache/camel/language/bean/springboot/BeanLanguageConfiguration.java
@@ -38,11 +38,35 @@ public class BeanLanguageConfiguration
*/
private Boolean enabled;
/**
+ * Scope of bean. When using singleton scope (default) the bean is created
+ * or looked up only once and reused for the lifetime of the endpoint. The
+ * bean should be thread-safe in case concurrent threads is calling the
bean
+ * at the same time. When using request scope the bean is created or looked
+ * up once per request (exchange). This can be used if you want to store
+ * state on a bean while processing a request and you want to call the same
+ * bean instance multiple times while processing the request. The bean does
+ * not have to be thread-safe as the instance is only called from the same
+ * request. When using delegate scope, then the bean will be looked up or
+ * created per call. However in case of lookup then this is delegated to
the
+ * bean registry such as Spring or CDI (if in use), which depends on their
+ * configuration can act as either singleton or prototype scope. so when
+ * using delegate then this depends on the delegated registry.
+ */
+ private String scope = "Singleton";
+ /**
* Whether to trim the value to remove leading and trailing whitespaces and
* line breaks
*/
private Boolean trim = true;
+ public String getScope() {
+ return scope;
+ }
+
+ public void setScope(String scope) {
+ this.scope = scope;
+ }
+
public Boolean getTrim() {
return trim;
}
diff --git a/components-starter/camel-corda-starter/pom.xml
b/components-starter/camel-corda-starter/pom.xml
index 43b013d..274f6da 100644
--- a/components-starter/camel-corda-starter/pom.xml
+++ b/components-starter/camel-corda-starter/pom.xml
@@ -41,14 +41,6 @@
<!--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>
- <exclusion>
<groupId>org.apache.logging.log4j</groupId>
<artifactId>log4j-core</artifactId>
</exclusion>
diff --git a/components-starter/camel-iota-starter/pom.xml
b/components-starter/camel-iota-starter/pom.xml
index ce65d0f..2050aee 100644
--- a/components-starter/camel-iota-starter/pom.xml
+++ b/components-starter/camel-iota-starter/pom.xml
@@ -38,18 +38,6 @@
<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/docs/modules/ROOT/pages/bean-starter.adoc
b/docs/modules/ROOT/pages/bean-starter.adoc
index 605dfb7..827fdb9 100644
--- a/docs/modules/ROOT/pages/bean-starter.adoc
+++ b/docs/modules/ROOT/pages/bean-starter.adoc
@@ -17,7 +17,7 @@ When using bean with Spring Boot make sure to use the
following Maven dependency
----
-The component supports 12 options, which are listed below.
+The component supports 13 options, which are listed below.
@@ -31,6 +31,7 @@ The component supports 12 options, which are listed below.
| *camel.component.class.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.class.scope* | Scope of bean. When using singleton scope
(default) the bean is created or looked up only once and reused for the
lifetime of the endpoint. The bean should be thread-safe in case concurrent
threads is calling the bean at the same time. When using request scope the bean
is created or looked up once per request (exchange). This can be used if you
want to store state on a bean while processing a request and you want to call
the same bean instance multiple t [...]
| *camel.language.bean.enabled* | Whether to enable auto configuration of the
bean language. This is enabled by default. | | Boolean
+| *camel.language.bean.scope* | Scope of bean. When using singleton scope
(default) the bean is created or looked up only once and reused for the
lifetime of the endpoint. The bean should be thread-safe in case concurrent
threads is calling the bean at the same time. When using request scope the bean
is created or looked up once per request (exchange). This can be used if you
want to store state on a bean while processing a request and you want to call
the same bean instance multiple tim [...]
| *camel.language.bean.trim* | Whether to trim the value to remove leading and
trailing whitespaces and line breaks | true | Boolean
| *camel.component.bean.basic-property-binding* | *Deprecated* Whether the
component should use basic property binding (Camel 2.x) or the newer property
binding with additional capabilities | false | Boolean
| *camel.component.bean.cache* | *Deprecated* Use singleton option instead. |
true | Boolean
