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 2019/07/26 14:54:35 UTC
[camel] 01/02: Camel-Jcache: Fixed CS
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.git
commit cc48bdcb72c81809dda99f41315609f9e049e088
Author: Andrea Cosentino <an...@gmail.com>
AuthorDate: Fri Jul 26 16:53:22 2019 +0200
Camel-Jcache: Fixed CS
---
.../component/jcache/JCacheConfigurationTest.java | 27 +++++++----------
.../camel/component/jcache/JCacheConsumerTest.java | 26 +++++++---------
.../policy/CacheManagerFromRegistryTest.java | 35 ++++++++++------------
3 files changed, 37 insertions(+), 51 deletions(-)
diff --git a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheConfigurationTest.java b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheConfigurationTest.java
index de16a9a..d90b70e 100644
--- a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheConfigurationTest.java
+++ b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheConfigurationTest.java
@@ -31,6 +31,7 @@ import javax.cache.integration.CacheLoaderException;
import javax.cache.integration.CacheWriter;
import javax.cache.integration.CacheWriterException;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
@@ -38,31 +39,21 @@ import org.apache.camel.impl.JndiRegistry;
import org.junit.Test;
public class JCacheConfigurationTest extends JCacheComponentTestSupport {
+
+ @BindToRegistry("myExpiryPolicyFactory")
private static final Factory<ExpiryPolicy> EXPIRY_POLICY_FACTORY = AccessedExpiryPolicy.factoryOf(Duration.ONE_MINUTE);
+ @BindToRegistry("myCacheWriterFactory")
private static final Factory<CacheWriter<Object, Object>> CACHE_WRITER_FACTORY = MyCacheWriter.factory();
+ @BindToRegistry("myCacheLoaderFactory")
private static final Factory<CacheLoader<Object, Object>> CACHE_LOADER_FACTORY = MyCacheLoader.factory();
- @EndpointInject(
- value = "jcache://test-cache"
- + "?expiryPolicyFactory=#myExpiryPolicyFactory"
- + "&cacheWriterFactory=#myCacheWriterFactory"
- + "&cacheLoaderFactory=#myCacheLoaderFactory"
- )
+ @EndpointInject(value = "jcache://test-cache" + "?expiryPolicyFactory=#myExpiryPolicyFactory" + "&cacheWriterFactory=#myCacheWriterFactory"
+ + "&cacheLoaderFactory=#myCacheLoaderFactory")
JCacheEndpoint from;
@EndpointInject("mock:to")
MockEndpoint to;
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry registry = super.createRegistry();
- registry.bind("myExpiryPolicyFactory", EXPIRY_POLICY_FACTORY);
- registry.bind("myCacheWriterFactory", CACHE_WRITER_FACTORY);
- registry.bind("myCacheLoaderFactory", CACHE_LOADER_FACTORY);
-
- return registry;
- }
-
@Test
public void testConfigurations() throws Exception {
final Cache<Object, Object> cache = from.getManager().getCache();
@@ -87,6 +78,7 @@ public class JCacheConfigurationTest extends JCacheComponentTestSupport {
public Object load(Object key) throws CacheLoaderException {
return null;
}
+
@Override
public Map<Object, Object> loadAll(Iterable<?> keys) throws CacheLoaderException {
return null;
@@ -101,12 +93,15 @@ public class JCacheConfigurationTest extends JCacheComponentTestSupport {
@Override
public void write(Cache.Entry<?, ?> entry) throws CacheWriterException {
}
+
@Override
public void writeAll(Collection<Cache.Entry<?, ?>> entries) throws CacheWriterException {
}
+
@Override
public void delete(Object key) throws CacheWriterException {
}
+
@Override
public void deleteAll(Collection<?> keys) throws CacheWriterException {
}
diff --git a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheConsumerTest.java b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheConsumerTest.java
index 2ea8975..5f3493d 100644
--- a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheConsumerTest.java
+++ b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/JCacheConsumerTest.java
@@ -22,6 +22,7 @@ import javax.cache.event.CacheEntryEventFilter;
import javax.cache.event.CacheEntryListenerException;
import javax.cache.event.EventType;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.Exchange;
import org.apache.camel.Predicate;
import org.apache.camel.builder.RouteBuilder;
@@ -31,10 +32,9 @@ import org.junit.Test;
public class JCacheConsumerTest extends JCacheComponentTestSupport {
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry registry = super.createRegistry();
- registry.bind("myFilter", new CacheEntryEventFilter<Object, Object>() {
+ @BindToRegistry("myFilter")
+ public CacheEntryEventFilter addCacheEntryEventFilter() throws Exception {
+ return new CacheEntryEventFilter<Object, Object>() {
@Override
public boolean evaluate(CacheEntryEvent<?, ?> event) throws CacheEntryListenerException {
if (event.getEventType() == EventType.REMOVED) {
@@ -43,16 +43,14 @@ public class JCacheConsumerTest extends JCacheComponentTestSupport {
return !event.getValue().toString().startsWith("to-filter-");
}
- });
-
- return registry;
+ };
}
@Test
public void testFilters() throws Exception {
final Cache<Object, Object> cache = getCacheFromEndpoint("jcache://test-cache");
- final String key = randomString();
+ final String key = randomString();
final String val1 = "to-filter-" + randomString();
final String val2 = randomString();
@@ -107,14 +105,10 @@ public class JCacheConsumerTest extends JCacheComponentTestSupport {
protected RouteBuilder createRouteBuilder() throws Exception {
return new RouteBuilder() {
public void configure() {
- from("jcache://test-cache?filteredEvents=UPDATED,REMOVED,EXPIRED")
- .to("mock:created");
- from("jcache://test-cache?filteredEvents=CREATED,REMOVED,EXPIRED")
- .to("mock:updated");
- from("jcache://test-cache?filteredEvents=CREATED,UPDATED,EXPIRED")
- .to("mock:removed");
- from("jcache://test-cache?eventFilters=#myFilter")
- .to("mock:my-filter");
+ from("jcache://test-cache?filteredEvents=UPDATED,REMOVED,EXPIRED").to("mock:created");
+ from("jcache://test-cache?filteredEvents=CREATED,REMOVED,EXPIRED").to("mock:updated");
+ from("jcache://test-cache?filteredEvents=CREATED,UPDATED,EXPIRED").to("mock:removed");
+ from("jcache://test-cache?eventFilters=#myFilter").to("mock:my-filter");
}
};
}
diff --git a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/policy/CacheManagerFromRegistryTest.java b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/policy/CacheManagerFromRegistryTest.java
index e5942d7..4c9da41 100644
--- a/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/policy/CacheManagerFromRegistryTest.java
+++ b/components/camel-jcache/src/test/java/org/apache/camel/component/jcache/policy/CacheManagerFromRegistryTest.java
@@ -22,6 +22,8 @@ import javax.cache.CacheManager;
import javax.cache.Caching;
import com.hazelcast.instance.HazelcastInstanceFactory;
+
+import org.apache.camel.BindToRegistry;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.JndiRegistry;
import org.junit.After;
@@ -30,15 +32,19 @@ import org.junit.Test;
//This test requires a registered CacheManager, but the others do not.
public class CacheManagerFromRegistryTest extends JCachePolicyTestBase {
- //Register cacheManager in CamelContext. Set cacheName
+ @BindToRegistry("cachemanager-hzsecond")
+ private CacheManager cc = Caching.getCachingProvider().getCacheManager(URI.create("hzsecond"), null);
+
+ // Register cacheManager in CamelContext. Set cacheName
@Test
public void testCacheManagerFromContext() throws Exception {
final String key = randomString();
- //Send exchange
+ // Send exchange
Object responseBody = this.template().requestBody("direct:policy-context-manager", key);
- //Verify the cacheManager "hzsecond" registered in the CamelContext was used
+ // Verify the cacheManager "hzsecond" registered in the CamelContext was
+ // used
assertNull(lookupCache("contextCacheManager"));
CacheManager cacheManager = Caching.getCachingProvider().getCacheManager(URI.create("hzsecond"), null);
Cache cache = cacheManager.getCache("contextCacheManager");
@@ -54,28 +60,18 @@ public class CacheManagerFromRegistryTest extends JCachePolicyTestBase {
@Override
public void configure() throws Exception {
- //Use the cacheManager registered in CamelContext. See createRegistry(). Set cacheName
- //During the test JndiRegistry is used, so we add the cacheManager to JNDI. In Spring context a bean works.
+ // Use the cacheManager registered in CamelContext. See
+ // createRegistry(). Set cacheName
+ // During the test JndiRegistry is used, so we add the
+ // cacheManager to JNDI. In Spring context a bean works.
JCachePolicy jcachePolicy = new JCachePolicy();
jcachePolicy.setCacheName("contextCacheManager");
- from("direct:policy-context-manager")
- .policy(jcachePolicy)
- .to("mock:value");
+ from("direct:policy-context-manager").policy(jcachePolicy).to("mock:value");
}
};
}
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry registry = super.createRegistry();
-
- //Register another CacheManager in registry
- registry.bind("cachemanager-hzsecond", Caching.getCachingProvider().getCacheManager(URI.create("hzsecond"), null));
-
- return registry;
- }
-
@After
public void after() {
super.after();
@@ -83,7 +79,8 @@ public class CacheManagerFromRegistryTest extends JCachePolicyTestBase {
cacheManager.getCacheNames().forEach((s) -> cacheManager.destroyCache(s));
Caching.getCachingProvider().close(URI.create("hzsecond"), null);
- //We need to shutdown the second instance using the Hazelcast api. close(URI,ClassLoader) doesn't do that.
+ // We need to shutdown the second instance using the Hazelcast api.
+ // close(URI,ClassLoader) doesn't do that.
HazelcastInstanceFactory.getHazelcastInstance("hzsecond").shutdown();
}