[infinispan-commits] Infinispan SVN: r2276 - in branches/4.1.x: cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc and 89 other directories.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Mon Aug 23 13:56:02 EDT 2010
Author: sannegrinovero
Date: 2010-08-23 13:55:55 -0400 (Mon, 23 Aug 2010)
New Revision: 2276
Added:
branches/4.1.x/core/PutObjectStoreDirHere/
branches/4.1.x/core/PutObjectStoreDirHere/defaultStore/
branches/4.1.x/tree/PutObjectStoreDirHere/
branches/4.1.x/tree/PutObjectStoreDirHere/defaultStore/
branches/4.1.x/tree/PutObjectStoreDirHere/defaultStore/Recovery/
branches/4.1.x/tree/PutObjectStoreDirHere/defaultStore/Recovery/TransactionStatusManager/
Removed:
branches/4.1.x/core/src/main/java/org/infinispan/factories/context/
branches/4.1.x/query/src/main/java/org/infinispan/query/config/
branches/4.1.x/server/websocket/src/main/java/org/infinispan/websocket/
Modified:
branches/4.1.x/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/PreparableTransactionRunner.java
branches/4.1.x/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/AbstractJdbcCacheStoreConfig.java
branches/4.1.x/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/AbstractNonDelegatingJdbcCacheStoreConfig.java
branches/4.1.x/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/DataManipulationHelper.java
branches/4.1.x/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/DatabaseType.java
branches/4.1.x/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/JdbcUtil.java
branches/4.1.x/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/TableManipulation.java
branches/4.1.x/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/PooledConnectionFactory.java
branches/4.1.x/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/SimpleConnectionFactory.java
branches/4.1.x/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStore.java
branches/4.1.x/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStoreConfig.java
branches/4.1.x/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStore.java
branches/4.1.x/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/binary/JdbcBinaryCacheStoreTest.java
branches/4.1.x/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStoreTest.java
branches/4.1.x/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStoreTest2.java
branches/4.1.x/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/JdbmCacheStoreConfig.java
branches/4.1.x/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/JdbmSerializer.java
branches/4.1.x/cachestore/jdbm/src/test/java/org/infinispan/loaders/jdbm/JdbmCacheStoreFunctionalTest.java
branches/4.1.x/cachestore/jdbm/src/test/java/org/infinispan/loaders/jdbm/JdbmCacheStoreTest.java
branches/4.1.x/cachestore/remote/src/main/java/org/infinispan/loaders/remote/RemoteCacheStore.java
branches/4.1.x/cachestore/remote/src/main/java/org/infinispan/loaders/remote/RemoteCacheStoreConfig.java
branches/4.1.x/cachestore/remote/src/test/java/org/infinispan/loaders/remote/RemoteCacheStoreTest.java
branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/RemoteCacheManager.java
branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/ServerStatistics.java
branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/exceptions/TransportException.java
branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/ConfigurationProperties.java
branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/RemoteCacheImpl.java
branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/ServerStatisticsImpl.java
branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/async/DefaultAsyncExecutorFactory.java
branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/consistenthash/ConsistentHash.java
branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/consistenthash/ConsistentHashFactory.java
branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/consistenthash/ConsistentHashV1.java
branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/AbstractKeyOperation.java
branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/ContainsKeyOperation.java
branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/GetWithVersionOperation.java
branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/HotRodOperation.java
branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/PingOperation.java
branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/PutIfAbsentOperation.java
branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/RemoveIfUnmodifiedOperation.java
branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/ReplaceIfUnmodifiedOperation.java
branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/RetryOnFailureOperation.java
branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol/HotRodConstants.java
branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol/HotRodOperations.java
branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/AbstractTransport.java
branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/TransportFactory.java
branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/tcp/PropsKeyedObjectPoolFactory.java
branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/tcp/RoundRobinBalancingStrategy.java
branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/tcp/TcpTransport.java
branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/tcp/TcpTransportFactory.java
branches/4.1.x/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/CSAIntegrationTest.java
branches/4.1.x/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/HitsAwareCacheManagersTest.java
branches/4.1.x/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/HotRodIntegrationTest.java
branches/4.1.x/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/RoundRobinBalancingIntegrationTest.java
branches/4.1.x/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/RoundRobinBalancingStrategyTest.java
branches/4.1.x/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ServerRestartTest.java
branches/4.1.x/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/WorkerThread.java
branches/4.1.x/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/retry/AbstractRetryTest.java
branches/4.1.x/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/retry/DistributionRetryTest.java
branches/4.1.x/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/retry/ReplicationRetryTest.java
branches/4.1.x/core/src/main/java/org/infinispan/affinity/KeyAffinityService.java
branches/4.1.x/core/src/main/java/org/infinispan/affinity/KeyAffinityServiceFactory.java
branches/4.1.x/core/src/main/java/org/infinispan/affinity/KeyAffinityServiceImpl.java
branches/4.1.x/core/src/main/java/org/infinispan/affinity/KeyGenerator.java
branches/4.1.x/core/src/main/java/org/infinispan/atomic/AtomicMapLookup.java
branches/4.1.x/core/src/main/java/org/infinispan/commands/control/LockControlCommand.java
branches/4.1.x/core/src/main/java/org/infinispan/commands/read/EntrySetCommand.java
branches/4.1.x/core/src/main/java/org/infinispan/commands/read/KeySetCommand.java
branches/4.1.x/core/src/main/java/org/infinispan/commands/read/SizeCommand.java
branches/4.1.x/core/src/main/java/org/infinispan/commands/read/ValuesCommand.java
branches/4.1.x/core/src/main/java/org/infinispan/commands/tx/AbstractTransactionBoundaryCommand.java
branches/4.1.x/core/src/main/java/org/infinispan/commands/tx/PrepareCommand.java
branches/4.1.x/core/src/main/java/org/infinispan/commands/write/RemoveCommand.java
branches/4.1.x/core/src/main/java/org/infinispan/config/ConfigurationValidatingVisitor.java
branches/4.1.x/core/src/main/java/org/infinispan/config/parsing/ConfigFilesConvertor.java
branches/4.1.x/core/src/main/java/org/infinispan/container/EntryFactory.java
branches/4.1.x/core/src/main/java/org/infinispan/container/entries/TransientCacheEntry.java
branches/4.1.x/core/src/main/java/org/infinispan/context/InvocationContext.java
branches/4.1.x/core/src/main/java/org/infinispan/context/impl/AbstractInvocationContext.java
branches/4.1.x/core/src/main/java/org/infinispan/distribution/ConsistentHashHelper.java
branches/4.1.x/core/src/main/java/org/infinispan/distribution/DefaultConsistentHash.java
branches/4.1.x/core/src/main/java/org/infinispan/factories/EmptyConstructorFactory.java
branches/4.1.x/core/src/main/java/org/infinispan/factories/MarshallerFactory.java
branches/4.1.x/core/src/main/java/org/infinispan/factories/TransactionManagerFactory.java
branches/4.1.x/core/src/main/java/org/infinispan/factories/TransportFactory.java
branches/4.1.x/core/src/main/java/org/infinispan/factories/scopes/ScopeDetector.java
branches/4.1.x/core/src/main/java/org/infinispan/factories/scopes/Scopes.java
branches/4.1.x/core/src/main/java/org/infinispan/interceptors/DistCacheStoreInterceptor.java
branches/4.1.x/core/src/main/java/org/infinispan/interceptors/DistLockingInterceptor.java
branches/4.1.x/core/src/main/java/org/infinispan/interceptors/DistributionInterceptor.java
branches/4.1.x/core/src/main/java/org/infinispan/interceptors/InterceptorChain.java
branches/4.1.x/core/src/main/java/org/infinispan/interceptors/InvocationContextInterceptor.java
branches/4.1.x/core/src/main/java/org/infinispan/interceptors/PassivationInterceptor.java
branches/4.1.x/core/src/main/java/org/infinispan/io/GridFile.java
branches/4.1.x/core/src/main/java/org/infinispan/io/UnsignedNumeric.java
branches/4.1.x/core/src/main/java/org/infinispan/jmx/AbstractJmxRegistration.java
branches/4.1.x/core/src/main/java/org/infinispan/jmx/ResourceDMBean.java
branches/4.1.x/core/src/main/java/org/infinispan/jmx/annotations/MBean.java
branches/4.1.x/core/src/main/java/org/infinispan/loaders/AbstractCacheLoaderConfig.java
branches/4.1.x/core/src/main/java/org/infinispan/loaders/AbstractCacheStore.java
branches/4.1.x/core/src/main/java/org/infinispan/loaders/CacheLoaderManagerImpl.java
branches/4.1.x/core/src/main/java/org/infinispan/loaders/cluster/ClusterCacheLoader.java
branches/4.1.x/core/src/main/java/org/infinispan/loaders/decorators/SingletonStore.java
branches/4.1.x/core/src/main/java/org/infinispan/manager/CacheContainer.java
branches/4.1.x/core/src/main/java/org/infinispan/manager/DefaultCacheManager.java
branches/4.1.x/core/src/main/java/org/infinispan/marshall/AbstractMarshaller.java
branches/4.1.x/core/src/main/java/org/infinispan/marshall/AbstractStreamingMarshaller.java
branches/4.1.x/core/src/main/java/org/infinispan/marshall/MarshalledValue.java
branches/4.1.x/core/src/main/java/org/infinispan/marshall/StreamingMarshaller.java
branches/4.1.x/core/src/main/java/org/infinispan/marshall/jboss/GenericJBossMarshaller.java
branches/4.1.x/core/src/main/java/org/infinispan/marshall/jboss/JBossMarshaller.java
branches/4.1.x/core/src/main/java/org/infinispan/remoting/ReplicationQueue.java
branches/4.1.x/core/src/main/java/org/infinispan/remoting/transport/jgroups/CommandAwareRpcDispatcher.java
branches/4.1.x/core/src/main/java/org/infinispan/transaction/TransactionLog.java
branches/4.1.x/core/src/main/java/org/infinispan/transaction/xa/CacheTransaction.java
branches/4.1.x/core/src/main/java/org/infinispan/transaction/xa/DeadlockDetectingGlobalTransaction.java
branches/4.1.x/core/src/main/java/org/infinispan/transaction/xa/RemoteTransaction.java
branches/4.1.x/core/src/main/java/org/infinispan/transaction/xa/TransactionTable.java
branches/4.1.x/core/src/main/java/org/infinispan/transaction/xa/TransactionXaAdapter.java
branches/4.1.x/core/src/main/java/org/infinispan/util/FileLookup.java
branches/4.1.x/core/src/main/java/org/infinispan/util/InfinispanCollections.java
branches/4.1.x/core/src/main/java/org/infinispan/util/LegacyKeySupportSystemProperties.java
branches/4.1.x/core/src/main/java/org/infinispan/util/Proxies.java
branches/4.1.x/core/src/main/java/org/infinispan/util/concurrent/AbstractInProcessNotifyingFuture.java
branches/4.1.x/core/src/main/java/org/infinispan/util/concurrent/IsolationLevel.java
branches/4.1.x/core/src/main/java/org/infinispan/util/concurrent/locks/StripedLock.java
branches/4.1.x/core/src/main/java/org/infinispan/util/concurrent/locks/containers/AbstractPerEntryLockContainer.java
branches/4.1.x/core/src/main/java/org/infinispan/util/concurrent/locks/containers/AbstractStripedLockContainer.java
branches/4.1.x/core/src/main/java/org/infinispan/util/hash/MurmurHash2.java
branches/4.1.x/core/src/test/java/org/infinispan/affinity/BaseFilterKeyAffinityServiceTest.java
branches/4.1.x/core/src/test/java/org/infinispan/affinity/FilteredKeyAffinityService.java
branches/4.1.x/core/src/test/java/org/infinispan/affinity/LocalKeyAffinityServiceTest.java
branches/4.1.x/core/src/test/java/org/infinispan/api/mvcc/read_committed/CacheAPIMVCCTest.java
branches/4.1.x/core/src/test/java/org/infinispan/config/parsing/MinimalConfigurationParsingTest.java
branches/4.1.x/core/src/test/java/org/infinispan/context/MarshalledValueContextTest.java
branches/4.1.x/core/src/test/java/org/infinispan/distribution/BaseDistFunctionalTest.java
branches/4.1.x/core/src/test/java/org/infinispan/distribution/HashFunctionComparisonTest.java
branches/4.1.x/core/src/test/java/org/infinispan/distribution/SyncDistImplicitLockingTest.java
branches/4.1.x/core/src/test/java/org/infinispan/eviction/EvictionManagerTest.java
branches/4.1.x/core/src/test/java/org/infinispan/jmx/RpcManagerMBeanTest.java
branches/4.1.x/core/src/test/java/org/infinispan/loaders/FlushingAsyncStoreTest.java
branches/4.1.x/core/src/test/java/org/infinispan/loaders/dummy/DummyInMemoryCacheStoreFunctionalTest.java
branches/4.1.x/core/src/test/java/org/infinispan/lock/EagerLockingDisabledTest.java
branches/4.1.x/core/src/test/java/org/infinispan/profiling/DeadlockDetectionPerformanceTest.java
branches/4.1.x/core/src/test/java/org/infinispan/replication/SyncCacheListenerTest.java
branches/4.1.x/core/src/test/java/org/infinispan/replication/SyncReplTest.java
branches/4.1.x/core/src/test/java/org/infinispan/statetransfer/StateTransferReplicationQueueTest.java
branches/4.1.x/core/src/test/java/org/infinispan/test/AbstractInfinispanTest.java
branches/4.1.x/core/src/test/java/org/infinispan/test/PerCacheExecutorThread.java
branches/4.1.x/core/src/test/java/org/infinispan/test/fwk/SuiteResourcesAndLogTest.java
branches/4.1.x/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java
branches/4.1.x/core/src/test/java/org/infinispan/tx/LargeTransactionTest.java
branches/4.1.x/core/src/test/java/org/infinispan/tx/TransactionManagerLookupTest.java
branches/4.1.x/demos/ec2-ui/src/main/java/org/infinispan/ec2demo/web/CacheSearchServlet.java
branches/4.1.x/demos/ec2-ui/src/main/java/org/infinispan/ec2demo/web/CacheServletListener.java
branches/4.1.x/demos/ec2/src/main/java/org/infinispan/ec2demo/CacheBuilder.java
branches/4.1.x/demos/ec2/src/main/java/org/infinispan/ec2demo/InfinispanFluDemo.java
branches/4.1.x/demos/ec2/src/main/java/org/infinispan/ec2demo/InfluenzaDataLoader.java
branches/4.1.x/demos/ec2/src/main/java/org/infinispan/ec2demo/InfluenzaVirusCache.java
branches/4.1.x/demos/ec2/src/main/java/org/infinispan/ec2demo/Influenza_N_P_CR_Element.java
branches/4.1.x/demos/ec2/src/main/java/org/infinispan/ec2demo/Influenza_Parser.java
branches/4.1.x/demos/ec2/src/main/java/org/infinispan/ec2demo/NucleotideCache.java
branches/4.1.x/demos/ec2/src/main/java/org/infinispan/ec2demo/Nucleotide_Protein_Element.java
branches/4.1.x/demos/ec2/src/main/java/org/infinispan/ec2demo/Nucleotide_Protein_Parser.java
branches/4.1.x/demos/ec2/src/main/java/org/infinispan/ec2demo/ProteinCache.java
branches/4.1.x/demos/gridfs-webdav/src/main/java/org/infinispan/demos/gridfs/GridStore.java
branches/4.1.x/demos/gui/src/main/java/org/infinispan/demo/InfinispanDemo.java
branches/4.1.x/query/src/main/java/org/infinispan/query/backend/KeyTransformationHandler.java
branches/4.1.x/query/src/main/java/org/infinispan/query/backend/QueryInterceptor.java
branches/4.1.x/query/src/test/java/org/infinispan/query/test/AnotherGrassEater.java
branches/4.1.x/server/websocket/
branches/4.1.x/tree/src/main/java/org/infinispan/tree/TreeStructureSupport.java
branches/4.1.x/tree/src/test/java/org/infinispan/api/tree/LazyDeserializationTreeCacheTest.java
branches/4.1.x/tree/src/test/java/org/infinispan/tx/TransactionManagerLookupTreeTest.java
Log:
javadoc typos, import cleanup, static final loggers - branch 4.1
Modified: branches/4.1.x/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/PreparableTransactionRunner.java
===================================================================
--- branches/4.1.x/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/PreparableTransactionRunner.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/PreparableTransactionRunner.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -9,7 +9,6 @@
import com.sleepycat.je.Transaction;
import com.sleepycat.je.TransactionConfig;
import com.sleepycat.util.ExceptionUnwrapper;
-import org.infinispan.loaders.CacheLoaderException;
/**
* Adapted version of {@link TransactionRunner}, which allows us to prepare a transaction without committing it.<p/> The
Modified: branches/4.1.x/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/AbstractJdbcCacheStoreConfig.java
===================================================================
--- branches/4.1.x/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/AbstractJdbcCacheStoreConfig.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/AbstractJdbcCacheStoreConfig.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -1,6 +1,5 @@
package org.infinispan.loaders.jdbc;
-import org.infinispan.loaders.AbstractCacheStoreConfig;
import org.infinispan.loaders.LockSupportCacheStoreConfig;
import org.infinispan.loaders.jdbc.connectionfactory.ConnectionFactoryConfig;
Modified: branches/4.1.x/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/AbstractNonDelegatingJdbcCacheStoreConfig.java
===================================================================
--- branches/4.1.x/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/AbstractNonDelegatingJdbcCacheStoreConfig.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/AbstractNonDelegatingJdbcCacheStoreConfig.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -1,7 +1,5 @@
package org.infinispan.loaders.jdbc;
-import org.infinispan.loaders.LockSupportCacheStoreConfig;
-
/**
* An abstract configuration for JDBC cache stores which have support for locking.
*
Modified: branches/4.1.x/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/DataManipulationHelper.java
===================================================================
--- branches/4.1.x/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/DataManipulationHelper.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/DataManipulationHelper.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -47,7 +47,7 @@
*/
public abstract class DataManipulationHelper {
- private static Log log = LogFactory.getLog(DataManipulationHelper.class);
+ private static final Log log = LogFactory.getLog(DataManipulationHelper.class);
private ConnectionFactory connectionFactory;
private TableManipulation tableManipulation;
Modified: branches/4.1.x/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/DatabaseType.java
===================================================================
--- branches/4.1.x/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/DatabaseType.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/DatabaseType.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -1,9 +1,7 @@
package org.infinispan.loaders.jdbc;
-import java.util.Arrays;
-
/**
- * Supported database dialects for the Jdbc cache stores
+ * Supported database dialects for the JDBC cache stores
*
* @author Manik Surtani
* @since 4.1
Modified: branches/4.1.x/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/JdbcUtil.java
===================================================================
--- branches/4.1.x/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/JdbcUtil.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/JdbcUtil.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -35,13 +35,13 @@
import java.sql.Statement;
/**
- * Contains common methods used by jdbc CacheStores.
+ * Contains common methods used by JDBC CacheStores.
*
* @author Mircea.Markus at jboss.com
*/
public class JdbcUtil {
- private static Log log = LogFactory.getLog(JdbcUtil.class);
+ private static final Log log = LogFactory.getLog(JdbcUtil.class);
public static void safeClose(Statement ps) {
if (ps != null) {
Modified: branches/4.1.x/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/TableManipulation.java
===================================================================
--- branches/4.1.x/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/TableManipulation.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/TableManipulation.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -43,7 +43,7 @@
*/
public class TableManipulation implements Cloneable {
- private static Log log = LogFactory.getLog(TableManipulation.class);
+ private static final Log log = LogFactory.getLog(TableManipulation.class);
public static final int DEFAULT_FETCH_SIZE = 100;
Modified: branches/4.1.x/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/PooledConnectionFactory.java
===================================================================
--- branches/4.1.x/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/PooledConnectionFactory.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/PooledConnectionFactory.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -45,7 +45,7 @@
*/
public class PooledConnectionFactory extends ConnectionFactory {
- private static Log log = LogFactory.getLog(PooledConnectionFactory.class);
+ private static final Log log = LogFactory.getLog(PooledConnectionFactory.class);
private ComboPooledDataSource pooledDataSource;
@Override
Modified: branches/4.1.x/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/SimpleConnectionFactory.java
===================================================================
--- branches/4.1.x/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/SimpleConnectionFactory.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/connectionfactory/SimpleConnectionFactory.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -38,7 +38,7 @@
*/
public class SimpleConnectionFactory extends ConnectionFactory {
- private static Log log = LogFactory.getLog(SimpleConnectionFactory.class);
+ private static final Log log = LogFactory.getLog(SimpleConnectionFactory.class);
private String connectionUrl;
private String userName;
Modified: branches/4.1.x/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStore.java
===================================================================
--- branches/4.1.x/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStore.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStore.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -68,7 +68,7 @@
@CacheLoaderMetadata(configurationClass = JdbcMixedCacheStoreConfig.class)
public class JdbcMixedCacheStore extends AbstractCacheStore {
- private static Log log = LogFactory.getLog(JdbcMixedCacheStore.class);
+ private static final Log log = LogFactory.getLog(JdbcMixedCacheStore.class);
private JdbcMixedCacheStoreConfig config;
private JdbcBinaryCacheStore binaryCacheStore = new JdbcBinaryCacheStore();
Modified: branches/4.1.x/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStoreConfig.java
===================================================================
--- branches/4.1.x/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStoreConfig.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStoreConfig.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -21,7 +21,6 @@
*/
package org.infinispan.loaders.jdbc.mixed;
-import org.infinispan.loaders.AbstractCacheStoreConfig;
import org.infinispan.loaders.LockSupportCacheStoreConfig;
import org.infinispan.loaders.jdbc.AbstractJdbcCacheStoreConfig;
import org.infinispan.loaders.jdbc.DatabaseType;
Modified: branches/4.1.x/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStore.java
===================================================================
--- branches/4.1.x/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStore.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/cachestore/jdbc/src/main/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStore.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -22,7 +22,6 @@
package org.infinispan.loaders.jdbc.stringbased;
import org.infinispan.Cache;
-import org.infinispan.config.Configuration;
import org.infinispan.container.entries.InternalCacheEntry;
import org.infinispan.container.entries.InternalCacheValue;
import org.infinispan.io.ByteBuffer;
@@ -81,7 +80,7 @@
@CacheLoaderMetadata(configurationClass = JdbcStringBasedCacheStoreConfig.class)
public class JdbcStringBasedCacheStore extends LockSupportCacheStore {
- private static Log log = LogFactory.getLog(JdbcStringBasedCacheStore.class);
+ private static final Log log = LogFactory.getLog(JdbcStringBasedCacheStore.class);
/**
* delimits the stream for stream transfer operations
Modified: branches/4.1.x/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/binary/JdbcBinaryCacheStoreTest.java
===================================================================
--- branches/4.1.x/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/binary/JdbcBinaryCacheStoreTest.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/binary/JdbcBinaryCacheStoreTest.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -37,7 +37,6 @@
import org.testng.annotations.Test;
import java.io.Serializable;
-import java.util.concurrent.TimeUnit;
/**
* Tester class for {@link JdbcBinaryCacheStore}
Modified: branches/4.1.x/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStoreTest.java
===================================================================
--- branches/4.1.x/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStoreTest.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/mixed/JdbcMixedCacheStoreTest.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -31,7 +31,6 @@
import org.infinispan.loaders.jdbc.TableManipulation;
import org.infinispan.loaders.jdbc.connectionfactory.ConnectionFactory;
import org.infinispan.loaders.jdbc.connectionfactory.ConnectionFactoryConfig;
-import org.infinispan.loaders.jdbc.stringbased.DefaultKey2StringMapper;
import org.infinispan.loaders.jdbc.stringbased.DefaultTwoWayKey2StringMapper;
import org.infinispan.loaders.jdbc.stringbased.Person;
import org.infinispan.marshall.StreamingMarshaller;
Modified: branches/4.1.x/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStoreTest2.java
===================================================================
--- branches/4.1.x/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStoreTest2.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/JdbcStringBasedCacheStoreTest2.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -83,7 +83,7 @@
}
/**
- * When trying to perists an unsupported object an exception is expected.
+ * When trying to persist an unsupported object an exception is expected.
*/
public void persistUnsupportedObject() throws Exception {
try {
Modified: branches/4.1.x/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/JdbmCacheStoreConfig.java
===================================================================
--- branches/4.1.x/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/JdbmCacheStoreConfig.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/JdbmCacheStoreConfig.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -2,7 +2,6 @@
import java.util.Comparator;
-import org.infinispan.CacheException;
import org.infinispan.config.Dynamic;
import org.infinispan.loaders.LockSupportCacheStoreConfig;
import org.infinispan.util.Util;
Modified: branches/4.1.x/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/JdbmSerializer.java
===================================================================
--- branches/4.1.x/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/JdbmSerializer.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/JdbmSerializer.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -8,7 +8,7 @@
/**
* Uses the configured (runtime) {@link org.infinispan.marshall.StreamingMarshaller} of the cache.
- * This Serializer is thus not really serializiable.
+ * This Serializer is thus not really serializable.
*
* @author Elias Ross
*/
Modified: branches/4.1.x/cachestore/jdbm/src/test/java/org/infinispan/loaders/jdbm/JdbmCacheStoreFunctionalTest.java
===================================================================
--- branches/4.1.x/cachestore/jdbm/src/test/java/org/infinispan/loaders/jdbm/JdbmCacheStoreFunctionalTest.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/cachestore/jdbm/src/test/java/org/infinispan/loaders/jdbm/JdbmCacheStoreFunctionalTest.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -28,7 +28,6 @@
import org.infinispan.test.TestingUtil;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
-import org.testng.annotations.BeforeTest;
import org.testng.annotations.Optional;
import org.testng.annotations.Parameters;
import org.testng.annotations.Test;
Modified: branches/4.1.x/cachestore/jdbm/src/test/java/org/infinispan/loaders/jdbm/JdbmCacheStoreTest.java
===================================================================
--- branches/4.1.x/cachestore/jdbm/src/test/java/org/infinispan/loaders/jdbm/JdbmCacheStoreTest.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/cachestore/jdbm/src/test/java/org/infinispan/loaders/jdbm/JdbmCacheStoreTest.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -13,7 +13,6 @@
import org.infinispan.test.TestingUtil;
import org.testng.annotations.AfterClass;
import org.testng.annotations.BeforeClass;
-import org.testng.annotations.BeforeTest;
import org.testng.annotations.Optional;
import org.testng.annotations.Parameters;
import org.testng.annotations.Test;
Modified: branches/4.1.x/cachestore/remote/src/main/java/org/infinispan/loaders/remote/RemoteCacheStore.java
===================================================================
--- branches/4.1.x/cachestore/remote/src/main/java/org/infinispan/loaders/remote/RemoteCacheStore.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/cachestore/remote/src/main/java/org/infinispan/loaders/remote/RemoteCacheStore.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -5,7 +5,6 @@
import org.infinispan.client.hotrod.RemoteCache;
import org.infinispan.client.hotrod.RemoteCacheManager;
import org.infinispan.container.entries.InternalCacheEntry;
-import org.infinispan.container.entries.InternalEntryFactory;
import org.infinispan.loaders.AbstractCacheStore;
import org.infinispan.loaders.CacheLoaderConfig;
import org.infinispan.loaders.CacheLoaderException;
@@ -42,7 +41,7 @@
@CacheLoaderMetadata(configurationClass = RemoteCacheStoreConfig.class)
public class RemoteCacheStore extends AbstractCacheStore {
- private static Log log = LogFactory.getLog(RemoteCacheStore.class);
+ private static final Log log = LogFactory.getLog(RemoteCacheStore.class);
private volatile RemoteCacheStoreConfig config;
private volatile RemoteCacheManager remoteCacheManager;
Modified: branches/4.1.x/cachestore/remote/src/main/java/org/infinispan/loaders/remote/RemoteCacheStoreConfig.java
===================================================================
--- branches/4.1.x/cachestore/remote/src/main/java/org/infinispan/loaders/remote/RemoteCacheStoreConfig.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/cachestore/remote/src/main/java/org/infinispan/loaders/remote/RemoteCacheStoreConfig.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -14,8 +14,8 @@
* <p/>
* Parameters:
* <ul>
- * <li>HotRodClientPropertiesFile-the file that contains the configuration of hotrod client. See <a href="http://community.jboss.org/wiki/JavaHotRodclient">Hotrod Java Client</a>
- * for more details on the hotrod client.
+ * <li>HotRodClientPropertiesFile-the file that contains the configuration of Hot Rod client. See <a href="http://community.jboss.org/wiki/JavaHotRodclient">Hotrod Java Client</a>
+ * for more details on the Hot Rod client.
* <li>remoteCacheName-the name of the remote cache in the remote infinispan cluster, to which to connect to</li>
* <li>UseDefaultRemoteCache-if set to true, the default remote cache will be used, as obtained by {@link org.infinispan.manager.CacheContainer#getCache()}.
* </ul>
Modified: branches/4.1.x/cachestore/remote/src/test/java/org/infinispan/loaders/remote/RemoteCacheStoreTest.java
===================================================================
--- branches/4.1.x/cachestore/remote/src/test/java/org/infinispan/loaders/remote/RemoteCacheStoreTest.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/cachestore/remote/src/test/java/org/infinispan/loaders/remote/RemoteCacheStoreTest.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -12,7 +12,6 @@
import org.testng.annotations.AfterTest;
import org.testng.annotations.Test;
-import java.io.IOException;
import java.util.Properties;
/**
Modified: branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/RemoteCacheManager.java
===================================================================
--- branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/RemoteCacheManager.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/RemoteCacheManager.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -2,7 +2,6 @@
import org.infinispan.client.hotrod.exceptions.HotRodClientException;
import org.infinispan.client.hotrod.impl.ConfigurationProperties;
-import org.infinispan.client.hotrod.impl.async.DefaultAsyncExecutorFactory;
import org.infinispan.client.hotrod.impl.operations.OperationsFactory;
import org.infinispan.client.hotrod.impl.RemoteCacheImpl;
import org.infinispan.client.hotrod.impl.transport.TransportFactory;
@@ -28,12 +27,12 @@
/**
* Factory for {@link org.infinispan.client.hotrod.RemoteCache}s. <p/> <p> <b>Lifecycle:</b> </p> In order to be able to
* use an {@link org.infinispan.client.hotrod.RemoteCache}, the {@link org.infinispan.client.hotrod.RemoteCacheManager}
- * must be started first: beside other things, this instantiates connections to Hotrod server(s). Starting the {@link
+ * must be started first: beside other things, this instantiates connections to Hot Rod server(s). Starting the {@link
* org.infinispan.client.hotrod.RemoteCacheManager} can be done either at creation by passing start==true to constructor
* or by using a constructor that does that for you (see C-tor documentation); or after construction by calling {@link
* #start()}.
* <p/>
- * This is an "expensive" object, as it manages a set of persistent TCP connections to the hotrod servers. It is recommended
+ * This is an "expensive" object, as it manages a set of persistent TCP connections to the Hot Rod servers. It is recommended
* to only have one instance of this per JVM, and to cache it between calls to the server (i.e. remoteCache
* operations).
* <p/>
@@ -47,9 +46,9 @@
* <p/>
* Below is the list of supported configuration elements:
* <ul>
- * <li><tt>infinispan.client.hotrod.request_balancing_strategy</tt>, default = org.infinispan.client.hotrod.impl.transport.tcp.RoundRobinBalancingStrategy. For replicated (vs distributed) hotrod server clusters, the client balances requests to the
+ * <li><tt>infinispan.client.hotrod.request_balancing_strategy</tt>, default = org.infinispan.client.hotrod.impl.transport.tcp.RoundRobinBalancingStrategy. For replicated (vs distributed) Hot Rod server clusters, the client balances requests to the
* servers according to this strategy.</li>
- * <li><tt>infinispan.client.hotrod.server_list</tt>, default = 127.0.0.1:11311. This is the initial list of hotrod servers to connect to, specified in the following format: host1:port1;host2:port2...
+ * <li><tt>infinispan.client.hotrod.server_list</tt>, default = 127.0.0.1:11311. This is the initial list of Hot Rod servers to connect to, specified in the following format: host1:port1;host2:port2...
* At least one host:port must be specified.</li>
* <li><tt>infinispan.client.hotrod.force_return_values</tt>, default = false. Whether or not to implicitly {@link org.infinispan.client.hotrod.Flag#FORCE_RETURN_VALUE} for all calls.</li>
* <li><tt>infinispan.client.hotrod.tcp_no_delay</tt>, default = true. Affects TCP NODELAY on the TCP stack.</li>
@@ -84,7 +83,7 @@
* <ul>
* <li> <tt>0</tt> - an exception will be thrown to the calling user</li>
* <li> <tt>1</tt> - the caller will block (invoke waits until a new or idle connections is available.
- * <li> <tt>2</tt> - a new persistent connection will be created and and returned (essentially making maxActive meaningless.) </li>
+ * <li> <tt>2</tt> - a new persistent connection will be created and returned (essentially making maxActive meaningless.) </li>
* </ul>
* The default whenExhaustedAction setting is 1.
* </li>
@@ -120,7 +119,7 @@
*/
public class RemoteCacheManager implements CacheContainer {
- private static Log log = LogFactory.getLog(RemoteCacheManager.class);
+ private static final Log log = LogFactory.getLog(RemoteCacheManager.class);
public static final String HOTROD_CLIENT_PROPERTIES = "hotrod-client.properties";
@@ -200,7 +199,7 @@
}
/**
- * Creates a remote cache manager aware of the hotrod server listening at host:port.
+ * Creates a remote cache manager aware of the Hot Rod server listening at host:port.
*
* @param start weather or not to start the RemoteCacheManager.
*/
Modified: branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/ServerStatistics.java
===================================================================
--- branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/ServerStatistics.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/ServerStatistics.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -3,7 +3,7 @@
import java.util.Map;
/**
- * Defines the possible list of statistics defined by the hotrod server.
+ * Defines the possible list of statistics defined by the Hot Rod server.
* Can be obtained through {@link RemoteCache#stats()}
*
* @author Mircea.Markus at jboss.com
Modified: branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/exceptions/TransportException.java
===================================================================
--- branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/exceptions/TransportException.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/exceptions/TransportException.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -1,7 +1,7 @@
package org.infinispan.client.hotrod.exceptions;
/**
- * Indicates a communication exception with the hotrod server: e.g. TCP connection is broken while reading a response
+ * Indicates a communication exception with the Hot Rod server: e.g. TCP connection is broken while reading a response
* from the server.
*
* @author Mircea.Markus at jboss.com
Modified: branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/ConfigurationProperties.java
===================================================================
--- branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/ConfigurationProperties.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/ConfigurationProperties.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -9,13 +9,11 @@
import java.net.InetSocketAddress;
import java.util.Collection;
import java.util.HashSet;
-import java.util.List;
import java.util.Properties;
import java.util.Set;
-import java.util.StringTokenizer;
/**
- * Encpasulate all config properties here
+ * Encapsulate all config properties here
*
* @author Manik Surtani
* @version 4.1
Modified: branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/RemoteCacheImpl.java
===================================================================
--- branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/RemoteCacheImpl.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/RemoteCacheImpl.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -30,7 +30,7 @@
*/
public class RemoteCacheImpl<K, V> extends RemoteCacheSupport<K, V> {
- private static Log log = LogFactory.getLog(RemoteCacheImpl.class);
+ private static final Log log = LogFactory.getLog(RemoteCacheImpl.class);
private Marshaller marshaller;
private final String name;
Modified: branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/ServerStatisticsImpl.java
===================================================================
--- branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/ServerStatisticsImpl.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/ServerStatisticsImpl.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -4,9 +4,7 @@
import java.util.Collections;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.Map;
-import java.util.Set;
/**
* @author Mircea.Markus at jboss.com
Modified: branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/async/DefaultAsyncExecutorFactory.java
===================================================================
--- branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/async/DefaultAsyncExecutorFactory.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/async/DefaultAsyncExecutorFactory.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -1,6 +1,5 @@
package org.infinispan.client.hotrod.impl.async;
-import com.sun.corba.se.impl.orb.ORBConfiguratorImpl;
import org.infinispan.client.hotrod.impl.ConfigurationProperties;
import org.infinispan.executors.ExecutorFactory;
import org.infinispan.util.TypedProperties;
Modified: branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/consistenthash/ConsistentHash.java
===================================================================
--- branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/consistenthash/ConsistentHash.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/consistenthash/ConsistentHash.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -2,7 +2,6 @@
import java.net.InetSocketAddress;
import java.util.LinkedHashMap;
-import java.util.Map;
/**
* Abstraction for the used consistent hash.
Modified: branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/consistenthash/ConsistentHashFactory.java
===================================================================
--- branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/consistenthash/ConsistentHashFactory.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/consistenthash/ConsistentHashFactory.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -9,7 +9,6 @@
import java.util.Collections;
import java.util.HashMap;
import java.util.Map;
-import java.util.Properties;
import static org.infinispan.client.hotrod.impl.ConfigurationProperties.HASH_FUNCTION_PREFIX;
@@ -29,7 +28,7 @@
*/
public class ConsistentHashFactory {
- private static Log log = LogFactory.getLog(ConsistentHashFactory.class);
+ private static final Log log = LogFactory.getLog(ConsistentHashFactory.class);
private final Map<Integer, String> version2ConsistentHash = new HashMap<Integer, String>();
Modified: branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/consistenthash/ConsistentHashV1.java
===================================================================
--- branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/consistenthash/ConsistentHashV1.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/consistenthash/ConsistentHashV1.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -18,7 +18,7 @@
*/
public class ConsistentHashV1 implements ConsistentHash {
- private static Log log = LogFactory.getLog(ConsistentHashV1.class);
+ private static final Log log = LogFactory.getLog(ConsistentHashV1.class);
private final SortedMap<Integer, InetSocketAddress> positions = new TreeMap<Integer, InetSocketAddress>();
Modified: branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/AbstractKeyOperation.java
===================================================================
--- branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/AbstractKeyOperation.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/AbstractKeyOperation.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -20,7 +20,7 @@
@Immutable
public abstract class AbstractKeyOperation extends RetryOnFailureOperation {
- private static Log log = LogFactory.getLog(AbstractKeyOperation.class);
+ private static final Log log = LogFactory.getLog(AbstractKeyOperation.class);
protected final byte[] key;
Modified: branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/ContainsKeyOperation.java
===================================================================
--- branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/ContainsKeyOperation.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/ContainsKeyOperation.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -8,7 +8,7 @@
import java.util.concurrent.atomic.AtomicInteger;
/**
- * Implemets "containsKey" operation as described in <a href="http://community.jboss.org/wiki/HotRodProtocol">Hot Rod protocol specification</a>.
+ * Implements "containsKey" operation as described in <a href="http://community.jboss.org/wiki/HotRodProtocol">Hot Rod protocol specification</a>.
*
* @author Mircea.Markus at jboss.com
* @since 4.1
Modified: branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/GetWithVersionOperation.java
===================================================================
--- branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/GetWithVersionOperation.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/GetWithVersionOperation.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -20,7 +20,7 @@
@Immutable
public class GetWithVersionOperation extends AbstractKeyOperation {
- private static Log log = LogFactory.getLog(GetWithVersionOperation.class);
+ private static final Log log = LogFactory.getLog(GetWithVersionOperation.class);
public GetWithVersionOperation(TransportFactory transportFactory, byte[] key, byte[] cacheName,
AtomicInteger topologyId, Flag[] flags) {
Modified: branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/HotRodOperation.java
===================================================================
--- branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/HotRodOperation.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/HotRodOperation.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -16,7 +16,7 @@
import java.util.concurrent.atomic.AtomicLong;
/**
- * Generic hotrod operation. It is aware of {@link org.infinispan.client.hotrod.Flag}s and it is targeted against a
+ * Generic Hot Rod operation. It is aware of {@link org.infinispan.client.hotrod.Flag}s and it is targeted against a
* cache name. This base class encapsulates the knowledge of writing and reading a header, as described in the
* <a href="http://community.jboss.org/wiki/HotRodProtocol">Hot Rod protocol specification</a>
*
@@ -28,7 +28,7 @@
static final AtomicLong MSG_ID = new AtomicLong();
- private static Log log = LogFactory.getLog(HotRodOperation.class);
+ private static final Log log = LogFactory.getLog(HotRodOperation.class);
protected final Flag[] flags;
Modified: branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/PingOperation.java
===================================================================
--- branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/PingOperation.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/PingOperation.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -18,7 +18,7 @@
@Immutable
public class PingOperation extends HotRodOperation {
- private static Log log = LogFactory.getLog(PingOperation.class);
+ private static final Log log = LogFactory.getLog(PingOperation.class);
private final Transport transport;
Modified: branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/PutIfAbsentOperation.java
===================================================================
--- branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/PutIfAbsentOperation.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/PutIfAbsentOperation.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -20,7 +20,7 @@
@Immutable
public class PutIfAbsentOperation extends AbstractKeyValueOperation {
- private static Log log = LogFactory.getLog(PutIfAbsentOperation.class);
+ private static final Log log = LogFactory.getLog(PutIfAbsentOperation.class);
public PutIfAbsentOperation(TransportFactory transportFactory, byte[] key, byte[] cacheName, AtomicInteger topologyId,
Flag[] flags, byte[] value, int lifespan, int maxIdle) {
Modified: branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/RemoveIfUnmodifiedOperation.java
===================================================================
--- branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/RemoveIfUnmodifiedOperation.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/RemoveIfUnmodifiedOperation.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -2,7 +2,6 @@
import net.jcip.annotations.Immutable;
import org.infinispan.client.hotrod.Flag;
-import org.infinispan.client.hotrod.impl.VersionedOperationResponse;
import org.infinispan.client.hotrod.impl.transport.Transport;
import org.infinispan.client.hotrod.impl.transport.TransportFactory;
Modified: branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/ReplaceIfUnmodifiedOperation.java
===================================================================
--- branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/ReplaceIfUnmodifiedOperation.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/ReplaceIfUnmodifiedOperation.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -1,7 +1,6 @@
package org.infinispan.client.hotrod.impl.operations;
import org.infinispan.client.hotrod.Flag;
-import org.infinispan.client.hotrod.impl.VersionedOperationResponse;
import org.infinispan.client.hotrod.impl.transport.Transport;
import org.infinispan.client.hotrod.impl.transport.TransportFactory;
Modified: branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/RetryOnFailureOperation.java
===================================================================
--- branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/RetryOnFailureOperation.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/operations/RetryOnFailureOperation.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -20,7 +20,7 @@
@Immutable
public abstract class RetryOnFailureOperation extends HotRodOperation {
- private static Log log = LogFactory.getLog(RetryOnFailureOperation.class);
+ private static final Log log = LogFactory.getLog(RetryOnFailureOperation.class);
protected final TransportFactory transportFactory;
Modified: branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol/HotRodConstants.java
===================================================================
--- branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol/HotRodConstants.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol/HotRodConstants.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -3,7 +3,7 @@
import java.nio.charset.Charset;
/**
- * Defines constants defined by Hotrod specifications.
+ * Defines constants defined by Hot Rod specifications.
*
* @author Mircea.Markus at jboss.com
* @since 4.1
Modified: branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol/HotRodOperations.java
===================================================================
--- branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol/HotRodOperations.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/protocol/HotRodOperations.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -8,7 +8,7 @@
import java.util.Map;
/**
- * Defines the hotrod operations as described in the protocol spec: http://community.jboss.org/wiki/HotRodProtocol
+ * Defines the Hot Rod operations as described in the protocol spec: http://community.jboss.org/wiki/HotRodProtocol
*
* @author Mircea.Markus at jboss.com
* @since 4.1
Modified: branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/AbstractTransport.java
===================================================================
--- branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/AbstractTransport.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/AbstractTransport.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -12,7 +12,7 @@
*/
public abstract class AbstractTransport implements Transport {
- private static Log log = LogFactory.getLog(AbstractTransport.class);
+ private static final Log log = LogFactory.getLog(AbstractTransport.class);
private final TransportFactory transportFactory;
Modified: branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/TransportFactory.java
===================================================================
--- branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/TransportFactory.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/TransportFactory.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -5,8 +5,6 @@
import java.net.InetSocketAddress;
import java.util.Collection;
import java.util.LinkedHashMap;
-import java.util.Map;
-import java.util.Properties;
import java.util.concurrent.atomic.AtomicInteger;
/**
Modified: branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/tcp/PropsKeyedObjectPoolFactory.java
===================================================================
--- branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/tcp/PropsKeyedObjectPoolFactory.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/tcp/PropsKeyedObjectPoolFactory.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -15,7 +15,7 @@
public class PropsKeyedObjectPoolFactory extends GenericKeyedObjectPoolFactory {
- private static Log log = LogFactory.getLog(PropsKeyedObjectPoolFactory.class);
+ private static final Log log = LogFactory.getLog(PropsKeyedObjectPoolFactory.class);
public PropsKeyedObjectPoolFactory(KeyedPoolableObjectFactory factory, Properties props) {
super(factory);
Modified: branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/tcp/RoundRobinBalancingStrategy.java
===================================================================
--- branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/tcp/RoundRobinBalancingStrategy.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/tcp/RoundRobinBalancingStrategy.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -21,7 +21,7 @@
@ThreadSafe
public class RoundRobinBalancingStrategy implements RequestBalancingStrategy {
- private static Log log = LogFactory.getLog(RoundRobinBalancingStrategy.class);
+ private static final Log log = LogFactory.getLog(RoundRobinBalancingStrategy.class);
private final ReadWriteLock readWriteLock = new ReentrantReadWriteLock();
private final Lock readLock = readWriteLock.readLock();
Modified: branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/tcp/TcpTransport.java
===================================================================
--- branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/tcp/TcpTransport.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/tcp/TcpTransport.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -4,7 +4,6 @@
import org.infinispan.client.hotrod.impl.transport.AbstractTransport;
import org.infinispan.client.hotrod.exceptions.TransportException;
import org.infinispan.client.hotrod.impl.transport.TransportFactory;
-import org.infinispan.io.UnsignedNumeric;
import org.infinispan.util.logging.Log;
import org.infinispan.util.logging.LogFactory;
@@ -28,7 +27,7 @@
//needed for debugging
private static AtomicLong ID_COUNTER = new AtomicLong(0);
- private static Log log = LogFactory.getLog(TcpTransport.class);
+ private static final Log log = LogFactory.getLog(TcpTransport.class);
private static final boolean trace = log.isTraceEnabled();
private final Socket socket;
Modified: branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/tcp/TcpTransportFactory.java
===================================================================
--- branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/tcp/TcpTransportFactory.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/client/hotrod-client/src/main/java/org/infinispan/client/hotrod/impl/transport/tcp/TcpTransportFactory.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -17,7 +17,6 @@
import java.util.Collection;
import java.util.HashSet;
import java.util.LinkedHashMap;
-import java.util.Properties;
import java.util.Set;
import java.util.concurrent.atomic.AtomicInteger;
Modified: branches/4.1.x/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/CSAIntegrationTest.java
===================================================================
--- branches/4.1.x/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/CSAIntegrationTest.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/CSAIntegrationTest.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -21,9 +21,6 @@
import org.testng.annotations.BeforeTest;
import org.testng.annotations.Test;
-import java.io.ByteArrayOutputStream;
-import java.io.IOException;
-import java.io.ObjectOutputStream;
import java.net.InetSocketAddress;
import java.util.ArrayList;
import java.util.List;
@@ -47,7 +44,7 @@
private RemoteCache<Object, Object> remoteCache;
private TcpTransportFactory tcpConnectionFactory;
- private static Log log = LogFactory.getLog(CSAIntegrationTest.class);
+ private static final Log log = LogFactory.getLog(CSAIntegrationTest.class);
private Marshaller m;
Modified: branches/4.1.x/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/HitsAwareCacheManagersTest.java
===================================================================
--- branches/4.1.x/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/HitsAwareCacheManagersTest.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/HitsAwareCacheManagersTest.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -3,7 +3,6 @@
import org.infinispan.Cache;
import org.infinispan.commands.VisitableCommand;
import org.infinispan.context.InvocationContext;
-import org.infinispan.interceptors.CacheMgmtInterceptor;
import org.infinispan.interceptors.base.CommandInterceptor;
import org.infinispan.manager.CacheContainer;
import org.infinispan.manager.EmbeddedCacheManager;
Modified: branches/4.1.x/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/HotRodIntegrationTest.java
===================================================================
--- branches/4.1.x/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/HotRodIntegrationTest.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/HotRodIntegrationTest.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -30,7 +30,7 @@
@Test (testName = "client.hotrod.HotRodClientIntegrationTest", groups = "functional" )
public class HotRodIntegrationTest extends SingleCacheManagerTest {
- private static Log log = LogFactory.getLog(HotRodIntegrationTest.class);
+ private static final Log log = LogFactory.getLog(HotRodIntegrationTest.class);
private static final String CACHE_NAME = "replSync";
private Cache cache;
Modified: branches/4.1.x/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/RoundRobinBalancingIntegrationTest.java
===================================================================
--- branches/4.1.x/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/RoundRobinBalancingIntegrationTest.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/RoundRobinBalancingIntegrationTest.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -26,7 +26,7 @@
@Test(testName = "client.hotrod.RoundRobinBalancingTest")
public class RoundRobinBalancingIntegrationTest extends MultipleCacheManagersTest {
- private static Log log = LogFactory.getLog(RoundRobinBalancingIntegrationTest.class);
+ private static final Log log = LogFactory.getLog(RoundRobinBalancingIntegrationTest.class);
Cache c1;
Cache c2;
Modified: branches/4.1.x/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/RoundRobinBalancingStrategyTest.java
===================================================================
--- branches/4.1.x/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/RoundRobinBalancingStrategyTest.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/RoundRobinBalancingStrategyTest.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -5,7 +5,6 @@
import org.testng.annotations.Test;
import java.net.InetSocketAddress;
-import java.net.SocketAddress;
import java.util.ArrayList;
import java.util.List;
Modified: branches/4.1.x/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ServerRestartTest.java
===================================================================
--- branches/4.1.x/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ServerRestartTest.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/ServerRestartTest.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -9,8 +9,6 @@
import org.testng.annotations.AfterClass;
import org.testng.annotations.Test;
-import java.util.HashMap;
-import java.util.Map;
import java.util.Properties;
/**
@@ -20,7 +18,7 @@
@Test
public class ServerRestartTest extends SingleCacheManagerTest {
- private static Log log = LogFactory.getLog(HotRodIntegrationTest.class);
+ private static final Log log = LogFactory.getLog(HotRodIntegrationTest.class);
RemoteCache defaultRemote;
private RemoteCacheManager remoteCacheManager;
Modified: branches/4.1.x/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/WorkerThread.java
===================================================================
--- branches/4.1.x/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/WorkerThread.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/WorkerThread.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -16,7 +16,7 @@
private static final AtomicInteger WORKER_INDEX = new AtomicInteger();
- private static Log log = LogFactory.getLog(WorkerThread.class);
+ private static final Log log = LogFactory.getLog(WorkerThread.class);
public static final String NULL = "_null_";
public static final String PUT_SYNC = "_put_sync_";
Modified: branches/4.1.x/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/retry/AbstractRetryTest.java
===================================================================
--- branches/4.1.x/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/retry/AbstractRetryTest.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/retry/AbstractRetryTest.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -1,7 +1,6 @@
package org.infinispan.client.hotrod.retry;
import org.infinispan.client.hotrod.HitsAwareCacheManagersTest;
-import org.infinispan.client.hotrod.RemoteCache;
import org.infinispan.client.hotrod.RemoteCacheManager;
import org.infinispan.client.hotrod.TestHelper;
import org.infinispan.client.hotrod.impl.RemoteCacheImpl;
Modified: branches/4.1.x/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/retry/DistributionRetryTest.java
===================================================================
--- branches/4.1.x/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/retry/DistributionRetryTest.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/retry/DistributionRetryTest.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -125,7 +125,7 @@
}
- log.info("About to stop hotrod server 2");
+ log.info("About to stop Hot Rod server 2");
hotRodServer2.stop();
Modified: branches/4.1.x/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/retry/ReplicationRetryTest.java
===================================================================
--- branches/4.1.x/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/retry/ReplicationRetryTest.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/client/hotrod-client/src/test/java/org/infinispan/client/hotrod/retry/ReplicationRetryTest.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -1,26 +1,15 @@
package org.infinispan.client.hotrod.retry;
-import org.infinispan.client.hotrod.HitsAwareCacheManagersTest;
-import org.infinispan.client.hotrod.RemoteCache;
-import org.infinispan.client.hotrod.RemoteCacheManager;
-import org.infinispan.client.hotrod.TestHelper;
+import static org.testng.Assert.assertEquals;
+
+import java.net.InetSocketAddress;
+import java.util.Map;
+
import org.infinispan.client.hotrod.VersionedValue;
-import org.infinispan.client.hotrod.impl.transport.tcp.RoundRobinBalancingStrategy;
-import org.infinispan.client.hotrod.impl.transport.tcp.TcpTransportFactory;
import org.infinispan.config.Configuration;
-import org.infinispan.lifecycle.ComponentStatus;
-import org.infinispan.manager.CacheContainer;
import org.infinispan.server.hotrod.HotRodServer;
-import org.infinispan.test.TestingUtil;
-import org.infinispan.test.fwk.TestCacheManagerFactory;
import org.testng.annotations.Test;
-import java.net.InetSocketAddress;
-import java.util.Map;
-import java.util.Properties;
-
-import static org.testng.Assert.assertEquals;
-
/**
* @author Mircea.Markus at jboss.com
* @since 4.1
Modified: branches/4.1.x/core/src/main/java/org/infinispan/affinity/KeyAffinityService.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/affinity/KeyAffinityService.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/affinity/KeyAffinityService.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -3,8 +3,6 @@
import org.infinispan.lifecycle.Lifecycle;
import org.infinispan.remoting.transport.Address;
-import java.util.concurrent.Executor;
-
/**
* Defines a service that generates keys to be mapped to specific nodes in a distributed(vs. replicated) cluster.
* The service is instantiated through through one of the factory methods from {@link org.infinispan.affinity.KeyAffinityServiceFactory}.
Modified: branches/4.1.x/core/src/main/java/org/infinispan/affinity/KeyAffinityServiceFactory.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/affinity/KeyAffinityServiceFactory.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/affinity/KeyAffinityServiceFactory.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -1,15 +1,11 @@
package org.infinispan.affinity;
import org.infinispan.Cache;
-import org.infinispan.executors.ExecutorFactory;
import org.infinispan.remoting.transport.Address;
import java.util.Collection;
import java.util.Collections;
-import java.util.Properties;
import java.util.concurrent.Executor;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
/**
* Factory for {@link org.infinispan.affinity.KeyAffinityService}.
Modified: branches/4.1.x/core/src/main/java/org/infinispan/affinity/KeyAffinityServiceImpl.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/affinity/KeyAffinityServiceImpl.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/affinity/KeyAffinityServiceImpl.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -38,7 +38,7 @@
private final float THRESHOLD = 0.5f;
- private static Log log = LogFactory.getLog(KeyAffinityServiceImpl.class);
+ private static final Log log = LogFactory.getLog(KeyAffinityServiceImpl.class);
private final Set<Address> filter;
Modified: branches/4.1.x/core/src/main/java/org/infinispan/affinity/KeyGenerator.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/affinity/KeyGenerator.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/affinity/KeyGenerator.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -1,7 +1,5 @@
package org.infinispan.affinity;
-import java.io.IOException;
-
/**
* Used for generating keys; used by {@link org.infinispan.affinity.KeyAffinityService} to generate the affinity keys.
* It offers the possibility to generate keys in a particular format.
Modified: branches/4.1.x/core/src/main/java/org/infinispan/atomic/AtomicMapLookup.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/atomic/AtomicMapLookup.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/atomic/AtomicMapLookup.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -1,7 +1,6 @@
package org.infinispan.atomic;
import org.infinispan.Cache;
-import org.infinispan.util.Immutables;
import java.util.Collections;
import java.util.Map;
Modified: branches/4.1.x/core/src/main/java/org/infinispan/commands/control/LockControlCommand.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/commands/control/LockControlCommand.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/commands/control/LockControlCommand.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -45,7 +45,6 @@
* For more details refer to: https://jira.jboss.org/jira/browse/ISPN-70 https://jira.jboss.org/jira/browse/ISPN-48
*
* @author Vladimir Blagojevic (<a href="mailto:vblagoje at redhat.com">vblagoje at redhat.com</a>)
- * @param
* @since 4.0
*/
@Marshallable(externalizer = ReplicableCommandExternalizer.class, id = Ids.LOCK_CONTROL_COMMAND)
Modified: branches/4.1.x/core/src/main/java/org/infinispan/commands/read/EntrySetCommand.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/commands/read/EntrySetCommand.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/commands/read/EntrySetCommand.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -21,7 +21,6 @@
*/
package org.infinispan.commands.read;
-import org.infinispan.commands.LocalCommand;
import org.infinispan.commands.VisitableCommand;
import org.infinispan.commands.Visitor;
import org.infinispan.container.DataContainer;
Modified: branches/4.1.x/core/src/main/java/org/infinispan/commands/read/KeySetCommand.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/commands/read/KeySetCommand.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/commands/read/KeySetCommand.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -21,7 +21,6 @@
*/
package org.infinispan.commands.read;
-import org.infinispan.commands.LocalCommand;
import org.infinispan.commands.VisitableCommand;
import org.infinispan.commands.Visitor;
import org.infinispan.container.DataContainer;
Modified: branches/4.1.x/core/src/main/java/org/infinispan/commands/read/SizeCommand.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/commands/read/SizeCommand.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/commands/read/SizeCommand.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -21,7 +21,6 @@
*/
package org.infinispan.commands.read;
-import org.infinispan.commands.LocalCommand;
import org.infinispan.commands.VisitableCommand;
import org.infinispan.commands.Visitor;
import org.infinispan.container.DataContainer;
Modified: branches/4.1.x/core/src/main/java/org/infinispan/commands/read/ValuesCommand.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/commands/read/ValuesCommand.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/commands/read/ValuesCommand.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -21,7 +21,6 @@
*/
package org.infinispan.commands.read;
-import org.infinispan.commands.LocalCommand;
import org.infinispan.commands.VisitableCommand;
import org.infinispan.commands.Visitor;
import org.infinispan.container.DataContainer;
@@ -38,7 +37,6 @@
*/
public class ValuesCommand extends AbstractLocalCommand implements VisitableCommand {
private final DataContainer container;
- private static final Object[] EMPTY_ARRAY = new Object[0];
public ValuesCommand(DataContainer container) {
this.container = container;
Modified: branches/4.1.x/core/src/main/java/org/infinispan/commands/tx/AbstractTransactionBoundaryCommand.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/commands/tx/AbstractTransactionBoundaryCommand.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/commands/tx/AbstractTransactionBoundaryCommand.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -40,7 +40,7 @@
*/
public abstract class AbstractTransactionBoundaryCommand implements TransactionBoundaryCommand {
- private static Log log = LogFactory.getLog(AbstractTransactionBoundaryCommand.class);
+ private static final Log log = LogFactory.getLog(AbstractTransactionBoundaryCommand.class);
private static boolean trace = log.isTraceEnabled();
protected GlobalTransaction globalTx;
Modified: branches/4.1.x/core/src/main/java/org/infinispan/commands/tx/PrepareCommand.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/commands/tx/PrepareCommand.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/commands/tx/PrepareCommand.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -52,7 +52,7 @@
@Marshallable(externalizer = ReplicableCommandExternalizer.class, id = Ids.PREPARE_COMMAND)
public class PrepareCommand extends AbstractTransactionBoundaryCommand {
- private static Log log = LogFactory.getLog(PrepareCommand.class);
+ private static final Log log = LogFactory.getLog(PrepareCommand.class);
private boolean trace = log.isTraceEnabled();
public static final byte COMMAND_ID = 12;
Modified: branches/4.1.x/core/src/main/java/org/infinispan/commands/write/RemoveCommand.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/commands/write/RemoveCommand.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/commands/write/RemoveCommand.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -40,7 +40,6 @@
@Marshallable(externalizer = ReplicableCommandExternalizer.class, id = Ids.REMOVE_COMMAND)
public class RemoveCommand extends AbstractDataWriteCommand {
private static final Log log = LogFactory.getLog(RemoveCommand.class);
- private static final boolean trace = log.isTraceEnabled();
public static final byte COMMAND_ID = 10;
protected CacheNotifier notifier;
boolean successful = true;
Modified: branches/4.1.x/core/src/main/java/org/infinispan/config/ConfigurationValidatingVisitor.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/config/ConfigurationValidatingVisitor.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/config/ConfigurationValidatingVisitor.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -22,7 +22,6 @@
package org.infinispan.config;
import org.infinispan.config.GlobalConfiguration.TransportType;
-import org.infinispan.eviction.EvictionStrategy;
import org.infinispan.loaders.decorators.SingletonStoreConfig;
/**
Modified: branches/4.1.x/core/src/main/java/org/infinispan/config/parsing/ConfigFilesConvertor.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/config/parsing/ConfigFilesConvertor.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/config/parsing/ConfigFilesConvertor.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -43,14 +43,10 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.OutputStream;
-import java.util.Arrays;
-import java.util.Collections;
import java.util.HashMap;
-import java.util.HashSet;
import java.util.LinkedList;
import java.util.List;
import java.util.Map;
-import java.util.Set;
import static java.util.Collections.sort;
Modified: branches/4.1.x/core/src/main/java/org/infinispan/container/EntryFactory.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/container/EntryFactory.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/container/EntryFactory.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -64,7 +64,7 @@
* @param forceLockIfAbsent forces a lock even if the entry is absent
* @param alreadyLocked if true, this hint prevents the method from acquiring any locks and the existence and ownership of the lock is presumed.
* @param forRemoval if true, this hint informs this method that the lock is being acquired for removal.
- * @param undeleteIfNeeded if true, if the entry is found in the current scope (perhaps a transaction) and is deleteed, it will be undeleted. If false, it will be considered deleted.
+ * @param undeleteIfNeeded if true, if the entry is found in the current scope (perhaps a transaction) and is deleted, it will be undeleted. If false, it will be considered deleted.
* @return an MVCCEntry instance
* @throws InterruptedException when things go wrong, usually trying to acquire a lock
*/
@@ -80,7 +80,7 @@
* @param forceLockIfAbsent forces a lock even if the entry is absent
* @param alreadyLocked if true, this hint prevents the method from acquiring any locks and the existence and ownership of the lock is presumed.
* @param forRemoval if true, this hint informs this method that the lock is being acquired for removal.
-* @param undeleteIfNeeded if true, if the entry is found in the current scope (perhaps a transaction) and is deleteed, it will be undeleted. If false, it will be considered deleted. * @return an MVCCEntry instance
+* @param undeleteIfNeeded if true, if the entry is found in the current scope (perhaps a transaction) and is deleted, it will be undeleted. If false, it will be considered deleted. * @return an MVCCEntry instance
* @throws InterruptedException when things go wrong, usually trying to acquire a lock
*/
MVCCEntry wrapEntryForWriting(InvocationContext ctx, InternalCacheEntry entry, boolean createIfAbsent, boolean forceLockIfAbsent, boolean alreadyLocked, boolean forRemoval, boolean undeleteIfNeeded) throws InterruptedException;
Modified: branches/4.1.x/core/src/main/java/org/infinispan/container/entries/TransientCacheEntry.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/container/entries/TransientCacheEntry.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/container/entries/TransientCacheEntry.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -8,10 +8,8 @@
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import static java.lang.Math.min;
-
/**
- * A cache entry that is transient, i.e., it can be considered expired afer a period of not being used.
+ * A cache entry that is transient, i.e., it can be considered expired after a period of not being used.
*
* @author Manik Surtani
* @since 4.0
Modified: branches/4.1.x/core/src/main/java/org/infinispan/context/InvocationContext.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/context/InvocationContext.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/context/InvocationContext.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -21,7 +21,6 @@
*/
package org.infinispan.context;
-import java.util.Collections;
import java.util.Set;
/**
Modified: branches/4.1.x/core/src/main/java/org/infinispan/context/impl/AbstractInvocationContext.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/context/impl/AbstractInvocationContext.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/context/impl/AbstractInvocationContext.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -3,7 +3,6 @@
import org.infinispan.container.entries.CacheEntry;
import org.infinispan.context.Flag;
import org.infinispan.context.InvocationContext;
-import org.infinispan.util.BidirectionalLinkedHashMap;
import org.infinispan.util.BidirectionalMap;
import java.util.Arrays;
Modified: branches/4.1.x/core/src/main/java/org/infinispan/distribution/ConsistentHashHelper.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/distribution/ConsistentHashHelper.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/distribution/ConsistentHashHelper.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -1,7 +1,6 @@
package org.infinispan.distribution;
import org.infinispan.config.Configuration;
-import org.infinispan.config.ConfigurationException;
import org.infinispan.remoting.transport.Address;
import org.infinispan.util.Util;
Modified: branches/4.1.x/core/src/main/java/org/infinispan/distribution/DefaultConsistentHash.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/distribution/DefaultConsistentHash.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/distribution/DefaultConsistentHash.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -3,9 +3,6 @@
import org.infinispan.marshall.Ids;
import org.infinispan.marshall.Marshallable;
import org.infinispan.remoting.transport.Address;
-import org.infinispan.util.hash.MurmurHash2;
-import org.infinispan.util.logging.Log;
-import org.infinispan.util.logging.LogFactory;
import java.io.IOException;
import java.io.ObjectInput;
@@ -14,7 +11,6 @@
import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import java.util.Random;
import java.util.SortedMap;
import java.util.TreeMap;
Modified: branches/4.1.x/core/src/main/java/org/infinispan/factories/EmptyConstructorFactory.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/factories/EmptyConstructorFactory.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/factories/EmptyConstructorFactory.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -1,11 +1,9 @@
package org.infinispan.factories;
import org.infinispan.commands.RemoteCommandsFactory;
-import org.infinispan.config.ConfigurationException;
import org.infinispan.factories.annotations.DefaultFactoryFor;
import org.infinispan.factories.scopes.Scope;
import org.infinispan.factories.scopes.Scopes;
-import org.infinispan.notifications.cachemanagerlistener.CacheManagerNotifier;
import org.infinispan.remoting.InboundInvocationHandler;
import org.infinispan.transaction.xa.GlobalTransactionFactory;
import org.infinispan.transaction.xa.TransactionTable;
Modified: branches/4.1.x/core/src/main/java/org/infinispan/factories/MarshallerFactory.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/factories/MarshallerFactory.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/factories/MarshallerFactory.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -21,7 +21,6 @@
*/
package org.infinispan.factories;
-import org.infinispan.config.ConfigurationException;
import org.infinispan.factories.annotations.DefaultFactoryFor;
import org.infinispan.marshall.StreamingMarshaller;
import org.infinispan.util.Util;
Modified: branches/4.1.x/core/src/main/java/org/infinispan/factories/TransactionManagerFactory.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/factories/TransactionManagerFactory.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/factories/TransactionManagerFactory.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -21,7 +21,6 @@
*/
package org.infinispan.factories;
-import org.infinispan.config.ConfigurationException;
import org.infinispan.factories.annotations.DefaultFactoryFor;
import org.infinispan.transaction.tm.BatchModeTransactionManager;
import org.infinispan.transaction.lookup.TransactionManagerLookup;
Modified: branches/4.1.x/core/src/main/java/org/infinispan/factories/TransportFactory.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/factories/TransportFactory.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/factories/TransportFactory.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -1,6 +1,5 @@
package org.infinispan.factories;
-import org.infinispan.CacheException;
import org.infinispan.factories.annotations.DefaultFactoryFor;
import org.infinispan.remoting.transport.Transport;
import org.infinispan.util.Util;
Modified: branches/4.1.x/core/src/main/java/org/infinispan/factories/scopes/ScopeDetector.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/factories/scopes/ScopeDetector.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/factories/scopes/ScopeDetector.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -3,7 +3,7 @@
import org.infinispan.util.ReflectionUtil;
/**
- * Retrieves the declated scope of a component
+ * Retrieves the declared scope of a component
*
* @author Manik Surtani
* @since 4.0
Modified: branches/4.1.x/core/src/main/java/org/infinispan/factories/scopes/Scopes.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/factories/scopes/Scopes.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/factories/scopes/Scopes.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -2,7 +2,7 @@
/**
* The different scopes that can be declared for a component in the cache system. If components are not bounded to a
- * specific scope explicity, then it defaults to the {@link #NAMED_CACHE} scope.
+ * specific scope explicitly, then it defaults to the {@link #NAMED_CACHE} scope.
*
* @author Manik Surtani
* @see Scope
Modified: branches/4.1.x/core/src/main/java/org/infinispan/interceptors/DistCacheStoreInterceptor.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/interceptors/DistCacheStoreInterceptor.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/interceptors/DistCacheStoreInterceptor.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -39,7 +39,7 @@
/**
* Cache store interceptor specific for the distribution cache mode. Put operations has been modified in such way that
- * if they put operation is the result of an L1 put, storing in the cache store is ignore. This is done so that inmortal
+ * if they put operation is the result of an L1 put, storing in the cache store is ignore. This is done so that immortal
* entries that get converted into mortal ones when putting into L1 don't get propagated to the cache store.
* <p/>
* Secondly, in a replicated environment where a shared cache store is used, the node in which the cache operation is
Modified: branches/4.1.x/core/src/main/java/org/infinispan/interceptors/DistLockingInterceptor.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/interceptors/DistLockingInterceptor.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/interceptors/DistLockingInterceptor.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -1,7 +1,6 @@
package org.infinispan.interceptors;
import org.infinispan.container.entries.CacheEntry;
-import org.infinispan.context.InvocationContext;
import org.infinispan.distribution.DistributionManager;
import org.infinispan.factories.annotations.Inject;
Modified: branches/4.1.x/core/src/main/java/org/infinispan/interceptors/DistributionInterceptor.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/interceptors/DistributionInterceptor.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/interceptors/DistributionInterceptor.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -40,7 +40,7 @@
/**
* The interceptor that handles distribution of entries across a cluster, as well as transparent lookup
*
- * @author manik
+ * @author Manik Surtani
* @since 4.0
*/
public class DistributionInterceptor extends BaseRpcInterceptor {
Modified: branches/4.1.x/core/src/main/java/org/infinispan/interceptors/InterceptorChain.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/interceptors/InterceptorChain.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/interceptors/InterceptorChain.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -63,8 +63,10 @@
@Start
private void printChainInfo() {
- if (log.isDebugEnabled()) log.debug("Interceptor chain size: " + size());
- if (log.isDebugEnabled()) log.debug("Interceptor chain is: " + toString());
+ if (log.isDebugEnabled()) {
+ log.debug("Interceptor chain size: " + size());
+ log.debug("Interceptor chain is: " + toString());
+ }
}
/**
Modified: branches/4.1.x/core/src/main/java/org/infinispan/interceptors/InvocationContextInterceptor.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/interceptors/InvocationContextInterceptor.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/interceptors/InvocationContextInterceptor.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -22,7 +22,6 @@
package org.infinispan.interceptors;
-import org.infinispan.CacheException;
import org.infinispan.commands.VisitableCommand;
import org.infinispan.context.Flag;
import org.infinispan.context.InvocationContext;
Modified: branches/4.1.x/core/src/main/java/org/infinispan/interceptors/PassivationInterceptor.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/interceptors/PassivationInterceptor.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/interceptors/PassivationInterceptor.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -1,27 +1,18 @@
package org.infinispan.interceptors;
import org.infinispan.commands.write.EvictCommand;
-import org.infinispan.config.ConfigurationException;
import org.infinispan.container.DataContainer;
-import org.infinispan.container.entries.InternalCacheEntry;
import org.infinispan.context.InvocationContext;
import org.infinispan.eviction.PassivationManager;
import org.infinispan.factories.annotations.Inject;
-import org.infinispan.factories.annotations.Start;
import org.infinispan.interceptors.base.JmxStatsCommandInterceptor;
import org.infinispan.jmx.annotations.MBean;
import org.infinispan.jmx.annotations.ManagedAttribute;
import org.infinispan.jmx.annotations.ManagedOperation;
-import org.infinispan.loaders.CacheLoaderException;
-import org.infinispan.loaders.CacheLoaderManager;
-import org.infinispan.loaders.CacheStore;
-import org.infinispan.notifications.cachelistener.CacheNotifier;
import org.rhq.helpers.pluginAnnotations.agent.MeasurementType;
import org.rhq.helpers.pluginAnnotations.agent.Metric;
import org.rhq.helpers.pluginAnnotations.agent.Operation;
-import java.util.concurrent.atomic.AtomicLong;
-
/**
* Writes evicted entries back to the store on the way in through the CacheStore
*
Modified: branches/4.1.x/core/src/main/java/org/infinispan/io/GridFile.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/io/GridFile.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/io/GridFile.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -2,12 +2,8 @@
import org.infinispan.AdvancedCache;
import org.infinispan.Cache;
-import org.infinispan.context.Flag;
-import org.jgroups.util.Streamable;
import org.jgroups.util.Util;
-import java.io.DataInputStream;
-import java.io.DataOutputStream;
import java.io.Externalizable;
import java.io.File;
import java.io.FileFilter;
Modified: branches/4.1.x/core/src/main/java/org/infinispan/io/UnsignedNumeric.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/io/UnsignedNumeric.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/io/UnsignedNumeric.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -5,7 +5,6 @@
import java.io.ObjectInput;
import java.io.ObjectOutput;
import java.io.OutputStream;
-import java.nio.Buffer;
/**
* Helper to read and write unsigned numerics
Modified: branches/4.1.x/core/src/main/java/org/infinispan/jmx/AbstractJmxRegistration.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/jmx/AbstractJmxRegistration.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/jmx/AbstractJmxRegistration.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -26,12 +26,9 @@
import javax.management.MBeanServer;
-import org.infinispan.CacheException;
import org.infinispan.config.GlobalConfiguration;
import org.infinispan.factories.AbstractComponentRegistry;
import org.infinispan.util.Util;
-import org.infinispan.util.logging.Log;
-import org.infinispan.util.logging.LogFactory;
/**
* Parent class for top level JMX component registration.
@@ -40,7 +37,6 @@
* @since 4.0
*/
public abstract class AbstractJmxRegistration {
- private static final Log log = LogFactory.getLog(AbstractJmxRegistration.class);
String jmxDomain;
MBeanServer mBeanServer;
GlobalConfiguration globalConfig;
Modified: branches/4.1.x/core/src/main/java/org/infinispan/jmx/ResourceDMBean.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/jmx/ResourceDMBean.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/jmx/ResourceDMBean.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -50,13 +50,13 @@
import java.util.regex.Pattern;
/**
- * This class was entirely copied from jgroups 2.7 (same name there). Couldn't simply reuse it
- * because jgroups does not ship with MBean, ManagedAttribute and ManagedOperation. Once jgroups
- * will ship these classes, the code can be dinalmically reused from there.
+ * This class was entirely copied from JGroups 2.7 (same name there). Couldn't simply reuse it
+ * because JGroups does not ship with MBean, ManagedAttribute and ManagedOperation. Once JGroups
+ * will ship these classes, the code can be dynamically reused from there.
* <p/>
* The original JGroup's ResourceDMBean logic has been modified so that {@link #invoke()} method checks
* whether the operation called has been exposed as a {@link ManagedOperation}, otherwise the call
- * fails. JGroups deviated from this logic on purpouse because they liked the fact that you could expose
+ * fails. JGroups deviated from this logic on purpose because they liked the fact that you could expose
* all class methods by simply annotating class with {@link MBean} annotation.
*
* @author Mircea.Markus at jboss.com
Modified: branches/4.1.x/core/src/main/java/org/infinispan/jmx/annotations/MBean.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/jmx/annotations/MBean.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/jmx/annotations/MBean.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -28,7 +28,7 @@
import java.lang.annotation.Target;
/**
- * Classes anotaded with this will be exposed as MBeans. If you are looking for more fined grained way of exposing jmx
+ * Classes annotated with this will be exposed as MBeans. If you are looking for more fined grained way of exposing JMX
* attributes/operations, take a look at {@link org.infinispan.jmx.annotations.ManagedAttribute} and {@link
* org.infinispan.jmx.annotations.ManagedOperation}
*
Modified: branches/4.1.x/core/src/main/java/org/infinispan/loaders/AbstractCacheLoaderConfig.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/loaders/AbstractCacheLoaderConfig.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/loaders/AbstractCacheLoaderConfig.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -18,7 +18,7 @@
* and Java element types they annotate with utmost understanding and care.
*
* @author Mircea.Markus at jboss.com
- * @autor Vladimir Blagojevic
+ * @author Vladimir Blagojevic
* @since 4.0
*
*/
Modified: branches/4.1.x/core/src/main/java/org/infinispan/loaders/AbstractCacheStore.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/loaders/AbstractCacheStore.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/loaders/AbstractCacheStore.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -30,7 +30,7 @@
*/
public abstract class AbstractCacheStore extends AbstractCacheLoader implements CacheStore {
- private static Log log = LogFactory.getLog(AbstractCacheStore.class);
+ private static final Log log = LogFactory.getLog(AbstractCacheStore.class);
private Map<GlobalTransaction, List<? extends Modification>> transactions;
private AbstractCacheStoreConfig config;
Modified: branches/4.1.x/core/src/main/java/org/infinispan/loaders/CacheLoaderManagerImpl.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/loaders/CacheLoaderManagerImpl.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/loaders/CacheLoaderManagerImpl.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -116,9 +116,12 @@
public void preload() {
if (loader != null) {
if (clmConfig.isPreload()) {
- log.debug("Preloading transient state from cache loader {0}", loader);
- long start = 0, stop = 0, total = 0;
- if (log.isDebugEnabled()) start = System.currentTimeMillis();
+ long start = 0;
+ boolean debugTiming = log.isDebugEnabled();
+ if (debugTiming) {
+ start = System.currentTimeMillis();
+ log.debug("Preloading transient state from cache loader {0}", loader);
+ }
Set<InternalCacheEntry> state;
try {
state = loadState();
@@ -129,9 +132,10 @@
for (InternalCacheEntry e : state)
cache.getAdvancedCache().withFlags(SKIP_CACHE_STATUS_CHECK, CACHE_MODE_LOCAL).put(e.getKey(), e.getValue(), e.getLifespan(), MILLISECONDS, e.getMaxIdle(), MILLISECONDS);
- if (log.isDebugEnabled()) stop = System.currentTimeMillis();
- if (log.isDebugEnabled()) total = stop - start;
- log.debug("Preloaded {0} keys in {1} milliseconds", state.size(), total);
+ if (debugTiming) {
+ long stop = System.currentTimeMillis();
+ log.debug("Preloaded {0} keys in {1} milliseconds", state.size(), stop - start);
+ }
}
}
}
Modified: branches/4.1.x/core/src/main/java/org/infinispan/loaders/cluster/ClusterCacheLoader.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/loaders/cluster/ClusterCacheLoader.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/loaders/cluster/ClusterCacheLoader.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -36,7 +36,7 @@
*/
@CacheLoaderMetadata(configurationClass = ClusterCacheLoaderConfig.class)
public class ClusterCacheLoader extends AbstractCacheLoader {
- private static Log log = LogFactory.getLog(ClusterCacheLoader.class);
+ private static final Log log = LogFactory.getLog(ClusterCacheLoader.class);
private ClusterCacheLoaderConfig config;
private RpcManager rpcManager;
Modified: branches/4.1.x/core/src/main/java/org/infinispan/loaders/decorators/SingletonStore.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/loaders/decorators/SingletonStore.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/loaders/decorators/SingletonStore.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -36,7 +36,7 @@
* SingletonStore is a simply facade to a real CacheStore implementation. It always delegates reads to the real
* CacheStore.
* <p/>
- * Writes are delegated <i>only if,/i> this SingletonStore is currently the cordinator. This avoids having all stores in
+ * Writes are delegated <i>only if</i> this SingletonStore is currently the coordinator. This avoids having all stores in
* a cluster writing the same data to the same underlying store. Although not incorrect (e.g. a DB will just discard
* additional INSERTs for the same key, and throw an exception), this will avoid a lot of redundant work.
* <p/>
Modified: branches/4.1.x/core/src/main/java/org/infinispan/manager/CacheContainer.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/manager/CacheContainer.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/manager/CacheContainer.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -1,19 +1,8 @@
package org.infinispan.manager;
import org.infinispan.Cache;
-import org.infinispan.config.Configuration;
-import org.infinispan.config.GlobalConfiguration;
-import org.infinispan.factories.annotations.SurvivesRestarts;
-import org.infinispan.factories.scopes.Scope;
-import org.infinispan.factories.scopes.Scopes;
-import org.infinispan.lifecycle.ComponentStatus;
import org.infinispan.lifecycle.Lifecycle;
-import org.infinispan.notifications.Listenable;
-import org.infinispan.remoting.transport.Address;
-import java.util.List;
-import java.util.Set;
-
/**
* A <tt>CacheContainer</tt> is the primary mechanism for retrieving a {@link org.infinispan.Cache} instance, and is often
* used as a starting point to using the {@link org.infinispan.Cache}.
Modified: branches/4.1.x/core/src/main/java/org/infinispan/manager/DefaultCacheManager.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/manager/DefaultCacheManager.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/manager/DefaultCacheManager.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -24,7 +24,6 @@
import org.infinispan.Cache;
import org.infinispan.Version;
import org.infinispan.config.Configuration;
-import org.infinispan.config.ConfigurationBeanVisitor;
import org.infinispan.config.ConfigurationException;
import org.infinispan.config.ConfigurationValidatingVisitor;
import org.infinispan.config.GlobalConfiguration;
Modified: branches/4.1.x/core/src/main/java/org/infinispan/marshall/AbstractMarshaller.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/marshall/AbstractMarshaller.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/marshall/AbstractMarshaller.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -7,7 +7,7 @@
/**
* Abstract Marshaller implementation containing shared implementations.
*
- * @author Galder Zamarre�o
+ * @author Galder Zamarreño
* @since 4.1
*/
public abstract class AbstractMarshaller implements Marshaller {
Modified: branches/4.1.x/core/src/main/java/org/infinispan/marshall/AbstractStreamingMarshaller.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/marshall/AbstractStreamingMarshaller.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/marshall/AbstractStreamingMarshaller.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -1,6 +1,5 @@
package org.infinispan.marshall;
-import org.infinispan.io.ByteBuffer;
import org.infinispan.io.ExposedByteArrayOutputStream;
import java.io.*;
Modified: branches/4.1.x/core/src/main/java/org/infinispan/marshall/MarshalledValue.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/marshall/MarshalledValue.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/marshall/MarshalledValue.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -33,7 +33,6 @@
import java.io.NotSerializableException;
import java.io.ObjectInput;
import java.io.ObjectOutput;
-import java.io.Serializable;
import java.util.Arrays;
/**
Modified: branches/4.1.x/core/src/main/java/org/infinispan/marshall/StreamingMarshaller.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/marshall/StreamingMarshaller.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/marshall/StreamingMarshaller.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -24,7 +24,6 @@
import net.jcip.annotations.ThreadSafe;
import org.infinispan.factories.scopes.Scope;
import org.infinispan.factories.scopes.Scopes;
-import org.infinispan.io.ByteBuffer;
import java.io.IOException;
import java.io.InputStream;
Modified: branches/4.1.x/core/src/main/java/org/infinispan/marshall/jboss/GenericJBossMarshaller.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/marshall/jboss/GenericJBossMarshaller.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/marshall/jboss/GenericJBossMarshaller.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -4,7 +4,6 @@
import org.infinispan.io.ByteBuffer;
import org.infinispan.io.ExposedByteArrayOutputStream;
import org.infinispan.marshall.AbstractMarshaller;
-import org.infinispan.marshall.Marshaller;
import org.infinispan.util.Util;
import org.infinispan.util.logging.Log;
import org.infinispan.util.logging.LogFactory;
Modified: branches/4.1.x/core/src/main/java/org/infinispan/marshall/jboss/JBossMarshaller.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/marshall/jboss/JBossMarshaller.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/marshall/jboss/JBossMarshaller.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -21,34 +21,14 @@
*/
package org.infinispan.marshall.jboss;
-import org.infinispan.CacheException;
import org.infinispan.commands.RemoteCommandsFactory;
-import org.infinispan.io.ByteBuffer;
import org.infinispan.io.ExposedByteArrayOutputStream;
-import org.infinispan.marshall.AbstractStreamingMarshaller;
import org.infinispan.marshall.Marshallable;
import org.infinispan.marshall.StreamingMarshaller;
import org.infinispan.util.ReflectionUtil;
-import org.infinispan.util.Util;
-import org.infinispan.util.logging.Log;
-import org.infinispan.util.logging.LogFactory;
-import org.jboss.marshalling.ContextClassResolver;
-import org.jboss.marshalling.ExceptionListener;
-import org.jboss.marshalling.MarshallerFactory;
-import org.jboss.marshalling.Marshalling;
-import org.jboss.marshalling.MarshallingConfiguration;
-import org.jboss.marshalling.TraceInformation;
-import org.jboss.marshalling.Unmarshaller;
-import org.jboss.marshalling.reflect.SunReflectiveCreator;
-import java.io.ByteArrayInputStream;
import java.io.IOException;
import java.io.InputStream;
-import java.io.ObjectInput;
-import java.io.ObjectOutput;
-import java.io.OutputStream;
-import java.lang.reflect.Method;
-import java.net.URL;
/**
* A specialized form of the {@link GenericJBossMarshaller}, making use of a custom object table for types internal to
Modified: branches/4.1.x/core/src/main/java/org/infinispan/remoting/ReplicationQueue.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/remoting/ReplicationQueue.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/remoting/ReplicationQueue.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -35,7 +35,6 @@
import org.infinispan.util.logging.Log;
import org.infinispan.util.logging.LogFactory;
-import java.util.ArrayList;
import java.util.LinkedList;
import java.util.List;
import java.util.concurrent.BlockingQueue;
Modified: branches/4.1.x/core/src/main/java/org/infinispan/remoting/transport/jgroups/CommandAwareRpcDispatcher.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/remoting/transport/jgroups/CommandAwareRpcDispatcher.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/remoting/transport/jgroups/CommandAwareRpcDispatcher.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -31,7 +31,6 @@
import org.infinispan.remoting.responses.RequestIgnoredResponse;
import org.infinispan.remoting.responses.Response;
import org.infinispan.remoting.transport.DistributedSync;
-import org.infinispan.util.Util;
import org.infinispan.util.concurrent.TimeoutException;
import org.infinispan.util.logging.Log;
import org.infinispan.util.logging.LogFactory;
@@ -57,7 +56,6 @@
import java.util.concurrent.ExecutionException;
import java.util.concurrent.ExecutorService;
import java.util.concurrent.Future;
-import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
import static java.util.concurrent.TimeUnit.MILLISECONDS;
Modified: branches/4.1.x/core/src/main/java/org/infinispan/transaction/TransactionLog.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/transaction/TransactionLog.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/transaction/TransactionLog.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -89,7 +89,7 @@
}
}
- private static Log log = LogFactory.getLog(TransactionLog.class);
+ private static final Log log = LogFactory.getLog(TransactionLog.class);
public void logPrepare(PrepareCommand command) {
pendingPrepares.put(command.getGlobalTransaction(), command);
Modified: branches/4.1.x/core/src/main/java/org/infinispan/transaction/xa/CacheTransaction.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/transaction/xa/CacheTransaction.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/transaction/xa/CacheTransaction.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -5,7 +5,6 @@
import org.infinispan.util.BidirectionalMap;
import java.util.List;
-import java.util.Map;
/**
* Defines the state a infinispan transaction should have.
Modified: branches/4.1.x/core/src/main/java/org/infinispan/transaction/xa/DeadlockDetectingGlobalTransaction.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/transaction/xa/DeadlockDetectingGlobalTransaction.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/transaction/xa/DeadlockDetectingGlobalTransaction.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -20,7 +20,7 @@
@Marshallable(externalizer = DeadlockDetectingGlobalTransaction.Externalizer.class, id = Ids.DEADLOCK_DETECTING_GLOBAL_TRANSACTION)
public class DeadlockDetectingGlobalTransaction extends GlobalTransaction {
- private static Log log = LogFactory.getLog(DeadlockDetectingGlobalTransaction.class);
+ private static final Log log = LogFactory.getLog(DeadlockDetectingGlobalTransaction.class);
public static final boolean trace = log.isTraceEnabled();
Modified: branches/4.1.x/core/src/main/java/org/infinispan/transaction/xa/RemoteTransaction.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/transaction/xa/RemoteTransaction.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/transaction/xa/RemoteTransaction.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -9,7 +9,6 @@
import java.util.Arrays;
import java.util.LinkedList;
import java.util.List;
-import java.util.Map;
/**
* Defines the state of a remotely originated transaction.
Modified: branches/4.1.x/core/src/main/java/org/infinispan/transaction/xa/TransactionTable.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/transaction/xa/TransactionTable.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/transaction/xa/TransactionTable.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -41,7 +41,7 @@
*/
public class TransactionTable {
- private static Log log = LogFactory.getLog(TransactionTable.class);
+ private static final Log log = LogFactory.getLog(TransactionTable.class);
private static boolean trace = log.isTraceEnabled();
private final Map<Transaction, TransactionXaAdapter> localTransactions = new HashMap<Transaction, TransactionXaAdapter>();
Modified: branches/4.1.x/core/src/main/java/org/infinispan/transaction/xa/TransactionXaAdapter.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/transaction/xa/TransactionXaAdapter.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/transaction/xa/TransactionXaAdapter.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -22,7 +22,6 @@
import javax.transaction.xa.Xid;
import java.util.ArrayList;
import java.util.List;
-import java.util.Map;
/**
* This acts both as an local {@link org.infinispan.transaction.xa.CacheTransaction} and implementor of an {@link
@@ -33,7 +32,7 @@
*/
public class TransactionXaAdapter implements CacheTransaction, XAResource {
- private static Log log = LogFactory.getLog(TransactionXaAdapter.class);
+ private static final Log log = LogFactory.getLog(TransactionXaAdapter.class);
private static boolean trace = log.isTraceEnabled();
private int txTimeout;
Modified: branches/4.1.x/core/src/main/java/org/infinispan/util/FileLookup.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/util/FileLookup.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/util/FileLookup.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -32,9 +32,9 @@
import java.net.URL;
/**
- * Holds the logic of looking up a file, in the following sequence: <ol> <li> try to load it with the curent thread's
+ * Holds the logic of looking up a file, in the following sequence: <ol> <li> try to load it with the current thread's
* context ClassLoader</li> <li> if fails, the system ClassLoader</li> <li> if fails, try to load it as a file from the
- * disck </li> </ol>
+ * disk </li> </ol>
*
* @author Mircea.Markus at jboss.com
* @since 4.0
Modified: branches/4.1.x/core/src/main/java/org/infinispan/util/InfinispanCollections.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/util/InfinispanCollections.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/util/InfinispanCollections.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -19,12 +19,12 @@
@SuppressWarnings("unchecked")
public static <T> ReversibleOrderedSet<T> emptyReversibleOrderedSet() {
- return (ReversibleOrderedSet<T>) EMPTY_ROS;
+ return EMPTY_ROS;
}
@SuppressWarnings("unchecked")
public static <K, V> BidirectionalMap<K, V> emptyBidirectionalMap() {
- return (BidirectionalMap<K, V>) EMPTY_BIDI_MAP;
+ return EMPTY_BIDI_MAP;
}
private static final class EmptyReversibleOrderedSet extends AbstractSet implements ReversibleOrderedSet {
Modified: branches/4.1.x/core/src/main/java/org/infinispan/util/LegacyKeySupportSystemProperties.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/util/LegacyKeySupportSystemProperties.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/util/LegacyKeySupportSystemProperties.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -3,8 +3,6 @@
import org.infinispan.util.logging.Log;
import org.infinispan.util.logging.LogFactory;
-import java.util.Properties;
-
/**
* A wrapper around system properties that supports legacy keys
*
Modified: branches/4.1.x/core/src/main/java/org/infinispan/util/Proxies.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/util/Proxies.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/util/Proxies.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -22,8 +22,6 @@
package org.infinispan.util;
import java.lang.reflect.Method;
-import java.util.HashSet;
-import java.util.Set;
import org.infinispan.util.logging.Log;
import org.infinispan.util.logging.LogFactory;
Modified: branches/4.1.x/core/src/main/java/org/infinispan/util/concurrent/AbstractInProcessNotifyingFuture.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/util/concurrent/AbstractInProcessNotifyingFuture.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/util/concurrent/AbstractInProcessNotifyingFuture.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -1,7 +1,5 @@
package org.infinispan.util.concurrent;
-import java.util.concurrent.ExecutionException;
-
/**
* An abstract NotifyingFuture that has "completed"
*
Modified: branches/4.1.x/core/src/main/java/org/infinispan/util/concurrent/IsolationLevel.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/util/concurrent/IsolationLevel.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/util/concurrent/IsolationLevel.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -21,9 +21,6 @@
*/
package org.infinispan.util.concurrent;
-import javax.xml.bind.annotation.XmlNsForm;
-import javax.xml.bind.annotation.XmlSchema;
-
/**
* Various transaction isolation levels as an enumerated class. Note that <a href="http://wiki.jboss.org/wiki/JBossCacheMVCC">MVCC</a>
* only supports {@link #READ_COMMITTED} and {@link #REPEATABLE_READ}, upgrading where possible.
Modified: branches/4.1.x/core/src/main/java/org/infinispan/util/concurrent/locks/StripedLock.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/util/concurrent/locks/StripedLock.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/util/concurrent/locks/StripedLock.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -48,7 +48,7 @@
@ThreadSafe
public class StripedLock {
- private static Log log = LogFactory.getLog(StripedLock.class);
+ private static final Log log = LogFactory.getLog(StripedLock.class);
private static final int DEFAULT_CONCURRENCY = 20;
private final int lockSegmentMask;
Modified: branches/4.1.x/core/src/main/java/org/infinispan/util/concurrent/locks/containers/AbstractPerEntryLockContainer.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/util/concurrent/locks/containers/AbstractPerEntryLockContainer.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/util/concurrent/locks/containers/AbstractPerEntryLockContainer.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -1,7 +1,5 @@
package org.infinispan.util.concurrent.locks.containers;
-import org.infinispan.util.Util;
-
import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.ConcurrentMap;
import java.util.concurrent.TimeUnit;
Modified: branches/4.1.x/core/src/main/java/org/infinispan/util/concurrent/locks/containers/AbstractStripedLockContainer.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/util/concurrent/locks/containers/AbstractStripedLockContainer.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/util/concurrent/locks/containers/AbstractStripedLockContainer.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -22,7 +22,6 @@
package org.infinispan.util.concurrent.locks.containers;
import net.jcip.annotations.ThreadSafe;
-import org.infinispan.util.Util;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.Lock;
Modified: branches/4.1.x/core/src/main/java/org/infinispan/util/hash/MurmurHash2.java
===================================================================
--- branches/4.1.x/core/src/main/java/org/infinispan/util/hash/MurmurHash2.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/main/java/org/infinispan/util/hash/MurmurHash2.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -2,8 +2,6 @@
import org.infinispan.util.ByteArrayKey;
-import java.util.Random;
-
/**
* An implementation of Austin Appleby's MurmurHash2.0 algorithm, as documented on <a href="http://sites.google.com/site/murmurhash/">his website</a>.
* <p />
Modified: branches/4.1.x/core/src/test/java/org/infinispan/affinity/BaseFilterKeyAffinityServiceTest.java
===================================================================
--- branches/4.1.x/core/src/test/java/org/infinispan/affinity/BaseFilterKeyAffinityServiceTest.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/test/java/org/infinispan/affinity/BaseFilterKeyAffinityServiceTest.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -7,7 +7,6 @@
import org.infinispan.test.TestingUtil;
import org.infinispan.util.logging.Log;
import org.infinispan.util.logging.LogFactory;
-import org.testng.annotations.Test;
import java.util.List;
import java.util.Map;
@@ -21,7 +20,7 @@
*/
public abstract class BaseFilterKeyAffinityServiceTest extends BaseKeyAffinityServiceTest {
- private static Log log = LogFactory.getLog(BaseFilterKeyAffinityServiceTest.class);
+ private static final Log log = LogFactory.getLog(BaseFilterKeyAffinityServiceTest.class);
protected EmbeddedCacheManager cacheManager;
Modified: branches/4.1.x/core/src/test/java/org/infinispan/affinity/FilteredKeyAffinityService.java
===================================================================
--- branches/4.1.x/core/src/test/java/org/infinispan/affinity/FilteredKeyAffinityService.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/test/java/org/infinispan/affinity/FilteredKeyAffinityService.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -5,7 +5,6 @@
import org.testng.annotations.Test;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
import java.util.concurrent.Executors;
import java.util.concurrent.ThreadFactory;
Modified: branches/4.1.x/core/src/test/java/org/infinispan/affinity/LocalKeyAffinityServiceTest.java
===================================================================
--- branches/4.1.x/core/src/test/java/org/infinispan/affinity/LocalKeyAffinityServiceTest.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/test/java/org/infinispan/affinity/LocalKeyAffinityServiceTest.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -1,10 +1,7 @@
package org.infinispan.affinity;
-import junit.framework.Assert;
-import org.infinispan.Cache;
import org.infinispan.manager.EmbeddedCacheManager;
import org.infinispan.remoting.transport.Address;
-import org.infinispan.test.TestingUtil;
import org.testng.annotations.Test;
import java.util.Collections;
Modified: branches/4.1.x/core/src/test/java/org/infinispan/api/mvcc/read_committed/CacheAPIMVCCTest.java
===================================================================
--- branches/4.1.x/core/src/test/java/org/infinispan/api/mvcc/read_committed/CacheAPIMVCCTest.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/test/java/org/infinispan/api/mvcc/read_committed/CacheAPIMVCCTest.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -2,7 +2,6 @@
import org.infinispan.api.CacheAPITest;
import org.infinispan.util.concurrent.IsolationLevel;
-import org.testng.annotations.AfterClass;
import org.testng.annotations.Test;
@Test(groups = "functional", testName = "api.mvcc.read_committed.CacheAPIMVCCTest")
Modified: branches/4.1.x/core/src/test/java/org/infinispan/config/parsing/MinimalConfigurationParsingTest.java
===================================================================
--- branches/4.1.x/core/src/test/java/org/infinispan/config/parsing/MinimalConfigurationParsingTest.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/test/java/org/infinispan/config/parsing/MinimalConfigurationParsingTest.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -1,7 +1,6 @@
package org.infinispan.config.parsing;
import org.infinispan.config.InfinispanConfiguration;
-import org.infinispan.test.TestingUtil;
import org.testng.annotations.Test;
import java.io.ByteArrayInputStream;
Modified: branches/4.1.x/core/src/test/java/org/infinispan/context/MarshalledValueContextTest.java
===================================================================
--- branches/4.1.x/core/src/test/java/org/infinispan/context/MarshalledValueContextTest.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/test/java/org/infinispan/context/MarshalledValueContextTest.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -4,16 +4,13 @@
import org.infinispan.config.Configuration;
import org.infinispan.context.InvocationContext;
import org.infinispan.context.InvocationContextContainer;
-import org.infinispan.context.InvocationContextContainerImpl;
import org.infinispan.context.impl.LocalTxInvocationContext;
import org.infinispan.manager.DefaultCacheManager;
import org.infinispan.manager.EmbeddedCacheManager;
import org.infinispan.test.SingleCacheManagerTest;
import org.infinispan.test.TestingUtil;
import org.infinispan.test.fwk.TestCacheManagerFactory;
-import org.infinispan.transaction.lookup.DummyTransactionManagerLookup;
import org.infinispan.util.concurrent.locks.LockManager;
-import org.infinispan.util.concurrent.locks.containers.LockContainer;
import org.testng.annotations.Test;
import javax.transaction.TransactionManager;
Modified: branches/4.1.x/core/src/test/java/org/infinispan/distribution/BaseDistFunctionalTest.java
===================================================================
--- branches/4.1.x/core/src/test/java/org/infinispan/distribution/BaseDistFunctionalTest.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/test/java/org/infinispan/distribution/BaseDistFunctionalTest.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -100,7 +100,7 @@
* This is a separate class because some tools try and run this method as a test
*/
public static class RehashWaiter {
- private static Log log = LogFactory.getLog(RehashWaiter.class);
+ private static final Log log = LogFactory.getLog(RehashWaiter.class);
public static void waitForInitRehashToComplete(Cache... caches) {
int gracetime = 60000; // 60 seconds?
long giveup = System.currentTimeMillis() + gracetime;
Modified: branches/4.1.x/core/src/test/java/org/infinispan/distribution/HashFunctionComparisonTest.java
===================================================================
--- branches/4.1.x/core/src/test/java/org/infinispan/distribution/HashFunctionComparisonTest.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/test/java/org/infinispan/distribution/HashFunctionComparisonTest.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -1,9 +1,7 @@
package org.infinispan.distribution;
import org.apache.commons.math.stat.descriptive.DescriptiveStatistics;
-import org.infinispan.profiling.testinternals.Generator;
import org.infinispan.remoting.transport.Address;
-import org.infinispan.util.Util;
import org.infinispan.util.hash.MurmurHash2;
import org.testng.annotations.Test;
Modified: branches/4.1.x/core/src/test/java/org/infinispan/distribution/SyncDistImplicitLockingTest.java
===================================================================
--- branches/4.1.x/core/src/test/java/org/infinispan/distribution/SyncDistImplicitLockingTest.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/test/java/org/infinispan/distribution/SyncDistImplicitLockingTest.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -21,24 +21,11 @@
*/
package org.infinispan.distribution;
-import org.infinispan.Cache;
import org.infinispan.config.Configuration;
import org.infinispan.replication.SyncReplImplicitLockingTest;
-import org.infinispan.test.MultipleCacheManagersTest;
-import org.infinispan.test.TestingUtil;
-import org.infinispan.util.concurrent.locks.LockManager;
-import static org.testng.AssertJUnit.assertEquals;
-import static org.testng.AssertJUnit.assertNull;
-
import org.testng.annotations.Test;
-import javax.transaction.TransactionManager;
-import java.util.HashMap;
-import java.util.Map;
-import java.util.concurrent.CountDownLatch;
-import java.util.concurrent.TimeUnit;
-
/**
* Tests for implicit locking
* <p/>
Modified: branches/4.1.x/core/src/test/java/org/infinispan/eviction/EvictionManagerTest.java
===================================================================
--- branches/4.1.x/core/src/test/java/org/infinispan/eviction/EvictionManagerTest.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/test/java/org/infinispan/eviction/EvictionManagerTest.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -2,18 +2,10 @@
import static org.easymock.EasyMock.*;
-import org.easymock.EasyMock;
-import org.easymock.IAnswer;
-import org.infinispan.AdvancedCache;
-import org.infinispan.Cache;
import org.infinispan.config.Configuration;
-import org.infinispan.container.DataContainer;
-import org.infinispan.container.entries.InternalEntryFactory;
-import org.infinispan.context.Flag;
import org.infinispan.test.AbstractInfinispanTest;
import org.testng.annotations.Test;
-import java.util.Iterator;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
Modified: branches/4.1.x/core/src/test/java/org/infinispan/jmx/RpcManagerMBeanTest.java
===================================================================
--- branches/4.1.x/core/src/test/java/org/infinispan/jmx/RpcManagerMBeanTest.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/test/java/org/infinispan/jmx/RpcManagerMBeanTest.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -17,7 +17,6 @@
import org.infinispan.test.TestingUtil;
import org.infinispan.test.fwk.TestCacheManagerFactory;
-import static org.easymock.EasyMock.expect;
import static org.testng.Assert.assertEquals;
import org.testng.annotations.Test;
Modified: branches/4.1.x/core/src/test/java/org/infinispan/loaders/FlushingAsyncStoreTest.java
===================================================================
--- branches/4.1.x/core/src/test/java/org/infinispan/loaders/FlushingAsyncStoreTest.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/test/java/org/infinispan/loaders/FlushingAsyncStoreTest.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -9,7 +9,6 @@
import org.infinispan.container.entries.InternalCacheEntry;
import org.infinispan.loaders.decorators.AsyncStoreConfig;
import org.infinispan.loaders.dummy.DummyInMemoryCacheStore;
-import org.infinispan.loaders.file.FileCacheStoreConfig;
import org.infinispan.manager.EmbeddedCacheManager;
import org.infinispan.test.SingleCacheManagerTest;
import org.infinispan.test.TestingUtil;
Modified: branches/4.1.x/core/src/test/java/org/infinispan/loaders/dummy/DummyInMemoryCacheStoreFunctionalTest.java
===================================================================
--- branches/4.1.x/core/src/test/java/org/infinispan/loaders/dummy/DummyInMemoryCacheStoreFunctionalTest.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/test/java/org/infinispan/loaders/dummy/DummyInMemoryCacheStoreFunctionalTest.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -2,15 +2,9 @@
import org.infinispan.loaders.BaseCacheStoreFunctionalTest;
import org.infinispan.loaders.CacheStoreConfig;
-import org.infinispan.loaders.file.FileCacheStoreConfig;
-import org.infinispan.test.TestingUtil;
import org.testng.annotations.AfterClass;
-import org.testng.annotations.BeforeTest;
-import org.testng.annotations.Parameters;
import org.testng.annotations.Test;
-import java.io.File;
-
@Test(groups = "unit", testName = "loaders.dummy.DummyInMemoryCacheStoreFunctionalTest")
public class DummyInMemoryCacheStoreFunctionalTest extends BaseCacheStoreFunctionalTest {
Modified: branches/4.1.x/core/src/test/java/org/infinispan/lock/EagerLockingDisabledTest.java
===================================================================
--- branches/4.1.x/core/src/test/java/org/infinispan/lock/EagerLockingDisabledTest.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/test/java/org/infinispan/lock/EagerLockingDisabledTest.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -1,7 +1,6 @@
package org.infinispan.lock;
import org.infinispan.Cache;
-import org.infinispan.CacheException;
import org.infinispan.config.Configuration;
import org.infinispan.config.ConfigurationException;
import org.infinispan.manager.EmbeddedCacheManager;
Modified: branches/4.1.x/core/src/test/java/org/infinispan/profiling/DeadlockDetectionPerformanceTest.java
===================================================================
--- branches/4.1.x/core/src/test/java/org/infinispan/profiling/DeadlockDetectionPerformanceTest.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/test/java/org/infinispan/profiling/DeadlockDetectionPerformanceTest.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -45,7 +45,7 @@
@Test(groups = "profiling", enabled = true, testName = "profiling.DeadlockDetectionPerformanceTest")
public class DeadlockDetectionPerformanceTest extends AbstractInfinispanTest {
- private static Log log = LogFactory.getLog(DeadlockDetectionPerformanceTest.class);
+ private static final Log log = LogFactory.getLog(DeadlockDetectionPerformanceTest.class);
public static final int KEY_POOL_SIZE = 10;
Modified: branches/4.1.x/core/src/test/java/org/infinispan/replication/SyncCacheListenerTest.java
===================================================================
--- branches/4.1.x/core/src/test/java/org/infinispan/replication/SyncCacheListenerTest.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/test/java/org/infinispan/replication/SyncCacheListenerTest.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -10,7 +10,6 @@
import org.infinispan.Cache;
import org.infinispan.CacheException;
import org.infinispan.config.Configuration;
-import org.infinispan.distribution.ConsistentHash;
import org.infinispan.notifications.Listener;
import org.infinispan.notifications.cachelistener.annotation.CacheEntryModified;
import org.infinispan.notifications.cachelistener.annotation.CacheEntryRemoved;
Modified: branches/4.1.x/core/src/test/java/org/infinispan/replication/SyncReplTest.java
===================================================================
--- branches/4.1.x/core/src/test/java/org/infinispan/replication/SyncReplTest.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/test/java/org/infinispan/replication/SyncReplTest.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -11,7 +11,6 @@
import org.infinispan.CacheException;
import org.infinispan.commands.remote.CacheRpcCommand;
import org.infinispan.config.Configuration;
-import org.infinispan.manager.NamedCacheNotFoundException;
import org.infinispan.remoting.rpc.ResponseFilter;
import org.infinispan.remoting.rpc.ResponseMode;
import org.infinispan.remoting.rpc.RpcManager;
Modified: branches/4.1.x/core/src/test/java/org/infinispan/statetransfer/StateTransferReplicationQueueTest.java
===================================================================
--- branches/4.1.x/core/src/test/java/org/infinispan/statetransfer/StateTransferReplicationQueueTest.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/test/java/org/infinispan/statetransfer/StateTransferReplicationQueueTest.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -6,7 +6,6 @@
import org.infinispan.manager.EmbeddedCacheManager;
import org.infinispan.test.MultipleCacheManagersTest;
import org.infinispan.test.TestingUtil;
-import org.infinispan.statetransfer.StateTransferFunctionalTest.*;
import org.infinispan.util.logging.Log;
import org.infinispan.util.logging.LogFactory;
import org.testng.annotations.Test;
@@ -18,13 +17,11 @@
import java.io.ObjectOutput;
import java.lang.reflect.Method;
import java.util.Properties;
-import java.util.concurrent.ExecutorService;
-import java.util.concurrent.Executors;
import java.util.concurrent.TimeUnit;
import java.util.concurrent.atomic.AtomicBoolean;
/**
- * State transfer and replication queue test veryfying that the interaction between them two works in fine.
+ * State transfer and replication queue test verifying that the interaction between them two works in fine.
*
* @author Galder Zamarreño
* @since 4.1
Modified: branches/4.1.x/core/src/test/java/org/infinispan/test/AbstractInfinispanTest.java
===================================================================
--- branches/4.1.x/core/src/test/java/org/infinispan/test/AbstractInfinispanTest.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/test/java/org/infinispan/test/AbstractInfinispanTest.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -24,7 +24,6 @@
import java.lang.reflect.Field;
import java.lang.reflect.Modifier;
-import org.testng.annotations.AfterClass;
import org.testng.annotations.AfterTest;
/**
Modified: branches/4.1.x/core/src/test/java/org/infinispan/test/PerCacheExecutorThread.java
===================================================================
--- branches/4.1.x/core/src/test/java/org/infinispan/test/PerCacheExecutorThread.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/test/java/org/infinispan/test/PerCacheExecutorThread.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -18,7 +18,7 @@
*/
public final class PerCacheExecutorThread extends Thread {
- private static Log log = LogFactory.getLog(PerCacheExecutorThread.class);
+ private static final Log log = LogFactory.getLog(PerCacheExecutorThread.class);
private Cache<Object, Object> cache;
private BlockingQueue<Object> toExecute = new ArrayBlockingQueue<Object>(1);
Modified: branches/4.1.x/core/src/test/java/org/infinispan/test/fwk/SuiteResourcesAndLogTest.java
===================================================================
--- branches/4.1.x/core/src/test/java/org/infinispan/test/fwk/SuiteResourcesAndLogTest.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/test/java/org/infinispan/test/fwk/SuiteResourcesAndLogTest.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -15,7 +15,7 @@
@Test(groups = "functional", testName = "test.testng.SuiteResourcesAndLogTest", alwaysRun=true)
public class SuiteResourcesAndLogTest {
- private static Log log = LogFactory.getLog(SuiteResourcesAndLogTest.class);
+ private static final Log log = LogFactory.getLog(SuiteResourcesAndLogTest.class);
@BeforeSuite
@AfterSuite
Modified: branches/4.1.x/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java
===================================================================
--- branches/4.1.x/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/test/java/org/infinispan/test/fwk/TestCacheManagerFactory.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -33,7 +33,7 @@
private static AtomicInteger jmxDomainPostfix = new AtomicInteger();
public static final String MARSHALLER = LegacyKeySupportSystemProperties.getProperty("infinispan.test.marshaller.class", "infinispan.marshaller.class");
- private static Log log = LogFactory.getLog(TestCacheManagerFactory.class);
+ private static final Log log = LogFactory.getLog(TestCacheManagerFactory.class);
private static ThreadLocal<PerThreadCacheManagers> perThreadCacheManagers = new ThreadLocal<PerThreadCacheManagers>() {
@Override
Modified: branches/4.1.x/core/src/test/java/org/infinispan/tx/LargeTransactionTest.java
===================================================================
--- branches/4.1.x/core/src/test/java/org/infinispan/tx/LargeTransactionTest.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/test/java/org/infinispan/tx/LargeTransactionTest.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -19,7 +19,7 @@
*/
@Test(testName = "tx.LargeTransactionTest", groups = "functional")
public class LargeTransactionTest extends MultipleCacheManagersTest {
- private static Log log = LogFactory.getLog(LargeTransactionTest.class);
+ private static final Log log = LogFactory.getLog(LargeTransactionTest.class);
protected void createCacheManagers() throws Throwable {
Modified: branches/4.1.x/core/src/test/java/org/infinispan/tx/TransactionManagerLookupTest.java
===================================================================
--- branches/4.1.x/core/src/test/java/org/infinispan/tx/TransactionManagerLookupTest.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/core/src/test/java/org/infinispan/tx/TransactionManagerLookupTest.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -4,7 +4,6 @@
import org.infinispan.transaction.lookup.DummyTransactionManagerLookup;
import org.infinispan.transaction.lookup.GenericTransactionManagerLookup;
import org.infinispan.transaction.lookup.JBossStandaloneJTAManagerLookup;
-import org.infinispan.transaction.lookup.JBossTransactionManagerLookup;
import org.infinispan.transaction.lookup.TransactionManagerLookup;
import org.testng.annotations.Test;
Modified: branches/4.1.x/demos/ec2/src/main/java/org/infinispan/ec2demo/CacheBuilder.java
===================================================================
--- branches/4.1.x/demos/ec2/src/main/java/org/infinispan/ec2demo/CacheBuilder.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/demos/ec2/src/main/java/org/infinispan/ec2demo/CacheBuilder.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -1,6 +1,3 @@
-/**
- *
- */
package org.infinispan.ec2demo;
import java.io.IOException;
@@ -8,15 +5,12 @@
import org.infinispan.manager.CacheContainer;
import org.infinispan.manager.DefaultCacheManager;
import org.infinispan.manager.EmbeddedCacheManager;
-import org.infinispan.util.logging.Log;
-import org.infinispan.util.logging.LogFactory;
/**
* @author noconnor at redhat.com
*/
public class CacheBuilder {
private EmbeddedCacheManager cache_manager;
- private static final Log myLogger = LogFactory.getLog(CacheBuilder.class);
public CacheBuilder(String inConfigFile) throws IOException {
Modified: branches/4.1.x/demos/ec2/src/main/java/org/infinispan/ec2demo/InfinispanFluDemo.java
===================================================================
--- branches/4.1.x/demos/ec2/src/main/java/org/infinispan/ec2demo/InfinispanFluDemo.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/demos/ec2/src/main/java/org/infinispan/ec2demo/InfinispanFluDemo.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -14,12 +14,7 @@
import java.io.InputStreamReader;
/**
- *
- */
-
-/**
* @author noconnor at redhat.com
- *
*/
public class InfinispanFluDemo {
@@ -78,7 +73,7 @@
} else {
try {
- Thread.currentThread().sleep(2000);
+ Thread.sleep(2000);
} catch (InterruptedException e) {
e.printStackTrace();
}
Modified: branches/4.1.x/demos/ec2/src/main/java/org/infinispan/ec2demo/InfluenzaDataLoader.java
===================================================================
--- branches/4.1.x/demos/ec2/src/main/java/org/infinispan/ec2demo/InfluenzaDataLoader.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/demos/ec2/src/main/java/org/infinispan/ec2demo/InfluenzaDataLoader.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -1,6 +1,3 @@
-/**
- *
- */
package org.infinispan.ec2demo;
import com.martiansoftware.jsap.JSAPResult;
@@ -28,7 +25,7 @@
private Nucleotide_Protein_Parser npParser;
private Influenza_Parser iParser;
- private static final Log myLogger = LogFactory.getLog(InfluenzaDataLoader.class);
+ private static final Log log = LogFactory.getLog(InfluenzaDataLoader.class);
public void createCache(String configFile) throws IOException {
String cfgFileName = LegacyKeySupportSystemProperties.getProperty("infinispan.configuration", "infinispan.demo.cfg");
@@ -65,7 +62,7 @@
System.out.println("Parsing files....");
if (config.getString("ifile") != null) {
- myLogger.info("Parsing Influenza data");
+ log.info("Parsing Influenza data");
List<Influenza_N_P_CR_Element> iList = iParser.parseFile(config.getString("ifile"));
boolean rQuery = config.getBoolean("randomquery");
@@ -81,7 +78,7 @@
this.searchCache(curreElem.getGanNucleoid());
try {
- Thread.currentThread().sleep(1000);
+ Thread.sleep(1000);
} catch (InterruptedException ex) {
// do nothing, yea I know its naughty...
}
@@ -110,7 +107,7 @@
}
if (config.getString("pfile") != null) {
- myLogger.info("Parsing Protein data");
+ log.info("Parsing Protein data");
List<Nucleotide_Protein_Element> npList = npParser.parseFile(config.getString("pfile"));
System.out.println("About to load " + npList.size() + " protein elements into ProteinCache");
int loopCount = 0;
@@ -133,7 +130,7 @@
}
if (config.getString("nfile") != null) {
- myLogger.info("Parsing Nucleotide data");
+ log.info("Parsing Nucleotide data");
List<Nucleotide_Protein_Element> npList = npParser.parseFile(config.getString("nfile"));
System.out.println("About to load " + npList.size() + " nucleotide elements into NucleiodCache");
int loopCount = 0;
@@ -162,14 +159,14 @@
}
public void searchCache(String inGBAN) {
- myLogger.trace("Searching influenzaCache for " + inGBAN);
+ log.trace("Searching influenzaCache for " + inGBAN);
// Find the virus details
Influenza_N_P_CR_Element myRec = influenzaCache.get(inGBAN);
if (myRec != null) {
System.out.println("++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++");
System.out.println("Virus Details->" + myRec);
- myLogger.trace("Searching nucleiodCache for " + myRec.getGanNucleoid());
+ log.trace("Searching nucleiodCache for " + myRec.getGanNucleoid());
Nucleotide_Protein_Element nucldet = nucleiodCache.get(myRec.getGanNucleoid());
System.out.println("Nucleotide details->" + nucldet);
@@ -177,7 +174,7 @@
Map<String, String> myProt = myRec.getProtein_Data();
for (String x : myProt.keySet()) {
System.out.println("=========================================================================");
- myLogger.trace("Searching proteinCache for " + x);
+ log.trace("Searching proteinCache for " + x);
Nucleotide_Protein_Element myProtdet = proteinCache.get(x);
System.out.println("Protein->" + myProtdet);
String protein_CR = myProt.get(x);
@@ -185,7 +182,7 @@
}
System.out.println("++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++");
} else {
- myLogger.trace("No virus data found for " + inGBAN);
+ log.trace("No virus data found for " + inGBAN);
System.out.println("No virus data found for " + inGBAN);
}
}
Modified: branches/4.1.x/demos/ec2/src/main/java/org/infinispan/ec2demo/InfluenzaVirusCache.java
===================================================================
--- branches/4.1.x/demos/ec2/src/main/java/org/infinispan/ec2demo/InfluenzaVirusCache.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/demos/ec2/src/main/java/org/infinispan/ec2demo/InfluenzaVirusCache.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -1,6 +1,3 @@
-/**
- *
- */
package org.infinispan.ec2demo;
import org.infinispan.Cache;
@@ -14,7 +11,7 @@
*
*/
public class InfluenzaVirusCache {
- private static final Log myLogger = LogFactory.getLog(InfluenzaVirusCache.class);
+ private static final Log log = LogFactory.getLog(InfluenzaVirusCache.class);
private Cache<String, Influenza_N_P_CR_Element> myCache;
public InfluenzaVirusCache(CacheBuilder cacheManger) throws IOException {
@@ -26,7 +23,7 @@
return;
String myKey = value.getGanNucleoid();
if ((myKey == null) || (myKey.isEmpty())) {
- myLogger.error("Invalid record " + value);
+ log.error("Invalid record " + value);
} else {
myCache.put(myKey, value);
}
Modified: branches/4.1.x/demos/ec2/src/main/java/org/infinispan/ec2demo/Influenza_N_P_CR_Element.java
===================================================================
--- branches/4.1.x/demos/ec2/src/main/java/org/infinispan/ec2demo/Influenza_N_P_CR_Element.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/demos/ec2/src/main/java/org/infinispan/ec2demo/Influenza_N_P_CR_Element.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -1,6 +1,3 @@
-/**
- *
- */
package org.infinispan.ec2demo;
import java.io.Serializable;
Modified: branches/4.1.x/demos/ec2/src/main/java/org/infinispan/ec2demo/Influenza_Parser.java
===================================================================
--- branches/4.1.x/demos/ec2/src/main/java/org/infinispan/ec2demo/Influenza_Parser.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/demos/ec2/src/main/java/org/infinispan/ec2demo/Influenza_Parser.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -1,6 +1,3 @@
-/**
- *
- */
package org.infinispan.ec2demo;
import java.io.File;
Modified: branches/4.1.x/demos/ec2/src/main/java/org/infinispan/ec2demo/NucleotideCache.java
===================================================================
--- branches/4.1.x/demos/ec2/src/main/java/org/infinispan/ec2demo/NucleotideCache.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/demos/ec2/src/main/java/org/infinispan/ec2demo/NucleotideCache.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -1,6 +1,3 @@
-/**
- *
- */
package org.infinispan.ec2demo;
import java.io.IOException;
@@ -12,7 +9,7 @@
*
*/
public class NucleotideCache {
- Logger myLogger = Logger.getLogger(NucleotideCache.class);
+ private static final Logger log = Logger.getLogger(NucleotideCache.class);
private Cache<String, Nucleotide_Protein_Element> myCache;
public NucleotideCache(CacheBuilder cacheManger) throws IOException {
@@ -24,7 +21,7 @@
return;
String myKey = value.getGenbankAccessionNumber();
if ((myKey == null) || (myKey.isEmpty())) {
- myLogger.error("Invalid record " + value);
+ log.error("Invalid record " + value);
} else {
myCache.put(value.getGenbankAccessionNumber(), value);
}
Modified: branches/4.1.x/demos/ec2/src/main/java/org/infinispan/ec2demo/Nucleotide_Protein_Element.java
===================================================================
--- branches/4.1.x/demos/ec2/src/main/java/org/infinispan/ec2demo/Nucleotide_Protein_Element.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/demos/ec2/src/main/java/org/infinispan/ec2demo/Nucleotide_Protein_Element.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -1,6 +1,3 @@
-/**
- *
- */
package org.infinispan.ec2demo;
import java.io.Serializable;
Modified: branches/4.1.x/demos/ec2/src/main/java/org/infinispan/ec2demo/Nucleotide_Protein_Parser.java
===================================================================
--- branches/4.1.x/demos/ec2/src/main/java/org/infinispan/ec2demo/Nucleotide_Protein_Parser.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/demos/ec2/src/main/java/org/infinispan/ec2demo/Nucleotide_Protein_Parser.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -10,18 +10,10 @@
import java.util.List;
/**
- *
- */
-
-/**
* @author noconnor at redhat.com
*/
public class Nucleotide_Protein_Parser {
- public Nucleotide_Protein_Parser() {
-
- }
-
@SuppressWarnings("unchecked")
public List<Nucleotide_Protein_Element> parseFile(String fileName) throws IOException, SAXException {
System.out.println("Parsing [" + fileName + "]");
Modified: branches/4.1.x/demos/ec2/src/main/java/org/infinispan/ec2demo/ProteinCache.java
===================================================================
--- branches/4.1.x/demos/ec2/src/main/java/org/infinispan/ec2demo/ProteinCache.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/demos/ec2/src/main/java/org/infinispan/ec2demo/ProteinCache.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -1,6 +1,3 @@
-/**
- *
- */
package org.infinispan.ec2demo;
import org.infinispan.Cache;
@@ -14,7 +11,7 @@
*
*/
public class ProteinCache {
- private static final Log myLogger = LogFactory.getLog(ProteinCache.class);
+ private static final Log log = LogFactory.getLog(ProteinCache.class);
private Cache<String, Nucleotide_Protein_Element> myCache;
public ProteinCache(CacheBuilder cacheManger) throws IOException {
@@ -26,7 +23,7 @@
return;
String myKey = value.getGenbankAccessionNumber();
if ((myKey == null) || (myKey.isEmpty())) {
- myLogger.error("Invalid record " + value);
+ log.error("Invalid record " + value);
} else {
myCache.put(value.getGenbankAccessionNumber(), value);
}
Modified: branches/4.1.x/demos/ec2-ui/src/main/java/org/infinispan/ec2demo/web/CacheSearchServlet.java
===================================================================
--- branches/4.1.x/demos/ec2-ui/src/main/java/org/infinispan/ec2demo/web/CacheSearchServlet.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/demos/ec2-ui/src/main/java/org/infinispan/ec2demo/web/CacheSearchServlet.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -24,7 +24,7 @@
* Servlet implementation class CacheSearchServlet
*/
public class CacheSearchServlet extends HttpServlet {
- private Log myLogger = LogFactory.getLog(CacheSearchServlet.class);
+ private static final Log log = LogFactory.getLog(CacheSearchServlet.class);
private static final long serialVersionUID = 1L;
private Cache<String, Influenza_N_P_CR_Element> influenzaCache;
private Cache<String, Nucleotide_Protein_Element> proteinCache;
@@ -59,7 +59,7 @@
Influenza_N_P_CR_Element myRec = influenzaCache.get(searchGBAN);
if (myRec != null) {
- myLogger.trace("Searching nucleiodCache for " + myRec.getGanNucleoid());
+ log.trace("Searching nucleiodCache for " + myRec.getGanNucleoid());
Nucleotide_Protein_Element nucldet = nucleiodCache.get(myRec.getGanNucleoid());
request.setAttribute("Nucleotide", nucldet);
@@ -67,7 +67,7 @@
Map<String, String> myProt = myRec.getProtein_Data();
Map<String, String> myMap = new HashMap<String, String>();
for (String x : myProt.keySet()) {
- myLogger.trace("Searching proteinCache for " + x);
+ log.trace("Searching proteinCache for " + x);
Nucleotide_Protein_Element myProtdet = proteinCache.get(x);
String protein_CR = myProt.get(x);
myMap.put(myProtdet.getGenbankAccessionNumber(), protein_CR);
Modified: branches/4.1.x/demos/ec2-ui/src/main/java/org/infinispan/ec2demo/web/CacheServletListener.java
===================================================================
--- branches/4.1.x/demos/ec2-ui/src/main/java/org/infinispan/ec2demo/web/CacheServletListener.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/demos/ec2-ui/src/main/java/org/infinispan/ec2demo/web/CacheServletListener.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -1,6 +1,3 @@
-/**
- *
- */
package org.infinispan.ec2demo.web;
import org.infinispan.ec2demo.CacheBuilder;
Modified: branches/4.1.x/demos/gridfs-webdav/src/main/java/org/infinispan/demos/gridfs/GridStore.java
===================================================================
--- branches/4.1.x/demos/gridfs-webdav/src/main/java/org/infinispan/demos/gridfs/GridStore.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/demos/gridfs-webdav/src/main/java/org/infinispan/demos/gridfs/GridStore.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -21,7 +21,7 @@
* @author Bela Ban
*/
public class GridStore implements IWebdavStore {
- private static Log log = LogFactory.getLog(GridStore.class);
+ private static final Log log = LogFactory.getLog(GridStore.class);
private static int BUF_SIZE = 65536;
private final Cache<String, byte[]> data;
private final Cache<String, GridFile.Metadata> metadata;
Modified: branches/4.1.x/demos/gui/src/main/java/org/infinispan/demo/InfinispanDemo.java
===================================================================
--- branches/4.1.x/demos/gui/src/main/java/org/infinispan/demo/InfinispanDemo.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/demos/gui/src/main/java/org/infinispan/demo/InfinispanDemo.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -46,7 +46,7 @@
* @author Manik Surtani
*/
public class InfinispanDemo {
- private static Log log = LogFactory.getLog(InfinispanDemo.class);
+ private static final Log log = LogFactory.getLog(InfinispanDemo.class);
private static JFrame frame;
private JTabbedPane mainPane;
private JPanel panel1;
Modified: branches/4.1.x/query/src/main/java/org/infinispan/query/backend/KeyTransformationHandler.java
===================================================================
--- branches/4.1.x/query/src/main/java/org/infinispan/query/backend/KeyTransformationHandler.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/query/src/main/java/org/infinispan/query/backend/KeyTransformationHandler.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -44,7 +44,7 @@
* @since 4.0
*/
public class KeyTransformationHandler {
- private static Log log = LogFactory.getLog(KeyTransformationHandler.class);
+ private static final Log log = LogFactory.getLog(KeyTransformationHandler.class);
public static Object stringToKey(String s) {
char type = s.charAt(0);
Modified: branches/4.1.x/query/src/main/java/org/infinispan/query/backend/QueryInterceptor.java
===================================================================
--- branches/4.1.x/query/src/main/java/org/infinispan/query/backend/QueryInterceptor.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/query/src/main/java/org/infinispan/query/backend/QueryInterceptor.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -35,7 +35,6 @@
import org.infinispan.factories.annotations.Inject;
import org.infinispan.interceptors.base.CommandInterceptor;
import org.infinispan.marshall.MarshalledValue;
-import org.infinispan.util.logging.Log;
import javax.transaction.TransactionManager;
import java.io.Serializable;
Modified: branches/4.1.x/query/src/test/java/org/infinispan/query/test/AnotherGrassEater.java
===================================================================
--- branches/4.1.x/query/src/test/java/org/infinispan/query/test/AnotherGrassEater.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/query/src/test/java/org/infinispan/query/test/AnotherGrassEater.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -12,6 +12,7 @@
@ProvidedId(bridge = @FieldBridge(impl = StringBridge.class))
@Indexed(index = "anotherclass")
public class AnotherGrassEater implements Serializable {
+ private static final long serialVersionUID = -5685487467005726138L;
@Field(store = Store.YES)
private String name;
@Field(store = Store.YES)
Property changes on: branches/4.1.x/server/websocket
___________________________________________________________________
Name: svn:ignore
- target
+ target
.settings
.classpath
.project
Modified: branches/4.1.x/tree/src/main/java/org/infinispan/tree/TreeStructureSupport.java
===================================================================
--- branches/4.1.x/tree/src/main/java/org/infinispan/tree/TreeStructureSupport.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/tree/src/main/java/org/infinispan/tree/TreeStructureSupport.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -33,7 +33,7 @@
import org.infinispan.util.logging.LogFactory;
public class TreeStructureSupport extends AutoBatchSupport {
- private static Log log = LogFactory.getLog(TreeStructureSupport.class);
+ private static final Log log = LogFactory.getLog(TreeStructureSupport.class);
protected final Cache<NodeKey, AtomicMap<?, ?>> cache;
protected final InvocationContextContainer icc;
Modified: branches/4.1.x/tree/src/test/java/org/infinispan/api/tree/LazyDeserializationTreeCacheTest.java
===================================================================
--- branches/4.1.x/tree/src/test/java/org/infinispan/api/tree/LazyDeserializationTreeCacheTest.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/tree/src/test/java/org/infinispan/api/tree/LazyDeserializationTreeCacheTest.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -3,7 +3,6 @@
import org.infinispan.config.Configuration;
import org.infinispan.manager.EmbeddedCacheManager;
import org.infinispan.test.SingleCacheManagerTest;
-import org.infinispan.test.TestingUtil;
import org.infinispan.test.fwk.TestCacheManagerFactory;
import org.infinispan.tree.TreeCache;
import org.infinispan.tree.TreeCacheImpl;
Modified: branches/4.1.x/tree/src/test/java/org/infinispan/tx/TransactionManagerLookupTreeTest.java
===================================================================
--- branches/4.1.x/tree/src/test/java/org/infinispan/tx/TransactionManagerLookupTreeTest.java 2010-08-23 14:26:05 UTC (rev 2275)
+++ branches/4.1.x/tree/src/test/java/org/infinispan/tx/TransactionManagerLookupTreeTest.java 2010-08-23 17:55:55 UTC (rev 2276)
@@ -3,11 +3,8 @@
import org.infinispan.config.Configuration;
import org.infinispan.manager.DefaultCacheManager;
import org.infinispan.manager.EmbeddedCacheManager;
-import org.infinispan.test.AbstractInfinispanTest;
-import org.infinispan.test.SingleCacheManagerTest;
import org.infinispan.test.TestingUtil;
import org.infinispan.transaction.lookup.TransactionManagerLookup;
-import org.infinispan.tree.Fqn;
import org.infinispan.tree.TreeCache;
import org.infinispan.tree.TreeCacheFactory;
import org.testng.annotations.Test;
More information about the infinispan-commits
mailing list