You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ac...@apache.org on 2017/06/22 10:47:03 UTC
[3/3] camel git commit: CAMEL-11435 - Fix defaultValue for
EvictionType to make it work with camel-caffeine-starter
CAMEL-11435 - Fix defaultValue for EvictionType to make it work with camel-caffeine-starter
Project: http://git-wip-us.apache.org/repos/asf/camel/repo
Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/7f8456a1
Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/7f8456a1
Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/7f8456a1
Branch: refs/heads/master
Commit: 7f8456a18fc071cbe37530dcde6174806001eedd
Parents: 7e7897a
Author: Andrea Cosentino <an...@gmail.com>
Authored: Thu Jun 22 11:46:18 2017 +0200
Committer: Andrea Cosentino <an...@gmail.com>
Committed: Thu Jun 22 12:28:04 2017 +0200
----------------------------------------------------------------------
.../camel-caffeine/src/main/docs/caffeine-cache-component.adoc | 2 +-
.../src/main/docs/caffeine-loadcache-component.adoc | 2 +-
.../apache/camel/component/caffeine/CaffeineConfiguration.java | 2 +-
components/readme.adoc | 4 ++--
.../cache/springboot/CaffeineCacheComponentConfiguration.java | 4 ++--
.../springboot/CaffeineLoadCacheComponentConfiguration.java | 5 +++--
6 files changed, 10 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/camel/blob/7f8456a1/components/camel-caffeine/src/main/docs/caffeine-cache-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-caffeine/src/main/docs/caffeine-cache-component.adoc b/components/camel-caffeine/src/main/docs/caffeine-cache-component.adoc
index de0dfdd..9119b3f 100644
--- a/components/camel-caffeine/src/main/docs/caffeine-cache-component.adoc
+++ b/components/camel-caffeine/src/main/docs/caffeine-cache-component.adoc
@@ -73,7 +73,7 @@ with the following path and query parameters:
| **action** (producer) | To configure the default cache action. If an action is set in the message header then the operation from the header takes precedence. | | String
| **cache** (producer) | To configure the default an already instantianted cache to be used | | Cache
| **cacheLoader** (producer) | To configure a CacheLoader in case of a LoadCache use | | CacheLoader
-| **evictionType** (producer) | Set the eviction Type for this cache | size_based | EvictionType
+| **evictionType** (producer) | Set the eviction Type for this cache | SIZE_BASED | EvictionType
| **expireAfterAccessTime** (producer) | Set the expire After Access Time in case of time based Eviction (in seconds) | 300 | int
| **expireAfterWriteTime** (producer) | Set the expire After Access Write in case of time based Eviction (in seconds) | 300 | int
| **initialCapacity** (producer) | Set the initial Capacity for the cache | 10000 | int
http://git-wip-us.apache.org/repos/asf/camel/blob/7f8456a1/components/camel-caffeine/src/main/docs/caffeine-loadcache-component.adoc
----------------------------------------------------------------------
diff --git a/components/camel-caffeine/src/main/docs/caffeine-loadcache-component.adoc b/components/camel-caffeine/src/main/docs/caffeine-loadcache-component.adoc
index a13c1ea..5abef6e 100644
--- a/components/camel-caffeine/src/main/docs/caffeine-loadcache-component.adoc
+++ b/components/camel-caffeine/src/main/docs/caffeine-loadcache-component.adoc
@@ -73,7 +73,7 @@ with the following path and query parameters:
| **action** (producer) | To configure the default cache action. If an action is set in the message header then the operation from the header takes precedence. | | String
| **cache** (producer) | To configure the default an already instantianted cache to be used | | Cache
| **cacheLoader** (producer) | To configure a CacheLoader in case of a LoadCache use | | CacheLoader
-| **evictionType** (producer) | Set the eviction Type for this cache | size_based | EvictionType
+| **evictionType** (producer) | Set the eviction Type for this cache | SIZE_BASED | EvictionType
| **expireAfterAccessTime** (producer) | Set the expire After Access Time in case of time based Eviction (in seconds) | 300 | int
| **expireAfterWriteTime** (producer) | Set the expire After Access Write in case of time based Eviction (in seconds) | 300 | int
| **initialCapacity** (producer) | Set the initial Capacity for the cache | 10000 | int
http://git-wip-us.apache.org/repos/asf/camel/blob/7f8456a1/components/camel-caffeine/src/main/java/org/apache/camel/component/caffeine/CaffeineConfiguration.java
----------------------------------------------------------------------
diff --git a/components/camel-caffeine/src/main/java/org/apache/camel/component/caffeine/CaffeineConfiguration.java b/components/camel-caffeine/src/main/java/org/apache/camel/component/caffeine/CaffeineConfiguration.java
index 2820491..fdf6d84 100644
--- a/components/camel-caffeine/src/main/java/org/apache/camel/component/caffeine/CaffeineConfiguration.java
+++ b/components/camel-caffeine/src/main/java/org/apache/camel/component/caffeine/CaffeineConfiguration.java
@@ -46,7 +46,7 @@ public class CaffeineConfiguration implements Cloneable {
private int initialCapacity = 10000;
@UriParam(label = "producer", defaultValue = "10000")
private int maximumSize = 10000;
- @UriParam(label = "producer", defaultValue = "size_based")
+ @UriParam(label = "producer", defaultValue = "SIZE_BASED")
private EvictionType evictionType = EvictionType.SIZE_BASED;
@UriParam(label = "producer", defaultValue = "300")
private int expireAfterAccessTime = 300;
http://git-wip-us.apache.org/repos/asf/camel/blob/7f8456a1/components/readme.adoc
----------------------------------------------------------------------
diff --git a/components/readme.adoc b/components/readme.adoc
index 4acb59e..6e739af 100644
--- a/components/readme.adoc
+++ b/components/readme.adoc
@@ -126,10 +126,10 @@ Number of Components: 274 in 188 JAR artifacts (17 deprecated)
`browse:name` | 1.3 | The browse component is used for viewing the messages received on endpoints that supports BrowsableEndpoint.
| link:camel-caffeine/src/main/docs/caffeine-cache-component.adoc[Caffeine Cache] (camel-caffeine) +
-`caffeine-cache:cacheName` | 2.20 | Camel Caffeine support
+`caffeine-cache:cacheName` | 2.20 | The caffeine-cache component is used for integration with Caffeine Cache.
| link:camel-caffeine/src/main/docs/caffeine-loadcache-component.adoc[Caffeine LoadCache] (camel-caffeine) +
-`caffeine-loadcache:cacheName` | 2.20 | Camel Caffeine support
+`caffeine-loadcache:cacheName` | 2.20 | The caffeine-loadcache component is used for integration with Caffeine Load Cache.
| link:camel-context/src/main/docs/context-component.adoc[Camel Context] (camel-context) +
`context:contextId:localEndpointUrl` | 2.7 | *deprecated* The context component allows to send/receive messages between Camel routes in a black box way.
http://git-wip-us.apache.org/repos/asf/camel/blob/7f8456a1/platforms/spring-boot/components-starter/camel-caffeine-starter/src/main/java/org/apache/camel/component/caffeine/cache/springboot/CaffeineCacheComponentConfiguration.java
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/components-starter/camel-caffeine-starter/src/main/java/org/apache/camel/component/caffeine/cache/springboot/CaffeineCacheComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-caffeine-starter/src/main/java/org/apache/camel/component/caffeine/cache/springboot/CaffeineCacheComponentConfiguration.java
index f4b73de..155551c 100644
--- a/platforms/spring-boot/components-starter/camel-caffeine-starter/src/main/java/org/apache/camel/component/caffeine/cache/springboot/CaffeineCacheComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-caffeine-starter/src/main/java/org/apache/camel/component/caffeine/cache/springboot/CaffeineCacheComponentConfiguration.java
@@ -25,7 +25,7 @@ import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
import org.springframework.boot.context.properties.ConfigurationProperties;
/**
- * Camel Caffeine support
+ * The caffeine-cache component is used for integration with Caffeine Cache.
*
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@@ -112,7 +112,7 @@ public class CaffeineCacheComponentConfiguration
/**
* Set the eviction Type for this cache
*/
- private EvictionType evictionType = EvictionType.size_based;
+ private EvictionType evictionType = EvictionType.SIZE_BASED;
/**
* Set the expire After Access Time in case of time based Eviction (in
* seconds)
http://git-wip-us.apache.org/repos/asf/camel/blob/7f8456a1/platforms/spring-boot/components-starter/camel-caffeine-starter/src/main/java/org/apache/camel/component/caffeine/load/springboot/CaffeineLoadCacheComponentConfiguration.java
----------------------------------------------------------------------
diff --git a/platforms/spring-boot/components-starter/camel-caffeine-starter/src/main/java/org/apache/camel/component/caffeine/load/springboot/CaffeineLoadCacheComponentConfiguration.java b/platforms/spring-boot/components-starter/camel-caffeine-starter/src/main/java/org/apache/camel/component/caffeine/load/springboot/CaffeineLoadCacheComponentConfiguration.java
index e024b9b..9d39e35 100644
--- a/platforms/spring-boot/components-starter/camel-caffeine-starter/src/main/java/org/apache/camel/component/caffeine/load/springboot/CaffeineLoadCacheComponentConfiguration.java
+++ b/platforms/spring-boot/components-starter/camel-caffeine-starter/src/main/java/org/apache/camel/component/caffeine/load/springboot/CaffeineLoadCacheComponentConfiguration.java
@@ -25,7 +25,8 @@ import org.apache.camel.spring.boot.ComponentConfigurationPropertiesCommon;
import org.springframework.boot.context.properties.ConfigurationProperties;
/**
- * Camel Caffeine support
+ * The caffeine-loadcache component is used for integration with Caffeine Load
+ * Cache.
*
* Generated by camel-package-maven-plugin - do not edit this file!
*/
@@ -112,7 +113,7 @@ public class CaffeineLoadCacheComponentConfiguration
/**
* Set the eviction Type for this cache
*/
- private EvictionType evictionType = EvictionType.size_based;
+ private EvictionType evictionType = EvictionType.SIZE_BASED;
/**
* Set the expire After Access Time in case of time based Eviction (in
* seconds)