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.git
The following commit(s) were added to refs/heads/main by this push:
new aedcc9b Polished
aedcc9b is described below
commit aedcc9be5770191e2a8cbad83efc13270a31307f
Author: Claus Ibsen <[email protected]>
AuthorDate: Sat Jun 19 09:22:55 2021 +0200
Polished
---
.../resources/org/apache/camel/catalog/docs/bean-language.adoc | 2 +-
.../generated/resources/org/apache/camel/catalog/languages/bean.json | 2 +-
.../src/generated/resources/org/apache/camel/catalog/models/bean.json | 2 +-
.../src/generated/resources/org/apache/camel/catalog/models/method.json | 2 +-
.../src/generated/resources/org/apache/camel/language/bean/bean.json | 2 +-
components/camel-bean/src/main/docs/bean-language.adoc | 2 +-
.../src/generated/resources/org/apache/camel/model/bean.json | 2 +-
.../src/generated/resources/org/apache/camel/model/language/method.json | 2 +-
.../src/main/java/org/apache/camel/model/BeanDefinition.java | 2 +-
.../main/java/org/apache/camel/model/language/MethodCallExpression.java | 2 +-
docs/components/modules/languages/pages/bean-language.adoc | 2 +-
11 files changed, 11 insertions(+), 11 deletions(-)
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/bean-language.adoc
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/bean-language.adoc
index 98dc589..b806a0b 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/bean-language.adoc
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/docs/bean-language.adoc
@@ -37,7 +37,7 @@ The Bean method language supports 5 options, which are listed
below.
| ref | | String | Reference to bean to lookup in the registry
| method | | String | Name of method to call
| beanType | | String | Class name of the bean to use
-| scope | Singleton | String | 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 time [...]
+| scope | Singleton | String | 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 time [...]
| trim | true | Boolean | Whether to trim the value to remove leading and
trailing whitespaces and line breaks
|===
// language options: END
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/bean.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/bean.json
index d4c70cf..8ce1dce 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/bean.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/languages/bean.json
@@ -19,7 +19,7 @@
"ref": { "kind": "attribute", "displayName": "Ref", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": 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,
"autowired": 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,
"autowired": 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, "autowired": 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 [...]
+ "scope": { "kind": "attribute", "displayName": "Scope", "required": false,
"type": "enum", "javaType": "java.lang.String", "enum": [ "Prototype",
"Request", "Singleton" ], "deprecated": false, "autowired": 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 [...]
"trim": { "kind": "attribute", "displayName": "Trim", "required": false,
"type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"autowired": 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,
"autowired": false, "secret": false, "description": "Sets the id of this node" }
}
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/bean.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/bean.json
index 72b406d..f050dfa 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/bean.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/bean.json
@@ -15,7 +15,7 @@
"method": { "kind": "attribute", "displayName": "Method", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Sets the method name on
the bean to use" },
"beanType": { "kind": "attribute", "displayName": "Bean Type", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Sets the Class of the
bean" },
"cache": { "kind": "attribute", "displayName": "Cache", "required": false,
"type": "boolean", "javaType": "java.lang.Boolean", "deprecated": true,
"autowired": false, "secret": false, "defaultValue": true, "description": "Use
singleton option instead" },
- "scope": { "kind": "attribute", "displayName": "Scope", "required": false,
"type": "enum", "javaType": "java.lang.String", "enum": [ "Prototype",
"Request", "Singleton" ], "deprecated": false, "autowired": 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 [...]
+ "scope": { "kind": "attribute", "displayName": "Scope", "required": false,
"type": "enum", "javaType": "java.lang.String", "enum": [ "Prototype",
"Request", "Singleton" ], "deprecated": false, "autowired": 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 [...]
"id": { "kind": "attribute", "displayName": "Id", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Sets the id of this node"
},
"description": { "kind": "element", "displayName": "Description",
"required": false, "type": "object", "javaType":
"org.apache.camel.model.DescriptionDefinition", "deprecated": false,
"autowired": false, "secret": false, "description": "Sets the description of
this node" }
}
diff --git
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/method.json
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/method.json
index 5554536..472f306 100644
---
a/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/method.json
+++
b/catalog/camel-catalog/src/generated/resources/org/apache/camel/catalog/models/method.json
@@ -15,7 +15,7 @@
"ref": { "kind": "attribute", "displayName": "Ref", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": 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,
"autowired": 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,
"autowired": 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, "autowired": 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 [...]
+ "scope": { "kind": "attribute", "displayName": "Scope", "required": false,
"type": "enum", "javaType": "java.lang.String", "enum": [ "Prototype",
"Request", "Singleton" ], "deprecated": false, "autowired": 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 [...]
"trim": { "kind": "attribute", "displayName": "Trim", "required": false,
"type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"autowired": 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,
"autowired": false, "secret": false, "description": "Sets the id of this node" }
}
diff --git
a/components/camel-bean/src/generated/resources/org/apache/camel/language/bean/bean.json
b/components/camel-bean/src/generated/resources/org/apache/camel/language/bean/bean.json
index d4c70cf..8ce1dce 100644
---
a/components/camel-bean/src/generated/resources/org/apache/camel/language/bean/bean.json
+++
b/components/camel-bean/src/generated/resources/org/apache/camel/language/bean/bean.json
@@ -19,7 +19,7 @@
"ref": { "kind": "attribute", "displayName": "Ref", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": 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,
"autowired": 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,
"autowired": 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, "autowired": 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 [...]
+ "scope": { "kind": "attribute", "displayName": "Scope", "required": false,
"type": "enum", "javaType": "java.lang.String", "enum": [ "Prototype",
"Request", "Singleton" ], "deprecated": false, "autowired": 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 [...]
"trim": { "kind": "attribute", "displayName": "Trim", "required": false,
"type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"autowired": 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,
"autowired": false, "secret": false, "description": "Sets the id of this node" }
}
diff --git a/components/camel-bean/src/main/docs/bean-language.adoc
b/components/camel-bean/src/main/docs/bean-language.adoc
index 98dc589..b806a0b 100644
--- a/components/camel-bean/src/main/docs/bean-language.adoc
+++ b/components/camel-bean/src/main/docs/bean-language.adoc
@@ -37,7 +37,7 @@ The Bean method language supports 5 options, which are listed
below.
| ref | | String | Reference to bean to lookup in the registry
| method | | String | Name of method to call
| beanType | | String | Class name of the bean to use
-| scope | Singleton | String | 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 time [...]
+| scope | Singleton | String | 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 time [...]
| trim | true | Boolean | Whether to trim the value to remove leading and
trailing whitespaces and line breaks
|===
// language options: END
diff --git
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/bean.json
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/bean.json
index 72b406d..f050dfa 100644
---
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/bean.json
+++
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/bean.json
@@ -15,7 +15,7 @@
"method": { "kind": "attribute", "displayName": "Method", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Sets the method name on
the bean to use" },
"beanType": { "kind": "attribute", "displayName": "Bean Type", "required":
false, "type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Sets the Class of the
bean" },
"cache": { "kind": "attribute", "displayName": "Cache", "required": false,
"type": "boolean", "javaType": "java.lang.Boolean", "deprecated": true,
"autowired": false, "secret": false, "defaultValue": true, "description": "Use
singleton option instead" },
- "scope": { "kind": "attribute", "displayName": "Scope", "required": false,
"type": "enum", "javaType": "java.lang.String", "enum": [ "Prototype",
"Request", "Singleton" ], "deprecated": false, "autowired": 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 [...]
+ "scope": { "kind": "attribute", "displayName": "Scope", "required": false,
"type": "enum", "javaType": "java.lang.String", "enum": [ "Prototype",
"Request", "Singleton" ], "deprecated": false, "autowired": 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 [...]
"id": { "kind": "attribute", "displayName": "Id", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": false, "secret": false, "description": "Sets the id of this node"
},
"description": { "kind": "element", "displayName": "Description",
"required": false, "type": "object", "javaType":
"org.apache.camel.model.DescriptionDefinition", "deprecated": false,
"autowired": false, "secret": false, "description": "Sets the description of
this node" }
}
diff --git
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/method.json
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/method.json
index 5554536..472f306 100644
---
a/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/method.json
+++
b/core/camel-core-model/src/generated/resources/org/apache/camel/model/language/method.json
@@ -15,7 +15,7 @@
"ref": { "kind": "attribute", "displayName": "Ref", "required": false,
"type": "string", "javaType": "java.lang.String", "deprecated": false,
"autowired": 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,
"autowired": 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,
"autowired": 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, "autowired": 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 [...]
+ "scope": { "kind": "attribute", "displayName": "Scope", "required": false,
"type": "enum", "javaType": "java.lang.String", "enum": [ "Prototype",
"Request", "Singleton" ], "deprecated": false, "autowired": 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 [...]
"trim": { "kind": "attribute", "displayName": "Trim", "required": false,
"type": "boolean", "javaType": "java.lang.Boolean", "deprecated": false,
"autowired": 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,
"autowired": false, "secret": false, "description": "Sets the id of this node" }
}
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/BeanDefinition.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/BeanDefinition.java
index 4c0cb35..a24f5ac 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/BeanDefinition.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/BeanDefinition.java
@@ -188,7 +188,7 @@ public class BeanDefinition extends
NoOutputDefinition<BeanDefinition> {
* 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 prototype 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 prototype scope then this
+ * their configuration can act as either singleton or prototype scope. So
when using prototype scope then this
* depends on the bean registry implementation.
*/
public void setScope(BeanScope scope) {
diff --git
a/core/camel-core-model/src/main/java/org/apache/camel/model/language/MethodCallExpression.java
b/core/camel-core-model/src/main/java/org/apache/camel/model/language/MethodCallExpression.java
index 3a36ae0..0ad1131 100644
---
a/core/camel-core-model/src/main/java/org/apache/camel/model/language/MethodCallExpression.java
+++
b/core/camel-core-model/src/main/java/org/apache/camel/model/language/MethodCallExpression.java
@@ -147,7 +147,7 @@ public class MethodCallExpression extends
ExpressionDefinition {
* 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 prototype 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 prototype scope then this
+ * their configuration can act as either singleton or prototype scope. So
when using prototype scope then this
* depends on the bean registry implementation.
*/
public void setScope(String scope) {
diff --git a/docs/components/modules/languages/pages/bean-language.adoc
b/docs/components/modules/languages/pages/bean-language.adoc
index 085346c..2d6438a 100644
--- a/docs/components/modules/languages/pages/bean-language.adoc
+++ b/docs/components/modules/languages/pages/bean-language.adoc
@@ -39,7 +39,7 @@ The Bean method language supports 5 options, which are listed
below.
| ref | | String | Reference to bean to lookup in the registry
| method | | String | Name of method to call
| beanType | | String | Class name of the bean to use
-| scope | Singleton | String | 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 time [...]
+| scope | Singleton | String | 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 time [...]
| trim | true | Boolean | Whether to trim the value to remove leading and
trailing whitespaces and line breaks
|===
// language options: END