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 d589520 [create-pull-request] automated change
d589520 is described below
commit d5895205a2378c78e042ce99ea5630735fed6955
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Sat Sep 12 01:11:23 2020 +0000
[create-pull-request] automated change
---
.../camel/springboot/catalog/components/caffeine-cache.json | 2 --
.../springboot/catalog/components/caffeine-loadcache.json | 2 --
.../src/main/docs/caffeine-starter.adoc | 4 +---
.../springboot/CaffeineCacheComponentConfiguration.java | 13 -------------
.../springboot/CaffeineLoadCacheComponentConfiguration.java | 13 -------------
docs/modules/ROOT/pages/caffeine-starter.adoc | 4 +---
tooling/camel-spring-boot-dependencies/pom.xml | 4 ++--
7 files changed, 4 insertions(+), 38 deletions(-)
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/caffeine-cache.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/caffeine-cache.json
index 4bcff9b..2404833 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/caffeine-cache.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/caffeine-cache.json
@@ -24,7 +24,6 @@
},
"componentProperties": {
"action": { "kind": "property", "displayName": "Action", "group":
"producer", "label": "producer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "secret": false,
"configurationClass":
"org.apache.camel.component.caffeine.CaffeineConfiguration",
"configurationField": "configuration", "description": "To configure the default
cache action. If an action is set in the message header, then the operation
from the header takes precedence." },
- "cache": { "kind": "property", "displayName": "Cache", "group":
"producer", "label": "producer", "required": false, "type": "object",
"javaType": "com.github.benmanes.caffeine.cache.Cache", "deprecated": false,
"secret": false, "configurationClass":
"org.apache.camel.component.caffeine.CaffeineConfiguration",
"configurationField": "configuration", "description": "To configure an already
instantiated cache to be used" },
"cacheLoader": { "kind": "property", "displayName": "Cache Loader",
"group": "producer", "label": "producer", "required": false, "type": "object",
"javaType": "com.github.benmanes.caffeine.cache.CacheLoader", "deprecated":
false, "secret": false, "configurationClass":
"org.apache.camel.component.caffeine.CaffeineConfiguration",
"configurationField": "configuration", "description": "To configure a
CacheLoader in case of a LoadCache use" },
"createCacheIfNotExist": { "kind": "property", "displayName": "Create
Cache If Not Exist", "group": "producer", "label": "", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": "true", "configurationClass":
"org.apache.camel.component.caffeine.CaffeineConfiguration",
"configurationField": "configuration", "description": "Configure if a cache
need to be created if it does exist or can't be pre-configured." },
"evictionType": { "kind": "property", "displayName": "Eviction Type",
"group": "producer", "label": "producer", "required": false, "type": "object",
"javaType": "org.apache.camel.component.caffeine.EvictionType", "enum": [
"size_based", "time_based" ], "deprecated": false, "secret": false,
"defaultValue": "SIZE_BASED", "configurationClass":
"org.apache.camel.component.caffeine.CaffeineConfiguration",
"configurationField": "configuration", "description": "Set the eviction Type
for thi [...]
@@ -45,7 +44,6 @@
"properties": {
"cacheName": { "kind": "path", "displayName": "Cache Name", "group":
"producer", "label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "secret":
false, "description": "the cache name" },
"action": { "kind": "parameter", "displayName": "Action", "group":
"producer", "label": "producer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "secret": false,
"configurationClass":
"org.apache.camel.component.caffeine.CaffeineConfiguration",
"configurationField": "configuration", "description": "To configure the default
cache action. If an action is set in the message header, then the operation
from the header takes precedence." },
- "cache": { "kind": "parameter", "displayName": "Cache", "group":
"producer", "label": "producer", "required": false, "type": "object",
"javaType": "com.github.benmanes.caffeine.cache.Cache", "deprecated": false,
"secret": false, "configurationClass":
"org.apache.camel.component.caffeine.CaffeineConfiguration",
"configurationField": "configuration", "description": "To configure an already
instantiated cache to be used" },
"cacheLoader": { "kind": "parameter", "displayName": "Cache Loader",
"group": "producer", "label": "producer", "required": false, "type": "object",
"javaType": "com.github.benmanes.caffeine.cache.CacheLoader", "deprecated":
false, "secret": false, "configurationClass":
"org.apache.camel.component.caffeine.CaffeineConfiguration",
"configurationField": "configuration", "description": "To configure a
CacheLoader in case of a LoadCache use" },
"createCacheIfNotExist": { "kind": "parameter", "displayName": "Create
Cache If Not Exist", "group": "producer", "label": "", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": "true", "configurationClass":
"org.apache.camel.component.caffeine.CaffeineConfiguration",
"configurationField": "configuration", "description": "Configure if a cache
need to be created if it does exist or can't be pre-configured." },
"evictionType": { "kind": "parameter", "displayName": "Eviction Type",
"group": "producer", "label": "producer", "required": false, "type": "object",
"javaType": "org.apache.camel.component.caffeine.EvictionType", "enum": [
"size_based", "time_based" ], "deprecated": false, "secret": false,
"defaultValue": "SIZE_BASED", "configurationClass":
"org.apache.camel.component.caffeine.CaffeineConfiguration",
"configurationField": "configuration", "description": "Set the eviction Type
for th [...]
diff --git
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/caffeine-loadcache.json
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/caffeine-loadcache.json
index 75a3d44..2651d27 100644
---
a/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/caffeine-loadcache.json
+++
b/catalog/camel-catalog-provider-springboot/src/main/resources/org/apache/camel/springboot/catalog/components/caffeine-loadcache.json
@@ -24,7 +24,6 @@
},
"componentProperties": {
"action": { "kind": "property", "displayName": "Action", "group":
"producer", "label": "producer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "secret": false,
"configurationClass":
"org.apache.camel.component.caffeine.CaffeineConfiguration",
"configurationField": "configuration", "description": "To configure the default
cache action. If an action is set in the message header, then the operation
from the header takes precedence." },
- "cache": { "kind": "property", "displayName": "Cache", "group":
"producer", "label": "producer", "required": false, "type": "object",
"javaType": "com.github.benmanes.caffeine.cache.Cache", "deprecated": false,
"secret": false, "configurationClass":
"org.apache.camel.component.caffeine.CaffeineConfiguration",
"configurationField": "configuration", "description": "To configure an already
instantiated cache to be used" },
"cacheLoader": { "kind": "property", "displayName": "Cache Loader",
"group": "producer", "label": "producer", "required": false, "type": "object",
"javaType": "com.github.benmanes.caffeine.cache.CacheLoader", "deprecated":
false, "secret": false, "configurationClass":
"org.apache.camel.component.caffeine.CaffeineConfiguration",
"configurationField": "configuration", "description": "To configure a
CacheLoader in case of a LoadCache use" },
"createCacheIfNotExist": { "kind": "property", "displayName": "Create
Cache If Not Exist", "group": "producer", "label": "", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": "true", "configurationClass":
"org.apache.camel.component.caffeine.CaffeineConfiguration",
"configurationField": "configuration", "description": "Configure if a cache
need to be created if it does exist or can't be pre-configured." },
"evictionType": { "kind": "property", "displayName": "Eviction Type",
"group": "producer", "label": "producer", "required": false, "type": "object",
"javaType": "org.apache.camel.component.caffeine.EvictionType", "enum": [
"size_based", "time_based" ], "deprecated": false, "secret": false,
"defaultValue": "SIZE_BASED", "configurationClass":
"org.apache.camel.component.caffeine.CaffeineConfiguration",
"configurationField": "configuration", "description": "Set the eviction Type
for thi [...]
@@ -45,7 +44,6 @@
"properties": {
"cacheName": { "kind": "path", "displayName": "Cache Name", "group":
"producer", "label": "", "required": true, "type": "string", "javaType":
"java.lang.String", "deprecated": false, "deprecationNote": "", "secret":
false, "description": "the cache name" },
"action": { "kind": "parameter", "displayName": "Action", "group":
"producer", "label": "producer", "required": false, "type": "string",
"javaType": "java.lang.String", "deprecated": false, "secret": false,
"configurationClass":
"org.apache.camel.component.caffeine.CaffeineConfiguration",
"configurationField": "configuration", "description": "To configure the default
cache action. If an action is set in the message header, then the operation
from the header takes precedence." },
- "cache": { "kind": "parameter", "displayName": "Cache", "group":
"producer", "label": "producer", "required": false, "type": "object",
"javaType": "com.github.benmanes.caffeine.cache.Cache", "deprecated": false,
"secret": false, "configurationClass":
"org.apache.camel.component.caffeine.CaffeineConfiguration",
"configurationField": "configuration", "description": "To configure an already
instantiated cache to be used" },
"cacheLoader": { "kind": "parameter", "displayName": "Cache Loader",
"group": "producer", "label": "producer", "required": false, "type": "object",
"javaType": "com.github.benmanes.caffeine.cache.CacheLoader", "deprecated":
false, "secret": false, "configurationClass":
"org.apache.camel.component.caffeine.CaffeineConfiguration",
"configurationField": "configuration", "description": "To configure a
CacheLoader in case of a LoadCache use" },
"createCacheIfNotExist": { "kind": "parameter", "displayName": "Create
Cache If Not Exist", "group": "producer", "label": "", "required": false,
"type": "boolean", "javaType": "boolean", "deprecated": false, "secret": false,
"defaultValue": "true", "configurationClass":
"org.apache.camel.component.caffeine.CaffeineConfiguration",
"configurationField": "configuration", "description": "Configure if a cache
need to be created if it does exist or can't be pre-configured." },
"evictionType": { "kind": "parameter", "displayName": "Eviction Type",
"group": "producer", "label": "producer", "required": false, "type": "object",
"javaType": "org.apache.camel.component.caffeine.EvictionType", "enum": [
"size_based", "time_based" ], "deprecated": false, "secret": false,
"defaultValue": "SIZE_BASED", "configurationClass":
"org.apache.camel.component.caffeine.CaffeineConfiguration",
"configurationField": "configuration", "description": "Set the eviction Type
for th [...]
diff --git
a/components-starter/camel-caffeine-starter/src/main/docs/caffeine-starter.adoc
b/components-starter/camel-caffeine-starter/src/main/docs/caffeine-starter.adoc
index 91e9739..dcb90df 100644
---
a/components-starter/camel-caffeine-starter/src/main/docs/caffeine-starter.adoc
+++
b/components-starter/camel-caffeine-starter/src/main/docs/caffeine-starter.adoc
@@ -17,7 +17,7 @@ When using caffeine with Spring Boot make sure to use the
following Maven depend
----
-The component supports 38 options, which are listed below.
+The component supports 36 options, which are listed below.
@@ -25,7 +25,6 @@ The component supports 38 options, which are listed below.
|===
| Name | Description | Default | Type
| *camel.component.caffeine-cache.action* | To configure the default cache
action. If an action is set in the message header, then the operation from the
header takes precedence. | | String
-| *camel.component.caffeine-cache.cache* | To configure an already
instantiated cache to be used. The option is a
com.github.benmanes.caffeine.cache.Cache type. | | String
| *camel.component.caffeine-cache.cache-loader* | To configure a CacheLoader
in case of a LoadCache use. The option is a
com.github.benmanes.caffeine.cache.CacheLoader type. | | String
| *camel.component.caffeine-cache.configuration* | Sets the global component
configuration. The option is a
org.apache.camel.component.caffeine.CaffeineConfiguration type. | | String
| *camel.component.caffeine-cache.create-cache-if-not-exist* | Configure if a
cache need to be created if it does exist or can't be pre-configured. | true |
Boolean
@@ -43,7 +42,6 @@ The component supports 38 options, which are listed below.
| *camel.component.caffeine-cache.stats-enabled* | To enable stats on the
cache | false | Boolean
| *camel.component.caffeine-cache.value-type* | The cache value type, default
java.lang.Object | | String
| *camel.component.caffeine-loadcache.action* | To configure the default cache
action. If an action is set in the message header, then the operation from the
header takes precedence. | | String
-| *camel.component.caffeine-loadcache.cache* | To configure an already
instantiated cache to be used. The option is a
com.github.benmanes.caffeine.cache.Cache type. | | String
| *camel.component.caffeine-loadcache.cache-loader* | To configure a
CacheLoader in case of a LoadCache use. The option is a
com.github.benmanes.caffeine.cache.CacheLoader type. | | String
| *camel.component.caffeine-loadcache.configuration* | Sets the global
component configuration. The option is a
org.apache.camel.component.caffeine.CaffeineConfiguration type. | | String
| *camel.component.caffeine-loadcache.create-cache-if-not-exist* | Configure
if a cache need to be created if it does exist or can't be pre-configured. |
true | Boolean
diff --git
a/components-starter/camel-caffeine-starter/src/main/java/org/apache/camel/component/caffeine/cache/springboot/CaffeineCacheComponentConfiguration.java
b/components-starter/camel-caffeine-starter/src/main/java/org/apache/camel/component/caffeine/cache/springboot/CaffeineCacheComponentConfiguration.java
index 4f4646a..e2bb011 100644
---
a/components-starter/camel-caffeine-starter/src/main/java/org/apache/camel/component/caffeine/cache/springboot/CaffeineCacheComponentConfiguration.java
+++
b/components-starter/camel-caffeine-starter/src/main/java/org/apache/camel/component/caffeine/cache/springboot/CaffeineCacheComponentConfiguration.java
@@ -45,11 +45,6 @@ public class CaffeineCacheComponentConfiguration
*/
private String action;
/**
- * To configure an already instantiated cache to be used. The option is a
- * com.github.benmanes.caffeine.cache.Cache type.
- */
- private String cache;
- /**
* To configure a CacheLoader in case of a LoadCache use. The option is a
* com.github.benmanes.caffeine.cache.CacheLoader type.
*/
@@ -140,14 +135,6 @@ public class CaffeineCacheComponentConfiguration
this.action = action;
}
- public String getCache() {
- return cache;
- }
-
- public void setCache(String cache) {
- this.cache = cache;
- }
-
public String getCacheLoader() {
return cacheLoader;
}
diff --git
a/components-starter/camel-caffeine-starter/src/main/java/org/apache/camel/component/caffeine/load/springboot/CaffeineLoadCacheComponentConfiguration.java
b/components-starter/camel-caffeine-starter/src/main/java/org/apache/camel/component/caffeine/load/springboot/CaffeineLoadCacheComponentConfiguration.java
index 7ba2f62..a57409c 100644
---
a/components-starter/camel-caffeine-starter/src/main/java/org/apache/camel/component/caffeine/load/springboot/CaffeineLoadCacheComponentConfiguration.java
+++
b/components-starter/camel-caffeine-starter/src/main/java/org/apache/camel/component/caffeine/load/springboot/CaffeineLoadCacheComponentConfiguration.java
@@ -45,11 +45,6 @@ public class CaffeineLoadCacheComponentConfiguration
*/
private String action;
/**
- * To configure an already instantiated cache to be used. The option is a
- * com.github.benmanes.caffeine.cache.Cache type.
- */
- private String cache;
- /**
* To configure a CacheLoader in case of a LoadCache use. The option is a
* com.github.benmanes.caffeine.cache.CacheLoader type.
*/
@@ -140,14 +135,6 @@ public class CaffeineLoadCacheComponentConfiguration
this.action = action;
}
- public String getCache() {
- return cache;
- }
-
- public void setCache(String cache) {
- this.cache = cache;
- }
-
public String getCacheLoader() {
return cacheLoader;
}
diff --git a/docs/modules/ROOT/pages/caffeine-starter.adoc
b/docs/modules/ROOT/pages/caffeine-starter.adoc
index 91e9739..dcb90df 100644
--- a/docs/modules/ROOT/pages/caffeine-starter.adoc
+++ b/docs/modules/ROOT/pages/caffeine-starter.adoc
@@ -17,7 +17,7 @@ When using caffeine with Spring Boot make sure to use the
following Maven depend
----
-The component supports 38 options, which are listed below.
+The component supports 36 options, which are listed below.
@@ -25,7 +25,6 @@ The component supports 38 options, which are listed below.
|===
| Name | Description | Default | Type
| *camel.component.caffeine-cache.action* | To configure the default cache
action. If an action is set in the message header, then the operation from the
header takes precedence. | | String
-| *camel.component.caffeine-cache.cache* | To configure an already
instantiated cache to be used. The option is a
com.github.benmanes.caffeine.cache.Cache type. | | String
| *camel.component.caffeine-cache.cache-loader* | To configure a CacheLoader
in case of a LoadCache use. The option is a
com.github.benmanes.caffeine.cache.CacheLoader type. | | String
| *camel.component.caffeine-cache.configuration* | Sets the global component
configuration. The option is a
org.apache.camel.component.caffeine.CaffeineConfiguration type. | | String
| *camel.component.caffeine-cache.create-cache-if-not-exist* | Configure if a
cache need to be created if it does exist or can't be pre-configured. | true |
Boolean
@@ -43,7 +42,6 @@ The component supports 38 options, which are listed below.
| *camel.component.caffeine-cache.stats-enabled* | To enable stats on the
cache | false | Boolean
| *camel.component.caffeine-cache.value-type* | The cache value type, default
java.lang.Object | | String
| *camel.component.caffeine-loadcache.action* | To configure the default cache
action. If an action is set in the message header, then the operation from the
header takes precedence. | | String
-| *camel.component.caffeine-loadcache.cache* | To configure an already
instantiated cache to be used. The option is a
com.github.benmanes.caffeine.cache.Cache type. | | String
| *camel.component.caffeine-loadcache.cache-loader* | To configure a
CacheLoader in case of a LoadCache use. The option is a
com.github.benmanes.caffeine.cache.CacheLoader type. | | String
| *camel.component.caffeine-loadcache.configuration* | Sets the global
component configuration. The option is a
org.apache.camel.component.caffeine.CaffeineConfiguration type. | | String
| *camel.component.caffeine-loadcache.create-cache-if-not-exist* | Configure
if a cache need to be created if it does exist or can't be pre-configured. |
true | Boolean
diff --git a/tooling/camel-spring-boot-dependencies/pom.xml
b/tooling/camel-spring-boot-dependencies/pom.xml
index 57c56e8..ae23295 100644
--- a/tooling/camel-spring-boot-dependencies/pom.xml
+++ b/tooling/camel-spring-boot-dependencies/pom.xml
@@ -129,7 +129,7 @@
<dependency>
<groupId>com.thoughtworks.xstream</groupId>
<artifactId>xstream</artifactId>
- <version>1.4.11.1</version>
+ <version>1.4.13</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
@@ -4190,7 +4190,7 @@
<dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-spring</artifactId>
- <version>4.14</version>
+ <version>4.17</version>
</dependency>
<dependency>
<groupId>org.apache.zookeeper</groupId>
