diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/AlterKeyspaceCqlGenerator.java b/spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/AlterKeyspaceCqlGenerator.java index ffb404909..596c99174 100644 --- a/spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/AlterKeyspaceCqlGenerator.java +++ b/spring-cassandra/src/main/java/org/springframework/cassandra/core/cql/generator/AlterKeyspaceCqlGenerator.java @@ -48,10 +48,10 @@ public class AlterKeyspaceCqlGenerator extends KeyspaceOptionsCqlGenerator options = spec().getOptions(); @@ -61,7 +61,7 @@ public class AlterKeyspaceCqlGenerator extends KeyspaceOptionsCqlGenerator options = spec().getOptions(); @@ -66,7 +66,7 @@ public class CreateKeyspaceCqlGenerator extends KeyspaceCqlGenerator> extends - KeyspaceNameCqlGenerator> { + KeyspaceNameCqlGenerator> { public KeyspaceOptionsCqlGenerator(KeyspaceOptionsSpecification specification) { super(specification); diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceOptionsSpecification.java b/spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceOptionsSpecification.java index 23cf20698..54fe4d331 100644 --- a/spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceOptionsSpecification.java +++ b/spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/KeyspaceOptionsSpecification.java @@ -13,8 +13,8 @@ import org.springframework.cassandra.core.cql.CqlStringUtils; * Abstract builder class to support the construction of table specifications that have table options, that is, those * options normally specified by WITH ... AND .... *

- * It is important to note that although this class depends on {@link KeyspaceOption} for convenient and typesafe use, it - * ultimately stores its options in a Map for flexibility. This means that + * It is important to note that although this class depends on {@link KeyspaceOption} for convenient and typesafe use, + * it ultimately stores its options in a Map for flexibility. This means that * {@link #with(KeyspaceOption)} and {@link #with(KeyspaceOption, Object)} delegate to * {@link #with(String, Object, boolean, boolean)}. This design allows the API to support new Cassandra options as they * are introduced without having to update the code immediately. @@ -27,7 +27,7 @@ public abstract class KeyspaceOptionsSpecification options = new LinkedHashMap(); - @SuppressWarnings( "unchecked" ) + @SuppressWarnings("unchecked") public T name(String name) { return (T) super.name(name); } @@ -43,8 +43,8 @@ public abstract class KeyspaceOptionsSpecification extends KeyspaceOptionsSpecification> implements KeyspaceDescriptor { +public class KeyspaceSpecification extends KeyspaceOptionsSpecification> implements + KeyspaceDescriptor { } diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CqlKeyspaceSpecificationAssertions.java b/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CqlKeyspaceSpecificationAssertions.java index 0831c4e37..a354b9b0d 100644 --- a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CqlKeyspaceSpecificationAssertions.java +++ b/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CqlKeyspaceSpecificationAssertions.java @@ -15,12 +15,13 @@ */ package org.springframework.cassandra.test.integration.core.cql.generator; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertTrue; import java.util.Map; -import org.springframework.cassandra.core.keyspace.Option; import org.springframework.cassandra.core.keyspace.KeyspaceDescriptor; +import org.springframework.cassandra.core.keyspace.Option; import com.datastax.driver.core.KeyspaceMetadata; import com.datastax.driver.core.Session; @@ -29,18 +30,18 @@ public class CqlKeyspaceSpecificationAssertions { public static double DELTA = 1e-6; // delta for comparisons of doubles - @SuppressWarnings( "unchecked" ) + @SuppressWarnings("unchecked") public static void assertKeyspace(KeyspaceDescriptor expected, String keyspace, Session session) { KeyspaceMetadata kmd = session.getCluster().getMetadata().getKeyspace(keyspace.toLowerCase()); - assertEquals( expected.getName(), kmd.getName() ); - - Map options = kmd.getReplication(); - Map expectedOptions = expected.getOptions(); - Map replicationMap = (Map) expectedOptions.get( "replication" ); + assertEquals(expected.getName(), kmd.getName()); + + Map options = kmd.getReplication(); + Map expectedOptions = expected.getOptions(); + Map replicationMap = (Map) expectedOptions.get("replication"); assertEquals(replicationMap.size(), options.size()); - for ( Map.Entry optionEntry : replicationMap.entrySet()) { + for (Map.Entry optionEntry : replicationMap.entrySet()) { String optionValue = options.get(optionEntry.getKey().getName()); String repMapValue = "" + optionEntry.getValue(); assertTrue(optionValue.endsWith(repMapValue)); diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/unit/core/keyspace/OptionTest.java b/spring-cassandra/src/test/java/org/springframework/cassandra/test/unit/core/keyspace/OptionTest.java index e5a8a3345..fa4dc5c12 100644 --- a/spring-cassandra/src/test/java/org/springframework/cassandra/test/unit/core/keyspace/OptionTest.java +++ b/spring-cassandra/src/test/java/org/springframework/cassandra/test/unit/core/keyspace/OptionTest.java @@ -1,6 +1,8 @@ package org.springframework.cassandra.test.unit.core.keyspace; -import static org.junit.Assert.*; +import static org.junit.Assert.assertEquals; +import static org.junit.Assert.assertFalse; +import static org.junit.Assert.assertTrue; import java.lang.annotation.RetentionPolicy;