[GitHub] jeanouii closed pull request #1: Remove JCS mentions from the project

classic Classic list List threaded Threaded
1 message Options
Reply | Threaded
Open this post in threaded view
|

[GitHub] jeanouii closed pull request #1: Remove JCS mentions from the project

GitBox
jeanouii closed pull request #1: Remove JCS mentions from the project
URL: https://github.com/apache/geronimo-jcache-simple/pull/1
 
 
   

This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:

As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):

diff --git a/pom.xml b/pom.xml
index 8ad58dd..547a3c4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -34,7 +34,7 @@
   <properties>
 
     <implementation-groupId>${project.groupId}</implementation-groupId>
-    <implementation-artifactId>commons-jcs</implementation-artifactId>
+    <implementation-artifactId>${project.artifactId}</implementation-artifactId>
     <implementation-version>${project.version}</implementation-version>
 
     <CacheManagerImpl>org.apache.geronimo.jcache.simple.SimpleManager</CacheManagerImpl>
diff --git a/src/main/java/org/apache/geronimo/jcache/simple/SimpleManager.java b/src/main/java/org/apache/geronimo/jcache/simple/SimpleManager.java
index e4d4d66..93656d3 100644
--- a/src/main/java/org/apache/geronimo/jcache/simple/SimpleManager.java
+++ b/src/main/java/org/apache/geronimo/jcache/simple/SimpleManager.java
@@ -129,7 +129,7 @@ public void destroyCache(final String cacheName) {
     public void enableManagement(final String cacheName, final boolean enabled) {
         assertNotClosed();
         assertNotNull(cacheName, "cacheName");
-        final SimpleCache<?, ?> cache = getJCSCache(cacheName);
+        final SimpleCache<?, ?> cache = of(cacheName);
         if (cache != null) {
             if (enabled) {
                 cache.enableManagement();
@@ -139,7 +139,7 @@ public void enableManagement(final String cacheName, final boolean enabled) {
         }
     }
 
-    private SimpleCache<?, ?> getJCSCache(final String cacheName) {
+    private SimpleCache<?, ?> of(final String cacheName) {
         return SimpleCache.class.cast(ClassLoaderAwareCache.getDelegate(caches.get(cacheName)));
     }
 
@@ -147,7 +147,7 @@ public void enableManagement(final String cacheName, final boolean enabled) {
     public void enableStatistics(final String cacheName, final boolean enabled) {
         assertNotClosed();
         assertNotNull(cacheName, "cacheName");
-        final SimpleCache<?, ?> cache = getJCSCache(cacheName);
+        final SimpleCache<?, ?> cache = of(cacheName);
         if (cache != null) {
             if (enabled) {
                 cache.enableStatistics();
diff --git a/src/main/java/org/apache/geronimo/jcache/simple/cdi/MakeJCacheCDIInterceptorFriendly.java b/src/main/java/org/apache/geronimo/jcache/simple/cdi/MakeJCacheCDIInterceptorFriendly.java
index b88205e..9413d99 100644
--- a/src/main/java/org/apache/geronimo/jcache/simple/cdi/MakeJCacheCDIInterceptorFriendly.java
+++ b/src/main/java/org/apache/geronimo/jcache/simple/cdi/MakeJCacheCDIInterceptorFriendly.java
@@ -150,9 +150,9 @@ public HelperBean(final AnnotatedType<CDIJCacheHelper> annotatedType,
                 final InjectionTarget<CDIJCacheHelper> injectionTarget, final String id) {
             this.at = annotatedType;
             this.it = injectionTarget;
-            this.id = "JCS#CDIHelper#" + id;
+            this.id = "JCache#CDIHelper#" + id;
 
-            this.qualifiers = new HashSet<Annotation>();
+            this.qualifiers = new HashSet<>();
             this.qualifiers.add(new AnnotationLiteral<Default>() {
             });
             this.qualifiers.add(new AnnotationLiteral<Any>() {


 

----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
 
For queries about this service, please contact Infrastructure at:
[hidden email]


With regards,
Apache Git Services