[jbosscache-commits] JBoss Cache SVN: r4606 - core/trunk/src/main/java/org/jboss/cache/interceptors.

[jbosscache-commits at lists.jboss.org]

Author: manik.surtani at jboss.com
Date: 2007-10-12 10:38:51 -0400 (Fri, 12 Oct 2007)
New Revision: 4606

Modified:
   core/trunk/src/main/java/org/jboss/cache/interceptors/DataGravitatorInterceptor.java
Log:
Genericised

Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/DataGravitatorInterceptor.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/interceptors/DataGravitatorInterceptor.java	2007-10-12 14:28:52 UTC (rev 4605)
+++ core/trunk/src/main/java/org/jboss/cache/interceptors/DataGravitatorInterceptor.java	2007-10-12 14:38:51 UTC (rev 4606)
@@ -17,7 +17,6 @@
 import org.jboss.cache.buddyreplication.BuddyManager;
 import org.jboss.cache.buddyreplication.GravitateResult;
 import org.jboss.cache.config.Configuration;
-import org.jboss.cache.loader.ClusteredCacheLoader;
 import org.jboss.cache.marshall.MethodCall;
 import org.jboss.cache.marshall.MethodCallFactory;
 import org.jboss.cache.marshall.MethodDeclarations;
@@ -55,7 +54,7 @@
    private BuddyManager buddyManager;
    private boolean syncCommunications = false;
    private Log log = LogFactory.getLog(DataGravitatorInterceptor.class);
-   private Map transactionMods = new ConcurrentHashMap();
+   private Map<GlobalTransaction, MethodCall> transactionMods = new ConcurrentHashMap<GlobalTransaction, MethodCall>();
 
    public void setCache(CacheSPI cache)
    {
@@ -184,12 +183,12 @@
 
    private void doPrepare(GlobalTransaction gtx, InvocationContext ctx) throws Throwable
    {
-      MethodCall cleanup = (MethodCall) transactionMods.get(gtx);
+      MethodCall cleanup = transactionMods.get(gtx);
       if (log.isTraceEnabled()) log.trace("Broadcasting prepare for cleanup ops " + cleanup);
       if (cleanup != null)
       {
          MethodCall prepare;
-         List mods = new ArrayList(1);
+         List<MethodCall> mods = new ArrayList<MethodCall>(1);
          mods.add(cleanup);
          if (configuration.isNodeLockingOptimistic())
          {
@@ -366,6 +365,7 @@
       return result;
    }
 
+   @SuppressWarnings("unchecked")
    private void createNode(List<NodeData> nodeData, boolean localOnly) throws CacheException
    {
       for (NodeData data : nodeData)
@@ -384,7 +384,8 @@
       }
    }
 
-   private void createNodesLocally(Fqn<Object> fqn, Map data) throws CacheException
+   @SuppressWarnings("unchecked")
+   private void createNodesLocally(Fqn<?> fqn, Map<?, ?> data) throws CacheException
    {
       int treeNodeSize;
       if ((treeNodeSize = fqn.size()) == 0) return;
@@ -421,13 +422,13 @@
    }
 
    @SuppressWarnings("unchecked")
-   private boolean localBackupExists(Fqn fqn)
+   private boolean localBackupExists(Fqn<?> fqn)
    {
       boolean exists = false;
 
       for (Node node : getBackupRootCollection())
       {
-         Fqn newSearchFqn = new Fqn(node.getFqn(), fqn);
+         Fqn<?> newSearchFqn = new Fqn(node.getFqn(), fqn);
          exists = cache.peek(newSearchFqn, false) != null;
          if (exists) break;
       }
@@ -466,7 +467,7 @@
    private Collection<Node> getBackupRootCollection()
    {
       NodeSPI backupRoot = cache.peek(BuddyManager.BUDDY_BACKUP_SUBTREE_FQN, true);
-      return backupRoot == null ? Collections.EMPTY_SET : backupRoot.getChildrenDirect();
+      return backupRoot == null ? Collections.emptySet() : backupRoot.getChildrenDirect();
    }
 
    private static class BackupData