svn commit: r1558203 - /cxf/branches/2.7.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/cache/HazelCastTokenStore.java

[ow...@apache.org]

Author: owulff
Date: Tue Jan 14 21:27:30 2014
New Revision: 1558203

URL: http://svn.apache.org/r1558203
Log:
[CXF-5467] Hazelcast Tokenstore configuration with Spring

Modified:
    cxf/branches/2.7.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/cache/HazelCastTokenStore.java

Modified: cxf/branches/2.7.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/cache/HazelCastTokenStore.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/cache/HazelCastTokenStore.java?rev=1558203&r1=1558202&r2=1558203&view=diff
==============================================================================
--- cxf/branches/2.7.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/cache/HazelCastTokenStore.java (original)
+++ cxf/branches/2.7.x-fixes/services/sts/sts-core/src/main/java/org/apache/cxf/sts/cache/HazelCastTokenStore.java Tue Jan 14 21:27:30 2014
@@ -24,6 +24,7 @@ import java.util.Date;
 import java.util.concurrent.TimeUnit;
 
 import com.hazelcast.core.Hazelcast;
+import com.hazelcast.core.HazelcastInstance;
 import com.hazelcast.core.IMap;
 
 import org.apache.cxf.common.util.StringUtils;
@@ -37,13 +38,37 @@ public class HazelCastTokenStore impleme
     public static final long MAX_TTL = DEFAULT_TTL * 12L;
 
     private IMap<Object, Object> cacheMap;
+
     private long ttl = DEFAULT_TTL;
+    private HazelcastInstance hazelcastInstance;
+    private String mapName;
     
     public HazelCastTokenStore(String mapName) {
-        cacheMap = Hazelcast.getDefaultInstance().getMap(mapName);
+        this.mapName = mapName;
     }
     
     /**
+     * Get the Hazelcast instance
+     * If null, return Default instance
+     * @param hzInstance Hazelcast instance
+     */
+    public HazelcastInstance getHazelcastInstance() {
+        if (hazelcastInstance == null) {
+            hazelcastInstance = Hazelcast.getDefaultInstance();
+        }
+        return hazelcastInstance;
+    }
+
+    /**
+     * Set the Hazelcast instance, otherwise default instance used
+     * If you configure Hazelcast instance in spring, you must inject the instance here.
+     * @param hzInstance Hazelcast instance
+     */
+    public void setHazelcastInstance(HazelcastInstance hazelcastInstance) {
+        this.hazelcastInstance = hazelcastInstance;
+    }
+
+    /**
      * Set a new (default) TTL value in seconds
      * @param newTtl a new (default) TTL value in seconds
      */
@@ -63,7 +88,7 @@ public class HazelCastTokenStore impleme
         if (token != null && !StringUtils.isEmpty(token.getId())) {
             int parsedTTL = getTTL(token);
             if (parsedTTL > 0) {
-                cacheMap.put(token.getId(), token, parsedTTL, TimeUnit.SECONDS);
+                getCacheMap().put(token.getId(), token, parsedTTL, TimeUnit.SECONDS);
             }
         }
     }
@@ -72,19 +97,19 @@ public class HazelCastTokenStore impleme
         if (token != null && !StringUtils.isEmpty(identifier)) {
             int parsedTTL = getTTL(token);
             if (parsedTTL > 0) {
-                cacheMap.put(identifier, token, parsedTTL, TimeUnit.SECONDS);
+                getCacheMap().put(identifier, token, parsedTTL, TimeUnit.SECONDS);
             }
         }
     }
     
     public void remove(String identifier) {
-        if (!StringUtils.isEmpty(identifier) && cacheMap.containsKey(identifier)) {
-            cacheMap.remove(identifier);
+        if (!StringUtils.isEmpty(identifier) && getCacheMap().containsKey(identifier)) {
+            getCacheMap().remove(identifier);
         }
     }
     
     public Collection<String> getTokenIdentifiers() {
-        return CastUtils.cast((Collection<?>)cacheMap.keySet());
+        return CastUtils.cast((Collection<?>)getCacheMap().keySet());
     }
 
     public Collection<SecurityToken> getExpiredTokens() {
@@ -93,7 +118,13 @@ public class HazelCastTokenStore impleme
     }
 
     public SecurityToken getToken(String identifier) {
-        return (SecurityToken)cacheMap.get(identifier);
+        return (SecurityToken)getCacheMap().get(identifier);
+    }
+    
+    public void destroy() {
+        if (hazelcastInstance != null) {
+            hazelcastInstance.getLifecycleService().shutdown();
+        }
     }
 
     private int getTTL(SecurityToken token) {
@@ -126,4 +157,12 @@ public class HazelCastTokenStore impleme
         return parsedTTL;
     }
     
+    private IMap<Object, Object> getCacheMap() {
+        if (this.cacheMap == null) {
+            this.cacheMap = getHazelcastInstance().getMap(mapName);
+        }
+        return this.cacheMap;
+    }
+    
 }
+