From d09e8d6e3ff3b64ba6e71e02bb461dfbb37aa85f Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 6 Jun 2017 12:28:52 +0200 Subject: [PATCH] DATACASS-448 - Update Javadoc references to relocated packages. Fix Javadoc leftovers after package relocation. --- .../core/AsyncCassandraTemplate.java | 6 +- .../core/CassandraAdminTemplate.java | 8 +- .../core/CassandraBatchTemplate.java | 4 +- .../cassandra/core/CassandraTemplate.java | 14 +-- .../core/ReactiveCassandraTemplate.java | 12 +-- .../BasicCassandraRowValueProvider.java | 2 +- .../convert/CassandraUDTValueProvider.java | 2 +- .../convert/MappingCassandraConverter.java | 2 +- .../cassandra/core/convert/UpdateMapper.java | 2 +- .../BasicCassandraPersistentEntity.java | 12 +-- ...andraPersistentEntityMetadataVerifier.java | 2 +- .../BasicCassandraPersistentProperty.java | 20 ++-- .../CassandraUserTypePersistentEntity.java | 6 +- ...andraPersistentEntityMetadataVerifier.java | 2 +- ...PrimaryKeyClassEntityMetadataVerifier.java | 2 +- .../core/mapping/SimpleUserTypeResolver.java | 2 +- .../data/cassandra/core/query/ColumnName.java | 2 +- .../data/cassandra/core/query/Columns.java | 2 +- .../query/ConvertingParameterAccessor.java | 2 +- .../core/ArgumentPreparedStatementBinder.java | 2 +- .../data/cql/core/AsyncCqlTemplate.java | 90 ++++++++-------- .../core/CachedPreparedStatementCreator.java | 2 +- .../data/cql/core/ColumnMapRowMapper.java | 2 +- .../data/cql/core/CqlTemplate.java | 100 +++++++++--------- .../data/cql/core/CqlTemplateSupport.java | 2 +- .../data/cql/core/ReactiveCqlTemplate.java | 86 +++++++-------- .../ReactiveRowMapperResultSetExtractor.java | 2 +- .../data/cql/core/RingMemberHostMapper.java | 2 +- .../cql/core/RowMapperResultSetExtractor.java | 2 +- .../core/SimplePreparedStatementCreator.java | 4 +- .../data/cql/core/WriteOptions.java | 14 +-- .../ResultSetToBigDecimalConverter.java | 4 +- .../ResultSetToBigIntegerConverter.java | 4 +- .../ResultSetToBooleanConverter.java | 4 +- .../ResultSetToByteBufferConverter.java | 4 +- .../converter/ResultSetToDateConverter.java | 4 +- .../converter/ResultSetToDoubleConverter.java | 4 +- .../converter/ResultSetToFloatConverter.java | 4 +- .../ResultSetToInetAddressConverter.java | 4 +- .../ResultSetToIntegerConverter.java | 4 +- .../ResultSetToListOfStringConverter.java | 4 +- .../converter/ResultSetToLongConverter.java | 4 +- .../converter/ResultSetToStringConverter.java | 4 +- .../converter/ResultSetToUuidConverter.java | 4 +- .../core/generator/AddColumnCqlGenerator.java | 2 +- .../generator/AlterUserTypeCqlGenerator.java | 2 +- .../generator/CreateUserTypeCqlGenerator.java | 2 +- .../generator/DropUserTypeCqlGenerator.java | 2 +- .../generator/RenameColumnCqlGenerator.java | 2 +- .../keyspace/CreateIndexSpecification.java | 8 +- .../data/cql/core/keyspace/DefaultOption.java | 14 +-- .../DefaultBridgedReactiveSession.java | 30 +++--- .../core/session/DefaultSessionFactory.java | 2 +- .../lookup/AbstractRoutingSessionFactory.java | 4 +- .../BeanFactorySessionFactoryLookup.java | 2 +- .../lookup/MapSessionFactoryLookup.java | 2 +- .../lookup/SingleSessionFactoryLookup.java | 2 +- .../support/CassandraExceptionTranslator.java | 2 +- .../cassandra/config/spring-cassandra-1.0.xsd | 6 +- .../cassandra/config/spring-cassandra-1.5.xsd | 10 +- .../data/cql/config/spring-cql-1.5.xsd | 2 +- .../core/ReactiveCqlTemplateUnitTests.java | 2 +- 62 files changed, 280 insertions(+), 280 deletions(-) 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 27503e7a4..5542eddd3 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 @@ -424,7 +424,7 @@ public class AsyncCassandraTemplate implements AsyncCassandraOperations { /* * (non-Javadoc) - * @see org.springframework.data.cassandra.core.AsyncCassandraOperations#insert(java.lang.Object, org.springframework.cassandra.core.WriteOptions) + * @see org.springframework.data.cassandra.core.AsyncCassandraOperations#insert(java.lang.Object, org.springframework.data.cql.core.WriteOptions) */ @Override public ListenableFuture insert(T entity, WriteOptions options) { @@ -448,7 +448,7 @@ public class AsyncCassandraTemplate implements AsyncCassandraOperations { /* * (non-Javadoc) - * @see org.springframework.data.cassandra.core.AsyncCassandraOperations#update(java.lang.Object, org.springframework.cassandra.core.WriteOptions) + * @see org.springframework.data.cassandra.core.AsyncCassandraOperations#update(java.lang.Object, org.springframework.data.cql.core.WriteOptions) */ @Override public ListenableFuture update(T entity, WriteOptions options) { @@ -472,7 +472,7 @@ public class AsyncCassandraTemplate implements AsyncCassandraOperations { /* * (non-Javadoc) - * @see org.springframework.data.cassandra.core.AsyncCassandraOperations#delete(java.lang.Object, org.springframework.cassandra.core.QueryOptions) + * @see org.springframework.data.cassandra.core.AsyncCassandraOperations#delete(java.lang.Object, org.springframework.data.cql.core.QueryOptions) */ @Override public ListenableFuture delete(T entity, QueryOptions options) { 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 95a30bea1..160f8c994 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 @@ -66,7 +66,7 @@ public class CassandraAdminTemplate extends CassandraTemplate implements Cassand /* * (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraAdminOperations#createTable(boolean, org.springframework.cassandra.core.cql.CqlIdentifier, java.lang.Class, java.util.Map) + * @see org.springframework.data.cassandra.core.CassandraAdminOperations#createTable(boolean, org.springframework.data.cql.core.cql.CqlIdentifier, java.lang.Class, java.util.Map) */ @Override public void createTable(boolean ifNotExists, CqlIdentifier tableName, Class entityClass, @@ -86,7 +86,7 @@ public class CassandraAdminTemplate extends CassandraTemplate implements Cassand /* * (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraAdminOperations#dropTable(org.springframework.cassandra.core.cql.CqlIdentifier) + * @see org.springframework.data.cassandra.core.CassandraAdminOperations#dropTable(org.springframework.data.cql.core.cql.CqlIdentifier) */ @Override public void dropTable(CqlIdentifier tableName) { @@ -95,7 +95,7 @@ public class CassandraAdminTemplate extends CassandraTemplate implements Cassand /* * (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraAdminOperations#dropUserType(org.springframework.cassandra.core.cql.CqlIdentifier) + * @see org.springframework.data.cassandra.core.CassandraAdminOperations#dropUserType(org.springframework.data.cql.core.cql.CqlIdentifier) */ @Override public void dropUserType(CqlIdentifier typeName) { @@ -107,7 +107,7 @@ public class CassandraAdminTemplate extends CassandraTemplate implements Cassand /* * (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraAdminOperations#getTableMetadata(java.lang.String, org.springframework.cassandra.core.cql.CqlIdentifier) + * @see org.springframework.data.cassandra.core.CassandraAdminOperations#getTableMetadata(java.lang.String, org.springframework.data.cql.core.cql.CqlIdentifier) */ @Override public Optional getTableMetadata(String keyspace, CqlIdentifier tableName) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraBatchTemplate.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraBatchTemplate.java index 079413f0a..393113d76 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraBatchTemplate.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraBatchTemplate.java @@ -102,7 +102,7 @@ class CassandraBatchTemplate implements CassandraBatchOperations { } /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraBatchOperations#insert(java.lang.Iterable, org.springframework.cassandra.core.WriteOptions) + * @see org.springframework.data.cassandra.core.CassandraBatchOperations#insert(java.lang.Iterable, org.springframework.data.cql.core.WriteOptions) */ @Override public CassandraBatchOperations insert(Iterable entities, WriteOptions options) { @@ -140,7 +140,7 @@ class CassandraBatchTemplate implements CassandraBatchOperations { } /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraBatchOperations#update(java.lang.Iterable, org.springframework.cassandra.core.WriteOptions) + * @see org.springframework.data.cassandra.core.CassandraBatchOperations#update(java.lang.Iterable, org.springframework.data.cql.core.WriteOptions) */ @Override public CassandraBatchOperations update(Iterable entities, WriteOptions options) { 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 6d10159cc..2e8aa8330 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 @@ -208,7 +208,7 @@ public class CassandraTemplate implements CassandraOperations { } /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraOperationsNG#stream(java.lang.String, java.lang.Class) + * @see org.springframework.data.cassandra.core.CassandraOperations#stream(java.lang.String, java.lang.Class) */ @Override public Stream stream(String cql, Class entityClass) throws DataAccessException { @@ -250,7 +250,7 @@ public class CassandraTemplate implements CassandraOperations { } /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraOperationsNG#stream(com.datastax.driver.core.Statement, java.lang.Class) + * @see org.springframework.data.cassandra.core.CassandraOperations#stream(com.datastax.driver.core.Statement, java.lang.Class) */ @Override public Stream stream(Statement statement, Class entityClass) throws DataAccessException { @@ -433,7 +433,7 @@ public class CassandraTemplate implements CassandraOperations { /* * (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraOperations#insert(java.lang.Object, org.springframework.cassandra.core.WriteOptions) + * @see org.springframework.data.cassandra.core.CassandraOperations#insert(java.lang.Object, org.springframework.data.cql.core.WriteOptions) */ @Override public T insert(T entity, WriteOptions options) { @@ -456,7 +456,7 @@ public class CassandraTemplate implements CassandraOperations { /* * (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraOperations#update(java.lang.Object, org.springframework.cassandra.core.WriteOptions) + * @see org.springframework.data.cassandra.core.CassandraOperations#update(java.lang.Object, org.springframework.data.cql.core.WriteOptions) */ @Override public T update(T entity, WriteOptions options) { @@ -479,7 +479,7 @@ public class CassandraTemplate implements CassandraOperations { /* * (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraOperations#delete(java.lang.Object, org.springframework.cassandra.core.QueryOptions) + * @see org.springframework.data.cassandra.core.CassandraOperations#delete(java.lang.Object, org.springframework.data.cql.core.QueryOptions) */ @Override public T delete(T entity, QueryOptions options) { @@ -532,7 +532,7 @@ public class CassandraTemplate implements CassandraOperations { /* /* * (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraOperationsNG#getTableName(java.lang.Class) + * @see org.springframework.data.cassandra.core.CassandraOperations#getTableName(java.lang.Class) */ @Override public CqlIdentifier getTableName(Class entityClass) { @@ -541,7 +541,7 @@ public class CassandraTemplate implements CassandraOperations { /* * (non-Javadoc) - * @see org.springframework.data.cassandra.core.CassandraOperationsNG#batchOps() + * @see org.springframework.data.cassandra.core.CassandraOperations#batchOps() */ @Override public CassandraBatchOperations batchOps() { 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 8a163b8fc..b868db606 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 @@ -380,7 +380,7 @@ public class ReactiveCassandraTemplate implements ReactiveCassandraOperations { /* * (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveCassandraOperations#insert(java.lang.Object, org.springframework.cassandra.core.WriteOptions) + * @see org.springframework.data.cassandra.core.ReactiveCassandraOperations#insert(java.lang.Object, org.springframework.data.cql.core.WriteOptions) */ @Override public Mono insert(T entity, WriteOptions options) { @@ -417,7 +417,7 @@ public class ReactiveCassandraTemplate implements ReactiveCassandraOperations { /* * (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveCassandraOperations#insert(org.reactivestreams.Publisher, org.springframework.cassandra.core.WriteOptions) + * @see org.springframework.data.cassandra.core.ReactiveCassandraOperations#insert(org.reactivestreams.Publisher, org.springframework.data.cql.core.WriteOptions) */ @Override public Flux insert(Publisher entities, WriteOptions options) { @@ -438,7 +438,7 @@ public class ReactiveCassandraTemplate implements ReactiveCassandraOperations { /* * (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveCassandraOperations#update(java.lang.Object, org.springframework.cassandra.core.WriteOptions) + * @see org.springframework.data.cassandra.core.ReactiveCassandraOperations#update(java.lang.Object, org.springframework.data.cql.core.WriteOptions) */ @Override public Mono update(T entity, WriteOptions options) { @@ -475,7 +475,7 @@ public class ReactiveCassandraTemplate implements ReactiveCassandraOperations { /* * (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveCassandraOperations#update(org.reactivestreams.Publisher, org.springframework.cassandra.core.WriteOptions) + * @see org.springframework.data.cassandra.core.ReactiveCassandraOperations#update(org.reactivestreams.Publisher, org.springframework.data.cql.core.WriteOptions) */ @Override public Flux update(Publisher entities, WriteOptions options) { @@ -515,7 +515,7 @@ public class ReactiveCassandraTemplate implements ReactiveCassandraOperations { /* * (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveCassandraOperations#delete(java.lang.Object, org.springframework.cassandra.core.QueryOptions) + * @see org.springframework.data.cassandra.core.ReactiveCassandraOperations#delete(java.lang.Object, org.springframework.data.cql.core.QueryOptions) */ @Override public Mono delete(T entity, QueryOptions options) { @@ -552,7 +552,7 @@ public class ReactiveCassandraTemplate implements ReactiveCassandraOperations { /* * (non-Javadoc) - * @see org.springframework.data.cassandra.core.ReactiveCassandraOperations#delete(org.reactivestreams.Publisher, org.springframework.cassandra.core.QueryOptions) + * @see org.springframework.data.cassandra.core.ReactiveCassandraOperations#delete(org.reactivestreams.Publisher, org.springframework.data.cql.core.QueryOptions) */ @Override public Flux delete(Publisher entities, QueryOptions options) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/BasicCassandraRowValueProvider.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/BasicCassandraRowValueProvider.java index 9a3eba01c..b9fcb6d9a 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/BasicCassandraRowValueProvider.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/BasicCassandraRowValueProvider.java @@ -78,7 +78,7 @@ public class BasicCassandraRowValueProvider implements CassandraRowValueProvider } /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.convert.CassandraValueProvider#hasProperty(org.springframework.data.cassandra.mapping.CassandraPersistentProperty) + * @see org.springframework.data.cassandra.core.convert.CassandraValueProvider#hasProperty(org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty) */ @Override public boolean hasProperty(CassandraPersistentProperty property) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraUDTValueProvider.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraUDTValueProvider.java index 8c3c1afa5..9f01a5348 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraUDTValueProvider.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraUDTValueProvider.java @@ -78,7 +78,7 @@ public class CassandraUDTValueProvider implements CassandraValueProvider { } /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.convert.CassandraValueProvider#hasProperty(org.springframework.data.cassandra.mapping.CassandraPersistentProperty) + * @see org.springframework.data.cassandra.core.convert.CassandraValueProvider#hasProperty(org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty) */ @Override public boolean hasProperty(CassandraPersistentProperty property) { 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 e66bfab00..6456f3b6f 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 @@ -950,7 +950,7 @@ public class MappingCassandraConverter extends AbstractCassandraConverter private final CassandraValueProvider parent; /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.convert.CassandraValueProvider#hasProperty(org.springframework.data.cassandra.mapping.CassandraPersistentProperty) + * @see org.springframework.data.cassandra.core.convert.CassandraValueProvider#hasProperty(org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty) */ @Override public boolean hasProperty(CassandraPersistentProperty property) { 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 b66e13140..de4a2bfb5 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 @@ -49,7 +49,7 @@ import com.datastax.driver.core.DataType.Name; * @author Mark Paluch * @see org.springframework.data.cassandra.core.query.Filter * @see org.springframework.data.cassandra.core.query.Update - * @see org.springframework.data.cassandra.mapping.CassandraPersistentEntity + * @see org.springframework.data.cassandra.core.mapping.CassandraPersistentEntity * @see org.springframework.data.mapping.PersistentProperty * @see org.springframework.data.util.TypeInformation * @since 2.0 diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentEntity.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentEntity.java index bdd32a32f..641d2f2be 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentEntity.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentEntity.java @@ -128,7 +128,7 @@ public class BasicCassandraPersistentEntity extends BasicPersistentEntity extends BasicPersistentEntity extends BasicPersistentEntity extends BasicPersistentEntity extends BasicPersistentEntity extends BasicPersistentEntity entity) throws MappingException { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentProperty.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentProperty.java index a02b5acc0..25c7b857e 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentProperty.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/BasicCassandraPersistentProperty.java @@ -124,7 +124,7 @@ public class BasicCassandraPersistentProperty extends AnnotationBasedPersistentP } /* (non-Javadoc) - * @see org.springframework.data.cassandra.mapping.CassandraPersistentProperty#getColumnName() + * @see org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty#getColumnName() */ @Override public CqlIdentifier getColumnName() { @@ -137,7 +137,7 @@ public class BasicCassandraPersistentProperty extends AnnotationBasedPersistentP } /* (non-Javadoc) - * @see org.springframework.data.cassandra.mapping.CassandraPersistentProperty#getPrimaryKeyOrdering() + * @see org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty#getPrimaryKeyOrdering() */ @Override public Optional getPrimaryKeyOrdering() { @@ -145,7 +145,7 @@ public class BasicCassandraPersistentProperty extends AnnotationBasedPersistentP } /* (non-Javadoc) - * @see org.springframework.data.cassandra.mapping.CassandraPersistentProperty#getDataType() + * @see org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty#getDataType() */ @Override public DataType getDataType() { @@ -277,7 +277,7 @@ public class BasicCassandraPersistentProperty extends AnnotationBasedPersistentP } /* (non-Javadoc) - * @see org.springframework.data.cassandra.mapping.CassandraPersistentProperty#isCompositePrimaryKey() + * @see org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty#isCompositePrimaryKey() */ @Override public boolean isCompositePrimaryKey() { @@ -285,7 +285,7 @@ public class BasicCassandraPersistentProperty extends AnnotationBasedPersistentP } /* (non-Javadoc) - * @see org.springframework.data.cassandra.mapping.CassandraPersistentProperty#isPrimaryKeyColumn() + * @see org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty#isPrimaryKeyColumn() */ @Override public boolean isPrimaryKeyColumn() { @@ -293,7 +293,7 @@ public class BasicCassandraPersistentProperty extends AnnotationBasedPersistentP } /* (non-Javadoc) - * @see org.springframework.data.cassandra.mapping.CassandraPersistentProperty#isPartitionKeyColumn() + * @see org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty#isPartitionKeyColumn() */ @Override public boolean isPartitionKeyColumn() { @@ -303,7 +303,7 @@ public class BasicCassandraPersistentProperty extends AnnotationBasedPersistentP } /* (non-Javadoc) - * @see org.springframework.data.cassandra.mapping.CassandraPersistentProperty#isClusterKeyColumn() + * @see org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty#isClusterKeyColumn() */ @Override public boolean isClusterKeyColumn() { @@ -353,7 +353,7 @@ public class BasicCassandraPersistentProperty extends AnnotationBasedPersistentP } /* (non-Javadoc) - * @see org.springframework.data.cassandra.mapping.CassandraPersistentProperty#setColumnName(org.springframework.cassandra.core.cql.CqlIdentifier) + * @see org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty#setColumnName(org.springframework.data.cql.core.cql.CqlIdentifier) */ @Override public void setColumnName(CqlIdentifier columnName) { @@ -364,7 +364,7 @@ public class BasicCassandraPersistentProperty extends AnnotationBasedPersistentP } /* (non-Javadoc) - * @see org.springframework.data.cassandra.mapping.CassandraPersistentProperty#setForceQuote(boolean) + * @see org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty#setForceQuote(boolean) */ @Override public void setForceQuote(boolean forceQuote) { @@ -399,7 +399,7 @@ public class BasicCassandraPersistentProperty extends AnnotationBasedPersistentP } /* (non-Javadoc) - * @see org.springframework.data.cassandra.mapping.CassandraPersistentProperty#isMapLike() + * @see org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty#isMapLike() */ @Override public boolean isMapLike() { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraUserTypePersistentEntity.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraUserTypePersistentEntity.java index d8f43f76c..32133c6cf 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraUserTypePersistentEntity.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraUserTypePersistentEntity.java @@ -56,7 +56,7 @@ public class CassandraUserTypePersistentEntity extends BasicCassandraPersiste } /* (non-Javadoc) - * @see org.springframework.data.cassandra.mapping.BasicCassandraPersistentEntity#determineTableName() + * @see org.springframework.data.cassandra.core.mapping.BasicCassandraPersistentEntity#determineTableName() */ @Override protected CqlIdentifier determineTableName() { @@ -67,7 +67,7 @@ public class CassandraUserTypePersistentEntity extends BasicCassandraPersiste } /* (non-Javadoc) - * @see org.springframework.data.cassandra.mapping.BasicCassandraPersistentEntity#isUserDefinedType() + * @see org.springframework.data.cassandra.core.mapping.BasicCassandraPersistentEntity#isUserDefinedType() */ @Override public boolean isUserDefinedType() { @@ -75,7 +75,7 @@ public class CassandraUserTypePersistentEntity extends BasicCassandraPersiste } /* (non-Javadoc) - * @see org.springframework.data.cassandra.mapping.BasicCassandraPersistentEntity#getUserType() + * @see org.springframework.data.cassandra.core.mapping.BasicCassandraPersistentEntity#getUserType() */ @Override public UserType getUserType() { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CompositeCassandraPersistentEntityMetadataVerifier.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CompositeCassandraPersistentEntityMetadataVerifier.java index 7de7dc8a9..9dfa3d6ab 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CompositeCassandraPersistentEntityMetadataVerifier.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CompositeCassandraPersistentEntityMetadataVerifier.java @@ -60,7 +60,7 @@ public class CompositeCassandraPersistentEntityMetadataVerifier implements Cassa /* * (non-Javadoc) - * @see org.springframework.data.cassandra.mapping.CassandraPersistentEntityMetadataVerifier#verify(org.springframework.data.cassandra.mapping.CassandraPersistentEntity) + * @see org.springframework.data.cassandra.core.mapping.CassandraPersistentEntityMetadataVerifier#verify(org.springframework.data.cassandra.core.mapping.CassandraPersistentEntity) */ @Override public void verify(CassandraPersistentEntity entity) throws MappingException { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/PrimaryKeyClassEntityMetadataVerifier.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/PrimaryKeyClassEntityMetadataVerifier.java index b54709711..bd3e34684 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/PrimaryKeyClassEntityMetadataVerifier.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/PrimaryKeyClassEntityMetadataVerifier.java @@ -33,7 +33,7 @@ public class PrimaryKeyClassEntityMetadataVerifier implements CassandraPersisten /* * (non-Javadoc) - * @see org.springframework.data.cassandra.mapping.CassandraPersistentEntityMetadataVerifier#verify(org.springframework.data.cassandra.mapping.CassandraPersistentEntity) + * @see org.springframework.data.cassandra.core.mapping.CassandraPersistentEntityMetadataVerifier#verify(org.springframework.data.cassandra.core.mapping.CassandraPersistentEntity) */ @Override public void verify(CassandraPersistentEntity entity) throws MappingException { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/SimpleUserTypeResolver.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/SimpleUserTypeResolver.java index 9716d1aad..89349d372 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/SimpleUserTypeResolver.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/SimpleUserTypeResolver.java @@ -50,7 +50,7 @@ public class SimpleUserTypeResolver implements UserTypeResolver { } /* (non-Javadoc) - * @see org.springframework.data.cassandra.mapping.UserTypeResolver#resolveType(org.springframework.cassandra.core.cql.CqlIdentifier) + * @see org.springframework.data.cassandra.core.mapping.UserTypeResolver#resolveType(org.springframework.data.cql.core.cql.CqlIdentifier) */ @Override public UserType resolveType(CqlIdentifier typeName) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/ColumnName.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/ColumnName.java index 6ba74236e..b4d004755 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/ColumnName.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/ColumnName.java @@ -29,7 +29,7 @@ import org.springframework.util.Assert; * Implementing classes must provide either {@link #getColumnName()} or {@link #getCqlIdentifier()}. * * @author Mark Paluch - * @see org.springframework.cassandra.core.cql.CqlIdentifier + * @see org.springframework.data.cql.core.cql.CqlIdentifier * @since 2.0 */ public abstract class ColumnName { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/Columns.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/Columns.java index 86daf6757..e93b4befe 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/Columns.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/query/Columns.java @@ -37,7 +37,7 @@ import org.springframework.util.StringUtils; * included using a {@link Selector}. * * @author Mark Paluch - * @see org.springframework.cassandra.core.cql.CqlIdentifier + * @see org.springframework.data.cql.core.cql.CqlIdentifier * @see org.springframework.data.cassandra.core.query.ColumnName * @see Selector * @see FunctionCall diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ConvertingParameterAccessor.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ConvertingParameterAccessor.java index 043cac412..ea116c34f 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ConvertingParameterAccessor.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ConvertingParameterAccessor.java @@ -277,7 +277,7 @@ class ConvertingParameterAccessor implements CassandraParameterAccessor { } /* (non-Javadoc) - * @see org.springframework.data.cassandra.repository.query.ConvertingParameterAccessor.PotentiallyConvertingIterator#nextConverted(org.springframework.data.cassandra.mapping.CassandraPersistentProperty) + * @see org.springframework.data.cassandra.repository.query.ConvertingParameterAccessor.PotentiallyConvertingIterator#nextConverted(org.springframework.data.cassandra.core.mapping.CassandraPersistentProperty) */ @Override public Object nextConverted(CassandraPersistentProperty property) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ArgumentPreparedStatementBinder.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ArgumentPreparedStatementBinder.java index b60e0d9c1..a610112ce 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ArgumentPreparedStatementBinder.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ArgumentPreparedStatementBinder.java @@ -39,7 +39,7 @@ public class ArgumentPreparedStatementBinder implements PreparedStatementBinder } /* (non-Javadoc) - * @see org.springframework.cassandra.core.PreparedStatementBinder#bindValues(com.datastax.driver.core.PreparedStatement) + * @see org.springframework.data.cql.core.PreparedStatementBinder#bindValues(com.datastax.driver.core.PreparedStatement) */ @Override public BoundStatement bindValues(PreparedStatement ps) throws DriverException { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/AsyncCqlTemplate.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/AsyncCqlTemplate.java index 639520045..19ba2cd23 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/AsyncCqlTemplate.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/AsyncCqlTemplate.java @@ -61,7 +61,7 @@ import com.google.common.util.concurrent.Futures; * it. *

* All CQL operations performed by this class are logged at debug level, using - * "org.springframework.cassandra.core.CqlTemplate" as log category. + * "org.springframework.data.cql.core.CqlTemplate" as log category. *

* NOTE: An instance of this class is thread-safe once configured. * @@ -120,7 +120,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.cassandra.core.AsyncCqlOperations#execute(org.springframework.cassandra.core.AsyncSessionCallback) + * @see org.springframework.data.cql.core.AsyncCqlOperations#execute(org.springframework.data.cql.core.AsyncSessionCallback) */ @Override public ListenableFuture execute(AsyncSessionCallback action) throws DataAccessException { @@ -140,7 +140,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.cassandra.core.AsyncCqlOperations#execute(java.lang.String) + * @see org.springframework.data.cql.core.AsyncCqlOperations#execute(java.lang.String) */ @Override public ListenableFuture execute(String cql) throws DataAccessException { @@ -152,7 +152,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.cassandra.core.AsyncCqlOperations#query(java.lang.String, org.springframework.cassandra.core.ResultSetExtractor) + * @see org.springframework.data.cql.core.AsyncCqlOperations#query(java.lang.String, org.springframework.data.cql.core.ResultSetExtractor) */ @Override public ListenableFuture query(String cql, ResultSetExtractor resultSetExtractor) @@ -180,7 +180,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.cassandra.core.AsyncCqlOperations#query(java.lang.String, org.springframework.cassandra.core.RowCallbackHandler) + * @see org.springframework.data.cql.core.AsyncCqlOperations#query(java.lang.String, org.springframework.data.cql.core.RowCallbackHandler) */ @Override public ListenableFuture query(String cql, RowCallbackHandler rowCallbackHandler) throws DataAccessException { @@ -193,7 +193,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.cassandra.core.AsyncCqlOperations#query(java.lang.String, org.springframework.cassandra.core.RowMapper) + * @see org.springframework.data.cql.core.AsyncCqlOperations#query(java.lang.String, org.springframework.data.cql.core.RowMapper) */ @Override public ListenableFuture> query(String cql, RowMapper rowMapper) throws DataAccessException { @@ -202,7 +202,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.cassandra.core.AsyncCqlOperations#queryForList(java.lang.String) + * @see org.springframework.data.cql.core.AsyncCqlOperations#queryForList(java.lang.String) */ @Override public ListenableFuture>> queryForList(String cql) throws DataAccessException { @@ -211,7 +211,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.cassandra.core.AsyncCqlOperations#queryForList(java.lang.String, java.lang.Class) + * @see org.springframework.data.cql.core.AsyncCqlOperations#queryForList(java.lang.String, java.lang.Class) */ @Override public ListenableFuture> queryForList(String cql, Class elementType) throws DataAccessException { @@ -220,7 +220,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.cassandra.core.AsyncCqlOperations#queryForMap(java.lang.String) + * @see org.springframework.data.cql.core.AsyncCqlOperations#queryForMap(java.lang.String) */ @Override public ListenableFuture> queryForMap(String cql) throws DataAccessException { @@ -229,7 +229,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.cassandra.core.AsyncCqlOperations#queryForObject(java.lang.String, java.lang.Class) + * @see org.springframework.data.cql.core.AsyncCqlOperations#queryForObject(java.lang.String, java.lang.Class) */ @Override public ListenableFuture queryForObject(String cql, Class requiredType) throws DataAccessException { @@ -238,7 +238,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.cassandra.core.AsyncCqlOperations#queryForObject(java.lang.String, org.springframework.cassandra.core.RowMapper) + * @see org.springframework.data.cql.core.AsyncCqlOperations#queryForObject(java.lang.String, org.springframework.data.cql.core.RowMapper) */ @Override public ListenableFuture queryForObject(String cql, RowMapper rowMapper) throws DataAccessException { @@ -251,7 +251,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.cassandra.core.AsyncCqlOperations#queryForResultSet(java.lang.String) + * @see org.springframework.data.cql.core.AsyncCqlOperations#queryForResultSet(java.lang.String) */ @Override public ListenableFuture queryForResultSet(String cql) throws DataAccessException { @@ -264,7 +264,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.cassandra.core.AsyncCqlOperations#execute(com.datastax.driver.core.Statement) + * @see org.springframework.data.cql.core.AsyncCqlOperations#execute(com.datastax.driver.core.Statement) */ @Override public ListenableFuture execute(Statement statement) throws DataAccessException { @@ -276,7 +276,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.cassandra.core.AsyncCqlOperations#query(com.datastax.driver.core.Statement, org.springframework.cassandra.core.ResultSetExtractor) + * @see org.springframework.data.cql.core.AsyncCqlOperations#query(com.datastax.driver.core.Statement, org.springframework.data.cql.core.ResultSetExtractor) */ @Override public ListenableFuture query(Statement statement, ResultSetExtractor resultSetExtractor) @@ -305,7 +305,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.cassandra.core.AsyncCqlOperations#query(com.datastax.driver.core.Statement, org.springframework.cassandra.core.RowCallbackHandler) + * @see org.springframework.data.cql.core.AsyncCqlOperations#query(com.datastax.driver.core.Statement, org.springframework.data.cql.core.RowCallbackHandler) */ @Override public ListenableFuture query(Statement statement, RowCallbackHandler rowCallbackHandler) @@ -319,7 +319,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.cassandra.core.AsyncCqlOperations#query(com.datastax.driver.core.Statement, org.springframework.cassandra.core.RowMapper) + * @see org.springframework.data.cql.core.AsyncCqlOperations#query(com.datastax.driver.core.Statement, org.springframework.data.cql.core.RowMapper) */ @Override public ListenableFuture> query(Statement statement, RowMapper rowMapper) throws DataAccessException { @@ -328,7 +328,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.cassandra.core.AsyncCqlOperations#queryForList(com.datastax.driver.core.Statement) + * @see org.springframework.data.cql.core.AsyncCqlOperations#queryForList(com.datastax.driver.core.Statement) */ @Override public ListenableFuture>> queryForList(Statement statement) throws DataAccessException { @@ -337,7 +337,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.cassandra.core.AsyncCqlOperations#queryForList(com.datastax.driver.core.Statement, java.lang.Class) + * @see org.springframework.data.cql.core.AsyncCqlOperations#queryForList(com.datastax.driver.core.Statement, java.lang.Class) */ @Override public ListenableFuture> queryForList(Statement statement, Class elementType) @@ -347,7 +347,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.cassandra.core.AsyncCqlOperations#queryForMap(com.datastax.driver.core.Statement) + * @see org.springframework.data.cql.core.AsyncCqlOperations#queryForMap(com.datastax.driver.core.Statement) */ @Override public ListenableFuture> queryForMap(Statement statement) throws DataAccessException { @@ -356,7 +356,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.cassandra.core.AsyncCqlOperations#queryForObject(com.datastax.driver.core.Statement, java.lang.Class) + * @see org.springframework.data.cql.core.AsyncCqlOperations#queryForObject(com.datastax.driver.core.Statement, java.lang.Class) */ @Override public ListenableFuture queryForObject(Statement statement, Class requiredType) throws DataAccessException { @@ -365,7 +365,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.cassandra.core.AsyncCqlOperations#queryForObject(com.datastax.driver.core.Statement, org.springframework.cassandra.core.RowMapper) + * @see org.springframework.data.cql.core.AsyncCqlOperations#queryForObject(com.datastax.driver.core.Statement, org.springframework.data.cql.core.RowMapper) */ @Override public ListenableFuture queryForObject(Statement statement, RowMapper rowMapper) @@ -379,7 +379,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.cassandra.core.AsyncCqlOperations#queryForResultSet(com.datastax.driver.core.Statement) + * @see org.springframework.data.cql.core.AsyncCqlOperations#queryForResultSet(com.datastax.driver.core.Statement) */ @Override public ListenableFuture queryForResultSet(Statement statement) throws DataAccessException { @@ -392,7 +392,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.cassandra.core.AsyncCqlOperations#execute(org.springframework.cassandra.core.AsyncPreparedStatementCreator) + * @see org.springframework.data.cql.core.AsyncCqlOperations#execute(org.springframework.data.cql.core.AsyncPreparedStatementCreator) */ @Override public ListenableFuture execute(AsyncPreparedStatementCreator preparedStatementCreator) @@ -403,7 +403,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.cassandra.core.AsyncCqlOperations#execute(java.lang.String, java.lang.Object[]) + * @see org.springframework.data.cql.core.AsyncCqlOperations#execute(java.lang.String, java.lang.Object[]) */ @Override public ListenableFuture execute(String cql, Object... args) throws DataAccessException { @@ -412,7 +412,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.cassandra.core.AsyncCqlOperations#execute(java.lang.String, org.springframework.cassandra.core.PreparedStatementBinder) + * @see org.springframework.data.cql.core.AsyncCqlOperations#execute(java.lang.String, org.springframework.data.cql.core.PreparedStatementBinder) */ @Override public ListenableFuture execute(String cql, PreparedStatementBinder preparedStatementBinder) @@ -423,7 +423,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.cassandra.core.AsyncCqlOperations#execute(java.lang.String, org.springframework.cassandra.core.PreparedStatementCallback) + * @see org.springframework.data.cql.core.AsyncCqlOperations#execute(java.lang.String, org.springframework.data.cql.core.PreparedStatementCallback) */ @Override public ListenableFuture execute(String cql, PreparedStatementCallback action) throws DataAccessException { @@ -432,7 +432,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.cassandra.core.AsyncCqlOperations#execute(org.springframework.cassandra.core.AsyncPreparedStatementCreator, org.springframework.cassandra.core.PreparedStatementCallback) + * @see org.springframework.data.cql.core.AsyncCqlOperations#execute(org.springframework.data.cql.core.AsyncPreparedStatementCreator, org.springframework.data.cql.core.PreparedStatementCallback) */ @Override public ListenableFuture execute(AsyncPreparedStatementCreator preparedStatementCreator, @@ -463,7 +463,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.cassandra.core.AsyncCqlOperations#query(org.springframework.cassandra.core.AsyncPreparedStatementCreator, org.springframework.cassandra.core.ResultSetExtractor) + * @see org.springframework.data.cql.core.AsyncCqlOperations#query(org.springframework.data.cql.core.AsyncPreparedStatementCreator, org.springframework.data.cql.core.ResultSetExtractor) */ @Override public ListenableFuture query(AsyncPreparedStatementCreator preparedStatementCreator, @@ -474,7 +474,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.cassandra.core.AsyncCqlOperations#query(org.springframework.cassandra.core.AsyncPreparedStatementCreator, org.springframework.cassandra.core.RowCallbackHandler) + * @see org.springframework.data.cql.core.AsyncCqlOperations#query(org.springframework.data.cql.core.AsyncPreparedStatementCreator, org.springframework.data.cql.core.RowCallbackHandler) */ @Override public ListenableFuture query(AsyncPreparedStatementCreator preparedStatementCreator, @@ -488,7 +488,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.cassandra.core.AsyncCqlOperations#query(org.springframework.cassandra.core.AsyncPreparedStatementCreator, org.springframework.cassandra.core.RowMapper) + * @see org.springframework.data.cql.core.AsyncCqlOperations#query(org.springframework.data.cql.core.AsyncPreparedStatementCreator, org.springframework.data.cql.core.RowMapper) */ @Override public ListenableFuture> query(AsyncPreparedStatementCreator preparedStatementCreator, @@ -499,7 +499,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.cassandra.core.AsyncCqlOperations#query(org.springframework.cassandra.core.AsyncPreparedStatementCreator, org.springframework.cassandra.core.PreparedStatementBinder, org.springframework.cassandra.core.ResultSetExtractor) + * @see org.springframework.data.cql.core.AsyncCqlOperations#query(org.springframework.data.cql.core.AsyncPreparedStatementCreator, org.springframework.data.cql.core.PreparedStatementBinder, org.springframework.data.cql.core.ResultSetExtractor) */ @Override public ListenableFuture query(AsyncPreparedStatementCreator preparedStatementCreator, @@ -569,7 +569,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.cassandra.core.AsyncCqlOperations#query(org.springframework.cassandra.core.AsyncPreparedStatementCreator, org.springframework.cassandra.core.PreparedStatementBinder, org.springframework.cassandra.core.RowCallbackHandler) + * @see org.springframework.data.cql.core.AsyncCqlOperations#query(org.springframework.data.cql.core.AsyncPreparedStatementCreator, org.springframework.data.cql.core.PreparedStatementBinder, org.springframework.data.cql.core.RowCallbackHandler) */ @Override public ListenableFuture query(AsyncPreparedStatementCreator preparedStatementCreator, @@ -585,7 +585,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.cassandra.core.AsyncCqlOperations#query(org.springframework.cassandra.core.AsyncPreparedStatementCreator, org.springframework.cassandra.core.PreparedStatementBinder, org.springframework.cassandra.core.RowMapper) + * @see org.springframework.data.cql.core.AsyncCqlOperations#query(org.springframework.data.cql.core.AsyncPreparedStatementCreator, org.springframework.data.cql.core.PreparedStatementBinder, org.springframework.data.cql.core.RowMapper) */ @Override public ListenableFuture> query(AsyncPreparedStatementCreator preparedStatementCreator, @@ -596,7 +596,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.cassandra.core.AsyncCqlOperations#query(java.lang.String, org.springframework.cassandra.core.ResultSetExtractor, java.lang.Object[]) + * @see org.springframework.data.cql.core.AsyncCqlOperations#query(java.lang.String, org.springframework.data.cql.core.ResultSetExtractor, java.lang.Object[]) */ @Override public ListenableFuture query(String cql, ResultSetExtractor resultSetExtractor, Object... args) @@ -607,7 +607,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.cassandra.core.AsyncCqlOperations#query(java.lang.String, org.springframework.cassandra.core.RowCallbackHandler, java.lang.Object[]) + * @see org.springframework.data.cql.core.AsyncCqlOperations#query(java.lang.String, org.springframework.data.cql.core.RowCallbackHandler, java.lang.Object[]) */ @Override public ListenableFuture query(String cql, RowCallbackHandler rowCallbackHandler, Object... args) @@ -622,7 +622,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.cassandra.core.AsyncCqlOperations#query(java.lang.String, org.springframework.cassandra.core.RowMapper, java.lang.Object[]) + * @see org.springframework.data.cql.core.AsyncCqlOperations#query(java.lang.String, org.springframework.data.cql.core.RowMapper, java.lang.Object[]) */ @Override public ListenableFuture> query(String cql, RowMapper rowMapper, Object... args) @@ -634,7 +634,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.cassandra.core.AsyncCqlOperations#query(java.lang.String, org.springframework.cassandra.core.PreparedStatementBinder, org.springframework.cassandra.core.ResultSetExtractor) + * @see org.springframework.data.cql.core.AsyncCqlOperations#query(java.lang.String, org.springframework.data.cql.core.PreparedStatementBinder, org.springframework.data.cql.core.ResultSetExtractor) */ @Override public ListenableFuture query(String cql, PreparedStatementBinder preparedStatementBinder, @@ -645,7 +645,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.cassandra.core.AsyncCqlOperations#query(java.lang.String, org.springframework.cassandra.core.PreparedStatementBinder, org.springframework.cassandra.core.RowCallbackHandler) + * @see org.springframework.data.cql.core.AsyncCqlOperations#query(java.lang.String, org.springframework.data.cql.core.PreparedStatementBinder, org.springframework.data.cql.core.RowCallbackHandler) */ @Override public ListenableFuture query(String cql, PreparedStatementBinder preparedStatementBinder, @@ -660,7 +660,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.cassandra.core.AsyncCqlOperations#query(java.lang.String, org.springframework.cassandra.core.PreparedStatementBinder, org.springframework.cassandra.core.RowMapper) + * @see org.springframework.data.cql.core.AsyncCqlOperations#query(java.lang.String, org.springframework.data.cql.core.PreparedStatementBinder, org.springframework.data.cql.core.RowMapper) */ @Override public ListenableFuture> query(String cql, PreparedStatementBinder preparedStatementBinder, @@ -671,7 +671,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.cassandra.core.AsyncCqlOperations#queryForList(java.lang.String, java.lang.Object[]) + * @see org.springframework.data.cql.core.AsyncCqlOperations#queryForList(java.lang.String, java.lang.Object[]) */ @Override public ListenableFuture>> queryForList(String cql, Object... args) @@ -683,7 +683,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.cassandra.core.AsyncCqlOperations#queryForList(java.lang.String, java.lang.Class, java.lang.Object[]) + * @see org.springframework.data.cql.core.AsyncCqlOperations#queryForList(java.lang.String, java.lang.Class, java.lang.Object[]) */ @Override public ListenableFuture> queryForList(String cql, Class elementType, Object... args) @@ -695,7 +695,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.cassandra.core.AsyncCqlOperations#queryForMap(java.lang.String, java.lang.Object[]) + * @see org.springframework.data.cql.core.AsyncCqlOperations#queryForMap(java.lang.String, java.lang.Object[]) */ @Override public ListenableFuture> queryForMap(String cql, Object... args) throws DataAccessException { @@ -704,7 +704,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.cassandra.core.AsyncCqlOperations#queryForObject(java.lang.String, java.lang.Class, java.lang.Object[]) + * @see org.springframework.data.cql.core.AsyncCqlOperations#queryForObject(java.lang.String, java.lang.Class, java.lang.Object[]) */ @Override public ListenableFuture queryForObject(String cql, Class requiredType, Object... args) @@ -715,7 +715,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.cassandra.core.AsyncCqlOperations#queryForObject(java.lang.String, org.springframework.cassandra.core.RowMapper, java.lang.Object[]) + * @see org.springframework.data.cql.core.AsyncCqlOperations#queryForObject(java.lang.String, org.springframework.data.cql.core.RowMapper, java.lang.Object[]) */ @Override public ListenableFuture queryForObject(String cql, RowMapper rowMapper, Object... args) @@ -730,7 +730,7 @@ public class AsyncCqlTemplate extends CqlTemplateSupport implements AsyncCqlOper /* * (non-Javadoc) - * @see org.springframework.cassandra.core.AsyncCqlOperations#queryForResultSet(java.lang.String, java.lang.Object[]) + * @see org.springframework.data.cql.core.AsyncCqlOperations#queryForResultSet(java.lang.String, java.lang.Object[]) */ @Override public ListenableFuture queryForResultSet(String cql, Object... args) throws DataAccessException { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CachedPreparedStatementCreator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CachedPreparedStatementCreator.java index 29b7c85b1..04225e19b 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CachedPreparedStatementCreator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CachedPreparedStatementCreator.java @@ -67,7 +67,7 @@ public class CachedPreparedStatementCreator implements PreparedStatementCreator } /* (non-Javadoc) - * @see org.springframework.cassandra.core.PreparedStatementCreator#createPreparedStatement(com.datastax.driver.core.Session) + * @see org.springframework.data.cql.core.PreparedStatementCreator#createPreparedStatement(com.datastax.driver.core.Session) */ @Override public PreparedStatement createPreparedStatement(Session session) throws DriverException { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ColumnMapRowMapper.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ColumnMapRowMapper.java index 9d4aa5810..71bb0925f 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ColumnMapRowMapper.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ColumnMapRowMapper.java @@ -42,7 +42,7 @@ import com.datastax.driver.core.Row; public class ColumnMapRowMapper implements RowMapper> { /* (non-Javadoc) - * @see org.springframework.cassandra.core.RowMapper#mapRow(com.datastax.driver.core.Row, int) + * @see org.springframework.data.cql.core.RowMapper#mapRow(com.datastax.driver.core.Row, int) */ @Override public Map mapRow(Row rs, int rowNum) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CqlTemplate.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CqlTemplate.java index 5ca538609..d1901baa7 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CqlTemplate.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CqlTemplate.java @@ -58,7 +58,7 @@ import com.datastax.driver.core.exceptions.DriverException; * it. *

* All CQL operations performed by this class are logged at debug level, using - * "org.springframework.cassandra.core.CqlTemplate" as log category. + * "org.springframework.data.cql.core.CqlTemplate" as log category. *

* NOTE: An instance of this class is thread-safe once configured. * @@ -119,7 +119,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.cassandra.core.CqlOperationsNG#execute(org.springframework.cassandra.core.SessionCallback) + * @see org.springframework.data.cql.core.CqlOperations#execute(org.springframework.data.cql.core.SessionCallback) */ @Override public T execute(SessionCallback action) throws DataAccessException { @@ -139,7 +139,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.cassandra.core.CqlOperationsNG#execute(java.lang.String) + * @see org.springframework.data.cql.core.CqlOperations#execute(java.lang.String) */ @Override public boolean execute(String cql) throws DataAccessException { @@ -151,7 +151,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.cassandra.core.CqlOperationsNG#query(java.lang.String, org.springframework.cassandra.core.ResultSetExtractor) + * @see org.springframework.data.cql.core.CqlOperations#query(java.lang.String, org.springframework.data.cql.core.ResultSetExtractor) */ @Override public T query(String cql, ResultSetExtractor resultSetExtractor) throws DataAccessException { @@ -176,7 +176,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.cassandra.core.CqlOperationsNG#query(java.lang.String, org.springframework.cassandra.core.RowCallbackHandler) + * @see org.springframework.data.cql.core.CqlOperations#query(java.lang.String, org.springframework.data.cql.core.RowCallbackHandler) */ @Override public void query(String cql, RowCallbackHandler rowCallbackHandler) throws DataAccessException { @@ -185,7 +185,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.cassandra.core.CqlOperationsNG#query(java.lang.String, org.springframework.cassandra.core.RowMapper) + * @see org.springframework.data.cql.core.CqlOperations#query(java.lang.String, org.springframework.data.cql.core.RowMapper) */ @Override public List query(String cql, RowMapper rowMapper) throws DataAccessException { @@ -194,7 +194,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.cassandra.core.CqlOperationsNG#queryForList(java.lang.String) + * @see org.springframework.data.cql.core.CqlOperations#queryForList(java.lang.String) */ @Override public List> queryForList(String cql) throws DataAccessException { @@ -203,7 +203,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.cassandra.core.CqlOperationsNG#queryForList(java.lang.String, java.lang.Class) + * @see org.springframework.data.cql.core.CqlOperations#queryForList(java.lang.String, java.lang.Class) */ @Override public List queryForList(String cql, Class elementType) throws DataAccessException { @@ -212,7 +212,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.cassandra.core.CqlOperationsNG#queryForMap(java.lang.String) + * @see org.springframework.data.cql.core.CqlOperations#queryForMap(java.lang.String) */ @Override public Map queryForMap(String cql) throws DataAccessException { @@ -221,7 +221,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.cassandra.core.CqlOperationsNG#queryForObject(java.lang.String, java.lang.Class) + * @see org.springframework.data.cql.core.CqlOperations#queryForObject(java.lang.String, java.lang.Class) */ @Override public T queryForObject(String cql, Class requiredType) throws DataAccessException { @@ -230,7 +230,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.cassandra.core.CqlOperationsNG#queryForObject(java.lang.String, org.springframework.cassandra.core.RowMapper) + * @see org.springframework.data.cql.core.CqlOperations#queryForObject(java.lang.String, org.springframework.data.cql.core.RowMapper) */ @Override public T queryForObject(String cql, RowMapper rowMapper) throws DataAccessException { @@ -239,7 +239,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.cassandra.core.CqlOperationsNG#queryForResultSet(java.lang.String) + * @see org.springframework.data.cql.core.CqlOperations#queryForResultSet(java.lang.String) */ @Override public ResultSet queryForResultSet(String cql) throws DataAccessException { @@ -248,7 +248,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.cassandra.core.CqlOperationsNG#queryForRows(java.lang.String) + * @see org.springframework.data.cql.core.CqlOperations#queryForRows(java.lang.String) */ @Override public Iterable queryForRows(String cql) throws DataAccessException { @@ -261,7 +261,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.cassandra.core.CqlOperationsNG#execute(com.datastax.driver.core.Statement) + * @see org.springframework.data.cql.core.CqlOperations#execute(com.datastax.driver.core.Statement) */ @Override public boolean execute(Statement statement) throws DataAccessException { @@ -273,7 +273,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.cassandra.core.CqlOperationsNG#query(com.datastax.driver.core.Statement, org.springframework.cassandra.core.ResultSetExtractor) + * @see org.springframework.data.cql.core.CqlOperations#query(com.datastax.driver.core.Statement, org.springframework.data.cql.core.ResultSetExtractor) */ @Override public T query(Statement statement, ResultSetExtractor resultSetExtractor) throws DataAccessException { @@ -294,7 +294,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.cassandra.core.CqlOperationsNG#query(com.datastax.driver.core.Statement, org.springframework.cassandra.core.RowCallbackHandler) + * @see org.springframework.data.cql.core.CqlOperations#query(com.datastax.driver.core.Statement, org.springframework.data.cql.core.RowCallbackHandler) */ @Override public void query(Statement statement, RowCallbackHandler rowCallbackHandler) throws DataAccessException { @@ -303,7 +303,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.cassandra.core.CqlOperationsNG#query(com.datastax.driver.core.Statement, org.springframework.cassandra.core.RowMapper) + * @see org.springframework.data.cql.core.CqlOperations#query(com.datastax.driver.core.Statement, org.springframework.data.cql.core.RowMapper) */ @Override public List query(Statement statement, RowMapper rowMapper) throws DataAccessException { @@ -312,7 +312,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.cassandra.core.CqlOperationsNG#queryForList(com.datastax.driver.core.Statement) + * @see org.springframework.data.cql.core.CqlOperations#queryForList(com.datastax.driver.core.Statement) */ @Override public List> queryForList(Statement statement) throws DataAccessException { @@ -321,7 +321,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.cassandra.core.CqlOperationsNG#queryForList(com.datastax.driver.core.Statement, java.lang.Class) + * @see org.springframework.data.cql.core.CqlOperations#queryForList(com.datastax.driver.core.Statement, java.lang.Class) */ @Override public List queryForList(Statement statement, Class elementType) throws DataAccessException { @@ -330,7 +330,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.cassandra.core.CqlOperationsNG#queryForMap(com.datastax.driver.core.Statement) + * @see org.springframework.data.cql.core.CqlOperations#queryForMap(com.datastax.driver.core.Statement) */ @Override public Map queryForMap(Statement statement) throws DataAccessException { @@ -339,7 +339,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.cassandra.core.CqlOperationsNG#queryForObject(com.datastax.driver.core.Statement, java.lang.Class) + * @see org.springframework.data.cql.core.CqlOperations#queryForObject(com.datastax.driver.core.Statement, java.lang.Class) */ @Override public T queryForObject(Statement statement, Class requiredType) throws DataAccessException { @@ -348,7 +348,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.cassandra.core.CqlOperationsNG#queryForObject(com.datastax.driver.core.Statement, org.springframework.cassandra.core.RowMapper) + * @see org.springframework.data.cql.core.CqlOperations#queryForObject(com.datastax.driver.core.Statement, org.springframework.data.cql.core.RowMapper) */ @Override public T queryForObject(Statement statement, RowMapper rowMapper) throws DataAccessException { @@ -357,7 +357,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.cassandra.core.CqlOperationsNG#queryForResultSet(com.datastax.driver.core.Statement) + * @see org.springframework.data.cql.core.CqlOperations#queryForResultSet(com.datastax.driver.core.Statement) */ @Override public ResultSet queryForResultSet(Statement statement) throws DataAccessException { @@ -366,7 +366,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.cassandra.core.CqlOperationsNG#queryForRows(com.datastax.driver.core.Statement) + * @see org.springframework.data.cql.core.CqlOperations#queryForRows(com.datastax.driver.core.Statement) */ @Override public Iterable queryForRows(Statement statement) throws DataAccessException { @@ -379,7 +379,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.cassandra.core.CqlOperationsNG#execute(java.lang.String, java.lang.Object[]) + * @see org.springframework.data.cql.core.CqlOperations#execute(java.lang.String, java.lang.Object[]) */ @Override public boolean execute(String cql, Object... args) throws DataAccessException { @@ -388,7 +388,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.cassandra.core.CqlOperationsNG#execute(java.lang.String, org.springframework.cassandra.core.PreparedStatementBinder) + * @see org.springframework.data.cql.core.CqlOperations#execute(java.lang.String, org.springframework.data.cql.core.PreparedStatementBinder) */ @Override public boolean execute(String cql, PreparedStatementBinder preparedStatementBinder) throws DataAccessException { @@ -397,7 +397,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.cassandra.core.CqlOperationsNG#execute(java.lang.String, org.springframework.cassandra.core.PreparedStatementCallback) + * @see org.springframework.data.cql.core.CqlOperations#execute(java.lang.String, org.springframework.data.cql.core.PreparedStatementCallback) */ @Override public T execute(String cql, PreparedStatementCallback action) throws DataAccessException { @@ -406,7 +406,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.cassandra.core.CqlOperationsNG#execute(org.springframework.cassandra.core.PreparedStatementCreator) + * @see org.springframework.data.cql.core.CqlOperations#execute(org.springframework.data.cql.core.PreparedStatementCreator) */ @Override public boolean execute(PreparedStatementCreator preparedStatementCreator) throws DataAccessException { @@ -415,7 +415,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.cassandra.core.CqlOperationsNG#execute(org.springframework.cassandra.core.PreparedStatementCreator, org.springframework.cassandra.core.PreparedStatementCallback) + * @see org.springframework.data.cql.core.CqlOperations#execute(org.springframework.data.cql.core.PreparedStatementCreator, org.springframework.data.cql.core.PreparedStatementCallback) */ @Override public T execute(PreparedStatementCreator preparedStatementCreator, PreparedStatementCallback action) @@ -441,7 +441,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.cassandra.core.CqlOperationsNG#query(org.springframework.cassandra.core.PreparedStatementCreator, org.springframework.cassandra.core.ResultSetExtractor) + * @see org.springframework.data.cql.core.CqlOperations#query(org.springframework.data.cql.core.PreparedStatementCreator, org.springframework.data.cql.core.ResultSetExtractor) */ @Override public T query(PreparedStatementCreator preparedStatementCreator, ResultSetExtractor resultSetExtractor) @@ -452,7 +452,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.cassandra.core.CqlOperationsNG#query(org.springframework.cassandra.core.PreparedStatementCreator, org.springframework.cassandra.core.RowCallbackHandler) + * @see org.springframework.data.cql.core.CqlOperations#query(org.springframework.data.cql.core.PreparedStatementCreator, org.springframework.data.cql.core.RowCallbackHandler) */ @Override public void query(PreparedStatementCreator preparedStatementCreator, RowCallbackHandler rowCallbackHandler) @@ -463,7 +463,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.cassandra.core.CqlOperationsNG#query(org.springframework.cassandra.core.PreparedStatementCreator, org.springframework.cassandra.core.RowMapper) + * @see org.springframework.data.cql.core.CqlOperations#query(org.springframework.data.cql.core.PreparedStatementCreator, org.springframework.data.cql.core.RowMapper) */ @Override public List query(PreparedStatementCreator preparedStatementCreator, RowMapper rowMapper) @@ -474,7 +474,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.cassandra.core.CqlOperationsNG#query(org.springframework.cassandra.core.PreparedStatementCreator, org.springframework.cassandra.core.PreparedStatementBinder, org.springframework.cassandra.core.ResultSetExtractor) + * @see org.springframework.data.cql.core.CqlOperations#query(org.springframework.data.cql.core.PreparedStatementCreator, org.springframework.data.cql.core.PreparedStatementBinder, org.springframework.data.cql.core.ResultSetExtractor) */ @Override public T query(PreparedStatementCreator preparedStatementCreator, PreparedStatementBinder preparedStatementBinder, @@ -510,7 +510,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.cassandra.core.CqlOperationsNG#query(org.springframework.cassandra.core.PreparedStatementCreator, org.springframework.cassandra.core.PreparedStatementBinder, org.springframework.cassandra.core.RowCallbackHandler) + * @see org.springframework.data.cql.core.CqlOperations#query(org.springframework.data.cql.core.PreparedStatementCreator, org.springframework.data.cql.core.PreparedStatementBinder, org.springframework.data.cql.core.RowCallbackHandler) */ @Override public void query(PreparedStatementCreator preparedStatementCreator, PreparedStatementBinder preparedStatementBinder, @@ -521,7 +521,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.cassandra.core.CqlOperationsNG#query(org.springframework.cassandra.core.PreparedStatementCreator, org.springframework.cassandra.core.PreparedStatementBinder, org.springframework.cassandra.core.RowMapper) + * @see org.springframework.data.cql.core.CqlOperations#query(org.springframework.data.cql.core.PreparedStatementCreator, org.springframework.data.cql.core.PreparedStatementBinder, org.springframework.data.cql.core.RowMapper) */ @Override public List query(PreparedStatementCreator preparedStatementCreator, @@ -532,7 +532,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.cassandra.core.CqlOperationsNG#query(java.lang.String, org.springframework.cassandra.core.ResultSetExtractor, java.lang.Object[]) + * @see org.springframework.data.cql.core.CqlOperations#query(java.lang.String, org.springframework.data.cql.core.ResultSetExtractor, java.lang.Object[]) */ @Override public T query(String cql, ResultSetExtractor resultSetExtractor, Object... args) throws DataAccessException { @@ -542,7 +542,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.cassandra.core.CqlOperationsNG#query(java.lang.String, org.springframework.cassandra.core.RowCallbackHandler, java.lang.Object[]) + * @see org.springframework.data.cql.core.CqlOperations#query(java.lang.String, org.springframework.data.cql.core.RowCallbackHandler, java.lang.Object[]) */ @Override public void query(String cql, RowCallbackHandler rowCallbackHandler, Object... args) throws DataAccessException { @@ -552,7 +552,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.cassandra.core.CqlOperationsNG#query(java.lang.String, org.springframework.cassandra.core.RowMapper, java.lang.Object[]) + * @see org.springframework.data.cql.core.CqlOperations#query(java.lang.String, org.springframework.data.cql.core.RowMapper, java.lang.Object[]) */ @Override public List query(String cql, RowMapper rowMapper, Object... args) throws DataAccessException { @@ -561,7 +561,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.cassandra.core.CqlOperationsNG#query(java.lang.String, org.springframework.cassandra.core.PreparedStatementBinder, org.springframework.cassandra.core.ResultSetExtractor) + * @see org.springframework.data.cql.core.CqlOperations#query(java.lang.String, org.springframework.data.cql.core.PreparedStatementBinder, org.springframework.data.cql.core.ResultSetExtractor) */ @Override public T query(String cql, PreparedStatementBinder preparedStatementBinder, @@ -572,7 +572,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.cassandra.core.CqlOperationsNG#query(java.lang.String, org.springframework.cassandra.core.PreparedStatementBinder, org.springframework.cassandra.core.RowCallbackHandler) + * @see org.springframework.data.cql.core.CqlOperations#query(java.lang.String, org.springframework.data.cql.core.PreparedStatementBinder, org.springframework.data.cql.core.RowCallbackHandler) */ @Override public void query(String cql, PreparedStatementBinder preparedStatementBinder, RowCallbackHandler rowCallbackHandler) @@ -583,7 +583,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.cassandra.core.CqlOperationsNG#query(java.lang.String, org.springframework.cassandra.core.PreparedStatementBinder, org.springframework.cassandra.core.RowMapper) + * @see org.springframework.data.cql.core.CqlOperations#query(java.lang.String, org.springframework.data.cql.core.PreparedStatementBinder, org.springframework.data.cql.core.RowMapper) */ @Override public List query(String cql, PreparedStatementBinder preparedStatementBinder, RowMapper rowMapper) @@ -594,7 +594,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.cassandra.core.CqlOperationsNG#queryForList(java.lang.String, java.lang.Object[]) + * @see org.springframework.data.cql.core.CqlOperations#queryForList(java.lang.String, java.lang.Object[]) */ @Override public List> queryForList(String cql, Object... args) throws DataAccessException { @@ -604,7 +604,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.cassandra.core.CqlOperationsNG#queryForList(java.lang.String, java.lang.Class, java.lang.Object[]) + * @see org.springframework.data.cql.core.CqlOperations#queryForList(java.lang.String, java.lang.Class, java.lang.Object[]) */ @Override public List queryForList(String cql, Class elementType, Object... args) throws DataAccessException { @@ -614,7 +614,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.cassandra.core.CqlOperationsNG#queryForMap(java.lang.String, java.lang.Object[]) + * @see org.springframework.data.cql.core.CqlOperations#queryForMap(java.lang.String, java.lang.Object[]) */ @Override public Map queryForMap(String cql, Object... args) throws DataAccessException { @@ -623,7 +623,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.cassandra.core.CqlOperationsNG#queryForObject(java.lang.String, java.lang.Class, java.lang.Object[]) + * @see org.springframework.data.cql.core.CqlOperations#queryForObject(java.lang.String, java.lang.Class, java.lang.Object[]) */ @Override public T queryForObject(String cql, Class requiredType, Object... args) throws DataAccessException { @@ -632,7 +632,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.cassandra.core.CqlOperationsNG#queryForObject(java.lang.String, org.springframework.cassandra.core.RowMapper, java.lang.Object[]) + * @see org.springframework.data.cql.core.CqlOperations#queryForObject(java.lang.String, org.springframework.data.cql.core.RowMapper, java.lang.Object[]) */ @Override public T queryForObject(String cql, RowMapper rowMapper, Object... args) throws DataAccessException { @@ -642,7 +642,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.cassandra.core.CqlOperationsNG#queryForResultSet(java.lang.String, java.lang.Object[]) + * @see org.springframework.data.cql.core.CqlOperations#queryForResultSet(java.lang.String, java.lang.Object[]) */ @Override public ResultSet queryForResultSet(String cql, Object... args) throws DataAccessException { @@ -651,7 +651,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.cassandra.core.CqlOperationsNG#queryForRows(java.lang.String, java.lang.Object[]) + * @see org.springframework.data.cql.core.CqlOperations#queryForRows(java.lang.String, java.lang.Object[]) */ @Override public Iterable queryForRows(String cql, Object... args) throws DataAccessException { @@ -660,7 +660,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.cassandra.core.CqlOperationsNG#describeRing() + * @see org.springframework.data.cql.core.CqlOperations#describeRing() */ @Override public List describeRing() throws DataAccessException { @@ -669,7 +669,7 @@ public class CqlTemplate extends CqlTemplateSupport implements CqlOperations { /* * (non-Javadoc) - * @see org.springframework.cassandra.core.CqlOperationsNG#describeRing(org.springframework.cassandra.core.HostMapper) + * @see org.springframework.data.cql.core.CqlOperations#describeRing(org.springframework.data.cql.core.HostMapper) */ @Override public Collection describeRing(HostMapper hostMapper) throws DataAccessException { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CqlTemplateSupport.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CqlTemplateSupport.java index 071703a4d..45ccb3aee 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CqlTemplateSupport.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/CqlTemplateSupport.java @@ -134,7 +134,7 @@ public abstract class CqlTemplateSupport extends CassandraAccessor { /* (non-Javadoc) * - @see org.springframework.cassandra.core.ResultSetExtractor#extractData(com.datastax.driver.core.ResultSet) + @see org.springframework.data.cql.core.ResultSetExtractor#extractData(com.datastax.driver.core.ResultSet) */ @Override public Object extractData(ResultSet resultSet) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReactiveCqlTemplate.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReactiveCqlTemplate.java index a7175d715..0e3fd5a26 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReactiveCqlTemplate.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReactiveCqlTemplate.java @@ -65,7 +65,7 @@ import com.datastax.driver.core.querybuilder.QueryBuilder; * it. *

* All CQL operations performed by this class are logged at debug level, using - * "org.springframework.cassandra.core.ReactiveCqlTemplate" as log category. + * "org.springframework.data.cql.core.ReactiveCqlTemplate" as log category. *

* NOTE: An instance of this class is thread-safe once configured. * @@ -196,11 +196,11 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } // ------------------------------------------------------------------------- - // Methods dealing with a plain org.springframework.cassandra.core.ReactiveSession + // Methods dealing with a plain org.springframework.data.cql.core.ReactiveSession // ------------------------------------------------------------------------- /* (non-Javadoc) - * @see org.springframework.cassandra.core.ReactiveCqlOperations#execute(org.springframework.cassandra.core.ReactiveSessionCallback) + * @see org.springframework.data.cql.core.ReactiveCqlOperations#execute(org.springframework.data.cql.core.ReactiveSessionCallback) */ @Override public Flux execute(ReactiveSessionCallback action) throws DataAccessException { @@ -215,7 +215,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re // ------------------------------------------------------------------------- /* (non-Javadoc) - * @see org.springframework.cassandra.core.ReactiveCqlOperations#execute(java.lang.String) + * @see org.springframework.data.cql.core.ReactiveCqlOperations#execute(java.lang.String) */ @Override public Mono execute(String cql) throws DataAccessException { @@ -226,7 +226,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.cassandra.core.ReactiveCqlOperations#query(java.lang.String, org.springframework.cassandra.core.ReactiveResultSetExtractor) + * @see org.springframework.data.cql.core.ReactiveCqlOperations#query(java.lang.String, org.springframework.data.cql.core.ReactiveResultSetExtractor) */ @Override public Flux query(String cql, ReactiveResultSetExtractor resultSetExtractor) throws DataAccessException { @@ -245,7 +245,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.cassandra.core.ReactiveCqlOperations#query(java.lang.String, org.springframework.cassandra.core.RowMapper) + * @see org.springframework.data.cql.core.ReactiveCqlOperations#query(java.lang.String, org.springframework.data.cql.core.RowMapper) */ @Override public Flux query(String cql, RowMapper rowMapper) throws DataAccessException { @@ -253,7 +253,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.cassandra.core.ReactiveCqlOperations#queryForObject(java.lang.String, org.springframework.cassandra.core.RowMapper) + * @see org.springframework.data.cql.core.ReactiveCqlOperations#queryForObject(java.lang.String, org.springframework.data.cql.core.RowMapper) */ @Override public Mono queryForObject(String cql, RowMapper rowMapper) throws DataAccessException { @@ -262,7 +262,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.cassandra.core.ReactiveCqlOperations#queryForObject(java.lang.String, java.lang.Class) + * @see org.springframework.data.cql.core.ReactiveCqlOperations#queryForObject(java.lang.String, java.lang.Class) */ @Override public Mono queryForObject(String cql, Class requiredType) throws DataAccessException { @@ -270,7 +270,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.cassandra.core.ReactiveCqlOperations#queryForMap(java.lang.String) + * @see org.springframework.data.cql.core.ReactiveCqlOperations#queryForMap(java.lang.String) */ @Override public Mono> queryForMap(String cql) throws DataAccessException { @@ -278,7 +278,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.cassandra.core.ReactiveCqlOperations#queryForFlux(java.lang.String, java.lang.Class) + * @see org.springframework.data.cql.core.ReactiveCqlOperations#queryForFlux(java.lang.String, java.lang.Class) */ @Override public Flux queryForFlux(String cql, Class elementType) throws DataAccessException { @@ -286,7 +286,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.cassandra.core.ReactiveCqlOperations#queryForFlux(java.lang.String) + * @see org.springframework.data.cql.core.ReactiveCqlOperations#queryForFlux(java.lang.String) */ @Override public Flux> queryForFlux(String cql) throws DataAccessException { @@ -294,7 +294,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.cassandra.core.ReactiveCqlOperations#queryForResultSet(java.lang.String) + * @see org.springframework.data.cql.core.ReactiveCqlOperations#queryForResultSet(java.lang.String) */ @Override public Mono queryForResultSet(String cql) throws DataAccessException { @@ -312,7 +312,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.cassandra.core.ReactiveCqlOperations#queryForRows(java.lang.String) + * @see org.springframework.data.cql.core.ReactiveCqlOperations#queryForRows(java.lang.String) */ @Override public Flux queryForRows(String cql) throws DataAccessException { @@ -321,7 +321,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.cassandra.core.ReactiveCqlOperations#execute(org.reactivestreams.Publisher) + * @see org.springframework.data.cql.core.ReactiveCqlOperations#execute(org.reactivestreams.Publisher) */ @Override public Flux execute(Publisher statementPublisher) throws DataAccessException { @@ -336,7 +336,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re // ------------------------------------------------------------------------- /* (non-Javadoc) - * @see org.springframework.cassandra.core.ReactiveCqlOperations#execute(com.datastax.driver.core.Statement) + * @see org.springframework.data.cql.core.ReactiveCqlOperations#execute(com.datastax.driver.core.Statement) */ @Override public Mono execute(Statement statement) throws DataAccessException { @@ -347,7 +347,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.cassandra.core.ReactiveCqlOperations#query(com.datastax.driver.core.Statement, org.springframework.cassandra.core.ReactiveResultSetExtractor) + * @see org.springframework.data.cql.core.ReactiveCqlOperations#query(com.datastax.driver.core.Statement, org.springframework.data.cql.core.ReactiveResultSetExtractor) */ @Override public Flux query(Statement statement, ReactiveResultSetExtractor rse) throws DataAccessException { @@ -366,7 +366,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.cassandra.core.ReactiveCqlOperations#query(com.datastax.driver.core.Statement, org.springframework.cassandra.core.RowMapper) + * @see org.springframework.data.cql.core.ReactiveCqlOperations#query(com.datastax.driver.core.Statement, org.springframework.data.cql.core.RowMapper) */ @Override public Flux query(Statement statement, RowMapper rowMapper) throws DataAccessException { @@ -374,7 +374,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.cassandra.core.ReactiveCqlOperations#queryForObject(com.datastax.driver.core.Statement, org.springframework.cassandra.core.RowMapper) + * @see org.springframework.data.cql.core.ReactiveCqlOperations#queryForObject(com.datastax.driver.core.Statement, org.springframework.data.cql.core.RowMapper) */ @Override public Mono queryForObject(Statement statement, RowMapper rowMapper) throws DataAccessException { @@ -383,7 +383,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.cassandra.core.ReactiveCqlOperations#queryForObject(com.datastax.driver.core.Statement, java.lang.Class) + * @see org.springframework.data.cql.core.ReactiveCqlOperations#queryForObject(com.datastax.driver.core.Statement, java.lang.Class) */ @Override public Mono queryForObject(Statement statement, Class requiredType) throws DataAccessException { @@ -391,7 +391,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.cassandra.core.ReactiveCqlOperations#queryForMap(com.datastax.driver.core.Statement) + * @see org.springframework.data.cql.core.ReactiveCqlOperations#queryForMap(com.datastax.driver.core.Statement) */ @Override public Mono> queryForMap(Statement statement) throws DataAccessException { @@ -399,7 +399,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.cassandra.core.ReactiveCqlOperations#queryForFlux(com.datastax.driver.core.Statement, java.lang.Class) + * @see org.springframework.data.cql.core.ReactiveCqlOperations#queryForFlux(com.datastax.driver.core.Statement, java.lang.Class) */ @Override public Flux queryForFlux(Statement statement, Class elementType) throws DataAccessException { @@ -407,7 +407,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.cassandra.core.ReactiveCqlOperations#queryForFlux(com.datastax.driver.core.Statement) + * @see org.springframework.data.cql.core.ReactiveCqlOperations#queryForFlux(com.datastax.driver.core.Statement) */ @Override public Flux> queryForFlux(Statement statement) throws DataAccessException { @@ -415,7 +415,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.cassandra.core.ReactiveCqlOperations#queryForResultSet(com.datastax.driver.core.Statement) + * @see org.springframework.data.cql.core.ReactiveCqlOperations#queryForResultSet(com.datastax.driver.core.Statement) */ @Override public Mono queryForResultSet(Statement statement) throws DataAccessException { @@ -444,7 +444,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re // ------------------------------------------------------------------------- /* (non-Javadoc) - * @see org.springframework.cassandra.core.ReactiveCqlOperations#execute(org.springframework.cassandra.core.ReactivePreparedStatementCreator, org.springframework.cassandra.core.ReactivePreparedStatementCallback) + * @see org.springframework.data.cql.core.ReactiveCqlOperations#execute(org.springframework.data.cql.core.ReactivePreparedStatementCreator, org.springframework.data.cql.core.ReactivePreparedStatementCallback) */ @Override public Flux execute(ReactivePreparedStatementCreator psc, ReactivePreparedStatementCallback action) @@ -463,7 +463,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.cassandra.core.ReactiveCqlOperations#execute(java.lang.String, org.springframework.cassandra.core.ReactivePreparedStatementCallback) + * @see org.springframework.data.cql.core.ReactiveCqlOperations#execute(java.lang.String, org.springframework.data.cql.core.ReactivePreparedStatementCallback) */ @Override public Flux execute(String cql, ReactivePreparedStatementCallback action) throws DataAccessException { @@ -502,7 +502,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.cassandra.core.ReactiveCqlOperations#query(org.springframework.cassandra.core.ReactivePreparedStatementCreator, org.springframework.cassandra.core.ReactiveResultSetExtractor) + * @see org.springframework.data.cql.core.ReactiveCqlOperations#query(org.springframework.data.cql.core.ReactivePreparedStatementCreator, org.springframework.data.cql.core.ReactiveResultSetExtractor) */ @Override public Flux query(ReactivePreparedStatementCreator psc, ReactiveResultSetExtractor rse) @@ -512,7 +512,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.cassandra.core.ReactiveCqlOperations#query(java.lang.String, org.springframework.cassandra.core.PreparedStatementBinder, org.springframework.cassandra.core.ReactiveResultSetExtractor) + * @see org.springframework.data.cql.core.ReactiveCqlOperations#query(java.lang.String, org.springframework.data.cql.core.PreparedStatementBinder, org.springframework.data.cql.core.ReactiveResultSetExtractor) */ @Override public Flux query(String cql, PreparedStatementBinder psb, ReactiveResultSetExtractor rse) @@ -522,7 +522,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.cassandra.core.ReactiveCqlOperations#query(java.lang.String, org.springframework.cassandra.core.ReactiveResultSetExtractor, java.lang.Object[]) + * @see org.springframework.data.cql.core.ReactiveCqlOperations#query(java.lang.String, org.springframework.data.cql.core.ReactiveResultSetExtractor, java.lang.Object[]) */ @Override public Flux query(String cql, ReactiveResultSetExtractor rse, Object... args) throws DataAccessException { @@ -530,7 +530,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.cassandra.core.ReactiveCqlOperations#query(org.springframework.cassandra.core.ReactivePreparedStatementCreator, org.springframework.cassandra.core.RowMapper) + * @see org.springframework.data.cql.core.ReactiveCqlOperations#query(org.springframework.data.cql.core.ReactivePreparedStatementCreator, org.springframework.data.cql.core.RowMapper) */ @Override public Flux query(ReactivePreparedStatementCreator psc, RowMapper rowMapper) throws DataAccessException { @@ -538,7 +538,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.cassandra.core.ReactiveCqlOperations#query(java.lang.String, org.springframework.cassandra.core.PreparedStatementBinder, org.springframework.cassandra.core.RowMapper) + * @see org.springframework.data.cql.core.ReactiveCqlOperations#query(java.lang.String, org.springframework.data.cql.core.PreparedStatementBinder, org.springframework.data.cql.core.RowMapper) */ @Override public Flux query(String cql, PreparedStatementBinder psb, RowMapper rowMapper) throws DataAccessException { @@ -546,7 +546,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.cassandra.core.ReactiveCqlOperations#query(org.springframework.cassandra.core.ReactivePreparedStatementCreator, org.springframework.cassandra.core.PreparedStatementBinder, org.springframework.cassandra.core.RowMapper) + * @see org.springframework.data.cql.core.ReactiveCqlOperations#query(org.springframework.data.cql.core.ReactivePreparedStatementCreator, org.springframework.data.cql.core.PreparedStatementBinder, org.springframework.data.cql.core.RowMapper) */ @Override public Flux query(ReactivePreparedStatementCreator psc, PreparedStatementBinder psb, RowMapper rowMapper) @@ -556,7 +556,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.cassandra.core.ReactiveCqlOperations#query(java.lang.String, org.springframework.cassandra.core.RowMapper, java.lang.Object[]) + * @see org.springframework.data.cql.core.ReactiveCqlOperations#query(java.lang.String, org.springframework.data.cql.core.RowMapper, java.lang.Object[]) */ @Override public Flux query(String cql, RowMapper rowMapper, Object... args) throws DataAccessException { @@ -564,7 +564,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.cassandra.core.ReactiveCqlOperations#queryForObject(java.lang.String, org.springframework.cassandra.core.RowMapper, java.lang.Object[]) + * @see org.springframework.data.cql.core.ReactiveCqlOperations#queryForObject(java.lang.String, org.springframework.data.cql.core.RowMapper, java.lang.Object[]) */ @Override public Mono queryForObject(String cql, RowMapper rowMapper, Object... args) throws DataAccessException { @@ -573,7 +573,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.cassandra.core.ReactiveCqlOperations#queryForObject(java.lang.String, java.lang.Class, java.lang.Object[]) + * @see org.springframework.data.cql.core.ReactiveCqlOperations#queryForObject(java.lang.String, java.lang.Class, java.lang.Object[]) */ @Override public Mono queryForObject(String cql, Class requiredType, Object... args) throws DataAccessException { @@ -581,7 +581,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.cassandra.core.ReactiveCqlOperations#queryForMap(java.lang.String, java.lang.Object[]) + * @see org.springframework.data.cql.core.ReactiveCqlOperations#queryForMap(java.lang.String, java.lang.Object[]) */ @Override public Mono> queryForMap(String cql, Object... args) throws DataAccessException { @@ -589,7 +589,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.cassandra.core.ReactiveCqlOperations#queryForFlux(java.lang.String, java.lang.Class, java.lang.Object[]) + * @see org.springframework.data.cql.core.ReactiveCqlOperations#queryForFlux(java.lang.String, java.lang.Class, java.lang.Object[]) */ @Override public Flux queryForFlux(String cql, Class elementType, Object... args) throws DataAccessException { @@ -597,7 +597,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.cassandra.core.ReactiveCqlOperations#queryForFlux(java.lang.String, java.lang.Object[]) + * @see org.springframework.data.cql.core.ReactiveCqlOperations#queryForFlux(java.lang.String, java.lang.Object[]) */ @Override public Flux> queryForFlux(String cql, Object... args) throws DataAccessException { @@ -605,7 +605,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.cassandra.core.ReactiveCqlOperations#queryForResultSet(java.lang.String, java.lang.Object[]) + * @see org.springframework.data.cql.core.ReactiveCqlOperations#queryForResultSet(java.lang.String, java.lang.Object[]) */ @Override public Mono queryForResultSet(String cql, Object... args) throws DataAccessException { @@ -617,7 +617,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.cassandra.core.ReactiveCqlOperations#queryForRows(java.lang.String, java.lang.Object[]) + * @see org.springframework.data.cql.core.ReactiveCqlOperations#queryForRows(java.lang.String, java.lang.Object[]) */ @Override public Flux queryForRows(String cql, Object... args) throws DataAccessException { @@ -626,7 +626,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.cassandra.core.ReactiveCqlOperations#execute(org.springframework.cassandra.core.ReactivePreparedStatementCreator) + * @see org.springframework.data.cql.core.ReactiveCqlOperations#execute(org.springframework.data.cql.core.ReactivePreparedStatementCreator) */ @Override public Mono execute(ReactivePreparedStatementCreator psc) throws DataAccessException { @@ -634,7 +634,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.cassandra.core.ReactiveCqlOperations#execute(java.lang.String, org.springframework.cassandra.core.PreparedStatementBinder) + * @see org.springframework.data.cql.core.ReactiveCqlOperations#execute(java.lang.String, org.springframework.data.cql.core.PreparedStatementBinder) */ @Override public Mono execute(String cql, PreparedStatementBinder psb) throws DataAccessException { @@ -643,7 +643,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.cassandra.core.ReactiveCqlOperations#execute(java.lang.String, java.lang.Object[]) + * @see org.springframework.data.cql.core.ReactiveCqlOperations#execute(java.lang.String, java.lang.Object[]) */ @Override public Mono execute(String cql, Object... args) throws DataAccessException { @@ -651,7 +651,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /* (non-Javadoc) - * @see org.springframework.cassandra.core.ReactiveCqlOperations#execute(java.lang.String, org.reactivestreams.Publisher) + * @see org.springframework.data.cql.core.ReactiveCqlOperations#execute(java.lang.String, org.reactivestreams.Publisher) */ @Override public Flux execute(String cql, Publisher args) throws DataAccessException { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReactiveRowMapperResultSetExtractor.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReactiveRowMapperResultSetExtractor.java index 1e64f983c..527ec2495 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReactiveRowMapperResultSetExtractor.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/ReactiveRowMapperResultSetExtractor.java @@ -56,7 +56,7 @@ public class ReactiveRowMapperResultSetExtractor implements ReactiveResultSet } /* (non-Javadoc) - * @see org.springframework.cassandra.core.ReactiveResultSetExtractor#extractData(org.springframework.cassandra.core.ReactiveResultSet) + * @see org.springframework.data.cql.core.ReactiveResultSetExtractor#extractData(org.springframework.data.cql.core.ReactiveResultSet) */ @Override public Publisher extractData(ReactiveResultSet resultSet) throws DriverException, DataAccessException { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/RingMemberHostMapper.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/RingMemberHostMapper.java index 64c5aa956..201a4a929 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/RingMemberHostMapper.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/RingMemberHostMapper.java @@ -36,7 +36,7 @@ public enum RingMemberHostMapper implements HostMapper { INSTANCE; /* (non-Javadoc) - * @see org.springframework.cassandra.core.HostMapper#mapHosts(java.util.Iterable) + * @see org.springframework.data.cql.core.HostMapper#mapHosts(java.util.Iterable) */ @Override public Collection mapHosts(Iterable hosts) throws DriverException { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/RowMapperResultSetExtractor.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/RowMapperResultSetExtractor.java index 4f0e0dae4..0e2ee4afe 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/RowMapperResultSetExtractor.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/RowMapperResultSetExtractor.java @@ -70,7 +70,7 @@ public class RowMapperResultSetExtractor implements ResultSetExtractor extractData(ResultSet resultSet) throws DriverException, DataAccessException { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/SimplePreparedStatementCreator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/SimplePreparedStatementCreator.java index d0c41846a..aae98050c 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/SimplePreparedStatementCreator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/SimplePreparedStatementCreator.java @@ -48,14 +48,14 @@ public class SimplePreparedStatementCreator implements PreparedStatementCreator, } /* (non-Javadoc) - * @see org.springframework.cassandra.core.CqlProvider#getCql() + * @see org.springframework.data.cql.core.CqlProvider#getCql() */ public String getCql() { return this.cql; } /* (non-Javadoc) - * @see org.springframework.cassandra.core.PreparedStatementCreator#createPreparedStatement(com.datastax.driver.core.Session) + * @see org.springframework.data.cql.core.PreparedStatementCreator#createPreparedStatement(com.datastax.driver.core.Session) */ @Override public PreparedStatement createPreparedStatement(Session session) throws DriverException { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/WriteOptions.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/WriteOptions.java index a387ebc5c..bd562a9a8 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/WriteOptions.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/WriteOptions.java @@ -99,7 +99,7 @@ public class WriteOptions extends QueryOptions { /* * (non-Javadoc) - * @see org.springframework.cassandra.core.QueryOptions.QueryOptionsBuilder#consistencyLevel(com.datastax.driver.core.ConsistencyLevel) + * @see org.springframework.data.cql.core.QueryOptions.QueryOptionsBuilder#consistencyLevel(com.datastax.driver.core.ConsistencyLevel) */ @Override public WriteOptionsBuilder consistencyLevel(com.datastax.driver.core.ConsistencyLevel consistencyLevel) { @@ -108,7 +108,7 @@ public class WriteOptions extends QueryOptions { /* * (non-Javadoc) - * @see org.springframework.cassandra.core.QueryOptions.QueryOptionsBuilder#retryPolicy(org.springframework.cassandra.core.RetryPolicy) + * @see org.springframework.data.cql.core.QueryOptions.QueryOptionsBuilder#retryPolicy(org.springframework.data.cql.core.RetryPolicy) */ @Override public WriteOptionsBuilder retryPolicy(com.datastax.driver.core.policies.RetryPolicy driverRetryPolicy) { @@ -117,7 +117,7 @@ public class WriteOptions extends QueryOptions { /* * (non-Javadoc) - * @see org.springframework.cassandra.core.QueryOptions.QueryOptionsBuilder#fetchSize(int) + * @see org.springframework.data.cql.core.QueryOptions.QueryOptionsBuilder#fetchSize(int) */ @Override public WriteOptionsBuilder fetchSize(int fetchSize) { @@ -126,7 +126,7 @@ public class WriteOptions extends QueryOptions { /* * (non-Javadoc) - * @see org.springframework.cassandra.core.QueryOptions.QueryOptionsBuilder#readTimeout(long) + * @see org.springframework.data.cql.core.QueryOptions.QueryOptionsBuilder#readTimeout(long) */ @Override public WriteOptionsBuilder readTimeout(long readTimeout) { @@ -135,7 +135,7 @@ public class WriteOptions extends QueryOptions { /* * (non-Javadoc) - * @see org.springframework.cassandra.core.QueryOptions.QueryOptionsBuilder#readTimeout(long, java.util.concurrent.TimeUnit) + * @see org.springframework.data.cql.core.QueryOptions.QueryOptionsBuilder#readTimeout(long, java.util.concurrent.TimeUnit) */ @Override public WriteOptionsBuilder readTimeout(long readTimeout, TimeUnit timeUnit) { @@ -144,7 +144,7 @@ public class WriteOptions extends QueryOptions { /* * (non-Javadoc) - * @see org.springframework.cassandra.core.QueryOptions.QueryOptionsBuilder#tracing(boolean) + * @see org.springframework.data.cql.core.QueryOptions.QueryOptionsBuilder#tracing(boolean) */ @Override public WriteOptionsBuilder tracing(boolean tracing) { @@ -153,7 +153,7 @@ public class WriteOptions extends QueryOptions { /* * (non-Javadoc) - * @see org.springframework.cassandra.core.QueryOptions.QueryOptionsBuilder#withTracing() + * @see org.springframework.data.cql.core.QueryOptions.QueryOptionsBuilder#withTracing() */ @Override public WriteOptionsBuilder withTracing() { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToBigDecimalConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToBigDecimalConverter.java index 51d578c3c..6647427bf 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToBigDecimalConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToBigDecimalConverter.java @@ -31,7 +31,7 @@ public class ResultSetToBigDecimalConverter extends AbstractResultSetToBasicFixe public static final ResultSetToBigDecimalConverter INSTANCE = new ResultSetToBigDecimalConverter(); /* (non-Javadoc) - * @see org.springframework.cassandra.core.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) + * @see org.springframework.data.cql.core.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) */ @Override protected BigDecimal doConvertSingleValue(Object object) { @@ -39,7 +39,7 @@ public class ResultSetToBigDecimalConverter extends AbstractResultSetToBasicFixe } /* (non-Javadoc) - * @see org.springframework.cassandra.core.converter.AbstractResultSetConverter#getType() + * @see org.springframework.data.cql.core.converter.AbstractResultSetConverter#getType() */ @Override protected Class getType() { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToBigIntegerConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToBigIntegerConverter.java index c04f3c212..611e46e3d 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToBigIntegerConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToBigIntegerConverter.java @@ -31,7 +31,7 @@ public class ResultSetToBigIntegerConverter extends AbstractResultSetToBasicFixe public static final ResultSetToBigIntegerConverter INSTANCE = new ResultSetToBigIntegerConverter(); /* (non-Javadoc) - * @see org.springframework.cassandra.core.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) + * @see org.springframework.data.cql.core.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) */ @Override protected BigInteger doConvertSingleValue(Object object) { @@ -39,7 +39,7 @@ public class ResultSetToBigIntegerConverter extends AbstractResultSetToBasicFixe } /* (non-Javadoc) - * @see org.springframework.cassandra.core.converter.AbstractResultSetConverter#getType() + * @see org.springframework.data.cql.core.converter.AbstractResultSetConverter#getType() */ @Override protected Class getType() { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToBooleanConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToBooleanConverter.java index d86646ae2..7ade0f9a4 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToBooleanConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToBooleanConverter.java @@ -29,7 +29,7 @@ public class ResultSetToBooleanConverter extends AbstractResultSetToBasicFixedTy public static final ResultSetToBooleanConverter INSTANCE = new ResultSetToBooleanConverter(); /* (non-Javadoc) - * @see org.springframework.cassandra.core.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) + * @see org.springframework.data.cql.core.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) */ @Override protected Boolean doConvertSingleValue(Object object) { @@ -37,7 +37,7 @@ public class ResultSetToBooleanConverter extends AbstractResultSetToBasicFixedTy } /* (non-Javadoc) - * @see org.springframework.cassandra.core.converter.AbstractResultSetConverter#getType() + * @see org.springframework.data.cql.core.converter.AbstractResultSetConverter#getType() */ @Override protected Class getType() { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToByteBufferConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToByteBufferConverter.java index 8de83e03b..f070e7db6 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToByteBufferConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToByteBufferConverter.java @@ -31,7 +31,7 @@ public class ResultSetToByteBufferConverter extends AbstractResultSetConverter getType() { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToDateConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToDateConverter.java index 824c25ed5..98382855d 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToDateConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToDateConverter.java @@ -31,7 +31,7 @@ public class ResultSetToDateConverter extends AbstractResultSetToBasicFixedTypeC public static final ResultSetToDateConverter INSTANCE = new ResultSetToDateConverter(); /* (non-Javadoc) - * @see org.springframework.cassandra.core.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) + * @see org.springframework.data.cql.core.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) */ @Override protected Date doConvertSingleValue(Object object) { @@ -39,7 +39,7 @@ public class ResultSetToDateConverter extends AbstractResultSetToBasicFixedTypeC } /* (non-Javadoc) - * @see org.springframework.cassandra.core.converter.AbstractResultSetConverter#getType() + * @see org.springframework.data.cql.core.converter.AbstractResultSetConverter#getType() */ @Override protected Class getType() { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToDoubleConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToDoubleConverter.java index b7f1fec47..d1c6a18f0 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToDoubleConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToDoubleConverter.java @@ -29,7 +29,7 @@ public class ResultSetToDoubleConverter extends AbstractResultSetToBasicFixedTyp public static final ResultSetToDoubleConverter INSTANCE = new ResultSetToDoubleConverter(); /* (non-Javadoc) - * @see org.springframework.cassandra.core.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) + * @see org.springframework.data.cql.core.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) */ @Override protected Double doConvertSingleValue(Object object) { @@ -37,7 +37,7 @@ public class ResultSetToDoubleConverter extends AbstractResultSetToBasicFixedTyp } /* (non-Javadoc) - * @see org.springframework.cassandra.core.converter.AbstractResultSetConverter#getType() + * @see org.springframework.data.cql.core.converter.AbstractResultSetConverter#getType() */ @Override protected Class getType() { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToFloatConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToFloatConverter.java index 245df6599..ad6161ea8 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToFloatConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToFloatConverter.java @@ -29,7 +29,7 @@ public class ResultSetToFloatConverter extends AbstractResultSetToBasicFixedType public static final ResultSetToFloatConverter INSTANCE = new ResultSetToFloatConverter(); /* (non-Javadoc) - * @see org.springframework.cassandra.core.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) + * @see org.springframework.data.cql.core.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) */ @Override protected Float doConvertSingleValue(Object object) { @@ -37,7 +37,7 @@ public class ResultSetToFloatConverter extends AbstractResultSetToBasicFixedType } /* (non-Javadoc) - * @see org.springframework.cassandra.core.converter.AbstractResultSetConverter#getType() + * @see org.springframework.data.cql.core.converter.AbstractResultSetConverter#getType() */ @Override protected Class getType() { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToInetAddressConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToInetAddressConverter.java index b4c9bfab7..42c71a39b 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToInetAddressConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToInetAddressConverter.java @@ -31,7 +31,7 @@ public class ResultSetToInetAddressConverter extends AbstractResultSetToBasicFix public static final ResultSetToInetAddressConverter INSTANCE = new ResultSetToInetAddressConverter(); /* (non-Javadoc) - * @see org.springframework.cassandra.core.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) + * @see org.springframework.data.cql.core.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) */ @Override protected InetAddress doConvertSingleValue(Object object) { @@ -39,7 +39,7 @@ public class ResultSetToInetAddressConverter extends AbstractResultSetToBasicFix } /* (non-Javadoc) - * @see org.springframework.cassandra.core.converter.AbstractResultSetConverter#getType() + * @see org.springframework.data.cql.core.converter.AbstractResultSetConverter#getType() */ @Override protected Class getType() { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToIntegerConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToIntegerConverter.java index 0c1e1de51..d0ed3b014 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToIntegerConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToIntegerConverter.java @@ -29,7 +29,7 @@ public class ResultSetToIntegerConverter extends AbstractResultSetToBasicFixedTy public static final ResultSetToIntegerConverter INSTANCE = new ResultSetToIntegerConverter(); /* (non-Javadoc) - * @see org.springframework.cassandra.core.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) + * @see org.springframework.data.cql.core.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) */ @Override protected Integer doConvertSingleValue(Object object) { @@ -37,7 +37,7 @@ public class ResultSetToIntegerConverter extends AbstractResultSetToBasicFixedTy } /* (non-Javadoc) - * @see org.springframework.cassandra.core.converter.AbstractResultSetConverter#getType() + * @see org.springframework.data.cql.core.converter.AbstractResultSetConverter#getType() */ @Override protected Class getType() { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToListOfStringConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToListOfStringConverter.java index b50bad850..1fdd9103a 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToListOfStringConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToListOfStringConverter.java @@ -35,7 +35,7 @@ public class ResultSetToListOfStringConverter extends AbstractResultSetConverter public static final ResultSetToListOfStringConverter INSTANCE = new ResultSetToListOfStringConverter(); /* (non-Javadoc) - * @see org.springframework.cassandra.core.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) + * @see org.springframework.data.cql.core.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) */ @Override protected List doConvertSingleValue(Object object) { @@ -47,7 +47,7 @@ public class ResultSetToListOfStringConverter extends AbstractResultSetConverter } /* (non-Javadoc) - * @see org.springframework.cassandra.core.converter.AbstractResultSetConverter#doConvertSingleRow(java.util.Map) + * @see org.springframework.data.cql.core.converter.AbstractResultSetConverter#doConvertSingleRow(java.util.Map) */ @Override protected List doConvertSingleRow(Map row) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToLongConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToLongConverter.java index 56e1341a1..63d0ad5e2 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToLongConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToLongConverter.java @@ -29,7 +29,7 @@ public class ResultSetToLongConverter extends AbstractResultSetToBasicFixedTypeC public static final ResultSetToLongConverter INSTANCE = new ResultSetToLongConverter(); /* (non-Javadoc) - * @see org.springframework.cassandra.core.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) + * @see org.springframework.data.cql.core.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) */ @Override protected Long doConvertSingleValue(Object object) { @@ -37,7 +37,7 @@ public class ResultSetToLongConverter extends AbstractResultSetToBasicFixedTypeC } /* (non-Javadoc) - * @see org.springframework.cassandra.core.converter.AbstractResultSetConverter#getType() + * @see org.springframework.data.cql.core.converter.AbstractResultSetConverter#getType() */ @Override protected Class getType() { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToStringConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToStringConverter.java index ba3721d9b..59396d89c 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToStringConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToStringConverter.java @@ -32,7 +32,7 @@ public class ResultSetToStringConverter extends AbstractResultSetConverter row) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToUuidConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToUuidConverter.java index c3923f64f..53a6b2710 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToUuidConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/converter/ResultSetToUuidConverter.java @@ -31,7 +31,7 @@ public class ResultSetToUuidConverter extends AbstractResultSetToBasicFixedTypeC public static final ResultSetToUuidConverter INSTANCE = new ResultSetToUuidConverter(); /* (non-Javadoc) - * @see org.springframework.cassandra.core.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) + * @see org.springframework.data.cql.core.converter.AbstractResultSetConverter#doConvertSingleValue(java.lang.Object) */ @Override protected UUID doConvertSingleValue(Object object) { @@ -39,7 +39,7 @@ public class ResultSetToUuidConverter extends AbstractResultSetToBasicFixedTypeC } /* (non-Javadoc) - * @see org.springframework.cassandra.core.converter.AbstractResultSetConverter#getType() + * @see org.springframework.data.cql.core.converter.AbstractResultSetConverter#getType() */ @Override protected Class getType() { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/AddColumnCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/AddColumnCqlGenerator.java index 95a9e7d5c..471347452 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/AddColumnCqlGenerator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/generator/AddColumnCqlGenerator.java @@ -35,7 +35,7 @@ public class AddColumnCqlGenerator extends ColumnChangeCqlGenerator getType() { return type; } /* (non-Javadoc) - * @see org.springframework.cassandra.core.keyspace.Option#getName() + * @see org.springframework.data.cql.core.keyspace.Option#getName() */ public String getName() { return name; } /* (non-Javadoc) - * @see org.springframework.cassandra.core.keyspace.Option#takesValue() + * @see org.springframework.data.cql.core.keyspace.Option#takesValue() */ public boolean takesValue() { return type != null; } /* (non-Javadoc) - * @see org.springframework.cassandra.core.keyspace.Option#requiresValue() + * @see org.springframework.data.cql.core.keyspace.Option#requiresValue() */ public boolean requiresValue() { return this.requiresValue; } /* (non-Javadoc) - * @see org.springframework.cassandra.core.keyspace.Option#escapesValue() + * @see org.springframework.data.cql.core.keyspace.Option#escapesValue() */ public boolean escapesValue() { return this.escapesValue; } /* (non-Javadoc) - * @see org.springframework.cassandra.core.keyspace.Option#quotesValue() + * @see org.springframework.data.cql.core.keyspace.Option#quotesValue() */ public boolean quotesValue() { return this.quotesValue; } /* (non-Javadoc) - * @see org.springframework.cassandra.core.keyspace.Option#checkValue(java.lang.Object) + * @see org.springframework.data.cql.core.keyspace.Option#checkValue(java.lang.Object) */ public void checkValue(Object value) { if (takesValue()) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/DefaultBridgedReactiveSession.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/DefaultBridgedReactiveSession.java index 7448d11e6..709f3e654 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/DefaultBridgedReactiveSession.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/DefaultBridgedReactiveSession.java @@ -44,7 +44,7 @@ import com.google.common.util.concurrent.ListenableFuture; * this is an intermediate solution until Datastax can provide a fully reactive driver. *

* All CQL operations performed by this class are logged at debug level, using - * "org.springframework.cassandra.core.DefaultBridgedReactiveSession" as log category. + * "org.springframework.data.cql.core.DefaultBridgedReactiveSession" as log category. *

* * @author Mark Paluch @@ -77,7 +77,7 @@ public class DefaultBridgedReactiveSession implements ReactiveSession { } /* (non-Javadoc) - * @see org.springframework.cassandra.core.ReactiveSession#execute(java.lang.String) + * @see org.springframework.data.cql.core.ReactiveSession#execute(java.lang.String) */ @Override public Mono execute(String query) { @@ -88,7 +88,7 @@ public class DefaultBridgedReactiveSession implements ReactiveSession { } /* (non-Javadoc) - * @see org.springframework.cassandra.core.ReactiveSession#execute(java.lang.String, java.lang.Object[]) + * @see org.springframework.data.cql.core.ReactiveSession#execute(java.lang.String, java.lang.Object[]) */ @Override public Mono execute(String query, Object... values) { @@ -99,7 +99,7 @@ public class DefaultBridgedReactiveSession implements ReactiveSession { } /* (non-Javadoc) - * @see org.springframework.cassandra.core.ReactiveSession#execute(java.lang.String, java.util.Map) + * @see org.springframework.data.cql.core.ReactiveSession#execute(java.lang.String, java.util.Map) */ @Override public Mono execute(String query, Map values) { @@ -110,7 +110,7 @@ public class DefaultBridgedReactiveSession implements ReactiveSession { } /* (non-Javadoc) - * @see org.springframework.cassandra.core.ReactiveSession#execute(com.datastax.driver.core.Statement) + * @see org.springframework.data.cql.core.ReactiveSession#execute(com.datastax.driver.core.Statement) */ @Override public Mono execute(Statement statement) { @@ -147,7 +147,7 @@ public class DefaultBridgedReactiveSession implements ReactiveSession { } /* (non-Javadoc) - * @see org.springframework.cassandra.core.ReactiveSession#prepare(java.lang.String) + * @see org.springframework.data.cql.core.ReactiveSession#prepare(java.lang.String) */ @Override public Mono prepare(String query) { @@ -158,7 +158,7 @@ public class DefaultBridgedReactiveSession implements ReactiveSession { } /* (non-Javadoc) - * @see org.springframework.cassandra.core.ReactiveSession#prepare(com.datastax.driver.core.RegularStatement) + * @see org.springframework.data.cql.core.ReactiveSession#prepare(com.datastax.driver.core.RegularStatement) */ @Override public Mono prepare(RegularStatement statement) { @@ -194,7 +194,7 @@ public class DefaultBridgedReactiveSession implements ReactiveSession { } /* (non-Javadoc) - * @see org.springframework.cassandra.core.ReactiveSession#close() + * @see org.springframework.data.cql.core.ReactiveSession#close() */ @Override public void close() { @@ -202,7 +202,7 @@ public class DefaultBridgedReactiveSession implements ReactiveSession { } /* (non-Javadoc) - * @see org.springframework.cassandra.core.ReactiveSession#isClosed() + * @see org.springframework.data.cql.core.ReactiveSession#isClosed() */ @Override public boolean isClosed() { @@ -210,7 +210,7 @@ public class DefaultBridgedReactiveSession implements ReactiveSession { } /* (non-Javadoc) - * @see org.springframework.cassandra.core.ReactiveSession#getCluster() + * @see org.springframework.data.cql.core.ReactiveSession#getCluster() */ @Override public Cluster getCluster() { @@ -228,7 +228,7 @@ public class DefaultBridgedReactiveSession implements ReactiveSession { } /* (non-Javadoc) - * @see org.springframework.cassandra.core.ReactiveResultSet#rows() + * @see org.springframework.data.cql.core.ReactiveResultSet#rows() */ @Override public Flux rows() { @@ -241,7 +241,7 @@ public class DefaultBridgedReactiveSession implements ReactiveSession { } /* (non-Javadoc) - * @see org.springframework.cassandra.core.ReactiveResultSet#getColumnDefinitions() + * @see org.springframework.data.cql.core.ReactiveResultSet#getColumnDefinitions() */ @Override public ColumnDefinitions getColumnDefinitions() { @@ -249,7 +249,7 @@ public class DefaultBridgedReactiveSession implements ReactiveSession { } /* (non-Javadoc) - * @see org.springframework.cassandra.core.ReactiveResultSet#wasApplied() + * @see org.springframework.data.cql.core.ReactiveResultSet#wasApplied() */ @Override public boolean wasApplied() { @@ -257,7 +257,7 @@ public class DefaultBridgedReactiveSession implements ReactiveSession { } /* (non-Javadoc) - * @see org.springframework.cassandra.core.ReactiveResultSet#getExecutionInfo() + * @see org.springframework.data.cql.core.ReactiveResultSet#getExecutionInfo() */ @Override public ExecutionInfo getExecutionInfo() { @@ -265,7 +265,7 @@ public class DefaultBridgedReactiveSession implements ReactiveSession { } /* (non-Javadoc) - * @see org.springframework.cassandra.core.ReactiveResultSet#getAllExecutionInfo() + * @see org.springframework.data.cql.core.ReactiveResultSet#getAllExecutionInfo() */ @Override public List getAllExecutionInfo() { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/DefaultSessionFactory.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/DefaultSessionFactory.java index 9c67bb4a4..cf3f6fea7 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/DefaultSessionFactory.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/DefaultSessionFactory.java @@ -46,7 +46,7 @@ public class DefaultSessionFactory implements SessionFactory { } /* (non-Javadoc) - * @see org.springframework.cassandra.core.session.SessionFactory#getSession() + * @see org.springframework.data.cql.core.session.SessionFactory#getSession() */ @Override public Session getSession() { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/AbstractRoutingSessionFactory.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/AbstractRoutingSessionFactory.java index f9ac0e23d..443c0a40a 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/AbstractRoutingSessionFactory.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/AbstractRoutingSessionFactory.java @@ -112,7 +112,7 @@ public abstract class AbstractRoutingSessionFactory implements SessionFactory, I } /* (non-Javadoc) - * @see org.springframework.cassandra.core.session.SessionFactory#getSession() + * @see org.springframework.data.cql.core.session.SessionFactory#getSession() */ @Override public Session getSession() { @@ -175,7 +175,7 @@ public abstract class AbstractRoutingSessionFactory implements SessionFactory, I return this.sessionFactoryLookup.getSessionFactory((String) sessionFactory); } else { throw new IllegalArgumentException(String - .format("Illegal session factory value. Only [org.springframework.cassandra.core.session.SessionFactory]" + .format("Illegal session factory value. Only [org.springframework.data.cql.core.session.SessionFactory]" + " and String supported: %s", sessionFactory)); } } diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/BeanFactorySessionFactoryLookup.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/BeanFactorySessionFactoryLookup.java index cf31b6214..9ab2de791 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/BeanFactorySessionFactoryLookup.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/BeanFactorySessionFactoryLookup.java @@ -71,7 +71,7 @@ public class BeanFactorySessionFactoryLookup implements SessionFactoryLookup, Be } /* (non-Javadoc) - * @see org.springframework.cassandra.core.session.lookup.SessionFactoryLookup#getSessionFactory(java.lang.String) + * @see org.springframework.data.cql.core.session.lookup.SessionFactoryLookup#getSessionFactory(java.lang.String) */ @Override public SessionFactory getSessionFactory(String sessionFactoryName) throws SessionFactoryLookupFailureException { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/MapSessionFactoryLookup.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/MapSessionFactoryLookup.java index 6bab7cc65..c642e3949 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/MapSessionFactoryLookup.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/MapSessionFactoryLookup.java @@ -102,7 +102,7 @@ public class MapSessionFactoryLookup implements SessionFactoryLookup { } /* (non-Javadoc) - * @see org.springframework.cassandra.core.session.lookup.SessionFactoryLookup#getSessionFactory(java.lang.String) + * @see org.springframework.data.cql.core.session.lookup.SessionFactoryLookup#getSessionFactory(java.lang.String) */ @Override public SessionFactory getSessionFactory(String sessionFactoryName) throws SessionFactoryLookupFailureException { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/SingleSessionFactoryLookup.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/SingleSessionFactoryLookup.java index b06873536..4214f041f 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/SingleSessionFactoryLookup.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/core/session/lookup/SingleSessionFactoryLookup.java @@ -42,7 +42,7 @@ public class SingleSessionFactoryLookup implements SessionFactoryLookup { } /* (non-Javadoc) - * @see org.springframework.cassandra.core.session.lookup.SessionFactoryLookup#getSessionFactory(java.lang.String) + * @see org.springframework.data.cql.core.session.lookup.SessionFactoryLookup#getSessionFactory(java.lang.String) */ @Override public SessionFactory getSessionFactory(String sessionFactoryName) throws SessionFactoryLookupFailureException { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/CassandraExceptionTranslator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/CassandraExceptionTranslator.java index 33ed4e8b8..9e33599bb 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/CassandraExceptionTranslator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cql/support/CassandraExceptionTranslator.java @@ -73,7 +73,7 @@ public class CassandraExceptionTranslator implements CqlExceptionTranslator { } /* (non-Javadoc) - * @see org.springframework.cassandra.core.support.CQLExceptionTranslator#translate(java.lang.String, java.lang.String, com.datastax.driver.core.exceptions.DriverException) + * @see org.springframework.data.cql.core.support.CQLExceptionTranslator#translate(java.lang.String, java.lang.String, com.datastax.driver.core.exceptions.DriverException) */ @Override public DataAccessException translate(String task, String cql, DriverException exception) { diff --git a/spring-data-cassandra/src/main/resources/org/springframework/data/cassandra/config/spring-cassandra-1.0.xsd b/spring-data-cassandra/src/main/resources/org/springframework/data/cassandra/config/spring-cassandra-1.0.xsd index 6ad5d4e18..387141150 100644 --- a/spring-data-cassandra/src/main/resources/org/springframework/data/cassandra/config/spring-cassandra-1.0.xsd +++ b/spring-data-cassandra/src/main/resources/org/springframework/data/cassandra/config/spring-cassandra-1.0.xsd @@ -712,7 +712,7 @@ Defines a CassandraMappingContext for holding rich entity mapping information. ]]> + type="org.springframework.data.cassandra.core.mapping.CassandraMappingContext"/> @@ -746,7 +746,7 @@ Defines a CassandraConverter for getting rich mapping functionality. use="optional"> @@ -759,7 +759,7 @@ The reference to a CassandraMappingContext. Will default to 'cassandraMapping'. + type="org.springframework.data.cassandra.core.mapping.CassandraMappingContext"/> diff --git a/spring-data-cassandra/src/main/resources/org/springframework/data/cassandra/config/spring-cassandra-1.5.xsd b/spring-data-cassandra/src/main/resources/org/springframework/data/cassandra/config/spring-cassandra-1.5.xsd index b96972b9b..83583fd1c 100644 --- a/spring-data-cassandra/src/main/resources/org/springframework/data/cassandra/config/spring-cassandra-1.5.xsd +++ b/spring-data-cassandra/src/main/resources/org/springframework/data/cassandra/config/spring-cassandra-1.5.xsd @@ -759,7 +759,7 @@ Defines a CassandraConverter for getting rich mapping functionality. @@ -774,7 +774,7 @@ Defines a CassandraMappingContext for holding rich entity mapping information. ]]> + type="org.springframework.data.cassandra.core.mapping.CassandraMappingContext"/> @@ -803,7 +803,7 @@ The reference to a UserTypeResolver. UserTypeResolver is required when working w ]]> + type="org.springframework.data.cassandra.core.mapping.UserTypeResolver"/> @@ -835,7 +835,7 @@ The reference to a CassandraTemplate. Will default to 'cqlTemplate'. - + @@ -858,7 +858,7 @@ The reference to a CassandraTemplate. Will default to 'cqlTemplate'. - + diff --git a/spring-data-cassandra/src/main/resources/org/springframework/data/cql/config/spring-cql-1.5.xsd b/spring-data-cassandra/src/main/resources/org/springframework/data/cql/config/spring-cql-1.5.xsd index 5d74ed4a2..43a697e50 100644 --- a/spring-data-cassandra/src/main/resources/org/springframework/data/cql/config/spring-cql-1.5.xsd +++ b/spring-data-cassandra/src/main/resources/org/springframework/data/cql/config/spring-cql-1.5.xsd @@ -51,7 +51,7 @@ Defines a CassandraTemplate. + type="org.springframework.data.cql.core.CqlTemplate"/> diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/ReactiveCqlTemplateUnitTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/ReactiveCqlTemplateUnitTests.java index f517209e7..9dae6d60f 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/ReactiveCqlTemplateUnitTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cql/core/ReactiveCqlTemplateUnitTests.java @@ -78,7 +78,7 @@ public class ReactiveCqlTemplateUnitTests { } // ------------------------------------------------------------------------- - // Tests dealing with a plain org.springframework.cassandra.core.ReactiveSession + // Tests dealing with a plain org.springframework.data.cql.core.ReactiveSession // ------------------------------------------------------------------------- @Test // DATACASS-335