diff --git a/astyanax-core/src/main/java/com/netflix/astyanax/connectionpool/Host.java b/astyanax-core/src/main/java/com/netflix/astyanax/connectionpool/Host.java index bc342cca7..a5499d75d 100644 --- a/astyanax-core/src/main/java/com/netflix/astyanax/connectionpool/Host.java +++ b/astyanax-core/src/main/java/com/netflix/astyanax/connectionpool/Host.java @@ -48,7 +48,7 @@ public class Host implements Comparable { private Set alternateIpAddress = Sets.newHashSet(); private List ranges = Lists.newArrayList(); - public static Pattern IP_ADDR_PATTERN = Pattern + public static final Pattern IP_ADDR_PATTERN = Pattern .compile("^(([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])\\.){3}([0-9]|[1-9][0-9]|1[0-9]{2}|2[0-4][0-9]|25[0-5])$"); /** diff --git a/astyanax-core/src/main/java/com/netflix/astyanax/retry/RunOnce.java b/astyanax-core/src/main/java/com/netflix/astyanax/retry/RunOnce.java index d1ce50306..877d6a6f7 100644 --- a/astyanax-core/src/main/java/com/netflix/astyanax/retry/RunOnce.java +++ b/astyanax-core/src/main/java/com/netflix/astyanax/retry/RunOnce.java @@ -18,7 +18,7 @@ import org.apache.commons.lang.builder.ToStringBuilder; public class RunOnce implements RetryPolicy { - public static RunOnce instance = new RunOnce(); + public static final RunOnce instance = new RunOnce(); public static RunOnce get() { return instance; diff --git a/astyanax-core/src/main/java/com/netflix/astyanax/shallows/EmptyLatencyScoreStrategyImpl.java b/astyanax-core/src/main/java/com/netflix/astyanax/shallows/EmptyLatencyScoreStrategyImpl.java index 8f4773942..5dbd0fb09 100644 --- a/astyanax-core/src/main/java/com/netflix/astyanax/shallows/EmptyLatencyScoreStrategyImpl.java +++ b/astyanax-core/src/main/java/com/netflix/astyanax/shallows/EmptyLatencyScoreStrategyImpl.java @@ -23,7 +23,7 @@ public class EmptyLatencyScoreStrategyImpl implements LatencyScoreStrategy { - public static EmptyLatencyScoreStrategyImpl instance = new EmptyLatencyScoreStrategyImpl(); + public static final EmptyLatencyScoreStrategyImpl instance = new EmptyLatencyScoreStrategyImpl(); public static EmptyLatencyScoreStrategyImpl get() { return instance; diff --git a/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/AllRowsQueryTest.java b/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/AllRowsQueryTest.java index b54d48ebe..5fc885f3f 100644 --- a/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/AllRowsQueryTest.java +++ b/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/AllRowsQueryTest.java @@ -24,7 +24,7 @@ public class AllRowsQueryTest extends KeyspaceTests { private static final Logger LOG = LoggerFactory.getLogger(AllRowsQueryTest.class); - public static ColumnFamily CF_ALL_ROWS = ColumnFamily + public static final ColumnFamily CF_ALL_ROWS = ColumnFamily .newColumnFamily( "allrows", StringSerializer.get(), diff --git a/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/CFStandardTests.java b/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/CFStandardTests.java index 95b376b80..674cdae3c 100644 --- a/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/CFStandardTests.java +++ b/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/CFStandardTests.java @@ -44,13 +44,13 @@ public class CFStandardTests extends KeyspaceTests { private static final Logger LOG = Logger.getLogger(CFStandardTests.class); - public static ColumnFamily CF_STANDARD1 = ColumnFamily + public static final ColumnFamily CF_STANDARD1 = ColumnFamily .newColumnFamily( "Standard1", StringSerializer.get(), StringSerializer.get()); - public static ColumnFamily CF_STANDARD2 = ColumnFamily + public static final ColumnFamily CF_STANDARD2 = ColumnFamily .newColumnFamily( "Standard2", StringSerializer.get(), diff --git a/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/ClickStreamTests.java b/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/ClickStreamTests.java index de751253b..d4fa619c8 100644 --- a/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/ClickStreamTests.java +++ b/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/ClickStreamTests.java @@ -20,10 +20,10 @@ public class ClickStreamTests extends KeyspaceTests { - public static AnnotatedCompositeSerializer SE_SERIALIZER + public static final AnnotatedCompositeSerializer SE_SERIALIZER = new AnnotatedCompositeSerializer(SessionEvent.class); - public static ColumnFamily CF_CLICK_STREAM = + public static final ColumnFamily CF_CLICK_STREAM = ColumnFamily.newColumnFamily("ClickStream", StringSerializer.get(), SE_SERIALIZER); @BeforeClass diff --git a/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/CounterColumnTests.java b/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/CounterColumnTests.java index 3c7cf9b19..b07304c7c 100644 --- a/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/CounterColumnTests.java +++ b/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/CounterColumnTests.java @@ -14,7 +14,7 @@ public class CounterColumnTests extends KeyspaceTests { - public static ColumnFamily CF_COUNTER1 = ColumnFamily + public static final ColumnFamily CF_COUNTER1 = ColumnFamily .newColumnFamily( "Counter1", StringSerializer.get(), diff --git a/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/DirectCqlTests.java b/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/DirectCqlTests.java index 9105bb007..39926d34f 100644 --- a/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/DirectCqlTests.java +++ b/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/DirectCqlTests.java @@ -18,13 +18,13 @@ public class DirectCqlTests extends KeyspaceTests { - public static ColumnFamily CF_DIRECT = ColumnFamily + public static final ColumnFamily CF_DIRECT = ColumnFamily .newColumnFamily( "cfdirect", IntegerSerializer.get(), StringSerializer.get()); - public static ColumnFamily CF_EMPTY_TABLE = ColumnFamily + public static final ColumnFamily CF_EMPTY_TABLE = ColumnFamily .newColumnFamily( "empty_table", StringSerializer.get(), diff --git a/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/LongColumnPaginationTests.java b/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/LongColumnPaginationTests.java index eeb4fc15b..440a13050 100644 --- a/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/LongColumnPaginationTests.java +++ b/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/LongColumnPaginationTests.java @@ -18,7 +18,7 @@ public class LongColumnPaginationTests extends KeyspaceTests { - public static ColumnFamily CF_LONGCOLUMN = ColumnFamily + public static final ColumnFamily CF_LONGCOLUMN = ColumnFamily .newColumnFamily( "LongColumn1", StringSerializer.get(), diff --git a/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/RowUniquenessConstraintTest.java b/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/RowUniquenessConstraintTest.java index 633071d69..d59f7b755 100644 --- a/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/RowUniquenessConstraintTest.java +++ b/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/RowUniquenessConstraintTest.java @@ -21,7 +21,7 @@ public class RowUniquenessConstraintTest extends KeyspaceTests { - public static ColumnFamily CF_UNIQUE_CONSTRAINT = ColumnFamily + public static final ColumnFamily CF_UNIQUE_CONSTRAINT = ColumnFamily .newColumnFamily( "cfunique", LongSerializer.get(), diff --git a/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/SerializerPackageTests.java b/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/SerializerPackageTests.java index 9428f24bb..7af8406d9 100644 --- a/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/SerializerPackageTests.java +++ b/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/SerializerPackageTests.java @@ -24,7 +24,7 @@ public class SerializerPackageTests extends KeyspaceTests { private static final Logger LOG = Logger.getLogger(SerializerPackageTests.class); - public static ColumnFamily CF_SERIALIZER1 = ColumnFamily + public static final ColumnFamily CF_SERIALIZER1 = ColumnFamily .newColumnFamily( "Serializer1", StringSerializer.get(), diff --git a/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/SingleColumnMutationTests.java b/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/SingleColumnMutationTests.java index afa4094c7..a5ba8ada2 100644 --- a/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/SingleColumnMutationTests.java +++ b/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/SingleColumnMutationTests.java @@ -12,7 +12,7 @@ public class SingleColumnMutationTests extends KeyspaceTests { - public static ColumnFamily CF_SINGLE_COLUMN = ColumnFamily + public static final ColumnFamily CF_SINGLE_COLUMN = ColumnFamily .newColumnFamily( "cfsinglecolmutation", LongSerializer.get(), diff --git a/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/TimeUUIDTests.java b/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/TimeUUIDTests.java index 7e34c6201..ccc382bca 100644 --- a/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/TimeUUIDTests.java +++ b/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/TimeUUIDTests.java @@ -26,7 +26,7 @@ public class TimeUUIDTests extends KeyspaceTests { private static final Logger LOG = Logger.getLogger(TimeUUIDTests.class); - public static ColumnFamily CF_TIME_UUID = ColumnFamily + public static final ColumnFamily CF_TIME_UUID = ColumnFamily .newColumnFamily( "TimeUUID1", StringSerializer.get(), diff --git a/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/recipes/ChunkedObjectStoreTest.java b/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/recipes/ChunkedObjectStoreTest.java index 66d0cfd39..cb23c5de1 100644 --- a/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/recipes/ChunkedObjectStoreTest.java +++ b/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/recipes/ChunkedObjectStoreTest.java @@ -19,7 +19,7 @@ public class ChunkedObjectStoreTest extends KeyspaceTests { - public static ColumnFamily CF_CHUNK = ColumnFamily.newColumnFamily("cfchunk", StringSerializer.get(), StringSerializer.get()); + public static final ColumnFamily CF_CHUNK = ColumnFamily.newColumnFamily("cfchunk", StringSerializer.get(), StringSerializer.get()); @BeforeClass public static void init() throws Exception { diff --git a/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/recipes/ColumnPrefixDistributedLockTest.java b/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/recipes/ColumnPrefixDistributedLockTest.java index bfab4e897..041bd6893 100644 --- a/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/recipes/ColumnPrefixDistributedLockTest.java +++ b/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/recipes/ColumnPrefixDistributedLockTest.java @@ -20,7 +20,7 @@ public class ColumnPrefixDistributedLockTest extends KeyspaceTests { - public static ColumnFamily CF_DIST_LOCK = ColumnFamily + public static final ColumnFamily CF_DIST_LOCK = ColumnFamily .newColumnFamily( "distlock", StringSerializer.get(), diff --git a/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/recipes/ColumnPrefixUniquenessConstraintTest.java b/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/recipes/ColumnPrefixUniquenessConstraintTest.java index a0eadc2a7..969668679 100644 --- a/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/recipes/ColumnPrefixUniquenessConstraintTest.java +++ b/astyanax-test/src/main/java/com/netflix/astyanax/cql/test/recipes/ColumnPrefixUniquenessConstraintTest.java @@ -22,7 +22,7 @@ public class ColumnPrefixUniquenessConstraintTest extends KeyspaceTests { - public static ColumnFamily CF_UNIQUE_CONSTRAINT = ColumnFamily + public static final ColumnFamily CF_UNIQUE_CONSTRAINT = ColumnFamily .newColumnFamily( "cfunique2", LongSerializer.get(),