[jbosscache-commits] JBoss Cache SVN: r5312 - in core/trunk/src: main/java/org/jboss/cache/factories and 2 other directories.
jbosscache-commits at lists.jboss.org
jbosscache-commits at lists.jboss.org
Tue Feb 5 22:25:50 EST 2008
Author: manik.surtani at jboss.com
Date: 2008-02-05 22:25:50 -0500 (Tue, 05 Feb 2008)
New Revision: 5312
Removed:
core/trunk/src/main/java/org/jboss/cache/factories/LockTableFactory.java
Modified:
core/trunk/src/main/java/org/jboss/cache/CacheSPI.java
core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.java
core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDelegate.java
core/trunk/src/test/java/org/jboss/cache/CallbackTest.java
core/trunk/src/test/java/org/jboss/cache/TreeCacheFunctionalTest.java
Log:
More cleanups
Modified: core/trunk/src/main/java/org/jboss/cache/CacheSPI.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/CacheSPI.java 2008-02-06 03:22:00 UTC (rev 5311)
+++ core/trunk/src/main/java/org/jboss/cache/CacheSPI.java 2008-02-06 03:25:50 UTC (rev 5312)
@@ -12,7 +12,6 @@
import org.jboss.cache.interceptors.Interceptor;
import org.jboss.cache.loader.CacheLoader;
import org.jboss.cache.loader.CacheLoaderManager;
-import org.jboss.cache.lock.NodeLock;
import org.jboss.cache.marshall.Marshaller;
import org.jboss.cache.notifications.Notifier;
import org.jboss.cache.statetransfer.StateTransferManager;
@@ -22,7 +21,6 @@
import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
import java.util.List;
-import java.util.Map;
import java.util.Set;
/**
@@ -227,13 +225,6 @@
int getNumberOfNodes();
/**
- * Retrieves the current table of locks.
- *
- * @return lock table.
- */
- Map<Thread, List<NodeLock>> getLockTable();
-
- /**
* Returns the global transaction for this local transaction.
* Optionally creates a new global transaction if it does not exist.
*
Modified: core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.java 2008-02-06 03:22:00 UTC (rev 5311)
+++ core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.java 2008-02-06 03:25:50 UTC (rev 5312)
@@ -104,7 +104,6 @@
s.add(BuddyManagerFactory.class);
s.add(EmptyConstructorFactory.class);
s.add(InterceptorChainFactory.class);
- s.add(LockTableFactory.class);
s.add(RuntimeConfigAwareFactory.class);
s.add(TransactionManagerFactory.class);
s.add(ReplicationQueueFactory.class);
Deleted: core/trunk/src/main/java/org/jboss/cache/factories/LockTableFactory.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/factories/LockTableFactory.java 2008-02-06 03:22:00 UTC (rev 5311)
+++ core/trunk/src/main/java/org/jboss/cache/factories/LockTableFactory.java 2008-02-06 03:25:50 UTC (rev 5312)
@@ -1,31 +0,0 @@
-package org.jboss.cache.factories;
-
-import org.jboss.cache.factories.annotations.DefaultFactoryFor;
-
-import java.util.Map;
-import java.util.concurrent.ConcurrentHashMap;
-
-/**
- * Dead simple class to create a lock factory
- *
- * @author Manik Surtani (<a href="mailto:manik at jboss.org">manik at jboss.org</a>)
- * @since 2.1.0
- */
- at DefaultFactoryFor(classes = Map.class)
-public class LockTableFactory extends EmptyConstructorFactory
-{
- private static final String LOCK_MAP_COMPONENT_NAME = "LockTable";
-
- @Override
- @SuppressWarnings("unchecked")
- protected <T> T construct(String componentName, Class<T> componentType)
- {
- if (componentName.equals(LOCK_MAP_COMPONENT_NAME))
- return (T) new ConcurrentHashMap();
- else
- {
- log.warn("Unknown component name " + componentName);
- return null;
- }
- }
-}
Modified: core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDelegate.java
===================================================================
--- core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDelegate.java 2008-02-06 03:22:00 UTC (rev 5311)
+++ core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDelegate.java 2008-02-06 03:25:50 UTC (rev 5312)
@@ -7,11 +7,9 @@
import org.jboss.cache.config.Configuration;
import org.jboss.cache.config.Option;
import org.jboss.cache.factories.InterceptorChainFactory;
-import org.jboss.cache.factories.annotations.ComponentName;
import org.jboss.cache.factories.annotations.Inject;
import org.jboss.cache.interceptors.Interceptor;
import org.jboss.cache.loader.CacheLoaderManager;
-import org.jboss.cache.lock.NodeLock;
import org.jboss.cache.marshall.Marshaller;
import org.jboss.cache.marshall.MethodCall;
import org.jboss.cache.marshall.MethodCallFactory;
@@ -51,7 +49,6 @@
private RPCManager rpcManager;
private RegionManager regionManager;
private Marshaller marshaller;
- private Map<Thread, List<NodeLock>> lockTable;
public CacheInvocationDelegate()
{
@@ -61,8 +58,7 @@
@Inject
private void injectDependencies(StateTransferManager stateTransferManager, CacheLoaderManager cacheLoaderManager, Notifier notifier,
TransactionManager transactionManager, BuddyManager buddyManager, TransactionTable transactionTable,
- RPCManager rpcManager, RegionManager regionManager, Marshaller marshaller,
- @ComponentName("LockTable")Map<Thread, List<NodeLock>> lockTable)
+ RPCManager rpcManager, RegionManager regionManager, Marshaller marshaller)
{
this.stateTransferManager = stateTransferManager;
this.cacheLoaderManager = cacheLoaderManager;
@@ -73,7 +69,6 @@
this.rpcManager = rpcManager;
this.regionManager = regionManager;
this.marshaller = marshaller;
- this.lockTable = lockTable;
}
private void reset()
@@ -87,7 +82,6 @@
this.rpcManager = null;
this.regionManager = null;
this.marshaller = null;
- this.lockTable = null;
}
@Override
@@ -177,11 +171,6 @@
return cache.getNumberOfNodes();
}
- public Map<Thread, List<NodeLock>> getLockTable()
- {
- return lockTable;
- }
-
public RegionManager getRegionManager()
{
return regionManager;
Modified: core/trunk/src/test/java/org/jboss/cache/CallbackTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/CallbackTest.java 2008-02-06 03:22:00 UTC (rev 5311)
+++ core/trunk/src/test/java/org/jboss/cache/CallbackTest.java 2008-02-06 03:25:50 UTC (rev 5312)
@@ -46,7 +46,7 @@
cache.put(FQN_A, null);
assertTrue(cache.exists(FQN_A));
assertTrue(cache.exists(FQN_B));//created by callback
- assertEquals(cache.getLockTable().size(), 0);
+ //assertEquals(cache.getLockTable().size(), 0);
System.out.println("cache locks:\n" + CachePrinter.printCacheLockingInfo(cache));
assertEquals(0, cache.getNumberOfLocksHeld());
}
@@ -59,7 +59,7 @@
cache.put(FQN_A, null);
assertTrue(cache.exists(FQN_A));
- assertEquals(cache.getLockTable().size(), 0);
+// assertEquals(cache.getLockTable().size(), 0);
System.out.println("cache locks:\n" + CachePrinter.printCacheLockingInfo(cache));
assertEquals(0, cache.getNumberOfLocksHeld());
}
@@ -74,7 +74,7 @@
cache.put("/a", null);
assertTrue(cache.exists(FQN_A));
assertTrue(cache.exists(FQN_B));
- assertEquals(cache.getLockTable().size(), 0);
+// assertEquals(cache.getLockTable().size(), 0);
System.out.println("cache locks:\n" + CachePrinter.printCacheLockingInfo(cache));
assertEquals(0, cache.getNumberOfLocksHeld());
}
Modified: core/trunk/src/test/java/org/jboss/cache/TreeCacheFunctionalTest.java
===================================================================
--- core/trunk/src/test/java/org/jboss/cache/TreeCacheFunctionalTest.java 2008-02-06 03:22:00 UTC (rev 5311)
+++ core/trunk/src/test/java/org/jboss/cache/TreeCacheFunctionalTest.java 2008-02-06 03:25:50 UTC (rev 5312)
@@ -50,7 +50,7 @@
assertEquals(cache.get("/a/b/c", "age"), 38);
assertNotNull(cache.getNode("/a/b/c"));
assertEquals(0, cache.getNumberOfLocksHeld());
- assertEquals(0, cache.getLockTable().size());
+// assertEquals(0, cache.getLockTable().size());
}
@@ -91,7 +91,7 @@
assertEquals(cache.getNode("/a/b/c").getKeys().size(), 2);
assertEquals(cache.exists("/a/b/c"), true);
assertEquals(0, cache.getNumberOfLocksHeld());
- assertEquals(0, cache.getLockTable().size());
+// assertEquals(0, cache.getLockTable().size());
}
public void testRemove() throws CacheException
@@ -104,6 +104,6 @@
cache.removeNode("/a/b/c");
assertEquals(0, cache.getNumberOfLocksHeld());
- assertEquals(0, cache.getLockTable().size());
+// assertEquals(0, cache.getLockTable().size());
}
}
More information about the jbosscache-commits
mailing list