From 9144fa90c494ae3cb3223d2f467a24bd85c08197 Mon Sep 17 00:00:00 2001 From: Matthew Adams Date: Thu, 23 Jan 2014 11:37:22 -0600 Subject: [PATCH] minor cleanup to remove Java warnings (no behavioral changes) --- .../config/CassandraTemplateFactoryBean.java | 8 ++++---- ...KeyspaceActionSpecificationFactoryBean.java | 4 ---- .../config/xml/CassandraClusterParser.java | 4 ---- .../cassandra/core/RingMember.java | 2 ++ .../core/keyspace/DropIndexSpecification.java | 2 +- ...ceholderNamespaceCreatingXmlConfigTest.java | 4 ---- ...reateTableCqlGeneratorIntegrationTests.java | 4 ---- .../generator/TableOptionsIntegrationTest.java | 1 - .../core/template/CassandraOperationsTest.java | 18 +----------------- .../CreateKeyspaceCqlGeneratorTests.java | 1 - .../convert/MappingCassandraConverter.java | 1 - .../cassandra/core/CassandraAdminTemplate.java | 3 +-- .../exception/EntityWriterException.java | 2 ++ .../data/cassandra/util/CqlUtils.java | 7 ------- .../UserRepositoryIntegrationTests.java | 1 - .../template/CassandraAdminTest.java | 4 ---- .../template/CassandraDataOperationsTest.java | 6 ------ 17 files changed, 11 insertions(+), 61 deletions(-) diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/config/CassandraTemplateFactoryBean.java b/spring-cassandra/src/main/java/org/springframework/cassandra/config/CassandraTemplateFactoryBean.java index 660ac9c85..5ef44bbab 100644 --- a/spring-cassandra/src/main/java/org/springframework/cassandra/config/CassandraTemplateFactoryBean.java +++ b/spring-cassandra/src/main/java/org/springframework/cassandra/config/CassandraTemplateFactoryBean.java @@ -15,8 +15,6 @@ */ package org.springframework.cassandra.config; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean; import org.springframework.cassandra.core.CassandraOperations; @@ -31,23 +29,25 @@ import com.datastax.driver.core.Session; */ public class CassandraTemplateFactoryBean implements FactoryBean, InitializingBean { - private static final Logger log = LoggerFactory.getLogger(CassandraTemplateFactoryBean.class); - private CassandraTemplate template; private Session session; + @Override public CassandraOperations getObject() { return template; } + @Override public Class getObjectType() { return CassandraOperations.class; } + @Override public boolean isSingleton() { return true; } + @Override public void afterPropertiesSet() throws Exception { if (session == null) { diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/config/KeyspaceActionSpecificationFactoryBean.java b/spring-cassandra/src/main/java/org/springframework/cassandra/config/KeyspaceActionSpecificationFactoryBean.java index e44d16587..38e1b2ec2 100644 --- a/spring-cassandra/src/main/java/org/springframework/cassandra/config/KeyspaceActionSpecificationFactoryBean.java +++ b/spring-cassandra/src/main/java/org/springframework/cassandra/config/KeyspaceActionSpecificationFactoryBean.java @@ -22,8 +22,6 @@ import java.util.List; import java.util.Map; import java.util.Set; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean; @@ -48,8 +46,6 @@ import org.springframework.util.Assert; public class KeyspaceActionSpecificationFactoryBean implements FactoryBean>>, InitializingBean, DisposableBean { - private final static Logger log = LoggerFactory.getLogger(KeyspaceActionSpecificationFactoryBean.class); - private KeyspaceAction action; private String name; private List networkTopologyDataCenters = new LinkedList(); diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraClusterParser.java b/spring-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraClusterParser.java index b750d4faf..77bc4eb85 100644 --- a/spring-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraClusterParser.java +++ b/spring-cassandra/src/main/java/org/springframework/cassandra/config/xml/CassandraClusterParser.java @@ -20,8 +20,6 @@ import static org.springframework.data.config.ParsingUtils.getSourceBeanDefiniti import java.util.ArrayList; import java.util.List; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.BeanDefinitionStoreException; import org.springframework.beans.factory.config.BeanDefinition; import org.springframework.beans.factory.support.AbstractBeanDefinition; @@ -55,8 +53,6 @@ import com.datastax.driver.core.SocketOptions; */ public class CassandraClusterParser extends AbstractBeanDefinitionParser { - private final static Logger log = LoggerFactory.getLogger(CassandraClusterParser.class); - @Override protected String resolveId(Element element, AbstractBeanDefinition definition, ParserContext parserContext) throws BeanDefinitionStoreException { diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/RingMember.java b/spring-cassandra/src/main/java/org/springframework/cassandra/core/RingMember.java index 705d1b6b7..2010afba0 100644 --- a/spring-cassandra/src/main/java/org/springframework/cassandra/core/RingMember.java +++ b/spring-cassandra/src/main/java/org/springframework/cassandra/core/RingMember.java @@ -25,6 +25,8 @@ import com.datastax.driver.core.Host; */ public final class RingMember implements Serializable { + private static final long serialVersionUID = -2582309141903132916L; + /* * Ring attributes */ diff --git a/spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DropIndexSpecification.java b/spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DropIndexSpecification.java index 1502a7cc6..de4039f2c 100644 --- a/spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DropIndexSpecification.java +++ b/spring-cassandra/src/main/java/org/springframework/cassandra/core/keyspace/DropIndexSpecification.java @@ -23,7 +23,7 @@ package org.springframework.cassandra.core.keyspace; */ public class DropIndexSpecification extends IndexNameSpecification { - private boolean ifExists; + // private boolean ifExists; /** * Entry point into the {@link DropIndexSpecification}'s fluent API to drop a table. Convenient if imported diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/xml/PropertyPlaceholderNamespaceCreatingXmlConfigTest.java b/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/xml/PropertyPlaceholderNamespaceCreatingXmlConfigTest.java index 93d8bd205..793963d57 100644 --- a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/xml/PropertyPlaceholderNamespaceCreatingXmlConfigTest.java +++ b/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/config/xml/PropertyPlaceholderNamespaceCreatingXmlConfigTest.java @@ -6,8 +6,6 @@ import javax.inject.Inject; import org.junit.Test; import org.junit.runner.RunWith; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.cassandra.core.CassandraOperations; import org.springframework.cassandra.test.integration.AbstractKeyspaceCreatingIntegrationTest; import org.springframework.cassandra.test.integration.config.IntegrationTestUtils; @@ -20,8 +18,6 @@ import com.datastax.driver.core.Session; @ContextConfiguration public class PropertyPlaceholderNamespaceCreatingXmlConfigTest extends AbstractKeyspaceCreatingIntegrationTest { - private static Logger log = LoggerFactory.getLogger(PropertyPlaceholderNamespaceCreatingXmlConfigTest.class); - @Inject Session s; diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CreateTableCqlGeneratorIntegrationTests.java b/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CreateTableCqlGeneratorIntegrationTests.java index fc4de3fbf..b04706092 100644 --- a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CreateTableCqlGeneratorIntegrationTests.java +++ b/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/CreateTableCqlGeneratorIntegrationTests.java @@ -3,8 +3,6 @@ package org.springframework.cassandra.test.integration.core.cql.generator; import static org.springframework.cassandra.test.integration.core.cql.generator.CqlTableSpecificationAssertions.assertTable; import org.junit.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.cassandra.test.integration.AbstractKeyspaceCreatingIntegrationTest; import org.springframework.cassandra.test.unit.core.cql.generator.CreateTableCqlGeneratorTests.BasicTest; import org.springframework.cassandra.test.unit.core.cql.generator.CreateTableCqlGeneratorTests.CompositePartitionKeyTest; @@ -17,8 +15,6 @@ import org.springframework.cassandra.test.unit.core.cql.generator.CreateTableCql */ public class CreateTableCqlGeneratorIntegrationTests { - private final static Logger log = LoggerFactory.getLogger(CreateTableCqlGeneratorIntegrationTests.class); - /** * Integration test base class that knows how to do everything except instantiate the concrete unit test type T. * diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/TableOptionsIntegrationTest.java b/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/TableOptionsIntegrationTest.java index 5c2e3ae25..6bf4e0dae 100644 --- a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/TableOptionsIntegrationTest.java +++ b/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/cql/generator/TableOptionsIntegrationTest.java @@ -20,7 +20,6 @@ import static org.springframework.cassandra.test.integration.core.cql.generator. import org.junit.Test; import org.slf4j.Logger; import org.slf4j.LoggerFactory; -import org.springframework.cassandra.test.integration.AbstractEmbeddedCassandraIntegrationTest; import org.springframework.cassandra.test.integration.AbstractKeyspaceCreatingIntegrationTest; import org.springframework.cassandra.test.unit.core.cql.generator.CreateTableCqlGeneratorTests; diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/template/CassandraOperationsTest.java b/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/template/CassandraOperationsTest.java index 3b31ecffe..aa6408baf 100644 --- a/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/template/CassandraOperationsTest.java +++ b/spring-cassandra/src/test/java/org/springframework/cassandra/test/integration/core/template/CassandraOperationsTest.java @@ -1090,22 +1090,6 @@ public class CassandraOperationsTest extends AbstractKeyspaceCreatingIntegration return b; } - /** - * Convert List to a Book - * - * @param bookElements - * @return - */ - private Book listToBook(List bookElements) { - Book b = new Book(); - b.setIsbn((String) bookElements.get(0)); - b.setTitle((String) bookElements.get(1)); - b.setAuthor((String) bookElements.get(2)); - b.setPages((Integer) bookElements.get(3)); - return b; - - } - /** * Assert that 2 Book objects are the same * @@ -1129,7 +1113,7 @@ public class CassandraOperationsTest extends AbstractKeyspaceCreatingIntegration */ public Book getBook(final String isbn) { - Book b = this.cassandraTemplate.query("select * from book where isbn = ?", new PreparedStatementBinder() { + Book b = cassandraTemplate.query("select * from book where isbn = ?", new PreparedStatementBinder() { @Override public BoundStatement bindValues(PreparedStatement ps) throws DriverException { diff --git a/spring-cassandra/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/CreateKeyspaceCqlGeneratorTests.java b/spring-cassandra/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/CreateKeyspaceCqlGeneratorTests.java index 9d3f87c19..4613542d8 100644 --- a/spring-cassandra/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/CreateKeyspaceCqlGeneratorTests.java +++ b/spring-cassandra/src/test/java/org/springframework/cassandra/test/unit/core/cql/generator/CreateKeyspaceCqlGeneratorTests.java @@ -4,7 +4,6 @@ import static org.junit.Assert.assertTrue; import java.util.HashMap; import java.util.Map; -import java.util.UUID; import org.junit.Test; import org.springframework.cassandra.config.KeyspaceAttributes; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/MappingCassandraConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/MappingCassandraConverter.java index 7ced0ddbc..879cd8c1a 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/MappingCassandraConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/convert/MappingCassandraConverter.java @@ -19,7 +19,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanClassLoaderAware; -import org.springframework.cassandra.core.keyspace.CreateTableSpecification; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; import org.springframework.core.convert.support.DefaultConversionService; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraAdminTemplate.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraAdminTemplate.java index f02a7d884..754b19b58 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraAdminTemplate.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraAdminTemplate.java @@ -7,7 +7,6 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.cassandra.core.SessionCallback; import org.springframework.cassandra.core.cql.generator.CreateTableCqlGenerator; -import org.springframework.cassandra.core.keyspace.CreateTableSpecification; import org.springframework.cassandra.support.CassandraAccessor; import org.springframework.cassandra.support.CassandraExceptionTranslator; import org.springframework.cassandra.support.exception.CassandraTableExistsException; @@ -49,7 +48,7 @@ public class CassandraAdminTemplate extends CassandraAccessor implements Cassand public void setCassandraConverter(CassandraConverter converter) { Assert.notNull(converter); this.converter = converter; - setMappingContext(converter.getCassandraMappingContext()); + setMappingContext(this.converter.getCassandraMappingContext()); } protected void setMappingContext(CassandraMappingContext mappingContext) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/exception/EntityWriterException.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/exception/EntityWriterException.java index d0275733e..fff15ad98 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/exception/EntityWriterException.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/exception/EntityWriterException.java @@ -23,6 +23,8 @@ package org.springframework.data.cassandra.exception; */ public class EntityWriterException extends Exception { + private static final long serialVersionUID = -3068204776019978031L; + /** * @param message */ diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/util/CqlUtils.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/util/CqlUtils.java index 153ca1770..6018d0770 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/util/CqlUtils.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/util/CqlUtils.java @@ -3,13 +3,8 @@ package org.springframework.data.cassandra.util; import java.util.ArrayList; import java.util.List; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.cassandra.core.CassandraTemplate; import org.springframework.cassandra.core.QueryOptions; -import org.springframework.cassandra.core.cql.generator.CreateTableCqlGenerator; -import org.springframework.cassandra.core.keyspace.CreateTableSpecification; -import org.springframework.data.cassandra.convert.CassandraConverter; import org.springframework.data.cassandra.exception.EntityWriterException; import org.springframework.data.cassandra.mapping.CassandraPersistentEntity; import org.springframework.data.cassandra.mapping.CassandraPersistentProperty; @@ -37,8 +32,6 @@ import com.datastax.driver.core.querybuilder.Update; */ public abstract class CqlUtils { - private static Logger log = LoggerFactory.getLogger(CqlUtils.class); - /** * Create the List of CQL for the indexes required for Cassandra mapped Table. * diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/UserRepositoryIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/UserRepositoryIntegrationTests.java index 18005b797..c43bb4a99 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/UserRepositoryIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/repository/UserRepositoryIntegrationTests.java @@ -150,7 +150,6 @@ public class UserRepositoryIntegrationTests { @AfterClass public static void stopCassandra() { EmbeddedCassandraServerHelper.cleanEmbeddedCassandra(); - EmbeddedCassandraServerHelper.stopEmbeddedCassandra(); } private static void assertEquals(User user1, User user2) { diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/template/CassandraAdminTest.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/template/CassandraAdminTest.java index 0b06d0a99..b8dd809a1 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/template/CassandraAdminTest.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/template/CassandraAdminTest.java @@ -29,8 +29,6 @@ import org.junit.BeforeClass; import org.junit.Test; import org.junit.runner.RunWith; import org.mockito.Mock; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.cassandra.core.CassandraOperations; import org.springframework.context.ApplicationContext; @@ -53,8 +51,6 @@ public class CassandraAdminTest { @Mock ApplicationContext context; - private static Logger log = LoggerFactory.getLogger(CassandraAdminTest.class); - @BeforeClass public static void startCassandra() throws IOException, TTransportException, ConfigurationException, InterruptedException { diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/template/CassandraDataOperationsTest.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/template/CassandraDataOperationsTest.java index 95da10e4d..dc842eec2 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/template/CassandraDataOperationsTest.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/template/CassandraDataOperationsTest.java @@ -28,7 +28,6 @@ import org.cassandraunit.dataset.cql.ClassPathCQLDataSet; import org.cassandraunit.dataset.yaml.ClassPathYamlDataSet; import org.cassandraunit.utils.EmbeddedCassandraServerHelper; import org.junit.After; -import org.junit.AfterClass; import org.junit.Assert; import org.junit.BeforeClass; import org.junit.Rule; @@ -691,9 +690,4 @@ public class CassandraDataOperationsTest { EmbeddedCassandraServerHelper.cleanEmbeddedCassandra(); } - - @AfterClass - public static void stopCassandra() { - EmbeddedCassandraServerHelper.stopEmbeddedCassandra(); - } }