[jbosscache-commits] JBoss Cache SVN: r5671 - in core/trunk/src/main/java/org/jboss/cache: buddyreplication and 17 other directories.
jbosscache-commits at lists.jboss.org
jbosscache-commits at lists.jboss.org
Thu Apr 24 11:41:26 EDT 2008
Author: manik.surtani at 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 at 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 at 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}.
* <p/>
* If configured via XML, expects the following:
* <p/>
@@ -20,19 +20,20 @@
* <attribute name="maxNodes">10000</attribute>
* </region>
* </pre>
- *
+ * <p/>
* 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>
- *
+ * <p/>
* Requires a "maxNodes" attribute otherwise a ConfigurationException is thrown.
*
* @author Daniel Huang (dhuang at 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}.
* <p/>
* If configured via XML, expects the following:
* <p/>
@@ -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>
- *
+ * <p/>
* Requires a "maxNodes" attribute otherwise a ConfigurationException is thrown.
*
* @author Daniel Huang (dhuang at 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.</p>
*/
+ @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.
- *
+ * <p/>
* <p>Note that the pre-requisite to use upgrade lock is the pre-existing of a read
* lock. Otherwise, a RuntimeException will be thrown.</p>
* <p>Also note that currently lock can only be obtained through <code>attempt</code>
* api with specified timeout instead <code>acquire</code> is not supported.
- *
+ * <p/>
* 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 at jboss.org">Bela Ban</a>.
* @version $Revision$
* <p/>
@@ -22,24 +23,32 @@
* <p/>
* <p>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.
* <p>
* 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.
* </p>
* <p>
- * 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.
* </p>
- *
+ *
* @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;
More information about the jbosscache-commits
mailing list