CXF-8765: Option to remove Ehcache (enhance JCache API and providers …

…presence detection in JCacheUtils)
apache · Jan 21, 2025 · b82c4bb · b82c4bb
1 parent 0623a22
commit b82c4bb
Showing 1 changed file with 8 additions and 2 deletions.
diff --git a/rt/ws/security/src/main/java/org/apache/cxf/ws/security/utils/JCacheUtils.java b/rt/ws/security/src/main/java/org/apache/cxf/ws/security/utils/JCacheUtils.java
@@ -18,6 +18,8 @@
  */
 package org.apache.cxf.ws.security.utils;
 
+import java.lang.invoke.MethodHandles;
+import java.lang.invoke.MethodType;
 import java.util.function.Function;
 import java.util.logging.Logger;
 
@@ -35,10 +37,14 @@ public final class JCacheUtils {
         boolean jcacheInstalled = false;
         try {
             final Class<?> caching = Class.forName("javax.cache.Caching");
+            final Class<?> cachingProvider = Class.forName("javax.cache.spi.CachingProvider");
             if (caching != null) {
-                jcacheInstalled = true;
+                jcacheInstalled = MethodHandles
+                    .publicLookup()
+                    .findStatic(caching, "getCachingProvider", MethodType.methodType(cachingProvider))
+                    .invoke() != null;
             }
-        } catch (Exception e) {
+        } catch (Throwable e) {
             LOG.fine("No JCache SPIs detected on classpath: " + e.getMessage());
         }
         JCACHE_INSTALLED = jcacheInstalled;