From a596e1db4e28cedee5a4c5d07d6f279d1d2ba768 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Thu, 4 May 2017 14:50:38 +0200 Subject: [PATCH] DATACASS-395 - Polishing. Add Javadoc and static constants of converters. Fix static final modifier keyword order. --- .../config/MultiLevelSetFlattenerFactoryBean.java | 2 +- .../cassandra/core/ReactiveCqlTemplate.java | 2 +- .../cassandra/core/ReservedKeyword.java | 2 +- .../core/converter/AbstractResultSetConverter.java | 2 +- .../AbstractResultSetToBasicFixedTypeConverter.java | 2 +- .../converter/ResultSetToBigDecimalConverter.java | 11 +++++++++++ .../converter/ResultSetToBigIntegerConverter.java | 11 +++++++++++ .../core/converter/ResultSetToBooleanConverter.java | 11 +++++++++++ .../converter/ResultSetToByteBufferConverter.java | 11 +++++++++++ .../core/converter/ResultSetToDateConverter.java | 11 +++++++++++ .../core/converter/ResultSetToDoubleConverter.java | 11 +++++++++++ .../core/converter/ResultSetToFloatConverter.java | 11 +++++++++++ .../converter/ResultSetToInetAddressConverter.java | 11 +++++++++++ .../core/converter/ResultSetToIntegerConverter.java | 11 +++++++++++ .../converter/ResultSetToListOfStringConverter.java | 10 ++++++++++ .../core/converter/ResultSetToLongConverter.java | 11 +++++++++++ .../core/converter/ResultSetToStringConverter.java | 11 +++++++++++ .../core/converter/ResultSetToUuidConverter.java | 11 +++++++++++ .../cassandra/support/CassandraAccessor.java | 2 +- .../AbstractEmbeddedCassandraIntegrationTest.java | 2 +- .../AbstractKeyspaceCreatingIntegrationTest.java | 2 +- .../cassandra/test/integration/CassandraRule.java | 6 +++--- .../integration/EmbeddedCassandraServerHelper.java | 4 ++-- .../integration/config/xml/TestHostStateListener.java | 2 +- .../integration/config/xml/TestLatencyTracker.java | 2 +- .../generator/CqlTableSpecificationAssertions.java | 2 +- .../IndexLifecycleCqlGeneratorIntegrationTests.java | 2 +- .../cql/generator/TableLifecycleIntegrationTests.java | 2 +- .../cql/generator/TableOptionsIntegrationTests.java | 2 +- .../integration/support/AbstractTestJavaConfig.java | 2 +- .../support/IntegrationTestNettyOptions.java | 2 +- .../repository/query/ConvertingParameterAccessor.java | 2 +- .../repository/cdi/CassandraOperationsProducer.java | 2 +- 33 files changed, 165 insertions(+), 23 deletions(-) diff --git a/spring-cql/src/main/java/org/springframework/cassandra/config/MultiLevelSetFlattenerFactoryBean.java b/spring-cql/src/main/java/org/springframework/cassandra/config/MultiLevelSetFlattenerFactoryBean.java index 30acbc98c..a27ead6e6 100644 --- a/spring-cql/src/main/java/org/springframework/cassandra/config/MultiLevelSetFlattenerFactoryBean.java +++ b/spring-cql/src/main/java/org/springframework/cassandra/config/MultiLevelSetFlattenerFactoryBean.java @@ -31,7 +31,7 @@ import org.springframework.beans.factory.FactoryBean; */ public class MultiLevelSetFlattenerFactoryBean implements FactoryBean> { - private final static Logger log = LoggerFactory.getLogger(MultiLevelSetFlattenerFactoryBean.class); + private static final Logger log = LoggerFactory.getLogger(MultiLevelSetFlattenerFactoryBean.class); private Set> multiLevelSet; diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/ReactiveCqlTemplate.java b/spring-cql/src/main/java/org/springframework/cassandra/core/ReactiveCqlTemplate.java index 0bae2a3fb..732bedd43 100644 --- a/spring-cql/src/main/java/org/springframework/cassandra/core/ReactiveCqlTemplate.java +++ b/spring-cql/src/main/java/org/springframework/cassandra/core/ReactiveCqlTemplate.java @@ -84,7 +84,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re /** * Placeholder for default values. */ - private final static Statement DEFAULTS = QueryBuilder.select().from("DEFAULT"); + private static final Statement DEFAULTS = QueryBuilder.select().from("DEFAULT"); /** * If this variable is set to a non-negative value, it will be used for setting the {@code fetchSize} property on diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/ReservedKeyword.java b/spring-cql/src/main/java/org/springframework/cassandra/core/ReservedKeyword.java index f5c868d95..7fce8237b 100644 --- a/spring-cql/src/main/java/org/springframework/cassandra/core/ReservedKeyword.java +++ b/spring-cql/src/main/java/org/springframework/cassandra/core/ReservedKeyword.java @@ -43,7 +43,7 @@ public enum ReservedKeyword { TABLE, THREE, TOKEN, TRUNCATE, TWO, UPDATE, USE, USING, WHERE, WITH; - private final static Set RESERVED; + private static final Set RESERVED; static { RESERVED = new HashSet<>(); diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/converter/AbstractResultSetConverter.java b/spring-cql/src/main/java/org/springframework/cassandra/core/converter/AbstractResultSetConverter.java index db79114be..724cedc8f 100644 --- a/spring-cql/src/main/java/org/springframework/cassandra/core/converter/AbstractResultSetConverter.java +++ b/spring-cql/src/main/java/org/springframework/cassandra/core/converter/AbstractResultSetConverter.java @@ -44,7 +44,7 @@ import com.datastax.driver.core.ResultSet; */ public abstract class AbstractResultSetConverter implements Converter { - private final static ResultSetToListConverter converter = new ResultSetToListConverter(); + private static final ResultSetToListConverter converter = new ResultSetToListConverter(); /** * Converts the given value to this converter's type or throws {@link IllegalArgumentException}. diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/converter/AbstractResultSetToBasicFixedTypeConverter.java b/spring-cql/src/main/java/org/springframework/cassandra/core/converter/AbstractResultSetToBasicFixedTypeConverter.java index 581dae755..761cfc231 100644 --- a/spring-cql/src/main/java/org/springframework/cassandra/core/converter/AbstractResultSetToBasicFixedTypeConverter.java +++ b/spring-cql/src/main/java/org/springframework/cassandra/core/converter/AbstractResultSetToBasicFixedTypeConverter.java @@ -26,5 +26,5 @@ import org.springframework.core.convert.support.DefaultConversionService; */ public abstract class AbstractResultSetToBasicFixedTypeConverter extends AbstractResultSetConverter { - protected final static ConversionService CONVERTER = new DefaultConversionService(); + protected static final ConversionService CONVERTER = new DefaultConversionService(); } diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToBigDecimalConverter.java b/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToBigDecimalConverter.java index b9605f98e..615e642f8 100644 --- a/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToBigDecimalConverter.java +++ b/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToBigDecimalConverter.java @@ -17,8 +17,19 @@ package org.springframework.cassandra.core.converter; import java.math.BigDecimal; +import org.springframework.core.convert.converter.Converter; + +import com.datastax.driver.core.ResultSet; + +/** + * {@link Converter} from {@link ResultSet} to a single {@link BigDecimal} value. + * + * @author Mark Paluch + */ public class ResultSetToBigDecimalConverter extends AbstractResultSetToBasicFixedTypeConverter { + public static final ResultSetToBigDecimalConverter INSTANCE = new ResultSetToBigDecimalConverter(); + /* (non-Javadoc) * @see org.springframework.cassandra.core.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) */ diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToBigIntegerConverter.java b/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToBigIntegerConverter.java index 09b9ee68a..47e5c0ddf 100644 --- a/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToBigIntegerConverter.java +++ b/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToBigIntegerConverter.java @@ -17,8 +17,19 @@ package org.springframework.cassandra.core.converter; import java.math.BigInteger; +import org.springframework.core.convert.converter.Converter; + +import com.datastax.driver.core.ResultSet; + +/** + * {@link Converter} from {@link ResultSet} to a single {@link BigInteger} value. + * + * @author Mark Paluch + */ public class ResultSetToBigIntegerConverter extends AbstractResultSetToBasicFixedTypeConverter { + public static final ResultSetToBigIntegerConverter INSTANCE = new ResultSetToBigIntegerConverter(); + /* (non-Javadoc) * @see org.springframework.cassandra.core.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) */ diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToBooleanConverter.java b/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToBooleanConverter.java index 9da0ca42d..00577edfb 100644 --- a/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToBooleanConverter.java +++ b/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToBooleanConverter.java @@ -15,8 +15,19 @@ */ package org.springframework.cassandra.core.converter; +import org.springframework.core.convert.converter.Converter; + +import com.datastax.driver.core.ResultSet; + +/** + * {@link Converter} from {@link ResultSet} to a single {@link Boolean} value. + * + * @author Mark Paluch + */ public class ResultSetToBooleanConverter extends AbstractResultSetToBasicFixedTypeConverter { + public static final ResultSetToBooleanConverter INSTANCE = new ResultSetToBooleanConverter(); + /* (non-Javadoc) * @see org.springframework.cassandra.core.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) */ diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToByteBufferConverter.java b/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToByteBufferConverter.java index fa37f656a..eada7e0de 100644 --- a/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToByteBufferConverter.java +++ b/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToByteBufferConverter.java @@ -17,8 +17,19 @@ package org.springframework.cassandra.core.converter; import java.nio.ByteBuffer; +import org.springframework.core.convert.converter.Converter; + +import com.datastax.driver.core.ResultSet; + +/** + * {@link Converter} from {@link ResultSet} to a single {@link ByteBuffer} value. + * + * @author Mark Paluch + */ public class ResultSetToByteBufferConverter extends AbstractResultSetConverter { + public static final ResultSetToByteBufferConverter INSTANCE = new ResultSetToByteBufferConverter(); + /* (non-Javadoc) * @see org.springframework.cassandra.core.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) */ diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToDateConverter.java b/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToDateConverter.java index 1f6c6efec..a86cefe61 100644 --- a/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToDateConverter.java +++ b/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToDateConverter.java @@ -17,8 +17,19 @@ package org.springframework.cassandra.core.converter; import java.util.Date; +import org.springframework.core.convert.converter.Converter; + +import com.datastax.driver.core.ResultSet; + +/** + * {@link Converter} from {@link ResultSet} to a single {@link Date} value. + * + * @author Mark Paluch + */ public class ResultSetToDateConverter extends AbstractResultSetToBasicFixedTypeConverter { + public static final ResultSetToDateConverter INSTANCE = new ResultSetToDateConverter(); + /* (non-Javadoc) * @see org.springframework.cassandra.core.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) */ diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToDoubleConverter.java b/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToDoubleConverter.java index d882d565d..cb8cdfdc2 100644 --- a/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToDoubleConverter.java +++ b/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToDoubleConverter.java @@ -15,8 +15,19 @@ */ package org.springframework.cassandra.core.converter; +import org.springframework.core.convert.converter.Converter; + +import com.datastax.driver.core.ResultSet; + +/** + * {@link Converter} from {@link ResultSet} to a single {@link Double} value. + * + * @author Mark Paluch + */ public class ResultSetToDoubleConverter extends AbstractResultSetToBasicFixedTypeConverter { + public static final ResultSetToDoubleConverter INSTANCE = new ResultSetToDoubleConverter(); + /* (non-Javadoc) * @see org.springframework.cassandra.core.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) */ diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToFloatConverter.java b/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToFloatConverter.java index 4071a9cda..5e241f51e 100644 --- a/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToFloatConverter.java +++ b/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToFloatConverter.java @@ -15,8 +15,19 @@ */ package org.springframework.cassandra.core.converter; +import org.springframework.core.convert.converter.Converter; + +import com.datastax.driver.core.ResultSet; + +/** + * {@link Converter} from {@link ResultSet} to a single {@link Float} value. + * + * @author Mark Paluch + */ public class ResultSetToFloatConverter extends AbstractResultSetToBasicFixedTypeConverter { + public static final ResultSetToFloatConverter INSTANCE = new ResultSetToFloatConverter(); + /* (non-Javadoc) * @see org.springframework.cassandra.core.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) */ diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToInetAddressConverter.java b/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToInetAddressConverter.java index 0c9899f32..7cd812d1b 100644 --- a/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToInetAddressConverter.java +++ b/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToInetAddressConverter.java @@ -17,8 +17,19 @@ package org.springframework.cassandra.core.converter; import java.net.InetAddress; +import org.springframework.core.convert.converter.Converter; + +import com.datastax.driver.core.ResultSet; + +/** + * {@link Converter} from {@link ResultSet} to a single {@link InetAddress} value. + * + * @author Mark Paluch + */ public class ResultSetToInetAddressConverter extends AbstractResultSetToBasicFixedTypeConverter { + public static final ResultSetToInetAddressConverter INSTANCE = new ResultSetToInetAddressConverter(); + /* (non-Javadoc) * @see org.springframework.cassandra.core.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) */ diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToIntegerConverter.java b/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToIntegerConverter.java index 80aaf4cac..ef5b8af9d 100644 --- a/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToIntegerConverter.java +++ b/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToIntegerConverter.java @@ -15,8 +15,19 @@ */ package org.springframework.cassandra.core.converter; +import org.springframework.core.convert.converter.Converter; + +import com.datastax.driver.core.ResultSet; + +/** + * {@link Converter} from {@link ResultSet} to a single {@link Integer} value. + * + * @author Mark Paluch + */ public class ResultSetToIntegerConverter extends AbstractResultSetToBasicFixedTypeConverter { + public static final ResultSetToIntegerConverter INSTANCE = new ResultSetToIntegerConverter(); + /* (non-Javadoc) * @see org.springframework.cassandra.core.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) */ diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToListOfStringConverter.java b/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToListOfStringConverter.java index f3053b4d1..fc9c36994 100644 --- a/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToListOfStringConverter.java +++ b/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToListOfStringConverter.java @@ -20,10 +20,20 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; +import org.springframework.core.convert.converter.Converter; import org.springframework.util.StringUtils; +import com.datastax.driver.core.ResultSet; + +/** + * {@link Converter} from {@link ResultSet} to a {@link List} of {@link String}. + * + * @author Mark Paluch + */ public class ResultSetToListOfStringConverter extends AbstractResultSetConverter> { + public static final ResultSetToListOfStringConverter INSTANCE = new ResultSetToListOfStringConverter(); + /* (non-Javadoc) * @see org.springframework.cassandra.core.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) */ diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToLongConverter.java b/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToLongConverter.java index 5a30788b6..765cabef0 100644 --- a/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToLongConverter.java +++ b/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToLongConverter.java @@ -15,8 +15,19 @@ */ package org.springframework.cassandra.core.converter; +import org.springframework.core.convert.converter.Converter; + +import com.datastax.driver.core.ResultSet; + +/** + * {@link Converter} from {@link ResultSet} to a single {@link Long} value. + * + * @author Mark Paluch + */ public class ResultSetToLongConverter extends AbstractResultSetToBasicFixedTypeConverter { + public static final ResultSetToLongConverter INSTANCE = new ResultSetToLongConverter(); + /* (non-Javadoc) * @see org.springframework.cassandra.core.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) */ diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToStringConverter.java b/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToStringConverter.java index e78dce62e..435dc13a5 100644 --- a/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToStringConverter.java +++ b/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToStringConverter.java @@ -18,8 +18,19 @@ package org.springframework.cassandra.core.converter; import java.util.List; import java.util.Map; +import org.springframework.core.convert.converter.Converter; + +import com.datastax.driver.core.ResultSet; + +/** + * {@link Converter} from {@link ResultSet} to a single {@link String} value. + * + * @author Mark Paluch + */ public class ResultSetToStringConverter extends AbstractResultSetConverter { + public static final ResultSetToStringConverter INSTANCE = new ResultSetToStringConverter(); + /* (non-Javadoc) * @see org.springframework.cassandra.core.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) */ diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToUuidConverter.java b/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToUuidConverter.java index dd0cef495..52d73cf5b 100644 --- a/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToUuidConverter.java +++ b/spring-cql/src/main/java/org/springframework/cassandra/core/converter/ResultSetToUuidConverter.java @@ -17,8 +17,19 @@ package org.springframework.cassandra.core.converter; import java.util.UUID; +import org.springframework.core.convert.converter.Converter; + +import com.datastax.driver.core.ResultSet; + +/** + * {@link Converter} from {@link ResultSet} to a single {@link UUID} value. + * + * @author Mark Paluch + */ public class ResultSetToUuidConverter extends AbstractResultSetToBasicFixedTypeConverter { + public static final ResultSetToUuidConverter INSTANCE = new ResultSetToUuidConverter(); + /* (non-Javadoc) * @see org.springframework.cassandra.core.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) */ diff --git a/spring-cql/src/main/java/org/springframework/cassandra/support/CassandraAccessor.java b/spring-cql/src/main/java/org/springframework/cassandra/support/CassandraAccessor.java index e8c6d3962..9e3725129 100644 --- a/spring-cql/src/main/java/org/springframework/cassandra/support/CassandraAccessor.java +++ b/spring-cql/src/main/java/org/springframework/cassandra/support/CassandraAccessor.java @@ -64,7 +64,7 @@ public class CassandraAccessor implements InitializingBean { /** * Placeholder for default values. */ - private final static Statement DEFAULTS = QueryBuilder.select().from("DEFAULT"); + private static final Statement DEFAULTS = QueryBuilder.select().from("DEFAULT"); /** Logger available to subclasses */ protected final Logger logger = LoggerFactory.getLogger(getClass()); diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/AbstractEmbeddedCassandraIntegrationTest.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/AbstractEmbeddedCassandraIntegrationTest.java index 964d6c9d9..d0236192b 100755 --- a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/AbstractEmbeddedCassandraIntegrationTest.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/AbstractEmbeddedCassandraIntegrationTest.java @@ -38,7 +38,7 @@ public abstract class AbstractEmbeddedCassandraIntegrationTest { /** * Initiate a Cassandra environment in test class scope. */ - @ClassRule public final static CassandraRule cassandraEnvironment = new CassandraRule("embedded-cassandra.yaml"); + @ClassRule public static final CassandraRule cassandraEnvironment = new CassandraRule("embedded-cassandra.yaml"); /** * Initiate a Cassandra environment in test scope. diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/AbstractKeyspaceCreatingIntegrationTest.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/AbstractKeyspaceCreatingIntegrationTest.java index 78df44741..1107bfd9e 100755 --- a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/AbstractKeyspaceCreatingIntegrationTest.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/AbstractKeyspaceCreatingIntegrationTest.java @@ -40,7 +40,7 @@ public abstract class AbstractKeyspaceCreatingIntegrationTest extends AbstractEm * Class rule to prepare a keyspace to give tests a keyspace context. The keyspace name is random and changes per * test. */ - @ClassRule public final static KeyspaceRule keyspaceRule = new KeyspaceRule(cassandraEnvironment); + @ClassRule public static final KeyspaceRule keyspaceRule = new KeyspaceRule(cassandraEnvironment); /** * The session that's connected to the keyspace used in the current instance's test. diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/CassandraRule.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/CassandraRule.java index ddc5c6f1b..0b86fc7dd 100644 --- a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/CassandraRule.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/CassandraRule.java @@ -384,9 +384,9 @@ public class CassandraRule extends ExternalResource { */ public static class InvocationMode { - private final static InvocationMode once = new InvocationMode(); - private final static InvocationMode each = new InvocationMode(); - private final static InvocationMode never = new InvocationMode(); + private static final InvocationMode once = new InvocationMode(); + private static final InvocationMode each = new InvocationMode(); + private static final InvocationMode never = new InvocationMode(); /** * Invocation mode to invoke an action once at before the first test. diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/EmbeddedCassandraServerHelper.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/EmbeddedCassandraServerHelper.java index 7c908f500..67898692c 100644 --- a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/EmbeddedCassandraServerHelper.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/EmbeddedCassandraServerHelper.java @@ -50,8 +50,8 @@ class EmbeddedCassandraServerHelper { public static final long DEFAULT_STARTUP_TIMEOUT_MS = TimeUnit.SECONDS.toMillis(20); public static final String DEFAULT_TMP_DIR = "target/embeddedCassandra"; - private final static AtomicReference sync = new AtomicReference<>(); - private final static AtomicReference cassandraRef = new AtomicReference<>(); + private static final AtomicReference sync = new AtomicReference<>(); + private static final AtomicReference cassandraRef = new AtomicReference<>(); private static String launchedYamlFile; diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/TestHostStateListener.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/TestHostStateListener.java index 0af62b286..48b6d92e9 100644 --- a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/TestHostStateListener.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/TestHostStateListener.java @@ -31,7 +31,7 @@ import com.datastax.driver.core.Host.StateListener; */ public class TestHostStateListener implements StateListener { - private final static Logger log = LoggerFactory.getLogger(TestHostStateListener.class); + private static final Logger log = LoggerFactory.getLogger(TestHostStateListener.class); @Override public void onAdd(Host host) { diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/TestLatencyTracker.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/TestLatencyTracker.java index e32951d09..821cd01a9 100644 --- a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/TestLatencyTracker.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/config/xml/TestLatencyTracker.java @@ -33,7 +33,7 @@ import com.datastax.driver.core.Statement; */ public class TestLatencyTracker implements LatencyTracker { - private final static Logger LOG = LoggerFactory.getLogger(TestLatencyTracker.class); + private static final Logger LOG = LoggerFactory.getLogger(TestLatencyTracker.class); @Override public void update(Host host, Statement statement, Exception exception, long newLatencyNanos) { diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CqlTableSpecificationAssertions.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CqlTableSpecificationAssertions.java index 7dfb0731f..ee0399674 100644 --- a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CqlTableSpecificationAssertions.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CqlTableSpecificationAssertions.java @@ -41,7 +41,7 @@ import com.datastax.driver.core.TableOptionsMetadata; */ public class CqlTableSpecificationAssertions { - private final static Logger log = LoggerFactory.getLogger(CqlTableSpecificationAssertions.class); + private static final Logger log = LoggerFactory.getLogger(CqlTableSpecificationAssertions.class); public static double DELTA = 1e-6; // delta for comparisons of doubles diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/IndexLifecycleCqlGeneratorIntegrationTests.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/IndexLifecycleCqlGeneratorIntegrationTests.java index 09759587b..b500daba9 100755 --- a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/IndexLifecycleCqlGeneratorIntegrationTests.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/IndexLifecycleCqlGeneratorIntegrationTests.java @@ -34,7 +34,7 @@ import org.springframework.cassandra.test.integration.AbstractKeyspaceCreatingIn */ public class IndexLifecycleCqlGeneratorIntegrationTests extends AbstractKeyspaceCreatingIntegrationTest { - private final static Logger log = LoggerFactory.getLogger(IndexLifecycleCqlGeneratorIntegrationTests.class); + private static final Logger log = LoggerFactory.getLogger(IndexLifecycleCqlGeneratorIntegrationTests.class); @Before public void setUp() throws Exception { diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/TableLifecycleIntegrationTests.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/TableLifecycleIntegrationTests.java index 33dc788e9..9b0720491 100755 --- a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/TableLifecycleIntegrationTests.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/TableLifecycleIntegrationTests.java @@ -36,7 +36,7 @@ import org.springframework.cassandra.test.integration.AbstractKeyspaceCreatingIn */ public class TableLifecycleIntegrationTests extends AbstractKeyspaceCreatingIntegrationTest { - private final static Logger log = LoggerFactory.getLogger(TableLifecycleIntegrationTests.class); + private static final Logger log = LoggerFactory.getLogger(TableLifecycleIntegrationTests.class); CreateTableCqlGeneratorUnitTests.MultipleOptionsTest createTableTest = new CreateTableCqlGeneratorUnitTests.MultipleOptionsTest(); diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/TableOptionsIntegrationTests.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/TableOptionsIntegrationTests.java index 0d0397f9c..f667f4bfe 100755 --- a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/TableOptionsIntegrationTests.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/TableOptionsIntegrationTests.java @@ -31,7 +31,7 @@ import org.springframework.cassandra.test.integration.AbstractKeyspaceCreatingIn */ public class TableOptionsIntegrationTests extends AbstractKeyspaceCreatingIntegrationTest { - private final static Logger log = LoggerFactory.getLogger(TableOptionsIntegrationTests.class); + private static final Logger log = LoggerFactory.getLogger(TableOptionsIntegrationTests.class); @Test public void test() { diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/AbstractTestJavaConfig.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/AbstractTestJavaConfig.java index dbd851e2a..1e12af8b8 100644 --- a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/AbstractTestJavaConfig.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/AbstractTestJavaConfig.java @@ -30,7 +30,7 @@ import com.datastax.driver.core.QueryOptions; @Configuration public abstract class AbstractTestJavaConfig extends AbstractSessionConfiguration { - private final static CassandraConnectionProperties PROPERTIES = new CassandraConnectionProperties(); + private static final CassandraConnectionProperties PROPERTIES = new CassandraConnectionProperties(); @Override protected int getPort() { diff --git a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/IntegrationTestNettyOptions.java b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/IntegrationTestNettyOptions.java index 468cff001..6bfc7bf65 100644 --- a/spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/IntegrationTestNettyOptions.java +++ b/spring-cql/src/test/java/org/springframework/cassandra/test/integration/support/IntegrationTestNettyOptions.java @@ -32,7 +32,7 @@ import com.datastax.driver.core.NettyOptions; */ public class IntegrationTestNettyOptions extends NettyOptions { - public final static IntegrationTestNettyOptions INSTANCE = new IntegrationTestNettyOptions(); + public static final IntegrationTestNettyOptions INSTANCE = new IntegrationTestNettyOptions(); private volatile static EventLoopGroup eventLoopGroup; private volatile static Timer timer; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ConvertingParameterAccessor.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ConvertingParameterAccessor.java index a2bc59dbd..8357564a7 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ConvertingParameterAccessor.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ConvertingParameterAccessor.java @@ -44,7 +44,7 @@ import com.datastax.driver.core.TypeCodec; */ class ConvertingParameterAccessor implements CassandraParameterAccessor { - private final static TypeInformation SET = ClassTypeInformation.from(Set.class); + private static final TypeInformation SET = ClassTypeInformation.from(Set.class); private final CassandraConverter converter; diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/cdi/CassandraOperationsProducer.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/cdi/CassandraOperationsProducer.java index 3e241db21..e31b6958f 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/cdi/CassandraOperationsProducer.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/cdi/CassandraOperationsProducer.java @@ -48,7 +48,7 @@ import com.google.common.util.concurrent.Service; */ class CassandraOperationsProducer { - public final static String KEYSPACE_NAME = RandomKeySpaceName.create(); + public static final String KEYSPACE_NAME = RandomKeySpaceName.create(); @Produces @Singleton