Use name from CacheDefaults when injecting JCache (#1126)

Use name from CacheDefaults when injecting JCache (PAYARA-1106)
payara · Oct 11, 2016 · 52c8756 · 52c8756
1 parent c7fad32
commit 52c8756
Showing 1 changed file with 13 additions and 0 deletions.
diff --git a/...-appserver-modules/payara-jsr107/src/main/java/fish/payara/cdi/jsr107/JSR107Producer.java b/...-appserver-modules/payara-jsr107/src/main/java/fish/payara/cdi/jsr107/JSR107Producer.java
@@ -22,12 +22,14 @@ and Distribution License("CDDL") (collectively, the "License").  You
 import fish.payara.nucleus.hazelcast.HazelcastCore;
 import javax.cache.Cache;
 import javax.cache.CacheManager;
+import javax.cache.annotation.CacheDefaults;
 import javax.cache.configuration.Factory;
 import javax.cache.configuration.FactoryBuilder;
 import javax.cache.configuration.MutableConfiguration;
 import javax.cache.spi.CachingProvider;
 import javax.enterprise.context.Dependent;
 import javax.enterprise.inject.Produces;
+import javax.enterprise.inject.spi.Bean;
 import javax.enterprise.inject.spi.InjectionPoint;
 
 /**
@@ -123,6 +125,17 @@ public Cache createCache(InjectionPoint ip) {
                 result = manager.createCache(cacheName, config);                
             }
         } else {  // configure a "raw" cache
+            Bean<?> bean = ip.getBean();
+            if (bean != null) {
+                Class<?> beanClass = bean.getBeanClass();
+                CacheDefaults defaults = beanClass.getAnnotation(CacheDefaults.class);
+                if (defaults != null) {
+                    String cacheNameFromAnnotation = defaults.cacheName();
+                    if (!"".equals(cacheNameFromAnnotation)) {
+                        cacheName = cacheNameFromAnnotation;
+                    }
+                }
+            }
             result = manager.getCache(cacheName);
             if (result == null) {
                 MutableConfiguration<Object, Object> config = new MutableConfiguration<>();