[infinispan-commits] Infinispan SVN: r1467 - in trunk: cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje and 71 other directories.
infinispan-commits at lists.jboss.org
infinispan-commits at lists.jboss.org
Mon Feb 8 10:26:53 EST 2010
Author: manik.surtani at jboss.com
Date: 2010-02-08 10:26:50 -0500 (Mon, 08 Feb 2010)
New Revision: 1467
Removed:
trunk/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud/CloudConnectionException.java
Modified:
trunk/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/BdbjeCacheStore.java
trunk/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/BdbjeCacheStoreConfig.java
trunk/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/BdbjeCacheStoreTest.java
trunk/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/BdbjeLearningTest.java
trunk/cachestore/cloud/src/integrationtest/java/org/infinispan/loaders/cloud/CloudCacheStoreFunctionalIntegrationTest.java
trunk/cachestore/cloud/src/integrationtest/java/org/infinispan/loaders/cloud/CloudCacheStoreIntegrationTest.java
trunk/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud/CloudCacheStoreConfig.java
trunk/cachestore/cloud/src/test/java/org/infinispan/loaders/cloud/CloudCacheStoreTest.java
trunk/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/TableNameUniquenessTest.java
trunk/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/DefaultKey2StringMapperTest.java
trunk/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/JdbmCacheStore.java
trunk/core/src/main/java/org/infinispan/CacheDelegate.java
trunk/core/src/main/java/org/infinispan/commands/CommandsFactoryImpl.java
trunk/core/src/main/java/org/infinispan/commands/control/RehashControlCommand.java
trunk/core/src/main/java/org/infinispan/commands/read/EntrySetCommand.java
trunk/core/src/main/java/org/infinispan/commands/read/KeySetCommand.java
trunk/core/src/main/java/org/infinispan/commands/read/SizeCommand.java
trunk/core/src/main/java/org/infinispan/commands/read/ValuesCommand.java
trunk/core/src/main/java/org/infinispan/commands/tx/PrepareCommand.java
trunk/core/src/main/java/org/infinispan/config/AbstractConfigurationBean.java
trunk/core/src/main/java/org/infinispan/config/CacheLoaderManagerConfig.java
trunk/core/src/main/java/org/infinispan/config/CustomInterceptorConfig.java
trunk/core/src/main/java/org/infinispan/container/EntryFactoryImpl.java
trunk/core/src/main/java/org/infinispan/container/FIFODataContainer.java
trunk/core/src/main/java/org/infinispan/container/SimpleDataContainer.java
trunk/core/src/main/java/org/infinispan/container/entries/ExpiryHelper.java
trunk/core/src/main/java/org/infinispan/container/entries/InternalEntryFactory.java
trunk/core/src/main/java/org/infinispan/context/impl/AbstractInvocationContext.java
trunk/core/src/main/java/org/infinispan/distribution/ConsistentHashHelper.java
trunk/core/src/main/java/org/infinispan/distribution/LeaveTask.java
trunk/core/src/main/java/org/infinispan/factories/GlobalComponentRegistry.java
trunk/core/src/main/java/org/infinispan/factories/NamedExecutorsFactory.java
trunk/core/src/main/java/org/infinispan/interceptors/CacheMgmtInterceptor.java
trunk/core/src/main/java/org/infinispan/interceptors/CacheStoreInterceptor.java
trunk/core/src/main/java/org/infinispan/interceptors/DistCacheStoreInterceptor.java
trunk/core/src/main/java/org/infinispan/interceptors/TxInterceptor.java
trunk/core/src/main/java/org/infinispan/jmx/ResourceDMBean.java
trunk/core/src/main/java/org/infinispan/loaders/AbstractCacheStore.java
trunk/core/src/main/java/org/infinispan/loaders/decorators/SingletonStore.java
trunk/core/src/main/java/org/infinispan/loaders/file/FileCacheStore.java
trunk/core/src/main/java/org/infinispan/loaders/modifications/Modification.java
trunk/core/src/main/java/org/infinispan/loaders/modifications/Remove.java
trunk/core/src/main/java/org/infinispan/loaders/modifications/Store.java
trunk/core/src/main/java/org/infinispan/marshall/jboss/ConstantObjectTable.java
trunk/core/src/main/java/org/infinispan/marshall/jboss/JBossMarshaller.java
trunk/core/src/main/java/org/infinispan/remoting/ReplicationQueue.java
trunk/core/src/main/java/org/infinispan/remoting/responses/ClusteredGetResponseValidityFilter.java
trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/CommandAwareRpcDispatcher.java
trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsTransport.java
trunk/core/src/main/java/org/infinispan/transaction/TransactionLog.java
trunk/core/src/main/java/org/infinispan/transaction/xa/TransactionTable.java
trunk/core/src/main/java/org/infinispan/util/AbstractMap.java
trunk/core/src/main/java/org/infinispan/util/BidirectionalLinkedHashMap.java
trunk/core/src/main/java/org/infinispan/util/ClassFinder.java
trunk/core/src/main/java/org/infinispan/util/FastCopyHashMap.java
trunk/core/src/main/java/org/infinispan/util/FileLookup.java
trunk/core/src/main/java/org/infinispan/util/Immutables.java
trunk/core/src/main/java/org/infinispan/util/InfinispanCollections.java
trunk/core/src/main/java/org/infinispan/util/ReflectionUtil.java
trunk/core/src/main/java/org/infinispan/util/concurrent/BufferedConcurrentHashMap.java
trunk/core/src/main/java/org/infinispan/util/concurrent/ConcurrentHashSet.java
trunk/core/src/main/java/org/infinispan/util/concurrent/locks/OwnableReentrantLock.java
trunk/core/src/test/java/org/infinispan/api/CacheAPITest.java
trunk/core/src/test/java/org/infinispan/api/mvcc/LockTestBase.java
trunk/core/src/test/java/org/infinispan/api/mvcc/read_committed/ReadCommittedLockTest.java
trunk/core/src/test/java/org/infinispan/api/mvcc/repeatable_read/RepeatableReadLockTest.java
trunk/core/src/test/java/org/infinispan/api/mvcc/repeatable_read/WriteSkewTest.java
trunk/core/src/test/java/org/infinispan/atomic/APITest.java
trunk/core/src/test/java/org/infinispan/atomic/AtomicHashMapTestAssertions.java
trunk/core/src/test/java/org/infinispan/config/ConfigurationCloneTest.java
trunk/core/src/test/java/org/infinispan/distribution/BaseDistFunctionalTest.java
trunk/core/src/test/java/org/infinispan/distribution/SingleOwnerTest.java
trunk/core/src/test/java/org/infinispan/distribution/rehash/XAResourceAdapter.java
trunk/core/src/test/java/org/infinispan/eviction/BaseEvictionFunctionalTest.java
trunk/core/src/test/java/org/infinispan/eviction/EvictionManagerTest.java
trunk/core/src/test/java/org/infinispan/eviction/MarshalledValuesEvictionTest.java
trunk/core/src/test/java/org/infinispan/jmx/RpcManagerMBeanTest.java
trunk/core/src/test/java/org/infinispan/loaders/CacheLoaderFunctionalTest.java
trunk/core/src/test/java/org/infinispan/loaders/decorators/AsyncTest.java
trunk/core/src/test/java/org/infinispan/marshall/MarshalledValueTest.java
trunk/core/src/test/java/org/infinispan/marshall/VersionAwareMarshallerTest.java
trunk/core/src/test/java/org/infinispan/notifications/CacheListenerRemovalTest.java
trunk/core/src/test/java/org/infinispan/profiling/MemConsumptionTest.java
trunk/core/src/test/java/org/infinispan/replication/SyncCacheListenerTest.java
trunk/core/src/test/java/org/infinispan/test/TestingUtil.java
trunk/core/src/test/java/org/infinispan/test/data/Key.java
trunk/core/src/test/java/org/infinispan/test/fwk/JGroupsConfigBuilder.java
trunk/core/src/test/java/org/infinispan/util/VisitableBidirectionalLinkedHashSetTest.java
trunk/demos/ec2/src/main/java/org/infinispan/ec2demo/InfluenzaDataLoader.java
trunk/demos/ec2/src/main/java/org/infinispan/ec2demo/InfluenzaVirusCache.java
trunk/demos/ec2/src/main/java/org/infinispan/ec2demo/NucleotideCache.java
trunk/demos/ec2/src/main/java/org/infinispan/ec2demo/ProteinCache.java
trunk/demos/gui/src/main/java/org/infinispan/demo/InfinispanDemo.java
trunk/demos/lucene-directory/src/main/java/org/infinispan/lucenedemo/DemoActions.java
trunk/jopr-plugin/src/main/java/org/infinispan/jopr/CacheManagerComponent.java
trunk/lucene-directory/src/main/java/org/infinispan/lucene/InfinispanDirectory.java
trunk/lucene-directory/src/main/java/org/infinispan/lucene/InfinispanIndexIO.java
trunk/lucene-directory/src/test/java/org/infinispan/lucene/profiling/SharedState.java
trunk/query/src/main/java/org/infinispan/query/impl/CacheQueryImpl.java
trunk/query/src/test/java/org/infinispan/query/test/CustomKey2.java
trunk/query/src/test/java/org/infinispan/query/test/Person.java
trunk/server/memcached/src/main/java/org/infinispan/server/core/netty/memcached/NettyMemcachedDecoder.java
trunk/server/memcached/src/main/java/org/infinispan/server/memcached/commands/Value.java
trunk/server/memcached/src/test/java/org/infinispan/server/memcached/FunctionalTest.java
trunk/server/memcached/src/test/java/org/infinispan/server/memcached/test/MemcachedTestingUtil.java
trunk/src/main/resources/assemblies/all.xml
trunk/tools/src/main/java/org/infinispan/tools/doclet/config/ConfigDoclet.java
trunk/tools/src/main/java/org/infinispan/tools/doclet/config/ConfigHtmlGenerator.java
trunk/tools/src/main/java/org/infinispan/tools/doclet/html/HtmlGenerator.java
trunk/tools/src/main/java/org/infinispan/tools/doclet/jmx/JmxDoclet.java
trunk/tools/src/main/java/org/infinispan/tools/doclet/jmx/MBeanOperation.java
trunk/tools/src/main/java/org/infinispan/tools/jopr/RhqPluginXmlGenerator.java
trunk/tree/src/main/java/org/infinispan/tree/Fqn.java
trunk/tree/src/main/java/org/infinispan/tree/FqnComparator.java
trunk/tree/src/main/java/org/infinispan/tree/NodeNotValidException.java
trunk/tree/src/test/java/org/infinispan/api/tree/NodeMoveAPITest.java
Log:
IntelliJ Inspection refactoring
Modified: trunk/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/BdbjeCacheStore.java
===================================================================
--- trunk/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/BdbjeCacheStore.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/BdbjeCacheStore.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -396,7 +396,7 @@
// which could lead to unexpected results, hence, InternalCacheEntry calls are required
expiry = entry.getMaxIdle() + System.currentTimeMillis();
}
- Long at = new Long(expiry);
+ Long at = expiry;
Object key = entry.getKey();
expiryMap.put(at, key);
}
Modified: trunk/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/BdbjeCacheStoreConfig.java
===================================================================
--- trunk/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/BdbjeCacheStoreConfig.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/cachestore/bdbje/src/main/java/org/infinispan/loaders/bdbje/BdbjeCacheStoreConfig.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -32,6 +32,7 @@
private String catalogDbName;
private String expiryDbPrefix;
private String cacheName;
+ private static final long serialVersionUID = -2913308899139287416L;
public String getExpiryDbPrefix() {
return expiryDbPrefix;
Modified: trunk/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/BdbjeCacheStoreTest.java
===================================================================
--- trunk/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/BdbjeCacheStoreTest.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/BdbjeCacheStoreTest.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -357,7 +357,7 @@
InternalCacheEntry entry = InternalEntryFactory.create("key", "value");
expect(cacheMap.put(entry.getKey(), entry)).andReturn(null);
ObjectInput ois = createMock(ObjectInput.class);
- expect(ois.readLong()).andReturn(new Long(1));
+ expect(ois.readLong()).andReturn((long) 1);
com.sleepycat.je.Transaction txn = createMock(com.sleepycat.je.Transaction.class);
expect(currentTransaction.beginTransaction(null)).andReturn(txn);
cacheMap.clear();
Modified: trunk/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/BdbjeLearningTest.java
===================================================================
--- trunk/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/BdbjeLearningTest.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/cachestore/bdbje/src/test/java/org/infinispan/loaders/bdbje/BdbjeLearningTest.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -239,9 +239,8 @@
}
catch (Exception e) {
- CacheLoaderException cle = (e instanceof CacheLoaderException) ? (CacheLoaderException) e :
+ throw (e instanceof CacheLoaderException) ? (CacheLoaderException) e :
new CacheLoaderException("Problems reading from stream", e);
- throw cle;
}
}
Modified: trunk/cachestore/cloud/src/integrationtest/java/org/infinispan/loaders/cloud/CloudCacheStoreFunctionalIntegrationTest.java
===================================================================
--- trunk/cachestore/cloud/src/integrationtest/java/org/infinispan/loaders/cloud/CloudCacheStoreFunctionalIntegrationTest.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/cachestore/cloud/src/integrationtest/java/org/infinispan/loaders/cloud/CloudCacheStoreFunctionalIntegrationTest.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -54,7 +54,7 @@
secretKey = (JcloudsPassword == null) ? sysPassword : JcloudsPassword;
cs = (JcloudsService == null) ? sysService : JcloudsService;
- if (accessKey == null || accessKey.trim().equals("") || secretKey == null || secretKey.trim().equals("")) {
+ if (accessKey == null || accessKey.trim().length() == 0 || secretKey == null || secretKey.trim().length() == 0) {
accessKey = "dummy";
secretKey = "dummy";
}
Modified: trunk/cachestore/cloud/src/integrationtest/java/org/infinispan/loaders/cloud/CloudCacheStoreIntegrationTest.java
===================================================================
--- trunk/cachestore/cloud/src/integrationtest/java/org/infinispan/loaders/cloud/CloudCacheStoreIntegrationTest.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/cachestore/cloud/src/integrationtest/java/org/infinispan/loaders/cloud/CloudCacheStoreIntegrationTest.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -55,7 +55,7 @@
secretKey = (JcloudsPassword == null) ? sysPassword : JcloudsPassword;
service = (JcloudsService == null) ? sysService : JcloudsService;
- if (accessKey == null || accessKey.trim().equals("") || secretKey == null || secretKey.trim().equals("")) {
+ if (accessKey == null || accessKey.trim().length() == 0 || secretKey == null || secretKey.trim().length() == 0) {
accessKey = "dummy";
secretKey = "dummy";
}
@@ -103,11 +103,11 @@
super.setUp();
cs.clear();
Set entries = cs.loadAll();
- assert entries.size() == 0;
+ assert entries.isEmpty();
cs2 = createAnotherCacheStore();
cs2.clear();
entries = cs2.loadAll();
- assert entries.size() == 0;
+ assert entries.isEmpty();
}
Modified: trunk/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud/CloudCacheStoreConfig.java
===================================================================
--- trunk/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud/CloudCacheStoreConfig.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud/CloudCacheStoreConfig.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -35,6 +35,7 @@
private int maxConnections = 10000;
private boolean secure = true;
private String cloudServiceLocation = "DEFAULT";
+ private static final long serialVersionUID = -9011054600279256849L;
public CloudCacheStoreConfig() {
setCacheLoaderClassName(CloudCacheStore.class.getName());
Deleted: trunk/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud/CloudConnectionException.java
===================================================================
--- trunk/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud/CloudConnectionException.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/cachestore/cloud/src/main/java/org/infinispan/loaders/cloud/CloudConnectionException.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -1,20 +0,0 @@
-package org.infinispan.loaders.cloud;
-
-import org.infinispan.loaders.CacheLoaderException;
-
-public class CloudConnectionException extends CacheLoaderException {
- public CloudConnectionException() {
- }
-
- public CloudConnectionException(Throwable cause) {
- super(cause);
- }
-
- public CloudConnectionException(String message) {
- super(message);
- }
-
- public CloudConnectionException(String message, Throwable cause) {
- super(message, cause);
- }
-}
Modified: trunk/cachestore/cloud/src/test/java/org/infinispan/loaders/cloud/CloudCacheStoreTest.java
===================================================================
--- trunk/cachestore/cloud/src/test/java/org/infinispan/loaders/cloud/CloudCacheStoreTest.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/cachestore/cloud/src/test/java/org/infinispan/loaders/cloud/CloudCacheStoreTest.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -53,11 +53,11 @@
super.setUp();
cs.clear();
Set entries = cs.loadAll();
- assert entries.size() == 0;
+ assert entries.isEmpty();
cs2 = createAnotherCacheStore();
cs2.clear();
entries = cs2.loadAll();
- assert entries.size() == 0;
+ assert entries.isEmpty();
}
@@ -121,6 +121,7 @@
private static class ObjectWithNegativeHashcode implements Serializable {
String s = "hello";
+ private static final long serialVersionUID = 5010691348616186237L;
@Override
public boolean equals(Object o) {
Modified: trunk/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/TableNameUniquenessTest.java
===================================================================
--- trunk/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/TableNameUniquenessTest.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/TableNameUniquenessTest.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -112,6 +112,7 @@
static class Person implements Serializable {
int age;
String name;
+ private static final long serialVersionUID = 4227565864228124235L;
Person(int age, String name) {
this.age = age;
Modified: trunk/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/DefaultKey2StringMapperTest.java
===================================================================
--- trunk/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/DefaultKey2StringMapperTest.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/cachestore/jdbc/src/test/java/org/infinispan/loaders/jdbc/stringbased/DefaultKey2StringMapperTest.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -46,7 +46,7 @@
@SuppressWarnings(value = "all")
public void testGetStingMapping() {
- Object[] toTest = {new Integer(0), new Byte("1"), new Short("2"), new Long(3), new Double("3.4"), new Float("3.5"), Boolean.FALSE, "some string"};
+ Object[] toTest = {0, new Byte("1"), new Short("2"), (long) 3, new Double("3.4"), new Float("3.5"), Boolean.FALSE, "some string"};
for (Object o : toTest) {
assert mapper.getStringMapping(o).equals(o.toString());
}
Modified: trunk/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/JdbmCacheStore.java
===================================================================
--- trunk/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/JdbmCacheStore.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/cachestore/jdbm/src/main/java/org/infinispan/loaders/jdbm/JdbmCacheStore.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -60,7 +60,7 @@
private static final String NAME = "CacheLoader";
private static final String EXPIRY = "Expiry";
- private final String DATE = "HH:mm:ss.SSS";
+ private static final String DATE = "HH:mm:ss.SSS";
private BlockingQueue<ExpiryEntry> expiryEntryQueue;
@@ -175,7 +175,7 @@
private void createTree() throws IOException {
tree = HTree.createInstance(recman);
- expiryTree = BTree.createInstance(recman, new NaturalComparator(), (Serializer) null, (Serializer) null);
+ expiryTree = BTree.createInstance(recman, new NaturalComparator(), null, null);
recman.setNamedObject(NAME, tree.getRecid());
recman.setNamedObject(EXPIRY, expiryTree.getRecid());
setSerializer();
@@ -276,7 +276,7 @@
// which could lead to unexpected results, hence, InternalCacheEntry calls are required
expiry = entry.getMaxIdle() + System.currentTimeMillis();
}
- Long at = new Long(expiry);
+ Long at = expiry;
Object key = entry.getKey();
if (trace) log.trace("at " + new SimpleDateFormat(DATE).format(new Date(at)) + " expire " + key);
@@ -494,12 +494,12 @@
}
}
- private final class ExpiryEntry {
+ private static final class ExpiryEntry {
private final Long expiry;
private final Object key;
private ExpiryEntry(long expiry, Object key) {
- this.expiry = new Long(expiry);
+ this.expiry = expiry;
this.key = key;
}
}
Modified: trunk/core/src/main/java/org/infinispan/CacheDelegate.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/CacheDelegate.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/main/java/org/infinispan/CacheDelegate.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -161,7 +161,7 @@
}
public final boolean remove(Object key, Object value) {
- InvocationContext ctx = getInvocationContext();
+ InvocationContext ctx = getInvocationContext(false);
RemoveCommand command = commandsFactory.buildRemoveCommand(key, value);
return (Boolean) invoker.invoke(ctx, command);
}
@@ -184,7 +184,7 @@
}
public final boolean containsKey(Object key) {
- InvocationContext ctx = getInvocationContext();
+ InvocationContext ctx = getInvocationContext(false);
GetKeyValueCommand command = commandsFactory.buildGetKeyValueCommand(key);
Object response = invoker.invoke(ctx, command);
return response != null;
@@ -196,7 +196,7 @@
@SuppressWarnings("unchecked")
public final V get(Object key) {
- InvocationContext ctx = getInvocationContext();
+ InvocationContext ctx = getInvocationContext(false);
GetKeyValueCommand command = commandsFactory.buildGetKeyValueCommand(key);
return (V) invoker.invoke(ctx, command);
}
@@ -207,7 +207,7 @@
@SuppressWarnings("unchecked")
public final V remove(Object key) {
- InvocationContext ctx = getInvocationContext();
+ InvocationContext ctx = getInvocationContext(false);
RemoveCommand command = commandsFactory.buildRemoveCommand(key, null);
return (V) invoker.invoke(ctx, command);
}
@@ -217,7 +217,7 @@
}
public final void clear() {
- InvocationContext ctx = getInvocationContext();
+ InvocationContext ctx = getInvocationContext(false);
ClearCommand command = commandsFactory.buildClearCommand();
invoker.invoke(ctx, command);
}
@@ -257,13 +257,13 @@
if (ongoingTransaction != null) transactionManager.resume(ongoingTransaction);
}
catch (Exception e) {
- log.debug("Had problems trying to resume a transaction after putForExternalread()", e);
+ log.debug("Had problems trying to resume a transaction after putForExternalRead()", e);
}
}
}
public final void evict(K key) {
- InvocationContext ctx = getInvocationContext();
+ InvocationContext ctx = getInvocationContext(true);
EvictCommand command = commandsFactory.buildEvictCommand(key);
invoker.invoke(ctx, command);
}
@@ -284,8 +284,8 @@
return notifier.getListeners();
}
- private InvocationContext getInvocationContext() {
- InvocationContext ctx = icc.createInvocationContext();
+ private InvocationContext getInvocationContext(boolean forceNonTransactional) {
+ InvocationContext ctx = forceNonTransactional ? icc.createNonTxInvocationContext() : icc.createInvocationContext();
PreInvocationContext pic = flagHolder.get();
if (pic != null && !pic.flags.isEmpty()) ctx.setFlags(pic.flags);
flagHolder.remove();
@@ -302,7 +302,7 @@
if (keys == null || keys.isEmpty())
throw new IllegalArgumentException("Cannot lock empty list of keys");
LockControlCommand command = commandsFactory.buildLockControlCommand(keys, false);
- invoker.invoke(getInvocationContext(), command);
+ invoker.invoke(getInvocationContext(false), command);
}
@ManagedOperation(description = "Starts the cache.")
@@ -429,14 +429,14 @@
@SuppressWarnings("unchecked")
public final V put(K key, V value, long lifespan, TimeUnit lifespanUnit, long maxIdleTime, TimeUnit idleTimeUnit) {
- InvocationContext ctx = getInvocationContext();
+ InvocationContext ctx = getInvocationContext(false);
PutKeyValueCommand command = commandsFactory.buildPutKeyValueCommand(key, value, lifespanUnit.toMillis(lifespan), idleTimeUnit.toMillis(maxIdleTime));
return (V) invoker.invoke(ctx, command);
}
@SuppressWarnings("unchecked")
public final V putIfAbsent(K key, V value, long lifespan, TimeUnit lifespanUnit, long maxIdleTime, TimeUnit idleTimeUnit) {
- InvocationContext context = getInvocationContext();
+ InvocationContext context = getInvocationContext(false);
PutKeyValueCommand command = commandsFactory.buildPutKeyValueCommand(key, value, lifespanUnit.toMillis(lifespan), idleTimeUnit.toMillis(maxIdleTime));
command.setPutIfAbsent(true);
return (V) invoker.invoke(context, command);
@@ -444,19 +444,19 @@
public final void putAll(Map<? extends K, ? extends V> map, long lifespan, TimeUnit lifespanUnit, long maxIdleTime, TimeUnit idleTimeUnit) {
PutMapCommand command = commandsFactory.buildPutMapCommand(map, lifespanUnit.toMillis(lifespan), idleTimeUnit.toMillis(maxIdleTime));
- invoker.invoke(getInvocationContext(), command);
+ invoker.invoke(getInvocationContext(false), command);
}
@SuppressWarnings("unchecked")
public final V replace(K key, V value, long lifespan, TimeUnit lifespanUnit, long maxIdleTime, TimeUnit idleTimeUnit) {
- InvocationContext ctx = getInvocationContext();
+ InvocationContext ctx = getInvocationContext(false);
ReplaceCommand command = commandsFactory.buildReplaceCommand(key, null, value, lifespanUnit.toMillis(lifespan), idleTimeUnit.toMillis(maxIdleTime));
return (V) invoker.invoke(ctx, command);
}
public final boolean replace(K key, V oldValue, V value, long lifespan, TimeUnit lifespanUnit, long maxIdleTime, TimeUnit idleTimeUnit) {
- InvocationContext ctx = getInvocationContext();
+ InvocationContext ctx = getInvocationContext(false);
ReplaceCommand command = commandsFactory.buildReplaceCommand(key, oldValue, value, lifespanUnit.toMillis(lifespan), idleTimeUnit.toMillis(maxIdleTime));
return (Boolean) invoker.invoke(ctx, command);
}
@@ -517,7 +517,7 @@
}
public final NotifyingFuture<V> putAsync(K key, V value, long lifespan, TimeUnit lifespanUnit, long maxIdle, TimeUnit maxIdleUnit) {
- InvocationContext ctx = getInvocationContext();
+ InvocationContext ctx = getInvocationContext(false);
ctx.setUseFutureReturnType(true);
PutKeyValueCommand command = commandsFactory.buildPutKeyValueCommand(key, value, lifespanUnit.toMillis(lifespan), maxIdleUnit.toMillis(maxIdle));
return wrapInFuture(invoker.invoke(ctx, command));
@@ -532,14 +532,14 @@
}
public final NotifyingFuture<Void> putAllAsync(Map<? extends K, ? extends V> data, long lifespan, TimeUnit lifespanUnit, long maxIdle, TimeUnit maxIdleUnit) {
- InvocationContext ctx = getInvocationContext();
+ InvocationContext ctx = getInvocationContext(false);
ctx.setUseFutureReturnType(true);
PutMapCommand command = commandsFactory.buildPutMapCommand(data, lifespanUnit.toMillis(lifespan), maxIdleUnit.toMillis(maxIdle));
return wrapInFuture(invoker.invoke(ctx, command));
}
public final NotifyingFuture<Void> clearAsync() {
- InvocationContext ctx = getInvocationContext();
+ InvocationContext ctx = getInvocationContext(false);
ctx.setUseFutureReturnType(true);
ClearCommand command = commandsFactory.buildClearCommand();
return wrapInFuture(invoker.invoke(ctx, command));
@@ -554,7 +554,7 @@
}
public final NotifyingFuture<V> putIfAbsentAsync(K key, V value, long lifespan, TimeUnit lifespanUnit, long maxIdle, TimeUnit maxIdleUnit) {
- InvocationContext ctx = getInvocationContext();
+ InvocationContext ctx = getInvocationContext(false);
ctx.setUseFutureReturnType(true);
PutKeyValueCommand command = commandsFactory.buildPutKeyValueCommand(key, value, lifespanUnit.toMillis(lifespan), maxIdleUnit.toMillis(maxIdle));
command.setPutIfAbsent(true);
@@ -562,14 +562,14 @@
}
public final NotifyingFuture<V> removeAsync(Object key) {
- InvocationContext ctx = getInvocationContext();
+ InvocationContext ctx = getInvocationContext(false);
ctx.setUseFutureReturnType(true);
RemoveCommand command = commandsFactory.buildRemoveCommand(key, null);
return wrapInFuture(invoker.invoke(ctx, command));
}
public final NotifyingFuture<Boolean> removeAsync(Object key, Object value) {
- InvocationContext ctx = getInvocationContext();
+ InvocationContext ctx = getInvocationContext(false);
ctx.setUseFutureReturnType(true);
RemoveCommand command = commandsFactory.buildRemoveCommand(key, value);
return wrapInFuture(invoker.invoke(ctx, command));
@@ -584,7 +584,7 @@
}
public final NotifyingFuture<V> replaceAsync(K key, V value, long lifespan, TimeUnit lifespanUnit, long maxIdle, TimeUnit maxIdleUnit) {
- InvocationContext ctx = getInvocationContext();
+ InvocationContext ctx = getInvocationContext(false);
ctx.setUseFutureReturnType(true);
ReplaceCommand command = commandsFactory.buildReplaceCommand(key, null, value, lifespanUnit.toMillis(lifespan), maxIdleUnit.toMillis(maxIdle));
return wrapInFuture(invoker.invoke(ctx, command));
@@ -599,7 +599,7 @@
}
public final NotifyingFuture<Boolean> replaceAsync(K key, V oldValue, V newValue, long lifespan, TimeUnit lifespanUnit, long maxIdle, TimeUnit maxIdleUnit) {
- InvocationContext ctx = getInvocationContext();
+ InvocationContext ctx = getInvocationContext(false);
ctx.setUseFutureReturnType(true);
ReplaceCommand command = commandsFactory.buildReplaceCommand(key, oldValue, newValue, lifespanUnit.toMillis(lifespan), maxIdleUnit.toMillis(maxIdle));
return wrapInFuture(invoker.invoke(ctx, command));
Modified: trunk/core/src/main/java/org/infinispan/commands/CommandsFactoryImpl.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/CommandsFactoryImpl.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/main/java/org/infinispan/commands/CommandsFactoryImpl.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -176,8 +176,7 @@
}
public EvictCommand buildEvictCommand(Object key) {
- EvictCommand command = new EvictCommand(key, notifier);
- return command;
+ return new EvictCommand(key, notifier);
}
public PrepareCommand buildPrepareCommand(GlobalTransaction gtx, List<WriteCommand> modifications, boolean onePhaseCommit) {
Modified: trunk/core/src/main/java/org/infinispan/commands/control/RehashControlCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/control/RehashControlCommand.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/main/java/org/infinispan/commands/control/RehashControlCommand.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -155,7 +155,7 @@
// if the current address is the current "owner" of this key (in old_ch), and the requestor is in the owner list
// in new_ch, then add this to the map.
List<Address> oldOwnerList = oldCH.locate(k, numCopies);
- if (oldOwnerList.size() > 0 && self.equals(oldOwnerList.get(0))) {
+ if (!oldOwnerList.isEmpty() && self.equals(oldOwnerList.get(0))) {
List<Address> newOwnerList = consistentHash.locate(k, numCopies);
if (newOwnerList.contains(sender)) return true;
}
Modified: trunk/core/src/main/java/org/infinispan/commands/read/EntrySetCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/read/EntrySetCommand.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/main/java/org/infinispan/commands/read/EntrySetCommand.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -37,6 +37,7 @@
* @since 4.0
*/
public class EntrySetCommand implements VisitableCommand, LocalCommand {
+ private static final Object[] EMPTY_ARRAY = new Object[0];
private final DataContainer container;
public EntrySetCommand(DataContainer container) {
@@ -56,7 +57,7 @@
}
public Object[] getParameters() {
- return new Object[0]; // no-op
+ return EMPTY_ARRAY; // no-op
}
public void setParameters(int commandId, Object[] parameters) {
Modified: trunk/core/src/main/java/org/infinispan/commands/read/KeySetCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/read/KeySetCommand.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/main/java/org/infinispan/commands/read/KeySetCommand.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -38,6 +38,7 @@
*/
public class KeySetCommand implements VisitableCommand, LocalCommand {
private final DataContainer container;
+ private static final Object[] EMPTY_ARRAY = new Object[0];
public KeySetCommand(DataContainer container) {
this.container = container;
@@ -56,7 +57,7 @@
}
public Object[] getParameters() {
- return new Object[0]; // no-op
+ return EMPTY_ARRAY; // no-op
}
public void setParameters(int commandId, Object[] parameters) {
Modified: trunk/core/src/main/java/org/infinispan/commands/read/SizeCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/read/SizeCommand.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/main/java/org/infinispan/commands/read/SizeCommand.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -35,6 +35,7 @@
*/
public class SizeCommand implements VisitableCommand, LocalCommand {
private final DataContainer container;
+ private static final Object[] EMPTY_ARRAY = new Object[0];
public SizeCommand(DataContainer container) {
this.container = container;
@@ -53,7 +54,7 @@
}
public Object[] getParameters() {
- return new Object[0]; // no-op
+ return EMPTY_ARRAY; // no-op
}
public void setParameters(int commandId, Object[] parameters) {
Modified: trunk/core/src/main/java/org/infinispan/commands/read/ValuesCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/read/ValuesCommand.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/main/java/org/infinispan/commands/read/ValuesCommand.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -38,6 +38,7 @@
*/
public class ValuesCommand implements VisitableCommand, LocalCommand {
private final DataContainer container;
+ private static final Object[] EMPTY_ARRAY = new Object[0];
public ValuesCommand(DataContainer container) {
this.container = container;
@@ -56,7 +57,7 @@
}
public Object[] getParameters() {
- return new Object[0]; // no-op
+ return EMPTY_ARRAY; // no-op
}
public void setParameters(int commandId, Object[] parameters) {
Modified: trunk/core/src/main/java/org/infinispan/commands/tx/PrepareCommand.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/commands/tx/PrepareCommand.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/main/java/org/infinispan/commands/tx/PrepareCommand.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -73,7 +73,7 @@
public PrepareCommand(GlobalTransaction gtx, List<WriteCommand> commands, boolean onePhaseCommit) {
this.globalTx = gtx;
- this.modifications = commands == null || commands.size() == 0 ? null : commands.toArray(new WriteCommand[commands.size()]);
+ this.modifications = commands == null || commands.isEmpty() ? null : commands.toArray(new WriteCommand[commands.size()]);
this.onePhaseCommit = onePhaseCommit;
}
Modified: trunk/core/src/main/java/org/infinispan/config/AbstractConfigurationBean.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/AbstractConfigurationBean.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/main/java/org/infinispan/config/AbstractConfigurationBean.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -118,7 +118,6 @@
@Override
public CloneableConfigurationComponent clone() throws CloneNotSupportedException {
- AbstractConfigurationBean c = (AbstractConfigurationBean) super.clone();
- return c;
+ return (AbstractConfigurationBean) super.clone();
}
}
Modified: trunk/core/src/main/java/org/infinispan/config/CacheLoaderManagerConfig.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/CacheLoaderManagerConfig.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/main/java/org/infinispan/config/CacheLoaderManagerConfig.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -139,7 +139,7 @@
}
public CacheLoaderConfig getFirstCacheLoaderConfig() {
- if (cacheLoaderConfigs.size() == 0)
+ if (cacheLoaderConfigs.isEmpty())
return null;
return cacheLoaderConfigs.get(0);
}
Modified: trunk/core/src/main/java/org/infinispan/config/CustomInterceptorConfig.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/config/CustomInterceptorConfig.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/main/java/org/infinispan/config/CustomInterceptorConfig.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -336,7 +336,7 @@
}
enum Position {
- FIRST,LAST;
+ FIRST,LAST
}
public void accept(ConfigurationBeanVisitor v) {
Modified: trunk/core/src/main/java/org/infinispan/container/EntryFactoryImpl.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/container/EntryFactoryImpl.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/main/java/org/infinispan/container/EntryFactoryImpl.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -110,7 +110,7 @@
return wrapEntryForWriting(ctx, entry.getKey(), entry, createIfAbsent, forceLockIfAbsent, alreadyLocked, forRemoval);
}
- private final MVCCEntry wrapEntryForWriting(InvocationContext ctx, Object key, InternalCacheEntry entry, boolean createIfAbsent, boolean forceLockIfAbsent, boolean alreadyLocked, boolean forRemoval) throws InterruptedException {
+ private MVCCEntry wrapEntryForWriting(InvocationContext ctx, Object key, InternalCacheEntry entry, boolean createIfAbsent, boolean forceLockIfAbsent, boolean alreadyLocked, boolean forRemoval) throws InterruptedException {
CacheEntry cacheEntry = ctx.lookupEntry(key);
MVCCEntry mvccEntry = null;
if (createIfAbsent && cacheEntry != null && cacheEntry.isNull()) cacheEntry = null;
Modified: trunk/core/src/main/java/org/infinispan/container/FIFODataContainer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/container/FIFODataContainer.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/main/java/org/infinispan/container/FIFODataContainer.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -467,7 +467,7 @@
setTable(new HashEntry[initialCapacity]);
}
- static final Segment[] newArray(int i) {
+ static Segment[] newArray(int i) {
return new Segment[i];
}
Modified: trunk/core/src/main/java/org/infinispan/container/SimpleDataContainer.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/container/SimpleDataContainer.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/main/java/org/infinispan/container/SimpleDataContainer.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -231,7 +231,7 @@
}
}
- private class MortalInmortalIterator {
+ private static class MortalInmortalIterator {
Iterator<Iterator<InternalCacheEntry>> metaIterator;
Iterator<InternalCacheEntry> currentIterator;
Modified: trunk/core/src/main/java/org/infinispan/container/entries/ExpiryHelper.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/container/entries/ExpiryHelper.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/main/java/org/infinispan/container/entries/ExpiryHelper.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -7,15 +7,15 @@
* @since 4.0
*/
class ExpiryHelper {
- static final boolean isExpiredMortal(long lifespan, long created) {
+ static boolean isExpiredMortal(long lifespan, long created) {
return lifespan > -1 && created > -1 && System.currentTimeMillis() > created + lifespan;
}
- static final boolean isExpiredTransient(long maxIdle, long lastUsed) {
+ static boolean isExpiredTransient(long maxIdle, long lastUsed) {
return maxIdle > -1 && lastUsed > -1 && System.currentTimeMillis() > maxIdle + lastUsed;
}
- static final boolean isExpiredTransientMortal(long maxIdle, long lastUsed, long lifespan, long created) {
+ static boolean isExpiredTransientMortal(long maxIdle, long lastUsed, long lifespan, long created) {
return isExpiredTransient(maxIdle, lastUsed) || isExpiredMortal(lifespan, created);
}
}
Modified: trunk/core/src/main/java/org/infinispan/container/entries/InternalEntryFactory.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/container/entries/InternalEntryFactory.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/main/java/org/infinispan/container/entries/InternalEntryFactory.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -15,33 +15,33 @@
this.recordLastUsed = recordLastUsed;
}
- public static final InternalCacheEntry create(Object key, Object value) {
+ public static InternalCacheEntry create(Object key, Object value) {
return new ImmortalCacheEntry(key, value);
}
- public static final InternalCacheEntry create(Object key, Object value, long lifespan) {
+ public static InternalCacheEntry create(Object key, Object value, long lifespan) {
return lifespan > -1 ? new MortalCacheEntry(key, value, lifespan) : new ImmortalCacheEntry(key, value);
}
- public static final InternalCacheEntry create(Object key, Object value, long lifespan, long maxIdle) {
+ public static InternalCacheEntry create(Object key, Object value, long lifespan, long maxIdle) {
if (lifespan < 0 && maxIdle < 0) return new ImmortalCacheEntry(key, value);
if (lifespan > -1 && maxIdle < 0) return new MortalCacheEntry(key, value, lifespan);
if (lifespan < 0 && maxIdle > -1) return new TransientCacheEntry(key, value, maxIdle);
return new TransientMortalCacheEntry(key, value, maxIdle, lifespan);
}
- public static final InternalCacheEntry create(Object key, Object value, long created, long lifespan, long lastUsed, long maxIdle) {
+ public static InternalCacheEntry create(Object key, Object value, long created, long lifespan, long lastUsed, long maxIdle) {
if (lifespan < 0 && maxIdle < 0) return new ImmortalCacheEntry(key, value);
if (lifespan > -1 && maxIdle < 0) return new MortalCacheEntry(key, value, lifespan, created);
if (lifespan < 0 && maxIdle > -1) return new TransientCacheEntry(key, value, maxIdle, lastUsed);
return new TransientMortalCacheEntry(key, value, maxIdle, lifespan, lastUsed, created);
}
- public static final InternalCacheValue createValue(Object v) {
+ public static InternalCacheValue createValue(Object v) {
return new ImmortalCacheValue(v);
}
- public static final InternalCacheValue createValue(Object v, long created, long lifespan, long lastUsed, long maxIdle) {
+ public static InternalCacheValue createValue(Object v, long created, long lifespan, long lastUsed, long maxIdle) {
if (lifespan < 0 && maxIdle < 0) return new ImmortalCacheValue(v);
if (lifespan > -1 && maxIdle < 0) return new MortalCacheValue(v, created, lifespan);
if (lifespan < 0 && maxIdle > -1) return new TransientCacheValue(v, maxIdle, lastUsed);
Modified: trunk/core/src/main/java/org/infinispan/context/impl/AbstractInvocationContext.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/context/impl/AbstractInvocationContext.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/main/java/org/infinispan/context/impl/AbstractInvocationContext.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -98,7 +98,7 @@
}
public void setFlags(Collection<Flag> flags) {
- if (flags == null || flags.size() == 0) return;
+ if (flags == null || flags.isEmpty()) return;
if (this.flags == null)
this.flags = EnumSet.copyOf(flags);
else
Modified: trunk/core/src/main/java/org/infinispan/distribution/ConsistentHashHelper.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/distribution/ConsistentHashHelper.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/main/java/org/infinispan/distribution/ConsistentHashHelper.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -124,7 +124,7 @@
*/
public static ConsistentHash createConsistentHash(Class<? extends ConsistentHash> clazz, List<Address> addresses) throws IllegalAccessException, InstantiationException, ClassNotFoundException {
ConsistentHash ch = Util.getInstance(clazz);
- if (addresses != null && addresses.size() > 0) ch.setCaches(addresses);
+ if (addresses != null && !addresses.isEmpty()) ch.setCaches(addresses);
return ch;
}
Modified: trunk/core/src/main/java/org/infinispan/distribution/LeaveTask.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/distribution/LeaveTask.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/main/java/org/infinispan/distribution/LeaveTask.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -71,7 +71,7 @@
CacheStore cs = dmi.getCacheStoreForRehashing();
if (cs != null) {
if (log.isTraceEnabled()) log.trace("Examining state in cache store");
- for (InternalCacheEntry ice : cs.loadAll()) if (!statemap.containsKey(ice.getKey())) statemap.addState(ice);
+ for (InternalCacheEntry ice : cs.loadAll()) if (statemap.doesNotContainKey(ice.getKey())) statemap.addState(ice);
}
// push state.
@@ -256,8 +256,8 @@
keysHandled.add(key);
}
- boolean containsKey(Object key) {
- return keysHandled.contains(key);
+ boolean doesNotContainKey(Object key) {
+ return !keysHandled.contains(key);
}
}
Modified: trunk/core/src/main/java/org/infinispan/factories/GlobalComponentRegistry.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/factories/GlobalComponentRegistry.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/main/java/org/infinispan/factories/GlobalComponentRegistry.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -77,7 +77,7 @@
@Override
protected void addShutdownHook() {
ArrayList al = MBeanServerFactory.findMBeanServer(null);
- boolean registerShutdownHook = (globalConfiguration.getShutdownHookBehavior() == DEFAULT && al.size() == 0)
+ boolean registerShutdownHook = (globalConfiguration.getShutdownHookBehavior() == DEFAULT && al.isEmpty())
|| globalConfiguration.getShutdownHookBehavior() == REGISTER;
if (registerShutdownHook) {
Modified: trunk/core/src/main/java/org/infinispan/factories/NamedExecutorsFactory.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/factories/NamedExecutorsFactory.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/main/java/org/infinispan/factories/NamedExecutorsFactory.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -66,11 +66,11 @@
}
private void setDefaultThreadPrio(int prio, Properties props) {
- if (!props.containsKey("threadPriority")) props.setProperty("threadPriority", "" + prio);
+ if (!props.containsKey("threadPriority")) props.setProperty("threadPriority", String.valueOf(prio));
}
private void setDefaultThreads(int numThreads, Properties props) {
- if (!props.containsKey("maxThreads")) props.setProperty("maxThreads", "" + numThreads);
+ if (!props.containsKey("maxThreads")) props.setProperty("maxThreads", String.valueOf(numThreads));
}
private void setComponentName(String cn, Properties p) {
Modified: trunk/core/src/main/java/org/infinispan/interceptors/CacheMgmtInterceptor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/interceptors/CacheMgmtInterceptor.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/main/java/org/infinispan/interceptors/CacheMgmtInterceptor.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -99,7 +99,7 @@
Object retval = invokeNextInterceptor(ctx, command);
long t2 = System.currentTimeMillis();
- if (data != null && data.size() > 0) {
+ if (data != null && !data.isEmpty()) {
storeTimes.getAndAdd(t2 - t1);
stores.getAndAdd(data.size());
}
Modified: trunk/core/src/main/java/org/infinispan/interceptors/CacheStoreInterceptor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/interceptors/CacheStoreInterceptor.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/main/java/org/infinispan/interceptors/CacheStoreInterceptor.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -237,7 +237,7 @@
throw new Exception("transactionContext for transaction " + gtx + " not found in transaction table");
}
List<WriteCommand> modifications = transactionContext.getModifications();
- if (modifications.size() == 0) {
+ if (modifications.isEmpty()) {
if (trace) log.trace("Transaction has not logged any modifications!");
return;
}
Modified: trunk/core/src/main/java/org/infinispan/interceptors/DistCacheStoreInterceptor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/interceptors/DistCacheStoreInterceptor.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/main/java/org/infinispan/interceptors/DistCacheStoreInterceptor.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -146,7 +146,7 @@
/**
* Method that skips invocation if: - No store defined or, - The context contains Flag.SKIP_CACHE_STORE or,
*/
- private final boolean skip(InvocationContext ctx) {
+ private boolean skip(InvocationContext ctx) {
if (store == null) return true; // could be because the cache loader oes not implement cache store
if (ctx.hasFlag(Flag.SKIP_CACHE_STORE)) {
if (trace)
Modified: trunk/core/src/main/java/org/infinispan/interceptors/TxInterceptor.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/interceptors/TxInterceptor.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/main/java/org/infinispan/interceptors/TxInterceptor.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -177,9 +177,7 @@
if (shouldEnlist(ctx)) {
xaAdapter = enlist(ctx);
LocalTxInvocationContext localTxContext = (LocalTxInvocationContext) ctx;
- if (!isLocalModeForced(ctx)) {
- shouldAddMod = true;
- }
+ if (localModeNotForced(ctx)) shouldAddMod = true;
localTxContext.setXaCache(xaAdapter);
}
Object rv = invokeNextInterceptor(ctx, command);
@@ -193,25 +191,25 @@
Transaction transaction = tm.getTransaction();
if (transaction == null) throw new IllegalStateException("This should only be called in an tx scope");
int status = transaction.getStatus();
- if (!isValid(status)) throw new IllegalStateException("Transaction " + transaction +
+ if (isNotValid(status)) throw new IllegalStateException("Transaction " + transaction +
" is not in a valid state to be invoking cache operations on.");
return txTable.getOrCreateXaAdapter(transaction, ctx);
}
- private boolean isValid(int status) {
- return status == Status.STATUS_ACTIVE || status == Status.STATUS_PREPARING;
+ private boolean isNotValid(int status) {
+ return status != Status.STATUS_ACTIVE && status != Status.STATUS_PREPARING;
}
private boolean shouldEnlist(InvocationContext ctx) {
return ctx.isInTxScope() && ctx.isOriginLocal();
}
- private boolean isLocalModeForced(InvocationContext icx) {
+ private boolean localModeNotForced(InvocationContext icx) {
if (icx.hasFlag(Flag.CACHE_MODE_LOCAL)) {
if (trace) log.debug("LOCAL mode forced on invocation. Suppressing clustered events.");
- return true;
+ return false;
}
- return false;
+ return true;
}
@ManagedOperation(description = "Resets statistics gathered by this component")
Modified: trunk/core/src/main/java/org/infinispan/jmx/ResourceDMBean.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/jmx/ResourceDMBean.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/main/java/org/infinispan/jmx/ResourceDMBean.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -106,7 +106,7 @@
ops.toArray(opInfos);
if (log.isTraceEnabled()) {
- if (ops.size() > 0)
+ if (!ops.isEmpty())
log.trace("Operations are:");
for (MBeanOperationInfo op : opInfos) {
log.trace("Operation " + op.getReturnType() + " " + op.getName());
@@ -177,15 +177,15 @@
public synchronized AttributeList setAttributes(AttributeList list) {
AttributeList results = new AttributeList();
- for (int i = 0; i < list.size(); i++) {
- Attribute attr = (Attribute) list.get(i);
+ for (Object aList : list) {
+ Attribute attr = (Attribute) aList;
if (setNamedAttribute(attr)) {
results.add(attr);
} else {
if (log.isWarnEnabled()) {
log.warn("Failed to update attribute name " + attr.getName() + " with value "
- + attr.getValue());
+ + attr.getValue());
}
}
}
@@ -225,15 +225,10 @@
public static Class<?> getClassForName(String name) throws ClassNotFoundException {
try {
- Class<?> c = Util.loadClass(name);
- return c;
+ return (Class<?>) Util.loadClass(name);
} catch (ClassNotFoundException cnfe) {
// Could be a primitive - let's check
- for (int i = 0; i < primitives.length; i++) {
- if (name.equals(primitives[i].getName())) {
- return primitives[i];
- }
- }
+ for (Class<?> primitive : primitives) if (name.equals(primitive.getName())) return primitive;
}
throw new ClassNotFoundException("Class " + name + " cannot be found");
}
@@ -382,8 +377,8 @@
if (attr != null) {
String fieldName = renameToJavaCodingConvention(field.getName());
MBeanAttributeInfo info = new MBeanAttributeInfo(fieldName, field.getType()
- .getCanonicalName(), attr.description(), true, Modifier.isFinal(field
- .getModifiers()) ? false : attr.writable(), false);
+ .getCanonicalName(), attr.description(), true, !Modifier.isFinal(field
+ .getModifiers()) && attr.writable(), false);
atts.put(fieldName, new FieldAttributeEntry(info, field));
}
@@ -478,9 +473,9 @@
public Object invoke(Attribute a) throws Exception {
if (a == null && isOrGetmethod != null)
- return isOrGetmethod.invoke(getObject(), new Object[] {});
+ return isOrGetmethod.invoke(getObject() );
else if (a != null && setMethod != null)
- return setMethod.invoke(getObject(), new Object[] { a.getValue() });
+ return setMethod.invoke(getObject(), a.getValue());
else
return null;
}
Modified: trunk/core/src/main/java/org/infinispan/loaders/AbstractCacheStore.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/loaders/AbstractCacheStore.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/main/java/org/infinispan/loaders/AbstractCacheStore.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -60,7 +60,7 @@
@Override
public Thread newThread(Runnable r) {
// Thread name: <cache>-<CacheStore>-<purger>-ID
- Thread t = new Thread(r, (cache == null ? "" : cache.getName() + "-") + loaderName + "-" + THREAD_COUNTER.getAndIncrement());
+ Thread t = new Thread(r, (cache == null ? "" : cache.getName() + '-') + loaderName + '-' + THREAD_COUNTER.getAndIncrement());
t.setDaemon(true);
return t;
}
Modified: trunk/core/src/main/java/org/infinispan/loaders/decorators/SingletonStore.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/loaders/decorators/SingletonStore.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/main/java/org/infinispan/loaders/decorators/SingletonStore.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -245,7 +245,7 @@
private boolean isCoordinator(List<Address> newView, Address currentAddress) {
if (!currentAddress.equals(localAddress)) localAddress = currentAddress;
if (localAddress != null) {
- return newView.size() > 0 && localAddress.equals(newView.get(0));
+ return !newView.isEmpty() && localAddress.equals(newView.get(0));
} else {
/* Invalid new view, so previous value returned */
return active;
Modified: trunk/core/src/main/java/org/infinispan/loaders/file/FileCacheStore.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/loaders/file/FileCacheStore.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/main/java/org/infinispan/loaders/file/FileCacheStore.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -263,7 +263,7 @@
}
public Bucket loadBucketContainingKey(String key) throws CacheLoaderException {
- return loadBucket(key.hashCode() + "");
+ return loadBucket(String.valueOf(key.hashCode()));
}
private boolean deleteFile(File f) {
Modified: trunk/core/src/main/java/org/infinispan/loaders/modifications/Modification.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/loaders/modifications/Modification.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/main/java/org/infinispan/loaders/modifications/Modification.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -8,7 +8,7 @@
*/
public interface Modification {
public static enum Type {
- STORE, REMOVE, CLEAR, PURGE_EXPIRED, PREPARE, COMMIT;
+ STORE, REMOVE, CLEAR, PURGE_EXPIRED, PREPARE, COMMIT
}
Type getType();
Modified: trunk/core/src/main/java/org/infinispan/loaders/modifications/Remove.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/loaders/modifications/Remove.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/main/java/org/infinispan/loaders/modifications/Remove.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -36,8 +36,7 @@
@Override
public int hashCode() {
- int result = key != null ? key.hashCode() : 0;
- return result;
+ return key != null ? key.hashCode() : 0;
}
@Override
Modified: trunk/core/src/main/java/org/infinispan/loaders/modifications/Store.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/loaders/modifications/Store.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/main/java/org/infinispan/loaders/modifications/Store.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -38,8 +38,7 @@
@Override
public int hashCode() {
- int result = storedEntry != null ? storedEntry.hashCode() : 0;
- return result;
+ return storedEntry != null ? storedEntry.hashCode() : 0;
}
@Override
Modified: trunk/core/src/main/java/org/infinispan/marshall/jboss/ConstantObjectTable.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/jboss/ConstantObjectTable.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/main/java/org/infinispan/marshall/jboss/ConstantObjectTable.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -247,7 +247,7 @@
}
public Object readObject(Unmarshaller input) throws IOException, ClassNotFoundException {
- ExternalizerAdapter adapter = (ExternalizerAdapter) readers.get(input.readUnsignedByte());
+ ExternalizerAdapter adapter = readers.get(input.readUnsignedByte());
return adapter.readObject(input);
}
Modified: trunk/core/src/main/java/org/infinispan/marshall/jboss/JBossMarshaller.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/marshall/jboss/JBossMarshaller.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/main/java/org/infinispan/marshall/jboss/JBossMarshaller.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -214,6 +214,9 @@
}
private static class DebuggingExceptionListener implements ExceptionListener {
+ private static final URL[] EMPTY_URLS = {};
+ private static final Class[] EMPTY_CLASSES = {};
+ private static final Object[] EMPTY_OBJECTS = {};
public void handleMarshallingException(Throwable problem, Object subject) {
if (log.isDebugEnabled()) {
@@ -250,13 +253,13 @@
}
private static URL[] getClassLoaderURLs(ClassLoader cl) {
- URL[] urls = {};
+ URL[] urls = EMPTY_URLS;
try {
Class returnType = urls.getClass();
- Class[] parameterTypes = {};
+ Class[] parameterTypes = EMPTY_CLASSES;
Method getURLs = cl.getClass().getMethod("getURLs", parameterTypes);
if (returnType.isAssignableFrom(getURLs.getReturnType())) {
- Object[] args = {};
+ Object[] args = EMPTY_OBJECTS;
urls = (URL[]) getURLs.invoke(cl, args);
}
} catch (Exception ignore) {}
Modified: trunk/core/src/main/java/org/infinispan/remoting/ReplicationQueue.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/remoting/ReplicationQueue.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/main/java/org/infinispan/remoting/ReplicationQueue.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -69,7 +69,6 @@
private Configuration configuration;
private boolean enabled;
private CommandsFactory commandsFactory;
- private boolean stateTransferEnabled;
public boolean isEnabled() {
return enabled;
@@ -89,7 +88,6 @@
*/
@Start
public synchronized void start() {
- stateTransferEnabled = configuration.isStateTransferEnabled();
long interval = configuration.getReplQueueInterval();
log.trace("Starting replication queue, with interval {0} and maxElements {1}", interval, maxElements);
this.maxElements = configuration.getReplQueueMaxElements();
Modified: trunk/core/src/main/java/org/infinispan/remoting/responses/ClusteredGetResponseValidityFilter.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/remoting/responses/ClusteredGetResponseValidityFilter.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/main/java/org/infinispan/remoting/responses/ClusteredGetResponseValidityFilter.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -32,7 +32,7 @@
}
public boolean needMoreResponses() {
- return numValidResponses < 1 && pendingResponders.size() > 0;
+ return numValidResponses < 1 && !pendingResponders.isEmpty();
}
}
Modified: trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/CommandAwareRpcDispatcher.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/CommandAwareRpcDispatcher.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/CommandAwareRpcDispatcher.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -340,7 +340,7 @@
}
}
- if (replay && ignorers.size() > 0) {
+ if (replay && !ignorers.isEmpty()) {
Message msg = constructMessage(buf, null);
//Since we are making a sync call make sure we don't bundle
//See ISPN-192 for more details
Modified: trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsTransport.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsTransport.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/main/java/org/infinispan/remoting/transport/jgroups/JGroupsTransport.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -488,7 +488,7 @@
needNotification = true;
}
// Now that we have a view, figure out if we are the coordinator
- coordinator = (members != null && members.size() != 0 && members.get(0).equals(getAddress()));
+ coordinator = (members != null && !members.isEmpty() && members.get(0).equals(getAddress()));
// now notify listeners - *after* updating the coordinator. - JBCACHE-662
if (needNotification && notifier != null) {
Modified: trunk/core/src/main/java/org/infinispan/transaction/TransactionLog.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/transaction/TransactionLog.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/main/java/org/infinispan/transaction/TransactionLog.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -144,7 +144,7 @@
public final void deactivate() {
active.set(false);
- if (entries.size() > 0)
+ if (!entries.isEmpty())
log.error("Unprocessed Transaction Log Entries! = {0}", entries.size());
entries.clear();
}
Modified: trunk/core/src/main/java/org/infinispan/transaction/xa/TransactionTable.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/transaction/xa/TransactionTable.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/main/java/org/infinispan/transaction/xa/TransactionTable.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -159,7 +159,7 @@
private void registerRemoteTransaction(GlobalTransaction gtx, RemoteTransaction rtx) {
RemoteTransaction transaction = remoteTransactions.put(gtx, rtx);
if (transaction != null) {
- String message = "A remote transaction with the given id was already registred!!!";
+ String message = "A remote transaction with the given id was already registered!!!";
log.error(message);
throw new IllegalStateException(message);
}
@@ -182,7 +182,7 @@
try {
transaction.enlistResource(current);
} catch (Exception e) {
- log.error("Failed to emlist TransactionXaAdapter to transaction");
+ log.error("Failed to enlist TransactionXaAdapter to transaction");
throw new CacheException(e);
}
notifier.notifyTransactionRegistered(tx, ctx);
Modified: trunk/core/src/main/java/org/infinispan/util/AbstractMap.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/AbstractMap.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/main/java/org/infinispan/util/AbstractMap.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -19,13 +19,13 @@
// The normal bit spreader...
- protected static final int hash(Object key) {
+ protected static int hash(Object key) {
int h = key.hashCode();
h ^= (h >>> 20) ^ (h >>> 12);
return h ^ (h >>> 7) ^ (h >>> 4);
}
- protected static final boolean eq(Object o1, Object o2) {
+ protected static boolean eq(Object o1, Object o2) {
return o1 == o2 || (o1 != null && o1.equals(o2));
}
Modified: trunk/core/src/main/java/org/infinispan/util/BidirectionalLinkedHashMap.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/BidirectionalLinkedHashMap.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/main/java/org/infinispan/util/BidirectionalLinkedHashMap.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -274,10 +274,7 @@
}
private void putAllForCreate(Map<? extends K, ? extends V> m) {
- for (Iterator<? extends Map.Entry<? extends K, ? extends V>> i = m.entrySet().iterator(); i.hasNext();) {
- Map.Entry<? extends K, ? extends V> e = i.next();
- putForCreate(e.getKey(), e.getValue());
- }
+ for (Entry<? extends K, ? extends V> e : m.entrySet()) putForCreate(e.getKey(), e.getValue());
}
/**
@@ -336,10 +333,7 @@
resize(newCapacity);
}
- for (Iterator<? extends Map.Entry<? extends K, ? extends V>> i = m.entrySet().iterator(); i.hasNext();) {
- Map.Entry<? extends K, ? extends V> e = i.next();
- put(e.getKey(), e.getValue());
- }
+ for (Entry<? extends K, ? extends V> e : m.entrySet()) put(e.getKey(), e.getValue());
}
/**
Modified: trunk/core/src/main/java/org/infinispan/util/ClassFinder.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/ClassFinder.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/main/java/org/infinispan/util/ClassFinder.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -123,15 +123,15 @@
for (File cf : classFiles) {
String clazz = null;
try {
- clazz = toClassName(cf.getAbsolutePath().toString());
+ clazz = toClassName(cf.getAbsolutePath());
claz = Util.loadClass(clazz);
classes.add(claz);
} catch (NoClassDefFoundError ncdfe) {
- log.warn(cf.getAbsolutePath().toString() + " has reference to a class "
+ log.warn(cf.getAbsolutePath() + " has reference to a class "
+ ncdfe.getMessage() + " that could not be loaded from classpath");
} catch (Throwable e) {
// Catch all since we do not want skip iteration
- log.warn("On path " + cf.getAbsolutePath().toString() + " could not load class "+ clazz, e);
+ log.warn("On path " + cf.getAbsolutePath() + " could not load class "+ clazz, e);
}
}
} else {
Modified: trunk/core/src/main/java/org/infinispan/util/FastCopyHashMap.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/FastCopyHashMap.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/main/java/org/infinispan/util/FastCopyHashMap.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -143,7 +143,7 @@
return index;
}
- private static final int index(int hashCode, int length) {
+ private static int index(int hashCode, int length) {
return hashCode & (length - 1);
}
@@ -435,7 +435,7 @@
Entry<K, V> table[] = FastCopyHashMap.this.table;
public boolean hasNext() {
- if (hasNext == true)
+ if (hasNext)
return true;
Entry<K, V> table[] = this.table;
Modified: trunk/core/src/main/java/org/infinispan/util/FileLookup.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/FileLookup.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/main/java/org/infinispan/util/FileLookup.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -49,7 +49,7 @@
* @return an input stream to the file or null if nothing found through all lookup steps.
*/
public InputStream lookupFile(String filename) {
- InputStream is = filename == null || filename.equals("") ? null : getAsInputStreamFromClassLoader(filename);
+ InputStream is = filename == null || filename.length() == 0 ? null : getAsInputStreamFromClassLoader(filename);
if (is == null) {
if (log.isDebugEnabled())
log.debug("Unable to find configuration file " + filename + " in classpath; searching for this file on the filesystem instead.");
Modified: trunk/core/src/main/java/org/infinispan/util/Immutables.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/Immutables.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/main/java/org/infinispan/util/Immutables.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -81,7 +81,7 @@
public static <T> List<T> immutableListCopy(List<? extends T> list) {
if (list == null) return null;
if (list.isEmpty()) return Collections.emptyList();
- if (list.size() == 1) return Collections.<T>singletonList(list.get(0));
+ if (list.size() == 1) return Collections.singletonList(list.get(0));
return new ImmutableListCopy<T>(list);
}
@@ -136,7 +136,7 @@
public static <T> Set<T> immutableSetCopy(Set<? extends T> set) {
if (set == null) return null;
if (set.isEmpty()) return Collections.emptySet();
- if (set.size() == 1) return Collections.<T>singleton(set.iterator().next());
+ if (set.size() == 1) return Collections.singleton(set.iterator().next());
Set<? extends T> copy = ObjectDuplicator.duplicateSet(set);
if (copy == null)
// Set uses Collection copy-ctor
@@ -169,7 +169,7 @@
if (map.isEmpty()) return Collections.emptyMap();
if (map.size() == 1) {
Map.Entry<? extends K, ? extends V> me = map.entrySet().iterator().next();
- return Collections.<K, V>singletonMap(me.getKey(), me.getValue());
+ return Collections.singletonMap(me.getKey(), me.getValue());
}
Map<? extends K, ? extends V> copy = ObjectDuplicator.duplicateMap(map);
@@ -191,7 +191,7 @@
public static <T> Collection<T> immutableCollectionCopy(Collection<? extends T> collection) {
if (collection == null) return null;
if (collection.isEmpty()) return Collections.emptySet();
- if (collection.size() == 1) return Collections.<T>singleton(collection.iterator().next());
+ if (collection.size() == 1) return Collections.singleton(collection.iterator().next());
Collection<? extends T> copy = ObjectDuplicator.duplicateCollection(collection);
if (copy == null)
Modified: trunk/core/src/main/java/org/infinispan/util/InfinispanCollections.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/InfinispanCollections.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/main/java/org/infinispan/util/InfinispanCollections.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -18,12 +18,12 @@
private static final BidirectionalMap EMPTY_BIDI_MAP = new EmptyBidiMap();
@SuppressWarnings("unchecked")
- public static final <T> ReversibleOrderedSet<T> emptyReversibleOrderedSet() {
+ public static <T> ReversibleOrderedSet<T> emptyReversibleOrderedSet() {
return (ReversibleOrderedSet<T>) EMPTY_ROS;
}
@SuppressWarnings("unchecked")
- public static final <K, V> BidirectionalMap<K, V> emptyBidirectionalMap() {
+ public static <K, V> BidirectionalMap<K, V> emptyBidirectionalMap() {
return (BidirectionalMap<K, V>) EMPTY_BIDI_MAP;
}
Modified: trunk/core/src/main/java/org/infinispan/util/ReflectionUtil.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/ReflectionUtil.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/main/java/org/infinispan/util/ReflectionUtil.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -104,7 +104,7 @@
for (Method m : c.getDeclaredMethods()) {
// don't bother if this method has already been overridden by a subclass
- if (!alreadyFound(m, s) && m.isAnnotationPresent(annotationType)) {
+ if (notFound(m, s) && m.isAnnotationPresent(annotationType)) {
s.add(m);
}
}
@@ -124,13 +124,13 @@
* @param s collection of methods found
* @return true a method with the same signature already exists.
*/
- private static boolean alreadyFound(Method m, Collection<Method> s) {
+ private static boolean notFound(Method m, Collection<Method> s) {
for (Method found : s) {
if (m.getName().equals(found.getName()) &&
Arrays.equals(m.getParameterTypes(), found.getParameterTypes()))
- return true;
+ return false;
}
- return false;
+ return true;
}
public static void setValue(Object instance, String fieldName, Object value) {
@@ -223,23 +223,25 @@
*/
@SuppressWarnings("unchecked")
public static <T extends Annotation> T getAnnotation(Class clazz, Class<T> ann) {
- // first check class
- T a = (T) clazz.getAnnotation(ann);
- if (a != null) return a;
+ while (true) {
+ // first check class
+ T a = (T) clazz.getAnnotation(ann);
+ if (a != null) return a;
- // check interfaces
- if (!clazz.isInterface()) {
- Class[] interfaces = clazz.getInterfaces();
- for (Class inter : interfaces) {
- a = getAnnotation(inter, ann);
- if (a != null) return a;
+ // check interfaces
+ if (!clazz.isInterface()) {
+ Class[] interfaces = clazz.getInterfaces();
+ for (Class inter : interfaces) {
+ a = getAnnotation(inter, ann);
+ if (a != null) return a;
+ }
}
+
+ // check superclasses
+ Class superclass = clazz.getSuperclass();
+ if (superclass == null) return null; // no where else to look
+ clazz = superclass;
}
-
- // check superclasses
- Class superclass = clazz.getSuperclass();
- if (superclass == null) return null; // no where else to look
- return getAnnotation(superclass, ann);
}
/**
Modified: trunk/core/src/main/java/org/infinispan/util/concurrent/BufferedConcurrentHashMap.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/concurrent/BufferedConcurrentHashMap.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/main/java/org/infinispan/util/concurrent/BufferedConcurrentHashMap.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -253,16 +253,16 @@
}
@SuppressWarnings("unchecked")
- static final <K, V> HashEntry<K, V>[] newArray(int i) {
+ static <K, V> HashEntry<K, V>[] newArray(int i) {
return new HashEntry[i];
}
}
- private enum Recency{HIR_RESIDENT,LIR_RESIDENT,HIR_NONRESIDENT};
+ private enum Recency{HIR_RESIDENT,LIR_RESIDENT,HIR_NONRESIDENT}
public enum Eviction {
NONE,LRU,LIRS
- };
+ }
interface EvictionPolicy<K, V> {
@@ -456,7 +456,7 @@
}
@SuppressWarnings("unchecked")
- static final <K, V> Segment<K, V>[] newArray(int i) {
+ static <K, V> Segment<K, V>[] newArray(int i) {
return new Segment[i];
}
@@ -1666,6 +1666,7 @@
* underlying map.
*/
final class WriteThroughEntry extends AbstractMap.SimpleEntry<K, V> {
+ private static final long serialVersionUID = -1075078642155041669L;
WriteThroughEntry(K k, V v) {
super(k, v);
}
Modified: trunk/core/src/main/java/org/infinispan/util/concurrent/ConcurrentHashSet.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/concurrent/ConcurrentHashSet.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/main/java/org/infinispan/util/concurrent/ConcurrentHashSet.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -44,7 +44,7 @@
protected final ConcurrentHashMap<E, Object> map;
/** any Serializable object will do, Integer.valueOf(0) is known cheap **/
- private static final Serializable DUMMY = Integer.valueOf(0);
+ private static final Serializable DUMMY = 0;
public ConcurrentHashSet() {
map = new ConcurrentHashMap<E, Object>();
Modified: trunk/core/src/main/java/org/infinispan/util/concurrent/locks/OwnableReentrantLock.java
===================================================================
--- trunk/core/src/main/java/org/infinispan/util/concurrent/locks/OwnableReentrantLock.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/main/java/org/infinispan/util/concurrent/locks/OwnableReentrantLock.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -75,8 +75,7 @@
*/
protected final Object currentRequestor() {
InvocationContext invocationContext = icc.getInvocationContext();
- Object o = invocationContext.getLockOwner();
- return o;
+ return invocationContext.getLockOwner();
}
public void lock() {
Modified: trunk/core/src/test/java/org/infinispan/api/CacheAPITest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/api/CacheAPITest.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/test/java/org/infinispan/api/CacheAPITest.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -134,7 +134,7 @@
assert !cache.containsKey(key1);
assert !cache.containsKey(key2);
- assert cache.size() == 0;
+ assert cache.isEmpty();
assert !cache.keySet().contains(key1);
assert !cache.keySet().contains(key2);
assert cache.keySet().isEmpty();
@@ -450,6 +450,6 @@
cache.clear();
- assert 0 == cache.size();
+ assert cache.isEmpty();
}
}
Modified: trunk/core/src/test/java/org/infinispan/api/mvcc/LockTestBase.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/api/mvcc/LockTestBase.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/test/java/org/infinispan/api/mvcc/LockTestBase.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -23,7 +23,7 @@
/**
* @author Manik Surtani (<a href="mailto:manik at jboss.org">manik at jboss.org</a>)
*/
- at Test(groups = {"functional", "mvcc"})
+ at Test(groups = "functional")
public abstract class LockTestBase extends AbstractInfinispanTest {
private Log log = LogFactory.getLog(LockTestBase.class);
protected boolean repeatableRead = true;
Modified: trunk/core/src/test/java/org/infinispan/api/mvcc/read_committed/ReadCommittedLockTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/api/mvcc/read_committed/ReadCommittedLockTest.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/test/java/org/infinispan/api/mvcc/read_committed/ReadCommittedLockTest.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -6,7 +6,7 @@
import javax.transaction.Transaction;
- at Test(groups = {"functional", "mvcc"}, testName = "api.mvcc.read_committed.ReadCommittedLockTest")
+ at Test(groups = "functional", testName = "api.mvcc.read_committed.ReadCommittedLockTest")
public class ReadCommittedLockTest extends LockTestBase {
public ReadCommittedLockTest() {
repeatableRead = false;
Modified: trunk/core/src/test/java/org/infinispan/api/mvcc/repeatable_read/RepeatableReadLockTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/api/mvcc/repeatable_read/RepeatableReadLockTest.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/test/java/org/infinispan/api/mvcc/repeatable_read/RepeatableReadLockTest.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -7,7 +7,7 @@
import javax.transaction.Transaction;
import javax.transaction.TransactionManager;
- at Test(groups = {"functional", "mvcc"}, testName = "api.mvcc.repeatable_read.RepeatableReadLockTest")
+ at Test(groups = "functional", testName = "api.mvcc.repeatable_read.RepeatableReadLockTest")
public class RepeatableReadLockTest extends LockTestBase {
public RepeatableReadLockTest() {
repeatableRead = true;
Modified: trunk/core/src/test/java/org/infinispan/api/mvcc/repeatable_read/WriteSkewTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/api/mvcc/repeatable_read/WriteSkewTest.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/test/java/org/infinispan/api/mvcc/repeatable_read/WriteSkewTest.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -197,8 +197,8 @@
if (allowWriteSkew) {
// should have no exceptions!!
throwExceptions(w1exceptions, w2exceptions);
- assert w2exceptions.size() == 0;
- assert w1exceptions.size() == 0;
+ assert w2exceptions.isEmpty();
+ assert w1exceptions.isEmpty();
assert "v3".equals(cache.get("k")) : "W2 should have overwritten W1's work!";
assertNoLocks();
Modified: trunk/core/src/test/java/org/infinispan/atomic/APITest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/atomic/APITest.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/test/java/org/infinispan/atomic/APITest.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -126,7 +126,7 @@
assert map.get("blah").equals("blah");
Transaction t = tm.suspend();
- assert map.size() == 0;
+ assert map.isEmpty();
assertIsEmpty(map);
assertIsEmptyMap(cache, "map");
Modified: trunk/core/src/test/java/org/infinispan/atomic/AtomicHashMapTestAssertions.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/atomic/AtomicHashMapTestAssertions.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/test/java/org/infinispan/atomic/AtomicHashMapTestAssertions.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -8,7 +8,7 @@
public class AtomicHashMapTestAssertions extends AbstractInfinispanTest {
public static void assertIsEmpty(Map map) {
- assert map.size() == 0;
+ assert map.isEmpty();
assert map.get("blah") == null;
assert !map.containsKey("blah");
}
Modified: trunk/core/src/test/java/org/infinispan/config/ConfigurationCloneTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/config/ConfigurationCloneTest.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/test/java/org/infinispan/config/ConfigurationCloneTest.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -33,8 +33,7 @@
@Override
protected CacheManager createCacheManager() throws Exception {
- CacheManager cm = TestCacheManagerFactory.createLocalCacheManager();
- return cm;
+ return TestCacheManagerFactory.createLocalCacheManager();
}
public void testCloningBeforeStart(Method method) {
Modified: trunk/core/src/test/java/org/infinispan/distribution/BaseDistFunctionalTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/distribution/BaseDistFunctionalTest.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/test/java/org/infinispan/distribution/BaseDistFunctionalTest.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -212,7 +212,7 @@
throw new RuntimeException("Cannot locate joiner! Joiner is [" + joinerAddress + "]");
}
- protected static final String safeType(Object o) {
+ protected static String safeType(Object o) {
if (o == null) return "null";
return o.getClass().getSimpleName();
}
Modified: trunk/core/src/test/java/org/infinispan/distribution/SingleOwnerTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/distribution/SingleOwnerTest.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/test/java/org/infinispan/distribution/SingleOwnerTest.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -107,6 +107,8 @@
Cache ownerCache = owners[0];
Cache nonOwnerCache = nonOwners[0];
ownerCache.put("diffkey", new Externalizable() {
+ private static final long serialVersionUID = -483939825697574242L;
+
public void writeExternal(ObjectOutput out) throws IOException {
throw new UnknownError();
}
Modified: trunk/core/src/test/java/org/infinispan/distribution/rehash/XAResourceAdapter.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/distribution/rehash/XAResourceAdapter.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/test/java/org/infinispan/distribution/rehash/XAResourceAdapter.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -11,6 +11,8 @@
* @since 4.0
*/
public abstract class XAResourceAdapter implements XAResource {
+ private static final Xid[] XIDS = new Xid[0];
+
public void commit(Xid xid, boolean b) throws XAException {
// no-op
}
@@ -36,7 +38,7 @@
}
public Xid[] recover(int i) throws XAException {
- return new Xid[0];
+ return XIDS;
}
public void rollback(Xid xid) throws XAException {
Modified: trunk/core/src/test/java/org/infinispan/eviction/BaseEvictionFunctionalTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/eviction/BaseEvictionFunctionalTest.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/test/java/org/infinispan/eviction/BaseEvictionFunctionalTest.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -47,7 +47,7 @@
for (Writer writer : w) writer.join();
// wait for the cache size to drop to 1, up to a specified amount of time.
- long giveupTime = System.currentTimeMillis() + (1000 * 60 * 1); // 1 mins?
+ long giveupTime = System.currentTimeMillis() + (1000 * 60); // 1 mins?
while (cache.getAdvancedCache().getDataContainer().size() > 1 && System.currentTimeMillis() < giveupTime) {
// System.out.println("Cache size is " + cache.size() + " and time diff is " + (giveupTime - System.currentTimeMillis()));
Thread.sleep(100);
Modified: trunk/core/src/test/java/org/infinispan/eviction/EvictionManagerTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/eviction/EvictionManagerTest.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/test/java/org/infinispan/eviction/EvictionManagerTest.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -1,11 +1,15 @@
package org.infinispan.eviction;
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;
@@ -55,49 +59,4 @@
assert em.evictionTask == mockFuture;
verify(mockService); // expect that the executor was never used!!
}
-
- public void testProcessingEviction() {
- EvictionManagerImpl em = new EvictionManagerImpl();
- Configuration cfg = getCfg();
- cfg.setEvictionWakeUpInterval(0);
- cfg.setEvictionMaxEntries(100);
-
- ScheduledExecutorService mockService = createMock(ScheduledExecutorService.class);
- DataContainer mockDataContainer = createMock(DataContainer.class);
- Cache mockCache = createMock(Cache.class);
- em.initialize(mockService, cfg, mockCache, mockDataContainer, null);
- replay(mockService);
- em.start();
- verify(mockService); // expect that the executor was never used!!
-
- // now manually process stuff.
- reset(mockDataContainer, mockCache);
- mockDataContainer.purgeExpired();
- expectLastCall().once();
- SizeGenerator sg = new SizeGenerator(500, 500, 1000, 101, 100, 99);
- expect(mockDataContainer.size()).andAnswer(sg).anyTimes();
- Iterator mockIterator = createMock(Iterator.class);
- expect(mockIterator.hasNext()).andReturn(true).anyTimes();
- expect(mockIterator.next()).andReturn(InternalEntryFactory.create("key", "value")).anyTimes();
- expect(mockDataContainer.iterator()).andReturn(mockIterator).once();
- mockCache.evict(eq("key"));
- expectLastCall().times(3);
-
- replay(mockDataContainer, mockIterator, mockCache);
- em.processEviction();
- verify(mockDataContainer, mockIterator, mockCache);
- }
-
- private static class SizeGenerator implements IAnswer<Integer> {
- int[] sizesToReport;
- int idx = 0;
-
- public SizeGenerator(int... sizesToReport) {
- this.sizesToReport = sizesToReport;
- }
-
- public Integer answer() throws Throwable {
- return sizesToReport[idx++];
- }
- }
}
Modified: trunk/core/src/test/java/org/infinispan/eviction/MarshalledValuesEvictionTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/eviction/MarshalledValuesEvictionTest.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/test/java/org/infinispan/eviction/MarshalledValuesEvictionTest.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -70,7 +70,7 @@
cache.put(p3, p4);
// wait for the cache size to drop to 1, up to a specified amount of time.
- long giveupTime = System.currentTimeMillis() + (1000 * 60 * 1); // 1 mins?
+ long giveupTime = System.currentTimeMillis() + (1000 * 60); // 1 mins?
while (cache.getAdvancedCache().getDataContainer().size() > 1 && System.currentTimeMillis() < giveupTime) {
TestingUtil.sleepThread(100);
}
@@ -89,7 +89,7 @@
cache.put("key-hexastyle", p2);
// wait for the cache size to drop to 1, up to a specified amount of time.
- long giveupTime = System.currentTimeMillis() + (1000 * 60 * 1); // 1 mins?
+ long giveupTime = System.currentTimeMillis() + (1000 * 60); // 1 mins?
while (cache.getAdvancedCache().getDataContainer().size() > 1 && System.currentTimeMillis() < giveupTime) {
TestingUtil.sleepThread(100);
}
Modified: trunk/core/src/test/java/org/infinispan/jmx/RpcManagerMBeanTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/jmx/RpcManagerMBeanTest.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/test/java/org/infinispan/jmx/RpcManagerMBeanTest.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -3,9 +3,12 @@
import org.easymock.EasyMock;
import static org.easymock.EasyMock.*;
import org.infinispan.Cache;
+import org.infinispan.commands.ReplicableCommand;
import org.infinispan.config.Configuration;
import org.infinispan.config.GlobalConfiguration;
import org.infinispan.manager.CacheManager;
+import org.infinispan.remoting.rpc.ResponseFilter;
+import org.infinispan.remoting.rpc.ResponseMode;
import org.infinispan.remoting.rpc.RpcManager;
import org.infinispan.remoting.rpc.RpcManagerImpl;
import org.infinispan.remoting.transport.Address;
@@ -13,6 +16,8 @@
import org.infinispan.test.MultipleCacheManagersTest;
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;
@@ -20,6 +25,7 @@
import javax.management.MBeanServer;
import javax.management.ObjectName;
import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
/**
@@ -85,21 +91,21 @@
cache1.put("key", "value2");
assert cache2.get("key").equals("value2");
- assert mBeanServer.getAttribute(rpcManager1, "ReplicationCount").equals(new Long(1)) : "Expected 1, was " + mBeanServer.getAttribute(rpcManager1, "ReplicationCount");
- assert mBeanServer.getAttribute(rpcManager1, "ReplicationFailures").equals(new Long(0));
- mBeanServer.getAttribute(rpcManager1, "ReplicationCount").equals(new Long(-1));
+ assert mBeanServer.getAttribute(rpcManager1, "ReplicationCount").equals((long) 1) : "Expected 1, was " + mBeanServer.getAttribute(rpcManager1, "ReplicationCount");
+ assert mBeanServer.getAttribute(rpcManager1, "ReplicationFailures").equals((long) 0);
+ mBeanServer.getAttribute(rpcManager1, "ReplicationCount").equals((long) -1);
// now resume statistics
mBeanServer.invoke(rpcManager1, "resetStatistics", new Object[0], new String[0]);
- assert mBeanServer.getAttribute(rpcManager1, "ReplicationCount").equals(new Long(0));
- assert mBeanServer.getAttribute(rpcManager1, "ReplicationFailures").equals(new Long(0));
+ assert mBeanServer.getAttribute(rpcManager1, "ReplicationCount").equals((long) 0);
+ assert mBeanServer.getAttribute(rpcManager1, "ReplicationFailures").equals((long) 0);
mBeanServer.setAttribute(rpcManager1, new Attribute("StatisticsEnabled", Boolean.FALSE));
cache1.put("key", "value");
assert cache2.get("key").equals("value");
- assert mBeanServer.getAttribute(rpcManager1, "ReplicationCount").equals(new Long(-1));
- assert mBeanServer.getAttribute(rpcManager1, "ReplicationCount").equals(new Long(-1));
+ assert mBeanServer.getAttribute(rpcManager1, "ReplicationCount").equals((long) -1);
+ assert mBeanServer.getAttribute(rpcManager1, "ReplicationCount").equals((long) -1);
// reset stats enabled parameter
mBeanServer.setAttribute(rpcManager1, new Attribute("StatisticsEnabled", Boolean.TRUE));
@@ -113,17 +119,17 @@
ObjectName rpcManager1 = new ObjectName("RpcManagerMBeanTest:cache-name=" + cachename + "(repl_sync),jmx-resource=RpcManager");
ObjectName rpcManager2 = new ObjectName("RpcManagerMBeanTest2:cache-name=" + cachename + "(repl_sync),jmx-resource=RpcManager");
- assert mBeanServer.getAttribute(rpcManager1, "ReplicationCount").equals(new Long(0));
- assert mBeanServer.getAttribute(rpcManager1, "ReplicationFailures").equals(new Long(0));
+ assert mBeanServer.getAttribute(rpcManager1, "ReplicationCount").equals((long) 0);
+ assert mBeanServer.getAttribute(rpcManager1, "ReplicationFailures").equals((long) 0);
assert mBeanServer.getAttribute(rpcManager1, "SuccessRatio").equals("N/A");
cache1.put("a1", "b1");
cache1.put("a2", "b2");
cache1.put("a3", "b3");
cache1.put("a4", "b4");
- assert mBeanServer.getAttribute(rpcManager1, "ReplicationCount").equals(new Long(4));
+ assert mBeanServer.getAttribute(rpcManager1, "ReplicationCount").equals((long) 4);
assert mBeanServer.getAttribute(rpcManager1, "SuccessRatio").equals("100%");
- assert !mBeanServer.getAttribute(rpcManager1, "AverageReplicationTime").equals(new Long(0));
+ assert !mBeanServer.getAttribute(rpcManager1, "AverageReplicationTime").equals((long) 0);
RpcManagerImpl rpcManager = (RpcManagerImpl) TestingUtil.extractComponent(cache1, RpcManager.class);
Transport originalTransport = rpcManager.getTransport();
@@ -135,14 +141,17 @@
memberList.add(mockAddress1);
memberList.add(mockAddress2);
Transport transport = createMock(Transport.class);
- EasyMock.expect(transport.getMembers()).andReturn(memberList).anyTimes();
- EasyMock.expect(transport.getAddress()).andReturn(null).anyTimes();
+ expect(transport.getMembers()).andReturn(memberList).anyTimes();
+ expect(transport.getAddress()).andReturn(null).anyTimes();
+ expect(transport.invokeRemotely(EasyMock.<Collection<Address>>anyObject(), EasyMock.<ReplicableCommand>anyObject(),
+ EasyMock.<ResponseMode>anyObject(), anyLong(), anyBoolean(), EasyMock.<ResponseFilter>anyObject(),
+ anyBoolean())).andThrow(new RuntimeException()).anyTimes();
replay(transport);
rpcManager.setTransport(transport);
cache1.put("a5", "b5");
- assert false : "rpc manager should had thrown an expception";
+ assert false : "rpc manager should have thrown an exception";
} catch (Throwable e) {
- log.debug("Expected exception", e);
+ log.debug("Expected exception "+ e);
//expected
assertEquals(mBeanServer.getAttribute(rpcManager1, "SuccessRatio"), ("80%"));
}
Modified: trunk/core/src/test/java/org/infinispan/loaders/CacheLoaderFunctionalTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/loaders/CacheLoaderFunctionalTest.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/test/java/org/infinispan/loaders/CacheLoaderFunctionalTest.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -224,7 +224,7 @@
// make sure we have no stale locks!!
assertNoLocks(cache);
- assert cache.size() == 0; // cache size ops will not trigger a load
+ assert cache.isEmpty(); // cache size ops will not trigger a load
cache.clear(); // this should propagate to the loader though
assertNotInCacheAndStore("k1", "k2", "k3", "k4");
Modified: trunk/core/src/test/java/org/infinispan/loaders/decorators/AsyncTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/loaders/decorators/AsyncTest.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/test/java/org/infinispan/loaders/decorators/AsyncTest.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -32,7 +32,8 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.TimeoutException;
-import static org.infinispan.test.TestingUtil.*;
+import static org.infinispan.test.TestingUtil.k;
+import static org.infinispan.test.TestingUtil.v;
@Test(groups = "unit", testName = "loaders.decorators.AsyncTest")
public class AsyncTest extends AbstractInfinispanTest {
@@ -325,6 +326,4 @@
}
}
-
- ;
}
Modified: trunk/core/src/test/java/org/infinispan/marshall/MarshalledValueTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/marshall/MarshalledValueTest.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/test/java/org/infinispan/marshall/MarshalledValueTest.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -509,6 +509,7 @@
boolean b;
static int serializationCount, deserializationCount;
final Log log = LogFactory.getLog(Pojo.class);
+ private static final long serialVersionUID = -2888014339659501395L;
public boolean equals(Object o) {
if (this == o) return true;
Modified: trunk/core/src/test/java/org/infinispan/marshall/VersionAwareMarshallerTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/marshall/VersionAwareMarshallerTest.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/test/java/org/infinispan/marshall/VersionAwareMarshallerTest.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -154,7 +154,7 @@
Set s1 = new HashSet();
Set s2 = new TreeSet();
for (int i = 0; i < 10; i++) {
- Integer integ = new Integer(1000 * i);
+ Integer integ = 1000 * i;
s1.add(integ);
s2.add(integ);
}
@@ -278,7 +278,7 @@
RollbackCommand c13 = new RollbackCommand(gtx);
marshallAndAssertEquality(c13);
- MultipleRpcCommand c99 = new MultipleRpcCommand(Arrays.asList(new ReplicableCommand[]{c2, c5, c6, c8, c10, c12, c13}), "mycache");
+ MultipleRpcCommand c99 = new MultipleRpcCommand(Arrays.asList(c2, c5, c6, c8, c10, c12, c13), "mycache");
marshallAndAssertEquality(c99);
}
@@ -365,7 +365,7 @@
assert merged.size() == 1;
m = new AtomicHashMap();
- assert m.size() == 0;
+ assert m.isEmpty();
bytes = marshaller.objectToByteBuffer(m);
NullDelta nulld = (NullDelta) marshaller.objectFromByteBuffer(bytes);
assert nulld == NullDelta.INSTANCE;
@@ -393,7 +393,7 @@
m.put("k5", "v2");
m.put("k5", "v3");
m.clear();
- assert m.size() == 0;
+ assert m.isEmpty();
bytes = marshaller.objectToByteBuffer(m);
d = (AtomicHashMapDelta) marshaller.objectFromByteBuffer(bytes);
assert d.getChangeLogSize() == 4;
@@ -402,7 +402,7 @@
for (Map.Entry<String, String> entry : merged.entrySet()) {
assert m.get(entry.getKey()).equals(entry.getValue());
}
- assert merged.size() == 0;
+ assert merged.isEmpty();
}
public void testMarshallObjectThatContainsACustomReadObjectMethod() throws Exception {
@@ -445,6 +445,8 @@
public void testErrorUnmarshalling() throws Exception {
Pojo pojo = new Pojo() {
+ private static final long serialVersionUID = -5109779096242560884L;
+
@Override
public void readExternal(ObjectInput in) throws IOException, ClassNotFoundException {
throw new IOException("Injected failue!");
@@ -472,6 +474,7 @@
int i;
boolean b;
static int serializationCount, deserializationCount;
+ private static final long serialVersionUID = 9032309454840083326L;
public boolean equals(Object o) {
if (this == o) return true;
Modified: trunk/core/src/test/java/org/infinispan/notifications/CacheListenerRemovalTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/notifications/CacheListenerRemovalTest.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/test/java/org/infinispan/notifications/CacheListenerRemovalTest.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -37,7 +37,7 @@
public void testListenerRemoval() {
cache.put("x", "y");
AtomicInteger i = new AtomicInteger(0);
- assert 0 == cache.getListeners().size();
+ assert cache.getListeners().isEmpty();
CacheListener l = new CacheListener(i);
cache.addListener(l);
assert 1 == cache.getListeners().size();
@@ -48,7 +48,7 @@
// remove the replListener
cache.removeListener(l);
- assert 0 == cache.getListeners().size();
+ assert cache.getListeners().isEmpty();
i.set(0);
assert 0 == i.get();
cache.get("x");
Modified: trunk/core/src/test/java/org/infinispan/profiling/MemConsumptionTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/profiling/MemConsumptionTest.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/test/java/org/infinispan/profiling/MemConsumptionTest.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -93,7 +93,7 @@
private byte[] generateUniqueKey(int runNumber, int keySize) {
byte[] b = new byte[keySize];
- b[0] = (byte) (runNumber >>> 0);
+ b[0] = (byte) (runNumber);
b[1] = (byte) (runNumber >>> 8);
b[2] = (byte) (runNumber >>> 16);
b[3] = (byte) (runNumber >>> 24);
Modified: trunk/core/src/test/java/org/infinispan/replication/SyncCacheListenerTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/replication/SyncCacheListenerTest.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/test/java/org/infinispan/replication/SyncCacheListenerTest.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -161,7 +161,7 @@
}
public void put(Map map) {
- if (map.size() == 0) fail("put(): map size can't be 0");
+ if (map.isEmpty()) fail("put(): map size can't be 0");
cache1.putAll(map);
}
Modified: trunk/core/src/test/java/org/infinispan/test/TestingUtil.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/test/TestingUtil.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/test/java/org/infinispan/test/TestingUtil.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -80,20 +80,22 @@
public static Object extractField(Class type, Object target, String fieldName) {
- Field field;
- try {
- field = type.getDeclaredField(fieldName);
- field.setAccessible(true);
- return field.get(target);
- }
- catch (Exception e) {
- if (type.equals(Object.class)) {
- e.printStackTrace();
- return null;
- } else {
- // try with superclass!!
- return extractField(type.getSuperclass(), target, fieldName);
+ while (true) {
+ Field field;
+ try {
+ field = type.getDeclaredField(fieldName);
+ field.setAccessible(true);
+ return field.get(target);
}
+ catch (Exception e) {
+ if (type.equals(Object.class)) {
+ e.printStackTrace();
+ return null;
+ } else {
+ // try with superclass!!
+ type = type.getSuperclass();
+ }
+ }
}
}
Modified: trunk/core/src/test/java/org/infinispan/test/data/Key.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/test/data/Key.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/test/java/org/infinispan/test/data/Key.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -13,6 +13,7 @@
String value;
final ReclosableLatch latch = new ReclosableLatch(false);
final boolean lockable;
+ private static final long serialVersionUID = 4745232904453872125L;
public Key() {
this.lockable = false;
Modified: trunk/core/src/test/java/org/infinispan/test/fwk/JGroupsConfigBuilder.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/test/fwk/JGroupsConfigBuilder.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/test/java/org/infinispan/test/fwk/JGroupsConfigBuilder.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -32,7 +32,7 @@
@Override
protected String initialValue() {
- return uniqueAddr.getAndAdd(50) + "";
+ return String.valueOf(uniqueAddr.getAndAdd(50));
}
};
Modified: trunk/core/src/test/java/org/infinispan/util/VisitableBidirectionalLinkedHashSetTest.java
===================================================================
--- trunk/core/src/test/java/org/infinispan/util/VisitableBidirectionalLinkedHashSetTest.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/core/src/test/java/org/infinispan/util/VisitableBidirectionalLinkedHashSetTest.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -43,7 +43,7 @@
}
assert set.isEmpty();
- assert set.size() == 0 : "Expecting size to be 0 but was " + set.size();
+ assert set.isEmpty() : "Expecting size to be 0 but was " + set.size();
}
Modified: trunk/demos/ec2/src/main/java/org/infinispan/ec2demo/InfluenzaDataLoader.java
===================================================================
--- trunk/demos/ec2/src/main/java/org/infinispan/ec2demo/InfluenzaDataLoader.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/demos/ec2/src/main/java/org/infinispan/ec2demo/InfluenzaDataLoader.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -189,8 +189,7 @@
}
}
public String cacheSizes(){
- String retStr = "Protein/Influenza/Nucleotide Cache Size-->" + proteinCache.size() + "/"
- + influenzaCache.size() + "/" + nucleiodCache.size();
- return retStr;
+ return "Protein/Influenza/Nucleotide Cache Size-->" + proteinCache.size() + "/"
+ + influenzaCache.size() + "/" + nucleiodCache.size();
}
}
Modified: trunk/demos/ec2/src/main/java/org/infinispan/ec2demo/InfluenzaVirusCache.java
===================================================================
--- trunk/demos/ec2/src/main/java/org/infinispan/ec2demo/InfluenzaVirusCache.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/demos/ec2/src/main/java/org/infinispan/ec2demo/InfluenzaVirusCache.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -37,8 +37,7 @@
}
public Influenza_N_P_CR_Element getVirusDetails(String GBAN) {
- Influenza_N_P_CR_Element myVR = myCache.get(GBAN);
- return myVR;
+ return myCache.get(GBAN);
}
public Cache getCache(){
Modified: trunk/demos/ec2/src/main/java/org/infinispan/ec2demo/NucleotideCache.java
===================================================================
--- trunk/demos/ec2/src/main/java/org/infinispan/ec2demo/NucleotideCache.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/demos/ec2/src/main/java/org/infinispan/ec2demo/NucleotideCache.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -35,8 +35,7 @@
}
public Nucleotide_Protein_Element getNucleotideDetails(String GBAN) {
- Nucleotide_Protein_Element myVR = myCache.get(GBAN);
- return myVR;
+ return myCache.get(GBAN);
}
public Cache getCache(){
Modified: trunk/demos/ec2/src/main/java/org/infinispan/ec2demo/ProteinCache.java
===================================================================
--- trunk/demos/ec2/src/main/java/org/infinispan/ec2demo/ProteinCache.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/demos/ec2/src/main/java/org/infinispan/ec2demo/ProteinCache.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -37,8 +37,7 @@
}
public Nucleotide_Protein_Element getProteinDetails(String GBAN) {
- Nucleotide_Protein_Element myVR = myCache.get(GBAN);
- return myVR;
+ return myCache.get(GBAN);
}
public Cache getCache() {
Modified: trunk/demos/gui/src/main/java/org/infinispan/demo/InfinispanDemo.java
===================================================================
--- trunk/demos/gui/src/main/java/org/infinispan/demo/InfinispanDemo.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/demos/gui/src/main/java/org/infinispan/demo/InfinispanDemo.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -464,6 +464,7 @@
public class ClusterTableModel extends AbstractTableModel {
List<String> members = new ArrayList<String>();
List<String> memberStates = new ArrayList<String>();
+ private static final long serialVersionUID = -4321027648450429007L;
public void setMembers(List<Address> m) {
if (m != null && !m.isEmpty()) {
@@ -517,6 +518,7 @@
public class CachedDataTableModel extends AbstractTableModel {
List<InternalCacheEntry> data = new LinkedList<InternalCacheEntry>();
+ private static final long serialVersionUID = -7109980678271415778L;
public int getRowCount() {
return data.size();
Modified: trunk/demos/lucene-directory/src/main/java/org/infinispan/lucenedemo/DemoActions.java
===================================================================
--- trunk/demos/lucene-directory/src/main/java/org/infinispan/lucenedemo/DemoActions.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/demos/lucene-directory/src/main/java/org/infinispan/lucenedemo/DemoActions.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -126,8 +126,7 @@
*/
public Query parseQuery(String queryLine) throws ParseException {
QueryParser parser = new QueryParser(MAIN_FIELD, analyzer);
- Query query = parser.parse(queryLine);
- return query;
+ return parser.parse(queryLine);
}
/**
Modified: trunk/jopr-plugin/src/main/java/org/infinispan/jopr/CacheManagerComponent.java
===================================================================
--- trunk/jopr-plugin/src/main/java/org/infinispan/jopr/CacheManagerComponent.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/jopr-plugin/src/main/java/org/infinispan/jopr/CacheManagerComponent.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -133,8 +133,7 @@
* @return EmsConnection object
*/
protected EmsConnection getConnection() {
- EmsConnection conn = helper.getEmsConnection(context.getPluginConfiguration());
- return conn;
+ return helper.getEmsConnection(context.getPluginConfiguration());
}
private EmsBean queryCacheManagerBean(EmsConnection conn) {
Modified: trunk/lucene-directory/src/main/java/org/infinispan/lucene/InfinispanDirectory.java
===================================================================
--- trunk/lucene-directory/src/main/java/org/infinispan/lucene/InfinispanDirectory.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/lucene-directory/src/main/java/org/infinispan/lucene/InfinispanDirectory.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -94,7 +94,7 @@
public String[] list() throws IOException {
checkIsOpen();
Set<String> filesList = getFileList();
- return filesList.toArray(new String[] {});
+ return filesList.toArray(new String[filesList.size()]);
}
/**
Modified: trunk/lucene-directory/src/main/java/org/infinispan/lucene/InfinispanIndexIO.java
===================================================================
--- trunk/lucene-directory/src/main/java/org/infinispan/lucene/InfinispanIndexIO.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/lucene-directory/src/main/java/org/infinispan/lucene/InfinispanIndexIO.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -53,11 +53,11 @@
return (byte[]) cache.get(key);
}
- private static final int getPositionInBuffer(int pos, int bufferSize) {
+ private static int getPositionInBuffer(int pos, int bufferSize) {
return (pos % bufferSize);
}
- private static final int getChunkNumberFromPosition(int pos, int bufferSize) {
+ private static int getChunkNumberFromPosition(int pos, int bufferSize) {
return ((pos) / (bufferSize));
}
Modified: trunk/lucene-directory/src/test/java/org/infinispan/lucene/profiling/SharedState.java
===================================================================
--- trunk/lucene-directory/src/test/java/org/infinispan/lucene/profiling/SharedState.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/lucene-directory/src/test/java/org/infinispan/lucene/profiling/SharedState.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -64,19 +64,11 @@
}
public long incrementIndexWriterTaskCount(long delta) {
- long count = indexWriterActionCount.addAndGet(delta);
-// if (count%500==0) {
-// System.out.println("IndexWriter tasks done: " + count);
-// }
- return count;
+ return indexWriterActionCount.addAndGet(delta);
}
public long incrementIndexSearchesCount(long delta) {
- long count = searchingActionCount.addAndGet(delta);
-// if (count%500==0) {
-// System.out.println("Search tasks done: " + count);
-// }
- return count;
+ return searchingActionCount.addAndGet(delta);
}
public String getStringToAddToIndex() throws InterruptedException {
Modified: trunk/query/src/main/java/org/infinispan/query/impl/CacheQueryImpl.java
===================================================================
--- trunk/query/src/main/java/org/infinispan/query/impl/CacheQueryImpl.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/query/src/main/java/org/infinispan/query/impl/CacheQueryImpl.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -378,7 +378,7 @@
List<DirectoryProvider> directories = new ArrayList<DirectoryProvider>();
Set<String> idFieldNames = new HashSet<String>();
Similarity searcherSimilarity = null;
- if (targetedEntities.size() == 0) {
+ if (targetedEntities.isEmpty()) {
// empty targetedEntities array means search over all indexed enities,
// but we have to make sure there is at least one
if (builders.isEmpty()) {
@@ -508,7 +508,7 @@
// previously done. Also copied in methods like buildLuceneFilter(), createFilter() and those methods that follow down
// until the end of the class.
private void buildFilters() {
- if (filterDefinitions == null || filterDefinitions.size() == 0) {
+ if (filterDefinitions == null || filterDefinitions.isEmpty()) {
return; // there is nothing to do if we don't have any filter definitions
}
@@ -606,8 +606,7 @@
for (Map.Entry<String, Object> entry : fullTextFilter.getParameters().entrySet()) {
def.invoke(entry.getKey(), instance, entry.getValue());
}
- if (cacheInstance(def.getCacheMode()) && def.getKeyMethod() == null && fullTextFilter.getParameters()
- .size() > 0) {
+ if (cacheInstance(def.getCacheMode()) && def.getKeyMethod() == null && !fullTextFilter.getParameters().isEmpty()) {
throw new SearchException("Filter with parameters and no @Key method: " + fullTextFilter.getName());
}
return instance;
Modified: trunk/query/src/test/java/org/infinispan/query/test/CustomKey2.java
===================================================================
--- trunk/query/src/test/java/org/infinispan/query/test/CustomKey2.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/query/src/test/java/org/infinispan/query/test/CustomKey2.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -7,6 +7,7 @@
@Transformable
public class CustomKey2 implements Serializable {
int i, j, k;
+ private static final long serialVersionUID = -8825579871900146417L;
public CustomKey2(int i, int j, int k) {
this.i = i;
Modified: trunk/query/src/test/java/org/infinispan/query/test/Person.java
===================================================================
--- trunk/query/src/test/java/org/infinispan/query/test/Person.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/query/src/test/java/org/infinispan/query/test/Person.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -23,6 +23,7 @@
private String blurb;
@Field(store = Store.YES, index = Index.UN_TOKENIZED)
private int age;
+ private static final long serialVersionUID = 8251606115293644545L;
public Person() {
}
Modified: trunk/server/memcached/src/main/java/org/infinispan/server/core/netty/memcached/NettyMemcachedDecoder.java
===================================================================
--- trunk/server/memcached/src/main/java/org/infinispan/server/core/netty/memcached/NettyMemcachedDecoder.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/server/memcached/src/main/java/org/infinispan/server/core/netty/memcached/NettyMemcachedDecoder.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -60,7 +60,7 @@
private volatile TextCommand command;
protected enum State {
- READ_COMMAND, READ_UNSTRUCTURED_DATA;
+ READ_COMMAND, READ_UNSTRUCTURED_DATA
}
public NettyMemcachedDecoder(Cache cache, InterceptorChain chain, ScheduledExecutorService scheduler) {
Modified: trunk/server/memcached/src/main/java/org/infinispan/server/memcached/commands/Value.java
===================================================================
--- trunk/server/memcached/src/main/java/org/infinispan/server/memcached/commands/Value.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/server/memcached/src/main/java/org/infinispan/server/memcached/commands/Value.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -38,7 +38,8 @@
private int flags;
private byte[] data;
private long cas;
-
+ private static final long serialVersionUID = -8421160896234703067L;
+
Value(int flags, byte[] data, long cas) {
this.flags = flags;
this.data = data;
Modified: trunk/server/memcached/src/test/java/org/infinispan/server/memcached/FunctionalTest.java
===================================================================
--- trunk/server/memcached/src/test/java/org/infinispan/server/memcached/FunctionalTest.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/server/memcached/src/test/java/org/infinispan/server/memcached/FunctionalTest.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -301,7 +301,7 @@
Future<Boolean> f = client.set(k(m), 0, 1);
assert f.get(5, TimeUnit.SECONDS);
long newValue = client.incr(k(m), Integer.MAX_VALUE);
- assert new Long(Integer.MAX_VALUE) + 1 == newValue : "New value not expected: " + newValue;
+ assert (long) Integer.MAX_VALUE + 1 == newValue : "New value not expected: " + newValue;
}
public void testDecrementBasic(Method m) throws Exception {
Modified: trunk/server/memcached/src/test/java/org/infinispan/server/memcached/test/MemcachedTestingUtil.java
===================================================================
--- trunk/server/memcached/src/test/java/org/infinispan/server/memcached/test/MemcachedTestingUtil.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/server/memcached/src/test/java/org/infinispan/server/memcached/test/MemcachedTestingUtil.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -75,7 +75,7 @@
return timeout;
}
};
- return new MemcachedClient(d, Arrays.asList(new InetSocketAddress[]{new InetSocketAddress(HOST, port)}));
+ return new MemcachedClient(d, Arrays.asList(new InetSocketAddress(HOST, port)));
}
public static TextServer createMemcachedTextServer(Cache cache) throws IOException {
Modified: trunk/src/main/resources/assemblies/all.xml
===================================================================
--- trunk/src/main/resources/assemblies/all.xml 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/src/main/resources/assemblies/all.xml 2010-02-08 15:26:50 UTC (rev 1467)
@@ -134,6 +134,7 @@
<include>org.infinispan:infinispan-server-rest</include>
<include>org.infinispan:infinispan-lucene-directory</include>
<include>org.infinispan:infinispan-lucene-demo</include>
+ <include>org.infinispan:infinispan-netty-transport</include>
</includes>
<sources>
<includeModuleDirectory>false</includeModuleDirectory>
Modified: trunk/tools/src/main/java/org/infinispan/tools/doclet/config/ConfigDoclet.java
===================================================================
--- trunk/tools/src/main/java/org/infinispan/tools/doclet/config/ConfigDoclet.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/tools/src/main/java/org/infinispan/tools/doclet/config/ConfigDoclet.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -38,7 +38,7 @@
private static String title() {
String s = "Configuration options";
- if (title == null || title.equals(""))
+ if (title == null || title.length() == 0)
return s;
else {
s += " (" + title + ")";
Modified: trunk/tools/src/main/java/org/infinispan/tools/doclet/config/ConfigHtmlGenerator.java
===================================================================
--- trunk/tools/src/main/java/org/infinispan/tools/doclet/config/ConfigHtmlGenerator.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/tools/src/main/java/org/infinispan/tools/doclet/config/ConfigHtmlGenerator.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -357,45 +357,53 @@
}
private Field findFieldRecursively(Class<?> c, String fieldName) {
- Field f = null;
- try {
- f = c.getDeclaredField(fieldName);
- } catch (NoSuchFieldException e) {
- ClassDoc classDoc = rootDoc.classNamed(c.getName());
- for (FieldDoc fd : classDoc.fields()) {
- for (Tag t : fd.tags(CONFIG_REF)) {
- Map<String, String> m = parseTag(t.text().trim());
- String field = m.get("name");
- if (field != null && field.startsWith(fieldName)) {
- return findFieldRecursively(c, fd.name());
- }
+ findFieldRecursively:
+ while (true) {
+ Field f = null;
+ try {
+ f = c.getDeclaredField(fieldName);
+ } catch (NoSuchFieldException e) {
+ ClassDoc classDoc = rootDoc.classNamed(c.getName());
+ for (FieldDoc fd : classDoc.fields()) {
+ for (Tag t : fd.tags(CONFIG_REF)) {
+ Map<String, String> m = parseTag(t.text().trim());
+ String field = m.get("name");
+ if (field != null && field.startsWith(fieldName)) {
+ fieldName = fd.name();
+ continue findFieldRecursively;
+ }
+ }
}
+ if (!c.equals(Object.class))
+ f = findFieldRecursively(c.getSuperclass(), fieldName);
}
- if (!c.equals(Object.class))
- f = findFieldRecursively(c.getSuperclass(), fieldName);
+ return f;
}
- return f;
}
private FieldDoc findFieldDocRecursively(Class<?> c, String fieldName, String tagName) {
- ClassDoc classDoc = rootDoc.classNamed(c.getName());
- for (FieldDoc fd : classDoc.fields()) {
- if (fd.name().equalsIgnoreCase(fieldName)) {
- return fd;
- }
- for (Tag t : fd.tags(tagName)) {
- Map<String, String> m = parseTag(t.text().trim());
- if (m.containsKey("name")) {
- String value = m.get("name").trim();
- if (fieldName.equalsIgnoreCase(value)) {
- return fd;
+ while (true) {
+ ClassDoc classDoc = rootDoc.classNamed(c.getName());
+ for (FieldDoc fd : classDoc.fields()) {
+ if (fd.name().equalsIgnoreCase(fieldName)) {
+ return fd;
+ }
+ for (Tag t : fd.tags(tagName)) {
+ Map<String, String> m = parseTag(t.text().trim());
+ if (m.containsKey("name")) {
+ String value = m.get("name").trim();
+ if (fieldName.equalsIgnoreCase(value)) {
+ return fd;
+ }
}
}
}
+ if (c.getSuperclass() != null) {
+ c = c.getSuperclass();
+ continue;
+ }
+ return null;
}
- if (c.getSuperclass() != null)
- return findFieldDocRecursively(c.getSuperclass(), fieldName, tagName);
- return null;
}
private FieldDoc fieldDocWithTag(Class<?> c, String tagName) {
Modified: trunk/tools/src/main/java/org/infinispan/tools/doclet/html/HtmlGenerator.java
===================================================================
--- trunk/tools/src/main/java/org/infinispan/tools/doclet/html/HtmlGenerator.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/tools/src/main/java/org/infinispan/tools/doclet/html/HtmlGenerator.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -82,6 +82,6 @@
protected abstract String generateContents();
protected boolean isValid(String s) {
- return s != null && !s.trim().equals("");
+ return s != null && s.trim().length() != 0;
}
}
Modified: trunk/tools/src/main/java/org/infinispan/tools/doclet/jmx/JmxDoclet.java
===================================================================
--- trunk/tools/src/main/java/org/infinispan/tools/doclet/jmx/JmxDoclet.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/tools/src/main/java/org/infinispan/tools/doclet/jmx/JmxDoclet.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -57,7 +57,7 @@
private static String jmxTitle() {
String s = "JMX Components";
- if (title == null || title.equals(""))
+ if (title == null || title.length() == 0)
return s;
else {
s += " (" + title + ")";
Modified: trunk/tools/src/main/java/org/infinispan/tools/doclet/jmx/MBeanOperation.java
===================================================================
--- trunk/tools/src/main/java/org/infinispan/tools/doclet/jmx/MBeanOperation.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/tools/src/main/java/org/infinispan/tools/doclet/jmx/MBeanOperation.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -17,7 +17,7 @@
}
void addParam(String paramType) {
- if (!signature.equals("")) signature += ", ";
+ if (signature.length() != 0) signature += ", ";
signature += paramType + " p" + n++;
}
}
Modified: trunk/tools/src/main/java/org/infinispan/tools/jopr/RhqPluginXmlGenerator.java
===================================================================
--- trunk/tools/src/main/java/org/infinispan/tools/jopr/RhqPluginXmlGenerator.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/tools/src/main/java/org/infinispan/tools/jopr/RhqPluginXmlGenerator.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -286,7 +286,7 @@
}
}
- private static final void debug(Object o) {
+ private static void debug(Object o) {
// if (log.isDebugEnabled()) log.debug(o);
// System.out.println(o);
}
Modified: trunk/tree/src/main/java/org/infinispan/tree/Fqn.java
===================================================================
--- trunk/tree/src/main/java/org/infinispan/tree/Fqn.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/tree/src/main/java/org/infinispan/tree/Fqn.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -98,6 +98,7 @@
* A cached string representation of this Fqn, used by toString to it isn't calculated again every time.
*/
protected String stringRepresentation;
+ private static final Object[] EMPTY_ARRAY = new Object[]{};
// ----------------- START: Private constructors for use by factory methods only. ----------------------
@@ -116,7 +117,7 @@
if (names != null)
elements = names.toArray();
else
- elements = new Object[]{};
+ elements = EMPTY_ARRAY;
}
private Fqn(Fqn base, Object... relative) {
@@ -204,7 +205,7 @@
*/
@SuppressWarnings("unchecked")
public static Fqn fromString(String stringRepresentation) {
- if (stringRepresentation == null || stringRepresentation.equals(SEPARATOR) || stringRepresentation.equals(""))
+ if (stringRepresentation == null || stringRepresentation.equals(SEPARATOR) || stringRepresentation.length() == 0)
return root();
String toMatch = stringRepresentation.startsWith(SEPARATOR) ? stringRepresentation.substring(1) : stringRepresentation;
@@ -431,7 +432,7 @@
}
}
- public static final Fqn root() // declared final so compilers can optimise and in-line.
+ public static Fqn root() // declared final so compilers can optimise and in-line.
{
return ROOT;
}
Modified: trunk/tree/src/main/java/org/infinispan/tree/FqnComparator.java
===================================================================
--- trunk/tree/src/main/java/org/infinispan/tree/FqnComparator.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/tree/src/main/java/org/infinispan/tree/FqnComparator.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -41,6 +41,7 @@
@Immutable
public class FqnComparator implements Comparator<Fqn>, Serializable {
public static final FqnComparator INSTANCE = new FqnComparator();
+ private static final long serialVersionUID = -1357631755443829281L;
/**
* Returns -1 if the first comes before; 0 if they are the same; 1 if the second Fqn comes before. <code>null</code>
Modified: trunk/tree/src/main/java/org/infinispan/tree/NodeNotValidException.java
===================================================================
--- trunk/tree/src/main/java/org/infinispan/tree/NodeNotValidException.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/tree/src/main/java/org/infinispan/tree/NodeNotValidException.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -30,6 +30,8 @@
* @since 4.0
*/
public class NodeNotValidException extends CacheException {
+ private static final long serialVersionUID = 6576866180835456994L;
+
public NodeNotValidException() {
}
Modified: trunk/tree/src/test/java/org/infinispan/api/tree/NodeMoveAPITest.java
===================================================================
--- trunk/tree/src/test/java/org/infinispan/api/tree/NodeMoveAPITest.java 2010-02-08 13:04:05 UTC (rev 1466)
+++ trunk/tree/src/test/java/org/infinispan/api/tree/NodeMoveAPITest.java 2010-02-08 15:26:50 UTC (rev 1467)
@@ -28,7 +28,7 @@
*
* @author <a href="mailto:manik AT jboss DOT org">Manik Surtani</a>
*/
- at Test(groups = {"functional", "pessimistic"}, testName = "api.tree.NodeMoveAPITest")
+ at Test(groups = "functional", testName = "api.tree.NodeMoveAPITest")
public class NodeMoveAPITest extends SingleCacheManagerTest {
protected final Log log = LogFactory.getLog(getClass());
More information about the infinispan-commits
mailing list