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

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();