Author: manik.surtani(a)jboss.com Date: 2008-04-28 10:58:24 -0400 (Mon, 28 Apr 2008) New Revision: 5724 Modified: core/trunk/src/main/java/org/jboss/cache/Fqn.java core/trunk/src/main/java/org/jboss/cache/LifecycleManager.java core/trunk/src/main/java/org/jboss/cache/RPCManagerImpl.java core/trunk/src/main/java/org/jboss/cache/StringFqn.java core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java core/trunk/src/main/java/org/jboss/cache/commands/write/InvalidateCommand.java core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.java core/trunk/src/main/java/org/jboss/cache/factories/InterceptorChainFactory.java core/trunk/src/main/java/org/jboss/cache/interceptors/CallInterceptor.java core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticReplicationInterceptor.java core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockInterceptor.java core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java core/trunk/src/test/java/org/jboss/cache/FqnTest.java core/trunk/src/test/java/org/jboss/cache/api/NodeMoveAPITest.java Log: TODOs Modified: core/trunk/src/main/java/org/jboss/cache/Fqn.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/Fqn.java 2008-04-28 14:53:03 UTC (rev 5723) +++ core/trunk/src/main/java/org/jboss/cache/Fqn.java 2008-04-28 14:58:24 UTC (rev 5724) @@ -110,7 +110,7 @@ // ----------------- START: Private constructors for use by factory methods only. ---------------------- - // TODO: Remove the unnecessary internalMarker boolean parameters to these methods once the deprecated public constructors are removed in 3.0.0. + // TODO: 3.0.0: Remove the unnecessary internalMarker boolean parameters to these methods once the deprecated public constructors are removed in 3.0.0. protected Fqn(boolean internalMarker) { Modified: core/trunk/src/main/java/org/jboss/cache/LifecycleManager.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/LifecycleManager.java 2008-04-28 14:53:03 UTC (rev 5723) +++ core/trunk/src/main/java/org/jboss/cache/LifecycleManager.java 2008-04-28 14:58:24 UTC (rev 5724) @@ -353,9 +353,6 @@ dataContainer.getRoot().removeChildrenDirect(); } - //todo - this should reather be implemented as follows: - // List<Component>comps = registry.detComponentsDependingOn(a component) - // registry.unregsiterComponents(comps); private void removeConfigurationDependentComponents() { // remove the Interceptor.class component though, since it may pertain to an old config Modified: core/trunk/src/main/java/org/jboss/cache/RPCManagerImpl.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/RPCManagerImpl.java 2008-04-28 14:53:03 UTC (rev 5723) +++ core/trunk/src/main/java/org/jboss/cache/RPCManagerImpl.java 2008-04-28 14:58:24 UTC (rev 5724) @@ -112,7 +112,7 @@ // ------------ START: Lifecycle methods ------------ - // TODO: This needs to be started manually for now, rather than by @Start. See CacheImpl.internalStart() + // TODO: 2.2.0: This needs to be started manually for now, rather than by @Start. See CacheImpl.internalStart() public void start() { Modified: core/trunk/src/main/java/org/jboss/cache/StringFqn.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/StringFqn.java 2008-04-28 14:53:03 UTC (rev 5723) +++ core/trunk/src/main/java/org/jboss/cache/StringFqn.java 2008-04-28 14:58:24 UTC (rev 5724) @@ -15,7 +15,7 @@ * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik@jboss.org</a>) * @since 2.2.0 */ -// TODO: Implement proper String escaping. +// TODO: 2.2.0: Implement proper String escaping. public class StringFqn extends Fqn { // Needs to be public because of NodeData serialization. Modified: core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java 2008-04-28 14:53:03 UTC (rev 5723) +++ core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java 2008-04-28 14:58:24 UTC (rev 5724) @@ -241,7 +241,7 @@ } } - // TODO: This needs to be started manually for now, rather than by @Start. See CacheImpl.internalStart() + // TODO: 2.2.0: This needs to be started manually for now, rather than by @Start. See CacheImpl.internalStart() public void init() throws CacheException { log.debug("Starting BuddyManager"); Modified: core/trunk/src/main/java/org/jboss/cache/commands/write/InvalidateCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/write/InvalidateCommand.java 2008-04-28 14:53:03 UTC (rev 5723) +++ core/trunk/src/main/java/org/jboss/cache/commands/write/InvalidateCommand.java 2008-04-28 14:58:24 UTC (rev 5724) @@ -66,7 +66,7 @@ @Override public Object perform(InvocationContext ctx) { - //todo - rather than using CacheSPI this should use peek(). The other interceptors should obtain locks and load nodes if necessary for this InvalidateCommand. + //TODO: 2.2.0: rather than using CacheSPI this should use peek(). The other interceptors should obtain locks and load nodes if necessary for this InvalidateCommand. Node node = spi.getNode(fqn); // force interceptor chain, load if necessary from cache loader. if (trace) log.trace("Invalidating fqn:" + fqn); Modified: core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.java 2008-04-28 14:53:03 UTC (rev 5723) +++ core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.java 2008-04-28 14:58:24 UTC (rev 5724) @@ -63,7 +63,7 @@ */ public class ComponentRegistry { - // TODO: Needs refactoring + // TODO: 2.2.0: Needs refactoring static final Object NULL_COMPONENT = new Object(); State overallState = CONSTRUCTED; Modified: core/trunk/src/main/java/org/jboss/cache/factories/InterceptorChainFactory.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/factories/InterceptorChainFactory.java 2008-04-28 14:53:03 UTC (rev 5723) +++ core/trunk/src/main/java/org/jboss/cache/factories/InterceptorChainFactory.java 2008-04-28 14:58:24 UTC (rev 5724) @@ -34,7 +34,7 @@ private CommandInterceptor createInterceptor(Class<? extends CommandInterceptor> clazz) throws IllegalAccessException, InstantiationException { - //todo - no reason for the individual interceptors to be registered as components, all manipulation should be done through InterceptorChain + //TODO: 2.2.0: no reason for the individual interceptors to be registered as components, all manipulation should be done through InterceptorChain CommandInterceptor chainedInterceptor = componentRegistry.getComponent(clazz.getName(), clazz); if (chainedInterceptor == null) { Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/CallInterceptor.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/interceptors/CallInterceptor.java 2008-04-28 14:53:03 UTC (rev 5723) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/CallInterceptor.java 2008-04-28 14:58:24 UTC (rev 5724) @@ -179,11 +179,11 @@ } else { - // TODO: Revisit this, this is a bug if a local rollback occurs!! + // TODO: 2.2.0: Revisit this, this is a bug if a local rollback occurs!! transactionTable.addModification(gtx, command); } - // todo: consolidate cache loader and regular modification lists!! + // TODO: 2.2.0: consolidate cache loader and regular modification lists!! // if (cacheLoaderManager != null) if (cacheLoadingEnabled) transactionTable.addCacheLoaderModification(gtx, command); } Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticReplicationInterceptor.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticReplicationInterceptor.java 2008-04-28 14:53:03 UTC (rev 5723) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticReplicationInterceptor.java 2008-04-28 14:58:24 UTC (rev 5724) @@ -202,7 +202,7 @@ { // Map method calls to data versioned equivalents. // See JBCACHE-843 and docs/design/DataVersioning.txt - //todo make the interceptor a field + //TODO: 2.2.0: make the interceptor a field DataVersionPopulator populator = new DataVersionPopulator(getTransactionWorkspace(gtx)); List<ReversibleCommand> clonedModifications = new ArrayList<ReversibleCommand>(command.getModifications().size()); for (ReversibleCommand command1 : command.getModifications()) Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockInterceptor.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockInterceptor.java 2008-04-28 14:53:03 UTC (rev 5723) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockInterceptor.java 2008-04-28 14:58:24 UTC (rev 5724) @@ -39,7 +39,7 @@ import java.util.List; /* -* todo refactorings ideas +* // TODO: 2.2.0: refactorings ideas * - thre are many places in code that handles that coputes the lock owners: either GTX or Thread.local. The * lockOwner can be abstractised as a LockOwner that can be extended by CurrentThreadLock owner and GlobalTransaction owner. This would make the code nicer. @@ -229,13 +229,13 @@ Object retVal = invokeNextInterceptor(ctx, command); // and make sure we remove all nodes we've created for the sake of later removal. - //todo [mmarkus] this logic should be moved within moveNodeCommand, as it is plain removal logic + //TODO: 2.2.0: [mmarkus] this logic should be moved within moveNodeCommand, as it is plain removal logic if (ctx.getGlobalTransaction() == null) { for (NodeSPI nodeSPI : createdNodes) dataContainer.realRemove(nodeSPI.getFqn(), true); dataContainer.realRemove(command.getFqn(), true); - //todo end of the logic that needs to be moved + //TODO: 2.2.0: end of the logic that needs to be moved NodeSPI n = dataContainer.peek(command.getFqn(), true, false); if (n != null) { Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java 2008-04-28 14:53:03 UTC (rev 5723) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java 2008-04-28 14:58:24 UTC (rev 5724) @@ -890,7 +890,7 @@ */ private List<ReversibleCommand> compact(List<ReversibleCommand> mods) { - // TODO: Make this more sophisticated, so it aggregates multiple puts on the same node, puts followed by a remove, etc. + // TODO: 3.0.0: Make this more sophisticated, so it aggregates multiple puts on the same node, puts followed by a remove, etc. // for now this just removes the redundant CreateNodeCommands from the list. List<ReversibleCommand> newList = new LinkedList<ReversibleCommand>(); for (ReversibleCommand cmd : mods) Modified: core/trunk/src/test/java/org/jboss/cache/FqnTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/FqnTest.java 2008-04-28 14:53:03 UTC (rev 5723) +++ core/trunk/src/test/java/org/jboss/cache/FqnTest.java 2008-04-28 14:58:24 UTC (rev 5724) @@ -478,7 +478,7 @@ } @Test(enabled = false) - // TODO enable once String escaping is in place + // TODO: 2.2.0: enable once String escaping is in place public void testUnescapedString() { @@ -501,7 +501,7 @@ } @Test(enabled = false) - // TODO enable once String escaping is in place + // TODO 2.2.0: enable once String escaping is in place public void testEscapedString() { String str = "/a/b" + '\\' + "/c/d"; // should result in a Fqn with elements "a", "b/c", "d". Modified: core/trunk/src/test/java/org/jboss/cache/api/NodeMoveAPITest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/api/NodeMoveAPITest.java 2008-04-28 14:53:03 UTC (rev 5723) +++ core/trunk/src/test/java/org/jboss/cache/api/NodeMoveAPITest.java 2008-04-28 14:58:24 UTC (rev 5724) @@ -403,7 +403,7 @@ @Test(groups = {"functional"}) public void testConcurrency() throws InterruptedException { - // TODO: investigate intermittent failure when in optimistic mode. + // TODO: 2.2.0: investigate intermittent failure when in optimistic mode. if (optimistic) return; final int N = 3;// number of threads