April 2008 - jbosscache-commits - Jboss List Archives

JBoss Cache SVN: r5673 - core/trunk/src/test/java/org/jboss/cache.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2008-04-24 11:43:13 -0400 (Thu, 24 Apr 2008) New Revision: 5673 Modified: core/trunk/src/test/java/org/jboss/cache/LifeCycleTest.java Log: Added catch for suspect exceptions Modified: core/trunk/src/test/java/org/jboss/cache/LifeCycleTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/LifeCycleTest.java 2008-04-24 15:41:58 UTC (rev 5672) +++ core/trunk/src/test/java/org/jboss/cache/LifeCycleTest.java 2008-04-24 15:43:13 UTC (rev 5673) @@ -1,12 +1,12 @@ package org.jboss.cache; import org.jboss.cache.config.Configuration; +import org.jboss.cache.invocation.CacheLifecycleManager; import org.jboss.cache.misc.TestingUtil; import org.jboss.cache.notifications.annotation.CacheListener; import org.jboss.cache.notifications.annotation.CacheStarted; import org.jboss.cache.notifications.annotation.CacheStopped; import org.jboss.cache.notifications.event.Event; -import org.jboss.cache.invocation.CacheLifecycleManager; import static org.testng.AssertJUnit.*; import org.testng.annotations.AfterMethod; import org.testng.annotations.Test; @@ -374,6 +374,10 @@ { // this sometimes happens when JGroups suspects the remote node. This is ok, as long as we don't get an ISE. } + catch (SuspectException se) + { + // this sometimes happens when JGroups suspects the remote node. This is ok, as long as we don't get an ISE. + } catch (Exception e) { exceptions.add(e);

16 years, 1 month

1
0
0 / 0

JBoss Cache SVN: r5672 - in core/trunk/src/main/java/org/jboss/cache: interceptors/base and 2 other directories.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2008-04-24 11:41:58 -0400 (Thu, 24 Apr 2008) New Revision: 5672 Modified: core/trunk/src/main/java/org/jboss/cache/commands/state/BaseDataVersionCommand.java core/trunk/src/main/java/org/jboss/cache/interceptors/base/ChainedInterceptor.java core/trunk/src/main/java/org/jboss/cache/interceptors/base/PostProcessingChainedInterceptor.java core/trunk/src/main/java/org/jboss/cache/interceptors/base/SkipCheckChainedInterceptor.java core/trunk/src/main/java/org/jboss/cache/notifications/event/EventImpl.java core/trunk/src/main/java/org/jboss/cache/util/concurrent/ConcurrentHashSet.java Log: Added missing @Override annotations Modified: core/trunk/src/main/java/org/jboss/cache/commands/state/BaseDataVersionCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/state/BaseDataVersionCommand.java 2008-04-24 15:41:25 UTC (rev 5671) +++ core/trunk/src/main/java/org/jboss/cache/commands/state/BaseDataVersionCommand.java 2008-04-24 15:41:58 UTC (rev 5672) @@ -30,6 +30,7 @@ } // basic implementations + @Override public Object[] getParameters() { if (isVersioned()) @@ -39,6 +40,7 @@ } // basic implementations + @Override public void setState(int commandId, Object[] args) { fqn = (Fqn) args[0]; Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/base/ChainedInterceptor.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/interceptors/base/ChainedInterceptor.java 2008-04-24 15:41:25 UTC (rev 5671) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/base/ChainedInterceptor.java 2008-04-24 15:41:58 UTC (rev 5672) @@ -1,14 +1,14 @@ package org.jboss.cache.interceptors.base; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jboss.cache.InvocationContext; import org.jboss.cache.commands.CacheCommand; import org.jboss.cache.commands.visitors.AbstractCommandsVisitor; -import org.jboss.cache.InvocationContext; import org.jboss.cache.interceptors.InterceptorMBean; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import java.util.Collections; import java.util.Map; -import java.util.Collections; /** * @author Mircea.Markus(a)jboss.com @@ -68,6 +68,7 @@ return command.accept(ctx, getNext()); } + @Override public Object handleDefault(InvocationContext ctx, CacheCommand command) throws Throwable { return invokeNextInterceptor(ctx, command); Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/base/PostProcessingChainedInterceptor.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/interceptors/base/PostProcessingChainedInterceptor.java 2008-04-24 15:41:25 UTC (rev 5671) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/base/PostProcessingChainedInterceptor.java 2008-04-24 15:41:58 UTC (rev 5672) @@ -1,15 +1,22 @@ package org.jboss.cache.interceptors.base; import org.jboss.cache.InvocationContext; +import org.jboss.cache.commands.CacheCommand; import org.jboss.cache.commands.cachedata.*; -import org.jboss.cache.commands.remote.*; +import org.jboss.cache.commands.channel.BlockChannelCommand; +import org.jboss.cache.commands.channel.UnblockChannelCommand; +import org.jboss.cache.commands.remote.AnnounceBuddyPoolNameCommand; +import org.jboss.cache.commands.remote.AssignToBuddyGroupCommand; +import org.jboss.cache.commands.remote.ClusteredGetCommand; +import org.jboss.cache.commands.remote.DataGravitationCleanupCommand; +import org.jboss.cache.commands.remote.GravitateDataCommand; +import org.jboss.cache.commands.remote.RemoteExistsNodeCommand; +import org.jboss.cache.commands.remote.RemoveFromBuddyGroupCommand; +import org.jboss.cache.commands.remote.ReplicateCommand; +import org.jboss.cache.commands.tx.CommitCommand; +import org.jboss.cache.commands.tx.OptimisticPrepareCommand; import org.jboss.cache.commands.tx.PrepareCommand; import org.jboss.cache.commands.tx.RollbackCommand; -import org.jboss.cache.commands.tx.CommitCommand; -import org.jboss.cache.commands.tx.OptimisticPrepareCommand; -import org.jboss.cache.commands.channel.BlockChannelCommand; -import org.jboss.cache.commands.channel.UnblockChannelCommand; -import org.jboss.cache.commands.CacheCommand; /** * This interceptor will call {@link #doAfterCall(org.jboss.cache.InvocationContext)} after invoking each handler method. @@ -26,7 +33,8 @@ try { return executePutDataMapCommand(ctx, command); - } finally + } + finally { doAfterCall(ctx); } @@ -37,12 +45,14 @@ return executeAll(ctx, command); } + @Override public final Object handlePutKeyValueCommand(InvocationContext ctx, PutKeyValueCommand command) throws Throwable { try { return executePutKeyValueCommand(ctx, command); - } finally + } + finally { doAfterCall(ctx); } @@ -53,12 +63,14 @@ return executeAll(ctx, command); } + @Override public final Object handleRemoveNodeCommand(InvocationContext ctx, RemoveNodeCommand command) throws Throwable { try { return executeRemoveNodeCommand(ctx, command); - } finally + } + finally { doAfterCall(ctx); } @@ -69,12 +81,14 @@ return executeAll(ctx, command); } + @Override public final Object handleRemoveDataCommand(InvocationContext ctx, RemoveDataCommand command) throws Throwable { try { return executeRemoveDataCommand(ctx, command); - } finally + } + finally { doAfterCall(ctx); } @@ -85,12 +99,14 @@ return executeAll(ctx, command); } + @Override public final Object handleEvictFqnCommand(InvocationContext ctx, EvictNodeCommand command) throws Throwable { try { return executeEvictFqnCommand(ctx, command); - } finally + } + finally { doAfterCall(ctx); } @@ -101,12 +117,14 @@ return executeAll(ctx, command); } + @Override public final Object handleInvalidateCommand(InvocationContext ctx, InvalidateCommand command) throws Throwable { try { return executeInvalidateCommand(ctx, command); - } finally + } + finally { doAfterCall(ctx); } @@ -117,12 +135,14 @@ return executeAll(ctx, command); } + @Override public final Object handleRemoveKeyCommand(InvocationContext ctx, RemoveKeyCommand command) throws Throwable { try { return executeRemoveKeyCommand(ctx, command); - } finally + } + finally { doAfterCall(ctx); } @@ -133,12 +153,14 @@ return executeAll(ctx, command); } + @Override public final Object handleGetDataMapCommand(InvocationContext ctx, GetDataMapCommand command) throws Throwable { try { return executeGetDataMapCommand(ctx, command); - } finally + } + finally { doAfterCall(ctx); } @@ -149,12 +171,14 @@ return executeAll(ctx, command); } + @Override public final Object handleExistsNodeCommand(InvocationContext ctx, RemoteExistsNodeCommand command) throws Throwable { try { return executeExistsNodeCommand(ctx, command); - } finally + } + finally { doAfterCall(ctx); } @@ -165,12 +189,14 @@ return executeAll(ctx, command); } + @Override public final Object handleGetKeyValueCommand(InvocationContext ctx, GetKeyValueCommand command) throws Throwable { try { return executeGetKeyValueCommand(ctx, command); - } finally + } + finally { doAfterCall(ctx); } @@ -181,12 +207,14 @@ return executeAll(ctx, command); } + @Override public final Object handleGetNodeCommand(InvocationContext ctx, GetNodeCommand command) throws Throwable { try { return executeGetNodeCommand(ctx, command); - } finally + } + finally { doAfterCall(ctx); } @@ -197,12 +225,14 @@ return executeAll(ctx, command); } + @Override public final Object handleGetKeysCommand(InvocationContext ctx, GetKeysCommand command) throws Throwable { try { return executeGetKeysCommand(ctx, command); - } finally + } + finally { doAfterCall(ctx); } @@ -213,12 +243,14 @@ return executeAll(ctx, command); } + @Override public final Object handleGetChildrenNamesCommand(InvocationContext ctx, GetChildrenNamesCommand command) throws Throwable { try { return executeGetChildrenNamesCommand(ctx, command); - } finally + } + finally { doAfterCall(ctx); } @@ -229,12 +261,14 @@ return executeAll(ctx, command); } + @Override public final Object handleMoveCommand(InvocationContext ctx, MoveCommand command) throws Throwable { try { return executeMoveCommand(ctx, command); - } finally + } + finally { doAfterCall(ctx); } @@ -245,12 +279,14 @@ return executeAll(ctx, command); } + @Override public final Object handleGravitateDataCommand(InvocationContext ctx, GravitateDataCommand command) throws Throwable { try { return executeGravitateDataCommand(ctx, command); - } finally + } + finally { doAfterCall(ctx); } @@ -261,12 +297,14 @@ return executeAll(ctx, command); } + @Override public final Object handlePrepareCommand(InvocationContext ctx, PrepareCommand command) throws Throwable { try { return executePrepareCommand(ctx, command); - } finally + } + finally { doAfterCall(ctx); } @@ -277,12 +315,14 @@ return executeAll(ctx, command); } + @Override public final Object handleRollbackCommand(InvocationContext ctx, RollbackCommand command) throws Throwable { try { return executeRollbackCommand(ctx, command); - } finally + } + finally { doAfterCall(ctx); } @@ -293,12 +333,14 @@ return executeAll(ctx, command); } + @Override public final Object handleCommitCommand(InvocationContext ctx, CommitCommand command) throws Throwable { try { return executeCommitCommand(ctx, command); - } finally + } + finally { doAfterCall(ctx); } @@ -309,12 +351,14 @@ return executeAll(ctx, command); } + @Override public final Object handleOptimisticPrepareCommand(InvocationContext ctx, OptimisticPrepareCommand command) throws Throwable { try { return executeOptimisticPrepareCommand(ctx, command); - } finally + } + finally { doAfterCall(ctx); } @@ -325,12 +369,14 @@ return executeAll(ctx, command); } + @Override public final Object handleReplicateCommand(InvocationContext ctx, ReplicateCommand command) throws Throwable { try { return executeReplicateCommands(ctx, command); - } finally + } + finally { doAfterCall(ctx); } @@ -341,12 +387,14 @@ return executeAll(ctx, command); } + @Override public final Object handleAnnounceBuddyPoolName(InvocationContext ctx, AnnounceBuddyPoolNameCommand command) throws Throwable { try { return executeAnnounceBuddyPoolName(ctx, command); - } finally + } + finally { doAfterCall(ctx); } @@ -357,12 +405,14 @@ return executeAll(ctx, command); } + @Override public final Object handleRemoveFromBuddyGroupCommand(InvocationContext ctx, RemoveFromBuddyGroupCommand command) throws Throwable { try { return executeRemoveFromBuddyGroupCommand(ctx, command); - } finally + } + finally { doAfterCall(ctx); } @@ -373,12 +423,14 @@ return executeAll(ctx, command); } + @Override public final Object handleAssignToBuddyGroupCommand(InvocationContext ctx, AssignToBuddyGroupCommand command) throws Throwable { try { return executeAssignToBuddyGroupCommand(ctx, command); - } finally + } + finally { doAfterCall(ctx); } @@ -389,12 +441,14 @@ return executeAll(ctx, command); } + @Override public final Object handleDataGravitationCleanupCommand(InvocationContext ctx, DataGravitationCleanupCommand command) throws Throwable { try { return executeDataGravitationCleanupCommand(ctx, command); - } finally + } + finally { doAfterCall(ctx); } @@ -405,12 +459,14 @@ return executeAll(ctx, command); } + @Override public final Object handleClusteredGetCommand(InvocationContext ctx, ClusteredGetCommand command) throws Throwable { try { return executeClusteredGetCommand(ctx, command); - } finally + } + finally { doAfterCall(ctx); } @@ -421,12 +477,14 @@ return executeAll(ctx, command); } + @Override public final Object handleBlockChannelCommand(InvocationContext ctx, BlockChannelCommand command) throws Throwable { try { return executeBlockChannelCommand(ctx, command); - } finally + } + finally { doAfterCall(ctx); } @@ -437,12 +495,14 @@ return executeAll(ctx, command); } + @Override public final Object handleUnblockChannelCommand(InvocationContext ctx, UnblockChannelCommand command) throws Throwable { try { return executeUnblockChannelCommand(ctx, command); - } finally + } + finally { doAfterCall(ctx); } Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/base/SkipCheckChainedInterceptor.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/interceptors/base/SkipCheckChainedInterceptor.java 2008-04-24 15:41:25 UTC (rev 5671) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/base/SkipCheckChainedInterceptor.java 2008-04-24 15:41:58 UTC (rev 5672) @@ -5,7 +5,14 @@ import org.jboss.cache.commands.cachedata.*; import org.jboss.cache.commands.channel.BlockChannelCommand; import org.jboss.cache.commands.channel.UnblockChannelCommand; -import org.jboss.cache.commands.remote.*; +import org.jboss.cache.commands.remote.AnnounceBuddyPoolNameCommand; +import org.jboss.cache.commands.remote.AssignToBuddyGroupCommand; +import org.jboss.cache.commands.remote.ClusteredGetCommand; +import org.jboss.cache.commands.remote.DataGravitationCleanupCommand; +import org.jboss.cache.commands.remote.GravitateDataCommand; +import org.jboss.cache.commands.remote.RemoteExistsNodeCommand; +import org.jboss.cache.commands.remote.RemoveFromBuddyGroupCommand; +import org.jboss.cache.commands.remote.ReplicateCommand; import org.jboss.cache.commands.tx.CommitCommand; import org.jboss.cache.commands.tx.OptimisticPrepareCommand; import org.jboss.cache.commands.tx.PrepareCommand; @@ -21,6 +28,7 @@ */ public abstract class SkipCheckChainedInterceptor extends ChainedInterceptor { + @Override public final Object handlePutDataMapCommand(InvocationContext ctx, PutDataMapCommand command) throws Throwable { if (skipInterception(ctx)) @@ -35,6 +43,7 @@ return executeAll(ctx, command); } + @Override public final Object handlePutKeyValueCommand(InvocationContext ctx, PutKeyValueCommand command) throws Throwable { if (skipInterception(ctx)) @@ -49,6 +58,7 @@ return executeAll(ctx, command); } + @Override public final Object handleRemoveNodeCommand(InvocationContext ctx, RemoveNodeCommand command) throws Throwable { if (skipInterception(ctx)) @@ -63,6 +73,7 @@ return executeAll(ctx, command); } + @Override public final Object handleRemoveDataCommand(InvocationContext ctx, RemoveDataCommand command) throws Throwable { if (skipInterception(ctx)) @@ -77,6 +88,7 @@ return executeAll(ctx, command); } + @Override public final Object handleEvictFqnCommand(InvocationContext ctx, EvictNodeCommand command) throws Throwable { if (skipInterception(ctx)) @@ -91,6 +103,7 @@ return executeAll(ctx, command); } + @Override public final Object handleInvalidateCommand(InvocationContext ctx, InvalidateCommand command) throws Throwable { if (skipInterception(ctx)) @@ -105,6 +118,7 @@ return executeAll(ctx, command); } + @Override public final Object handleRemoveKeyCommand(InvocationContext ctx, RemoveKeyCommand command) throws Throwable { if (skipInterception(ctx)) @@ -119,6 +133,7 @@ return executeAll(ctx, command); } + @Override public final Object handleGetDataMapCommand(InvocationContext ctx, GetDataMapCommand command) throws Throwable { if (skipInterception(ctx)) @@ -133,6 +148,7 @@ return executeAll(ctx, command); } + @Override public final Object handleExistsNodeCommand(InvocationContext ctx, RemoteExistsNodeCommand command) throws Throwable { if (skipInterception(ctx)) @@ -147,6 +163,7 @@ return executeAll(ctx, command); } + @Override public final Object handleGetKeyValueCommand(InvocationContext ctx, GetKeyValueCommand command) throws Throwable { if (skipInterception(ctx)) @@ -161,6 +178,7 @@ return executeAll(ctx, command); } + @Override public final Object handleGetNodeCommand(InvocationContext ctx, GetNodeCommand command) throws Throwable { if (skipInterception(ctx)) @@ -175,6 +193,7 @@ return executeAll(ctx, command); } + @Override public final Object handleGetKeysCommand(InvocationContext ctx, GetKeysCommand command) throws Throwable { if (skipInterception(ctx)) @@ -189,6 +208,7 @@ return executeAll(ctx, command); } + @Override public final Object handleGetChildrenNamesCommand(InvocationContext ctx, GetChildrenNamesCommand command) throws Throwable { if (skipInterception(ctx)) @@ -203,6 +223,7 @@ return executeAll(ctx, command); } + @Override public final Object handleMoveCommand(InvocationContext ctx, MoveCommand command) throws Throwable { if (skipInterception(ctx)) @@ -217,6 +238,7 @@ return executeAll(ctx, command); } + @Override public final Object handleGravitateDataCommand(InvocationContext ctx, GravitateDataCommand command) throws Throwable { if (skipInterception(ctx)) @@ -231,6 +253,7 @@ return executeAll(ctx, command); } + @Override public final Object handlePrepareCommand(InvocationContext ctx, PrepareCommand command) throws Throwable { if (skipInterception(ctx)) @@ -245,6 +268,7 @@ return executeAll(ctx, command); } + @Override public final Object handleRollbackCommand(InvocationContext ctx, RollbackCommand command) throws Throwable { if (skipInterception(ctx)) @@ -259,6 +283,7 @@ return executeAll(ctx, command); } + @Override public final Object handleCommitCommand(InvocationContext ctx, CommitCommand command) throws Throwable { if (skipInterception(ctx)) @@ -273,6 +298,7 @@ return executeAll(ctx, command); } + @Override public final Object handleOptimisticPrepareCommand(InvocationContext ctx, OptimisticPrepareCommand command) throws Throwable { if (skipInterception(ctx)) @@ -287,6 +313,7 @@ return executeAll(ctx, command); } + @Override public final Object handleReplicateCommand(InvocationContext ctx, ReplicateCommand command) throws Throwable { if (skipInterception(ctx)) @@ -301,6 +328,7 @@ return executeAll(ctx, command); } + @Override public final Object handleAnnounceBuddyPoolName(InvocationContext ctx, AnnounceBuddyPoolNameCommand command) throws Throwable { if (skipInterception(ctx)) @@ -315,6 +343,7 @@ return executeAll(ctx, command); } + @Override public final Object handleRemoveFromBuddyGroupCommand(InvocationContext ctx, RemoveFromBuddyGroupCommand command) throws Throwable { if (skipInterception(ctx)) @@ -329,6 +358,7 @@ return executeAll(ctx, command); } + @Override public final Object handleAssignToBuddyGroupCommand(InvocationContext ctx, AssignToBuddyGroupCommand command) throws Throwable { if (skipInterception(ctx)) @@ -343,6 +373,7 @@ return executeAll(ctx, command); } + @Override public final Object handleDataGravitationCleanupCommand(InvocationContext ctx, DataGravitationCleanupCommand command) throws Throwable { if (skipInterception(ctx)) @@ -357,6 +388,7 @@ return executeAll(ctx, command); } + @Override public final Object handleClusteredGetCommand(InvocationContext ctx, ClusteredGetCommand command) throws Throwable { if (skipInterception(ctx)) @@ -371,6 +403,7 @@ return executeAll(ctx, command); } + @Override public final Object handleBlockChannelCommand(InvocationContext ctx, BlockChannelCommand command) throws Throwable { if (skipInterception(ctx)) @@ -385,6 +418,7 @@ return executeAll(ctx, command); } + @Override public final Object handleUnblockChannelCommand(InvocationContext ctx, UnblockChannelCommand command) throws Throwable { if (skipInterception(ctx)) @@ -399,6 +433,7 @@ return executeAll(ctx, command); } + @Override public final Object handleDefault(InvocationContext ctx, CacheCommand command) throws Throwable { if (skipInterception(ctx)) Modified: core/trunk/src/main/java/org/jboss/cache/notifications/event/EventImpl.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/notifications/event/EventImpl.java 2008-04-24 15:41:25 UTC (rev 5671) +++ core/trunk/src/main/java/org/jboss/cache/notifications/event/EventImpl.java 2008-04-24 15:41:58 UTC (rev 5672) @@ -169,6 +169,7 @@ this.buddyGroup = buddyGroup; } + @Override public boolean equals(Object o) { if (this == o) return true; @@ -192,6 +193,7 @@ return true; } + @Override public int hashCode() { int result; @@ -211,6 +213,7 @@ } + @Override public String toString() { return "EventImpl{" + Modified: core/trunk/src/main/java/org/jboss/cache/util/concurrent/ConcurrentHashSet.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/util/concurrent/ConcurrentHashSet.java 2008-04-24 15:41:25 UTC (rev 5671) +++ core/trunk/src/main/java/org/jboss/cache/util/concurrent/ConcurrentHashSet.java 2008-04-24 15:41:58 UTC (rev 5672) @@ -24,67 +24,81 @@ map = new ConcurrentHashMap<E, Object>(); } + @Override public int size() { return map.size(); } + @Override public boolean isEmpty() { return map.isEmpty(); } + @Override public boolean contains(Object o) { return map.containsKey(o); } + @Override public Iterator<E> iterator() { return map.keySet().iterator(); } + + @Override public Object[] toArray() { return map.keySet().toArray(); } + @Override public <T> T[] toArray(T[] a) { return map.keySet().toArray(a); } + @Override public boolean add(E o) { Object v = map.put(o, DUMMY); return v == null; } + @Override public boolean remove(Object o) { Object v = map.remove(o); return v != null; } + @Override public boolean containsAll(Collection<?> c) { return map.keySet().containsAll(c); } + @Override public boolean addAll(Collection<? extends E> c) { throw new UnsupportedOperationException("Not supported in this implementation since additional locking is required and cannot directly be delegated to multiple calls to ConcurrentHashMap"); } + @Override public boolean retainAll(Collection<?> c) { throw new UnsupportedOperationException("Not supported in this implementation since additional locking is required and cannot directly be delegated to multiple calls to ConcurrentHashMap"); } + @Override public boolean removeAll(Collection<?> c) { throw new UnsupportedOperationException("Not supported in this implementation since additional locking is required and cannot directly be delegated to multiple calls to ConcurrentHashMap"); } + @Override public void clear() { map.clear();

16 years, 1 month

1
0
0 / 0

JBoss Cache SVN: r5671 - in core/trunk/src/main/java/org/jboss/cache: buddyreplication and 17 other directories.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2008-04-24 11:41:25 -0400 (Thu, 24 Apr 2008) New Revision: 5671 Modified: core/trunk/src/main/java/org/jboss/cache/ConsoleListener.java core/trunk/src/main/java/org/jboss/cache/DefaultCacheFactory.java core/trunk/src/main/java/org/jboss/cache/Fqn.java core/trunk/src/main/java/org/jboss/cache/InvocationContext.java core/trunk/src/main/java/org/jboss/cache/Modification.java core/trunk/src/main/java/org/jboss/cache/NodeFactory.java core/trunk/src/main/java/org/jboss/cache/RegionImpl.java core/trunk/src/main/java/org/jboss/cache/RegionManager.java core/trunk/src/main/java/org/jboss/cache/ReplicationException.java core/trunk/src/main/java/org/jboss/cache/VersionedNode.java core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyFqnTransformer.java core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyGroup.java core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java core/trunk/src/main/java/org/jboss/cache/buddyreplication/GravitateResult.java core/trunk/src/main/java/org/jboss/cache/buddyreplication/NextMemberBuddyLocatorConfig.java core/trunk/src/main/java/org/jboss/cache/cluster/ReplicationQueue.java core/trunk/src/main/java/org/jboss/cache/commands/cachedata/EvictNodeCommand.java core/trunk/src/main/java/org/jboss/cache/commands/cachedata/GetDataMapCommand.java core/trunk/src/main/java/org/jboss/cache/commands/cachedata/PutDataMapCommand.java core/trunk/src/main/java/org/jboss/cache/commands/cachedata/PutKeyValueCommand.java core/trunk/src/main/java/org/jboss/cache/commands/cachedata/RemoveDataCommand.java core/trunk/src/main/java/org/jboss/cache/commands/cachedata/RemoveKeyCommand.java core/trunk/src/main/java/org/jboss/cache/commands/cachedata/RemoveNodeCommand.java core/trunk/src/main/java/org/jboss/cache/commands/tx/OptimisticPrepareCommand.java core/trunk/src/main/java/org/jboss/cache/commands/tx/PrepareCommand.java core/trunk/src/main/java/org/jboss/cache/commands/visitors/DataVersionCommandsVisitor.java core/trunk/src/main/java/org/jboss/cache/commands/visitors/GlobalTransactionCommandsVisitor.java core/trunk/src/main/java/org/jboss/cache/config/BuddyReplicationConfig.java core/trunk/src/main/java/org/jboss/cache/config/CacheLoaderConfig.java core/trunk/src/main/java/org/jboss/cache/config/Configuration.java core/trunk/src/main/java/org/jboss/cache/config/ConfigurationComponent.java core/trunk/src/main/java/org/jboss/cache/config/Option.java core/trunk/src/main/java/org/jboss/cache/eviction/BaseEvictionAlgorithm.java core/trunk/src/main/java/org/jboss/cache/eviction/BaseSortedEvictionAlgorithm.java core/trunk/src/main/java/org/jboss/cache/eviction/ElementSizeAlgorithm.java core/trunk/src/main/java/org/jboss/cache/eviction/ElementSizeConfiguration.java core/trunk/src/main/java/org/jboss/cache/eviction/EvictedEventNode.java core/trunk/src/main/java/org/jboss/cache/eviction/EvictionQueueList.java core/trunk/src/main/java/org/jboss/cache/eviction/EvictionTimerTask.java core/trunk/src/main/java/org/jboss/cache/eviction/FIFOAlgorithm.java core/trunk/src/main/java/org/jboss/cache/eviction/FIFOConfiguration.java core/trunk/src/main/java/org/jboss/cache/eviction/LFUAlgorithm.java core/trunk/src/main/java/org/jboss/cache/eviction/LFUConfiguration.java core/trunk/src/main/java/org/jboss/cache/eviction/LRUAlgorithm.java core/trunk/src/main/java/org/jboss/cache/eviction/LRUConfiguration.java core/trunk/src/main/java/org/jboss/cache/eviction/LRUPolicy.java core/trunk/src/main/java/org/jboss/cache/eviction/MRUAlgorithm.java core/trunk/src/main/java/org/jboss/cache/eviction/MRUConfiguration.java core/trunk/src/main/java/org/jboss/cache/eviction/MRUQueue.java core/trunk/src/main/java/org/jboss/cache/eviction/NodeEntry.java core/trunk/src/main/java/org/jboss/cache/interceptors/ActivationInterceptor.java core/trunk/src/main/java/org/jboss/cache/interceptors/InvalidationInterceptor.java core/trunk/src/main/java/org/jboss/cache/interceptors/InvocationContextInterceptor.java core/trunk/src/main/java/org/jboss/cache/interceptors/MarshalledValueInterceptor.java core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticNodeInterceptor.java core/trunk/src/main/java/org/jboss/cache/interceptors/OrderedSynchronizationHandler.java core/trunk/src/main/java/org/jboss/cache/interceptors/PassivationInterceptor.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/main/java/org/jboss/cache/invocation/CacheData.java core/trunk/src/main/java/org/jboss/cache/invocation/CacheLifecycleManager.java core/trunk/src/main/java/org/jboss/cache/invocation/NodeInvocationDelegate.java core/trunk/src/main/java/org/jboss/cache/loader/AbstractDelegatingCacheLoader.java core/trunk/src/main/java/org/jboss/cache/loader/AdjListJDBCCacheLoader.java core/trunk/src/main/java/org/jboss/cache/loader/AdjListJDBCCacheLoaderConfig.java core/trunk/src/main/java/org/jboss/cache/loader/AsyncCacheLoader.java core/trunk/src/main/java/org/jboss/cache/loader/AsyncCacheLoaderConfig.java core/trunk/src/main/java/org/jboss/cache/loader/C3p0ConnectionFactory.java core/trunk/src/main/java/org/jboss/cache/loader/ChainingCacheLoader.java core/trunk/src/main/java/org/jboss/cache/loader/ClusteredCacheLoaderConfig.java core/trunk/src/main/java/org/jboss/cache/loader/FileCacheLoader.java core/trunk/src/main/java/org/jboss/cache/loader/FileCacheLoaderConfig.java core/trunk/src/main/java/org/jboss/cache/loader/JDBCCacheLoader.java core/trunk/src/main/java/org/jboss/cache/loader/JDBCCacheLoaderConfig.java core/trunk/src/main/java/org/jboss/cache/loader/JDBCCacheLoaderOld.java core/trunk/src/main/java/org/jboss/cache/loader/LocalDelegatingCacheLoader.java core/trunk/src/main/java/org/jboss/cache/loader/ReadOnlyDelegatingCacheLoader.java core/trunk/src/main/java/org/jboss/cache/loader/bdbje/BdbjeCacheLoader.java core/trunk/src/main/java/org/jboss/cache/loader/jdbm/JdbmCacheLoader.java core/trunk/src/main/java/org/jboss/cache/loader/jdbm/Null.java core/trunk/src/main/java/org/jboss/cache/loader/tcp/TcpCacheServer.java core/trunk/src/main/java/org/jboss/cache/lock/IdentityLock.java core/trunk/src/main/java/org/jboss/cache/lock/LockStrategyRepeatableRead.java core/trunk/src/main/java/org/jboss/cache/lock/LockingException.java core/trunk/src/main/java/org/jboss/cache/lock/NonBlockingWriterLock.java core/trunk/src/main/java/org/jboss/cache/lock/ReadWriteLockWithUpgrade.java core/trunk/src/main/java/org/jboss/cache/lock/TimeoutException.java core/trunk/src/main/java/org/jboss/cache/marshall/MethodCall.java core/trunk/src/main/java/org/jboss/cache/marshall/NodeData.java core/trunk/src/main/java/org/jboss/cache/marshall/NodeDataExceptionMarker.java core/trunk/src/main/java/org/jboss/cache/marshall/NodeDataMarker.java core/trunk/src/main/java/org/jboss/cache/optimistic/DefaultDataVersion.java core/trunk/src/main/java/org/jboss/cache/optimistic/TransactionWorkspaceImpl.java core/trunk/src/main/java/org/jboss/cache/optimistic/WorkspaceNodeImpl.java core/trunk/src/main/java/org/jboss/cache/transaction/GlobalTransaction.java core/trunk/src/main/java/org/jboss/cache/transaction/OptimisticTransactionEntry.java core/trunk/src/main/java/org/jboss/cache/transaction/TransactionEntry.java core/trunk/src/main/java/org/jboss/cache/transaction/TransactionTable.java core/trunk/src/main/java/org/jboss/cache/util/ExposedByteArrayOutputStream.java core/trunk/src/main/java/org/jboss/cache/util/MapCopy.java core/trunk/src/main/java/org/jboss/cache/util/Util.java Log: Added missing @Override annotations Modified: core/trunk/src/main/java/org/jboss/cache/ConsoleListener.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/ConsoleListener.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/ConsoleListener.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -167,6 +167,7 @@ * Thread overrides. */ + @Override public void run() { cache.stop(); Modified: core/trunk/src/main/java/org/jboss/cache/DefaultCacheFactory.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/DefaultCacheFactory.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/DefaultCacheFactory.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -161,6 +161,7 @@ return createCache(c, start); } + @Override protected <T> T construct(String componentName, Class<T> componentType) { throw new UnsupportedOperationException("Should never be invoked - this is a bootstrap factory."); Modified: core/trunk/src/main/java/org/jboss/cache/Fqn.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/Fqn.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/Fqn.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -455,6 +455,7 @@ /** * Clones the Fqn. */ + @Override @SuppressWarnings("unchecked") public Fqn<E> clone() throws CloneNotSupportedException { @@ -472,6 +473,7 @@ /** * Returns true if obj is a Fqn with the same elements. */ + @Override public boolean equals(Object obj) { if (this == obj) @@ -489,6 +491,7 @@ /** * Returns a hash code with Fqn elements. */ + @Override public int hashCode() { if (hash_code == 0) @@ -508,6 +511,7 @@ * Fqn.ROOT.toString(); // "/" * </pre> */ + @Override public String toString() { if (stringRepresentation == null) Modified: core/trunk/src/main/java/org/jboss/cache/InvocationContext.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/InvocationContext.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/InvocationContext.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -239,6 +239,7 @@ this.originLocal = originLocal; } + @Override public String toString() { return "InvocationContext{" + @@ -293,6 +294,7 @@ invocationLocks = null; } + @Override public InvocationContext clone() throws CloneNotSupportedException { InvocationContext clone = (InvocationContext) super.clone(); @@ -321,6 +323,7 @@ this.setCacheLoaderHasMods(template.isCacheLoaderHasMods()); } + @Override public boolean equals(Object o) { if (this == o) return true; @@ -345,6 +348,7 @@ return true; } + @Override public int hashCode() { int result; Modified: core/trunk/src/main/java/org/jboss/cache/Modification.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/Modification.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/Modification.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -263,6 +263,7 @@ /** * Returns debug information about this modification. */ + @Override public String toString() { StringBuffer sb = new StringBuffer(); Modified: core/trunk/src/main/java/org/jboss/cache/NodeFactory.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/NodeFactory.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/NodeFactory.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -30,6 +30,7 @@ private boolean optimistic; private Configuration configuration; + @Override protected <T> T construct(String componentName, Class<T> componentType) { throw new UnsupportedOperationException("Should never be called!"); Modified: core/trunk/src/main/java/org/jboss/cache/RegionImpl.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/RegionImpl.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/RegionImpl.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -140,6 +140,7 @@ putNodeEvent(markNoUse); } + @Override public String toString() { return "RegionImpl{" + Modified: core/trunk/src/main/java/org/jboss/cache/RegionManager.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/RegionManager.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/RegionManager.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -904,6 +904,7 @@ /** * Returns a string containing debug information on every region. */ + @Override public String toString() { return "RegionManager " + dumpRegions(); Modified: core/trunk/src/main/java/org/jboss/cache/ReplicationException.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/ReplicationException.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/ReplicationException.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -37,6 +37,7 @@ super(msg, cause); } + @Override public String toString() { return super.toString(); Modified: core/trunk/src/main/java/org/jboss/cache/VersionedNode.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/VersionedNode.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/VersionedNode.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -76,6 +76,7 @@ this.version = version; } + @Override public Map getInternalState(boolean onlyInternalState) { Map state = super.getInternalState(onlyInternalState); @@ -83,6 +84,7 @@ return state; } + @Override public void setInternalState(Map state) { if (state != null) Modified: core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyFqnTransformer.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyFqnTransformer.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyFqnTransformer.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -56,6 +56,7 @@ this.factory = cf; } + @Override public Object handleCommitCommand(InvocationContext ctx, CommitCommand commitCommand) throws Throwable { return commitCommand; @@ -64,11 +65,13 @@ /** * No fqn conversion for this one. */ + @Override public Object handleDataGravitationCleanupCommand(InvocationContext ctx, DataGravitationCleanupCommand command) throws Throwable { return factory.buildDataGravitationCleanupCommand(command.getFqn(), command.getBackup()); } + @Override public Object handlePutDataMapCommand(InvocationContext ctx, PutDataMapCommand command) throws Throwable { Fqn transformed = getBackupFqn(command.getFqn()); @@ -76,6 +79,7 @@ command.isCreateUndoOps(), command.isEraseContents()); } + @Override public Object handlePutKeyValueCommand(InvocationContext ctx, PutKeyValueCommand command) throws Throwable { Fqn transformed = getBackupFqn(command.getFqn()); @@ -83,6 +87,7 @@ command.getValue(), command.isCreateUndoOps(), command.isPutForExternalRead()); } + @Override public Object handleRemoveNodeCommand(InvocationContext ctx, RemoveNodeCommand command) throws Throwable { Fqn transformed = getBackupFqn(command.getFqn()); @@ -90,6 +95,7 @@ command.isSkipSendingNodeEvents(), command.isCreateUndoOps()); } + @Override public Object handleRemoveDataCommand(InvocationContext ctx, RemoveDataCommand command) throws Throwable { Fqn transformed = getBackupFqn(command.getFqn()); @@ -97,60 +103,70 @@ command.isSendNodeEvent(), command.isEviction()); } + @Override public Object handleEvictFqnCommand(InvocationContext ctx, EvictNodeCommand command) throws Throwable { Fqn fqn = getBackupFqn(command.getFqn()); return factory.buildEvictFqnCommand(fqn); } + @Override public Object handleInvalidateCommand(InvocationContext ctx, InvalidateCommand command) throws Throwable { Fqn transformed = getBackupFqn(command.getFqn()); return factory.buildInvalidateCommand(transformed); } + @Override public Object handleRemoveKeyCommand(InvocationContext ctx, RemoveKeyCommand command) throws Throwable { Fqn transformed = getBackupFqn(command.getFqn()); return factory.buildRemoveKeyCommand(null, transformed, command.getKey(), command.isCreateUndoOps()); } + @Override public Object handleGetDataMapCommand(InvocationContext ctx, GetDataMapCommand command) throws Throwable { Fqn transformed = getBackupFqn(command.getFqn()); return factory.buildGetDataMapCommand(transformed); } + @Override public Object handleExistsNodeCommand(InvocationContext ctx, RemoteExistsNodeCommand command) throws Throwable { Fqn transformed = getBackupFqn(command.getFqn()); return factory.buildEvictFqnCommand(transformed); } + @Override public Object handleGetKeyValueCommand(InvocationContext ctx, GetKeyValueCommand command) throws Throwable { Fqn transformed = getBackupFqn(command.getFqn()); return factory.buildGetKeyValueCommand(transformed, command.getKey(), command.isSendNodeEvent()); } + @Override public Object handleGetNodeCommand(InvocationContext ctx, GetNodeCommand command) throws Throwable { Fqn transformed = getBackupFqn(command.getFqn()); return factory.buildGetNodeCommand(transformed); } + @Override public Object handleGetKeysCommand(InvocationContext ctx, GetKeysCommand command) throws Throwable { Fqn transformed = getBackupFqn(command.getFqn()); return factory.buildGetKeysCommand(transformed); } + @Override public Object handleGetChildrenNamesCommand(InvocationContext ctx, GetChildrenNamesCommand command) throws Throwable { Fqn transformed = getBackupFqn(command.getFqn()); return factory.buildGetChildrenNamesCommand(transformed); } + @Override public Object handleMoveCommand(InvocationContext ctx, MoveCommand command) throws Throwable { Fqn transformedFrom = getBackupFqn(command.getFqn()); @@ -158,12 +174,14 @@ return factory.buildMoveCommand(transformedFrom, transformedTo); } + @Override public Object handleGravitateDataCommand(InvocationContext ctx, GravitateDataCommand command) throws Throwable { Fqn transformed = getBackupFqn(command.getFqn()); return factory.buildGravitateDataCacheCommand(transformed, command.isSearchSubtrees()); } + @Override public Object handlePrepareCommand(InvocationContext ctx, PrepareCommand command) throws Throwable { List<? extends CacheCommand> toTransform = command.getModifications(); @@ -171,44 +189,52 @@ return factory.buildPrepareCommand(command.getGlobalTransaction(), transformedCommands, command.getLocalAddress(), command.isOnePhaseCommit()); } + @Override public Object handleRollbackCommand(InvocationContext ctx, RollbackCommand command) throws Throwable { return factory.buildRollbackCommand(null); } + @Override public Object handleOptimisticPrepareCommand(InvocationContext ctx, OptimisticPrepareCommand command) throws Throwable { List<MarshallableCommand> transformed = transformBatch(command.getModifications()); return factory.buildOptimisticPrepareCommand(command.getGlobalTransaction(), transformed, command.getData(), command.getLocalAddress(), command.isOnePhaseCommit()); } + @Override public Object handleReplicateCommand(InvocationContext ctx, ReplicateCommand command) throws Throwable { List<MarshallableCommand> transformed = transformBatch(command.isSingleCommand() ? Collections.singletonList(command.getSingleModification()) : command.getModifications()); return factory.buildReplicateCommand(transformed); } + @Override public Object handleAnnounceBuddyPoolName(InvocationContext ctx, AnnounceBuddyPoolNameCommand command) throws Throwable { return factory.buildAnnounceBuddyPoolNameCommand(command.getAddress(), command.getBuddyPoolName()); } + @Override public Object handleRemoveFromBuddyGroupCommand(InvocationContext ctx, RemoveFromBuddyGroupCommand command) throws Throwable { return factory.buildRemoveFromBuddyGroupCommand(command.getGroupName()); } + @Override public Object handleAssignToBuddyGroupCommand(InvocationContext ctx, AssignToBuddyGroupCommand command) throws Throwable { return factory.buildAssignToBuddyGroupCommand(command.getGroup(), command.getState()); } + @Override public Object handleClusteredGetCommand(InvocationContext ctx, ClusteredGetCommand command) throws Throwable { CacheDataCommand transformed = (CacheDataCommand) command.accept(ctx, this); return factory.buildClusteredGetCommand(command.getSearchBackupSubtrees(), transformed); } + @Override public Object handleCreateNodeCommand(InvocationContext ctx, CreateNodeCommand command) throws Throwable { return factory.buildCreateNodeCommand(getBackupFqn(command.getFqn())); Modified: core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyGroup.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyGroup.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyGroup.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -86,6 +86,7 @@ return lastModified; } + @Override public String toString() { StringBuffer b = new StringBuffer("BuddyGroup: ("); 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-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -326,6 +326,7 @@ this.newMembers = newMembers; } + @Override public String toString() { return "MembershipChange: Old members = " + oldMembers + " New members = " + newMembers; Modified: core/trunk/src/main/java/org/jboss/cache/buddyreplication/GravitateResult.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/buddyreplication/GravitateResult.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/buddyreplication/GravitateResult.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -73,6 +73,7 @@ return nodeData; } + @Override public String toString() { return "Result dataFound=" + dataFound + Modified: core/trunk/src/main/java/org/jboss/cache/buddyreplication/NextMemberBuddyLocatorConfig.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/buddyreplication/NextMemberBuddyLocatorConfig.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/buddyreplication/NextMemberBuddyLocatorConfig.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -37,11 +37,13 @@ setBuddyLocatorProperties(base.getBuddyLocatorProperties()); } + @Override public String getBuddyLocatorClass() { return NextMemberBuddyLocator.class.getName(); } + @Override public void setBuddyLocatorClass(String buddyLocatorClass) { // ignore it @@ -69,6 +71,7 @@ this.numBuddies = numBuddies; } + @Override public void setBuddyLocatorProperties(Properties props) { super.setBuddyLocatorProperties(props); @@ -94,7 +97,7 @@ { NextMemberBuddyLocatorConfig other = (NextMemberBuddyLocatorConfig) obj; return (other.ignoreColocatedBuddies == this.ignoreColocatedBuddies) - && (other.numBuddies == this.numBuddies); + && (other.numBuddies == this.numBuddies); } return false; } @@ -113,8 +116,6 @@ { return (NextMemberBuddyLocatorConfig) super.clone(); } - - } \ No newline at end of file Modified: core/trunk/src/main/java/org/jboss/cache/cluster/ReplicationQueue.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/cluster/ReplicationQueue.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/cluster/ReplicationQueue.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -165,6 +165,7 @@ class MyTask extends TimerTask { + @Override public void run() { flush(); Modified: core/trunk/src/main/java/org/jboss/cache/commands/cachedata/EvictNodeCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/cachedata/EvictNodeCommand.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/commands/cachedata/EvictNodeCommand.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -39,6 +39,7 @@ return isVersioned() ? VERSIONED_METHOD_ID : METHOD_ID; } + @Override protected boolean isVersionedId(int id) { return VERSIONED_METHOD_ID == id; Modified: core/trunk/src/main/java/org/jboss/cache/commands/cachedata/GetDataMapCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/cachedata/GetDataMapCommand.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/commands/cachedata/GetDataMapCommand.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -31,6 +31,7 @@ this.fqn = fqn; } + @Override @Inject public void initialize(CacheData cacheData) { Modified: core/trunk/src/main/java/org/jboss/cache/commands/cachedata/PutDataMapCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/cachedata/PutDataMapCommand.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/commands/cachedata/PutDataMapCommand.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -156,6 +156,7 @@ if (isVersionedId(commandId)) dataVersion = (DataVersion) args[4]; } + @Override protected boolean isVersionedId(int id) { return id == VERSIONED_METHOD_ID || id == ERASE_VERSIONED_METHOD_ID; Modified: core/trunk/src/main/java/org/jboss/cache/commands/cachedata/PutKeyValueCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/cachedata/PutKeyValueCommand.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/commands/cachedata/PutKeyValueCommand.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -202,6 +202,7 @@ return result; } + @Override protected boolean isVersionedId(int commandId) { return commandId == PUT_FOR_EXT_READ_VERSIONED_METHOD_ID || commandId == VERSIONED_METHOD_ID; Modified: core/trunk/src/main/java/org/jboss/cache/commands/cachedata/RemoveDataCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/cachedata/RemoveDataCommand.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/commands/cachedata/RemoveDataCommand.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -204,6 +204,7 @@ return result; } + @Override protected boolean isVersionedId(int id) { return id == VERSIONED_METHOD_ID; Modified: core/trunk/src/main/java/org/jboss/cache/commands/cachedata/RemoveKeyCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/cachedata/RemoveKeyCommand.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/commands/cachedata/RemoveKeyCommand.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -156,6 +156,7 @@ return result; } + @Override protected boolean isVersionedId(int id) { return id == VERSIONED_METHOD_ID; Modified: core/trunk/src/main/java/org/jboss/cache/commands/cachedata/RemoveNodeCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/cachedata/RemoveNodeCommand.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/commands/cachedata/RemoveNodeCommand.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -256,6 +256,7 @@ return result; } + @Override protected boolean isVersionedId(int id) { return id == VERSIONED_METHOD_ID; Modified: core/trunk/src/main/java/org/jboss/cache/commands/tx/OptimisticPrepareCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/tx/OptimisticPrepareCommand.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/commands/tx/OptimisticPrepareCommand.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -28,6 +28,7 @@ this.data = data; } + @Override public Object accept(InvocationContext ctx, CommandsVisitor handler) throws Throwable { return handler.handleOptimisticPrepareCommand(ctx, this); Modified: core/trunk/src/main/java/org/jboss/cache/commands/tx/PrepareCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/tx/PrepareCommand.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/commands/tx/PrepareCommand.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -112,6 +112,7 @@ } + @Override public String toString() { return "PrepareCommand{" + Modified: core/trunk/src/main/java/org/jboss/cache/commands/visitors/DataVersionCommandsVisitor.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/visitors/DataVersionCommandsVisitor.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/commands/visitors/DataVersionCommandsVisitor.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -1,13 +1,17 @@ package org.jboss.cache.commands.visitors; import org.jboss.cache.InvocationContext; -import org.jboss.cache.commands.cachedata.*; +import org.jboss.cache.commands.cachedata.PutDataMapCommand; +import org.jboss.cache.commands.cachedata.PutKeyValueCommand; +import org.jboss.cache.commands.cachedata.RemoveDataCommand; +import org.jboss.cache.commands.cachedata.RemoveKeyCommand; +import org.jboss.cache.commands.cachedata.RemoveNodeCommand; import org.jboss.cache.commands.state.DataVersionCommand; /** * Similar to {@link AbstractCommandsVisitor} but delegates the handlers of {@link org.jboss.cache.commands.state.DataVersionCommand} * to {@link #handleDataVersionCommand(org.jboss.cache.InvocationContext, org.jboss.cache.commands.state.DataVersionCommand)}. - * All other handlers are delegated by default to + * All other handlers are delegated by default to * {@link #handleDefault(org.jboss.cache.InvocationContext, org.jboss.cache.commands.CacheCommand)} * * @author Mircea.Markus(a)jboss.com @@ -15,26 +19,31 @@ */ public abstract class DataVersionCommandsVisitor extends AbstractCommandsVisitor { + @Override public Object handlePutDataMapCommand(InvocationContext ctx, PutDataMapCommand command) throws Throwable { return handleDataVersionCommand(ctx, command); } + @Override public Object handlePutKeyValueCommand(InvocationContext ctx, PutKeyValueCommand command) throws Throwable { return handleDataVersionCommand(ctx, command); } + @Override public Object handleRemoveNodeCommand(InvocationContext ctx, RemoveNodeCommand command) throws Throwable { return handleDataVersionCommand(ctx, command); } + @Override public Object handleRemoveDataCommand(InvocationContext ctx, RemoveDataCommand command) throws Throwable { return handleDataVersionCommand(ctx, command); } + @Override public Object handleRemoveKeyCommand(InvocationContext ctx, RemoveKeyCommand command) throws Throwable { return handleDataVersionCommand(ctx, command); Modified: core/trunk/src/main/java/org/jboss/cache/commands/visitors/GlobalTransactionCommandsVisitor.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/visitors/GlobalTransactionCommandsVisitor.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/commands/visitors/GlobalTransactionCommandsVisitor.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -1,13 +1,17 @@ package org.jboss.cache.commands.visitors; import org.jboss.cache.InvocationContext; -import org.jboss.cache.commands.cachedata.*; +import org.jboss.cache.commands.cachedata.PutDataMapCommand; +import org.jboss.cache.commands.cachedata.PutKeyValueCommand; +import org.jboss.cache.commands.cachedata.RemoveDataCommand; +import org.jboss.cache.commands.cachedata.RemoveKeyCommand; +import org.jboss.cache.commands.cachedata.RemoveNodeCommand; +import org.jboss.cache.commands.remote.DataGravitationCleanupCommand; import org.jboss.cache.commands.state.GlobalTransactionCommand; import org.jboss.cache.commands.tx.CommitCommand; +import org.jboss.cache.commands.tx.OptimisticPrepareCommand; import org.jboss.cache.commands.tx.PrepareCommand; import org.jboss.cache.commands.tx.RollbackCommand; -import org.jboss.cache.commands.tx.OptimisticPrepareCommand; -import org.jboss.cache.commands.remote.DataGravitationCleanupCommand; /** * @author Mircea.Markus(a)jboss.com @@ -16,52 +20,62 @@ public abstract class GlobalTransactionCommandsVisitor extends AbstractCommandsVisitor { + @Override public Object handlePutDataMapCommand(InvocationContext ctx, PutDataMapCommand command) throws Throwable { return handleGlobalTransactionCommands(command); } + @Override public Object handlePutKeyValueCommand(InvocationContext ctx, PutKeyValueCommand command) throws Throwable { return handleGlobalTransactionCommands(command); } + @Override public Object handleRemoveDataCommand(InvocationContext ctx, RemoveDataCommand command) throws Throwable { return handleGlobalTransactionCommands(command); } + @Override public Object handleRemoveNodeCommand(InvocationContext ctx, RemoveNodeCommand command) throws Throwable { return handleGlobalTransactionCommands(command); } + @Override public Object handleRemoveKeyCommand(InvocationContext ctx, RemoveKeyCommand command) throws Throwable { return handleGlobalTransactionCommands(command); } + @Override public Object handleDataGravitationCleanupCommand(InvocationContext ctx, DataGravitationCleanupCommand command) throws Throwable { return handleGlobalTransactionCommands(command); } + @Override public Object handleCommitCommand(InvocationContext ctx, CommitCommand command) throws Throwable { return handleGlobalTransactionCommands(command); } + @Override public Object handlePrepareCommand(InvocationContext ctx, PrepareCommand command) throws Throwable { return handleGlobalTransactionCommands(command); } + @Override public Object handleRollbackCommand(InvocationContext ctx, RollbackCommand command) throws Throwable { return handleGlobalTransactionCommands(command); } + @Override public Object handleOptimisticPrepareCommand(InvocationContext ctx, OptimisticPrepareCommand command) throws Throwable { return handleGlobalTransactionCommands(command); Modified: core/trunk/src/main/java/org/jboss/cache/config/BuddyReplicationConfig.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/config/BuddyReplicationConfig.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/config/BuddyReplicationConfig.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -125,6 +125,7 @@ this.buddyLocatorConfig = buddyLocatorConfig; } + @Override public boolean equals(Object obj) { if (this == obj) @@ -145,6 +146,7 @@ return false; } + @Override public int hashCode() { int result = 11; @@ -198,6 +200,7 @@ this.buddyLocatorProperties = buddyLocatorProperties; } + @Override public boolean equals(Object obj) { if (this == obj) @@ -212,6 +215,7 @@ return false; } + @Override public int hashCode() { int result = 19; @@ -220,6 +224,7 @@ return result; } + @Override public String toString() { return super.toString() + " class=" + buddyLocatorClass + Modified: core/trunk/src/main/java/org/jboss/cache/config/CacheLoaderConfig.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/config/CacheLoaderConfig.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/config/CacheLoaderConfig.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -88,6 +88,7 @@ return !isPassivation() && cacheLoaderConfigs.size() > 1; } + @Override public String toString() { return new StringBuffer().append("CacheLoaderConfig{").append("shared=").append(shared).append(", passivation=").append(passivation).append(", preload='").append(preload).append('\'').append(", cacheLoaderConfigs.size()=").append(cacheLoaderConfigs.size()).append('}').toString(); Modified: core/trunk/src/main/java/org/jboss/cache/config/Configuration.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/config/Configuration.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/config/Configuration.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -835,6 +835,7 @@ return result; } + @Override public Configuration clone() throws CloneNotSupportedException { Configuration c = (Configuration) super.clone(); Modified: core/trunk/src/main/java/org/jboss/cache/config/ConfigurationComponent.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/config/ConfigurationComponent.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/config/ConfigurationComponent.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -149,6 +149,7 @@ setCache(cr.getComponent(CacheSPI.class)); } + @Override public ConfigurationComponent clone() throws CloneNotSupportedException { ConfigurationComponent c = (ConfigurationComponent) super.clone(); Modified: core/trunk/src/main/java/org/jboss/cache/config/Option.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/config/Option.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/config/Option.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -235,6 +235,7 @@ this.lockAcquisitionTimeout = lockAcquisitionTimeout; } + @Override public String toString() { return "Option{" + @@ -250,12 +251,14 @@ '}'; } + @Override public Option clone() throws CloneNotSupportedException { return (Option) super.clone(); } + @Override public boolean equals(Object o) { if (this == o) return true; @@ -276,6 +279,7 @@ return true; } + @Override public int hashCode() { int result; Modified: core/trunk/src/main/java/org/jboss/cache/eviction/BaseEvictionAlgorithm.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/eviction/BaseEvictionAlgorithm.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/eviction/BaseEvictionAlgorithm.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -198,9 +198,9 @@ if (!result) { log.warn("Unable to add Fqn[" + ne.getFqn() + "] to recycle " + - "queue because it's full. This is often sign that " + - "evictions are not occurring and nodes that should be " + - "evicted are piling up waiting to be evicted."); + "queue because it's full. This is often sign that " + + "evictions are not occurring and nodes that should be " + + "evicted are piling up waiting to be evicted."); } } catch (InterruptedException e) @@ -553,6 +553,7 @@ /** * Returns debug information. */ + @Override public String toString() { return super.toString() + Modified: core/trunk/src/main/java/org/jboss/cache/eviction/BaseSortedEvictionAlgorithm.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/eviction/BaseSortedEvictionAlgorithm.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/eviction/BaseSortedEvictionAlgorithm.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -27,11 +27,13 @@ { private static final Log log = LogFactory.getLog(BaseSortedEvictionAlgorithm.class); + @Override public void process(Region region) throws EvictionException { super.process(region); } + @Override protected void processQueues(Region region) throws EvictionException { boolean evictionNodesModified = false; Modified: core/trunk/src/main/java/org/jboss/cache/eviction/ElementSizeAlgorithm.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/eviction/ElementSizeAlgorithm.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/eviction/ElementSizeAlgorithm.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -15,11 +15,13 @@ */ public class ElementSizeAlgorithm extends BaseSortedEvictionAlgorithm { + @Override protected EvictionQueue setupEvictionQueue(Region region) throws EvictionException { return new ElementSizeQueue(); } + @Override protected boolean shouldEvictNode(NodeEntry ne) { // check the minimum time to live and see if we should not evict the node. This check will Modified: core/trunk/src/main/java/org/jboss/cache/eviction/ElementSizeConfiguration.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/eviction/ElementSizeConfiguration.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/eviction/ElementSizeConfiguration.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -10,7 +10,7 @@ import org.jboss.cache.config.Dynamic; /** - * Configuration for {@link ElementSizePolicy}. + * Configuration for {@link ElementSizePolicy}. * * If configured via XML, expects the following: * @@ -20,19 +20,20 @@ * <attribute name="maxNodes">10000</attribute> * </region> * </pre> - * + * * Requires a positive "maxElementsPerNode" value otherwise a ConfigurationException is thrown. - * + * * @author Daniel Huang * @author Brian Stansberry - * * @version $Revision$ */ public class ElementSizeConfiguration extends EvictionPolicyConfigBase { - /** The serialVersionUID */ + /** + * The serialVersionUID + */ private static final long serialVersionUID = 2510593544656833758L; - + @Dynamic private int maxElementsPerNode; @@ -48,7 +49,7 @@ { setEvictionPolicyClass(ElementSizePolicy.class.getName()); } - + public int getMaxElementsPerNode() { return maxElementsPerNode; @@ -59,7 +60,7 @@ testImmutability("maxElementsPerNode"); this.maxElementsPerNode = maxElementsPerNode; } - + /** * Requires a positive maxElementsPerNode value or ConfigurationException * is thrown. @@ -67,13 +68,14 @@ @Override public void validate() throws ConfigurationException { - if (maxElementsPerNode < 0) + if (maxElementsPerNode < 0) { throw new ConfigurationException("maxElementsPerNode must be must be " + - "configured to a value greater than or equal to 0"); + "configured to a value greater than or equal to 0"); } } + @Override public String toString() { StringBuffer str = new StringBuffer(); @@ -114,6 +116,6 @@ { return (ElementSizeConfiguration) super.clone(); } - - + + } Modified: core/trunk/src/main/java/org/jboss/cache/eviction/EvictedEventNode.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/eviction/EvictedEventNode.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/eviction/EvictedEventNode.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -93,6 +93,7 @@ return type_; } + @Override public String toString() { return "EvictedEN[fqn=" + fqn_ + " event=" + type_ + " diff=" + elementDifference_ + "]"; Modified: core/trunk/src/main/java/org/jboss/cache/eviction/EvictionQueueList.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/eviction/EvictionQueueList.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/eviction/EvictionQueueList.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -210,6 +210,7 @@ return entry.previous == null; } + @Override public String toString() { return Arrays.asList(toArray()).toString(); @@ -348,17 +349,20 @@ this.node = node; } + @Override public boolean equals(Object o) { EvictionListEntry entry = (EvictionListEntry) o; return this.node.getFqn().equals(entry.node.getFqn()); } + @Override public int hashCode() { return this.node.getFqn().hashCode(); } + @Override public String toString() { return "EntryLE=" + node; Modified: core/trunk/src/main/java/org/jboss/cache/eviction/EvictionTimerTask.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/eviction/EvictionTimerTask.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/eviction/EvictionTimerTask.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -96,6 +96,7 @@ * This thread will synchronize the set of regions and iterate through every MarshRegion registered w/ the * Eviction thread. It also synchronizes on each individual region as it is being processed. */ + @Override public void run() { synchronized (processedRegions) @@ -116,7 +117,7 @@ catch (EvictionException e) { log.error("run(): error processing eviction with exception: " + e.toString() - + " will reset the eviction queue list."); + + " will reset the eviction queue list."); region.resetEvictionQueues(); log.debug("trace", e); } Modified: core/trunk/src/main/java/org/jboss/cache/eviction/FIFOAlgorithm.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/eviction/FIFOAlgorithm.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/eviction/FIFOAlgorithm.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -22,6 +22,7 @@ private static final Log log = LogFactory.getLog(FIFOAlgorithm.class); + @Override protected EvictionQueue setupEvictionQueue(Region region) throws EvictionException { return new FIFOQueue(); @@ -30,6 +31,7 @@ /** * For FIFO, a node should be evicted if the queue size is >= to the configured maxNodes size. */ + @Override protected boolean shouldEvictNode(NodeEntry ne) { // check the minimum time to live and see if we should not evict the node. This check will Modified: core/trunk/src/main/java/org/jboss/cache/eviction/FIFOConfiguration.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/eviction/FIFOConfiguration.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/eviction/FIFOConfiguration.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -18,7 +18,7 @@ * <attribute name="maxNodes">1000</attribute> * </region> * </pre> - * + * * Requires a "maxNodes" attribute otherwise a ConfigurationException is thrown. * * @author Daniel Huang (dhuang(a)jboss.org) @@ -26,7 +26,9 @@ */ public class FIFOConfiguration extends EvictionPolicyConfigBase { - /** The serialVersionUID */ + /** + * The serialVersionUID + */ private static final long serialVersionUID = -7229715009546277313L; public FIFOConfiguration() @@ -35,7 +37,7 @@ // We require that maxNodes is set setMaxNodes(-1); } - + /** * Requires a positive maxNodes value or ConfigurationException * is thrown. @@ -46,10 +48,11 @@ if (getMaxNodes() < 0) { throw new ConfigurationException("maxNodes must be must be " + - "configured to a value greater than or equal to 0"); + "configured to a value greater than or equal to 0"); } } + @Override public String toString() { StringBuffer ret = new StringBuffer(); @@ -62,7 +65,7 @@ { return (obj instanceof FIFOConfiguration && super.equals(obj)); } - + @Override protected void setEvictionPolicyClassName() { @@ -80,6 +83,6 @@ { return (FIFOConfiguration) super.clone(); } - - + + } Modified: core/trunk/src/main/java/org/jboss/cache/eviction/LFUAlgorithm.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/eviction/LFUAlgorithm.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/eviction/LFUAlgorithm.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -36,6 +36,7 @@ { private static final Log log = LogFactory.getLog(LFUAlgorithm.class); + @Override protected boolean shouldEvictNode(NodeEntry ne) { if (log.isTraceEnabled()) @@ -68,6 +69,7 @@ * @return The created LFUQueue. * @throws EvictionException */ + @Override protected EvictionQueue setupEvictionQueue(Region region) throws EvictionException { return new LFUQueue(); Modified: core/trunk/src/main/java/org/jboss/cache/eviction/LFUConfiguration.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/eviction/LFUConfiguration.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/eviction/LFUConfiguration.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -50,6 +50,7 @@ this.minNodes = minNodes; } + @Override public String toString() { StringBuffer ret = new StringBuffer(); Modified: core/trunk/src/main/java/org/jboss/cache/eviction/LRUAlgorithm.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/eviction/LRUAlgorithm.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/eviction/LRUAlgorithm.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -24,11 +24,13 @@ { private static final Log log = LogFactory.getLog(LRUAlgorithm.class); + @Override protected EvictionQueue setupEvictionQueue(Region region) throws EvictionException { return new LRUQueue(); } + @Override protected boolean shouldEvictNode(NodeEntry entry) { // check the minimum time to live and see if we should not evict the node. This check will Modified: core/trunk/src/main/java/org/jboss/cache/eviction/LRUConfiguration.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/eviction/LRUConfiguration.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/eviction/LRUConfiguration.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -10,7 +10,7 @@ import org.jboss.cache.config.Dynamic; /** - * Configuration implementation for {@link LRUPolicy}. + * Configuration implementation for {@link LRUPolicy}. * * If configured via XML, expects the following: * @@ -27,7 +27,9 @@ */ public class LRUConfiguration extends EvictionPolicyConfigBase { - /** The serialVersionUID */ + /** + * The serialVersionUID + */ private static final long serialVersionUID = -3426716488271559729L; @Dynamic @@ -48,7 +50,7 @@ setEvictionPolicyClass(LRUPolicy.class.getName()); } - + public int getTimeToLiveSeconds() { return timeToLiveSeconds; @@ -58,7 +60,7 @@ { testImmutability("timeToLiveSeconds"); this.timeToLiveSeconds = timeToLiveSeconds; - } + } public int getMaxAgeSeconds() { @@ -70,7 +72,7 @@ testImmutability("maxAgeSeconds"); this.maxAgeSeconds = maxAgeSeconds; } - + /** * Requires a positive timeToLiveSeconds value or ConfigurationException * is thrown. @@ -81,10 +83,11 @@ if (timeToLiveSeconds < 0) { throw new ConfigurationException("timeToLiveSeconds must be " + - "configured to a value greater than or equal to 0"); + "configured to a value greater than or equal to 0"); } } + @Override public String toString() { StringBuffer str = new StringBuffer(); @@ -100,7 +103,7 @@ { LRUConfiguration other = (LRUConfiguration) obj; return maxAgeSeconds == other.maxAgeSeconds - && timeToLiveSeconds == other.timeToLiveSeconds; + && timeToLiveSeconds == other.timeToLiveSeconds; } return false; } @@ -126,5 +129,5 @@ { return (LRUConfiguration) super.clone(); } - + } Modified: core/trunk/src/main/java/org/jboss/cache/eviction/LRUPolicy.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/eviction/LRUPolicy.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/eviction/LRUPolicy.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -40,6 +40,7 @@ return LRUConfiguration.class; } + @Override public void setCache(CacheSPI cache) { super.setCache(cache); Modified: core/trunk/src/main/java/org/jboss/cache/eviction/MRUAlgorithm.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/eviction/MRUAlgorithm.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/eviction/MRUAlgorithm.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -21,11 +21,13 @@ */ public class MRUAlgorithm extends BaseEvictionAlgorithm { + @Override protected EvictionQueue setupEvictionQueue(Region region) throws EvictionException { return new MRUQueue(); } + @Override protected boolean shouldEvictNode(NodeEntry ne) { // check the minimum time to live and see if we should not evict the node. This check will Modified: core/trunk/src/main/java/org/jboss/cache/eviction/MRUConfiguration.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/eviction/MRUConfiguration.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/eviction/MRUConfiguration.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -18,7 +18,7 @@ * <attribute name="maxNodes">1000</attribute> * </region> * </pre> - * + * * Requires a "maxNodes" attribute otherwise a ConfigurationException is thrown. * * @author Daniel Huang (dhuang(a)jboss.org) @@ -26,7 +26,9 @@ */ public class MRUConfiguration extends EvictionPolicyConfigBase { - /** The serialVersionUID */ + /** + * The serialVersionUID + */ private static final long serialVersionUID = -8734577898966155218L; public MRUConfiguration() @@ -54,6 +56,7 @@ throw new ConfigurationException("maxNodes not configured"); } + @Override public String toString() { StringBuffer str = new StringBuffer(); @@ -79,5 +82,5 @@ { return (MRUConfiguration) super.clone(); } - + } Modified: core/trunk/src/main/java/org/jboss/cache/eviction/MRUQueue.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/eviction/MRUQueue.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/eviction/MRUQueue.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -146,6 +146,7 @@ return list.iterator(); } + @Override public String toString() { return list.toString(); Modified: core/trunk/src/main/java/org/jboss/cache/eviction/NodeEntry.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/eviction/NodeEntry.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/eviction/NodeEntry.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -1,8 +1,8 @@ package org.jboss.cache.eviction; -import org.jboss.cache.Fqn; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.jboss.cache.Fqn; /** * Value object used in queue @@ -135,11 +135,13 @@ this.fqn = fqn; } + @Override public int hashCode() { return fqn.hashCode(); } + @Override public boolean equals(Object o) { if (!(o instanceof NodeEntry)) @@ -148,6 +150,7 @@ return fqn.equals(ne.getFqn()); } + @Override public String toString() { StringBuffer output = new StringBuffer(); Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/ActivationInterceptor.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/interceptors/ActivationInterceptor.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/ActivationInterceptor.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -282,6 +282,7 @@ this.notifier = notifier; } + @Override public Object handleRemoveNodeCommand(InvocationContext ctx, RemoveNodeCommand removeNodeCommand) throws Throwable { Modification mod = new Modification(Modification.ModificationType.REMOVE_NODE, removeNodeCommand.getFqn()); @@ -289,6 +290,7 @@ return null; } + @Override public Object handlePutDataMapCommand(InvocationContext ctx, PutDataMapCommand command) throws Throwable { Fqn fqn = command.getFqn(); @@ -329,6 +331,7 @@ } + @Override public Object handlePutKeyValueCommand(InvocationContext ctx, PutKeyValueCommand putKeyValueCommand) throws Throwable { return super.handlePutKeyValueCommand(ctx, putKeyValueCommand); Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/InvalidationInterceptor.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/interceptors/InvalidationInterceptor.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/InvalidationInterceptor.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -70,6 +70,7 @@ protected boolean optimistic; private CommandsFactory commandsFactory; + @Override @Inject public void injectComponents(RPCManager rpcManager, BuddyManager buddyManager, ReplicationQueue replicationQueue, Configuration config, TransactionTable txTable, CommandsFactory commandsFactory) @@ -99,42 +100,50 @@ return false; } + @Override public Object handlePutDataMapCommand(InvocationContext ctx, PutDataMapCommand command) throws Throwable { return handleCrudMethod(ctx, command.getFqn(), null, command); } + @Override public Object handlePutKeyValueCommand(InvocationContext ctx, PutKeyValueCommand command) throws Throwable { if (command.isPutForExternalRead()) return invokeNextInterceptor(ctx, command); return handleCrudMethod(ctx, command.getFqn(), null, command); } + @Override public Object handleRemoveNodeCommand(InvocationContext ctx, RemoveNodeCommand command) throws Throwable { return handleCrudMethod(ctx, command.getFqn(), null, command); } + @Override public Object handleRemoveKeyCommand(InvocationContext ctx, RemoveKeyCommand command) throws Throwable { return handleCrudMethod(ctx, command.getFqn(), null, command); } + @Override public Object handleDataGravitationCleanupCommand(InvocationContext ctx, DataGravitationCleanupCommand command) throws Throwable { return handleCrudMethod(ctx, command.getFqn(), null, command); } + @Override public Object handleMoveCommand(InvocationContext ctx, MoveCommand command) throws Throwable { return handleCrudMethod(ctx, command.getTo(), command.getFqn(), command); } + @Override public Object handleRemoveDataCommand(InvocationContext ctx, RemoveDataCommand command) throws Throwable { return handleCrudMethod(ctx, command.getFqn(), null, command); } + @Override public Object handlePrepareCommand(InvocationContext ctx, PrepareCommand command) throws Throwable { Object retval = invokeNextInterceptor(ctx, command); @@ -159,6 +168,7 @@ return retval; } + @Override public Object handleOptimisticPrepareCommand(InvocationContext ctx, OptimisticPrepareCommand command) throws Throwable { Object retval = invokeNextInterceptor(ctx, command); @@ -178,6 +188,7 @@ return retval; } + @Override public Object handleCommitCommand(InvocationContext ctx, CommitCommand command) throws Throwable { Object retval = invokeNextInterceptor(ctx, command); @@ -192,6 +203,7 @@ return retval; } + @Override public Object handleRollbackCommand(InvocationContext ctx, RollbackCommand command) throws Throwable { Object retval = invokeNextInterceptor(ctx, command); @@ -284,6 +296,7 @@ result = new HashSet<Fqn>(maxSetSize); } + @Override public Object handlePutKeyValueCommand(InvocationContext ctx, PutKeyValueCommand command) throws Throwable { if (command.isPutForExternalRead()) @@ -295,31 +308,37 @@ return null; } + @Override public Object handlePutDataMapCommand(InvocationContext ctx, PutDataMapCommand command) throws Throwable { return addFqn(command.getFqn()); } + @Override public Object handleRemoveNodeCommand(InvocationContext ctx, RemoveNodeCommand command) throws Throwable { return addFqn(command.getFqn()); } + @Override public Object handleRemoveDataCommand(InvocationContext ctx, RemoveDataCommand command) throws Throwable { return addFqn(command.getFqn()); } + @Override public Object handleRemoveKeyCommand(InvocationContext ctx, RemoveKeyCommand command) throws Throwable { return addFqn(command.getFqn()); } + @Override public Object handleDataGravitationCleanupCommand(InvocationContext ctx, DataGravitationCleanupCommand command) throws Throwable { return addFqn(command.getFqn()); } + @Override public Object handleMoveCommand(InvocationContext ctx, MoveCommand command) throws Throwable { if (containsPutForExternalRead) return null; @@ -344,11 +363,13 @@ return invalidations; } + @Override public void resetStatistics() { invalidations = 0; } + @Override public Map<String, Object> dumpStatistics() { Map<String, Object> retval = new HashMap<String, Object>(); Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/InvocationContextInterceptor.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/interceptors/InvocationContextInterceptor.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/InvocationContextInterceptor.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -45,56 +45,67 @@ this.rpcManager = rpcManager; } + @Override public Object handlePutDataMapCommand(InvocationContext ctx, PutDataMapCommand command) throws Throwable { return handleAll(ctx, command, command.getGlobalTransaction()); } + @Override public Object handlePutKeyValueCommand(InvocationContext ctx, PutKeyValueCommand command) throws Throwable { return handleAll(ctx, command, command.getGlobalTransaction()); } + @Override public Object handleRemoveNodeCommand(InvocationContext ctx, RemoveNodeCommand command) throws Throwable { return handleAll(ctx, command, command.getGlobalTransaction()); } + @Override public Object handleRemoveDataCommand(InvocationContext ctx, RemoveDataCommand command) throws Throwable { return handleAll(ctx, command, command.getGlobalTransaction()); } + @Override public Object handleRemoveKeyCommand(InvocationContext ctx, RemoveKeyCommand command) throws Throwable { return handleAll(ctx, command, command.getGlobalTransaction()); } + @Override public Object handlePrepareCommand(InvocationContext ctx, PrepareCommand command) throws Throwable { return handleAll(ctx, command, command.getGlobalTransaction()); } + @Override public Object handleRollbackCommand(InvocationContext ctx, RollbackCommand command) throws Throwable { return handleAll(ctx, command, command.getGlobalTransaction()); } + @Override public Object handleCommitCommand(InvocationContext ctx, CommitCommand command) throws Throwable { return handleAll(ctx, command, command.getGlobalTransaction()); } + @Override public Object handleOptimisticPrepareCommand(InvocationContext ctx, OptimisticPrepareCommand command) throws Throwable { return handleAll(ctx, command, command.getGlobalTransaction()); } + @Override public Object handleDataGravitationCleanupCommand(InvocationContext ctx, DataGravitationCleanupCommand command) throws Throwable { return handleAll(ctx, command, command.getGlobalTransaction()); } + @Override public Object handleDefault(InvocationContext ctx, CacheCommand command) throws Throwable { return handleAll(ctx, command, null); Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/MarshalledValueInterceptor.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/interceptors/MarshalledValueInterceptor.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/MarshalledValueInterceptor.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -1,15 +1,23 @@ package org.jboss.cache.interceptors; import org.jboss.cache.InvocationContext; -import org.jboss.cache.commands.cachedata.*; import org.jboss.cache.commands.CacheCommand; +import org.jboss.cache.commands.cachedata.GetChildrenNamesCommand; +import org.jboss.cache.commands.cachedata.GetDataMapCommand; +import org.jboss.cache.commands.cachedata.GetKeyValueCommand; +import org.jboss.cache.commands.cachedata.GetKeysCommand; +import org.jboss.cache.commands.cachedata.GetNodeCommand; +import org.jboss.cache.commands.cachedata.PutDataMapCommand; +import org.jboss.cache.commands.cachedata.PutKeyValueCommand; +import org.jboss.cache.commands.cachedata.RemoveDataCommand; +import org.jboss.cache.commands.cachedata.RemoveKeyCommand; import org.jboss.cache.interceptors.base.ChainedInterceptor; import org.jboss.cache.marshall.MarshalledValue; import org.jboss.cache.marshall.MarshalledValueHelper; import org.jboss.cache.marshall.MarshalledValueMap; +import java.io.IOException; import java.io.NotSerializableException; -import java.io.IOException; import java.util.HashMap; import java.util.HashSet; import java.util.Map; @@ -29,6 +37,7 @@ public class MarshalledValueInterceptor extends ChainedInterceptor { + @Override public Object handlePutDataMapCommand(InvocationContext ctx, PutDataMapCommand command) throws Throwable { if (command.getDataVersion() != null) @@ -41,6 +50,7 @@ return compactAndProcessRetVal(command, marshalledValues, retVal); } + @Override public Object handleGetDataMapCommand(InvocationContext ctx, GetDataMapCommand command) throws Throwable { Object retVal = invokeNextInterceptor(ctx, command); @@ -53,6 +63,7 @@ return retVal; } + @Override public Object handlePutKeyValueCommand(InvocationContext ctx, PutKeyValueCommand command) throws Throwable { Set<MarshalledValue> marshalledValues = new HashSet<MarshalledValue>(); @@ -77,12 +88,14 @@ return processRetVal(retVal); } + @Override public Object handleRemoveDataCommand(InvocationContext ctx, RemoveDataCommand command) throws Throwable { Object retVal = invokeNextInterceptor(ctx, command); return processRetVal(retVal); } + @Override public Object handleRemoveKeyCommand(InvocationContext ctx, RemoveKeyCommand command) throws Throwable { Set<MarshalledValue> marshalledValues = new HashSet<MarshalledValue>(); @@ -95,18 +108,21 @@ return compactAndProcessRetVal(command, marshalledValues, retVal); } + @Override public Object handleGetChildrenNamesCommand(InvocationContext ctx, GetChildrenNamesCommand command) throws Throwable { Object retVal = invokeNextInterceptor(ctx, command); return processRetVal(retVal); } + @Override public Object handleGetKeysCommand(InvocationContext ctx, GetKeysCommand command) throws Throwable { Object retVal = invokeNextInterceptor(ctx, command); return processRetVal(retVal); } + @Override public Object handleGetKeyValueCommand(InvocationContext ctx, GetKeyValueCommand command) throws Throwable { Set<MarshalledValue> marshalledValues = new HashSet<MarshalledValue>(); Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticNodeInterceptor.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticNodeInterceptor.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticNodeInterceptor.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -69,6 +69,7 @@ trace = log.isTraceEnabled(); } + @Override public Object handleDataGravitationCleanupCommand(InvocationContext ctx, DataGravitationCleanupCommand command) throws Throwable { GlobalTransaction gtx = getGlobalTransaction(ctx); @@ -83,6 +84,7 @@ return result; } + @Override public Object handleRemoveNodeCommand(InvocationContext ctx, RemoveNodeCommand command) throws Throwable { GlobalTransaction gtx = getGlobalTransaction(ctx); @@ -97,6 +99,7 @@ return result; } + @Override public Object handlePutKeyValueCommand(InvocationContext ctx, PutKeyValueCommand command) throws Throwable { GlobalTransaction gtx = getGlobalTransaction(ctx); @@ -119,6 +122,7 @@ return result; } + @Override public Object handlePutDataMapCommand(InvocationContext ctx, PutDataMapCommand command) throws Throwable { GlobalTransaction gtx = getGlobalTransaction(ctx); @@ -142,6 +146,7 @@ } + @Override public Object handleMoveCommand(InvocationContext ctx, MoveCommand command) throws Throwable { GlobalTransaction gtx = getGlobalTransaction(ctx); @@ -160,6 +165,7 @@ return null; } + @Override public Object handleRemoveKeyCommand(InvocationContext ctx, RemoveKeyCommand command) throws Throwable { GlobalTransaction gtx = getGlobalTransaction(ctx); @@ -175,6 +181,7 @@ return result; } + @Override public Object handleRemoveDataCommand(InvocationContext ctx, RemoveDataCommand command) throws Throwable { GlobalTransaction gtx = getGlobalTransaction(ctx); @@ -189,6 +196,7 @@ return null; } + @Override public Object handleGetKeyValueCommand(InvocationContext ctx, GetKeyValueCommand command) throws Throwable { TransactionWorkspace workspace = getTransactionWorkspace(getGlobalTransaction(ctx)); @@ -212,6 +220,7 @@ return result; } + @Override public Object handleGetKeysCommand(InvocationContext ctx, GetKeysCommand command) throws Throwable { TransactionWorkspace workspace = getTransactionWorkspace(getGlobalTransaction(ctx)); @@ -234,6 +243,7 @@ return result; } + @Override public Object handleGetDataMapCommand(InvocationContext ctx, GetDataMapCommand command) throws Throwable { TransactionWorkspace workspace = getTransactionWorkspace(getGlobalTransaction(ctx)); @@ -255,6 +265,7 @@ return result; } + @Override public Object handleGetChildrenNamesCommand(InvocationContext ctx, GetChildrenNamesCommand command) throws Throwable { TransactionWorkspace workspace = getTransactionWorkspace(getGlobalTransaction(ctx)); @@ -276,6 +287,7 @@ return result; } + @Override public Object handleGetNodeCommand(InvocationContext ctx, GetNodeCommand command) throws Throwable { TransactionWorkspace workspace = getTransactionWorkspace(getGlobalTransaction(ctx)); Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/OrderedSynchronizationHandler.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/interceptors/OrderedSynchronizationHandler.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/OrderedSynchronizationHandler.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -81,6 +81,7 @@ if (exceptionInAfterCompletion != null) throw exceptionInAfterCompletion; } + @Override public String toString() { StringBuffer sb = new StringBuffer(); Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/PassivationInterceptor.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/interceptors/PassivationInterceptor.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/PassivationInterceptor.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -48,6 +48,7 @@ * be passivated and stores the evicted node and its attributes back to the * store using the CacheLoader. */ + @Override public Object handleEvictFqnCommand(InvocationContext ctx, EvictNodeCommand evictFqnCommand) throws Throwable { Fqn fqn = evictFqnCommand.getFqn(); @@ -81,11 +82,13 @@ return passivations.get(); } + @Override public void resetStatistics() { passivations.set(0); } + @Override public Map<String, Object> dumpStatistics() { Map<String, Object> retval = new HashMap<String, Object>(); 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-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/PessimisticLockInterceptor.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -284,9 +284,10 @@ return invokeNextInterceptor(ctx, command); } + @Override public void doAfterCall(InvocationContext ctx) { - ctx.clearInvocationLocksAcquired(); + ctx.clearInvocationLocksAcquired(); } /** 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-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -99,12 +99,14 @@ this.lifecycleManager = lifecycleManager; } + @Override @SuppressWarnings("unchecked") public Object handleOptimisticPrepareCommand(InvocationContext ctx, OptimisticPrepareCommand command) throws Throwable { return handlePrepareCommand(ctx, command); } + @Override public Object handlePrepareCommand(InvocationContext ctx, PrepareCommand command) throws Throwable { Object result = null; @@ -145,6 +147,7 @@ } } + @Override @SuppressWarnings("unchecked") public Object handleCommitCommand(InvocationContext ctx, CommitCommand command) throws Throwable { @@ -200,6 +203,7 @@ return null; } + @Override public Object handleRollbackCommand(InvocationContext ctx, RollbackCommand command) throws Throwable { if (!ctx.getGlobalTransaction().isRemote()) @@ -291,6 +295,7 @@ return rollbacks; } + @Override public void resetStatistics() { prepares = 0; @@ -298,6 +303,7 @@ rollbacks = 0; } + @Override public Map<String, Object> dumpStatistics() { Map<String, Object> retval = new HashMap<String, Object>(3); @@ -406,6 +412,7 @@ * @return * @throws Throwable */ + @Override public Object handleDefault(InvocationContext ctx, CacheCommand command) throws Throwable { Object result; @@ -649,6 +656,7 @@ this.injectDataVersions = injectDataVersions; } + @Override public Object handleDefault(InvocationContext ctx, CacheCommand command) throws Throwable { Object result = invokeNextInterceptor(ctx, command); @@ -656,6 +664,7 @@ return result; } + @Override public Object handleDataVersionCommand(InvocationContext ctx, DataVersionCommand command) throws Throwable { if (!injectDataVersions) return handleDefault(ctx, command); @@ -998,6 +1007,7 @@ //todo add this visitor locally globalTransactionCommandsVisitor = new GlobalTransactionCommandsVisitor() { + @Override public Object handleGlobalTransactionCommands(GlobalTransactionCommand command) { command.setGlobalTransaction(gtx); @@ -1181,6 +1191,7 @@ this.entry = null; } + @Override public String toString() { return "TxInterceptor.RemoteSynchronizationHandler(gtx=" + gtx + ", tx=" + getTxAsString() + ")"; @@ -1310,6 +1321,7 @@ } } + @Override public String toString() { return "TxInterceptor.LocalSynchronizationHandler(gtx=" + gtx + ", tx=" + getTxAsString() + ")"; Modified: core/trunk/src/main/java/org/jboss/cache/invocation/CacheData.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/invocation/CacheData.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/invocation/CacheData.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -239,6 +239,7 @@ } } + @Override public String toString() { return toString(false); Modified: core/trunk/src/main/java/org/jboss/cache/invocation/CacheLifecycleManager.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/invocation/CacheLifecycleManager.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/invocation/CacheLifecycleManager.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -269,6 +269,7 @@ log.trace("Registering a shutdown hook. Configured behavior = " + configuration.getShutdownHookBehavior()); shutdownHook = new Thread() { + @Override public void run() { try Modified: core/trunk/src/main/java/org/jboss/cache/invocation/NodeInvocationDelegate.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/invocation/NodeInvocationDelegate.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/invocation/NodeInvocationDelegate.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -497,6 +497,7 @@ throw new NodeNotValidException("Node " + getFqn() + " is not valid. Perhaps it has been moved or removed."); } + @Override public String toString() { return node == null ? null : node.toString(); Modified: core/trunk/src/main/java/org/jboss/cache/loader/AbstractDelegatingCacheLoader.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/loader/AbstractDelegatingCacheLoader.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/loader/AbstractDelegatingCacheLoader.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -57,6 +57,7 @@ return cacheLoader.getConfig(); } + @Override public void setCache(CacheSPI c) { super.setCache(c); @@ -88,6 +89,7 @@ cacheLoader.put(name, attributes); } + @Override public void put(List<Modification> modifications) throws Exception { cacheLoader.put(modifications); @@ -108,61 +110,73 @@ cacheLoader.removeData(fqn); } + @Override public void prepare(Object tx, List<Modification> modifications, boolean one_phase) throws Exception { cacheLoader.prepare(tx, modifications, one_phase); } + @Override public void commit(Object tx) throws Exception { cacheLoader.commit(tx); } + @Override public void rollback(Object tx) { cacheLoader.rollback(tx); } + @Override public void loadEntireState(ObjectOutputStream os) throws Exception { cacheLoader.loadEntireState(os); } + @Override public void storeEntireState(ObjectInputStream is) throws Exception { cacheLoader.storeEntireState(is); } + @Override public void loadState(Fqn subtree, ObjectOutputStream os) throws Exception { cacheLoader.loadState(subtree, os); } + @Override public void storeState(Fqn subtree, ObjectInputStream is) throws Exception { cacheLoader.storeState(subtree, is); } + @Override public void setRegionManager(RegionManager manager) { cacheLoader.setRegionManager(manager); } + @Override public void create() throws Exception { cacheLoader.create(); } + @Override public void start() throws Exception { cacheLoader.start(); } + @Override public void stop() { cacheLoader.stop(); } + @Override public void destroy() { cacheLoader.destroy(); Modified: core/trunk/src/main/java/org/jboss/cache/loader/AdjListJDBCCacheLoader.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/loader/AdjListJDBCCacheLoader.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/loader/AdjListJDBCCacheLoader.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -179,6 +179,7 @@ * @param one_phase indicates whether it's one or two phase commit transaction * @throws Exception */ + @Override public void prepare(Object tx, List<Modification> modifications, boolean one_phase) throws Exception { // start a tx @@ -210,6 +211,7 @@ * @param tx the tx to commit * @throws Exception */ + @Override public void commit(Object tx) throws Exception { cf.commit(tx); @@ -220,6 +222,7 @@ * * @param tx the tx to rollback */ + @Override public void rollback(Object tx) { cf.rollback(tx); Modified: core/trunk/src/main/java/org/jboss/cache/loader/AdjListJDBCCacheLoaderConfig.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/loader/AdjListJDBCCacheLoaderConfig.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/loader/AdjListJDBCCacheLoaderConfig.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -12,386 +12,389 @@ */ public class AdjListJDBCCacheLoaderConfig extends IndividualCacheLoaderConfig { - /** - * The serialVersionUID - */ - private static final long serialVersionUID = -8371846151643130281L; + /** + * The serialVersionUID + */ + private static final long serialVersionUID = -8371846151643130281L; - private boolean createTable; - private String createTableDDL; - private String datasourceName; - private String deleteAllSql; - private String deleteNodeSql; - private boolean dropTable; - private String dropTableDDL; - private String driverClass; - private String insertNodeSql; - private String jdbcURL; - private String jdbcUser; - private String jdbcPassword; - private String selectChildFqnsSql; - private String selectChildNamesSql; - private String selectNodeSql; - private String updateNodeSql; - private String updateTableSql; - private String connectionFactoryClass; - protected String table; - protected String nodeColumn; - protected String fqnColumn; + private boolean createTable; + private String createTableDDL; + private String datasourceName; + private String deleteAllSql; + private String deleteNodeSql; + private boolean dropTable; + private String dropTableDDL; + private String driverClass; + private String insertNodeSql; + private String jdbcURL; + private String jdbcUser; + private String jdbcPassword; + private String selectChildFqnsSql; + private String selectChildNamesSql; + private String selectNodeSql; + private String updateNodeSql; + private String updateTableSql; + private String connectionFactoryClass; + protected String table; + protected String nodeColumn; + protected String fqnColumn; - public AdjListJDBCCacheLoaderConfig() - { - } + public AdjListJDBCCacheLoaderConfig() + { + } - /** - * For use by {@link JDBCCacheLoaderOld}. - * - * @param base generic config object created by XML parsing. - */ - AdjListJDBCCacheLoaderConfig(IndividualCacheLoaderConfig base) - { - populateFromBaseConfig(base); - } + /** + * For use by {@link JDBCCacheLoaderOld}. + * + * @param base generic config object created by XML parsing. + */ + AdjListJDBCCacheLoaderConfig(IndividualCacheLoaderConfig base) + { + populateFromBaseConfig(base); + } - public boolean getCreateTable() - { - return createTable; - } + public boolean getCreateTable() + { + return createTable; + } - public void setCreateTable(boolean createTable) - { - testImmutability("createTable"); - this.createTable = createTable; - } + public void setCreateTable(boolean createTable) + { + testImmutability("createTable"); + this.createTable = createTable; + } - public String getCreateTableDDL() - { - return createTableDDL; - } + public String getCreateTableDDL() + { + return createTableDDL; + } - public void setCreateTableDDL(String createTableDDL) - { - testImmutability("createTableDDL"); - this.createTableDDL = createTableDDL; - } + public void setCreateTableDDL(String createTableDDL) + { + testImmutability("createTableDDL"); + this.createTableDDL = createTableDDL; + } - public String getDatasourceName() - { - return datasourceName; - } + public String getDatasourceName() + { + return datasourceName; + } - public void setDatasourceName(String datasourceName) - { - testImmutability("datasourceName"); - this.datasourceName = datasourceName; - } + public void setDatasourceName(String datasourceName) + { + testImmutability("datasourceName"); + this.datasourceName = datasourceName; + } - public String getDeleteAllSql() - { - return deleteAllSql; - } + public String getDeleteAllSql() + { + return deleteAllSql; + } - public void setDeleteAllSql(String deleteAllSql) - { - testImmutability("deleteAllSql"); - this.deleteAllSql = deleteAllSql; - } + public void setDeleteAllSql(String deleteAllSql) + { + testImmutability("deleteAllSql"); + this.deleteAllSql = deleteAllSql; + } - public String getDeleteNodeSql() - { - return deleteNodeSql; - } + public String getDeleteNodeSql() + { + return deleteNodeSql; + } - public void setDeleteNodeSql(String deleteNodeSql) - { - testImmutability("deleteNodeSql"); - this.deleteNodeSql = deleteNodeSql; - } + public void setDeleteNodeSql(String deleteNodeSql) + { + testImmutability("deleteNodeSql"); + this.deleteNodeSql = deleteNodeSql; + } - public String getDriverClass() - { - return driverClass; - } + public String getDriverClass() + { + return driverClass; + } - public void setDriverClass(String driverClass) - { - testImmutability("driverClass"); - this.driverClass = driverClass; - } + public void setDriverClass(String driverClass) + { + testImmutability("driverClass"); + this.driverClass = driverClass; + } - public boolean getDropTable() - { - return dropTable; - } + public boolean getDropTable() + { + return dropTable; + } - public void setDropTable(boolean dropTable) - { - testImmutability("dropTable"); - this.dropTable = dropTable; - } + public void setDropTable(boolean dropTable) + { + testImmutability("dropTable"); + this.dropTable = dropTable; + } - public String getInsertNodeSql() - { - return insertNodeSql; - } + public String getInsertNodeSql() + { + return insertNodeSql; + } - public void setInsertNodeSql(String insertNodeSql) - { - testImmutability("insertNodeSql"); - this.insertNodeSql = insertNodeSql; - } + public void setInsertNodeSql(String insertNodeSql) + { + testImmutability("insertNodeSql"); + this.insertNodeSql = insertNodeSql; + } - public String getSelectChildFqnsSql() - { - return selectChildFqnsSql; - } + public String getSelectChildFqnsSql() + { + return selectChildFqnsSql; + } - public void setSelectChildFqnsSql(String selectChildFqnsSql) - { - testImmutability("selectChildFqnsSql"); - this.selectChildFqnsSql = selectChildFqnsSql; - } + public void setSelectChildFqnsSql(String selectChildFqnsSql) + { + testImmutability("selectChildFqnsSql"); + this.selectChildFqnsSql = selectChildFqnsSql; + } - public String getSelectNodeSql() - { - return selectNodeSql; - } + public String getSelectNodeSql() + { + return selectNodeSql; + } - public void setSelectNodeSql(String selectNodeSql) - { - testImmutability("selectNodeSql"); - this.selectNodeSql = selectNodeSql; - } + public void setSelectNodeSql(String selectNodeSql) + { + testImmutability("selectNodeSql"); + this.selectNodeSql = selectNodeSql; + } - public String getTable() - { - return table; - } + public String getTable() + { + return table; + } - public void setTable(String table) - { - testImmutability("table"); - this.table = table; - } + public void setTable(String table) + { + testImmutability("table"); + this.table = table; + } - public String getUpdateTableSql() - { - return updateTableSql; - } + public String getUpdateTableSql() + { + return updateTableSql; + } - public void setUpdateTableSql(String updateTableSql) - { - testImmutability("updateTableSql"); - this.updateTableSql = updateTableSql; - } + public void setUpdateTableSql(String updateTableSql) + { + testImmutability("updateTableSql"); + this.updateTableSql = updateTableSql; + } - public String getDropTableDDL() - { - return dropTableDDL; - } + public String getDropTableDDL() + { + return dropTableDDL; + } - public void setDropTableDDL(String dropTableDDL) - { - testImmutability("dropTableDDL"); - this.dropTableDDL = dropTableDDL; - } + public void setDropTableDDL(String dropTableDDL) + { + testImmutability("dropTableDDL"); + this.dropTableDDL = dropTableDDL; + } - public String getSelectChildNamesSql() - { - return selectChildNamesSql; - } + public String getSelectChildNamesSql() + { + return selectChildNamesSql; + } - public void setSelectChildNamesSql(String selectChildNamesSql) - { - testImmutability("selectChildNamesSql"); - this.selectChildNamesSql = selectChildNamesSql; - } + public void setSelectChildNamesSql(String selectChildNamesSql) + { + testImmutability("selectChildNamesSql"); + this.selectChildNamesSql = selectChildNamesSql; + } - public String getUpdateNodeSql() - { - return updateNodeSql; - } + public String getUpdateNodeSql() + { + return updateNodeSql; + } - public void setUpdateNodeSql(String updateNodeSql) - { - testImmutability("updateNodeSql"); - this.updateNodeSql = updateNodeSql; - } + public void setUpdateNodeSql(String updateNodeSql) + { + testImmutability("updateNodeSql"); + this.updateNodeSql = updateNodeSql; + } - public String getJdbcPassword() - { - return jdbcPassword; - } + public String getJdbcPassword() + { + return jdbcPassword; + } - public void setJdbcPassword(String jdbcPassword) - { - testImmutability("jdbcPassword"); - this.jdbcPassword = jdbcPassword; - } + public void setJdbcPassword(String jdbcPassword) + { + testImmutability("jdbcPassword"); + this.jdbcPassword = jdbcPassword; + } - public String getJdbcURL() - { - return jdbcURL; - } + public String getJdbcURL() + { + return jdbcURL; + } - public void setJdbcURL(String jdbcURL) - { - testImmutability("jdbcURL"); - this.jdbcURL = jdbcURL; - } + public void setJdbcURL(String jdbcURL) + { + testImmutability("jdbcURL"); + this.jdbcURL = jdbcURL; + } - public String getJdbcUser() - { - return jdbcUser; - } + public String getJdbcUser() + { + return jdbcUser; + } - public void setJdbcUser(String jdbcUser) - { - testImmutability("jdbcUser"); - this.jdbcUser = jdbcUser; - } + public void setJdbcUser(String jdbcUser) + { + testImmutability("jdbcUser"); + this.jdbcUser = jdbcUser; + } - public String getConnectionFactoryClass() - { - return connectionFactoryClass; - } + public String getConnectionFactoryClass() + { + return connectionFactoryClass; + } - public void setConnectionFactoryClass(String connectionFactoryClass) - { - testImmutability("connectionFactoryClass"); - this.connectionFactoryClass = connectionFactoryClass; - } + public void setConnectionFactoryClass(String connectionFactoryClass) + { + testImmutability("connectionFactoryClass"); + this.connectionFactoryClass = connectionFactoryClass; + } - public void setProperties(Properties props) - { - super.setProperties(props); - datasourceName = props.getProperty("cache.jdbc.datasource"); - if (datasourceName == null) - { - this.driverClass = AdjListJDBCCacheLoader.getRequiredProperty(props, "cache.jdbc.driver"); - this.jdbcURL = AdjListJDBCCacheLoader.getRequiredProperty(props, "cache.jdbc.url"); - this.jdbcUser = AdjListJDBCCacheLoader.getRequiredProperty(props, "cache.jdbc.user"); - this.jdbcPassword = AdjListJDBCCacheLoader.getRequiredProperty(props, "cache.jdbc.password"); + @Override + public void setProperties(Properties props) + { + super.setProperties(props); + datasourceName = props.getProperty("cache.jdbc.datasource"); + if (datasourceName == null) + { + this.driverClass = AdjListJDBCCacheLoader.getRequiredProperty(props, "cache.jdbc.driver"); + this.jdbcURL = AdjListJDBCCacheLoader.getRequiredProperty(props, "cache.jdbc.url"); + this.jdbcUser = AdjListJDBCCacheLoader.getRequiredProperty(props, "cache.jdbc.user"); + this.jdbcPassword = AdjListJDBCCacheLoader.getRequiredProperty(props, "cache.jdbc.password"); - if (log.isDebugEnabled()) - { - log.debug("Properties: " + - "cache.jdbc.url=" + - jdbcURL + - ", cache.jdbc.driver=" + - driverClass + - ", cache.jdbc.user=" + - jdbcUser + - ", cache.jdbc.password=" + - jdbcPassword + - ", cache.jdbc.table=" + table); - } - } + if (log.isDebugEnabled()) + { + log.debug("Properties: " + + "cache.jdbc.url=" + + jdbcURL + + ", cache.jdbc.driver=" + + driverClass + + ", cache.jdbc.user=" + + jdbcUser + + ", cache.jdbc.password=" + + jdbcPassword + + ", cache.jdbc.table=" + table); + } + } - String prop = props.getProperty("cache.jdbc.table.create"); - this.createTable = (prop == null || Boolean.valueOf(prop)); - prop = props.getProperty("cache.jdbc.table.drop"); - this.dropTable = prop == null ? false : Boolean.valueOf(prop); + String prop = props.getProperty("cache.jdbc.table.create"); + this.createTable = (prop == null || Boolean.valueOf(prop)); + prop = props.getProperty("cache.jdbc.table.drop"); + this.dropTable = prop == null ? false : Boolean.valueOf(prop); - this.table = props.getProperty("cache.jdbc.table.name", "jbosscache"); - String primaryKey = props.getProperty("cache.jdbc.table.primarykey", "jbosscache_pk"); - fqnColumn = props.getProperty("cache.jdbc.fqn.column", "fqn"); - String fqnType = props.getProperty("cache.jdbc.fqn.type", "varchar(255)"); - nodeColumn = props.getProperty("cache.jdbc.node.column", "node"); - String nodeType = props.getProperty("cache.jdbc.node.type", "blob"); - String parentColumn = props.getProperty("cache.jdbc.parent.column", "parent"); + this.table = props.getProperty("cache.jdbc.table.name", "jbosscache"); + String primaryKey = props.getProperty("cache.jdbc.table.primarykey", "jbosscache_pk"); + fqnColumn = props.getProperty("cache.jdbc.fqn.column", "fqn"); + String fqnType = props.getProperty("cache.jdbc.fqn.type", "varchar(255)"); + nodeColumn = props.getProperty("cache.jdbc.node.column", "node"); + String nodeType = props.getProperty("cache.jdbc.node.type", "blob"); + String parentColumn = props.getProperty("cache.jdbc.parent.column", "parent"); - selectChildNamesSql = "select " + fqnColumn + " from " + table + " where " + parentColumn + "=?"; - deleteNodeSql = "delete from " + table + " where " + fqnColumn + "=?"; - deleteAllSql = "delete from " + table; - selectChildFqnsSql = "select " + fqnColumn + " from " + table + " where " + parentColumn + "=?"; - insertNodeSql = "insert into " + - table + - " (" + - fqnColumn + - ", " + - nodeColumn + - ", " + - parentColumn + - ") values (?, ?, ?)"; - updateNodeSql = "update " + table + " set " + nodeColumn + "=? where " + fqnColumn + "=?"; - selectNodeSql = "select " + nodeColumn + " from " + table + " where " + fqnColumn + "=?"; + selectChildNamesSql = "select " + fqnColumn + " from " + table + " where " + parentColumn + "=?"; + deleteNodeSql = "delete from " + table + " where " + fqnColumn + "=?"; + deleteAllSql = "delete from " + table; + selectChildFqnsSql = "select " + fqnColumn + " from " + table + " where " + parentColumn + "=?"; + insertNodeSql = "insert into " + + table + + " (" + + fqnColumn + + ", " + + nodeColumn + + ", " + + parentColumn + + ") values (?, ?, ?)"; + updateNodeSql = "update " + table + " set " + nodeColumn + "=? where " + fqnColumn + "=?"; + selectNodeSql = "select " + nodeColumn + " from " + table + " where " + fqnColumn + "=?"; - createTableDDL = "create table " + - table + - "(" + - fqnColumn + - " " + - fqnType + - " not null, " + - nodeColumn + - " " + - nodeType + - ", " + - parentColumn + - " " + - fqnType + - ", constraint " + primaryKey + " primary key (" + fqnColumn + "))"; + createTableDDL = "create table " + + table + + "(" + + fqnColumn + + " " + + fqnType + + " not null, " + + nodeColumn + + " " + + nodeType + + ", " + + parentColumn + + " " + + fqnType + + ", constraint " + primaryKey + " primary key (" + fqnColumn + "))"; - dropTableDDL = "drop table " + table; - connectionFactoryClass = props.getProperty("cache.jdbc.connection.factory", "org.jboss.cache.loader.NonManagedConnectionFactory"); - } + dropTableDDL = "drop table " + table; + connectionFactoryClass = props.getProperty("cache.jdbc.connection.factory", "org.jboss.cache.loader.NonManagedConnectionFactory"); + } - public boolean equals(Object obj) - { - if (obj instanceof AdjListJDBCCacheLoaderConfig && equalsExcludingProperties(obj)) - { - AdjListJDBCCacheLoaderConfig other = (AdjListJDBCCacheLoaderConfig) obj; + @Override + public boolean equals(Object obj) + { + if (obj instanceof AdjListJDBCCacheLoaderConfig && equalsExcludingProperties(obj)) + { + AdjListJDBCCacheLoaderConfig other = (AdjListJDBCCacheLoaderConfig) obj; - return (this.createTable == other.createTable) - && safeEquals(createTableDDL, other.createTableDDL) - && safeEquals(datasourceName, other.datasourceName) - && safeEquals(deleteAllSql, other.deleteAllSql) - && safeEquals(deleteNodeSql, other.deleteNodeSql) - && safeEquals(driverClass, other.driverClass) - && (dropTable == other.dropTable) - && safeEquals(dropTableDDL, other.dropTableDDL) - && safeEquals(insertNodeSql, other.insertNodeSql) - && safeEquals(jdbcPassword, other.jdbcPassword) - && safeEquals(jdbcURL, other.jdbcURL) - && safeEquals(jdbcUser, other.jdbcUser) - && safeEquals(selectChildFqnsSql, other.selectChildFqnsSql) - && safeEquals(selectChildNamesSql, other.selectChildNamesSql) - && safeEquals(selectNodeSql, other.selectNodeSql) - && safeEquals(table, other.table) - && safeEquals(updateNodeSql, other.updateNodeSql) - && safeEquals(updateTableSql, other.updateTableSql) - && safeEquals(connectionFactoryClass, other.connectionFactoryClass); - } + return (this.createTable == other.createTable) + && safeEquals(createTableDDL, other.createTableDDL) + && safeEquals(datasourceName, other.datasourceName) + && safeEquals(deleteAllSql, other.deleteAllSql) + && safeEquals(deleteNodeSql, other.deleteNodeSql) + && safeEquals(driverClass, other.driverClass) + && (dropTable == other.dropTable) + && safeEquals(dropTableDDL, other.dropTableDDL) + && safeEquals(insertNodeSql, other.insertNodeSql) + && safeEquals(jdbcPassword, other.jdbcPassword) + && safeEquals(jdbcURL, other.jdbcURL) + && safeEquals(jdbcUser, other.jdbcUser) + && safeEquals(selectChildFqnsSql, other.selectChildFqnsSql) + && safeEquals(selectChildNamesSql, other.selectChildNamesSql) + && safeEquals(selectNodeSql, other.selectNodeSql) + && safeEquals(table, other.table) + && safeEquals(updateNodeSql, other.updateNodeSql) + && safeEquals(updateTableSql, other.updateTableSql) + && safeEquals(connectionFactoryClass, other.connectionFactoryClass); + } - return false; - } + return false; + } - public int hashCode() - { - int result = hashCodeExcludingProperties(); - result = 31 * result + (createTable ? 0 : 1); - result = 31 * result + (createTableDDL == null ? 0 : createTableDDL.hashCode()); - result = 31 * result + (datasourceName == null ? 0 : datasourceName.hashCode()); - result = 31 * result + (deleteAllSql == null ? 0 : deleteAllSql.hashCode()); - result = 31 * result + (deleteNodeSql == null ? 0 : deleteNodeSql.hashCode()); - result = 31 * result + (driverClass == null ? 0 : driverClass.hashCode()); - result = 31 * result + (dropTable ? 0 : 1); - result = 31 * result + (dropTableDDL == null ? 0 : dropTableDDL.hashCode()); - result = 31 * result + (insertNodeSql == null ? 0 : insertNodeSql.hashCode()); - result = 31 * result + (jdbcPassword == null ? 0 : jdbcPassword.hashCode()); - result = 31 * result + (jdbcUser == null ? 0 : jdbcUser.hashCode()); - result = 31 * result + (jdbcURL == null ? 0 : jdbcURL.hashCode()); - result = 31 * result + (selectChildFqnsSql == null ? 0 : selectChildFqnsSql.hashCode()); - result = 31 * result + (selectChildNamesSql == null ? 0 : selectChildNamesSql.hashCode()); - result = 31 * result + (selectNodeSql == null ? 0 : selectNodeSql.hashCode()); - result = 31 * result + (table == null ? 0 : table.hashCode()); - result = 31 * result + (updateNodeSql == null ? 0 : updateNodeSql.hashCode()); - result = 31 * result + (updateTableSql == null ? 0 : updateTableSql.hashCode()); - result = 31 * result + (connectionFactoryClass == null ? 0 : connectionFactoryClass.hashCode()); + @Override + public int hashCode() + { + int result = hashCodeExcludingProperties(); + result = 31 * result + (createTable ? 0 : 1); + result = 31 * result + (createTableDDL == null ? 0 : createTableDDL.hashCode()); + result = 31 * result + (datasourceName == null ? 0 : datasourceName.hashCode()); + result = 31 * result + (deleteAllSql == null ? 0 : deleteAllSql.hashCode()); + result = 31 * result + (deleteNodeSql == null ? 0 : deleteNodeSql.hashCode()); + result = 31 * result + (driverClass == null ? 0 : driverClass.hashCode()); + result = 31 * result + (dropTable ? 0 : 1); + result = 31 * result + (dropTableDDL == null ? 0 : dropTableDDL.hashCode()); + result = 31 * result + (insertNodeSql == null ? 0 : insertNodeSql.hashCode()); + result = 31 * result + (jdbcPassword == null ? 0 : jdbcPassword.hashCode()); + result = 31 * result + (jdbcUser == null ? 0 : jdbcUser.hashCode()); + result = 31 * result + (jdbcURL == null ? 0 : jdbcURL.hashCode()); + result = 31 * result + (selectChildFqnsSql == null ? 0 : selectChildFqnsSql.hashCode()); + result = 31 * result + (selectChildNamesSql == null ? 0 : selectChildNamesSql.hashCode()); + result = 31 * result + (selectNodeSql == null ? 0 : selectNodeSql.hashCode()); + result = 31 * result + (table == null ? 0 : table.hashCode()); + result = 31 * result + (updateNodeSql == null ? 0 : updateNodeSql.hashCode()); + result = 31 * result + (updateTableSql == null ? 0 : updateTableSql.hashCode()); + result = 31 * result + (connectionFactoryClass == null ? 0 : connectionFactoryClass.hashCode()); - return result; - } + return result; + } @Override public AdjListJDBCCacheLoaderConfig clone() throws CloneNotSupportedException Modified: core/trunk/src/main/java/org/jboss/cache/loader/AsyncCacheLoader.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/loader/AsyncCacheLoader.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/loader/AsyncCacheLoader.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -103,6 +103,7 @@ super(cacheLoader); } + @Override public void setConfig(IndividualCacheLoaderConfig base) { if (base instanceof AsyncCacheLoaderConfig) @@ -122,6 +123,7 @@ super.setConfig(base); } + @Override public Map get(Fqn name) throws Exception { try @@ -157,6 +159,7 @@ return null; } + @Override public Object put(Fqn name, Object key, Object value) throws Exception { if (config.getUseAsyncPut()) @@ -172,6 +175,7 @@ } } + @Override public void put(Fqn name, Map attributes) throws Exception { if (config.getUseAsyncPut()) @@ -187,6 +191,7 @@ } } + @Override public void put(List<Modification> modifications) throws Exception { if (config.getUseAsyncPut()) @@ -202,6 +207,7 @@ } } + @Override public Object remove(Fqn name, Object key) throws Exception { Object oldValue = get(name, key); @@ -210,18 +216,21 @@ return oldValue; } + @Override public void remove(Fqn name) throws Exception { Modification mod = new Modification(Modification.ModificationType.REMOVE_NODE, name); enqueue(mod); } + @Override public void removeData(Fqn name) throws Exception { Modification mod = new Modification(Modification.ModificationType.REMOVE_DATA, name); enqueue(mod); } + @Override public void start() throws Exception { if (log.isInfoEnabled()) log.info("Async cache loader starting: " + this); @@ -231,6 +240,7 @@ processor.start(); } + @Override public void stop() { stopped.set(true); @@ -357,6 +367,7 @@ } } + @Override public String toString() { return "TQ t=" + t; @@ -364,6 +375,7 @@ } + @Override public String toString() { return super.toString() + Modified: core/trunk/src/main/java/org/jboss/cache/loader/AsyncCacheLoaderConfig.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/loader/AsyncCacheLoaderConfig.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/loader/AsyncCacheLoaderConfig.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -79,6 +79,7 @@ this.useAsyncPut = useAsyncPut; } + @Override public void setProperties(Properties props) { super.setProperties(props); @@ -113,19 +114,21 @@ } } + @Override public boolean equals(Object obj) { if (obj instanceof AsyncCacheLoaderConfig && equalsExcludingProperties(obj)) { AsyncCacheLoaderConfig other = (AsyncCacheLoaderConfig) obj; return (batchSize == other.batchSize) - && (queueSize == other.queueSize) - && (returnOld == other.returnOld) - && (useAsyncPut == other.useAsyncPut); + && (queueSize == other.queueSize) + && (returnOld == other.returnOld) + && (useAsyncPut == other.useAsyncPut); } return false; } + @Override public int hashCode() { int result = hashCodeExcludingProperties(); Modified: core/trunk/src/main/java/org/jboss/cache/loader/C3p0ConnectionFactory.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/loader/C3p0ConnectionFactory.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/loader/C3p0ConnectionFactory.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -27,6 +27,7 @@ private DataSource ds; + @Override public void setConfig(AdjListJDBCCacheLoaderConfig config) { super.setConfig(config); @@ -69,6 +70,7 @@ } } + @Override public void start() throws Exception { /* We need to call super so that the driver is loaded. This is required by the C3P0 manual. */ @@ -83,6 +85,7 @@ } } + @Override public Connection checkoutConnection() throws SQLException { Connection connection = ds.getConnection(); @@ -93,6 +96,7 @@ return connection; } + @Override public void stop() { try Modified: core/trunk/src/main/java/org/jboss/cache/loader/ChainingCacheLoader.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/loader/ChainingCacheLoader.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/loader/ChainingCacheLoader.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -163,6 +163,7 @@ * @param modifications A List<Modification> of modifications * @throws Exception */ + @Override public void put(List<Modification> modifications) throws Exception { for (CacheLoader l : writeCacheLoaders) @@ -231,6 +232,7 @@ * we won't get a {@link #commit(Object)} or {@link #rollback(Object)} method call later * @throws Exception */ + @Override public void prepare(Object tx, List modifications, boolean one_phase) throws Exception { for (CacheLoader l : writeCacheLoaders) @@ -248,6 +250,7 @@ * * @param tx */ + @Override public void commit(Object tx) throws Exception { for (CacheLoader l : writeCacheLoaders) @@ -262,6 +265,7 @@ * * @param tx */ + @Override public void rollback(Object tx) { for (CacheLoader l : writeCacheLoaders) @@ -276,6 +280,7 @@ * * @throws Exception */ + @Override public void create() throws Exception { Iterator<CacheLoader> it = cacheLoaders.iterator(); @@ -290,6 +295,7 @@ } } + @Override public void start() throws Exception { for (CacheLoader cacheLoader : cacheLoaders) @@ -298,6 +304,7 @@ } } + @Override public void stop() { for (CacheLoader cacheLoader : cacheLoaders) @@ -306,6 +313,7 @@ } } + @Override public void destroy() { for (CacheLoader cacheLoader : cacheLoaders) @@ -317,11 +325,13 @@ /** * No-op, as this class doesn't directly use the ERegionManager. */ + @Override public void setRegionManager(RegionManager manager) { // no-op -- we don't do anything with the region manager } + @Override public void loadEntireState(ObjectOutputStream os) throws Exception { Iterator<CacheLoader> i = cacheLoaders.iterator(); @@ -338,6 +348,7 @@ } } + @Override public void loadState(Fqn subtree, ObjectOutputStream os) throws Exception { Iterator<CacheLoader> i = cacheLoaders.iterator(); @@ -354,6 +365,7 @@ } } + @Override public void storeEntireState(ObjectInputStream is) throws Exception { Iterator<CacheLoader> i = writeCacheLoaders.iterator(); @@ -371,6 +383,7 @@ } + @Override public void storeState(Fqn subtree, ObjectInputStream is) throws Exception { Iterator<CacheLoader> i = writeCacheLoaders.iterator(); @@ -423,6 +436,7 @@ } } + @Override public String toString() { StringBuffer buf = new StringBuffer("ChainingCacheLoader{"); Modified: core/trunk/src/main/java/org/jboss/cache/loader/ClusteredCacheLoaderConfig.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/loader/ClusteredCacheLoaderConfig.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/loader/ClusteredCacheLoaderConfig.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -42,6 +42,7 @@ this.timeout = timeout; } + @Override public void setProperties(Properties props) { super.setProperties(props); @@ -55,6 +56,7 @@ } } + @Override public boolean equals(Object obj) { if (obj instanceof ClusteredCacheLoaderConfig && equalsExcludingProperties(obj)) @@ -65,6 +67,7 @@ return false; } + @Override public int hashCode() { return 31 * hashCodeExcludingProperties() + (int) timeout; Modified: core/trunk/src/main/java/org/jboss/cache/loader/FileCacheLoader.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/loader/FileCacheLoader.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/loader/FileCacheLoader.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -119,6 +119,7 @@ return config; } + @Override public void create() throws Exception { lock.acquireLock(Fqn.ROOT, true); @@ -239,6 +240,7 @@ } + @Override public void put(Fqn fqn, Map attributes, boolean erase) throws Exception { lock.acquireLock(fqn, true); Modified: core/trunk/src/main/java/org/jboss/cache/loader/FileCacheLoaderConfig.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/loader/FileCacheLoaderConfig.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/loader/FileCacheLoaderConfig.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -51,6 +51,7 @@ this.checkCharacterPortability = checkCharacterPortability; } + @Override public void setProperties(Properties props) { super.setProperties(props); @@ -63,6 +64,7 @@ } } + @Override public boolean equals(Object obj) { if (obj instanceof FileCacheLoaderConfig && equalsExcludingProperties(obj)) @@ -72,6 +74,7 @@ return false; } + @Override public int hashCode() { return 31 * hashCodeExcludingProperties() + (location == null ? 0 : location.hashCode()); Modified: core/trunk/src/main/java/org/jboss/cache/loader/JDBCCacheLoader.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/loader/JDBCCacheLoader.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/loader/JDBCCacheLoader.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -1,5 +1,13 @@ package org.jboss.cache.loader; +import net.jcip.annotations.ThreadSafe; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jboss.cache.Fqn; +import org.jboss.cache.config.CacheLoaderConfig; +import org.jboss.cache.config.CacheLoaderConfig.IndividualCacheLoaderConfig; +import org.jboss.cache.marshall.NodeData; + import java.io.InputStream; import java.sql.Connection; import java.sql.PreparedStatement; @@ -9,15 +17,6 @@ import java.util.List; import java.util.Map; -import net.jcip.annotations.ThreadSafe; - -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; -import org.jboss.cache.Fqn; -import org.jboss.cache.config.CacheLoaderConfig; -import org.jboss.cache.config.CacheLoaderConfig.IndividualCacheLoaderConfig; -import org.jboss.cache.marshall.NodeData; - /** * JDBC implementation of <tt>AdjListJDBCCacheLoader</tt>. * Represents a faster alternative than JDBCCacheLoaderOld and relies on the same database structrure. @@ -45,6 +44,7 @@ /** * Builds a AdjListJDBCCacheLoaderConfig based on the supplied base config. */ + @Override protected AdjListJDBCCacheLoaderConfig processConfig(CacheLoaderConfig.IndividualCacheLoaderConfig base) { if (base instanceof JDBCCacheLoaderConfig) @@ -97,7 +97,7 @@ ps.executeUpdate(); if (getLogger().isTraceEnabled()) { - getLogger().trace("Deleting all the children of " + fqn + ". Used sql is'" + config.getDeleteNodeSql() + '\''); + getLogger().trace("Deleting all the children of " + fqn + ". Used sql is'" + config.getDeleteNodeSql() + '\''); } } catch (SQLException e) @@ -118,6 +118,7 @@ * Subscribes to contract. * Performance Note: O(2) db calls. */ + @Override protected void getNodeDataList(Fqn fqn, List<NodeData> list) throws Exception { Map nodeAttributes = loadNode(fqn); @@ -232,6 +233,7 @@ } + @Override protected Log getLogger() { return log; @@ -246,6 +248,7 @@ * The implementation checks node's existence firstly, and based on that continues or not. As root is not * persisted nothing is loaded etc. */ + @Override public void start() throws Exception { super.start(); Modified: core/trunk/src/main/java/org/jboss/cache/loader/JDBCCacheLoaderConfig.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/loader/JDBCCacheLoaderConfig.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/loader/JDBCCacheLoaderConfig.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -35,6 +35,7 @@ setClassName(JDBCCacheLoader.class.getName()); } + @Override public void setProperties(Properties props) { super.setProperties(props); @@ -55,6 +56,7 @@ /** * Returns the sql string for removing a node and all its children. */ + @Override public String getDeleteNodeSql() { return deleteNode; Modified: core/trunk/src/main/java/org/jboss/cache/loader/JDBCCacheLoaderOld.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/loader/JDBCCacheLoaderOld.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/loader/JDBCCacheLoaderOld.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -72,6 +72,7 @@ private JDBCCacheLoaderOldConfig config; + @Override public AdjListJDBCCacheLoaderConfig processConfig(IndividualCacheLoaderConfig base) { if (config instanceof JDBCCacheLoaderOldConfig) @@ -290,6 +291,7 @@ } } + @Override public void put(Fqn name, Map attributes, boolean override) throws Exception { // JBCACHE-769 -- make a defensive copy @@ -322,6 +324,7 @@ } + @Override protected Log getLogger() { return log; Modified: core/trunk/src/main/java/org/jboss/cache/loader/LocalDelegatingCacheLoader.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/loader/LocalDelegatingCacheLoader.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/loader/LocalDelegatingCacheLoader.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -112,6 +112,7 @@ this.delegate = delegate; } + @Override public void loadEntireState(ObjectOutputStream os) throws Exception { try @@ -137,17 +138,20 @@ } } + @Override public void loadState(Fqn subtree, ObjectOutputStream os) throws Exception { throw new UnsupportedOperationException("setting and loading state for specific Fqns not supported"); } + @Override public void storeEntireState(ObjectInputStream is) throws Exception { delegate.getStateTransferManager().setState(is, Fqn.ROOT); } + @Override public void storeState(Fqn subtree, ObjectInputStream is) throws Exception { throw new UnsupportedOperationException("setting and loading state for specific Fqns not supported"); Modified: core/trunk/src/main/java/org/jboss/cache/loader/ReadOnlyDelegatingCacheLoader.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/loader/ReadOnlyDelegatingCacheLoader.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/loader/ReadOnlyDelegatingCacheLoader.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -24,6 +24,7 @@ super(cl); } + @Override public Object put(Fqn name, Object key, Object value) throws Exception { log.trace("Not delegating write operation to underlying cache loader"); @@ -31,16 +32,19 @@ return (map == null) ? null : map.get(key); } + @Override public void put(Fqn name, Map attributes) throws Exception { log.trace("Not delegating write operation to underlying cache loader"); } + @Override public void put(List<Modification> modifications) throws Exception { log.trace("Not delegating write operation to underlying cache loader"); } + @Override public Object remove(Fqn fqn, Object key) throws Exception { log.trace("Not delegating write operation to underlying cache loader"); @@ -48,36 +52,43 @@ return (map == null) ? null : map.get(key); } + @Override public void remove(Fqn fqn) throws Exception { log.trace("Not delegating write operation to underlying cache loader"); } + @Override public void removeData(Fqn fqn) throws Exception { log.trace("Not delegating write operation to underlying cache loader"); } + @Override public void prepare(Object tx, List<Modification> modifications, boolean one_phase) throws Exception { log.trace("Not delegating write operation to underlying cache loader"); } + @Override public void commit(Object tx) throws Exception { log.trace("Not delegating write operation to underlying cache loader"); } + @Override public void rollback(Object tx) { log.trace("Not delegating write operation to underlying cache loader"); } + @Override public void storeEntireState(ObjectInputStream is) throws Exception { log.trace("Not delegating write operation to underlying cache loader"); } + @Override public void storeState(Fqn subtree, ObjectInputStream is) throws Exception { log.trace("Not delegating write operation to underlying cache loader"); Modified: core/trunk/src/main/java/org/jboss/cache/loader/bdbje/BdbjeCacheLoader.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/loader/bdbje/BdbjeCacheLoader.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/loader/bdbje/BdbjeCacheLoader.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -288,6 +288,7 @@ /** * Sets the CacheImpl owner of this cache loader. */ + @Override public void setCache(CacheSPI c) { super.setCache(c); @@ -585,6 +586,7 @@ * Intended to be used in a non-transactional environment, but will use * auto-commit in a transactional environment. */ + @Override public void put(List<Modification> modifications) throws Exception { checkOpen(); @@ -845,6 +847,7 @@ * be called later with the same tx value. Performs retries if necessary to * resolve deadlocks. */ + @Override public void prepare(Object tx, List<Modification> modifications, boolean onePhase) throws Exception { checkOpen(); @@ -938,6 +941,7 @@ * Commits the given transaction, or throws IllegalArgumentException if the * given key is not associated with an uncommited transaction. */ + @Override public void commit(Object tx) throws Exception { @@ -960,6 +964,7 @@ * Commits the given transaction, or throws IllegalArgumentException if the * given key is not associated with an uncommited transaction. */ + @Override public void rollback(Object tx) { Modified: core/trunk/src/main/java/org/jboss/cache/loader/jdbm/JdbmCacheLoader.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/loader/jdbm/JdbmCacheLoader.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/loader/jdbm/JdbmCacheLoader.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -228,6 +228,7 @@ /** * Sets the CacheImpl owner of this cache loader. */ + @Override public void setCache(CacheSPI c) { super.setCache(c); @@ -538,6 +539,7 @@ * Intended to be used in a non-transactional environment, but will use * auto-commit in a transactional environment. */ + @Override public void put(List<Modification> modifications) throws Exception { @@ -658,6 +660,7 @@ log.debug(""); } + @Override public String toString() { BTree bt = tree; Modified: core/trunk/src/main/java/org/jboss/cache/loader/jdbm/Null.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/loader/jdbm/Null.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/loader/jdbm/Null.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -3,19 +3,25 @@ /** * Special FQN entry to indicate null. */ -class Null implements java.io.Serializable { +class Null implements java.io.Serializable +{ private static final long serialVersionUID = -1337133713374690630L; static final Object NULL = new Null(); - private Null() {} + private Null() + { + } - public String toString() { + @Override + public String toString() + { return "null"; } - Object readResolve() { + Object readResolve() + { return NULL; } Modified: core/trunk/src/main/java/org/jboss/cache/loader/tcp/TcpCacheServer.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/loader/tcp/TcpCacheServer.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/loader/tcp/TcpCacheServer.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -137,6 +137,7 @@ Thread serverThread = new Thread("TcpCacheServer") { + @Override public void run() { try @@ -446,6 +447,7 @@ } + @Override public String toString() { StringBuffer sb = new StringBuffer(); Modified: core/trunk/src/main/java/org/jboss/cache/lock/IdentityLock.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/lock/IdentityLock.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/lock/IdentityLock.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -424,6 +424,7 @@ return map_.isOwner(o, LockMap.OWNER_ANY); } + @Override public String toString() { return toString(false); Modified: core/trunk/src/main/java/org/jboss/cache/lock/LockStrategyRepeatableRead.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/lock/LockStrategyRepeatableRead.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/lock/LockStrategyRepeatableRead.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -38,7 +38,7 @@ /** * @see org.jboss.cache.lock.LockStrategy#upgradeLockAttempt(long) */ - public Lock upgradeLockAttempt(long msecs) throws UpgradeException + public Lock upgradeLockAttempt(long msecs) throws UpgradeException { return lock_.upgradeLockAttempt(msecs); } @@ -46,14 +46,15 @@ /** * @see org.jboss.cache.lock.LockStrategy#writeLock() */ - public Lock writeLock() + public Lock writeLock() { return lock_.writeLock(); } + @Override public String toString() { - return lock_ != null? lock_.toString() : "(null)"; + return lock_ != null ? lock_.toString() : "(null)"; } } Modified: core/trunk/src/main/java/org/jboss/cache/lock/LockingException.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/lock/LockingException.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/lock/LockingException.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -64,6 +64,7 @@ this.failed_lockers = failed_lockers; } + @Override public String toString() { String retval = super.toString(); Modified: core/trunk/src/main/java/org/jboss/cache/lock/NonBlockingWriterLock.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/lock/NonBlockingWriterLock.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/lock/NonBlockingWriterLock.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -26,6 +26,7 @@ { // Only need to overwrite this method so WL is not blocked on RL. + @Override protected synchronized boolean startWrite() { boolean allowWrite = (activeWriter_ == null); Modified: core/trunk/src/main/java/org/jboss/cache/lock/ReadWriteLockWithUpgrade.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/lock/ReadWriteLockWithUpgrade.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/lock/ReadWriteLockWithUpgrade.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -24,34 +24,34 @@ * particular, the write lock is obtained with priority to prevent deadlock * situation. The current design is based in part from Doug Lea's * PreferredWriterReadWriteLock. - * + * * Note that the pre-requisite to use upgrade lock is the pre-existing of a read * lock. Otherwise, a RuntimeException will be thrown. * Also note that currently lock can only be obtained through <code>attempt</code> * api with specified timeout instead <code>acquire</code> is not supported. - * + * * Internally, the upgrade is done through a Semaphore where a thread with * a higher priority will obtain the write lock first. The following scenarios then can * happen: * <ul> * <li>If there are multiple read locks granted (and no write lock request in waiting), - * an upgrade will release one read lock - * (decrease the counter), bump up upagrade counter, increase the current thread priority, - * set a thread local as upgrade thread, - * and place a write lock acquire() call. Upon waken up, it will check if the current - * thread is an upgrade. If it is, restore the thread priority, and decrease the - * upgrade counter.</li> + * an upgrade will release one read lock + * (decrease the counter), bump up upagrade counter, increase the current thread priority, + * set a thread local as upgrade thread, + * and place a write lock acquire() call. Upon waken up, it will check if the current + * thread is an upgrade. If it is, restore the thread priority, and decrease the + * upgrade counter.</li> * <li>If there are mutiple write locks request in waiting (and only one read lock granted), - * decrease the read lock counter, - * bump up the upgrade counter, and increase the current thread priority. - * When one of the writer gets wake up, it will first check - * if upgrade counter is zero. If not, it will first release the semaphore so the upgrade - * thread can grab it, check the semaphore is gone, do notify, and issue myself another - * acquire to grab the nextInterceptor available semaphore.</li> - * </ul> + * decrease the read lock counter, + * bump up the upgrade counter, and increase the current thread priority. + * When one of the writer gets wake up, it will first check + * if upgrade counter is zero. If not, it will first release the semaphore so the upgrade + * thread can grab it, check the semaphore is gone, do notify, and issue myself another + * acquire to grab the nextInterceptor available semaphore.</li> + * </ul> * * @author Ben Wang -*/ + */ public class ReadWriteLockWithUpgrade implements ReadWriteLock { private long activeReaders_ = 0; @@ -67,6 +67,7 @@ protected final WriterLock writerLock_ = new WriterLock(); protected static final Log log_ = LogFactory.getLog(ReadWriteLockWithUpgrade.class); + @Override public String toString() { StringBuffer sb = new StringBuffer(); @@ -133,7 +134,7 @@ if (!readerLock_.tryLock(msecs, TimeUnit.MILLISECONDS)) { String errStr = "ReadWriteLockWithUpgrade.upgradeLockAttempt():" + - " failed to upgrade to write lock and also failed to re-obtain the read lock"; + " failed to upgrade to write lock and also failed to re-obtain the read lock"; log_.error(errStr); throw new IllegalStateException(errStr); } Modified: core/trunk/src/main/java/org/jboss/cache/lock/TimeoutException.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/lock/TimeoutException.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/lock/TimeoutException.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -15,6 +15,7 @@ /** * Thrown when a timeout occurred. used by operations with timeouts, e.g. lock * acquisition, or waiting for responses from all members. + * * @author <a href="mailto:bela@jboss.org">Bela Ban</a>. * @version $Revision$ * @@ -22,24 +23,32 @@ * * Dec 28 2002 Bela Ban: first implementation */ -public class TimeoutException extends CacheException { +public class TimeoutException extends CacheException +{ - /** The serialVersionUID */ + /** + * The serialVersionUID + */ private static final long serialVersionUID = -8096787619908687038L; - public TimeoutException() { + public TimeoutException() + { super(); } - public TimeoutException(String msg) { + public TimeoutException(String msg) + { super(msg); } - public TimeoutException(String msg, Throwable cause) { + public TimeoutException(String msg, Throwable cause) + { super(msg, cause); } - public String toString() { + @Override + public String toString() + { return super.toString(); } } Modified: core/trunk/src/main/java/org/jboss/cache/marshall/MethodCall.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/marshall/MethodCall.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/marshall/MethodCall.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -88,6 +88,7 @@ throw new RuntimeException("Use of incorrect method! Are you sure you intend to do this instead of getMethodId()?!?"); } + @Override public String toString() { StringBuffer ret = new StringBuffer(); Modified: core/trunk/src/main/java/org/jboss/cache/marshall/NodeData.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/marshall/NodeData.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/marshall/NodeData.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -89,12 +89,14 @@ } } + @Override public String toString() { return "NodeData {fqn: " + fqn + ", attrs=" + attrs + "}"; } + @Override public boolean equals(Object o) { if (this == o) return true; @@ -108,6 +110,7 @@ return true; } + @Override public int hashCode() { int result; Modified: core/trunk/src/main/java/org/jboss/cache/marshall/NodeDataExceptionMarker.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/marshall/NodeDataExceptionMarker.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/marshall/NodeDataExceptionMarker.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -32,11 +32,13 @@ return cacheNodeIdentity; } + @Override public boolean isExceptionMarker() { return true; } + @Override public void writeExternal(ObjectOutput out) throws IOException { super.writeExternal(out); @@ -44,6 +46,7 @@ out.writeObject(cacheNodeIdentity); } + @Override public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException { super.readExternal(in); @@ -51,6 +54,7 @@ cacheNodeIdentity = in.readObject(); } + @Override public String toString() { return "NodeDataExceptionMarker"; Modified: core/trunk/src/main/java/org/jboss/cache/marshall/NodeDataMarker.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/marshall/NodeDataMarker.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/marshall/NodeDataMarker.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -5,11 +5,13 @@ private static final long serialVersionUID = 4851793846346021014L; + @Override public boolean isMarker() { return true; } + @Override public String toString() { return "NodeDataMarker"; Modified: core/trunk/src/main/java/org/jboss/cache/optimistic/DefaultDataVersion.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/optimistic/DefaultDataVersion.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/optimistic/DefaultDataVersion.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -87,11 +87,13 @@ } } + @Override public String toString() { return "Ver=" + version; } + @Override public boolean equals(Object other) { if (other instanceof DefaultDataVersion) @@ -101,6 +103,7 @@ return false; } + @Override public int hashCode() { return (int) version; Modified: core/trunk/src/main/java/org/jboss/cache/optimistic/TransactionWorkspaceImpl.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/optimistic/TransactionWorkspaceImpl.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/optimistic/TransactionWorkspaceImpl.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -92,6 +92,7 @@ /** * Returns debug information. */ + @Override public String toString() { return "Workspace nodes=" + nodes; Modified: core/trunk/src/main/java/org/jboss/cache/optimistic/WorkspaceNodeImpl.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/optimistic/WorkspaceNodeImpl.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/optimistic/WorkspaceNodeImpl.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -327,6 +327,7 @@ } } + @Override public String toString() { StringBuffer sb = new StringBuffer(); Modified: core/trunk/src/main/java/org/jboss/cache/transaction/GlobalTransaction.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/transaction/GlobalTransaction.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/transaction/GlobalTransaction.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -76,6 +76,7 @@ return id; } + @Override public int hashCode() { if (hash_code == -1) @@ -85,6 +86,7 @@ return hash_code; } + @Override public boolean equals(Object other) { if (this == other) @@ -93,10 +95,11 @@ return false; GlobalTransaction otherGtx = (GlobalTransaction) other; - boolean aeq = (addr == null) ? (otherGtx.addr == null) : addr.equals(otherGtx.addr); + boolean aeq = (addr == null) ? (otherGtx.addr == null) : addr.equals(otherGtx.addr); return aeq && (id == otherGtx.id); } + @Override public String toString() { StringBuffer sb = new StringBuffer(); Modified: core/trunk/src/main/java/org/jboss/cache/transaction/OptimisticTransactionEntry.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/transaction/OptimisticTransactionEntry.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/transaction/OptimisticTransactionEntry.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -30,6 +30,7 @@ super(tx); } + @Override public String toString() { StringBuffer sb = new StringBuffer(super.toString()); Modified: core/trunk/src/main/java/org/jboss/cache/transaction/TransactionEntry.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/transaction/TransactionEntry.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/transaction/TransactionEntry.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -336,6 +336,7 @@ /** * Returns debug information about this transaction. */ + @Override public String toString() { StringBuffer sb = new StringBuffer(); Modified: core/trunk/src/main/java/org/jboss/cache/transaction/TransactionTable.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/transaction/TransactionTable.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/transaction/TransactionTable.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -247,6 +247,7 @@ /** * Returns summary debug information. */ + @Override public String toString() { StringBuffer sb = new StringBuffer(); Modified: core/trunk/src/main/java/org/jboss/cache/util/ExposedByteArrayOutputStream.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/util/ExposedByteArrayOutputStream.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/util/ExposedByteArrayOutputStream.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -10,22 +10,22 @@ import java.io.ByteArrayOutputStream; /** - * Extends ByteArrayOutputStream, but exposes the internal buffer. - * Using this, callers don't need to call toByteArray() which copies the + * Extends ByteArrayOutputStream, but exposes the internal buffer. + * Using this, callers don't need to call toByteArray() which copies the * internal buffer. * * Also overrides the superclass' behavior of always doubling the size of the - * internal buffer any time more capacity is needed. This class doubles the - * size until the internal buffer reaches a configurable max size (default is - * 4MB), after which it begins growing the buffer in 25% increments. This is - * intended to help prevent an OutOfMemoryError during a resize of a large + * internal buffer any time more capacity is needed. This class doubles the + * size until the internal buffer reaches a configurable max size (default is + * 4MB), after which it begins growing the buffer in 25% increments. This is + * intended to help prevent an OutOfMemoryError during a resize of a large * buffer. * * - * A version of this class was originally created by Bela Ban as part of the + * A version of this class was originally created by Bela Ban as part of the * JGroups library. * - * + * * @author <a href="mailto://brian.stansberry@jboss.com">Brian Stansberry</a> * @version $Id$ */ @@ -36,9 +36,9 @@ * is needed the buffer will grow by 25% rather than 100% */ public static final int DEFAULT_DOUBLING_SIZE = 4 * 1024 * 1024; // 4MB - + private int maxDoublingSize = DEFAULT_DOUBLING_SIZE; - + public ExposedByteArrayOutputStream() { super(); @@ -48,17 +48,16 @@ { super(size); } - + /** - * Creates a new byte array output stream, with a buffer capacity of - * the specified size, in bytes. + * Creates a new byte array output stream, with a buffer capacity of + * the specified size, in bytes. * - * @param size the initial size. - * @param maxDoublingSize the buffer size, after which if more capacity - * is needed the buffer will grow by 25% - * rather than 100% - * - * @exception IllegalArgumentException if size is negative. + * @param size the initial size. + * @param maxDoublingSize the buffer size, after which if more capacity + * is needed the buffer will grow by 25% + * rather than 100% + * @throws IllegalArgumentException if size is negative. */ public ExposedByteArrayOutputStream(int size, int maxDoublingSize) { @@ -71,43 +70,50 @@ * will almost certainly be longer than the data written to it; call * <code>size()</code> to get the number of bytes of actual data. */ - public byte[] getRawBuffer() { - return buf; + public byte[] getRawBuffer() + { + return buf; } + @Override public synchronized void write(byte[] b, int off, int len) { if ((off < 0) || (off > b.length) || (len < 0) || - ((off + len) > b.length) || ((off + len) < 0)) { - throw new IndexOutOfBoundsException(); - } - else if (len == 0) { + ((off + len) > b.length) || ((off + len) < 0)) + { + throw new IndexOutOfBoundsException(); + } + else if (len == 0) + { return; } - + int newcount = count + len; - if (newcount > buf.length) { + if (newcount > buf.length) + { byte newbuf[] = new byte[getNewBufferSize(buf.length, newcount)]; System.arraycopy(buf, 0, newbuf, 0, count); buf = newbuf; } - + System.arraycopy(b, off, buf, count, len); count = newcount; } + @Override public synchronized void write(int b) { int newcount = count + 1; - if (newcount > buf.length) { + if (newcount > buf.length) + { byte newbuf[] = new byte[getNewBufferSize(buf.length, newcount)]; System.arraycopy(buf, 0, newbuf, 0, count); buf = newbuf; } - buf[count] = (byte)b; + buf[count] = (byte) b; count = newcount; } - + /** * Gets the highest internal buffer size after which if more capacity * is needed the buffer will grow in 25% increments rather than 100%. @@ -116,10 +122,10 @@ { return maxDoublingSize; } - + /** * Gets the number of bytes to which the internal buffer should be resized. - * + * * @param curSize the current number of bytes * @param minNewSize the minimum number of bytes required * @return the size to which the internal buffer should be resized Modified: core/trunk/src/main/java/org/jboss/cache/util/MapCopy.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/util/MapCopy.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/util/MapCopy.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -1,5 +1,7 @@ package org.jboss.cache.util; +import net.jcip.annotations.Immutable; + import java.io.IOException; import java.io.Serializable; import java.util.AbstractMap; @@ -11,8 +13,6 @@ import java.util.Map; import java.util.Set; -import net.jcip.annotations.Immutable; - /** * Contains a fixed array of read-only map entries, from a copy of an existing map. * This class is more lightweight for places where the copied map will just be iterated over. @@ -57,19 +57,22 @@ /** * Returns a copy of the given map. */ - public static <L, W> Map<L, W> copy(Map<L, W> m) { + public static <L, W> Map<L, W> copy(Map<L, W> m) + { return new MapCopy<L, W>(m); } - + private void init() { this.entrySet = new AbstractSet<Map.Entry<K, V>>() { + @Override public int size() { return data.size(); } + @Override public Iterator<Map.Entry<K, V>> iterator() { return new EntryIterator(); Modified: core/trunk/src/main/java/org/jboss/cache/util/Util.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/util/Util.java 2008-04-24 15:33:27 UTC (rev 5670) +++ core/trunk/src/main/java/org/jboss/cache/util/Util.java 2008-04-24 15:41:25 UTC (rev 5671) @@ -113,6 +113,7 @@ public final Map<Object, Object> modifiedEntries = new HashMap<Object, Object>(); + @Override public boolean equals(Object o) { if (this == o) return true; @@ -129,6 +130,7 @@ return true; } + @Override public int hashCode() { int result; @@ -138,6 +140,7 @@ return result; } + @Override public String toString() { return "Added Entries " + addedEntries + " Removeed Entries " + removedEntries + " Modified Entries " + modifiedEntries;

16 years, 1 month

1
0
0 / 0

JBoss Cache SVN: r5670 - in core/trunk/src: main/java/org/jboss/cache/interceptors and 1 other directories.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2008-04-24 11:33:27 -0400 (Thu, 24 Apr 2008) New Revision: 5670 Modified: core/trunk/src/main/java/org/jboss/cache/factories/XmlConfigurationParser.java core/trunk/src/main/java/org/jboss/cache/interceptors/ActivationInterceptor.java core/trunk/src/main/java/org/jboss/cache/interceptors/CacheLoaderInterceptor.java core/trunk/src/test/java/org/jboss/cache/transaction/AsyncRollbackTransactionManager.java Log: resolved TODOs Modified: core/trunk/src/main/java/org/jboss/cache/factories/XmlConfigurationParser.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/factories/XmlConfigurationParser.java 2008-04-24 15:22:21 UTC (rev 5669) +++ core/trunk/src/main/java/org/jboss/cache/factories/XmlConfigurationParser.java 2008-04-24 15:33:27 UTC (rev 5670) @@ -522,12 +522,10 @@ { regionConfigs.add(parseEvictionRegionConfig((Element) node, ec.getDefaultEvictionPolicyClass(), eventQueueSize)); } - catch (MissingPolicyException ignored) + catch (MissingPolicyException missingPolicy) { - // Just log a warning and continue - // TODO (BES Oct-2006) I did it this way as that is how it worked - // before, but why not just throw the exception? - LogFactory.getLog(EvictionConfig.class).warn(ignored.getLocalizedMessage()); + LogFactory.getLog(EvictionConfig.class).warn(missingPolicy.getLocalizedMessage()); + throw missingPolicy; } } Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/ActivationInterceptor.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/interceptors/ActivationInterceptor.java 2008-04-24 15:22:21 UTC (rev 5669) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/ActivationInterceptor.java 2008-04-24 15:33:27 UTC (rev 5670) @@ -16,6 +16,7 @@ import org.jboss.cache.commands.tx.OptimisticPrepareCommand; import org.jboss.cache.commands.tx.PrepareCommand; import org.jboss.cache.commands.visitors.AbstractCommandsVisitor; +import org.jboss.cache.factories.annotations.Inject; import org.jboss.cache.invocation.CacheData; import org.jboss.cache.loader.CacheLoader; import org.jboss.cache.notifications.Notifier; @@ -44,7 +45,6 @@ { protected TransactionManager txMgr = null; - //todo - this is never queried, is this expected behavior? private long activations = 0; /** @@ -59,6 +59,12 @@ useCacheStore = false; } + @Inject + public void injectTransactionManager(TransactionManager txMgr) + { + this.txMgr = txMgr; + } + @Override public Object handleRemoveDataCommand(InvocationContext ctx, RemoveDataCommand command) throws Throwable { Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/CacheLoaderInterceptor.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/interceptors/CacheLoaderInterceptor.java 2008-04-24 15:22:21 UTC (rev 5669) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/CacheLoaderInterceptor.java 2008-04-24 15:33:27 UTC (rev 5670) @@ -12,7 +12,6 @@ import org.jboss.cache.factories.annotations.Start; import org.jboss.cache.interceptors.base.ChainedInterceptor; import org.jboss.cache.invocation.CacheData; -import org.jboss.cache.invocation.InterceptorChain; import org.jboss.cache.loader.CacheLoader; import org.jboss.cache.loader.CacheLoaderManager; import org.jboss.cache.lock.LockManager; @@ -40,7 +39,6 @@ private long cacheLoads = 0; private long cacheMisses = 0; private CacheLoaderManager clm; - private InterceptorChain cacheCommand; private LockManager lockManager; protected TransactionTable txTable = null; Modified: core/trunk/src/test/java/org/jboss/cache/transaction/AsyncRollbackTransactionManager.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/transaction/AsyncRollbackTransactionManager.java 2008-04-24 15:22:21 UTC (rev 5669) +++ core/trunk/src/test/java/org/jboss/cache/transaction/AsyncRollbackTransactionManager.java 2008-04-24 15:33:27 UTC (rev 5670) @@ -1,9 +1,7 @@ package org.jboss.cache.transaction; -import java.util.HashMap; -import java.util.Iterator; -import java.util.Map; -import java.util.Properties; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import javax.naming.Context; import javax.naming.InitialContext; @@ -15,10 +13,11 @@ import javax.transaction.RollbackException; import javax.transaction.SystemException; import javax.transaction.Transaction; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; +import java.util.Properties; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - public class AsyncRollbackTransactionManager extends DummyTransactionManager { private static final long serialVersionUID = 5793952292960075970L; @@ -114,7 +113,7 @@ if ((currentTx = getTransaction()) != null) { throw new NotSupportedException(Thread.currentThread() + - " is already associated with a transaction (" + currentTx + ")"); + " is already associated with a transaction (" + currentTx + ")"); } AsyncRollbackTransaction tx = new AsyncRollbackTransaction(this, timeout); setTransaction(tx); @@ -147,17 +146,13 @@ super.commit(); } - public void resume(Transaction tx) throws InvalidTransactionException, IllegalStateException, SystemException { - //TODO Not implemented TX timeout counting super.resume(tx); } - public Transaction suspend() throws SystemException { - //TODO Not implemented TX timeout counting return super.suspend(); }

16 years, 1 month

1
0
0 / 0

JBoss Cache SVN: r5669 - in core/trunk/src: test/java/org/jboss/cache/buddyreplication and 1 other directory.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2008-04-24 11:22:21 -0400 (Thu, 24 Apr 2008) New Revision: 5669 Modified: core/trunk/src/main/java/org/jboss/cache/NodeFactory.java core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyBackupActivationInactivationTest.java Log: resolved TODOs Modified: core/trunk/src/main/java/org/jboss/cache/NodeFactory.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/NodeFactory.java 2008-04-24 15:19:08 UTC (rev 5668) +++ core/trunk/src/main/java/org/jboss/cache/NodeFactory.java 2008-04-24 15:22:21 UTC (rev 5669) @@ -23,7 +23,6 @@ * * @author <a href="mailto:manik@jboss.org">Manik Surtani (manik(a)jboss.org)</a> */ -// TODO: Rethink how nodes are created. Perhaps use the component factory to create instance nodes as well, not just singletons? public class NodeFactory<K, V> extends ComponentFactory { private ComponentRegistry componentRegistry; Modified: core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java 2008-04-24 15:19:08 UTC (rev 5668) +++ core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java 2008-04-24 15:22:21 UTC (rev 5669) @@ -277,8 +277,6 @@ if (gtx != null) { CreateNodeCommand createNodeCommand = commandsFactory.buildCreateNodeCommand(child_fqn); - //todo - [mmarkus] there are commands added to the modification list just for being able to rollback. - //todo make sure the commands are being compacted before replication takes place transactionTable.addModification(gtx, createNodeCommand); } } Modified: core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyBackupActivationInactivationTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyBackupActivationInactivationTest.java 2008-04-24 15:19:08 UTC (rev 5668) +++ core/trunk/src/test/java/org/jboss/cache/buddyreplication/BuddyBackupActivationInactivationTest.java 2008-04-24 15:22:21 UTC (rev 5669) @@ -15,18 +15,13 @@ import org.jboss.cache.config.Configuration; import org.jboss.cache.config.Configuration.CacheMode; import org.jboss.cache.factories.UnitTestCacheConfigurationFactory; -import org.jboss.cache.factories.XmlConfigurationParser; import org.jboss.cache.misc.TestingUtil; import org.jboss.cache.util.CachePrinter; import static org.testng.AssertJUnit.*; import org.testng.annotations.AfterMethod; import org.testng.annotations.BeforeMethod; import org.testng.annotations.Test; -import org.w3c.dom.Document; -import org.w3c.dom.Element; -import javax.xml.parsers.DocumentBuilder; -import javax.xml.parsers.DocumentBuilderFactory; import java.util.HashMap; import java.util.Map; @@ -36,7 +31,7 @@ * * @author Brian Stansberry */ -@Test +@Test(groups = "functional") public class BuddyBackupActivationInactivationTest extends BuddyReplicationTestsBase { public static final Fqn<String> A = Fqn.fromString("/a"); @@ -204,20 +199,9 @@ private BuddyReplicationConfig getBuddyConfig() throws Exception { - // TODO just build the object; skip the legacy XML business - - DocumentBuilderFactory dbf = DocumentBuilderFactory.newInstance(); - DocumentBuilder db = dbf.newDocumentBuilder(); - Document doc = db.newDocument(); - Element config = doc.createElement("config"); - doc.appendChild(config); - Element replEnabled = doc.createElement("buddyReplicationEnabled"); - replEnabled.appendChild(doc.createTextNode("true")); - config.appendChild(replEnabled); - Element gravDisabled = doc.createElement("autoDataGravitation"); - gravDisabled.appendChild(doc.createTextNode("false")); - config.appendChild(gravDisabled); - - return XmlConfigurationParser.parseBuddyReplicationConfig(config); + BuddyReplicationConfig brc = new BuddyReplicationConfig(); + brc.setEnabled(true); + brc.setAutoDataGravitation(false); + return brc; } }

16 years, 1 month

1
0
0 / 0

JBoss Cache SVN: r5668 - core/trunk/src/main/java/org/jboss/cache.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2008-04-24 11:19:08 -0400 (Thu, 24 Apr 2008) New Revision: 5668 Modified: core/trunk/src/main/java/org/jboss/cache/Modification.java Log: Removed TODO - yes there is a difference between PUT_DATA and PUT_DATA_ERASE Modified: core/trunk/src/main/java/org/jboss/cache/Modification.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/Modification.java 2008-04-24 15:10:03 UTC (rev 5667) +++ core/trunk/src/main/java/org/jboss/cache/Modification.java 2008-04-24 15:19:08 UTC (rev 5668) @@ -34,7 +34,6 @@ { PUT_KEY_VALUE, PUT_DATA, - //todo check whether there is any difference between PUT_DATA and PUT_DATA_ERASE and merge them PUT_DATA_ERASE, REMOVE_NODE, REMOVE_KEY_VALUE,

16 years, 1 month

1
0
0 / 0

JBoss Cache SVN: r5667 - core/trunk/src/test/java/org/jboss/cache/statetransfer.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2008-04-24 11:10:03 -0400 (Thu, 24 Apr 2008) New Revision: 5667 Modified: core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferConcurrencyTest.java Log: Does not deadlock anymore Modified: core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferConcurrencyTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferConcurrencyTest.java 2008-04-24 15:08:23 UTC (rev 5666) +++ core/trunk/src/test/java/org/jboss/cache/statetransfer/StateTransferConcurrencyTest.java 2008-04-24 15:10:03 UTC (rev 5667) @@ -33,10 +33,8 @@ * * * @author <a href="mailto://brian.stansberry@jboss.com">Brian Stansberry</a> - * @version $Id$ */ -// todo: re-enable and ensure this works!! -@Test(groups = "functional", enabled = false) +@Test(groups = "functional") public class StateTransferConcurrencyTest extends StateTransferTestBase {

16 years, 1 month

1
0
0 / 0

JBoss Cache SVN: r5666 - in core/trunk/src: test/java/org/jboss/cache and 1 other directories.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2008-04-24 11:08:23 -0400 (Thu, 24 Apr 2008) New Revision: 5666 Modified: core/trunk/src/main/java/org/jboss/cache/Fqn.java core/trunk/src/test/java/org/jboss/cache/FqnTest.java core/trunk/src/test/java/org/jboss/cache/loader/AdjListJDBCCacheLoaderCompatibilityTest.java Log: Fixed Fqn stuff Modified: core/trunk/src/main/java/org/jboss/cache/Fqn.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/Fqn.java 2008-04-24 14:45:57 UTC (rev 5665) +++ core/trunk/src/main/java/org/jboss/cache/Fqn.java 2008-04-24 15:08:23 UTC (rev 5666) @@ -355,9 +355,9 @@ @SuppressWarnings("unchecked") public static Fqn<String> fromString(String stringRepresentation) { - if (stringRepresentation == null) + if (stringRepresentation == null || stringRepresentation.equals(SEPARATOR)) { - return root(); + return ROOT; } return new StringFqn(stringRepresentation); } @@ -537,7 +537,13 @@ elements.add(e); } - if (getClass().equals(StringFqn.class)) stringRepresentation = getStringRepresentation(elements); + if (getClass().equals(StringFqn.class)) + { + if (isRoot()) + stringRepresentation = SEPARATOR; + else + stringRepresentation = getStringRepresentation(elements); + } } Modified: core/trunk/src/test/java/org/jboss/cache/FqnTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/FqnTest.java 2008-04-24 14:45:57 UTC (rev 5665) +++ core/trunk/src/test/java/org/jboss/cache/FqnTest.java 2008-04-24 15:08:23 UTC (rev 5666) @@ -303,6 +303,11 @@ fqn = Fqn.fromString("/one/two"); assert !fqn.isRoot(); + + Fqn f = Fqn.fromString("/"); + + assert f.isRoot(); + assert f.equals(Fqn.ROOT); } public void testGetName() Modified: core/trunk/src/test/java/org/jboss/cache/loader/AdjListJDBCCacheLoaderCompatibilityTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/loader/AdjListJDBCCacheLoaderCompatibilityTest.java 2008-04-24 14:45:57 UTC (rev 5665) +++ core/trunk/src/test/java/org/jboss/cache/loader/AdjListJDBCCacheLoaderCompatibilityTest.java 2008-04-24 15:08:23 UTC (rev 5666) @@ -133,7 +133,7 @@ assertEquals(newImpl.get(Fqn.fromString("/a/b/d")).get("key2"), "value2"); assertEquals(newImpl.get(Fqn.fromString("/a/b/e")).get("key3"), "value3"); assertEquals(newImpl.get(Fqn.fromString("/a/f/e")).get("key4"), "value4"); - assertEquals(newImpl.get(Fqn.ROOT).get("root_key"), "root_value"); + assertEquals("root_value", newImpl.get(Fqn.ROOT).get("root_key")); assertEquals(newImpl.getNodeCount(), 8); }

16 years, 1 month

1
0
0 / 0

JBoss Cache SVN: r5665 - in core/trunk/src/main/java/org/jboss/cache: buddyreplication and 21 other directories.

by jbosscache-commits＠lists.jboss.org

Author: manik.surtani(a)jboss.com Date: 2008-04-24 10:45:57 -0400 (Thu, 24 Apr 2008) New Revision: 5665 Modified: core/trunk/src/main/java/org/jboss/cache/AbstractNode.java core/trunk/src/main/java/org/jboss/cache/CacheManagerImpl.java core/trunk/src/main/java/org/jboss/cache/RPCManagerImpl.java core/trunk/src/main/java/org/jboss/cache/RegionImpl.java core/trunk/src/main/java/org/jboss/cache/RegionManager.java core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyFqnTransformer.java core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyGroup.java core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java core/trunk/src/main/java/org/jboss/cache/buddyreplication/GravitateResult.java core/trunk/src/main/java/org/jboss/cache/buddyreplication/NextMemberBuddyLocator.java core/trunk/src/main/java/org/jboss/cache/cluster/ReplicationQueue.java core/trunk/src/main/java/org/jboss/cache/commands/cachedata/CreateNodeCommand.java core/trunk/src/main/java/org/jboss/cache/commands/cachedata/GetKeyValueCommand.java core/trunk/src/main/java/org/jboss/cache/commands/cachedata/InvalidateCommand.java core/trunk/src/main/java/org/jboss/cache/commands/cachedata/PutDataMapCommand.java core/trunk/src/main/java/org/jboss/cache/commands/cachedata/PutKeyValueCommand.java core/trunk/src/main/java/org/jboss/cache/commands/cachedata/RemoveDataCommand.java core/trunk/src/main/java/org/jboss/cache/commands/cachedata/RemoveKeyCommand.java core/trunk/src/main/java/org/jboss/cache/commands/cachedata/RemoveNodeCommand.java core/trunk/src/main/java/org/jboss/cache/commands/channel/BlockChannelCommand.java core/trunk/src/main/java/org/jboss/cache/commands/channel/UnblockChannelCommand.java core/trunk/src/main/java/org/jboss/cache/commands/remote/ClusteredGetCommand.java core/trunk/src/main/java/org/jboss/cache/commands/remote/DataGravitationCleanupCommand.java core/trunk/src/main/java/org/jboss/cache/commands/remote/GravitateDataCommand.java core/trunk/src/main/java/org/jboss/cache/commands/remote/ReplicateCommand.java core/trunk/src/main/java/org/jboss/cache/commands/visitors/AbstractCommandsVisitor.java core/trunk/src/main/java/org/jboss/cache/config/XmlParsingConfigurationRegistry.java core/trunk/src/main/java/org/jboss/cache/eviction/NullEvictionPolicy.java core/trunk/src/main/java/org/jboss/cache/eviction/NullEvictionPolicyConfig.java core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.java core/trunk/src/main/java/org/jboss/cache/factories/XmlConfigurationParser.java core/trunk/src/main/java/org/jboss/cache/interceptors/BaseRpcInterceptor.java core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticCreateIfNotExistsInterceptor.java core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticNodeInterceptor.java core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticReplicationInterceptor.java core/trunk/src/main/java/org/jboss/cache/interceptors/OrderedSynchronizationHandler.java core/trunk/src/main/java/org/jboss/cache/interceptors/PassivationInterceptor.java core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDelegate.java core/trunk/src/main/java/org/jboss/cache/invocation/NodeInvocationDelegate.java core/trunk/src/main/java/org/jboss/cache/loader/AsyncCacheLoader.java core/trunk/src/main/java/org/jboss/cache/loader/ReadOnlyDelegatingCacheLoader.java core/trunk/src/main/java/org/jboss/cache/loader/TcpDelegatingCacheLoader.java core/trunk/src/main/java/org/jboss/cache/loader/bdbje/BdbjeCacheLoader.java core/trunk/src/main/java/org/jboss/cache/loader/tcp/TcpCacheServer.java core/trunk/src/main/java/org/jboss/cache/lock/SimpleLock.java core/trunk/src/main/java/org/jboss/cache/lock/StripedLock.java core/trunk/src/main/java/org/jboss/cache/lock/ThreadLocalMap.java core/trunk/src/main/java/org/jboss/cache/marshall/RegionalizedReturnValue.java core/trunk/src/main/java/org/jboss/cache/marshall/UnmarshalledReferences.java core/trunk/src/main/java/org/jboss/cache/marshall/VersionAwareMarshaller.java core/trunk/src/main/java/org/jboss/cache/notifications/Notifier.java core/trunk/src/main/java/org/jboss/cache/optimistic/WorkspaceNodeImpl.java core/trunk/src/main/java/org/jboss/cache/transaction/DummyContextFactory.java core/trunk/src/main/java/org/jboss/cache/transaction/TransactionEntry.java core/trunk/src/main/java/org/jboss/cache/transaction/TransactionTable.java core/trunk/src/main/java/org/jboss/cache/util/SimpleImmutableEntry.java core/trunk/src/main/java/org/jboss/cache/util/reflect/ReflectionUtil.java core/trunk/src/main/java/org/jboss/cache/xml/XmlHelper.java Log: IntelliJ inspections Modified: core/trunk/src/main/java/org/jboss/cache/AbstractNode.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/AbstractNode.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/AbstractNode.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -21,7 +21,7 @@ /** * Flags placed on the node. Replaces older 'boolean' flags. */ - protected EnumSet<NodeFlags> flags = EnumSet.noneOf(NodeFlags.class); + protected final EnumSet<NodeFlags> flags = EnumSet.noneOf(NodeFlags.class); /** * These flags were originally stored as booleans on the UnversionedNode class. They have been replaced with an enum Modified: core/trunk/src/main/java/org/jboss/cache/CacheManagerImpl.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/CacheManagerImpl.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/CacheManagerImpl.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -39,9 +39,9 @@ private boolean configRegistryInjected; - private Map<String, Cache<Object, Object>> caches = new HashMap<String, Cache<Object, Object>>(); + private final Map<String, Cache<Object, Object>> caches = new HashMap<String, Cache<Object, Object>>(); - private Map<String, Integer> checkouts = new HashMap<String, Integer>(); + private final Map<String, Integer> checkouts = new HashMap<String, Integer>(); private ChannelFactory channelFactory; @@ -127,19 +127,19 @@ return cache; } - + /** * Extension point for subclasses, where we actually use a * {@link CacheFactory} to create a cache. This default implementation * uses {@link DefaultCacheFactory}. - * + * * @param config the Configuration for the cache * @return the Cache */ @SuppressWarnings("unchecked") protected Cache<Object, Object> createCache(Configuration config) { - return new DefaultCacheFactory().createCache(config, false); + return new DefaultCacheFactory().createCache(config, false); } public void releaseCache(String configName) Modified: core/trunk/src/main/java/org/jboss/cache/RPCManagerImpl.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/RPCManagerImpl.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/RPCManagerImpl.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -61,8 +61,8 @@ public class RPCManagerImpl implements RPCManager { private Channel channel; - private Log log = LogFactory.getLog(RPCManagerImpl.class); - private List<Address> members = new LinkedList<Address>(); + private final Log log = LogFactory.getLog(RPCManagerImpl.class); + private final List<Address> members = new LinkedList<Address>(); /** * True if this Cache is the coordinator. */ @@ -84,7 +84,7 @@ private Notifier notifier; private CacheSPI spi; private InvocationContextContainer invocationContextContainer; - private boolean trace = log.isTraceEnabled(); + private final boolean trace = log.isTraceEnabled(); private Marshaller marshaller; private TransactionManager txManager; private TransactionTable txTable; Modified: core/trunk/src/main/java/org/jboss/cache/RegionImpl.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/RegionImpl.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/RegionImpl.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -29,8 +29,8 @@ { private static final Log log = LogFactory.getLog(RegionImpl.class); - private RegionManager regionManager; - private Fqn fqn; + private final RegionManager regionManager; + private final Fqn fqn; private Status status; private ClassLoader classLoader; private BlockingQueue<EvictedEventNode> nodeEventQueue = null; @@ -61,7 +61,7 @@ public Configuration getCacheConfiguration() { - if (regionManager!= null && regionManager.getCache() != null) + if (regionManager != null && regionManager.getCache() != null) return regionManager.getCache().getConfiguration(); else return null; @@ -143,12 +143,12 @@ public String toString() { return "RegionImpl{" + - "fqn=" + fqn + - "; classloader="+ classLoader + - "; status=" + status + - "; eviction=" + (getEvictionPolicy() != null) + - "; timerThreadRegistered=" + (getEvictionPolicy() != null && regionManager.getEvictionTimerTask().isRegionRegisteredForProcessing(this)) + - '}'; + "fqn=" + fqn + + "; classloader=" + classLoader + + "; status=" + status + + "; eviction=" + (getEvictionPolicy() != null) + + "; timerThreadRegistered=" + (getEvictionPolicy() != null && regionManager.getEvictionTimerTask().isRegionRegisteredForProcessing(this)) + + '}'; } public int compareTo(Region other) @@ -164,8 +164,8 @@ if (nodeEventQueue.size() > capacityWarnThreshold) { log.warn("putNodeEvent(): eviction node event queue size is at 98% threshold value of capacity: " + configuration.getEventQueueSize() + - " Region: " + fqn + - " You will need to reduce the wakeUpIntervalSeconds parameter."); + " Region: " + fqn + + " You will need to reduce the wakeUpIntervalSeconds parameter."); } nodeEventQueue.put(event); } Modified: core/trunk/src/main/java/org/jboss/cache/RegionManager.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/RegionManager.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/RegionManager.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -47,13 +47,13 @@ /** * A registry of regions that have been defined. */ - private Map<Fqn, Region> regionsRegistry = new ConcurrentHashMap<Fqn, Region>(); + private final Map<Fqn, Region> regionsRegistry = new ConcurrentHashMap<Fqn, Region>(); private boolean defaultInactive; - private Log log = LogFactory.getLog(RegionManager.class); + private final Log log = LogFactory.getLog(RegionManager.class); private CacheSPI cache; private boolean usingEvictions; private EvictionConfig evictionConfig; - private EvictionTimerTask evictionTimerTask = new EvictionTimerTask(); + private final EvictionTimerTask evictionTimerTask = new EvictionTimerTask(); protected final Set<Fqn> activationChangeNodes = Collections.synchronizedSet(new HashSet<Fqn>()); protected Configuration configuration; Modified: core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/UnversionedNode.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -41,7 +41,7 @@ * Debug log. */ protected static Log log = LogFactory.getLog(UnversionedNode.class); - protected static boolean trace = log.isTraceEnabled(); + protected static final boolean trace = log.isTraceEnabled(); /** * Lock manager that manages locks to be acquired when accessing the node inside a transaction. Lazy set just in case Modified: core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyFqnTransformer.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyFqnTransformer.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyFqnTransformer.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -41,7 +41,7 @@ public static final Fqn<String> BUDDY_BACKUP_SUBTREE_FQN = Fqn.fromString(BUDDY_BACKUP_SUBTREE); - private String buddyGroupName; + private final String buddyGroupName; CommandsFactory factory; Modified: core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyGroup.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyGroup.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyGroup.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -39,7 +39,7 @@ /** * List<Address> - a list of JGroups addresses */ - private List<Address> buddies = new CopyOnWriteArrayList<Address>(); + private final List<Address> buddies = new CopyOnWriteArrayList<Address>(); public String getGroupName() { 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-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/buddyreplication/BuddyManager.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -58,7 +58,7 @@ */ public class BuddyManager { - private Log log = LogFactory.getLog(BuddyManager.class); + private final Log log = LogFactory.getLog(BuddyManager.class); private boolean trace; BuddyReplicationConfig config; @@ -98,7 +98,7 @@ * Keyed on String group name, values are BuddyGroup objects. * Needs to deal with concurrent access - concurrent assignTo/removeFrom buddy grp */ - Map<Address, BuddyGroup> buddyGroupsIParticipateIn = new ConcurrentHashMap<Address, BuddyGroup>(); + final Map<Address, BuddyGroup> buddyGroupsIParticipateIn = new ConcurrentHashMap<Address, BuddyGroup>(); /** * Queue to deal with queued up view change requests - which are handled asynchronously @@ -108,7 +108,7 @@ /** * Async thread that handles items on the view change queue */ - private AsyncViewChangeHandlerThread asyncViewChangeHandler = new AsyncViewChangeHandlerThread(); + private final AsyncViewChangeHandlerThread asyncViewChangeHandler = new AsyncViewChangeHandlerThread(); /** * Constants representng the buddy backup subtree @@ -130,7 +130,7 @@ */ private final Object poolInfoNotifierLock = new Object(); - private CountDownLatch initialisationLatch = new CountDownLatch(1); + private final CountDownLatch initialisationLatch = new CountDownLatch(1); // a dummy MembershipChange - a poison-pill to be placed on the membership change queue to notify async handler // threads to exit gracefully when the BuddyManager has been stopped. private static final MembershipChange STOP_NOTIFIER = new MembershipChange(null, null); @@ -317,8 +317,8 @@ static class MembershipChange { - List<Address> oldMembers; - List<Address> newMembers; + final List<Address> oldMembers; + final List<Address> newMembers; public MembershipChange(List<Address> oldMembers, List<Address> newMembers) { @@ -687,7 +687,7 @@ { try { - makeRemoteCall(buddies, command, true); + makeRemoteCall(buddies, command); break; } catch (Exception e) @@ -782,7 +782,7 @@ { try { - makeRemoteCall(buddies, membershipCall, true); + makeRemoteCall(buddies, membershipCall); break; } catch (Exception e) @@ -838,7 +838,7 @@ try { - byte[] state = generateState(fqn, timeouts[i], force, false); + byte[] state = generateState(fqn, timeouts[i], force); if (log.isDebugEnabled()) { log.debug("acquireState(): got state"); @@ -885,20 +885,19 @@ * State returned is a serialized byte[][], element 0 is the transient state * (or null), and element 1 is the persistent state (or null). * - * @param fqn Fqn indicating the uppermost node in the - * portion of the cache whose state should be returned. - * @param timeout max number of ms this method should wait to acquire - * a read lock on the nodes being transferred - * @param force if a read lock cannot be acquired after - * <code>timeout</code> ms, should the lock acquisition - * be forced, and any existing transactions holding locks - * on the nodes be rolled back? NOTE: - * In release 1.2.4, this parameter has no effect. - * @param suppressErrors should any Throwable thrown be suppressed? + * @param fqn Fqn indicating the uppermost node in the + * portion of the cache whose state should be returned. + * @param timeout max number of ms this method should wait to acquire + * a read lock on the nodes being transferred + * @param force if a read lock cannot be acquired after + * <code>timeout</code> ms, should the lock acquisition + * be forced, and any existing transactions holding locks + * on the nodes be rolled back? NOTE: + * In release 1.2.4, this parameter has no effect. * @return a serialized byte[][], element 0 is the transient state * (or null), and element 1 is the persistent state (or null). */ - public byte[] generateState(Fqn fqn, long timeout, boolean force, boolean suppressErrors) throws Throwable + private byte[] generateState(Fqn fqn, long timeout, boolean force) throws Throwable { MarshalledValueOutputStream out = null; @@ -907,7 +906,7 @@ { ExposedByteArrayOutputStream baos = new ExposedByteArrayOutputStream(16 * 1024); out = new MarshalledValueOutputStream(baos); - stateTransferManager.getState(out, fqn, timeout, force, suppressErrors); + stateTransferManager.getState(out, fqn, timeout, force, false); result = baos.getRawBuffer(); } finally @@ -938,7 +937,7 @@ try { - makeRemoteCall(recipients, command, true); + makeRemoteCall(recipients, command); } catch (Exception e) { @@ -946,7 +945,7 @@ } } - private void makeRemoteCall(List<Address> recipients, CacheCommand call, boolean sync) throws Exception + private void makeRemoteCall(List<Address> recipients, CacheCommand call) throws Exception { // remove non-members from dest list if (recipients != null) @@ -963,7 +962,7 @@ } } - rpcManager.callRemoteMethods(recipients, call, sync, true, config.getBuddyCommunicationTimeout(), false); + rpcManager.callRemoteMethods(recipients, call, true, true, config.getBuddyCommunicationTimeout(), false); } Modified: core/trunk/src/main/java/org/jboss/cache/buddyreplication/GravitateResult.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/buddyreplication/GravitateResult.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/buddyreplication/GravitateResult.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -14,11 +14,11 @@ */ public class GravitateResult { - private boolean dataFound; + private final boolean dataFound; - private List<NodeData> nodeData; + private final List<NodeData> nodeData; - private Fqn buddyBackupFqn; + private final Fqn buddyBackupFqn; /** * Factory method that creates a GravitateResult indicating that no data has been found. @@ -76,7 +76,7 @@ public String toString() { return "Result dataFound=" + dataFound + - " nodeData=" + nodeData + - " fqn=" + buddyBackupFqn; + " nodeData=" + nodeData + + " fqn=" + buddyBackupFqn; } } Modified: core/trunk/src/main/java/org/jboss/cache/buddyreplication/NextMemberBuddyLocator.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/buddyreplication/NextMemberBuddyLocator.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/buddyreplication/NextMemberBuddyLocator.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -38,7 +38,7 @@ @ThreadSafe public class NextMemberBuddyLocator implements BuddyLocator { - private Log log = LogFactory.getLog(NextMemberBuddyLocator.class); + private final Log log = LogFactory.getLog(NextMemberBuddyLocator.class); private NextMemberBuddyLocatorConfig config = new NextMemberBuddyLocatorConfig(); @@ -121,11 +121,11 @@ Address candidate = currentMembership.get(subscript); if ( - !candidate.equals(dataOwner) && // ignore self from selection as buddy - !buddies.contains(candidate) && // havent already considered this candidate - (!ignoreColocatedBuddiesForSession || !isColocated(candidate, dataOwner)) && // ignore colocated buddies - (isInSameBuddyPool(buddyPoolMap, candidate, dataOwner))// try and find buddies in the same buddy pool first - ) + !candidate.equals(dataOwner) && // ignore self from selection as buddy + !buddies.contains(candidate) && // havent already considered this candidate + (!ignoreColocatedBuddiesForSession || !isColocated(candidate, dataOwner)) && // ignore colocated buddies + (isInSameBuddyPool(buddyPoolMap, candidate, dataOwner))// try and find buddies in the same buddy pool first + ) { buddies.add(candidate); } Modified: core/trunk/src/main/java/org/jboss/cache/cluster/ReplicationQueue.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/cluster/ReplicationQueue.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/cluster/ReplicationQueue.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -26,7 +26,7 @@ public class ReplicationQueue { - private static Log log = LogFactory.getLog(ReplicationQueue.class); + private static final Log log = LogFactory.getLog(ReplicationQueue.class); /** * We flush every 5 seconds. Inactive if -1 or 0 Modified: core/trunk/src/main/java/org/jboss/cache/commands/cachedata/CreateNodeCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/cachedata/CreateNodeCommand.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/commands/cachedata/CreateNodeCommand.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -19,7 +19,7 @@ public class CreateNodeCommand extends BaseCacheDataCommand implements TxCacheCommand { public static final int METHOD_ID = 48; - private List<Fqn> newlyCreated = new LinkedList<Fqn>(); + private final List<Fqn> newlyCreated = new LinkedList<Fqn>(); public CreateNodeCommand() { Modified: core/trunk/src/main/java/org/jboss/cache/commands/cachedata/GetKeyValueCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/cachedata/GetKeyValueCommand.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/commands/cachedata/GetKeyValueCommand.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -17,7 +17,7 @@ public class GetKeyValueCommand extends BaseCacheDataCommand { public static final int METHOD_ID = 26; - private static Log log = LogFactory.getLog(GetKeyValueCommand.class); + private static final Log log = LogFactory.getLog(GetKeyValueCommand.class); private static boolean trace; private Object key; Modified: core/trunk/src/main/java/org/jboss/cache/commands/cachedata/InvalidateCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/cachedata/InvalidateCommand.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/commands/cachedata/InvalidateCommand.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -33,7 +33,7 @@ public class InvalidateCommand extends EvictNodeCommand { public static final int METHOD_ID = 47; - private static Log log = LogFactory.getLog(InvalidateCommand.class); + private static final Log log = LogFactory.getLog(InvalidateCommand.class); private static boolean trace; /* dependencies*/ Modified: core/trunk/src/main/java/org/jboss/cache/commands/cachedata/PutDataMapCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/cachedata/PutDataMapCommand.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/commands/cachedata/PutDataMapCommand.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -29,7 +29,7 @@ public static final int VERSIONED_METHOD_ID = 37; public static final int ERASE_VERSIONED_METHOD_ID = 38; - private static Log log = LogFactory.getLog(PutDataMapCommand.class); + private static final Log log = LogFactory.getLog(PutDataMapCommand.class); private static boolean trace; /* dependencies*/ Modified: core/trunk/src/main/java/org/jboss/cache/commands/cachedata/PutKeyValueCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/cachedata/PutKeyValueCommand.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/commands/cachedata/PutKeyValueCommand.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -30,7 +30,7 @@ public static final int PUT_FOR_EXT_READ_METHOD_ID = 45; public static final int PUT_FOR_EXT_READ_VERSIONED_METHOD_ID = 46; - private static Log log = LogFactory.getLog(PutKeyValueCommand.class); + private static final Log log = LogFactory.getLog(PutKeyValueCommand.class); private static boolean trace; /* parametres */ Modified: core/trunk/src/main/java/org/jboss/cache/commands/cachedata/RemoveDataCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/cachedata/RemoveDataCommand.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/commands/cachedata/RemoveDataCommand.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -27,7 +27,7 @@ public static final int METHOD_ID = 7; public static final int VERSIONED_METHOD_ID = 42; - private static Log log = LogFactory.getLog(RemoveDataCommand.class); + private static final Log log = LogFactory.getLog(RemoveDataCommand.class); private static boolean trace; /* parameters*/ Modified: core/trunk/src/main/java/org/jboss/cache/commands/cachedata/RemoveKeyCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/cachedata/RemoveKeyCommand.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/commands/cachedata/RemoveKeyCommand.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -27,7 +27,7 @@ public static final int METHOD_ID = 6; public static final int VERSIONED_METHOD_ID = 41; - private static Log log = LogFactory.getLog(RemoveKeyCommand.class); + private static final Log log = LogFactory.getLog(RemoveKeyCommand.class); private static boolean trace; /* parameters */ Modified: core/trunk/src/main/java/org/jboss/cache/commands/cachedata/RemoveNodeCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/cachedata/RemoveNodeCommand.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/commands/cachedata/RemoveNodeCommand.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -27,7 +27,7 @@ { public static final int METHOD_ID = 5; public static final int VERSIONED_METHOD_ID = 40; - private static Log log = LogFactory.getLog(RemoveNodeCommand.class); + private static final Log log = LogFactory.getLog(RemoveNodeCommand.class); private static boolean trace; private boolean isOptimistic; Modified: core/trunk/src/main/java/org/jboss/cache/commands/channel/BlockChannelCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/channel/BlockChannelCommand.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/commands/channel/BlockChannelCommand.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -16,10 +16,6 @@ { public static final int METHOD_ID = 43; - public BlockChannelCommand() - { - } - public Object perform(InvocationContext ctx) throws Throwable { return null; Modified: core/trunk/src/main/java/org/jboss/cache/commands/channel/UnblockChannelCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/channel/UnblockChannelCommand.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/commands/channel/UnblockChannelCommand.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -16,10 +16,6 @@ { public static final int METHOD_ID = 44; - public UnblockChannelCommand() - { - } - public Object perform(InvocationContext ctx) throws Throwable { //noop Modified: core/trunk/src/main/java/org/jboss/cache/commands/remote/ClusteredGetCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/remote/ClusteredGetCommand.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/commands/remote/ClusteredGetCommand.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -28,7 +28,7 @@ private CacheData cacheData; private InterceptorChain interceptorChain; - private static Log log = LogFactory.getLog(ClusteredGetCommand.class); + private static final Log log = LogFactory.getLog(ClusteredGetCommand.class); private static boolean trace; public ClusteredGetCommand() Modified: core/trunk/src/main/java/org/jboss/cache/commands/remote/DataGravitationCleanupCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/remote/DataGravitationCleanupCommand.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/commands/remote/DataGravitationCleanupCommand.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -39,7 +39,7 @@ private InterceptorChain invoker; private CommandsFactory commandsFactory; - private static Log log = LogFactory.getLog(DataGravitationCleanupCommand.class); + private static final Log log = LogFactory.getLog(DataGravitationCleanupCommand.class); private static boolean trace; /* parameters */ Modified: core/trunk/src/main/java/org/jboss/cache/commands/remote/GravitateDataCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/remote/GravitateDataCommand.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/commands/remote/GravitateDataCommand.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -37,7 +37,7 @@ /* parametres */ private boolean searchSubtrees; - private static Log log = LogFactory.getLog(GravitateDataCommand.class); + private static final Log log = LogFactory.getLog(GravitateDataCommand.class); private static boolean trace; public GravitateDataCommand() Modified: core/trunk/src/main/java/org/jboss/cache/commands/remote/ReplicateCommand.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/remote/ReplicateCommand.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/commands/remote/ReplicateCommand.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -25,7 +25,7 @@ private InterceptorChain invoker; - private static Log log = LogFactory.getLog(ReplicateCommand.class); + private static final Log log = LogFactory.getLog(ReplicateCommand.class); private static boolean trace; /** Modified: core/trunk/src/main/java/org/jboss/cache/commands/visitors/AbstractCommandsVisitor.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/commands/visitors/AbstractCommandsVisitor.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/commands/visitors/AbstractCommandsVisitor.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -179,12 +179,4 @@ command.accept(ctx, this); } } - - public void visitCollectionGeneric(InvocationContext ctx, Collection toVisit) throws Throwable - { - for (Object command : toVisit) - { - ((CacheCommand) command).accept(ctx, this); - } - } } Modified: core/trunk/src/main/java/org/jboss/cache/config/XmlParsingConfigurationRegistry.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/config/XmlParsingConfigurationRegistry.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/config/XmlParsingConfigurationRegistry.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -7,103 +7,105 @@ package org.jboss.cache.config; +import org.jboss.cache.factories.CacheConfigsXmlParser; + import java.util.HashSet; import java.util.Hashtable; import java.util.Map; import java.util.Set; -import org.jboss.cache.factories.CacheConfigsXmlParser; - /** * {@link ConfigurationRegistry} that obtains its initial set of configurations * by parsing an XML document. - * + * * @author <a href="brian.stansberry(a)jboss.com">Brian Stansberry</a> * @version $Revision: 1 $ */ -public class XmlParsingConfigurationRegistry implements ConfigurationRegistry -{ - private CacheConfigsXmlParser parser; - private String configResource; - private Map<String, Configuration> configs = new Hashtable<String, Configuration>(); - private boolean started; - - public XmlParsingConfigurationRegistry(String configResource) - { - parser = new CacheConfigsXmlParser(); - this.configResource = configResource; - } - - public void start() throws Exception - { - if (!started) - { - if (configResource != null) - configs.putAll(parser.parseConfigs(configResource)); - started = true; - } - } - - public void stop() - { - if (started) - { - synchronized (configs) - { - configs.clear(); - } - started = false; - } - } - - public String getConfigResource() - { - return configResource; - } +public class XmlParsingConfigurationRegistry implements ConfigurationRegistry +{ + private final CacheConfigsXmlParser parser; + private final String configResource; + private final Map<String, Configuration> configs = new Hashtable<String, Configuration>(); + private boolean started; - public Set<String> getConfigurationNames() - { - return new HashSet<String>(configs.keySet()); - } - - public void registerConfiguration(String configName, Configuration config) - throws CloneNotSupportedException - { - synchronized (configs) { - if (configs.containsKey(configName)) - throw new IllegalStateException(configName + " already registered"); - configs.put(configName, config.clone()); - } - } - - public void unregisterConfiguration(String configName) - { - synchronized (configs) { - if (configs.remove(configName) == null) - throw new IllegalStateException(configName + " not registered"); - } - } - - public Configuration getConfiguration(String configName) - { - Configuration config = null; - synchronized (configs) - { - config = configs.get(configName); - } - - if (config == null) - throw new IllegalArgumentException("unknown config " + configName); - - // Don't hand out a ref to our master copy - try - { - return config.clone(); - } - catch (CloneNotSupportedException e) - { - // This should not happen, as we already cloned the config - throw new RuntimeException("Could not clone configuration " + configName, e); - } - } + public XmlParsingConfigurationRegistry(String configResource) + { + parser = new CacheConfigsXmlParser(); + this.configResource = configResource; + } + + public void start() throws Exception + { + if (!started) + { + if (configResource != null) + configs.putAll(parser.parseConfigs(configResource)); + started = true; + } + } + + public void stop() + { + if (started) + { + synchronized (configs) + { + configs.clear(); + } + started = false; + } + } + + public String getConfigResource() + { + return configResource; + } + + public Set<String> getConfigurationNames() + { + return new HashSet<String>(configs.keySet()); + } + + public void registerConfiguration(String configName, Configuration config) + throws CloneNotSupportedException + { + synchronized (configs) + { + if (configs.containsKey(configName)) + throw new IllegalStateException(configName + " already registered"); + configs.put(configName, config.clone()); + } + } + + public void unregisterConfiguration(String configName) + { + synchronized (configs) + { + if (configs.remove(configName) == null) + throw new IllegalStateException(configName + " not registered"); + } + } + + public Configuration getConfiguration(String configName) + { + Configuration config = null; + synchronized (configs) + { + config = configs.get(configName); + } + + if (config == null) + throw new IllegalArgumentException("unknown config " + configName); + + // Don't hand out a ref to our master copy + try + { + return config.clone(); + } + catch (CloneNotSupportedException e) + { + // This should not happen, as we already cloned the config + throw new RuntimeException("Could not clone configuration " + configName, e); + } + } } Modified: core/trunk/src/main/java/org/jboss/cache/eviction/NullEvictionPolicy.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/eviction/NullEvictionPolicy.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/eviction/NullEvictionPolicy.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -1,5 +1,5 @@ /** - * + * */ package org.jboss.cache.eviction; @@ -10,47 +10,48 @@ import org.jboss.cache.config.EvictionPolicyConfig; /** - * Eviction policy that does nothing and always tells the eviction + * Eviction policy that does nothing and always tells the eviction * interceptor an event can be ignored, saving the overhead of * constructing and processing event objects. Basically useful - * as a default policy for a cache or subtree that is - * shared between multiple usages, some of which don't + * as a default policy for a cache or subtree that is + * shared between multiple usages, some of which don't * want eviction. - * + * * @author Brian Stansberry */ public class NullEvictionPolicy implements EvictionPolicy { private static final Log log = LogFactory.getLog(NullEvictionPolicy.class); - + private CacheSPI cache; - + /** - * Constructs a new NullEvictionPolicy. + * Returns <code>true</code> */ - public NullEvictionPolicy() - { - } - - /** Returns <code>true</code> */ public boolean canIgnoreEvent(Fqn fqn, NodeEventType eventType) { return true; } - /** No-op */ + /** + * No-op + */ public void evict(Fqn fqn) throws Exception { log.debug("evict should not be called on NullEvictionPolicy"); } - /** Returns {@link NullEvictionAlgorithm#INSTANCE}. */ + /** + * Returns {@link NullEvictionAlgorithm#INSTANCE}. + */ public EvictionAlgorithm getEvictionAlgorithm() { return NullEvictionAlgorithm.INSTANCE; } - /** Returns {@link NullEvictionPolicyConfig}. */ + /** + * Returns {@link NullEvictionPolicyConfig}. + */ public Class<? extends EvictionPolicyConfig> getEvictionConfigurationClass() { return NullEvictionPolicyConfig.class; Modified: core/trunk/src/main/java/org/jboss/cache/eviction/NullEvictionPolicyConfig.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/eviction/NullEvictionPolicyConfig.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/eviction/NullEvictionPolicyConfig.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -1,5 +1,5 @@ /** - * + * */ package org.jboss.cache.eviction; @@ -9,24 +9,17 @@ /** * Configuration class for {@link NullEvictionPolicy}. - * + * * @author Brian Stansberry */ public class NullEvictionPolicyConfig - extends ConfigurationComponent - implements EvictionPolicyConfig + extends ConfigurationComponent + implements EvictionPolicyConfig { private static final long serialVersionUID = -6591180473728241737L; /** - * Constructs a new NullEvictionPolicyConfig. - */ - public NullEvictionPolicyConfig() - { - } - - /** * Returns {@link NullEvictionPolicy}. */ public String getEvictionPolicyClass() @@ -34,13 +27,17 @@ return NullEvictionPolicy.class.getName(); } - /** No-op */ + /** + * No-op + */ public void reset() { // no-op } - /** No-op */ + /** + * No-op + */ public void validate() throws ConfigurationException { // no-op 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-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/factories/ComponentRegistry.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -72,14 +72,14 @@ /** * The registry of components. Components are stored under their name. */ - Map<String, Component> componentLookup = new HashMap<String, Component>(); + final Map<String, Component> componentLookup = new HashMap<String, Component>(); /** * Contains class definitions of component factories that can be used to construct certain components */ Map<Class, Class<? extends ComponentFactory>> defaultFactories = null; - private static Log log = LogFactory.getLog(ComponentRegistry.class); + private static final Log log = LogFactory.getLog(ComponentRegistry.class); private Bootstrap bootstrap; // cache of reflection methods to call during injections. These will be emptied when start() is called. @@ -745,11 +745,11 @@ class Component { Object instance; - String name; - Class type; + final String name; + final Class type; State state = CONSTRUCTED; - Set<Component> dependencies = new HashSet<Component>(3); - Set<Component> dependencyFor = new HashSet<Component>(3); + final Set<Component> dependencies = new HashSet<Component>(3); + final Set<Component> dependencyFor = new HashSet<Component>(3); boolean deepRecursionDetector = false; public Component(String name, Class type) @@ -969,13 +969,13 @@ class Bootstrap { - InterceptorChain interceptorChain; - CacheLifecycleManager lifecycleManager; - CacheData cacheData; - CacheSPI cacheSPI; - ComponentRegistry componentRegistry; - Configuration configuration; - private ClassLoader deployerClassLoader; + final InterceptorChain interceptorChain; + final CacheLifecycleManager lifecycleManager; + final CacheData cacheData; + final CacheSPI cacheSPI; + final ComponentRegistry componentRegistry; + final Configuration configuration; + private final ClassLoader deployerClassLoader; Bootstrap(ClassLoader deployerClassLoader, InterceptorChain interceptorChain, CacheLifecycleManager lifecycleManager, CacheData cacheData, CacheSPI cacheSPI, ComponentRegistry componentRegistry, Configuration configuration) Modified: core/trunk/src/main/java/org/jboss/cache/factories/XmlConfigurationParser.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/factories/XmlConfigurationParser.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/factories/XmlConfigurationParser.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -54,7 +54,7 @@ */ public class XmlConfigurationParser { - private static Log log = LogFactory.getLog(XmlConfigurationParser.class); + private static final Log log = LogFactory.getLog(XmlConfigurationParser.class); public static final String ATTR = "attribute"; public static final String NAME = "name"; @@ -702,8 +702,8 @@ static class ParsedAttributes { - Map<String, String> stringAttribs; - Map<String, Element> xmlAttribs; + final Map<String, String> stringAttribs; + final Map<String, Element> xmlAttribs; ParsedAttributes(Map strings, Map elements) { Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/BaseRpcInterceptor.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/interceptors/BaseRpcInterceptor.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/BaseRpcInterceptor.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -81,21 +81,16 @@ protected void replicateCall(InvocationContext ctx, CacheCommand call, boolean sync, Option o, boolean useOutOfBandMessage) throws Throwable { - replicateCall(ctx, null, call, sync, o, true, useOutOfBandMessage); + replicateCall(ctx, null, call, sync, o, useOutOfBandMessage); } protected void replicateCall(InvocationContext ctx, CacheCommand call, boolean sync, Option o) throws Throwable { - replicateCall(ctx, null, call, sync, o); + replicateCall(ctx, null, call, sync, o, false); } - protected void replicateCall(InvocationContext ctx, List<Address> recipients, CacheCommand call, boolean sync, Option o) throws Throwable + protected void replicateCall(InvocationContext ctx, List<Address> recipients, CacheCommand c, boolean sync, Option o, boolean useOutOfBandMessage) throws Throwable { - replicateCall(ctx, recipients, call, sync, o, true, false); - } - - protected void replicateCall(InvocationContext ctx, List<Address> recipients, CacheCommand c, boolean sync, Option o, boolean wrapCacheCommandInReplicateMethod, boolean useOutOfBandMessage) throws Throwable - { long syncReplTimeout = config.getSyncReplTimeout(); // test for option overrides @@ -120,7 +115,7 @@ } } - replicateCall(recipients, c, sync, wrapCacheCommandInReplicateMethod, useOutOfBandMessage, false, (int) syncReplTimeout); + replicateCall(recipients, c, sync, true, useOutOfBandMessage, false, (int) syncReplTimeout); } protected void replicateCall(List<Address> recipients, CacheCommand c, boolean sync, boolean wrapCacheCommandInReplicateMethod, boolean useOutOfBandMessage, boolean isBroadcast, int timeout) throws Throwable Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticCreateIfNotExistsInterceptor.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticCreateIfNotExistsInterceptor.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticCreateIfNotExistsInterceptor.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -77,10 +77,10 @@ public Object handleMoveCommand(InvocationContext ctx, MoveCommand command) throws Throwable { List<Fqn> fqns = new ArrayList<Fqn>(); - fqns.add((Fqn) command.getTo()); + fqns.add(command.getTo()); // peek into Node and get a hold of all child fqns as these need to be in the workspace. NodeSPI node = cacheData.peek(command.getFqn(), true, true); - greedyGetFqns(fqns, node, (Fqn) command.getTo()); + greedyGetFqns(fqns, node, command.getTo()); if (trace) log.trace("Adding Fqns " + fqns + " for a move() operation."); for (Fqn f : fqns) { Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticNodeInterceptor.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticNodeInterceptor.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticNodeInterceptor.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -136,7 +136,7 @@ throw new CacheException("Unable to set node version for " + command.getFqn() + ", node is null."); } } - putDataMapAndNotify(command.getData(), false, workspace, workspaceNode, ctx); + putDataMapAndNotify(command.getData(), workspace, workspaceNode, ctx); addToModificationList(gtx, command, ctx); return null; } @@ -336,7 +336,6 @@ * Adds a method call to the modification list of a given transaction's transaction entry * * @param gtx transaction - * @param m methodcall to add */ private void addToModificationList(GlobalTransaction gtx, TxCacheCommand command, InvocationContext ctx) { @@ -427,13 +426,12 @@ } } - private void putDataMapAndNotify(Map<Object, Object> data, boolean eraseExisitng, TransactionWorkspace workspace, WorkspaceNode workspaceNode, InvocationContext ctx) + private void putDataMapAndNotify(Map<Object, Object> data, TransactionWorkspace workspace, WorkspaceNode workspaceNode, InvocationContext ctx) { if (workspaceNode == null) throw new NodeNotExistsException("optimisticCreateIfNotExistsInterceptor should have created this node!"); // pre-notify notifier.notifyNodeModified(workspaceNode.getFqn(), true, PUT_MAP, workspaceNode.getData(), ctx); - if (eraseExisitng) workspaceNode.clearData(); workspaceNode.putAll(data); workspace.addNode(workspaceNode); // post-notify 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-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/OptimisticReplicationInterceptor.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -282,7 +282,7 @@ public class DataVersionPopulator extends AbstractCommandsVisitor { - TransactionWorkspace workspace; + final TransactionWorkspace workspace; public DataVersionPopulator(TransactionWorkspace workspace) { Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/OrderedSynchronizationHandler.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/interceptors/OrderedSynchronizationHandler.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/OrderedSynchronizationHandler.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -21,10 +21,10 @@ */ public class OrderedSynchronizationHandler implements Synchronization { - static Log log = LogFactory.getLog(OrderedSynchronizationHandler.class); + static final Log log = LogFactory.getLog(OrderedSynchronizationHandler.class); private Transaction tx = null; - private LinkedList<Synchronization> handlers = new LinkedList<Synchronization>(); + private final LinkedList<Synchronization> handlers = new LinkedList<Synchronization>(); public OrderedSynchronizationHandler(Transaction tx) throws SystemException, RollbackException { Modified: core/trunk/src/main/java/org/jboss/cache/interceptors/PassivationInterceptor.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/interceptors/PassivationInterceptor.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/PassivationInterceptor.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -27,7 +27,7 @@ public class PassivationInterceptor extends ChainedInterceptor implements PassivationInterceptorMBean { - private AtomicLong passivations = new AtomicLong(0); + private final AtomicLong passivations = new AtomicLong(0); protected CacheLoader loader; private Notifier notifier; 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-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/interceptors/TxInterceptor.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -70,14 +70,14 @@ private InvocationContextContainer invocationContextContainer; private CacheLifecycleManager lifecycleManager; - private ModificationsReplayVisitor replayVisitorNoInject = new ModificationsReplayVisitor(false); - private ModificationsReplayVisitor replayVisitorWithInject = new ModificationsReplayVisitor(true); + private final ModificationsReplayVisitor replayVisitorNoInject = new ModificationsReplayVisitor(false); + private final ModificationsReplayVisitor replayVisitorWithInject = new ModificationsReplayVisitor(true); /** * List <Transaction>that we have registered for */ - private Map transactions = new ConcurrentHashMap(16); - private Map rollbackTransactions = new ConcurrentHashMap(16); + private final Map transactions = new ConcurrentHashMap(16); + private final Map rollbackTransactions = new ConcurrentHashMap(16); private long prepares = 0; private long commits = 0; @@ -532,7 +532,6 @@ * * Resumes any existing txs before returning. * - * @return * @throws Throwable */ private Object handleOptimisticPrepare(InvocationContext ctx, GlobalTransaction gtx, Transaction ltx, OptimisticPrepareCommand command) throws Throwable @@ -553,7 +552,7 @@ private Object handlePessimisticPrepare(InvocationContext ctx, Transaction ltx, PrepareCommand command) throws Exception { boolean success = true; - Object retval; + Object retval = null; try { // now pass up the prepare method itself. @@ -567,7 +566,7 @@ } else { - invokeNextInterceptor(ctx, command); + retval = invokeNextInterceptor(ctx, command); } // JBCACHE-361 Confirm that the transaction is ACTIVE @@ -638,12 +637,12 @@ } } } - return null; + return retval; } public class ModificationsReplayVisitor extends DataVersionCommandsVisitor { - private boolean injectDataVersions; + private final boolean injectDataVersions; public ModificationsReplayVisitor(boolean injectDataVersions) { Modified: core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDelegate.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDelegate.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/invocation/CacheInvocationDelegate.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -34,7 +34,7 @@ * * @author Manik Surtani (<a href="mailto:manik@jboss.org">manik(a)jboss.org</a>) * @since 2.1.0 - * todo [mmarkus] consider renaming this as it does not look as an Delegate (rather as a facade) + * todo [mmarkus] consider renaming this as it does not look as an Delegate (rather as a facade) */ @SuppressWarnings("unchecked") public class CacheInvocationDelegate<K, V> extends AbstractInvocationDelegate implements CacheSPI<K, V> @@ -53,10 +53,6 @@ private CommandsFactory commandsFactory;// tu be built here and imjected within any CacheCommand instance. Also pass this to the interceptor chain private CacheTransactionHelper transactionHelper; - public CacheInvocationDelegate() - { - } - @Inject public void initialize(StateTransferManager stateTransferManager, CacheLoaderManager cacheLoaderManager, Notifier notifier, TransactionManager transactionManager, BuddyManager buddyManager, TransactionTable transactionTable, @@ -382,7 +378,8 @@ } } return result; - } else + } + else { InvocationContext ctx = invocationContextContainer.get(); cacheStatusCheck(ctx); @@ -449,7 +446,8 @@ getInvocationContext().getOptionOverrides().setForceAsynchronous(true); PutKeyValueCommand command = commandsFactory.buildPutKeyValueCommand(null, fqn, key, value, false, true); invoker.invoke(ctx, command); - } else + } + else { if (log.isDebugEnabled()) log.debug("putForExternalRead() called with Fqn " + fqn + " and this node already exists. This method is hence a no op."); Modified: core/trunk/src/main/java/org/jboss/cache/invocation/NodeInvocationDelegate.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/invocation/NodeInvocationDelegate.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/invocation/NodeInvocationDelegate.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -28,7 +28,7 @@ @SuppressWarnings("unchecked") public class NodeInvocationDelegate<K, V> extends AbstractInvocationDelegate implements NodeSPI<K, V> { - private UnversionedNode node; + private final UnversionedNode node; private CacheSPI<K, V> spi; public NodeInvocationDelegate(UnversionedNode node) @@ -406,13 +406,13 @@ public V get(K key) { assertValid(); - return (V) spi.get(getFqn(), key); + return spi.get(getFqn(), key); } public V remove(K key) { assertValid(); - return (V) spi.remove(getFqn(), key); + return spi.remove(getFqn(), key); } public void clearData() Modified: core/trunk/src/main/java/org/jboss/cache/loader/AsyncCacheLoader.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/loader/AsyncCacheLoader.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/loader/AsyncCacheLoader.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -86,7 +86,7 @@ /** * Default limit on entries to process asynchronously. */ - public static final int DEFAULT_QUEUE_SIZE = 10000; + private static final int DEFAULT_QUEUE_SIZE = 10000; private AsyncCacheLoaderConfig config; private AsyncProcessor processor; @@ -242,7 +242,7 @@ } private void enqueue(Modification mod) - throws CacheException, InterruptedException + throws CacheException, InterruptedException { if (stopped.get()) { @@ -367,14 +367,14 @@ public String toString() { return super.toString() + - " delegate=[" + super.getCacheLoader() + "]" + - " processor=" + processor + - " stopped=" + stopped + - " batchSize=" + config.getBatchSize() + - " returnOld=" + config.getReturnOld() + - " asyncPut=" + config.getUseAsyncPut() + - " queue.remainingCapacity()=" + queue.remainingCapacity() + - " queue.peek()=" + queue.peek(); + " delegate=[" + super.getCacheLoader() + "]" + + " processor=" + processor + + " stopped=" + stopped + + " batchSize=" + config.getBatchSize() + + " returnOld=" + config.getReturnOld() + + " asyncPut=" + config.getUseAsyncPut() + + " queue.remainingCapacity()=" + queue.remainingCapacity() + + " queue.peek()=" + queue.peek(); } } Modified: core/trunk/src/main/java/org/jboss/cache/loader/ReadOnlyDelegatingCacheLoader.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/loader/ReadOnlyDelegatingCacheLoader.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/loader/ReadOnlyDelegatingCacheLoader.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -1,13 +1,13 @@ package org.jboss.cache.loader; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.jboss.cache.Fqn; import org.jboss.cache.Modification; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; +import java.io.ObjectInputStream; +import java.util.List; import java.util.Map; -import java.util.List; -import java.io.ObjectInputStream; /** * Provides ignoreModifications features to all cache loaders. @@ -17,7 +17,7 @@ */ public class ReadOnlyDelegatingCacheLoader extends AbstractDelegatingCacheLoader { - private static Log log = LogFactory.getLog(ReadOnlyDelegatingCacheLoader.class); + private static final Log log = LogFactory.getLog(ReadOnlyDelegatingCacheLoader.class); public ReadOnlyDelegatingCacheLoader(CacheLoader cl) { Modified: core/trunk/src/main/java/org/jboss/cache/loader/TcpDelegatingCacheLoader.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/loader/TcpDelegatingCacheLoader.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/loader/TcpDelegatingCacheLoader.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -46,7 +46,7 @@ private TcpDelegatingCacheLoaderConfig config; ObjectInputStream in; ObjectOutputStream out; - private static Log log = LogFactory.getLog(TcpDelegatingCacheLoader.class); + private static final Log log = LogFactory.getLog(TcpDelegatingCacheLoader.class); private static Method GET_CHILDREN_METHOD, GET_METHOD, PUT_KEY_METHOD, PUT_DATA_METHOD, REMOVE_KEY_METHOD, REMOVE_METHOD, PUT_MODS_METHOD, EXISTS_METHOD, REMOVE_DATA_METHOD; static Modified: core/trunk/src/main/java/org/jboss/cache/loader/bdbje/BdbjeCacheLoader.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/loader/bdbje/BdbjeCacheLoader.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/loader/bdbje/BdbjeCacheLoader.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -373,7 +373,7 @@ { // changed createIfNull param to true // See http://jira.jboss.com/jira/browse/JBCACHE-118 - return makeDataObject(foundData, true); + return makeDataObject(foundData); } else { @@ -473,7 +473,7 @@ status = cursor.getSearchKey(keyEntry, foundData, LockMode.RMW); if (status == OperationStatus.SUCCESS) { - map = makeDataObject(foundData, true); + map = makeDataObject(foundData); oldVal = map.put(key, value); cursor.putCurrent(makeDataEntry(map)); } @@ -540,7 +540,7 @@ status = cursor.getSearchKey(keyEntry, foundData, LockMode.RMW); if (status == OperationStatus.SUCCESS) { - Map map = makeDataObject(foundData, true); + Map map = makeDataObject(foundData); if (values != null) { map.putAll(values); @@ -778,7 +778,7 @@ cursor.getSearchKey(keyEntry, foundData, LockMode.RMW); if (status == OperationStatus.SUCCESS) { - Map map = makeDataObject(foundData, true); + Map map = makeDataObject(foundData); oldVal = map.remove(key); cursor.putCurrent(makeDataEntry(map)); } @@ -1076,10 +1076,10 @@ * Converts a database entry to a Map. */ @SuppressWarnings("unchecked") - private Map<Object, Object> makeDataObject(DatabaseEntry entry, boolean createIfNull) + private Map<Object, Object> makeDataObject(DatabaseEntry entry) { Map<Object, Object> map = (Map<Object, Object>) serialBinding.entryToObject(entry); - if (createIfNull && map == null) + if (true && map == null) { map = new HashMap<Object, Object>(); } Modified: core/trunk/src/main/java/org/jboss/cache/loader/tcp/TcpCacheServer.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/loader/tcp/TcpCacheServer.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/loader/tcp/TcpCacheServer.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -51,7 +51,7 @@ * whether or not to start the server thread as a daemon. Should be false if started from the command line, true if started as an MBean. */ boolean daemon = true; - static Log log = LogFactory.getLog(TcpCacheServer.class); + static final Log log = LogFactory.getLog(TcpCacheServer.class); public String getBindAddress() Modified: core/trunk/src/main/java/org/jboss/cache/lock/SimpleLock.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/lock/SimpleLock.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/lock/SimpleLock.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -18,8 +18,8 @@ */ public class SimpleLock { -// Log log=LogFactory.getLog(getClass()); - private SemaphoreLock sem_; + // Log log=LogFactory.getLog(getClass()); + private final SemaphoreLock sem_; public SimpleLock() { Modified: core/trunk/src/main/java/org/jboss/cache/lock/StripedLock.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/lock/StripedLock.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/lock/StripedLock.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -26,11 +26,11 @@ public class StripedLock { private static final int DEFAULT_CONCURRENCY = 20; - private int lockSegmentMask; - private int lockSegmentShift; + private final int lockSegmentMask; + private final int lockSegmentShift; - ReentrantReadWriteLock[] sharedLocks; - private Log log = LogFactory.getLog(StripedLock.class); + final ReentrantReadWriteLock[] sharedLocks; + private final Log log = LogFactory.getLog(StripedLock.class); /** * This constructor just calls {@link #StripedLock(int)} with a default concurrency value of 20. Modified: core/trunk/src/main/java/org/jboss/cache/lock/ThreadLocalMap.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/lock/ThreadLocalMap.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/lock/ThreadLocalMap.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -8,69 +8,86 @@ /** * Map which reduces concurrency and potential memory leaks for non-static ThreadLocals. * http://www.me.umn.edu/~shivane/blogs/cafefeed/2004/06/of-non-static-threa... + * * @author Brian Dueck * @version $Id$ */ -public class ThreadLocalMap<K, V> implements Map<K, V> { +public class ThreadLocalMap<K, V> implements Map<K, V> +{ - private ThreadLocal threadLocal = new ThreadLocal() { - @Override - protected Object initialValue() { - return new HashMap(); - } - }; + private final ThreadLocal threadLocal = new ThreadLocal() + { + @Override + protected Object initialValue() + { + return new HashMap(); + } + }; - @SuppressWarnings("unchecked") - private Map<K, V> getThreadLocalMap() { - return (Map<K, V>) threadLocal.get(); - } + @SuppressWarnings("unchecked") + private Map<K, V> getThreadLocalMap() + { + return (Map<K, V>) threadLocal.get(); + } - public V put(K key, V value) { - return getThreadLocalMap().put(key, value); - } + public V put(K key, V value) + { + return getThreadLocalMap().put(key, value); + } - public V get(Object key) { - return getThreadLocalMap().get(key); - } + public V get(Object key) + { + return getThreadLocalMap().get(key); + } - public V remove(Object key) { - return getThreadLocalMap().remove(key); - } + public V remove(Object key) + { + return getThreadLocalMap().remove(key); + } - public int size() { - return getThreadLocalMap().size(); - } + public int size() + { + return getThreadLocalMap().size(); + } - public void clear() { - getThreadLocalMap().clear(); - } + public void clear() + { + getThreadLocalMap().clear(); + } - public boolean isEmpty() { - return getThreadLocalMap().isEmpty(); - } + public boolean isEmpty() + { + return getThreadLocalMap().isEmpty(); + } - public boolean containsKey(Object arg0) { - return getThreadLocalMap().containsKey(arg0); - } + public boolean containsKey(Object arg0) + { + return getThreadLocalMap().containsKey(arg0); + } - public boolean containsValue(Object arg0) { - return getThreadLocalMap().containsValue(arg0); - } + public boolean containsValue(Object arg0) + { + return getThreadLocalMap().containsValue(arg0); + } - public Collection<V> values() { - return getThreadLocalMap().values(); - } + public Collection<V> values() + { + return getThreadLocalMap().values(); + } - public void putAll(Map<? extends K, ? extends V> arg0) { - getThreadLocalMap().putAll(arg0); - } + public void putAll(Map<? extends K, ? extends V> arg0) + { + getThreadLocalMap().putAll(arg0); + } - public Set<Map.Entry<K, V>> entrySet() { - return getThreadLocalMap().entrySet(); - } + public Set<Map.Entry<K, V>> entrySet() + { + return getThreadLocalMap().entrySet(); + } - public Set<K> keySet() { - return getThreadLocalMap().keySet(); - } + public Set<K> keySet() + { + return getThreadLocalMap().keySet(); + } } \ No newline at end of file Modified: core/trunk/src/main/java/org/jboss/cache/marshall/RegionalizedReturnValue.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/marshall/RegionalizedReturnValue.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/marshall/RegionalizedReturnValue.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -11,8 +11,8 @@ */ class RegionalizedReturnValue { - Object returnValue; - Fqn region; + final Object returnValue; + final Fqn region; /** * Creates this value object. Modified: core/trunk/src/main/java/org/jboss/cache/marshall/UnmarshalledReferences.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/marshall/UnmarshalledReferences.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/marshall/UnmarshalledReferences.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -11,7 +11,7 @@ */ public class UnmarshalledReferences { - private ArrayList<Object> referencedObjects = new ArrayList<Object>(); + private final ArrayList<Object> referencedObjects = new ArrayList<Object>(); /** * Retrieves an object referenced by an id Modified: core/trunk/src/main/java/org/jboss/cache/marshall/VersionAwareMarshaller.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/marshall/VersionAwareMarshaller.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/marshall/VersionAwareMarshaller.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -44,7 +44,7 @@ private ComponentRegistry componentRegistry; Marshaller defaultMarshaller; - Map<Integer, Marshaller> marshallers = new HashMap<Integer, Marshaller>(); + final Map<Integer, Marshaller> marshallers = new HashMap<Integer, Marshaller>(); private int versionInt; @Inject Modified: core/trunk/src/main/java/org/jboss/cache/notifications/Notifier.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/notifications/Notifier.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/notifications/Notifier.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -13,7 +13,6 @@ import org.jboss.cache.CacheSPI; import org.jboss.cache.Fqn; import org.jboss.cache.InvocationContext; -import org.jboss.cache.invocation.InvocationContextContainer; import org.jboss.cache.buddyreplication.BuddyGroup; import org.jboss.cache.factories.annotations.Destroy; import org.jboss.cache.factories.annotations.Inject; @@ -45,9 +44,9 @@ { private static final Log log = LogFactory.getLog(Notifier.class); - private static Class emptyMap = Collections.emptyMap().getClass(); + private static final Class emptyMap = Collections.emptyMap().getClass(); - private static Class singletonMap = Collections.singletonMap(null, null).getClass(); + private static final Class singletonMap = Collections.singletonMap(null, null).getClass(); private static final Class[] allowedMethodAnnotations = { CacheStarted.class, CacheStopped.class, CacheBlocked.class, CacheUnblocked.class, NodeCreated.class, NodeRemoved.class, NodeVisited.class, NodeModified.class, NodeMoved.class, @@ -683,8 +682,8 @@ */ class ListenerInvocation { - private Object target; - private Method method; + private final Object target; + private final Method method; public ListenerInvocation(Object target, Method method) { Modified: core/trunk/src/main/java/org/jboss/cache/optimistic/WorkspaceNodeImpl.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/optimistic/WorkspaceNodeImpl.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/optimistic/WorkspaceNodeImpl.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -36,7 +36,7 @@ public class WorkspaceNodeImpl<K, V> extends AbstractNode<K, V> implements WorkspaceNode<K, V> { - private static Log log = LogFactory.getLog(WorkspaceNodeImpl.class); + private static final Log log = LogFactory.getLog(WorkspaceNodeImpl.class); private NodeSPI<K, V> node; private TransactionWorkspace workspace; Modified: core/trunk/src/main/java/org/jboss/cache/transaction/DummyContextFactory.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/transaction/DummyContextFactory.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/transaction/DummyContextFactory.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -15,10 +15,6 @@ static Context instance = null; - public DummyContextFactory() - { - } - /** * Creates an Initial Context for beginning name resolution. * Special requirements of this context are supplied Modified: core/trunk/src/main/java/org/jboss/cache/transaction/TransactionEntry.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/transaction/TransactionEntry.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/transaction/TransactionEntry.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -52,7 +52,7 @@ public class TransactionEntry { - private static Log log = LogFactory.getLog(TransactionEntry.class); + private static final Log log = LogFactory.getLog(TransactionEntry.class); /** * Local transaction @@ -67,11 +67,11 @@ /** * List<MethodCall> of modifications ({@link MethodCall}). They will be replicated on TX commit */ - private List<TxCacheCommand> modificationList = new LinkedList<TxCacheCommand>(); + private final List<TxCacheCommand> modificationList = new LinkedList<TxCacheCommand>(); // For some reason we see multiple threads accessing this list - even within the same tx. Could be due to reuse of // tx identifiers in the DummyTM, which is where we see this problem. - private List<TxCacheCommand> classLoadeModList = new CopyOnWriteArrayList<TxCacheCommand>(); + private final List<TxCacheCommand> classLoadeModList = new CopyOnWriteArrayList<TxCacheCommand>(); /** * LinkedHashSet<IdentityLock> of locks acquired by the transaction. We use @@ -79,7 +79,7 @@ * be added multiple times) but also need guaranteed ordering for use * by lock release code (see JBCCACHE-874). */ - private LinkedHashSet<NodeLock> locks = new LinkedHashSet<NodeLock>(); + private final LinkedHashSet<NodeLock> locks = new LinkedHashSet<NodeLock>(); /** * A list of dummy uninitialised nodes created by the cache loader interceptor to load data for a @@ -90,7 +90,7 @@ /** * List<Fqn> of nodes that have been removed by the transaction */ - private List<Fqn> removedNodes = new LinkedList<Fqn>(); + private final List<Fqn> removedNodes = new LinkedList<Fqn>(); public TransactionEntry(Transaction tx) throws SystemException, RollbackException { Modified: core/trunk/src/main/java/org/jboss/cache/transaction/TransactionTable.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/transaction/TransactionTable.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/transaction/TransactionTable.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -34,12 +34,12 @@ * and GlobalTransactions. * New: a local TX can have a number of GTXs */ - protected Map<Transaction, GlobalTransaction> tx2gtxMap = new ConcurrentHashMap<Transaction, GlobalTransaction>(); + protected final Map<Transaction, GlobalTransaction> tx2gtxMap = new ConcurrentHashMap<Transaction, GlobalTransaction>(); /** * Mappings between GlobalTransactions and modifications. */ - protected Map<GlobalTransaction, TransactionEntry> gtx2EntryMap = new ConcurrentHashMap<GlobalTransaction, TransactionEntry>(); + protected final Map<GlobalTransaction, TransactionEntry> gtx2EntryMap = new ConcurrentHashMap<GlobalTransaction, TransactionEntry>(); /** * Returns the number of local transactions. Modified: core/trunk/src/main/java/org/jboss/cache/util/SimpleImmutableEntry.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/util/SimpleImmutableEntry.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/util/SimpleImmutableEntry.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -11,9 +11,9 @@ { private static final long serialVersionUID = -6092752114794052323L; - private K key; + private final K key; - private V value; + private final V value; public SimpleImmutableEntry(Entry<K, V> me) { @@ -49,14 +49,14 @@ return false; Map.Entry e2 = (Map.Entry) o; return (getKey() == null ? e2.getKey() == null : getKey().equals(e2.getKey())) - && (getValue() == null ? e2.getValue() == null : getValue().equals(e2.getValue())); + && (getValue() == null ? e2.getValue() == null : getValue().equals(e2.getValue())); } @Override public int hashCode() { return (getKey() == null ? 0 : getKey().hashCode()) ^ - (getValue() == null ? 0 : getValue().hashCode()); + (getValue() == null ? 0 : getValue().hashCode()); } @Override Modified: core/trunk/src/main/java/org/jboss/cache/util/reflect/ReflectionUtil.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/util/reflect/ReflectionUtil.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/util/reflect/ReflectionUtil.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -19,7 +19,7 @@ */ public class ReflectionUtil { - private static Log log = LogFactory.getLog(ReflectionUtil.class); + private static final Log log = LogFactory.getLog(ReflectionUtil.class); /** * Returns a set of Methods that contain the given method annotation. This includes all public, protected, package and private Modified: core/trunk/src/main/java/org/jboss/cache/xml/XmlHelper.java =================================================================== --- core/trunk/src/main/java/org/jboss/cache/xml/XmlHelper.java 2008-04-24 13:59:14 UTC (rev 5664) +++ core/trunk/src/main/java/org/jboss/cache/xml/XmlHelper.java 2008-04-24 14:45:57 UTC (rev 5665) @@ -32,7 +32,7 @@ */ public class XmlHelper { - private static Log log = LogFactory.getLog(XmlHelper.class); + private static final Log log = LogFactory.getLog(XmlHelper.class); /** * The root of a JBoss Cache configuration XML file. This is the <tt><mbean></tt> tag.

16 years, 1 month

1
0
0 / 0

JBoss Cache SVN: r5664 - core/trunk/src/test/java/org/jboss/cache/invocation.

by jbosscache-commits＠lists.jboss.org

Author: mircea.markus Date: 2008-04-24 09:59:14 -0400 (Thu, 24 Apr 2008) New Revision: 5664 Modified: core/trunk/src/test/java/org/jboss/cache/invocation/InterceptorChainTest.java Log: JBCACHE-1222 - fixed interceptor chain tests Modified: core/trunk/src/test/java/org/jboss/cache/invocation/InterceptorChainTest.java =================================================================== --- core/trunk/src/test/java/org/jboss/cache/invocation/InterceptorChainTest.java 2008-04-24 13:59:14 UTC (rev 5663) +++ core/trunk/src/test/java/org/jboss/cache/invocation/InterceptorChainTest.java 2008-04-24 13:59:14 UTC (rev 5664) @@ -151,7 +151,7 @@ assert txInterceptor.getNext().equals(invalidationInterceptor); } - public ChainedInterceptor create(Class<? extends ChainedInterceptor> toInstantiate) + private ChainedInterceptor create(Class<? extends ChainedInterceptor> toInstantiate) { try {

16 years, 1 month

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

jbosscache-commits April 2008