From ec0dd6b1d01944bbdc72866c2e363d6cd95f84c0 Mon Sep 17 00:00:00 2001 From: Henning Schmiedehausen Date: Fri, 20 Dec 2013 15:58:33 -0800 Subject: [PATCH 1/2] tab & checkstyle fixes --- .../java/com/nesscomputing/cache/Base64.java | 34 +++++----- .../cache/CacheConfiguration.java | 2 +- .../cache/CacheTopologyProvider.java | 10 +-- .../cache/NonEvictingJvmCacheProvider.java | 64 +++++++++---------- .../cache/guava/GuavaCacheAdapter.java | 4 +- 5 files changed, 59 insertions(+), 55 deletions(-) diff --git a/src/main/java/com/nesscomputing/cache/Base64.java b/src/main/java/com/nesscomputing/cache/Base64.java index 04c41d8..76d62e8 100644 --- a/src/main/java/com/nesscomputing/cache/Base64.java +++ b/src/main/java/com/nesscomputing/cache/Base64.java @@ -38,17 +38,17 @@ final class Base64 private Base64() { } - static private final int BASELENGTH = 255; - static private final int LOOKUPLENGTH = 64; - static private final int TWENTYFOURBITGROUP = 24; - static private final int EIGHTBIT = 8; - static private final int SIXTEENBIT = 16; -// static private final int SIXBIT = 6; - static private final int FOURBYTE = 4; - static private final int SIGN = -128; - static private final byte PAD = (byte) '='; - static private byte [] base64Alphabet = new byte[BASELENGTH]; - static private byte [] lookUpBase64Alphabet = new byte[LOOKUPLENGTH]; + private static final int BASELENGTH = 255; + private static final int LOOKUPLENGTH = 64; + private static final int TWENTYFOURBITGROUP = 24; + private static final int EIGHTBIT = 8; + private static final int SIXTEENBIT = 16; +// private static final int SIXBIT = 6; + private static final int FOURBYTE = 4; + private static final int SIGN = -128; + private static final byte PAD = (byte) '='; + private static byte [] base64Alphabet = new byte[BASELENGTH]; + private static byte [] lookUpBase64Alphabet = new byte[LOOKUPLENGTH]; static { @@ -72,14 +72,17 @@ private Base64() { base64Alphabet['+'] = 62; base64Alphabet['/'] = 63; - for (int i = 0; i <= 25; i++ ) + for (int i = 0; i <= 25; i++ ) { lookUpBase64Alphabet[i] = (byte) ('A' + i); + } - for (int i = 26, j = 0; i <= 51; i++, j++ ) + for (int i = 26, j = 0; i <= 51; i++, j++ ) { lookUpBase64Alphabet[i] = (byte) ('a'+ j); + } - for (int i = 52, j = 0; i <= 61; i++, j++ ) + for (int i = 52, j = 0; i <= 61; i++, j++ ) { lookUpBase64Alphabet[i] = (byte) ('0' + j); + } lookUpBase64Alphabet[62] = (byte) '+'; lookUpBase64Alphabet[63] = (byte) '/'; @@ -107,8 +110,9 @@ public static boolean isArrayByteBase64( byte[] arrayOctect ) } for (int i=0; i < length; i++) { - if ( !Base64.isBase64(arrayOctect[i]) ) + if ( !Base64.isBase64(arrayOctect[i]) ) { return false; + } } return true; } diff --git a/src/main/java/com/nesscomputing/cache/CacheConfiguration.java b/src/main/java/com/nesscomputing/cache/CacheConfiguration.java index a51b2c6..e539aaa 100644 --- a/src/main/java/com/nesscomputing/cache/CacheConfiguration.java +++ b/src/main/java/com/nesscomputing/cache/CacheConfiguration.java @@ -155,7 +155,7 @@ public String getMemcachedSeparator() { @Config({"ness.cache.${cacheName}.max-value-size", "ness.cache.max-value-size"}) @Default("1034240") public int getMemcachedMaxValueSize() { - return 1034240; + return 1034240; } @Config({"ness.cache.${cacheName}.read-queue", "ness.cache.read-queue"}) diff --git a/src/main/java/com/nesscomputing/cache/CacheTopologyProvider.java b/src/main/java/com/nesscomputing/cache/CacheTopologyProvider.java index 0b6b32b..8788273 100644 --- a/src/main/java/com/nesscomputing/cache/CacheTopologyProvider.java +++ b/src/main/java/com/nesscomputing/cache/CacheTopologyProvider.java @@ -48,7 +48,7 @@ class CacheTopologyProvider { @Override public InetSocketAddress apply(@Nonnull ServiceInformation input) { return new InetSocketAddress(input.getProperty(ServiceInformation.PROP_SERVICE_ADDRESS), - Integer.valueOf(input.getProperty(ServiceInformation.PROP_SERVICE_PORT))); + Integer.parseInt(input.getProperty(ServiceInformation.PROP_SERVICE_PORT))); } }; @@ -87,10 +87,10 @@ public ImmutableList get() { final Collection serviceInformation; if (cacheName == null) { - serviceInformation = discoveryClient.findAllServiceInformation("memcached"); + serviceInformation = discoveryClient.findAllServiceInformation("memcached"); } else { - serviceInformation = discoveryClient.findAllServiceInformation("memcached", cacheName); + serviceInformation = discoveryClient.findAllServiceInformation("memcached", cacheName); } //apply strict typing @@ -107,7 +107,7 @@ public boolean apply(final ServiceInformation input) { }); final List results = Lists.newArrayList(Collections2.transform(discoverInformation, SERVICE_INFORMATION_TO_INET_SOCKET_ADDRESS)); - Collections.sort(results, InetSocketAddressComparator.DEFAULT); - return ImmutableList.copyOf(results); + Collections.sort(results, InetSocketAddressComparator.DEFAULT); + return ImmutableList.copyOf(results); } } diff --git a/src/main/java/com/nesscomputing/cache/NonEvictingJvmCacheProvider.java b/src/main/java/com/nesscomputing/cache/NonEvictingJvmCacheProvider.java index 3354cde..9a94070 100644 --- a/src/main/java/com/nesscomputing/cache/NonEvictingJvmCacheProvider.java +++ b/src/main/java/com/nesscomputing/cache/NonEvictingJvmCacheProvider.java @@ -36,43 +36,43 @@ */ @Singleton public class NonEvictingJvmCacheProvider implements InternalCacheProvider { - private final static Log LOG = Log.findLog(); - private final ConcurrentMap, byte[]> map = Maps.newConcurrentMap(); + private static final Log LOG = Log.findLog(); + private final ConcurrentMap, byte[]> map = Maps.newConcurrentMap(); - @Override - public void set(String namespace, Collection> stores, @Nullable CacheStatistics cacheStatistics) { - for (CacheStore entry: stores) { - LOG.trace("%s setting %s:%s", this, namespace, entry.getKey()); + @Override + public void set(String namespace, Collection> stores, @Nullable CacheStatistics cacheStatistics) { + for (CacheStore entry: stores) { + LOG.trace("%s setting %s:%s", this, namespace, entry.getKey()); Entry key = Maps.immutableEntry(namespace, entry.getKey()); - byte[] value = entry.getData(); - if (value != null) { + byte[] value = entry.getData(); + if (value != null) { map.put(key, value); - } else { - map.remove(key); - } - } - } + } else { + map.remove(key); + } + } + } - @Override - public Map get(String namespace, Collection keys, @Nullable CacheStatistics cacheStatistics) { - Map ret = Maps.newHashMap(); - for (String key: keys) { - byte[] data = map.get(Maps.immutableEntry(namespace, key)); - LOG.trace("%s getting %s:%s=%s", this, namespace, key, data); - if (data != null) { - ret.put(key, data); - } - } - return ret; - } + @Override + public Map get(String namespace, Collection keys, @Nullable CacheStatistics cacheStatistics) { + Map ret = Maps.newHashMap(); + for (String key: keys) { + byte[] data = map.get(Maps.immutableEntry(namespace, key)); + LOG.trace("%s getting %s:%s=%s", this, namespace, key, data); + if (data != null) { + ret.put(key, data); + } + } + return ret; + } - @Override - public void clear(String namespace, Collection keys, @Nullable CacheStatistics cacheStatistics) { - for (String key: keys) { - LOG.trace("%s clearing %s:%s", this, namespace, key); - map.remove(Maps.immutableEntry(namespace, key)); - } - } + @Override + public void clear(String namespace, Collection keys, @Nullable CacheStatistics cacheStatistics) { + for (String key: keys) { + LOG.trace("%s clearing %s:%s", this, namespace, key); + map.remove(Maps.immutableEntry(namespace, key)); + } + } @Override public Map add(String namespace, Collection> stores, @Nullable CacheStatistics cacheStatistics) diff --git a/src/main/java/com/nesscomputing/cache/guava/GuavaCacheAdapter.java b/src/main/java/com/nesscomputing/cache/guava/GuavaCacheAdapter.java index f73f234..5fadd4a 100644 --- a/src/main/java/com/nesscomputing/cache/guava/GuavaCacheAdapter.java +++ b/src/main/java/com/nesscomputing/cache/guava/GuavaCacheAdapter.java @@ -232,9 +232,9 @@ public void put(K key, V value) { @Override public void putAll(Map m) { - for(Entry entry : m.entrySet()) { + for(Entry entry : m.entrySet()) { put(entry.getKey(), entry.getValue()); - } + } } @SuppressWarnings("unchecked") From ffa85ec7231c56eca623244d95b8a9f1ed3e047a Mon Sep 17 00:00:00 2001 From: Henning Schmiedehausen Date: Mon, 27 Jan 2014 20:21:14 -0800 Subject: [PATCH 2/2] local fixes --- pom.xml | 50 +++++-------------- .../com/nesscomputing/cache/CacheModule.java | 4 +- .../nesscomputing/cache/CacheStatistics.java | 4 +- .../com/nesscomputing/cache/CacheStores.java | 4 +- .../cache/CacheTopologyProvider.java | 13 +++-- .../cache/JmxCacheStatisticsManager.java | 4 +- .../nesscomputing/cache/JvmCacheProvider.java | 8 +-- .../nesscomputing/cache/MemcacheProvider.java | 4 +- .../cache/MemcachedClientFactory.java | 10 ++-- .../nesscomputing/cache/NamespacedCache.java | 6 +-- .../com/nesscomputing/cache/NessCache.java | 2 +- .../cache/NessMemcachedConnectionFactory.java | 4 +- .../cache/guava/GuavaCacheAdapter.java | 6 +-- .../cache/guava/GuavaCacheModuleBuilder.java | 4 +- .../guava/GuavaCacheModuleBuilderImpl.java | 4 +- .../cache/BaseCacheIntegrationSetup.java | 8 +-- .../nesscomputing/cache/BaseCachingTests.java | 8 +-- .../cache/CacheIntegrationTest.java | 15 +++--- .../com/nesscomputing/cache/JvmCacheTest.java | 8 +-- .../cache/MemcachedValueSizeTest.java | 7 ++- .../cache/NamedMemcacheTest.java | 18 +++---- .../nesscomputing/cache/NullCacheTest.java | 10 ++-- .../cache/RemoveReAddNodeTest.java | 20 ++++---- .../cache/ShardedMemcacheIntegrationTest.java | 41 ++++++++------- .../SpyMemcachedRuntimeExceptionTest.java | 18 +++---- .../cache/guava/BasicGuavaCacheTest.java | 11 ++-- .../CustomSerializationGuavaCacheTest.java | 8 +-- .../JacksonSerializationGuavaCacheTest.java | 13 +++-- 28 files changed, 140 insertions(+), 172 deletions(-) diff --git a/pom.xml b/pom.xml index 04af3c7..9530909 100644 --- a/pom.xml +++ b/pom.xml @@ -5,71 +5,50 @@ 4.0.0 com.nesscomputing - ness-oss-parent - 33 + ness-root + 1.0-SNAPSHOT - - scm:git:git://github.com/NessComputing/components-ness-cache.git - scm:git:git@github.com:NessComputing/components-ness-cache.git - http://github.com/NessComputing/components-ness-cache - HEAD - - com.nesscomputing.components ness-cache ness-cache - 1.0.1-SNAPSHOT jar Ness Caching Component - 2.2.3 - 1.6.2 + 1 + false - - com.nesscomputing.components - ness-jackson - 2.3.3 - test - - com.nesscomputing.components ness-logging - 1.1.1 com.nesscomputing.components ness-lifecycle - 1.3.0 com.nesscomputing.components ness-config - 2.3.1 com.nesscomputing.service.discovery discovery-client - ${dep.discovery.version} net.spy spymemcached - 2.10.1 net.sf.ehcache ehcache-core - 2.6.6 @@ -87,13 +66,12 @@ com.google.code.findbugs - jsr305 + annotations org.weakref jmxutils - 1.12 @@ -111,25 +89,17 @@ config-magic - - com.nesscomputing.testing - findbugs-annotations - true - 2.0.0 - - com.fasterxml.jackson.core jackson-annotations - ${dep.jackson.version} com.fasterxml.jackson.dataformat jackson-dataformat-smile - ${dep.jackson.version} runtime + @@ -138,10 +108,15 @@ test + + com.nesscomputing.components + ness-jackson + test + + com.thimbleware.jmemcached jmemcached-core - 1.0.0 test @@ -160,7 +135,6 @@ com.nesscomputing.service.discovery discovery-testing - ${dep.discovery.version} test diff --git a/src/main/java/com/nesscomputing/cache/CacheModule.java b/src/main/java/com/nesscomputing/cache/CacheModule.java index 46f8422..815cfdd 100644 --- a/src/main/java/com/nesscomputing/cache/CacheModule.java +++ b/src/main/java/com/nesscomputing/cache/CacheModule.java @@ -29,12 +29,12 @@ import com.google.inject.Scopes; import com.google.inject.name.Names; -import org.apache.commons.lang3.StringUtils; - import com.nesscomputing.config.Config; import com.nesscomputing.config.ConfigProvider; import com.nesscomputing.logging.Log; +import org.apache.commons.lang3.StringUtils; + public class CacheModule extends AbstractModule { private static final Log LOG = Log.findLog(); diff --git a/src/main/java/com/nesscomputing/cache/CacheStatistics.java b/src/main/java/com/nesscomputing/cache/CacheStatistics.java index 4f153eb..004bb08 100644 --- a/src/main/java/com/nesscomputing/cache/CacheStatistics.java +++ b/src/main/java/com/nesscomputing/cache/CacheStatistics.java @@ -20,10 +20,10 @@ import javax.annotation.concurrent.ThreadSafe; -import org.weakref.jmx.Managed; - import com.nesscomputing.logging.Log; +import org.weakref.jmx.Managed; + /** * Bean to hold cache statistics on a per-namespace basis */ diff --git a/src/main/java/com/nesscomputing/cache/CacheStores.java b/src/main/java/com/nesscomputing/cache/CacheStores.java index 9d8e039..27ee9a8 100644 --- a/src/main/java/com/nesscomputing/cache/CacheStores.java +++ b/src/main/java/com/nesscomputing/cache/CacheStores.java @@ -18,14 +18,14 @@ import java.util.Arrays; import java.util.Collection; -import org.joda.time.DateTime; - import javax.annotation.Nonnull; import com.google.common.base.Function; import com.google.common.base.Preconditions; import com.google.common.collect.Collections2; +import org.joda.time.DateTime; + import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; @SuppressFBWarnings("NP_PARAMETER_MUST_BE_NONNULL_BUT_MARKED_AS_NULLABLE") diff --git a/src/main/java/com/nesscomputing/cache/CacheTopologyProvider.java b/src/main/java/com/nesscomputing/cache/CacheTopologyProvider.java index 8788273..0138b58 100644 --- a/src/main/java/com/nesscomputing/cache/CacheTopologyProvider.java +++ b/src/main/java/com/nesscomputing/cache/CacheTopologyProvider.java @@ -15,8 +15,6 @@ */ package com.nesscomputing.cache; -import com.nesscomputing.logging.Log; - import java.net.InetSocketAddress; import java.net.URI; import java.util.Collection; @@ -25,11 +23,6 @@ import javax.annotation.Nonnull; -import com.nesscomputing.service.discovery.client.ReadOnlyDiscoveryClient; -import com.nesscomputing.service.discovery.client.ServiceInformation; - -import org.apache.commons.lang3.StringUtils; - import com.google.common.base.Function; import com.google.common.base.Predicate; import com.google.common.collect.Collections2; @@ -39,6 +32,12 @@ import com.google.inject.Singleton; import com.google.inject.name.Named; +import com.nesscomputing.logging.Log; +import com.nesscomputing.service.discovery.client.ReadOnlyDiscoveryClient; +import com.nesscomputing.service.discovery.client.ServiceInformation; + +import org.apache.commons.lang3.StringUtils; + /** * Use service discovery or configuration to assemble a set of Memcache servers dynamically. */ diff --git a/src/main/java/com/nesscomputing/cache/JmxCacheStatisticsManager.java b/src/main/java/com/nesscomputing/cache/JmxCacheStatisticsManager.java index af0383f..5af610d 100644 --- a/src/main/java/com/nesscomputing/cache/JmxCacheStatisticsManager.java +++ b/src/main/java/com/nesscomputing/cache/JmxCacheStatisticsManager.java @@ -25,13 +25,13 @@ import com.google.inject.Inject; import com.google.inject.Singleton; -import org.weakref.jmx.MBeanExporter; - import com.nesscomputing.lifecycle.Lifecycle; import com.nesscomputing.lifecycle.LifecycleListener; import com.nesscomputing.lifecycle.LifecycleStage; import com.nesscomputing.logging.Log; +import org.weakref.jmx.MBeanExporter; + /** * Manage various {@link CacheStatistics} beans exported via JMX. Exports them on first access, * and unexports them on lifecycle shutdown. diff --git a/src/main/java/com/nesscomputing/cache/JvmCacheProvider.java b/src/main/java/com/nesscomputing/cache/JvmCacheProvider.java index d296468..11f46d1 100644 --- a/src/main/java/com/nesscomputing/cache/JvmCacheProvider.java +++ b/src/main/java/com/nesscomputing/cache/JvmCacheProvider.java @@ -26,6 +26,10 @@ import com.google.inject.Inject; import com.google.inject.Singleton; +import com.nesscomputing.lifecycle.Lifecycle; +import com.nesscomputing.lifecycle.LifecycleListener; +import com.nesscomputing.lifecycle.LifecycleStage; + import net.sf.ehcache.Cache; import net.sf.ehcache.CacheManager; import net.sf.ehcache.Element; @@ -36,10 +40,6 @@ import org.joda.time.DateTime; -import com.nesscomputing.lifecycle.Lifecycle; -import com.nesscomputing.lifecycle.LifecycleListener; -import com.nesscomputing.lifecycle.LifecycleStage; - /** * An in-JVM cache, currently backed by EHCache */ diff --git a/src/main/java/com/nesscomputing/cache/MemcacheProvider.java b/src/main/java/com/nesscomputing/cache/MemcacheProvider.java index d6aafb9..8f23256 100644 --- a/src/main/java/com/nesscomputing/cache/MemcacheProvider.java +++ b/src/main/java/com/nesscomputing/cache/MemcacheProvider.java @@ -39,13 +39,13 @@ import com.google.inject.Inject; import com.google.inject.Singleton; +import com.nesscomputing.logging.Log; + import net.spy.memcached.MemcachedClient; import net.spy.memcached.OperationTimeoutException; import org.joda.time.DateTime; -import com.nesscomputing.logging.Log; - /** * Provide a cache based upon a memached server diff --git a/src/main/java/com/nesscomputing/cache/MemcachedClientFactory.java b/src/main/java/com/nesscomputing/cache/MemcachedClientFactory.java index e8a0059..86ab95c 100644 --- a/src/main/java/com/nesscomputing/cache/MemcachedClientFactory.java +++ b/src/main/java/com/nesscomputing/cache/MemcachedClientFactory.java @@ -15,9 +15,6 @@ */ package com.nesscomputing.cache; -import com.nesscomputing.lifecycle.LifecycleStage; -import com.nesscomputing.lifecycle.guice.OnStage; - import java.io.IOException; import java.net.InetSocketAddress; import java.util.concurrent.ScheduledExecutorService; @@ -30,8 +27,6 @@ import javax.annotation.Nullable; import javax.annotation.concurrent.ThreadSafe; -import net.spy.memcached.MemcachedClient; - import com.google.common.base.Objects; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; @@ -39,8 +34,13 @@ import com.google.inject.Inject; import com.google.inject.Singleton; import com.google.inject.name.Named; + +import com.nesscomputing.lifecycle.LifecycleStage; +import com.nesscomputing.lifecycle.guice.OnStage; import com.nesscomputing.logging.Log; +import net.spy.memcached.MemcachedClient; + /** * Maintain a {@link MemcachedClient} which is always connected to the currently operating * memcached cluster. Periodically uses the {@link CacheTopologyProvider} and if there is a change, diff --git a/src/main/java/com/nesscomputing/cache/NamespacedCache.java b/src/main/java/com/nesscomputing/cache/NamespacedCache.java index 8971885..20585eb 100644 --- a/src/main/java/com/nesscomputing/cache/NamespacedCache.java +++ b/src/main/java/com/nesscomputing/cache/NamespacedCache.java @@ -23,12 +23,12 @@ import javax.annotation.CheckForNull; import javax.annotation.Nonnull; -import org.apache.commons.lang3.BooleanUtils; -import org.joda.time.DateTime; - import com.google.common.base.Function; import com.google.common.collect.Collections2; +import org.apache.commons.lang3.BooleanUtils; +import org.joda.time.DateTime; + /** * A facade over a {@link NessCache} which has the namespace field * pre-filled. diff --git a/src/main/java/com/nesscomputing/cache/NessCache.java b/src/main/java/com/nesscomputing/cache/NessCache.java index 0d98d8c..98e161e 100644 --- a/src/main/java/com/nesscomputing/cache/NessCache.java +++ b/src/main/java/com/nesscomputing/cache/NessCache.java @@ -36,7 +36,7 @@ public interface NessCache { * } * */ - public NamespacedCache withNamespace(String namespace); + NamespacedCache withNamespace(String namespace); /** * In a given namespace, store (add or overwrite) a collection of keys and corresponding values diff --git a/src/main/java/com/nesscomputing/cache/NessMemcachedConnectionFactory.java b/src/main/java/com/nesscomputing/cache/NessMemcachedConnectionFactory.java index 6d1f468..ff20c79 100644 --- a/src/main/java/com/nesscomputing/cache/NessMemcachedConnectionFactory.java +++ b/src/main/java/com/nesscomputing/cache/NessMemcachedConnectionFactory.java @@ -18,14 +18,14 @@ import java.util.concurrent.BlockingQueue; import java.util.concurrent.LinkedBlockingQueue; +import com.google.inject.Inject; + import net.spy.memcached.FailureMode; import net.spy.memcached.KetamaConnectionFactory; import net.spy.memcached.OperationFactory; import net.spy.memcached.ops.Operation; import net.spy.memcached.protocol.binary.BinaryOperationFactory; import net.spy.memcached.transcoders.Transcoder; - -import com.google.inject.Inject; /** * A ConnectionFactory which is Ketama and Binary capable, and uses the custom Ness transcoder. */ diff --git a/src/main/java/com/nesscomputing/cache/guava/GuavaCacheAdapter.java b/src/main/java/com/nesscomputing/cache/guava/GuavaCacheAdapter.java index 5fadd4a..42c2100 100644 --- a/src/main/java/com/nesscomputing/cache/guava/GuavaCacheAdapter.java +++ b/src/main/java/com/nesscomputing/cache/guava/GuavaCacheAdapter.java @@ -43,12 +43,12 @@ import com.google.common.util.concurrent.UncheckedExecutionException; import com.google.inject.TypeLiteral; -import org.joda.time.DateTime; -import org.joda.time.Duration; - import com.nesscomputing.cache.NamespacedCache; import com.nesscomputing.logging.Log; +import org.joda.time.DateTime; +import org.joda.time.Duration; + /** * Provides a Guava Cache implementation backed by a namespaced NessCache. * @see GuavaCacheModuleBuilder diff --git a/src/main/java/com/nesscomputing/cache/guava/GuavaCacheModuleBuilder.java b/src/main/java/com/nesscomputing/cache/guava/GuavaCacheModuleBuilder.java index 031ee8a..a84ac91 100644 --- a/src/main/java/com/nesscomputing/cache/guava/GuavaCacheModuleBuilder.java +++ b/src/main/java/com/nesscomputing/cache/guava/GuavaCacheModuleBuilder.java @@ -17,14 +17,14 @@ import java.lang.annotation.Annotation; -import org.joda.time.Duration; - import com.google.common.base.Function; import com.google.common.cache.CacheLoader; import com.google.inject.Key; import com.google.inject.Module; import com.google.inject.Provider; +import org.joda.time.Duration; + /** * Guice module builder which provides Cache<K, V> implementations for any * type K, V backed by NessCache. diff --git a/src/main/java/com/nesscomputing/cache/guava/GuavaCacheModuleBuilderImpl.java b/src/main/java/com/nesscomputing/cache/guava/GuavaCacheModuleBuilderImpl.java index c1cc672..a0aff9f 100644 --- a/src/main/java/com/nesscomputing/cache/guava/GuavaCacheModuleBuilderImpl.java +++ b/src/main/java/com/nesscomputing/cache/guava/GuavaCacheModuleBuilderImpl.java @@ -35,11 +35,11 @@ import com.google.inject.util.Providers; import com.google.inject.util.Types; -import org.joda.time.Duration; - import com.nesscomputing.cache.NamespacedCache; import com.nesscomputing.cache.NessCache; +import org.joda.time.Duration; + class GuavaCacheModuleBuilderImpl implements GuavaCacheModuleBuilder { private final String cacheName; diff --git a/src/test/java/com/nesscomputing/cache/BaseCacheIntegrationSetup.java b/src/test/java/com/nesscomputing/cache/BaseCacheIntegrationSetup.java index 5fe589f..1ec622e 100644 --- a/src/test/java/com/nesscomputing/cache/BaseCacheIntegrationSetup.java +++ b/src/test/java/com/nesscomputing/cache/BaseCacheIntegrationSetup.java @@ -17,10 +17,6 @@ import java.net.InetSocketAddress; -import org.junit.After; -import org.junit.Before; - -import com.nesscomputing.testing.lessio.AllowNetworkListen; import com.thimbleware.jmemcached.CacheImpl; import com.thimbleware.jmemcached.Key; import com.thimbleware.jmemcached.LocalCacheElement; @@ -29,6 +25,10 @@ import com.thimbleware.jmemcached.storage.hash.ConcurrentLinkedHashMap; import com.thimbleware.jmemcached.storage.hash.ConcurrentLinkedHashMap.EvictionPolicy; +import org.junit.After; +import org.junit.Before; +import org.kitei.testing.lessio.AllowNetworkListen; + /** * Set up a memcached on localhost: */ diff --git a/src/test/java/com/nesscomputing/cache/BaseCachingTests.java b/src/test/java/com/nesscomputing/cache/BaseCachingTests.java index 2a48aec..6d3a8d3 100644 --- a/src/test/java/com/nesscomputing/cache/BaseCachingTests.java +++ b/src/test/java/com/nesscomputing/cache/BaseCachingTests.java @@ -23,15 +23,15 @@ import java.util.Collections; import java.util.Map; -import org.joda.time.DateTime; -import org.junit.Assert; -import org.junit.Test; - import com.google.common.base.Charsets; import com.google.common.collect.ImmutableList; import com.google.inject.Inject; import com.google.inject.name.Named; +import org.joda.time.DateTime; +import org.junit.Assert; +import org.junit.Test; + public abstract class BaseCachingTests { @Inject @Named("test") diff --git a/src/test/java/com/nesscomputing/cache/CacheIntegrationTest.java b/src/test/java/com/nesscomputing/cache/CacheIntegrationTest.java index f094d95..72b94de 100644 --- a/src/test/java/com/nesscomputing/cache/CacheIntegrationTest.java +++ b/src/test/java/com/nesscomputing/cache/CacheIntegrationTest.java @@ -15,12 +15,6 @@ */ package com.nesscomputing.cache; -import com.nesscomputing.service.discovery.client.ReadOnlyDiscoveryClient; - -import org.easymock.EasyMock; -import org.junit.After; -import org.junit.Before; - import com.google.inject.AbstractModule; import com.google.inject.Guice; import com.google.inject.Inject; @@ -29,8 +23,13 @@ import com.nesscomputing.lifecycle.Lifecycle; import com.nesscomputing.lifecycle.LifecycleStage; import com.nesscomputing.lifecycle.guice.LifecycleModule; -import com.nesscomputing.testing.lessio.AllowDNSResolution; -import com.nesscomputing.testing.lessio.AllowNetworkAccess; +import com.nesscomputing.service.discovery.client.ReadOnlyDiscoveryClient; + +import org.easymock.EasyMock; +import org.junit.After; +import org.junit.Before; +import org.kitei.testing.lessio.AllowDNSResolution; +import org.kitei.testing.lessio.AllowNetworkAccess; @AllowDNSResolution @AllowNetworkAccess(endpoints = {"127.0.0.1:0"}) diff --git a/src/test/java/com/nesscomputing/cache/JvmCacheTest.java b/src/test/java/com/nesscomputing/cache/JvmCacheTest.java index 9d6010e..6801707 100644 --- a/src/test/java/com/nesscomputing/cache/JvmCacheTest.java +++ b/src/test/java/com/nesscomputing/cache/JvmCacheTest.java @@ -19,12 +19,12 @@ import com.google.inject.Guice; import com.google.inject.Inject; -import org.easymock.EasyMock; -import org.junit.Before; - import com.nesscomputing.config.Config; import com.nesscomputing.lifecycle.Lifecycle; -import com.nesscomputing.testing.lessio.AllowDNSResolution; + +import org.easymock.EasyMock; +import org.junit.Before; +import org.kitei.testing.lessio.AllowDNSResolution; @AllowDNSResolution public class JvmCacheTest extends BaseCachingTests { diff --git a/src/test/java/com/nesscomputing/cache/MemcachedValueSizeTest.java b/src/test/java/com/nesscomputing/cache/MemcachedValueSizeTest.java index 94be37e..5def64a 100644 --- a/src/test/java/com/nesscomputing/cache/MemcachedValueSizeTest.java +++ b/src/test/java/com/nesscomputing/cache/MemcachedValueSizeTest.java @@ -39,10 +39,9 @@ import org.junit.After; import org.junit.Before; import org.junit.Test; - -import com.nesscomputing.testing.lessio.AllowDNSResolution; -import com.nesscomputing.testing.lessio.AllowNetworkAccess; -import com.nesscomputing.testing.lessio.AllowNetworkListen; +import org.kitei.testing.lessio.AllowDNSResolution; +import org.kitei.testing.lessio.AllowNetworkAccess; +import org.kitei.testing.lessio.AllowNetworkListen; @AllowDNSResolution @AllowNetworkListen(ports = {0}) diff --git a/src/test/java/com/nesscomputing/cache/NamedMemcacheTest.java b/src/test/java/com/nesscomputing/cache/NamedMemcacheTest.java index 19863e0..f9233f6 100644 --- a/src/test/java/com/nesscomputing/cache/NamedMemcacheTest.java +++ b/src/test/java/com/nesscomputing/cache/NamedMemcacheTest.java @@ -36,12 +36,6 @@ import com.thimbleware.jmemcached.storage.hash.ConcurrentLinkedHashMap; import com.thimbleware.jmemcached.storage.hash.ConcurrentLinkedHashMap.EvictionPolicy; -import org.joda.time.DateTime; -import org.junit.After; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; - import com.nesscomputing.config.Config; import com.nesscomputing.lifecycle.Lifecycle; import com.nesscomputing.lifecycle.LifecycleStage; @@ -52,9 +46,15 @@ import com.nesscomputing.service.discovery.client.ReadOnlyDiscoveryClient; import com.nesscomputing.service.discovery.client.ServiceInformation; import com.nesscomputing.service.discovery.testing.client.MockedDiscoveryClient; -import com.nesscomputing.testing.lessio.AllowDNSResolution; -import com.nesscomputing.testing.lessio.AllowNetworkAccess; -import com.nesscomputing.testing.lessio.AllowNetworkListen; + +import org.joda.time.DateTime; +import org.junit.After; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; +import org.kitei.testing.lessio.AllowDNSResolution; +import org.kitei.testing.lessio.AllowNetworkAccess; +import org.kitei.testing.lessio.AllowNetworkListen; /** * @author christopher diff --git a/src/test/java/com/nesscomputing/cache/NullCacheTest.java b/src/test/java/com/nesscomputing/cache/NullCacheTest.java index 214169e..6511ea2 100644 --- a/src/test/java/com/nesscomputing/cache/NullCacheTest.java +++ b/src/test/java/com/nesscomputing/cache/NullCacheTest.java @@ -25,16 +25,16 @@ import com.google.inject.Inject; import com.google.inject.name.Named; -import org.joda.time.DateTime; -import org.junit.After; -import org.junit.Before; -import org.junit.Test; - import com.nesscomputing.config.Config; import com.nesscomputing.lifecycle.Lifecycle; import com.nesscomputing.lifecycle.LifecycleStage; import com.nesscomputing.lifecycle.guice.LifecycleModule; +import org.joda.time.DateTime; +import org.junit.After; +import org.junit.Before; +import org.junit.Test; + public class NullCacheTest { @Inject diff --git a/src/test/java/com/nesscomputing/cache/RemoveReAddNodeTest.java b/src/test/java/com/nesscomputing/cache/RemoveReAddNodeTest.java index 8664c2c..75eae8c 100644 --- a/src/test/java/com/nesscomputing/cache/RemoveReAddNodeTest.java +++ b/src/test/java/com/nesscomputing/cache/RemoveReAddNodeTest.java @@ -36,13 +36,6 @@ import com.thimbleware.jmemcached.storage.hash.ConcurrentLinkedHashMap; import com.thimbleware.jmemcached.storage.hash.ConcurrentLinkedHashMap.EvictionPolicy; -import org.joda.time.DateTime; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; - import com.nesscomputing.config.Config; import com.nesscomputing.lifecycle.Lifecycle; import com.nesscomputing.lifecycle.LifecycleStage; @@ -52,9 +45,16 @@ import com.nesscomputing.service.discovery.client.ReadOnlyDiscoveryClient; import com.nesscomputing.service.discovery.client.ServiceInformation; import com.nesscomputing.service.discovery.testing.client.MockedDiscoveryClient; -import com.nesscomputing.testing.lessio.AllowDNSResolution; -import com.nesscomputing.testing.lessio.AllowNetworkAccess; -import com.nesscomputing.testing.lessio.AllowNetworkListen; + +import org.joda.time.DateTime; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; +import org.kitei.testing.lessio.AllowDNSResolution; +import org.kitei.testing.lessio.AllowNetworkAccess; +import org.kitei.testing.lessio.AllowNetworkListen; @AllowDNSResolution @AllowNetworkListen(ports = {0}) diff --git a/src/test/java/com/nesscomputing/cache/ShardedMemcacheIntegrationTest.java b/src/test/java/com/nesscomputing/cache/ShardedMemcacheIntegrationTest.java index 93e29e3..7a00e80 100644 --- a/src/test/java/com/nesscomputing/cache/ShardedMemcacheIntegrationTest.java +++ b/src/test/java/com/nesscomputing/cache/ShardedMemcacheIntegrationTest.java @@ -24,33 +24,12 @@ import java.util.Random; import java.util.UUID; -import com.nesscomputing.service.discovery.client.DiscoveryClient; -import com.nesscomputing.service.discovery.client.ReadOnlyDiscoveryClient; -import com.nesscomputing.service.discovery.client.ServiceInformation; -import com.nesscomputing.service.discovery.testing.client.MockedDiscoveryClient; - -import org.joda.time.DateTime; -import org.junit.After; -import org.junit.Assert; -import org.junit.Before; -import org.junit.Ignore; -import org.junit.Test; - import com.google.common.collect.ImmutableList; import com.google.common.collect.Maps; import com.google.inject.AbstractModule; import com.google.inject.Guice; import com.google.inject.Inject; import com.google.inject.name.Named; - -import com.nesscomputing.config.Config; -import com.nesscomputing.lifecycle.Lifecycle; -import com.nesscomputing.lifecycle.LifecycleStage; -import com.nesscomputing.lifecycle.guice.LifecycleModule; -import com.nesscomputing.logging.Log; -import com.nesscomputing.testing.lessio.AllowDNSResolution; -import com.nesscomputing.testing.lessio.AllowNetworkAccess; -import com.nesscomputing.testing.lessio.AllowNetworkListen; import com.thimbleware.jmemcached.CacheImpl; import com.thimbleware.jmemcached.Key; import com.thimbleware.jmemcached.LocalCacheElement; @@ -59,6 +38,26 @@ import com.thimbleware.jmemcached.storage.hash.ConcurrentLinkedHashMap; import com.thimbleware.jmemcached.storage.hash.ConcurrentLinkedHashMap.EvictionPolicy; +import com.nesscomputing.config.Config; +import com.nesscomputing.lifecycle.Lifecycle; +import com.nesscomputing.lifecycle.LifecycleStage; +import com.nesscomputing.lifecycle.guice.LifecycleModule; +import com.nesscomputing.logging.Log; +import com.nesscomputing.service.discovery.client.DiscoveryClient; +import com.nesscomputing.service.discovery.client.ReadOnlyDiscoveryClient; +import com.nesscomputing.service.discovery.client.ServiceInformation; +import com.nesscomputing.service.discovery.testing.client.MockedDiscoveryClient; + +import org.joda.time.DateTime; +import org.junit.After; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Ignore; +import org.junit.Test; +import org.kitei.testing.lessio.AllowDNSResolution; +import org.kitei.testing.lessio.AllowNetworkAccess; +import org.kitei.testing.lessio.AllowNetworkListen; + @AllowDNSResolution @AllowNetworkListen(ports = {0}) @AllowNetworkAccess(endpoints = {"127.0.0.1:0"}) diff --git a/src/test/java/com/nesscomputing/cache/SpyMemcachedRuntimeExceptionTest.java b/src/test/java/com/nesscomputing/cache/SpyMemcachedRuntimeExceptionTest.java index b2224c6..5dc4c60 100644 --- a/src/test/java/com/nesscomputing/cache/SpyMemcachedRuntimeExceptionTest.java +++ b/src/test/java/com/nesscomputing/cache/SpyMemcachedRuntimeExceptionTest.java @@ -19,15 +19,6 @@ import java.net.InetSocketAddress; -import net.spy.memcached.BinaryConnectionFactory; -import net.spy.memcached.DefaultConnectionFactory; -import net.spy.memcached.FailureMode; -import net.spy.memcached.MemcachedClient; - -import org.junit.After; -import org.junit.Ignore; -import org.junit.Test; - import com.google.common.collect.Lists; import com.thimbleware.jmemcached.CacheImpl; import com.thimbleware.jmemcached.Key; @@ -37,6 +28,15 @@ import com.thimbleware.jmemcached.storage.hash.ConcurrentLinkedHashMap; import com.thimbleware.jmemcached.storage.hash.ConcurrentLinkedHashMap.EvictionPolicy; +import net.spy.memcached.BinaryConnectionFactory; +import net.spy.memcached.DefaultConnectionFactory; +import net.spy.memcached.FailureMode; +import net.spy.memcached.MemcachedClient; + +import org.junit.After; +import org.junit.Ignore; +import org.junit.Test; + @Ignore // Filed as http://code.google.com/p/spymemcached/issues/detail?id=189 public class SpyMemcachedRuntimeExceptionTest { diff --git a/src/test/java/com/nesscomputing/cache/guava/BasicGuavaCacheTest.java b/src/test/java/com/nesscomputing/cache/guava/BasicGuavaCacheTest.java index c719799..eb3ded6 100644 --- a/src/test/java/com/nesscomputing/cache/guava/BasicGuavaCacheTest.java +++ b/src/test/java/com/nesscomputing/cache/guava/BasicGuavaCacheTest.java @@ -22,11 +22,6 @@ import java.util.Collections; import java.util.concurrent.Callable; - -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; - import com.google.common.base.Charsets; import com.google.common.base.Functions; import com.google.common.cache.Cache; @@ -41,7 +36,11 @@ import com.nesscomputing.lifecycle.junit.LifecycleRule; import com.nesscomputing.lifecycle.junit.LifecycleRunner; import com.nesscomputing.lifecycle.junit.LifecycleStatement; -import com.nesscomputing.testing.lessio.AllowDNSResolution; + +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.kitei.testing.lessio.AllowDNSResolution; @AllowDNSResolution @RunWith(LifecycleRunner.class) diff --git a/src/test/java/com/nesscomputing/cache/guava/CustomSerializationGuavaCacheTest.java b/src/test/java/com/nesscomputing/cache/guava/CustomSerializationGuavaCacheTest.java index 3d0ea0e..c962bdf 100644 --- a/src/test/java/com/nesscomputing/cache/guava/CustomSerializationGuavaCacheTest.java +++ b/src/test/java/com/nesscomputing/cache/guava/CustomSerializationGuavaCacheTest.java @@ -27,16 +27,16 @@ import com.google.inject.Inject; import com.google.inject.name.Named; -import org.junit.Test; -import org.junit.runner.RunWith; - import com.nesscomputing.cache.CacheModule; import com.nesscomputing.config.Config; import com.nesscomputing.config.ConfigModule; import com.nesscomputing.lifecycle.junit.LifecycleRule; import com.nesscomputing.lifecycle.junit.LifecycleRunner; import com.nesscomputing.lifecycle.junit.LifecycleStatement; -import com.nesscomputing.testing.lessio.AllowDNSResolution; + +import org.junit.Test; +import org.junit.runner.RunWith; +import org.kitei.testing.lessio.AllowDNSResolution; @AllowDNSResolution diff --git a/src/test/java/com/nesscomputing/cache/guava/JacksonSerializationGuavaCacheTest.java b/src/test/java/com/nesscomputing/cache/guava/JacksonSerializationGuavaCacheTest.java index f0f17ae..a88e4a2 100644 --- a/src/test/java/com/nesscomputing/cache/guava/JacksonSerializationGuavaCacheTest.java +++ b/src/test/java/com/nesscomputing/cache/guava/JacksonSerializationGuavaCacheTest.java @@ -23,12 +23,6 @@ import java.util.concurrent.Callable; import java.util.concurrent.atomic.AtomicBoolean; - -import org.joda.time.DateTime; -import org.joda.time.DateTimeZone; -import org.junit.Test; -import org.junit.runner.RunWith; - import com.google.common.cache.Cache; import com.google.inject.AbstractModule; import com.google.inject.Guice; @@ -45,7 +39,12 @@ import com.nesscomputing.lifecycle.junit.LifecycleRule; import com.nesscomputing.lifecycle.junit.LifecycleRunner; import com.nesscomputing.lifecycle.junit.LifecycleStatement; -import com.nesscomputing.testing.lessio.AllowDNSResolution; + +import org.joda.time.DateTime; +import org.joda.time.DateTimeZone; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.kitei.testing.lessio.AllowDNSResolution; @AllowDNSResolution @RunWith(LifecycleRunner.class)