Repository: camel Updated Branches: refs/heads/master 54061ed11 -> 6cb8276b6
In camel-jcache filteredEvents and eventsFilter are exclusive. Added the URIParam annotation to JCacheConfiguration. Project: http://git-wip-us.apache.org/repos/asf/camel/repo Commit: http://git-wip-us.apache.org/repos/asf/camel/commit/6cb8276b Tree: http://git-wip-us.apache.org/repos/asf/camel/tree/6cb8276b Diff: http://git-wip-us.apache.org/repos/asf/camel/diff/6cb8276b Branch: refs/heads/master Commit: 6cb8276b6278148130a29ade32b0afa5bc61876b Parents: 54061ed Author: Andrea Cosentino <anco...@gmail.com> Authored: Mon Aug 8 08:45:25 2016 +0200 Committer: Andrea Cosentino <anco...@gmail.com> Committed: Mon Aug 8 08:46:50 2016 +0200 ---------------------------------------------------------------------- .../camel-jcache/src/main/docs/jcache.adoc | 23 ++++++++++++++++++-- .../component/jcache/JCacheConfiguration.java | 4 ++-- .../camel/component/jcache/JCacheEndpoint.java | 3 +++ 3 files changed, 26 insertions(+), 4 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/camel/blob/6cb8276b/components/camel-jcache/src/main/docs/jcache.adoc ---------------------------------------------------------------------- diff --git a/components/camel-jcache/src/main/docs/jcache.adoc b/components/camel-jcache/src/main/docs/jcache.adoc index d95f04f..cc1cdfe 100644 --- a/components/camel-jcache/src/main/docs/jcache.adoc +++ b/components/camel-jcache/src/main/docs/jcache.adoc @@ -4,18 +4,36 @@ JCache + // endpoint options: START -The JCache component supports 5 endpoint options which are listed below: +The JCache component supports 22 endpoint options which are listed below: {% raw %} [width="100%",cols="2s,1,1m,1m,5",options="header"] |======================================================================= | Name | Group | Default | Java Type | Description | cacheName | common | | String | *Required* the cache name +| managementEnabled | common | false | boolean | Whether management gathering is enabled +| readThrough | common | false | boolean | If read-through caching should be used +| statisticsEnabled | common | false | boolean | Whether statistics gathering is enabled +| storeByValue | common | true | boolean | If cache should use store-by-value or store-by-reference semantics +| writeThrough | common | false | boolean | If write-through caching should be used | bridgeErrorHandler | consumer | false | boolean | Allows for bridging the consumer to the Camel routing Error Handler which mean any exceptions occurred while the consumer is trying to pickup incoming messages or the likes will now be processed as a message and handled by the routing Error Handler. By default the consumer will use the org.apache.camel.spi.ExceptionHandler to deal with exceptions that will be logged at WARN/ERROR level and ignored. +| filteredEvents | consumer | | List | Events a consumer should filter. If using filteredEvents option then eventFilters one will be ignored +| oldValueRequired | consumer | false | boolean | if the old value is required for events +| synchronous | consumer | false | boolean | if the the event listener should block the thread causing the event +| eventFilters | consumer (advanced) | | List | The CacheEntryEventFilter. If using eventFilters option then filteredEvents one will be ignored | exceptionHandler | consumer (advanced) | | ExceptionHandler | To let the consumer use a custom ExceptionHandler. Notice if the option bridgeErrorHandler is enabled then this options is not in use. By default the consumer will deal with exceptions that will be logged at WARN/ERROR level and ignored. +| action | producer | | String | To configure using a cache operation by default. If an operation in the message header then the operation from the header takes precedence. +| cacheConfiguration | advanced | | Configuration | A Configuration for the Cache +| cacheConfigurationProperties | advanced | | Properties | The Properties for the javax.cache.spi.CachingProvider to create the CacheManager +| cacheLoaderFactory | advanced | | CacheLoader> | The CacheLoader factory +| cacheWriterFactory | advanced | | CacheWriter> | The CacheWriter factory +| cachingProvider | advanced | | String | *Required* The fully qualified class name of the javax.cache.spi.CachingProvider +| configurationUri | advanced | | String | An implementation specific URI for the CacheManager +| createCacheIfNotExists | advanced | true | boolean | Configure if a cache need to be created if it does exist or can't be pre-configured. | exchangePattern | advanced | InOnly | ExchangePattern | Sets the default exchange pattern when creating an exchange -| synchronous | advanced | false | boolean | Sets whether synchronous processing should be strictly used or Camel is allowed to use asynchronous processing (if supported). +| expiryPolicyFactory | advanced | | ExpiryPolicy> | The ExpiryPolicy factory |======================================================================= {% endraw %} // endpoint options: END @@ -24,6 +42,7 @@ The JCache component supports 5 endpoint options which are listed below: + // component options: START The JCache component has no options. // component options: END http://git-wip-us.apache.org/repos/asf/camel/blob/6cb8276b/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/JCacheConfiguration.java ---------------------------------------------------------------------- diff --git a/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/JCacheConfiguration.java b/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/JCacheConfiguration.java index eadbf54..ceda31a 100644 --- a/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/JCacheConfiguration.java +++ b/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/JCacheConfiguration.java @@ -237,7 +237,7 @@ public class JCacheConfiguration { } /** - * Events a consumer should filter + * Events a consumer should filter. If using filteredEvents option, then eventFilters one will be ignored */ public List<EventType> getFilteredEvents() { return filteredEvents; @@ -256,7 +256,7 @@ public class JCacheConfiguration { } /** - * The CacheEntryEventFilter + * The CacheEntryEventFilter. If using eventFilters option, then filteredEvents one will be ignored */ public List<CacheEntryEventFilter> getEventFilters() { return eventFilters; http://git-wip-us.apache.org/repos/asf/camel/blob/6cb8276b/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/JCacheEndpoint.java ---------------------------------------------------------------------- diff --git a/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/JCacheEndpoint.java b/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/JCacheEndpoint.java index ab052fd..ffa8c2d 100644 --- a/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/JCacheEndpoint.java +++ b/components/camel-jcache/src/main/java/org/apache/camel/component/jcache/JCacheEndpoint.java @@ -22,6 +22,7 @@ import org.apache.camel.Producer; import org.apache.camel.impl.DefaultEndpoint; import org.apache.camel.spi.Metadata; import org.apache.camel.spi.UriEndpoint; +import org.apache.camel.spi.UriParam; import org.apache.camel.spi.UriPath; /** @@ -32,6 +33,8 @@ public class JCacheEndpoint extends DefaultEndpoint { @UriPath(description = "the cache name") @Metadata(required = "true") private final String cacheName; + + @UriParam private final JCacheConfiguration cacheConfiguration; private final JCacheManager<Object, Object> cacheManager;
