diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraAuditingBeanDefinitionParser.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraAuditingBeanDefinitionParser.java index b8a49219f..2d0ac1f60 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraAuditingBeanDefinitionParser.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraAuditingBeanDefinitionParser.java @@ -31,7 +31,6 @@ import org.springframework.data.cassandra.core.mapping.event.ReactiveAuditingEnt import org.springframework.lang.Nullable; import org.springframework.util.ClassUtils; import org.springframework.util.StringUtils; - import org.w3c.dom.Element; /** diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CqlSessionFactoryBean.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CqlSessionFactoryBean.java index 293470faf..b4bf4bf16 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CqlSessionFactoryBean.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CqlSessionFactoryBean.java @@ -30,7 +30,6 @@ import java.util.stream.Stream; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - import org.springframework.beans.factory.DisposableBean; import org.springframework.beans.factory.FactoryBean; import org.springframework.beans.factory.InitializingBean; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CqlSessionParser.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CqlSessionParser.java index 44f13ed45..3937183c1 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CqlSessionParser.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CqlSessionParser.java @@ -30,7 +30,6 @@ import org.springframework.beans.factory.xml.ParserContext; import org.springframework.data.cassandra.core.cql.keyspace.KeyspaceAttributes; import org.springframework.util.StringUtils; import org.springframework.util.xml.DomUtils; - import org.w3c.dom.Element; /** diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/InitializeKeyspaceBeanDefinitionParser.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/InitializeKeyspaceBeanDefinitionParser.java index 56a051611..79c3bca2a 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/InitializeKeyspaceBeanDefinitionParser.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/InitializeKeyspaceBeanDefinitionParser.java @@ -33,7 +33,6 @@ import org.springframework.data.cassandra.core.cql.session.init.SessionFactoryIn import org.springframework.lang.Nullable; import org.springframework.util.StringUtils; import org.springframework.util.xml.DomUtils; - import org.w3c.dom.Element; /** diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/SessionFactoryBeanDefinitionParser.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/SessionFactoryBeanDefinitionParser.java index d83614c4d..c8b4e8afc 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/SessionFactoryBeanDefinitionParser.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/SessionFactoryBeanDefinitionParser.java @@ -23,7 +23,6 @@ import org.springframework.beans.factory.support.BeanDefinitionBuilder; import org.springframework.beans.factory.xml.AbstractSingleBeanDefinitionParser; import org.springframework.beans.factory.xml.ParserContext; import org.springframework.util.StringUtils; - import org.w3c.dom.Element; /** diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/AsyncCassandraTemplate.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/AsyncCassandraTemplate.java index ff576c29e..ea9b2f26c 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/AsyncCassandraTemplate.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/AsyncCassandraTemplate.java @@ -23,27 +23,8 @@ import java.util.function.Function; import java.util.stream.Collectors; import java.util.stream.StreamSupport; -import com.datastax.oss.driver.api.core.CqlIdentifier; -import com.datastax.oss.driver.api.core.CqlSession; -import com.datastax.oss.driver.api.core.DriverException; -import com.datastax.oss.driver.api.core.config.DefaultDriverOption; -import com.datastax.oss.driver.api.core.cql.AsyncResultSet; -import com.datastax.oss.driver.api.core.cql.BoundStatement; -import com.datastax.oss.driver.api.core.cql.PreparedStatement; -import com.datastax.oss.driver.api.core.cql.ResultSet; -import com.datastax.oss.driver.api.core.cql.Row; -import com.datastax.oss.driver.api.core.cql.SimpleStatement; -import com.datastax.oss.driver.api.core.cql.Statement; -import com.datastax.oss.driver.api.querybuilder.QueryBuilder; -import com.datastax.oss.driver.api.querybuilder.delete.Delete; -import com.datastax.oss.driver.api.querybuilder.insert.Insert; -import com.datastax.oss.driver.api.querybuilder.insert.RegularInsert; -import com.datastax.oss.driver.api.querybuilder.select.Select; -import com.datastax.oss.driver.api.querybuilder.truncate.Truncate; -import com.datastax.oss.driver.api.querybuilder.update.Update; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; @@ -57,7 +38,21 @@ import org.springframework.data.cassandra.SessionFactory; import org.springframework.data.cassandra.core.EntityOperations.AdaptibleEntity; import org.springframework.data.cassandra.core.convert.CassandraConverter; import org.springframework.data.cassandra.core.convert.MappingCassandraConverter; -import org.springframework.data.cassandra.core.cql.*; +import org.springframework.data.cassandra.core.cql.AsyncCqlOperations; +import org.springframework.data.cassandra.core.cql.AsyncCqlTemplate; +import org.springframework.data.cassandra.core.cql.AsyncPreparedStatementCreator; +import org.springframework.data.cassandra.core.cql.AsyncResultSetExtractor; +import org.springframework.data.cassandra.core.cql.AsyncSessionCallback; +import org.springframework.data.cassandra.core.cql.CassandraAccessor; +import org.springframework.data.cassandra.core.cql.CqlExceptionTranslator; +import org.springframework.data.cassandra.core.cql.CqlProvider; +import org.springframework.data.cassandra.core.cql.PreparedStatementBinder; +import org.springframework.data.cassandra.core.cql.QueryExtractorDelegate; +import org.springframework.data.cassandra.core.cql.QueryOptions; +import org.springframework.data.cassandra.core.cql.RowCallbackHandler; +import org.springframework.data.cassandra.core.cql.RowMapper; +import org.springframework.data.cassandra.core.cql.SingleColumnRowMapper; +import org.springframework.data.cassandra.core.cql.WriteOptions; import org.springframework.data.cassandra.core.cql.session.DefaultSessionFactory; import org.springframework.data.cassandra.core.cql.util.CassandraFutureAdapter; import org.springframework.data.cassandra.core.cql.util.StatementBuilder; @@ -84,6 +79,25 @@ import org.springframework.scheduling.annotation.AsyncResult; import org.springframework.util.Assert; import org.springframework.util.concurrent.ListenableFuture; +import com.datastax.oss.driver.api.core.CqlIdentifier; +import com.datastax.oss.driver.api.core.CqlSession; +import com.datastax.oss.driver.api.core.DriverException; +import com.datastax.oss.driver.api.core.config.DefaultDriverOption; +import com.datastax.oss.driver.api.core.cql.AsyncResultSet; +import com.datastax.oss.driver.api.core.cql.BoundStatement; +import com.datastax.oss.driver.api.core.cql.PreparedStatement; +import com.datastax.oss.driver.api.core.cql.ResultSet; +import com.datastax.oss.driver.api.core.cql.Row; +import com.datastax.oss.driver.api.core.cql.SimpleStatement; +import com.datastax.oss.driver.api.core.cql.Statement; +import com.datastax.oss.driver.api.querybuilder.QueryBuilder; +import com.datastax.oss.driver.api.querybuilder.delete.Delete; +import com.datastax.oss.driver.api.querybuilder.insert.Insert; +import com.datastax.oss.driver.api.querybuilder.insert.RegularInsert; +import com.datastax.oss.driver.api.querybuilder.select.Select; +import com.datastax.oss.driver.api.querybuilder.truncate.Truncate; +import com.datastax.oss.driver.api.querybuilder.update.Update; + /** * Primary implementation of {@link AsyncCassandraOperations}. It simplifies the use of asynchronous Cassandra usage and * helps to avoid common errors. It executes core Cassandra workflow. This class executes CQL queries or updates, diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraPersistentEntitySchemaCreator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraPersistentEntitySchemaCreator.java index e45599716..cc0fd920c 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraPersistentEntitySchemaCreator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraPersistentEntitySchemaCreator.java @@ -24,7 +24,6 @@ import java.util.Set; import java.util.stream.Collectors; import org.jetbrains.annotations.NotNull; - import org.springframework.data.cassandra.core.cql.generator.CreateIndexCqlGenerator; import org.springframework.data.cassandra.core.cql.generator.CreateTableCqlGenerator; import org.springframework.data.cassandra.core.cql.generator.CreateUserTypeCqlGenerator; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraTemplate.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraTemplate.java index 32d653381..bb552e08d 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraTemplate.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraTemplate.java @@ -20,27 +20,8 @@ import java.util.function.Consumer; import java.util.function.Function; import java.util.stream.Stream; -import com.datastax.oss.driver.api.core.CqlIdentifier; -import com.datastax.oss.driver.api.core.CqlSession; -import com.datastax.oss.driver.api.core.DriverException; -import com.datastax.oss.driver.api.core.config.DefaultDriverOption; -import com.datastax.oss.driver.api.core.cql.BatchType; -import com.datastax.oss.driver.api.core.cql.BoundStatement; -import com.datastax.oss.driver.api.core.cql.PreparedStatement; -import com.datastax.oss.driver.api.core.cql.ResultSet; -import com.datastax.oss.driver.api.core.cql.Row; -import com.datastax.oss.driver.api.core.cql.SimpleStatement; -import com.datastax.oss.driver.api.core.cql.Statement; -import com.datastax.oss.driver.api.querybuilder.QueryBuilder; -import com.datastax.oss.driver.api.querybuilder.delete.Delete; -import com.datastax.oss.driver.api.querybuilder.insert.Insert; -import com.datastax.oss.driver.api.querybuilder.insert.RegularInsert; -import com.datastax.oss.driver.api.querybuilder.select.Select; -import com.datastax.oss.driver.api.querybuilder.truncate.Truncate; -import com.datastax.oss.driver.api.querybuilder.update.Update; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; @@ -55,7 +36,18 @@ import org.springframework.data.cassandra.core.convert.CassandraConverter; import org.springframework.data.cassandra.core.convert.MappingCassandraConverter; import org.springframework.data.cassandra.core.convert.QueryMapper; import org.springframework.data.cassandra.core.convert.UpdateMapper; -import org.springframework.data.cassandra.core.cql.*; +import org.springframework.data.cassandra.core.cql.CassandraAccessor; +import org.springframework.data.cassandra.core.cql.CqlOperations; +import org.springframework.data.cassandra.core.cql.CqlProvider; +import org.springframework.data.cassandra.core.cql.CqlTemplate; +import org.springframework.data.cassandra.core.cql.PreparedStatementBinder; +import org.springframework.data.cassandra.core.cql.PreparedStatementCreator; +import org.springframework.data.cassandra.core.cql.QueryExtractorDelegate; +import org.springframework.data.cassandra.core.cql.QueryOptions; +import org.springframework.data.cassandra.core.cql.RowMapper; +import org.springframework.data.cassandra.core.cql.SessionCallback; +import org.springframework.data.cassandra.core.cql.SingleColumnRowMapper; +import org.springframework.data.cassandra.core.cql.WriteOptions; import org.springframework.data.cassandra.core.cql.session.DefaultSessionFactory; import org.springframework.data.cassandra.core.cql.util.StatementBuilder; import org.springframework.data.cassandra.core.mapping.CassandraPersistentEntity; @@ -79,6 +71,25 @@ import org.springframework.data.projection.SpelAwareProxyProjectionFactory; import org.springframework.lang.Nullable; import org.springframework.util.Assert; +import com.datastax.oss.driver.api.core.CqlIdentifier; +import com.datastax.oss.driver.api.core.CqlSession; +import com.datastax.oss.driver.api.core.DriverException; +import com.datastax.oss.driver.api.core.config.DefaultDriverOption; +import com.datastax.oss.driver.api.core.cql.BatchType; +import com.datastax.oss.driver.api.core.cql.BoundStatement; +import com.datastax.oss.driver.api.core.cql.PreparedStatement; +import com.datastax.oss.driver.api.core.cql.ResultSet; +import com.datastax.oss.driver.api.core.cql.Row; +import com.datastax.oss.driver.api.core.cql.SimpleStatement; +import com.datastax.oss.driver.api.core.cql.Statement; +import com.datastax.oss.driver.api.querybuilder.QueryBuilder; +import com.datastax.oss.driver.api.querybuilder.delete.Delete; +import com.datastax.oss.driver.api.querybuilder.insert.Insert; +import com.datastax.oss.driver.api.querybuilder.insert.RegularInsert; +import com.datastax.oss.driver.api.querybuilder.select.Select; +import com.datastax.oss.driver.api.querybuilder.truncate.Truncate; +import com.datastax.oss.driver.api.querybuilder.update.Update; + /** * Primary implementation of {@link CassandraOperations}. It simplifies the use of Cassandra usage and helps to avoid * common errors. It executes core Cassandra workflow. This class executes CQL queries or updates, initiating iteration diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/PreparedStatementDelegate.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/PreparedStatementDelegate.java index a32fb5c5d..433da13ad 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/PreparedStatementDelegate.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/PreparedStatementDelegate.java @@ -22,7 +22,6 @@ import java.util.function.Predicate; import java.util.function.Supplier; import org.apache.commons.logging.Log; - import org.springframework.data.cassandra.core.cql.QueryExtractorDelegate; import org.springframework.lang.Nullable; import org.springframework.util.Assert; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveCassandraBatchOperations.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveCassandraBatchOperations.java index 755c73ad2..347f32210 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveCassandraBatchOperations.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveCassandraBatchOperations.java @@ -20,7 +20,6 @@ import reactor.core.publisher.Mono; import java.util.Collections; import org.reactivestreams.Subscriber; - import org.springframework.data.cassandra.core.cql.WriteOptions; import org.springframework.util.Assert; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveCassandraTemplate.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveCassandraTemplate.java index f264145d1..f704997ce 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveCassandraTemplate.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveCassandraTemplate.java @@ -26,7 +26,6 @@ import java.util.function.Function; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.reactivestreams.Publisher; - import org.springframework.beans.BeansException; import org.springframework.context.ApplicationContext; import org.springframework.context.ApplicationContextAware; @@ -41,7 +40,18 @@ import org.springframework.data.cassandra.ReactiveSessionFactory; import org.springframework.data.cassandra.core.EntityOperations.AdaptibleEntity; import org.springframework.data.cassandra.core.convert.CassandraConverter; import org.springframework.data.cassandra.core.convert.MappingCassandraConverter; -import org.springframework.data.cassandra.core.cql.*; +import org.springframework.data.cassandra.core.cql.CassandraAccessor; +import org.springframework.data.cassandra.core.cql.CqlProvider; +import org.springframework.data.cassandra.core.cql.PreparedStatementBinder; +import org.springframework.data.cassandra.core.cql.QueryExtractorDelegate; +import org.springframework.data.cassandra.core.cql.QueryOptions; +import org.springframework.data.cassandra.core.cql.ReactiveCqlOperations; +import org.springframework.data.cassandra.core.cql.ReactiveCqlTemplate; +import org.springframework.data.cassandra.core.cql.ReactivePreparedStatementCreator; +import org.springframework.data.cassandra.core.cql.ReactiveSessionCallback; +import org.springframework.data.cassandra.core.cql.RowMapper; +import org.springframework.data.cassandra.core.cql.SingleColumnRowMapper; +import org.springframework.data.cassandra.core.cql.WriteOptions; import org.springframework.data.cassandra.core.cql.session.DefaultReactiveSessionFactory; import org.springframework.data.cassandra.core.cql.util.StatementBuilder; import org.springframework.data.cassandra.core.mapping.CassandraPersistentEntity; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraJodaTimeConverters.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraJodaTimeConverters.java index 348bc87e6..fe3953074 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraJodaTimeConverters.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraJodaTimeConverters.java @@ -26,7 +26,6 @@ import org.joda.time.DateTime; import org.joda.time.LocalDate; import org.joda.time.LocalDateTime; import org.joda.time.LocalTime; - import org.springframework.core.convert.converter.Converter; import org.springframework.data.convert.WritingConverter; import org.springframework.util.ClassUtils; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraThreeTenBackPortConverters.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraThreeTenBackPortConverters.java index e36018773..dc5d7edf4 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraThreeTenBackPortConverters.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraThreeTenBackPortConverters.java @@ -27,7 +27,6 @@ import org.springframework.data.convert.ReadingConverter; import org.springframework.data.convert.ThreeTenBackPortConverters; import org.springframework.data.convert.WritingConverter; import org.springframework.util.ClassUtils; - import org.threeten.bp.LocalDate; import org.threeten.bp.LocalDateTime; import org.threeten.bp.LocalTime; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/DefaultColumnTypeResolver.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/DefaultColumnTypeResolver.java index 6b68b5ca8..181971c2d 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/DefaultColumnTypeResolver.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/DefaultColumnTypeResolver.java @@ -28,7 +28,6 @@ import java.util.stream.StreamSupport; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - import org.springframework.core.annotation.AnnotatedElementUtils; import org.springframework.dao.InvalidDataAccessApiUsageException; import org.springframework.data.cassandra.core.mapping.CassandraPersistentEntity; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/MappingCassandraConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/MappingCassandraConverter.java index 942321794..88fd77569 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/MappingCassandraConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/MappingCassandraConverter.java @@ -27,7 +27,6 @@ import java.util.function.Predicate; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - import org.springframework.beans.BeansException; import org.springframework.beans.factory.BeanClassLoaderAware; import org.springframework.context.ApplicationContext; @@ -37,8 +36,20 @@ import org.springframework.core.annotation.MergedAnnotations; import org.springframework.core.convert.ConversionService; import org.springframework.core.convert.support.DefaultConversionService; import org.springframework.dao.InvalidDataAccessApiUsageException; -import org.springframework.data.cassandra.core.mapping.*; +import org.springframework.data.cassandra.core.mapping.BasicCassandraPersistentEntity; +import org.springframework.data.cassandra.core.mapping.BasicMapId; +import org.springframework.data.cassandra.core.mapping.CassandraMappingContext; +import org.springframework.data.cassandra.core.mapping.CassandraPersistentEntity; +import org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty; +import org.springframework.data.cassandra.core.mapping.Column; +import org.springframework.data.cassandra.core.mapping.Element; +import org.springframework.data.cassandra.core.mapping.Embedded; import org.springframework.data.cassandra.core.mapping.Embedded.OnEmpty; +import org.springframework.data.cassandra.core.mapping.EmbeddedEntityOperations; +import org.springframework.data.cassandra.core.mapping.MapId; +import org.springframework.data.cassandra.core.mapping.MapIdentifiable; +import org.springframework.data.cassandra.core.mapping.PersistentPropertyTranslator; +import org.springframework.data.cassandra.core.mapping.UserTypeResolver; import org.springframework.data.convert.CustomConversions; import org.springframework.data.mapping.AccessOptions; import org.springframework.data.mapping.InstanceCreatorMetadata; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/UpdateMapper.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/UpdateMapper.java index 55ec67579..304408f77 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/UpdateMapper.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/UpdateMapper.java @@ -30,7 +30,6 @@ import java.util.Set; import org.springframework.data.cassandra.core.mapping.CassandraPersistentEntity; import org.springframework.data.cassandra.core.query.Filter; import org.springframework.data.cassandra.core.query.Update; -import org.springframework.data.cassandra.core.query.Update.*; import org.springframework.data.mapping.PersistentProperty; import org.springframework.data.util.TypeInformation; import org.springframework.util.Assert; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ArgumentPreparedStatementBinder.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ArgumentPreparedStatementBinder.java index b4614af58..faf9864ec 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ArgumentPreparedStatementBinder.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ArgumentPreparedStatementBinder.java @@ -15,12 +15,12 @@ */ package org.springframework.data.cassandra.core.cql; +import org.springframework.lang.Nullable; + import com.datastax.oss.driver.api.core.DriverException; import com.datastax.oss.driver.api.core.cql.BoundStatement; import com.datastax.oss.driver.api.core.cql.PreparedStatement; -import org.springframework.lang.Nullable; - /** * Simple adapter for {@link PreparedStatementBinder} that applies a given array of arguments. * diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/AsyncCqlOperations.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/AsyncCqlOperations.java index 08bfb3031..d3526a497 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/AsyncCqlOperations.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/AsyncCqlOperations.java @@ -18,16 +18,16 @@ package org.springframework.data.cassandra.core.cql; import java.util.List; import java.util.Map; -import com.datastax.oss.driver.api.core.cql.AsyncResultSet; -import com.datastax.oss.driver.api.core.cql.PreparedStatement; -import com.datastax.oss.driver.api.core.cql.ResultSet; -import com.datastax.oss.driver.api.core.cql.Statement; - import org.springframework.dao.DataAccessException; import org.springframework.dao.IncorrectResultSizeDataAccessException; import org.springframework.lang.Nullable; import org.springframework.util.concurrent.ListenableFuture; +import com.datastax.oss.driver.api.core.cql.AsyncResultSet; +import com.datastax.oss.driver.api.core.cql.PreparedStatement; +import com.datastax.oss.driver.api.core.cql.ResultSet; +import com.datastax.oss.driver.api.core.cql.Statement; + /** * Interface specifying a basic set of CQL asynchronously executed operations. Exposes similar methods as * {@link CqlTemplate}, but returns result handles or accepts callbacks as opposed to concrete results. Implemented by diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/AsyncResultSetExtractor.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/AsyncResultSetExtractor.java index 70068a4ec..3cd28988f 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/AsyncResultSetExtractor.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/AsyncResultSetExtractor.java @@ -15,13 +15,13 @@ */ package org.springframework.data.cassandra.core.cql; -import com.datastax.oss.driver.api.core.DriverException; -import com.datastax.oss.driver.api.core.cql.AsyncResultSet; - import org.springframework.dao.DataAccessException; import org.springframework.lang.Nullable; import org.springframework.util.concurrent.ListenableFuture; +import com.datastax.oss.driver.api.core.DriverException; +import com.datastax.oss.driver.api.core.cql.AsyncResultSet; + /** * Callback interface used by {@link AsyncCqlTemplate}'s query methods. Implementations of this interface perform the * actual work of extracting results from a {@link AsyncResultSet}, but don't need to worry about exception handling. diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/AsyncResultStream.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/AsyncResultStream.java index caece9184..1b208257c 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/AsyncResultStream.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/AsyncResultStream.java @@ -20,13 +20,13 @@ import java.util.concurrent.atomic.AtomicInteger; import java.util.function.Consumer; import java.util.stream.Collector; -import com.datastax.oss.driver.api.core.cql.AsyncResultSet; -import com.datastax.oss.driver.api.core.cql.Row; - import org.springframework.util.Assert; import org.springframework.util.concurrent.ListenableFuture; import org.springframework.util.concurrent.SettableListenableFuture; +import com.datastax.oss.driver.api.core.cql.AsyncResultSet; +import com.datastax.oss.driver.api.core.cql.Row; + /** * Asynchronous supplied sequence of elements supporting sequential operations over a {@link AsyncResultSet a result * set}. An asynchronous stream represents a pipeline of operations to process a {@link AsyncResultSet}. diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/AsyncSessionCallback.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/AsyncSessionCallback.java index 0888ab1ab..09790c8a9 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/AsyncSessionCallback.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/AsyncSessionCallback.java @@ -15,12 +15,12 @@ */ package org.springframework.data.cassandra.core.cql; -import com.datastax.oss.driver.api.core.CqlSession; -import com.datastax.oss.driver.api.core.DriverException; - import org.springframework.dao.DataAccessException; import org.springframework.util.concurrent.ListenableFuture; +import com.datastax.oss.driver.api.core.CqlSession; +import com.datastax.oss.driver.api.core.DriverException; + /** * Generic callback interface for code that operates asynchronously on a Cassandra {@link CqlSession}. Allows to execute * any number of operations on a single session, using any type and number of statements. diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/BeanPropertyRowMapper.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/BeanPropertyRowMapper.java index 7ecedeb29..4be670bcb 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/BeanPropertyRowMapper.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/BeanPropertyRowMapper.java @@ -24,7 +24,6 @@ import java.util.Set; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanWrapper; import org.springframework.beans.BeanWrapperImpl; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CachedPreparedStatementCreator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CachedPreparedStatementCreator.java index 71e07ed20..fb975afd4 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CachedPreparedStatementCreator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CachedPreparedStatementCreator.java @@ -20,7 +20,6 @@ import java.util.concurrent.ConcurrentHashMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - import org.springframework.util.Assert; import com.datastax.oss.driver.api.core.CqlIdentifier; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CassandraAccessor.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CassandraAccessor.java index 519da9a7f..78c6030ce 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CassandraAccessor.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CassandraAccessor.java @@ -19,7 +19,6 @@ import java.util.Map; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - import org.springframework.beans.factory.InitializingBean; import org.springframework.dao.DataAccessException; import org.springframework.data.cassandra.SessionFactory; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CassandraExceptionTranslator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CassandraExceptionTranslator.java index 4022ca4ae..8d13fbd57 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CassandraExceptionTranslator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CassandraExceptionTranslator.java @@ -25,7 +25,18 @@ import org.springframework.dao.DataAccessException; import org.springframework.dao.DataAccessResourceFailureException; import org.springframework.dao.TransientDataAccessResourceException; import org.springframework.dao.support.PersistenceExceptionTranslator; -import org.springframework.data.cassandra.*; +import org.springframework.data.cassandra.CassandraAuthenticationException; +import org.springframework.data.cassandra.CassandraConnectionFailureException; +import org.springframework.data.cassandra.CassandraInsufficientReplicasAvailableException; +import org.springframework.data.cassandra.CassandraInvalidConfigurationInQueryException; +import org.springframework.data.cassandra.CassandraInvalidQueryException; +import org.springframework.data.cassandra.CassandraQuerySyntaxException; +import org.springframework.data.cassandra.CassandraReadTimeoutException; +import org.springframework.data.cassandra.CassandraSchemaElementExistsException; +import org.springframework.data.cassandra.CassandraTruncateException; +import org.springframework.data.cassandra.CassandraUnauthorizedException; +import org.springframework.data.cassandra.CassandraUncategorizedException; +import org.springframework.data.cassandra.CassandraWriteTimeoutException; import org.springframework.lang.Nullable; import org.springframework.util.ClassUtils; import org.springframework.util.StringUtils; @@ -34,7 +45,19 @@ import com.datastax.oss.driver.api.core.AllNodesFailedException; import com.datastax.oss.driver.api.core.DriverException; import com.datastax.oss.driver.api.core.auth.AuthenticationException; import com.datastax.oss.driver.api.core.metadata.Node; -import com.datastax.oss.driver.api.core.servererrors.*; +import com.datastax.oss.driver.api.core.servererrors.AlreadyExistsException; +import com.datastax.oss.driver.api.core.servererrors.BootstrappingException; +import com.datastax.oss.driver.api.core.servererrors.CoordinatorException; +import com.datastax.oss.driver.api.core.servererrors.InvalidConfigurationInQueryException; +import com.datastax.oss.driver.api.core.servererrors.InvalidQueryException; +import com.datastax.oss.driver.api.core.servererrors.OverloadedException; +import com.datastax.oss.driver.api.core.servererrors.ReadTimeoutException; +import com.datastax.oss.driver.api.core.servererrors.SyntaxError; +import com.datastax.oss.driver.api.core.servererrors.TruncateException; +import com.datastax.oss.driver.api.core.servererrors.UnauthorizedException; +import com.datastax.oss.driver.api.core.servererrors.UnavailableException; +import com.datastax.oss.driver.api.core.servererrors.WriteTimeoutException; +import com.datastax.oss.driver.api.core.servererrors.WriteType; /** * Simple {@link PersistenceExceptionTranslator} for Cassandra. diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlConstantType.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlConstantType.java index d9fc212ed..db22ecc1a 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlConstantType.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlConstantType.java @@ -15,10 +15,10 @@ */ package org.springframework.data.cassandra.core.cql; -import java.util.regex.Pattern; - import static org.springframework.data.cassandra.core.cql.CqlConstantType.Regex.*; +import java.util.regex.Pattern; + public enum CqlConstantType { STRING(STRING_PATTERN), INTEGER(INTEGER_PATTERN), FLOAT(FLOAT_PATTERN), BOOLEAN(BOOLEAN_PATTERN), UUID( diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlExceptionTranslator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlExceptionTranslator.java index 6941b1089..a461aae8b 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlExceptionTranslator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlExceptionTranslator.java @@ -15,13 +15,13 @@ */ package org.springframework.data.cassandra.core.cql; -import com.datastax.oss.driver.api.core.DriverException; - import org.springframework.dao.DataAccessException; import org.springframework.dao.support.PersistenceExceptionTranslator; import org.springframework.data.cassandra.core.mapping.UnsupportedCassandraOperationException; import org.springframework.lang.Nullable; +import com.datastax.oss.driver.api.core.DriverException; + /** * Strategy interface for translating between {@link RuntimeException driver exceptions} and Spring's data access * strategy-agnostic {@link DataAccessException} hierarchy. diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlTemplate.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlTemplate.java index 1852276a2..ce15ef811 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlTemplate.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlTemplate.java @@ -453,7 +453,8 @@ public class CqlTemplate extends CassandraAccessor implements CqlOperations { try { if (logger.isDebugEnabled()) { - logger.debug(String.format("Preparing statement [%s] using %s", toCql(preparedStatementCreator), preparedStatementCreator)); + logger.debug(String.format("Preparing statement [%s] using %s", toCql(preparedStatementCreator), + preparedStatementCreator)); } CqlSession session = getCurrentSession(); @@ -523,7 +524,8 @@ public class CqlTemplate extends CassandraAccessor implements CqlOperations { try { if (logger.isDebugEnabled()) { - logger.debug(String.format("Preparing statement [%s] using %s", toCql(preparedStatementCreator), preparedStatementCreator)); + logger.debug(String.format("Preparing statement [%s] using %s", toCql(preparedStatementCreator), + preparedStatementCreator)); } CqlSession session = getCurrentSession(); @@ -531,7 +533,8 @@ public class CqlTemplate extends CassandraAccessor implements CqlOperations { PreparedStatement preparedStatement = preparedStatementCreator.createPreparedStatement(session); if (logger.isDebugEnabled()) { - logger.debug(String.format("Executing prepared statement [%s]", QueryExtractorDelegate.getCql(preparedStatement))); + logger.debug( + String.format("Executing prepared statement [%s]", QueryExtractorDelegate.getCql(preparedStatement))); } Statement boundStatement = applyStatementSettings( diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ExecutionProfileResolver.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ExecutionProfileResolver.java index 4630f60f4..0b490f0ee 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ExecutionProfileResolver.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ExecutionProfileResolver.java @@ -15,11 +15,11 @@ */ package org.springframework.data.cassandra.core.cql; +import org.springframework.util.Assert; + import com.datastax.oss.driver.api.core.config.DriverExecutionProfile; import com.datastax.oss.driver.api.core.cql.Statement; -import org.springframework.util.Assert; - /** * Resolver for a {@link com.datastax.oss.driver.api.core.config.DriverExecutionProfile} used with * {@link com.datastax.oss.driver.api.core.cql.Statement#setExecutionProfileName(String)} or diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/QueryExtractorDelegate.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/QueryExtractorDelegate.java index f9d2be0bf..165478369 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/QueryExtractorDelegate.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/QueryExtractorDelegate.java @@ -15,6 +15,9 @@ */ package org.springframework.data.cassandra.core.cql; +import org.springframework.lang.Nullable; +import org.springframework.util.ObjectUtils; + import com.datastax.oss.driver.api.core.cql.BatchStatement; import com.datastax.oss.driver.api.core.cql.BatchableStatement; import com.datastax.oss.driver.api.core.cql.BoundStatement; @@ -22,9 +25,6 @@ import com.datastax.oss.driver.api.core.cql.PreparedStatement; import com.datastax.oss.driver.api.core.cql.SimpleStatement; import com.datastax.oss.driver.api.core.cql.Statement; -import org.springframework.lang.Nullable; -import org.springframework.util.ObjectUtils; - /** * Utility to extract CQL queries from a {@link Statement}. * diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveCassandraAccessor.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveCassandraAccessor.java index e0f1272ef..fe0a2cab8 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveCassandraAccessor.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveCassandraAccessor.java @@ -17,7 +17,6 @@ package org.springframework.data.cassandra.core.cql; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - import org.springframework.beans.factory.InitializingBean; import org.springframework.dao.DataAccessException; import org.springframework.data.cassandra.ReactiveSession; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveCqlOperations.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveCqlOperations.java index e84a48027..1da7e2294 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveCqlOperations.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveCqlOperations.java @@ -15,20 +15,21 @@ */ package org.springframework.data.cassandra.core.cql; -import java.util.Map; - -import com.datastax.oss.driver.api.core.cql.PreparedStatement; -import com.datastax.oss.driver.api.core.cql.Row; -import com.datastax.oss.driver.api.core.cql.Statement; -import org.reactivestreams.Publisher; import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; +import java.util.Map; + +import org.reactivestreams.Publisher; import org.springframework.dao.DataAccessException; import org.springframework.dao.IncorrectResultSizeDataAccessException; import org.springframework.data.cassandra.ReactiveResultSet; import org.springframework.lang.Nullable; +import com.datastax.oss.driver.api.core.cql.PreparedStatement; +import com.datastax.oss.driver.api.core.cql.Row; +import com.datastax.oss.driver.api.core.cql.Statement; + /** * Interface specifying a basic set of CQL operations executed in a reactive fashion. Implemented by * {@link ReactiveCqlTemplate}. Not often used directly, but a useful option to enhance testability, as it can easily be diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveCqlTemplate.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveCqlTemplate.java index 00ccc6332..41d3e9317 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveCqlTemplate.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveCqlTemplate.java @@ -23,7 +23,6 @@ import java.util.function.Function; import java.util.function.Supplier; import org.reactivestreams.Publisher; - import org.springframework.dao.DataAccessException; import org.springframework.dao.support.DataAccessUtils; import org.springframework.data.cassandra.ReactiveResultSet; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactivePreparedStatementCallback.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactivePreparedStatementCallback.java index 6135f3a96..688738128 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactivePreparedStatementCallback.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactivePreparedStatementCallback.java @@ -16,7 +16,6 @@ package org.springframework.data.cassandra.core.cql; import org.reactivestreams.Publisher; - import org.springframework.dao.DataAccessException; import org.springframework.data.cassandra.ReactiveSession; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveResultSetExtractor.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveResultSetExtractor.java index 362473b0f..b9434964f 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveResultSetExtractor.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveResultSetExtractor.java @@ -15,12 +15,12 @@ */ package org.springframework.data.cassandra.core.cql; -import com.datastax.oss.driver.api.core.DriverException; import org.reactivestreams.Publisher; - import org.springframework.dao.DataAccessException; import org.springframework.data.cassandra.ReactiveResultSet; +import com.datastax.oss.driver.api.core.DriverException; + /** * Callback interface used by {@link ReactiveCqlTemplate}'s query methods. Implementations of this interface perform the * actual work of extracting results from a {@link ReactiveResultSet}, but don't need to worry about exception handling. diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveRowMapperResultSetExtractor.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveRowMapperResultSetExtractor.java index eefa1b170..e129d3551 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveRowMapperResultSetExtractor.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveRowMapperResultSetExtractor.java @@ -15,13 +15,13 @@ */ package org.springframework.data.cassandra.core.cql; -import com.datastax.oss.driver.api.core.DriverException; import org.reactivestreams.Publisher; - import org.springframework.dao.DataAccessException; import org.springframework.data.cassandra.ReactiveResultSet; import org.springframework.util.Assert; +import com.datastax.oss.driver.api.core.DriverException; + /** * Adapter implementation of the {@link ReactiveResultSetExtractor} interface that delegates to a {@link RowMapper} * which is supposed to create an object for each row. Each object is emitted through the {@link Publisher} of this diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveSessionCallback.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveSessionCallback.java index ef8de6945..24725a195 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveSessionCallback.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveSessionCallback.java @@ -15,13 +15,13 @@ */ package org.springframework.data.cassandra.core.cql; -import com.datastax.oss.driver.api.core.DriverException; -import com.datastax.oss.driver.api.core.cql.Statement; import org.reactivestreams.Publisher; - import org.springframework.dao.DataAccessException; import org.springframework.data.cassandra.ReactiveSession; +import com.datastax.oss.driver.api.core.DriverException; +import com.datastax.oss.driver.api.core.cql.Statement; + /** * Generic callback interface for code that operates on a CQL {@link ReactiveSession}. Allows to execute any number of * operations on a single {@link ReactiveSession}, using any type and number of Statements. diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveStatementCallback.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveStatementCallback.java index 203008413..e235424ce 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveStatementCallback.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveStatementCallback.java @@ -15,13 +15,13 @@ */ package org.springframework.data.cassandra.core.cql; -import com.datastax.oss.driver.api.core.DriverException; -import com.datastax.oss.driver.api.core.cql.Statement; import org.reactivestreams.Publisher; - import org.springframework.dao.DataAccessException; import org.springframework.data.cassandra.ReactiveSession; +import com.datastax.oss.driver.api.core.DriverException; +import com.datastax.oss.driver.api.core.cql.Statement; + /** * Generic callback interface for code that operates on a CQL {@link Statement}. Allows to execute any number of * operations on a single {@link Statement}, for example a single {@link ReactiveSession#execute(Statement)}. diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ResultSetExtractor.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ResultSetExtractor.java index 48c0eebba..d0aa55b77 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ResultSetExtractor.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ResultSetExtractor.java @@ -15,12 +15,12 @@ */ package org.springframework.data.cassandra.core.cql; -import com.datastax.oss.driver.api.core.DriverException; -import com.datastax.oss.driver.api.core.cql.ResultSet; - import org.springframework.dao.DataAccessException; import org.springframework.lang.Nullable; +import com.datastax.oss.driver.api.core.DriverException; +import com.datastax.oss.driver.api.core.cql.ResultSet; + /** * Callback interface used by {@link CqlTemplate}'s query methods. Implementations of this interface perform the actual * work of extracting results from a {@link ResultSet}, but don't need to worry about exception handling. diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/RingMemberHostMapper.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/RingMemberHostMapper.java index f60cb1109..219c0d0fd 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/RingMemberHostMapper.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/RingMemberHostMapper.java @@ -19,11 +19,11 @@ import java.util.Collection; import java.util.stream.Collectors; import java.util.stream.StreamSupport; +import org.springframework.util.Assert; + import com.datastax.oss.driver.api.core.DriverException; import com.datastax.oss.driver.api.core.metadata.Node; -import org.springframework.util.Assert; - /** * {@link HostMapper} to to map hosts into {@link RingMember} objects. * diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/RowUtils.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/RowUtils.java index 25c72c284..6d0a2a3fa 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/RowUtils.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/RowUtils.java @@ -23,12 +23,12 @@ import java.time.LocalTime; import java.util.Date; import java.util.UUID; +import org.springframework.lang.Nullable; + import com.datastax.oss.driver.api.core.cql.Row; import com.datastax.oss.driver.api.core.data.TupleValue; import com.datastax.oss.driver.api.core.data.UdtValue; -import org.springframework.lang.Nullable; - /** * Generic utility methods for working with Cassandra. Mainly for internal use within the framework, but also useful for * custom CQL access code. diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/SessionCallback.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/SessionCallback.java index 8896cb177..fc3433d9d 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/SessionCallback.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/SessionCallback.java @@ -15,11 +15,11 @@ */ package org.springframework.data.cassandra.core.cql; +import org.springframework.dao.DataAccessException; + import com.datastax.oss.driver.api.core.CqlSession; import com.datastax.oss.driver.api.core.DriverException; -import org.springframework.dao.DataAccessException; - /** * Generic callback interface for code that operates on a Cassandra {@link CqlSession}. Allows to execute any number of * operations on a single session, using any type and number of statements. diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToArrayConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToArrayConverter.java index d16440d7e..a898e05fa 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToArrayConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToArrayConverter.java @@ -18,12 +18,12 @@ package org.springframework.data.cassandra.core.cql.converter; import java.util.ArrayList; import java.util.List; -import com.datastax.oss.driver.api.core.cql.ResultSet; -import com.datastax.oss.driver.api.core.cql.Row; - import org.springframework.core.convert.converter.Converter; import org.springframework.util.Assert; +import com.datastax.oss.driver.api.core.cql.ResultSet; +import com.datastax.oss.driver.api.core.cql.Row; + /** * {@link Converter} from {@link ResultSet} to {@link Object} array. * diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToBigDecimalConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToBigDecimalConverter.java index 82290c5f6..8565bbd6b 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToBigDecimalConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToBigDecimalConverter.java @@ -17,10 +17,10 @@ package org.springframework.data.cassandra.core.cql.converter; import java.math.BigDecimal; -import com.datastax.oss.driver.api.core.cql.ResultSet; - import org.springframework.core.convert.converter.Converter; +import com.datastax.oss.driver.api.core.cql.ResultSet; + /** * {@link Converter} from {@link ResultSet} to a single {@link BigDecimal} value. * diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToBigIntegerConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToBigIntegerConverter.java index de2731ca0..392caa774 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToBigIntegerConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToBigIntegerConverter.java @@ -17,10 +17,10 @@ package org.springframework.data.cassandra.core.cql.converter; import java.math.BigInteger; -import com.datastax.oss.driver.api.core.cql.ResultSet; - import org.springframework.core.convert.converter.Converter; +import com.datastax.oss.driver.api.core.cql.ResultSet; + /** * {@link Converter} from {@link ResultSet} to a single {@link BigInteger} value. * diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToBooleanConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToBooleanConverter.java index def68d153..6c27afb31 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToBooleanConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToBooleanConverter.java @@ -15,10 +15,10 @@ */ package org.springframework.data.cassandra.core.cql.converter; -import com.datastax.oss.driver.api.core.cql.ResultSet; - import org.springframework.core.convert.converter.Converter; +import com.datastax.oss.driver.api.core.cql.ResultSet; + /** * {@link Converter} from {@link ResultSet} to a single {@link Boolean} value. * diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToByteBufferConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToByteBufferConverter.java index fc69646c9..11011ac96 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToByteBufferConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToByteBufferConverter.java @@ -17,10 +17,10 @@ package org.springframework.data.cassandra.core.cql.converter; import java.nio.ByteBuffer; -import com.datastax.oss.driver.api.core.cql.ResultSet; - import org.springframework.core.convert.converter.Converter; +import com.datastax.oss.driver.api.core.cql.ResultSet; + /** * {@link Converter} from {@link ResultSet} to a single {@link ByteBuffer} value. * diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToDateConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToDateConverter.java index 4e5de5180..fc931720e 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToDateConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToDateConverter.java @@ -17,10 +17,10 @@ package org.springframework.data.cassandra.core.cql.converter; import java.util.Date; -import com.datastax.oss.driver.api.core.cql.ResultSet; - import org.springframework.core.convert.converter.Converter; +import com.datastax.oss.driver.api.core.cql.ResultSet; + /** * {@link Converter} from {@link ResultSet} to a single {@link Date} value. * diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToDoubleConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToDoubleConverter.java index 8d192ab0a..09bf3307f 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToDoubleConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToDoubleConverter.java @@ -15,10 +15,10 @@ */ package org.springframework.data.cassandra.core.cql.converter; -import com.datastax.oss.driver.api.core.cql.ResultSet; - import org.springframework.core.convert.converter.Converter; +import com.datastax.oss.driver.api.core.cql.ResultSet; + /** * {@link Converter} from {@link ResultSet} to a single {@link Double} value. * diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToFloatConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToFloatConverter.java index 4a373c030..6b0ac076a 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToFloatConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToFloatConverter.java @@ -15,10 +15,10 @@ */ package org.springframework.data.cassandra.core.cql.converter; -import com.datastax.oss.driver.api.core.cql.ResultSet; - import org.springframework.core.convert.converter.Converter; +import com.datastax.oss.driver.api.core.cql.ResultSet; + /** * {@link Converter} from {@link ResultSet} to a single {@link Float} value. * diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToInetAddressConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToInetAddressConverter.java index 3e439126b..23b9e0bb5 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToInetAddressConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToInetAddressConverter.java @@ -17,10 +17,10 @@ package org.springframework.data.cassandra.core.cql.converter; import java.net.InetAddress; -import com.datastax.oss.driver.api.core.cql.ResultSet; - import org.springframework.core.convert.converter.Converter; +import com.datastax.oss.driver.api.core.cql.ResultSet; + /** * {@link Converter} from {@link ResultSet} to a single {@link InetAddress} value. * diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToIntegerConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToIntegerConverter.java index c745ac477..cc91c488a 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToIntegerConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToIntegerConverter.java @@ -15,10 +15,10 @@ */ package org.springframework.data.cassandra.core.cql.converter; -import com.datastax.oss.driver.api.core.cql.ResultSet; - import org.springframework.core.convert.converter.Converter; +import com.datastax.oss.driver.api.core.cql.ResultSet; + /** * {@link Converter} from {@link ResultSet} to a single {@link Integer} value. * diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToListConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToListConverter.java index 96f3c4db7..87db196cc 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToListConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToListConverter.java @@ -19,12 +19,12 @@ import java.util.ArrayList; import java.util.List; import java.util.Map; -import com.datastax.oss.driver.api.core.cql.ResultSet; -import com.datastax.oss.driver.api.core.cql.Row; - import org.springframework.core.convert.converter.Converter; import org.springframework.util.Assert; +import com.datastax.oss.driver.api.core.cql.ResultSet; +import com.datastax.oss.driver.api.core.cql.Row; + /** * {@link Converter} from {@link ResultSet} to {@link Map}. * diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToListOfStringConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToListOfStringConverter.java index 000b209af..78dc97d89 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToListOfStringConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToListOfStringConverter.java @@ -20,11 +20,11 @@ import java.util.List; import java.util.Map; import java.util.stream.Collectors; -import com.datastax.oss.driver.api.core.cql.ResultSet; - import org.springframework.core.convert.converter.Converter; import org.springframework.util.StringUtils; +import com.datastax.oss.driver.api.core.cql.ResultSet; + /** * {@link Converter} from {@link ResultSet} to a {@link List} of {@link String}. * diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToLongConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToLongConverter.java index a98ac6f13..db9b94324 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToLongConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToLongConverter.java @@ -15,10 +15,10 @@ */ package org.springframework.data.cassandra.core.cql.converter; -import com.datastax.oss.driver.api.core.cql.ResultSet; - import org.springframework.core.convert.converter.Converter; +import com.datastax.oss.driver.api.core.cql.ResultSet; + /** * {@link Converter} from {@link ResultSet} to a single {@link Long} value. * diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToStringConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToStringConverter.java index 062b9ec3d..00099c65a 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToStringConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToStringConverter.java @@ -18,10 +18,10 @@ package org.springframework.data.cassandra.core.cql.converter; import java.util.List; import java.util.Map; -import com.datastax.oss.driver.api.core.cql.ResultSet; - import org.springframework.core.convert.converter.Converter; +import com.datastax.oss.driver.api.core.cql.ResultSet; + /** * {@link Converter} from {@link ResultSet} to a single {@link String} value. * diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToUuidConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToUuidConverter.java index 9440211eb..b86330a18 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToUuidConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/ResultSetToUuidConverter.java @@ -17,10 +17,10 @@ package org.springframework.data.cassandra.core.cql.converter; import java.util.UUID; -import com.datastax.oss.driver.api.core.cql.ResultSet; - import org.springframework.core.convert.converter.Converter; +import com.datastax.oss.driver.api.core.cql.ResultSet; + /** * {@link Converter} from {@link ResultSet} to a single {@link UUID} value. * diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/RowToArrayConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/RowToArrayConverter.java index 46f7c4a95..fcf9b779f 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/RowToArrayConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/RowToArrayConverter.java @@ -17,10 +17,10 @@ package org.springframework.data.cassandra.core.cql.converter; import java.util.List; -import com.datastax.oss.driver.api.core.cql.Row; - import org.springframework.core.convert.converter.Converter; +import com.datastax.oss.driver.api.core.cql.Row; + /** * Converter to convert {@link Row} to {@link Object} array. * diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/RowToListConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/RowToListConverter.java index 6c08c0e8b..e527dacc4 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/RowToListConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/RowToListConverter.java @@ -18,12 +18,12 @@ package org.springframework.data.cassandra.core.cql.converter; import java.util.ArrayList; import java.util.List; -import com.datastax.oss.driver.api.core.cql.ColumnDefinitions; -import com.datastax.oss.driver.api.core.cql.Row; - import org.springframework.core.convert.converter.Converter; import org.springframework.data.convert.ReadingConverter; +import com.datastax.oss.driver.api.core.cql.ColumnDefinitions; +import com.datastax.oss.driver.api.core.cql.Row; + /** * Converter to convert {@link Row}s to a {@link List} of {@link Object} representation. * diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/RowToMapConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/RowToMapConverter.java index 6458de0bb..bf8d9253e 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/RowToMapConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/RowToMapConverter.java @@ -18,12 +18,12 @@ package org.springframework.data.cassandra.core.cql.converter; import java.util.HashMap; import java.util.Map; -import com.datastax.oss.driver.api.core.cql.ColumnDefinitions; -import com.datastax.oss.driver.api.core.cql.Row; - import org.springframework.core.convert.converter.Converter; import org.springframework.data.convert.ReadingConverter; +import com.datastax.oss.driver.api.core.cql.ColumnDefinitions; +import com.datastax.oss.driver.api.core.cql.Row; + /** * Converter to convert {@link Row}s to a {@link Map} of {@link String}/{@link Object} representation. * diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/generator/OptionRenderUtil.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/generator/OptionRenderUtil.java index 1689346c0..fecef49a6 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/generator/OptionRenderUtil.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/generator/OptionRenderUtil.java @@ -15,12 +15,12 @@ */ package org.springframework.data.cassandra.core.cql.generator; +import static org.springframework.data.cassandra.core.cql.keyspace.CqlStringUtils.*; + import java.util.Map; import org.springframework.data.cassandra.core.cql.keyspace.Option; -import static org.springframework.data.cassandra.core.cql.keyspace.CqlStringUtils.*; - /** * @author Mark Paluch * @since 2.0 diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/ColumnChangeSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/ColumnChangeSpecification.java index fc14b79a8..b65e8552f 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/ColumnChangeSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/ColumnChangeSpecification.java @@ -15,10 +15,10 @@ */ package org.springframework.data.cassandra.core.cql.keyspace; -import com.datastax.oss.driver.api.core.CqlIdentifier; - import org.springframework.util.Assert; +import com.datastax.oss.driver.api.core.CqlIdentifier; + /** * Base value object class for column change specifications. * diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/ColumnTypeChangeSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/ColumnTypeChangeSpecification.java index 43f22369a..3ab02808f 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/ColumnTypeChangeSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/ColumnTypeChangeSpecification.java @@ -15,11 +15,11 @@ */ package org.springframework.data.cassandra.core.cql.keyspace; +import org.springframework.util.Assert; + import com.datastax.oss.driver.api.core.CqlIdentifier; import com.datastax.oss.driver.api.core.type.DataType; -import org.springframework.util.Assert; - /** * Base value object class for column changes that include {@link DataType} information. * diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/CreateIndexSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/CreateIndexSpecification.java index f81c345c3..73dd0383a 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/CreateIndexSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/CreateIndexSpecification.java @@ -20,12 +20,12 @@ import java.util.Collections; import java.util.LinkedHashMap; import java.util.Map; -import com.datastax.oss.driver.api.core.CqlIdentifier; - import org.springframework.lang.Nullable; import org.springframework.util.Assert; import org.springframework.util.StringUtils; +import com.datastax.oss.driver.api.core.CqlIdentifier; + /** * Object to configure a {@code CREATE INDEX} specification. * diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/CreateTableSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/CreateTableSpecification.java index b92292975..7bbc8acf2 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/CreateTableSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/CreateTableSpecification.java @@ -15,10 +15,10 @@ */ package org.springframework.data.cassandra.core.cql.keyspace; -import com.datastax.oss.driver.api.core.CqlIdentifier; - import org.springframework.lang.Nullable; +import com.datastax.oss.driver.api.core.CqlIdentifier; + /** * Object to configure a {@code CREATE TABLE} specification. * diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/DropKeyspaceSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/DropKeyspaceSpecification.java index 9abaa7bb7..c1f145c0c 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/DropKeyspaceSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/DropKeyspaceSpecification.java @@ -16,9 +16,9 @@ package org.springframework.data.cassandra.core.cql.keyspace; import org.springframework.data.cassandra.core.cql.KeyspaceIdentifier; +import org.springframework.lang.Nullable; import com.datastax.oss.driver.api.core.CqlIdentifier; -import org.springframework.lang.Nullable; /** * Object to configure a {@code DROP KEYSPACE} specification. diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/IndexDescriptor.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/IndexDescriptor.java index f847a51e9..72fc379fc 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/IndexDescriptor.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/IndexDescriptor.java @@ -15,10 +15,10 @@ */ package org.springframework.data.cassandra.core.cql.keyspace; -import com.datastax.oss.driver.api.core.CqlIdentifier; - import org.springframework.lang.Nullable; +import com.datastax.oss.driver.api.core.CqlIdentifier; + /** * Describes an index. * diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/IndexNameSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/IndexNameSpecification.java index d8bd3edba..bb635f012 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/IndexNameSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/IndexNameSpecification.java @@ -15,11 +15,11 @@ */ package org.springframework.data.cassandra.core.cql.keyspace; -import com.datastax.oss.driver.api.core.CqlIdentifier; - import org.springframework.lang.Nullable; import org.springframework.util.Assert; +import com.datastax.oss.driver.api.core.CqlIdentifier; + /** * Abstract builder class to support the construction of an index. * diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/RenameColumnSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/RenameColumnSpecification.java index 8af8769f5..687dfb831 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/RenameColumnSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/RenameColumnSpecification.java @@ -15,10 +15,10 @@ */ package org.springframework.data.cassandra.core.cql.keyspace; -import com.datastax.oss.driver.api.core.CqlIdentifier; - import org.springframework.util.Assert; +import com.datastax.oss.driver.api.core.CqlIdentifier; + /** * {@link ColumnChangeSpecification} to rename a column. * diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/TableNameSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/TableNameSpecification.java index 08ed36b01..e0f7baf4e 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/TableNameSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/TableNameSpecification.java @@ -15,10 +15,10 @@ */ package org.springframework.data.cassandra.core.cql.keyspace; -import com.datastax.oss.driver.api.core.CqlIdentifier; - import org.springframework.util.Assert; +import com.datastax.oss.driver.api.core.CqlIdentifier; + /** * Abstract builder class to support the construction of table specifications. * diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/UserTypeNameSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/UserTypeNameSpecification.java index 489a0af14..1882418d1 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/UserTypeNameSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/UserTypeNameSpecification.java @@ -15,10 +15,10 @@ */ package org.springframework.data.cassandra.core.cql.keyspace; -import com.datastax.oss.driver.api.core.CqlIdentifier; - import org.springframework.util.Assert; +import com.datastax.oss.driver.api.core.CqlIdentifier; + /** * Base value object builder class to construction of user type specifications. * diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/DefaultBridgedReactiveSession.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/DefaultBridgedReactiveSession.java index d500b62b4..b63139e7f 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/DefaultBridgedReactiveSession.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/DefaultBridgedReactiveSession.java @@ -27,7 +27,6 @@ import java.util.concurrent.CompletionStage; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - import org.springframework.data.cassandra.ReactiveResultSet; import org.springframework.data.cassandra.ReactiveSession; import org.springframework.util.Assert; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/DefaultSessionFactory.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/DefaultSessionFactory.java index 1f332fec2..a22649661 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/DefaultSessionFactory.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/DefaultSessionFactory.java @@ -15,11 +15,11 @@ */ package org.springframework.data.cassandra.core.cql.session; -import com.datastax.oss.driver.api.core.CqlSession; - import org.springframework.data.cassandra.SessionFactory; import org.springframework.util.Assert; +import com.datastax.oss.driver.api.core.CqlSession; + /** * Default {@link SessionFactory} implementation. *

diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/init/ResourceKeyspacePopulator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/init/ResourceKeyspacePopulator.java index 868f136e3..b255867a1 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/init/ResourceKeyspacePopulator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/session/init/ResourceKeyspacePopulator.java @@ -19,8 +19,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import com.datastax.oss.driver.api.core.CqlSession; - import org.springframework.core.io.Resource; import org.springframework.core.io.support.EncodedResource; import org.springframework.data.cassandra.SessionFactory; @@ -28,6 +26,8 @@ import org.springframework.lang.Nullable; import org.springframework.util.Assert; import org.springframework.util.StringUtils; +import com.datastax.oss.driver.api.core.CqlSession; + /** * Populates, initializes, or cleans up a keyspace using CQL scripts defined in external resources. *