[jboss-cvs] JBossAS SVN: r80720 - projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/cache.

[jboss-cvs-commits at lists.jboss.org]

Author: alesj
Date: 2008-11-09 09:36:04 -0500 (Sun, 09 Nov 2008)
New Revision: 80720

Modified:
   projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/cache/CachePolicyVFSCache.java
   projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/cache/LRUVFSCache.java
   projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/cache/TimedVFSCache.java
Log:
Genericise policy.

Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/cache/CachePolicyVFSCache.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/cache/CachePolicyVFSCache.java	2008-11-09 14:19:48 UTC (rev 80719)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/cache/CachePolicyVFSCache.java	2008-11-09 14:36:04 UTC (rev 80720)
@@ -32,11 +32,12 @@
 /**
  * Cache policy vfs cache.
  *
+ * @param <T> exact policy type
  * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
  */
-public abstract class CachePolicyVFSCache extends PathMatchingVFSCache
+public abstract class CachePolicyVFSCache<T extends CachePolicy> extends PathMatchingVFSCache
 {
-   private CachePolicy policy;
+   private T policy;
    private Map<Object, Object> properties;
 
    protected CachePolicyVFSCache()
@@ -65,7 +66,7 @@
     *
     * @return the policy
     */
-   protected CachePolicy getPolicy()
+   protected T getPolicy()
    {
       check();
       return policy;
@@ -154,7 +155,7 @@
     *
     * @return the cache policy
     */
-   protected abstract CachePolicy createCachePolicy();
+   protected abstract T createCachePolicy();
 
    /**
     * Read instance properties.

Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/cache/LRUVFSCache.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/cache/LRUVFSCache.java	2008-11-09 14:19:48 UTC (rev 80719)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/cache/LRUVFSCache.java	2008-11-09 14:36:04 UTC (rev 80720)
@@ -23,7 +23,6 @@
 
 import java.util.Map;
 
-import org.jboss.util.CachePolicy;
 import org.jboss.util.LRUCachePolicy;
 import org.jboss.virtual.VFSUtils;
 
@@ -32,7 +31,7 @@
  *
  * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
  */
-public class LRUVFSCache extends CachePolicyVFSCache
+public class LRUVFSCache extends CachePolicyVFSCache<LRUCachePolicy>
 {
    private Integer min;
    private Integer max;
@@ -52,7 +51,7 @@
       super(properties);
    }
 
-   protected CachePolicy createCachePolicy()
+   protected LRUCachePolicy createCachePolicy()
    {
       if (min == null)
          min = getInteger(readInstanceProperties(VFSUtils.VFS_CACHE_KEY + ".LRUPolicyCaching.min", null, true));

Modified: projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/cache/TimedVFSCache.java
===================================================================
--- projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/cache/TimedVFSCache.java	2008-11-09 14:19:48 UTC (rev 80719)
+++ projects/vfs/trunk/src/main/java/org/jboss/virtual/plugins/cache/TimedVFSCache.java	2008-11-09 14:36:04 UTC (rev 80720)
@@ -26,7 +26,6 @@
 import java.util.List;
 import java.util.Map;
 
-import org.jboss.util.CachePolicy;
 import org.jboss.util.TimedCachePolicy;
 import org.jboss.virtual.VFSUtils;
 import org.jboss.virtual.spi.VFSContext;
@@ -36,7 +35,7 @@
  *
  * @author <a href="mailto:ales.justin at jboss.com">Ales Justin</a>
  */
-public class TimedVFSCache extends CachePolicyVFSCache
+public class TimedVFSCache extends CachePolicyVFSCache<TimedCachePolicy>
 {
    private Integer defaultLifetime;
    private Boolean threadSafe;
@@ -69,7 +68,7 @@
    @SuppressWarnings("unchecked")
    public Iterable<VFSContext> getCachedContexts()
    {
-      TimedCachePolicy tcp = (TimedCachePolicy)getPolicy();
+      TimedCachePolicy tcp = getPolicy();
       List keys = tcp.getValidKeys();
       if (keys != null && keys.isEmpty() == false)
       {
@@ -82,7 +81,7 @@
       return Collections.emptySet();
    }
 
-   protected CachePolicy createCachePolicy()
+   protected TimedCachePolicy createCachePolicy()
    {
       if (defaultLifetime == null)
          defaultLifetime = getInteger(readInstanceProperties(VFSUtils.VFS_CACHE_KEY + ".TimedPolicyCaching.lifetime", null, true));