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 f38838f3892f57db11d642659d900c866b81aa91
Author: Andrea Cosentino <anco...@gmail.com>
AuthorDate: Tue Jul 23 10:55:42 2019 +0200
Camel-Ehcache: Use BindToRegistry annotation where possible
---
.../ehcache/EhcacheCacheConfigurationTest.java | 52 +++++++++-------------
.../ehcache/EhcacheComponentConfigurationTest.java | 11 +++--
.../ehcache/EhcacheConfigurationTest.java | 11 +++--
.../component/ehcache/EhcacheTestSupport.java | 10 +----
4 files changed, 34 insertions(+), 50 deletions(-)
diff --git
a/components/camel-ehcache/src/test/java/org/apache/camel/component/ehcache/EhcacheCacheConfigurationTest.java
b/components/camel-ehcache/src/test/java/org/apache/camel/component/ehcache/EhcacheCacheConfigurationTest.java
index aeec177..50b2616 100644
---
a/components/camel-ehcache/src/test/java/org/apache/camel/component/ehcache/EhcacheCacheConfigurationTest.java
+++
b/components/camel-ehcache/src/test/java/org/apache/camel/component/ehcache/EhcacheCacheConfigurationTest.java
@@ -16,6 +16,7 @@
*/
package org.apache.camel.component.ehcache;
+import org.apache.camel.BindToRegistry;
import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.JndiRegistry;
@@ -23,6 +24,7 @@ import org.apache.camel.test.junit4.CamelTestSupport;
import org.ehcache.Cache;
import org.ehcache.CacheManager;
import org.ehcache.UserManagedCache;
+import org.ehcache.config.CacheConfiguration;
import org.ehcache.config.ResourcePools;
import org.ehcache.config.ResourceType;
import org.ehcache.config.SizedResourcePool;
@@ -42,36 +44,26 @@ public class EhcacheCacheConfigurationTest extends
CamelTestSupport {
private EhcacheEndpoint ehcacheUserConf;
@EndpointInject("ehcache:myCache?cacheManager=#myCacheManager&keyType=java.lang.String&valueType=java.lang.String")
private EhcacheEndpoint ehcacheCacheManager;
-
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry registry = super.createRegistry();
- registry.bind(
- "myProgrammaticConfiguration",
- CacheConfigurationBuilder.newCacheConfigurationBuilder(
- String.class,
- String.class,
- ResourcePoolsBuilder.newResourcePoolsBuilder()
- .heap(100, EntryUnit.ENTRIES)
- .offheap(1, MemoryUnit.MB))
- .build()
- );
- registry.bind(
- "myCacheManager",
- CacheManagerBuilder.newCacheManagerBuilder()
- .withCache(
- "myCache",
- CacheConfigurationBuilder.newCacheConfigurationBuilder(
- String.class,
- String.class,
- ResourcePoolsBuilder.newResourcePoolsBuilder()
- .heap(100, EntryUnit.ENTRIES)
- .offheap(1, MemoryUnit.MB))
- ).build(true)
- );
-
- return registry;
- }
+
+ @BindToRegistry("myProgrammaticConfiguration")
+ private CacheConfiguration c =
CacheConfigurationBuilder.newCacheConfigurationBuilder(
+ String.class,
+ String.class,
+ ResourcePoolsBuilder.newResourcePoolsBuilder()
+ .heap(100, EntryUnit.ENTRIES)
+ .offheap(1, MemoryUnit.MB))
+ .build();
+
+ @BindToRegistry("myCacheManager")
+ private CacheManager el = CacheManagerBuilder.newCacheManagerBuilder()
+ .withCache(
+ "myCache",
+ CacheConfigurationBuilder.newCacheConfigurationBuilder(
+ String.class,
+ String.class,
+ ResourcePoolsBuilder.newResourcePoolsBuilder()
+ .heap(100, EntryUnit.ENTRIES)
+ .offheap(1, MemoryUnit.MB))).build(true);
// *****************************
// Test
diff --git
a/components/camel-ehcache/src/test/java/org/apache/camel/component/ehcache/EhcacheComponentConfigurationTest.java
b/components/camel-ehcache/src/test/java/org/apache/camel/component/ehcache/EhcacheComponentConfigurationTest.java
index 1b1fa81..e1814d2 100644
---
a/components/camel-ehcache/src/test/java/org/apache/camel/component/ehcache/EhcacheComponentConfigurationTest.java
+++
b/components/camel-ehcache/src/test/java/org/apache/camel/component/ehcache/EhcacheComponentConfigurationTest.java
@@ -16,6 +16,8 @@
*/
package org.apache.camel.component.ehcache;
+import org.apache.camel.BindToRegistry;
+import org.apache.camel.Component;
import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.JndiRegistry;
@@ -35,8 +37,8 @@ public class EhcacheComponentConfigurationTest extends
CamelTestSupport {
@EndpointInject("ehcache:myCache")
private EhcacheEndpoint endpoint;
- @Override
- protected JndiRegistry createRegistry() throws Exception {
+ @BindToRegistry("ehcache")
+ public Component createEhcacheComponent() throws Exception {
EhcacheComponent component = new EhcacheComponent();
component.getConfiguration().setKeyType(String.class);
component.getConfiguration().setValueType(String.class);
@@ -53,10 +55,7 @@ public class EhcacheComponentConfigurationTest extends
CamelTestSupport {
).build(true)
);
- JndiRegistry registry = super.createRegistry();
- registry.bind("ehcache", component);
-
- return registry;
+ return component;
}
// *****************************
diff --git
a/components/camel-ehcache/src/test/java/org/apache/camel/component/ehcache/EhcacheConfigurationTest.java
b/components/camel-ehcache/src/test/java/org/apache/camel/component/ehcache/EhcacheConfigurationTest.java
index a32e200..a837543 100644
---
a/components/camel-ehcache/src/test/java/org/apache/camel/component/ehcache/EhcacheConfigurationTest.java
+++
b/components/camel-ehcache/src/test/java/org/apache/camel/component/ehcache/EhcacheConfigurationTest.java
@@ -18,6 +18,8 @@ package org.apache.camel.component.ehcache;
import java.util.Collections;
+import org.apache.camel.BindToRegistry;
+import org.apache.camel.Component;
import org.apache.camel.EndpointInject;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.impl.JndiRegistry;
@@ -38,8 +40,8 @@ public class EhcacheConfigurationTest extends
CamelTestSupport {
@EndpointInject("ehcache:customConfig")
EhcacheEndpoint customConfig;
- @Override
- protected JndiRegistry createRegistry() throws Exception {
+ @BindToRegistry("ehcache")
+ public Component createEhcacheComponent() throws Exception {
EhcacheComponent component = new EhcacheComponent();
component.setCacheConfiguration(
CacheConfigurationBuilder.newCacheConfigurationBuilder(
@@ -63,10 +65,7 @@ public class EhcacheConfigurationTest extends
CamelTestSupport {
)
);
- JndiRegistry registry = super.createRegistry();
- registry.bind("ehcache", component);
-
- return registry;
+ return component;
}
// *****************************
diff --git
a/components/camel-ehcache/src/test/java/org/apache/camel/component/ehcache/EhcacheTestSupport.java
b/components/camel-ehcache/src/test/java/org/apache/camel/component/ehcache/EhcacheTestSupport.java
index 225952b..323a448 100644
---
a/components/camel-ehcache/src/test/java/org/apache/camel/component/ehcache/EhcacheTestSupport.java
+++
b/components/camel-ehcache/src/test/java/org/apache/camel/component/ehcache/EhcacheTestSupport.java
@@ -25,6 +25,7 @@ import java.util.UUID;
import java.util.stream.Collectors;
import java.util.stream.IntStream;
+import org.apache.camel.BindToRegistry;
import
org.apache.camel.component.ehcache.processor.aggregate.EhcacheAggregationRepository;
import org.apache.camel.impl.JndiRegistry;
import org.apache.camel.support.DefaultExchangeHolder;
@@ -48,6 +49,7 @@ public class EhcacheTestSupport extends CamelTestSupport {
@Rule
public final TestName testName = new TestName();
+ @BindToRegistry("cacheManager")
protected CacheManager cacheManager;
@Override
@@ -68,14 +70,6 @@ public class EhcacheTestSupport extends CamelTestSupport {
}
}
- @Override
- protected JndiRegistry createRegistry() throws Exception {
- JndiRegistry registry = super.createRegistry();
- registry.bind("cacheManager", cacheManager);
-
- return registry;
- }
-
protected Cache<Object, Object> getCache(String name) {
return cacheManager.getCache(name, Object.class, Object.class);
}
