From d6dc3a0109abf2ae2575e49a1b22d212c0ba946c Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Tue, 21 Sep 2021 19:55:43 +0200 Subject: [PATCH] Fix malformed Javadoc. See #1171 --- .../data/cassandra/ReactiveSession.java | 24 +++++++++---------- .../cassandra/ReactiveSessionFactory.java | 3 ++- .../CassandraCqlSessionFactoryBean.java | 4 +++- .../data/cassandra/config/ParsingUtils.java | 2 +- .../core/AsyncCassandraTemplate.java | 2 +- .../core/CassandraBatchTemplate.java | 2 +- .../cassandra/core/CassandraOperations.java | 6 ++--- ...assandraPersistentEntitySchemaCreator.java | 1 - .../cassandra/core/CassandraTemplate.java | 6 ++--- .../core/ExecutableSelectOperation.java | 7 +++--- .../core/ReactiveCassandraBatchTemplate.java | 2 +- .../core/ReactiveCassandraTemplate.java | 8 +++---- .../core/ReactiveSelectOperation.java | 2 +- .../convert/CassandraJodaTimeConverters.java | 1 - .../CassandraThreeTenBackPortConverters.java | 1 - .../convert/CassandraUDTValueProvider.java | 2 +- .../convert/MappingCassandraConverter.java | 3 +-- .../core/convert/RowValueProvider.java | 1 - .../core/convert/TupleValueProvider.java | 1 - .../core/convert/UdtValueProvider.java | 2 +- .../cassandra/core/cql/AsyncCqlTemplate.java | 2 +- .../cql/AsyncRowMapperResultSetExtractor.java | 8 +++---- .../cql/CachedPreparedStatementCreator.java | 3 +-- .../core/cql/ColumnMapRowMapper.java | 10 ++++---- .../cassandra/core/cql/CqlIdentifier.java | 8 ++++--- .../data/cassandra/core/cql/CqlTemplate.java | 2 +- .../core/cql/KeyspaceIdentifier.java | 6 ++--- .../core/cql/PreparedStatementCallback.java | 13 +++++----- .../core/cql/ReactiveCassandraAccessor.java | 2 ++ .../core/cql/ReactiveCqlTemplate.java | 9 ++++--- .../ReactivePreparedStatementCallback.java | 10 ++++---- .../data/cassandra/core/cql/RingMember.java | 6 ++--- .../data/cassandra/core/cql/RowMapper.java | 17 +++++++------ .../core/cql/RowMapperResultSetExtractor.java | 8 +++---- .../core/cql/SingleColumnRowMapper.java | 12 +++++----- .../converter/AbstractResultSetConverter.java | 10 ++++---- .../KeyspaceOptionsCqlGenerator.java | 2 +- .../generator/TableOptionsCqlGenerator.java | 2 +- .../cql/keyspace/ColumnSpecification.java | 2 +- .../core/cql/keyspace/FieldSpecification.java | 6 ++--- .../keyspace/KeyspaceActionSpecification.java | 1 - .../KeyspaceOptionsSpecification.java | 8 +++---- .../keyspace/TableOptionsSpecification.java | 17 +++++++------ .../CachedPreparedStatementCreator.java | 5 ++-- .../support/MapPreparedStatementCache.java | 5 ++-- .../cql/support/PreparedStatementCache.java | 2 +- .../cassandra/core/mapping/BasicMapId.java | 2 +- ...CassandraPersistentPropertyComparator.java | 3 +-- .../cassandra/core/mapping/CassandraType.java | 4 ++-- .../CodecRegistryTupleTypeFactory.java | 5 ++-- .../data/cassandra/core/mapping/Embedded.java | 6 ++--- .../core/mapping/IdInterfaceValidator.java | 4 ++-- .../data/cassandra/core/mapping/Indexed.java | 4 ++-- .../cassandra/core/mapping/PrimaryKey.java | 4 ++-- .../core/mapping/PrimaryKeyClass.java | 2 +- .../data/cassandra/core/mapping/SASI.java | 4 ---- .../data/cassandra/core/mapping/Tuple.java | 4 ++-- .../core/mapping/event/AfterLoadEvent.java | 2 +- .../core/query/CassandraPageRequest.java | 2 +- .../core/query/CriteriaDefinition.java | 4 ++-- .../data/cassandra/core/query/Query.java | 2 +- .../repository/CassandraRepository.java | 4 ++-- .../repository/MapIdCassandraRepository.java | 4 ++-- .../data/cassandra/repository/Query.java | 4 ++-- .../ReactiveCassandraRepository.java | 6 ++--- .../query/CassandraQueryCreator.java | 2 +- .../query/CassandraQueryExecution.java | 2 +- .../query/CassandraQueryMethod.java | 2 +- .../data/cassandra/util/MapBuilder.java | 4 ++-- 69 files changed, 166 insertions(+), 170 deletions(-) diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/ReactiveSession.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/ReactiveSession.java index 082497af1..b75504e8a 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/ReactiveSession.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/ReactiveSession.java @@ -35,11 +35,11 @@ import com.datastax.oss.driver.api.core.metadata.Node; * A session holds connections to a Cassandra cluster, allowing it to be queried. {@link ReactiveSession} executes * queries and prepares statements in a reactive style returning results wrapped in {@link Mono} and * {@link reactor.core.publisher.Flux}. - *

+ *

* Each session maintains multiple connections to the cluster nodes, provides policies to choose which node to use for * each query (round-robin on all nodes of the cluster by default), and handles retries for failed queries (when it * makes sense). - *

+ *

* Session instances are thread-safe and usually a single instance is enough per application. As a given session can * only be "logged" into one keyspace at a time (where the "logged" keyspace is the one used by queries that don't * explicitly use a fully qualified table name), it can make sense to create one session per keyspace used. This is @@ -56,11 +56,11 @@ public interface ReactiveSession extends Closeable { /** * Returns a snapshot of the Cassandra cluster's topology and schema metadata. - *

+ *

* In order to provide atomic updates, this method returns an immutable object: the node list, token map, and schema * contained in a given instance will always be consistent with each other (but note that {@link Node} itself is not * immutable: some of its properties will be updated dynamically, in particular {@link Node#getState()}). - *

+ *

* As a consequence of the above, you should call this method each time you need a fresh view of the metadata. Do * not call it once and store the result, because it is a frozen snapshot that will become stale over time. *

@@ -76,7 +76,7 @@ public interface ReactiveSession extends Closeable { /** * The keyspace that this session is currently connected to, or {@link Optional#empty()} if this session is not * connected to any keyspace. - *

+ *

* There are two ways that this can be set: before initializing the session (either with the {@code session-keyspace} * option in the configuration, or with {@link CqlSessionBuilder#withKeyspace(CqlIdentifier)}); or at runtime, if the * client issues a request that changes the keyspace (such as a CQL {@code USE} query). Note that this second method @@ -90,7 +90,7 @@ public interface ReactiveSession extends Closeable { /** * Whether this Session instance has been closed. - *

+ *

* Note that this method returns true as soon as the closing of this Session has started but it does not guarantee * that the closing is done. If you want to guarantee that the closing is done, you can call {@code close()} and wait * until it returns (or call the get method on {@code closeAsync()} with a very short timeout and check this doesn't @@ -109,7 +109,7 @@ public interface ReactiveSession extends Closeable { /** * Executes the provided query. - *

+ *

* This is a convenience method for {@code execute(new SimpleStatement(query))}. * * @param query the CQL query to execute. @@ -120,7 +120,7 @@ public interface ReactiveSession extends Closeable { /** * Executes the provided query using the provided values. - *

+ *

* This is a convenience method for {@code execute(new SimpleStatement(query, values))}. * * @param query the CQL query to execute. @@ -133,7 +133,7 @@ public interface ReactiveSession extends Closeable { /** * Executes the provided query using the provided named values. - *

+ *

* This is a convenience method for {@code execute(new SimpleStatement(query, values))}. * * @param query the CQL query to execute. @@ -146,7 +146,7 @@ public interface ReactiveSession extends Closeable { /** * Executes the provided query. - *

+ *

* This method blocks until at least some result has been received from the database. However, for SELECT queries, it * does not guarantee that the result has been received in full. But it does guarantee that some response has been * received from the database, and in particular guarantees that if the request is invalid, an exception will be @@ -168,7 +168,7 @@ public interface ReactiveSession extends Closeable { /** * Prepares the provided query. - *

+ *

* This method behaves like {@link #prepare(String)}, but note that the resulting {@code PreparedStatement} will * inherit the query properties set on {@code statement}. Concretely, this means that in the following code: * @@ -180,7 +180,7 @@ public interface ReactiveSession extends Closeable { * * * the final execution will be performed with Quorum consistency. - *

+ *

* Please note that if the same CQL statement is prepared more than once, all calls to this method will return the * same {@code PreparedStatement} object but the method will still apply the properties of the prepared * {@code Statement} to this object. diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/ReactiveSessionFactory.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/ReactiveSessionFactory.java index 6c7f4c167..0f1a699d2 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/ReactiveSessionFactory.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/ReactiveSessionFactory.java @@ -34,7 +34,8 @@ import reactor.core.publisher.Mono; public interface ReactiveSessionFactory { /** - * Return a {@link ReactiveSession} to be used directly or inside a callback inside {@link ReactiveCqlTemplate}. + * Return a {@link ReactiveSession} to be used directly or inside a callback inside + * {@link org.springframework.data.cassandra.core.cql.ReactiveCqlTemplate}. * * @return a {@link ReactiveSession}. */ diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraCqlSessionFactoryBean.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraCqlSessionFactoryBean.java index aec8536d8..31a96873c 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraCqlSessionFactoryBean.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/CassandraCqlSessionFactoryBean.java @@ -16,12 +16,14 @@ package org.springframework.data.cassandra.config; + import org.springframework.data.cassandra.core.cql.CassandraExceptionTranslator; import org.springframework.data.cassandra.core.cql.CqlTemplate; /** * Factory for creating and configuring a Cassandra {@link com.datastax.oss.driver.api.core.CqlSession}, which is a - * thread-safe singleton. As such, it is sufficient to have one {@link CqlSession} per application and keyspace. + * thread-safe singleton. As such, it is sufficient to have one {@link com.datastax.oss.driver.api.core.CqlSession} per + * application and keyspace. * * @author Alex Shvid * @author Matthew T. Adams diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/ParsingUtils.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/ParsingUtils.java index 25efc56e5..856f90800 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/ParsingUtils.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/ParsingUtils.java @@ -143,7 +143,7 @@ abstract class ParsingUtils { /** * Adds the named property and value, or reference to the given {@link BeanDefinitionBuilder} with an optional default * value if the value has not been specified. - *

+ *

* If {@code required} is false, value is null or empty, and {@code defaultValue} is null or * empty, then no property is added to the bean definition and this method silently returns. * 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 587684d9f..127fb0105 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 @@ -135,7 +135,7 @@ public class AsyncCassandraTemplate * * @param session {@link CqlSession} used to interact with Cassandra; must not be {@literal null}. * @see CassandraConverter - * @see Session + * @see CqlSession */ public AsyncCassandraTemplate(CqlSession session) { this(session, newConverter(session)); 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 4bac9c9e4..56ff75689 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 @@ -72,7 +72,7 @@ class CassandraBatchTemplate implements CassandraBatchOperations { /** * Return a reference to the configured {@link CassandraConverter} used to map {@link Object Objects} to - * {@link com.datastax.driver.core.Row Rows}. + * {@link com.datastax.oss.driver.api.core.cql.Row Rows}. * * @return a reference to the configured {@link CassandraConverter}. * @see org.springframework.data.cassandra.core.convert.CassandraConverter diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraOperations.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraOperations.java index 710f90433..8161c35d8 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraOperations.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraOperations.java @@ -98,7 +98,7 @@ public interface CassandraOperations extends FluentCassandraOperations { /** * Execute a {@code SELECT} query and convert the resulting items to a {@link Iterator} of entities. *

- * Returns a {@link Iterator} that wraps the Cassandra {@link com.datastax.driver.core.ResultSet}. + * Returns a {@link Iterator} that wraps the Cassandra {@link ResultSet}. * * @param element return type. * @param cql query to execute. Must not be empty or {@literal null}. @@ -160,7 +160,7 @@ public interface CassandraOperations extends FluentCassandraOperations { /** * Execute a {@code SELECT} query and convert the resulting items to a {@link Iterator} of entities. *

- * Returns a {@link Iterator} that wraps the Cassandra {@link com.datastax.driver.core.ResultSet}. + * Returns a {@link Iterator} that wraps the Cassandra {@link ResultSet}. * * @param element return type. * @param statement query to execute. Must not be empty or {@literal null}. @@ -212,7 +212,7 @@ public interface CassandraOperations extends FluentCassandraOperations { /** * Execute a {@code SELECT} query and convert the resulting items to a {@link Iterator} of entities. *

- * Returns a {@link Iterator} that wraps the Cassandra {@link com.datastax.driver.core.ResultSet}. + * Returns a {@link Iterator} that wraps the Cassandra {@link ResultSet}. * * @param element return type. * @param query query to execute. Must not be empty or {@literal null}. diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraPersistentEntitySchemaCreator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraPersistentEntitySchemaCreator.java index 70e23759b..f9df1402b 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraPersistentEntitySchemaCreator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/CassandraPersistentEntitySchemaCreator.java @@ -61,7 +61,6 @@ public class CassandraPersistentEntitySchemaCreator { * Create a new {@link CassandraPersistentEntitySchemaCreator} for the given {@link CassandraMappingContext} and * {@link CassandraAdminOperations}. * - * @param mappingContext must not be {@literal null}. * @param cassandraAdminOperations must not be {@literal null}. * @since 3.0 */ 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 2edfa8f95..526dbf6bc 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 @@ -138,7 +138,7 @@ public class CassandraTemplate implements CassandraOperations, ApplicationEventP * * @param session {@link CqlSession} used to interact with Cassandra; must not be {@literal null}. * @see CassandraConverter - * @see Session + * @see CqlSession */ public CassandraTemplate(CqlSession session) { this(session, newConverter(session)); @@ -152,7 +152,7 @@ public class CassandraTemplate implements CassandraOperations, ApplicationEventP * @param converter {@link CassandraConverter} used to convert between Java and Cassandra types; must not be * {@literal null}. * @see CassandraConverter - * @see Session + * @see CqlSession */ public CassandraTemplate(CqlSession session, CassandraConverter converter) { this(new DefaultSessionFactory(session), converter); @@ -180,7 +180,7 @@ public class CassandraTemplate implements CassandraOperations, ApplicationEventP * @param converter {@link CassandraConverter} used to convert between Java and Cassandra types; must not be * {@literal null}. * @see CassandraConverter - * @see Session + * @see CqlSession */ public CassandraTemplate(CqlOperations cqlOperations, CassandraConverter converter) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ExecutableSelectOperation.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ExecutableSelectOperation.java index 95a6fc53e..df811952a 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ExecutableSelectOperation.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ExecutableSelectOperation.java @@ -24,6 +24,7 @@ import org.springframework.lang.Nullable; import org.springframework.util.Assert; import com.datastax.oss.driver.api.core.CqlIdentifier; +import com.datastax.oss.driver.api.core.cql.ResultSet; /** * The {@link ExecutableSelectOperation} interface allows creation and execution of Cassandra {@code SELECT} operations @@ -31,7 +32,7 @@ import com.datastax.oss.driver.api.core.CqlIdentifier; *

* The starting {@literal domainType} is used for mapping the {@link Query} provided via {@code matching} into the * Cassandra-specific representation. By default, the originating {@literal domainType} is also used for mapping back - * the result from the {@link com.datastax.driver.core.Row}. However, it is possible to define an different + * the result from the {@link com.datastax.oss.driver.api.core.cql.Row}. However, it is possible to define an different * {@literal returnType} via {@code as} for mapping the result. *

* By default, the table to operate on is derived from the initial {@literal domainType} and can be defined there with @@ -212,8 +213,8 @@ public interface ExecutableSelectOperation { /** * Stream all matching elements. * - * @return a {@link Stream} wrapping the Cassandra {@link com.datastax.driver.core.ResultSet}, which needs to be - * closed; never {@literal null}. + * @return a {@link Stream} wrapping the Cassandra {@link ResultSet}, which needs to be closed; never + * {@literal null}. * @see java.util.stream.Stream * @see #all() */ diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveCassandraBatchTemplate.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveCassandraBatchTemplate.java index d9c71b173..bfa1a7dad 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveCassandraBatchTemplate.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveCassandraBatchTemplate.java @@ -85,7 +85,7 @@ class ReactiveCassandraBatchTemplate implements ReactiveCassandraBatchOperations /** * Return a reference to the configured {@link CassandraConverter} used to map {@link Object Objects} to - * {@link com.datastax.driver.core.Row Rows}. + * {@link com.datastax.oss.driver.api.core.cql.Row Rows}. * * @return a reference to the configured {@link CassandraConverter}. * @see org.springframework.data.cassandra.core.convert.CassandraConverter 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 1e33de064..44cc15967 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 @@ -134,7 +134,7 @@ public class ReactiveCassandraTemplate * * @param session {@link ReactiveSession} used to interact with Cassandra; must not be {@literal null}. * @see CassandraConverter - * @see Session + * @see ReactiveSession */ public ReactiveCassandraTemplate(ReactiveSession session) { this(session, newConverter(session)); @@ -148,7 +148,7 @@ public class ReactiveCassandraTemplate * @param converter {@link CassandraConverter} used to convert between Java and Cassandra types; must not be * {@literal null}. * @see org.springframework.data.cassandra.core.convert.CassandraConverter - * @see com.datastax.oss.driver.api.core.CqlSession + * @see ReactiveSession */ public ReactiveCassandraTemplate(ReactiveSession session, CassandraConverter converter) { this(new DefaultReactiveSessionFactory(session), converter); @@ -162,7 +162,7 @@ public class ReactiveCassandraTemplate * @param converter {@link CassandraConverter} used to convert between Java and Cassandra types; must not be * {@literal null}. * @see org.springframework.data.cassandra.core.convert.CassandraConverter - * @see com.datastax.oss.driver.api.core.CqlSession + * @see ReactiveSession */ public ReactiveCassandraTemplate(ReactiveSessionFactory sessionFactory, CassandraConverter converter) { this(new ReactiveCqlTemplate(sessionFactory), converter); @@ -177,7 +177,7 @@ public class ReactiveCassandraTemplate * @param converter {@link CassandraConverter} used to convert between Java and Cassandra types; must not be * {@literal null}. * @see org.springframework.data.cassandra.core.convert.CassandraConverter - * @see com.datastax.oss.driver.api.core.CqlSession + * @see ReactiveSession */ public ReactiveCassandraTemplate(ReactiveCqlOperations reactiveCqlOperations, CassandraConverter converter) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveSelectOperation.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveSelectOperation.java index 3599f2af9..36a34e2bd 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveSelectOperation.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveSelectOperation.java @@ -29,7 +29,7 @@ import com.datastax.oss.driver.api.core.CqlIdentifier; *

* The starting {@literal domainType} is used for mapping the {@link Query} provided via {@code matching} int the * Cassandra specific representation. By default, the originating {@literal domainType} is also used for mapping back - * the result from the {@link com.datastax.driver.core.Row}. However, it is possible to define an different + * the result from the {@link com.datastax.oss.driver.api.core.cql.Row}. However, it is possible to define an different * {@literal returnType} via {@code as} to mapping the result. *

* By default, the table to operate on is derived from the initial {@literal domainType} and can be defined there via diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraJodaTimeConverters.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraJodaTimeConverters.java index b993173b7..91517e8a1 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraJodaTimeConverters.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraJodaTimeConverters.java @@ -52,7 +52,6 @@ public abstract class CassandraJodaTimeConverters { * @return a {@link Collection} of Joda Time {@link Converter Converters} to register. * @see org.springframework.core.convert.converter.Converter * @see java.util.Collection - * @see org.joda.time */ public static Collection> getConvertersToRegister() { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraThreeTenBackPortConverters.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraThreeTenBackPortConverters.java index 2442c3f1c..9003f7748 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraThreeTenBackPortConverters.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraThreeTenBackPortConverters.java @@ -58,7 +58,6 @@ public abstract class CassandraThreeTenBackPortConverters { * @return a {@link Collection} of ThreeTen Backport {@link Converter Converters} to register. * @see org.springframework.core.convert.converter.Converter * @see java.util.Collection - * @see org.joda.time */ public static Collection> getConvertersToRegister() { 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 c794440e6..9545bfc57 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 @@ -44,7 +44,7 @@ public class CassandraUDTValueProvider extends UdtValueProvider { } /** - * Create a new {@link CassandraUDTValueProvider} with the given {@link UDTValue} and + * Create a new {@link CassandraUDTValueProvider} with the given {@link UdtValue} and * {@link DefaultSpELExpressionEvaluator}. * * @param udtValue must not be {@literal null}. 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 0b5f8505e..3c07503b9 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 @@ -137,9 +137,8 @@ public class MappingCassandraConverter extends AbstractCassandraConverter } /** - * Creates a new {@link ConversionContext} given {@link ObjectPath}. + * Creates a new {@link ConversionContext}. * - * @param path the current {@link ObjectPath}, must not be {@literal null}. * @return the {@link ConversionContext}. */ protected ConversionContext getConversionContext() { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/RowValueProvider.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/RowValueProvider.java index a4079fef1..a8db9ebfe 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/RowValueProvider.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/RowValueProvider.java @@ -40,7 +40,6 @@ public class RowValueProvider implements CassandraValueProvider { * {@link SpELExpressionEvaluator}. * * @param source must not be {@literal null}. - * @param codecRegistry must not be {@literal null}. * @param evaluator must not be {@literal null}. */ public RowValueProvider(Row source, SpELExpressionEvaluator evaluator) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/TupleValueProvider.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/TupleValueProvider.java index 1dab01228..3c64dcc29 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/TupleValueProvider.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/TupleValueProvider.java @@ -42,7 +42,6 @@ public class TupleValueProvider implements CassandraValueProvider { * Create a new {@link TupleValueProvider} with the given {@link TupleValue} and {@link SpELExpressionEvaluator}. * * @param tupleValue must not be {@literal null}. - * @param codecRegistry must not be {@literal null}. * @param evaluator must not be {@literal null}. */ public TupleValueProvider(TupleValue tupleValue, SpELExpressionEvaluator evaluator) { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/UdtValueProvider.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/UdtValueProvider.java index dc43eaa9f..1337afed6 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/UdtValueProvider.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/UdtValueProvider.java @@ -35,7 +35,7 @@ public class UdtValueProvider implements CassandraValueProvider { private final SpELExpressionEvaluator evaluator; /** - * Create a new {@link UdtValueProvider} with the given {@link UDTValue} and {@link SpELExpressionEvaluator}. + * Create a new {@link UdtValueProvider} with the given {@link UdtValue} and {@link SpELExpressionEvaluator}. * * @param udtValue must not be {@literal null}. * @param evaluator must not be {@literal null}. diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/AsyncCqlTemplate.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/AsyncCqlTemplate.java index 705570d9b..0818548c2 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/AsyncCqlTemplate.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/AsyncCqlTemplate.java @@ -838,7 +838,7 @@ public class AsyncCqlTemplate extends CassandraAccessor implements AsyncCqlOpera } /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.ResultSetExtractor#extractData(com.datastax.driver.core.ResultSet) + * @see org.springframework.data.cassandra.core.cql.ResultSetExtractor#extractData(ResultSet) */ @Override @Nullable diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/AsyncRowMapperResultSetExtractor.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/AsyncRowMapperResultSetExtractor.java index 51a70ebbd..7481f8236 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/AsyncRowMapperResultSetExtractor.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/AsyncRowMapperResultSetExtractor.java @@ -18,13 +18,13 @@ package org.springframework.data.cassandra.core.cql; import java.util.List; import java.util.stream.Collectors; -import com.datastax.oss.driver.api.core.DriverException; -import com.datastax.oss.driver.api.core.cql.AsyncResultSet; - import org.springframework.dao.DataAccessException; import org.springframework.util.Assert; import org.springframework.util.concurrent.ListenableFuture; +import com.datastax.oss.driver.api.core.DriverException; +import com.datastax.oss.driver.api.core.cql.AsyncResultSet; + /** * Adapter implementation of the {@link ResultSetExtractor} interface that delegates to a {@link RowMapper} which is * supposed to create an object for each row. Each object is added to the results List of this @@ -57,7 +57,7 @@ public class AsyncRowMapperResultSetExtractor implements AsyncResultSetExtrac } /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.ResultSetExtractor#extractData(com.datastax.driver.core.ResultSet) + * @see org.springframework.data.cassandra.core.cql.ResultSetExtractor#extractData(ResultSet) */ @Override public ListenableFuture> extractData(AsyncResultSet resultSet) throws DriverException, DataAccessException { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CachedPreparedStatementCreator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CachedPreparedStatementCreator.java index 7c2f32a63..ae53cc39e 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CachedPreparedStatementCreator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CachedPreparedStatementCreator.java @@ -38,8 +38,7 @@ import com.datastax.oss.driver.api.core.cql.PreparedStatement; * * @author David Webb * @author Mark Paluch - * @deprecated since 2.0. This class uses an unsafe, static held cache and is not able to prepare - * {@link com.datastax.driver.core.querybuilder.BuiltStatement}. + * @deprecated since 2.0. This class uses an unsafe, static held cache. */ @Deprecated public class CachedPreparedStatementCreator implements PreparedStatementCreator { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ColumnMapRowMapper.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ColumnMapRowMapper.java index 1f62a082e..c2584183a 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ColumnMapRowMapper.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ColumnMapRowMapper.java @@ -17,13 +17,13 @@ package org.springframework.data.cassandra.core.cql; import java.util.Map; +import org.springframework.lang.Nullable; +import org.springframework.util.LinkedCaseInsensitiveMap; + import com.datastax.oss.driver.api.core.cql.ColumnDefinition; import com.datastax.oss.driver.api.core.cql.ColumnDefinitions; import com.datastax.oss.driver.api.core.cql.Row; -import org.springframework.lang.Nullable; -import org.springframework.util.LinkedCaseInsensitiveMap; - /** * {@link RowMapper} implementation that creates a {@code java.util.Map} for each row, representing all columns as * key-value pairs: one entry for each column, with the column name as key. @@ -44,7 +44,7 @@ import org.springframework.util.LinkedCaseInsensitiveMap; public class ColumnMapRowMapper implements RowMapper> { /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.RowMapper#mapRow(com.datastax.driver.core.Row, int) + * @see org.springframework.data.cassandra.core.cql.RowMapper#mapRow(com.datastax.oss.driver.api.core.cql.Row, int) */ @Override public Map mapRow(Row rs, int rowNum) { @@ -82,7 +82,7 @@ public class ColumnMapRowMapper implements RowMapper> { * * @param columnName the column name as returned by the {@link Row}, must not be {@literal null}. * @return the column key to use. - * @see ColumnDefinitions#getName(int) + * @see ColumnDefinitions#get(int) */ protected String getColumnKey(String columnName) { return columnName; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlIdentifier.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlIdentifier.java index 43795eb5b..bd3fda17d 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlIdentifier.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlIdentifier.java @@ -184,9 +184,11 @@ public final class CqlIdentifier implements Comparable, Serializa * Returns the identifier without encasing quotes, regardless of the value of {@link #isQuoted()}. For * example, if {@link #isQuoted()} is {@code true}, then this value will be the same as {@link #toCql()} and * {@link #toString()}. - *

- * This is needed, for example, to get the correct {@link TableMetadata} from - * {@link KeyspaceMetadata#getTable(String)}: the given string must not be quoted. + *

+ * This is needed, for example, to get the correct + * {@link com.datastax.oss.driver.api.core.metadata.schema.TableMetadata} from + * {@link com.datastax.oss.driver.api.core.metadata.schema.KeyspaceMetadata#getTable(String)}: the given string must + * not be quoted. */ public String getUnquoted() { return unquoted; diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlTemplate.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlTemplate.java index 725d05708..e97f6489b 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlTemplate.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/CqlTemplate.java @@ -850,7 +850,7 @@ public class CqlTemplate extends CassandraAccessor implements CqlOperations { } /* (non-Javadoc) - * @see org.springframework.data.cassandra.core.cql.ResultSetExtractor#extractData(com.datastax.driver.core.ResultSet) + * @see org.springframework.data.cassandra.core.cql.ResultSetExtractor#extractData(ResultSet) */ @Override @Nullable diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/KeyspaceIdentifier.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/KeyspaceIdentifier.java index 811b068c9..4084766d5 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/KeyspaceIdentifier.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/KeyspaceIdentifier.java @@ -17,13 +17,13 @@ package org.springframework.data.cassandra.core.cql; import java.util.regex.Pattern; -import com.datastax.oss.driver.api.core.CqlIdentifier; - import org.springframework.util.Assert; +import com.datastax.oss.driver.api.core.CqlIdentifier; + /** * This encapsulates the logic for keyspace identifiers. - *

+ *

* Keyspace identifiers are converted to lower case. To render, use any of the methods {@link #toCql()}, * {@link #toCql(StringBuilder)}, or {@link #toString()}. * diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/PreparedStatementCallback.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/PreparedStatementCallback.java index 240bf6920..b1efd9685 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/PreparedStatementCallback.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/PreparedStatementCallback.java @@ -15,21 +15,22 @@ */ package org.springframework.data.cassandra.core.cql; -import com.datastax.oss.driver.api.core.CqlSession; -import com.datastax.oss.driver.api.core.DriverException; -import com.datastax.oss.driver.api.core.cql.PreparedStatement; - import org.springframework.dao.DataAccessException; import org.springframework.lang.Nullable; +import com.datastax.oss.driver.api.core.CqlSession; +import com.datastax.oss.driver.api.core.DriverException; +import com.datastax.oss.driver.api.core.cql.PreparedStatement; +import com.datastax.oss.driver.api.core.cql.Statement; + /** * Generic callback interface for code that operates on a {@link PreparedStatement}. Allows to execute any number of - * operations on a single {@link PreparedStatement}, for example a single {@link Session#execute(Statement). + * operations on a single {@link PreparedStatement}, for example a single {@link CqlSession#execute(Statement)}. *

* Used internally by {@link CqlTemplate}, but also useful for application code. Note that the passed-in * {@link PreparedStatement} can have been created by the framework or by a custom {@link PreparedStatementCreator}. * However, the latter is hardly ever necessary, as most custom callback actions will perform updates in which case a - * standard {@link PreparedStatement is fine. Custom actions will always set parameter values themselves, so that + * standard {@link PreparedStatement} is fine. Custom actions will always set parameter values themselves, so that * {@link PreparedStatementCreator} capability is not needed either. * * @author David Webb diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveCassandraAccessor.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveCassandraAccessor.java index dcb350a5c..4cfa24286 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveCassandraAccessor.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveCassandraAccessor.java @@ -25,6 +25,8 @@ import org.springframework.data.cassandra.ReactiveSessionFactory; import org.springframework.lang.Nullable; import org.springframework.util.Assert; +import com.datastax.oss.driver.api.core.DriverException; + /** * Base class for {@link ReactiveCqlTemplate} and other CQL-accessing DAO helpers, defining common properties such as * {@link ReactiveSessionFactory} and exception translator. diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveCqlTemplate.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveCqlTemplate.java index 00c489a75..0f9d11a76 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveCqlTemplate.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactiveCqlTemplate.java @@ -19,7 +19,6 @@ import reactor.core.publisher.Flux; import reactor.core.publisher.Mono; import java.util.Map; -import java.util.Optional; import java.util.function.Function; import org.reactivestreams.Publisher; @@ -116,8 +115,8 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re private @Nullable ConsistencyLevel serialConsistencyLevel; /** - * Construct a new {@link ReactiveCqlTemplate Note: The {@link ReactiveSessionFactory} has to be set before using the - * instance. + * Construct a new {@link ReactiveCqlTemplate}. Note: The {@link ReactiveSessionFactory} has to be set before using + * the instance. * * @see #setSessionFactory */ @@ -810,7 +809,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re } /** - * Exception translation {@link Function} intended for {@link Mono#otherwise(Function)} usage. + * Exception translation {@link Function} intended for {@link Mono#onErrorMap(Function)} usage. * * @param task readable text describing the task being attempted * @param cql CQL query or update that caused the problem (may be {@literal null}) @@ -846,7 +845,7 @@ public class ReactiveCqlTemplate extends ReactiveCassandraAccessor implements Re /** * Prepare the given CQL Statement applying statement settings such as page size and consistency level. * - * @param stmt the CQL Statement to prepare + * @param statement the CQL Statement to prepare * @see #setConsistencyLevel(ConsistencyLevel) * @see #setSerialConsistencyLevel(ConsistencyLevel) * @see #setPageSize(int) diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactivePreparedStatementCallback.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactivePreparedStatementCallback.java index 8181e8da6..edc4f89bf 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactivePreparedStatementCallback.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/ReactivePreparedStatementCallback.java @@ -15,21 +15,23 @@ */ package org.springframework.data.cassandra.core.cql; -import com.datastax.oss.driver.api.core.DriverException; -import com.datastax.oss.driver.api.core.cql.PreparedStatement; import org.reactivestreams.Publisher; import org.springframework.dao.DataAccessException; import org.springframework.data.cassandra.ReactiveSession; +import com.datastax.oss.driver.api.core.DriverException; +import com.datastax.oss.driver.api.core.cql.PreparedStatement; +import com.datastax.oss.driver.api.core.cql.Statement; + /** * Generic callback interface for code that operates on a {@link PreparedStatement}. Allows to execute any number of - * operations on a single {@link PreparedStatement}, for example a single {@link ReactiveSession#execute(Statement). + * operations on a single {@link PreparedStatement}, for example a single {@link ReactiveSession#execute(Statement)}. *

* Used internally by {@link ReactiveCqlTemplate}, but also useful for application code. Note that the passed-in * {@link PreparedStatement} can have been created by the framework or by a custom * {@link ReactivePreparedStatementCreator}. However, the latter is hardly ever necessary, as most custom callback - * actions will perform updates in which case a standard {@link PreparedStatement is fine. Custom actions will always + * actions will perform updates in which case a standard {@link PreparedStatement} is fine. Custom actions will always * set parameter values themselves, so that {@link ReactivePreparedStatementCreator} capability is not needed either. * * @author Mark Paluch diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/RingMember.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/RingMember.java index bbd68e06e..458c7242e 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/RingMember.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/RingMember.java @@ -19,10 +19,10 @@ import java.io.Serializable; import java.net.InetAddress; import java.net.InetSocketAddress; -import com.datastax.oss.driver.api.core.metadata.Node; - import org.springframework.util.Assert; +import com.datastax.oss.driver.api.core.metadata.Node; + /** * Domain object representing a Cassandra host. * @@ -45,7 +45,7 @@ public final class RingMember implements Serializable { private final String rack; /** - * Creates a new {@link RingMember} given {@link Host}. + * Creates a new {@link RingMember} given {@link Node}. * * @param host * @return diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/RowMapper.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/RowMapper.java index 3a4fdf540..0ee5d38d0 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/RowMapper.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/RowMapper.java @@ -15,16 +15,16 @@ */ package org.springframework.data.cassandra.core.cql; -import com.datastax.oss.driver.api.core.DriverException; -import com.datastax.oss.driver.api.core.cql.Row; - import org.springframework.lang.Nullable; +import com.datastax.oss.driver.api.core.DriverException; +import com.datastax.oss.driver.api.core.cql.ResultSet; +import com.datastax.oss.driver.api.core.cql.Row; + /** - * An interface used by {@link CqlTemplate} for mapping rows of a {@link com.datastax.driver.core.ResultSet} on a - * per-row basis. Implementations of this interface perform the actual work of mapping each row to a result object, but - * don't need to worry about exception handling. {@link DriverException}s will be caught and handled by the calling - * {@link CqlTemplate}. + * An interface used by {@link CqlTemplate} for mapping rows of a {@link ResultSet} on a per-row basis. Implementations + * of this interface perform the actual work of mapping each row to a result object, but don't need to worry about + * exception handling. {@link DriverException}s will be caught and handled by the calling {@link CqlTemplate}. *

* Typically used either for {@link CqlTemplate}'s query methods or for out parameters of stored procedures. * {@link RowMapper} objects are typically stateless and thus reusable; they are an ideal choice for implementing @@ -39,8 +39,7 @@ import org.springframework.lang.Nullable; public interface RowMapper { /** - * Implementations must implement this method to map each row of data in the - * {@link com.datastax.driver.core.ResultSet}. + * Implementations must implement this method to map each row of data in the {@link ResultSet}. * * @param row the {@link Row} to map, must not be {@literal null}. * @param rowNum the number of the current row. diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/RowMapperResultSetExtractor.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/RowMapperResultSetExtractor.java index 051149e3e..4fff59a99 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/RowMapperResultSetExtractor.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/RowMapperResultSetExtractor.java @@ -18,13 +18,13 @@ package org.springframework.data.cassandra.core.cql; import java.util.ArrayList; import java.util.List; +import org.springframework.dao.DataAccessException; +import org.springframework.util.Assert; + import com.datastax.oss.driver.api.core.DriverException; import com.datastax.oss.driver.api.core.cql.ResultSet; import com.datastax.oss.driver.api.core.cql.Row; -import org.springframework.dao.DataAccessException; -import org.springframework.util.Assert; - /** * Adapter implementation of the {@link ResultSetExtractor} interface that delegates to a {@link RowMapper} which is * supposed to create an object for each row. Each object is added to the results List of this @@ -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/cassandra/core/cql/SingleColumnRowMapper.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/SingleColumnRowMapper.java index d1dd5d949..e5190ebf8 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/SingleColumnRowMapper.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/SingleColumnRowMapper.java @@ -15,19 +15,19 @@ */ package org.springframework.data.cassandra.core.cql; -import com.datastax.oss.driver.api.core.DriverException; -import com.datastax.oss.driver.api.core.cql.ColumnDefinition; -import com.datastax.oss.driver.api.core.cql.ColumnDefinitions; -import com.datastax.oss.driver.api.core.cql.Row; - import org.springframework.dao.TypeMismatchDataAccessException; import org.springframework.lang.Nullable; import org.springframework.util.ClassUtils; import org.springframework.util.NumberUtils; +import com.datastax.oss.driver.api.core.DriverException; +import com.datastax.oss.driver.api.core.cql.ColumnDefinition; +import com.datastax.oss.driver.api.core.cql.ColumnDefinitions; +import com.datastax.oss.driver.api.core.cql.Row; + /** * {@link RowMapper} implementation that converts a single column into a single result value per row. Expects to operate - * on a {@link com.datastax.driver.core.Row} that just contains a single column. + * on a {@link com.datastax.oss.driver.api.core.cql.Row} that just contains a single column. *

* The type of the result value for each row can be specified. The value for the single column will be extracted from a * {@link Row} and converted into the specified target type. diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/AbstractResultSetConverter.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/AbstractResultSetConverter.java index 753c5ec05..fc02d0593 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/AbstractResultSetConverter.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/converter/AbstractResultSetConverter.java @@ -18,16 +18,16 @@ package org.springframework.data.cassandra.core.cql.converter; import java.util.List; import java.util.Map; -import com.datastax.oss.driver.api.core.cql.ResultSet; - import org.springframework.core.convert.converter.Converter; import org.springframework.lang.Nullable; +import com.datastax.oss.driver.api.core.cql.ResultSet; + /** * Convenient converter that can be used to convert a single-row-single-column, single-row-multi-column, or multi-row * {@link ResultSet} into the a value of a given type. The majority of the expected usage is to convert a * single-row-single-column result set into the target type. - *

+ *

* The algorithm is: *

- *

+ *

* If the converter throws due to the inability to convert a given {@link ResultSet}, it will throw an * {@link IllegalArgumentException}. * @@ -66,7 +66,7 @@ public abstract class AbstractResultSetConverter implements Converter the subtype of this class for which this is a CQL generator. */ public abstract class KeyspaceOptionsCqlGenerator> extends KeyspaceNameCqlGenerator> { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/generator/TableOptionsCqlGenerator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/generator/TableOptionsCqlGenerator.java index bda59c289..304fe07d1 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/generator/TableOptionsCqlGenerator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/generator/TableOptionsCqlGenerator.java @@ -24,7 +24,7 @@ import org.springframework.data.cassandra.core.cql.keyspace.TableOptionsSpecific * Base class that contains behavior common to CQL generation for table operations. * * @author Matthew T. Adams - * @param T The subtype of this class for which this is a CQL generator. + * @param the subtype of this class for which this is a CQL generator. */ public abstract class TableOptionsCqlGenerator> extends TableNameCqlGenerator { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/ColumnSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/ColumnSpecification.java index 6bd010a88..4c29ea078 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/ColumnSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/ColumnSpecification.java @@ -28,7 +28,7 @@ import com.datastax.oss.driver.api.core.type.DataType; /** * Object to configure a CQL column specification. - *

+ *

* Use {@link #name(String)} and {@link #type(DataType)} to set the name and type of the column, respectively. To * specify a clustered {@code PRIMARY KEY} column, use {@link #clustered()} or {@link #clustered(Ordering)}. To specify * that the {@code PRIMARY KEY} column is or is part of the partition key, use {@link #partitioned()} instead of diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/FieldSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/FieldSpecification.java index 4528ece7a..5dadca13c 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/FieldSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/FieldSpecification.java @@ -15,14 +15,14 @@ */ package org.springframework.data.cassandra.core.cql.keyspace; +import org.springframework.util.Assert; + import com.datastax.oss.driver.api.core.CqlIdentifier; import com.datastax.oss.driver.api.core.type.DataType; -import org.springframework.util.Assert; - /** * Base value object class to specify user type fields. - *

+ *

* A {@link FieldSpecification} consists of a name and a {@link DataType}. * * @author Mark Paluch diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/KeyspaceActionSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/KeyspaceActionSpecification.java index 794c5919b..0b065b032 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/KeyspaceActionSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/KeyspaceActionSpecification.java @@ -25,7 +25,6 @@ import com.datastax.oss.driver.api.core.CqlIdentifier; * * @author John McPeek * @author David Webb - * @param The subtype of the {@link KeyspaceActionSpecification} */ public abstract class KeyspaceActionSpecification { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/KeyspaceOptionsSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/KeyspaceOptionsSpecification.java index 6a84649c3..b06a64824 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/KeyspaceOptionsSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/KeyspaceOptionsSpecification.java @@ -29,15 +29,15 @@ import com.datastax.oss.driver.api.core.CqlIdentifier; /** * Abstract builder class to support the construction of table specifications that have table options, that is, those * options normally specified by {@code WITH ... AND ...}. - *

+ *

* It is important to note that although this class depends on {@link KeyspaceOption} for convenient and typesafe use, - * it ultimately stores its options in a Map for flexibility. This means that + * it ultimately stores its options in a Map<String,Object> for flexibility. This means that * {@link #with(KeyspaceOption)} and {@link #with(KeyspaceOption, Object)} delegate to * {@link #with(String, Object, boolean, boolean)}. This design allows the API to support new Cassandra options as they * are introduced without having to update the code immediately. * * @author John McPeek - * @param The subtype of the {@link KeyspaceOptionsSpecification}. + * @param the subtype of the {@link KeyspaceOptionsSpecification}. */ public abstract class KeyspaceOptionsSpecification> extends KeyspaceActionSpecification { @@ -74,7 +74,7 @@ public abstract class KeyspaceOptionsSpecification + *

* Options that have {@literal null} values are considered single string options where the name of the option is the * string to be used. Otherwise, the result of {@link Object#toString()} is considered to be the value of the option * with the given name. The value, after conversion to string, may have embedded single quotes escaped according to diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/TableOptionsSpecification.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/TableOptionsSpecification.java index 3736d35b3..8458f1268 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/TableOptionsSpecification.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/keyspace/TableOptionsSpecification.java @@ -15,25 +15,24 @@ */ package org.springframework.data.cassandra.core.cql.keyspace; +import static org.springframework.data.cassandra.core.cql.keyspace.CqlStringUtils.*; + import java.util.Collections; import java.util.LinkedHashMap; import java.util.Map; -import com.datastax.oss.driver.api.core.CqlIdentifier; - import org.springframework.lang.Nullable; -import static org.springframework.data.cassandra.core.cql.keyspace.CqlStringUtils.*; +import com.datastax.oss.driver.api.core.CqlIdentifier; /** * Abstract builder class to support the construction of table specifications that have table options, that is, those * options normally specified by {@code WITH ... AND ...}. - *

+ *

* It is important to note that although this class depends on {@link TableOption} for convenient and typesafe use, it - * ultimately stores its options in a Map for flexibility. This means that - * {@link #with(TableOption)} and {@link #with(TableOption, Object)} delegate to - * {@link #with(String, Object, boolean, boolean)}. This design allows the API to support new Cassandra options as they - * are introduced without having to update the code immediately. + * ultimately stores its options in a Map for flexibility. This means that {@link #with(TableOption)} and + * {@link #with(TableOption, Object)} delegate to {@link #with(String, Object, boolean, boolean)}. This design allows + * the API to support new Cassandra options as they are introduced without having to update the code immediately. * * @author Matthew T. Adams * @author Mark Paluch @@ -73,7 +72,7 @@ public abstract class TableOptionsSpecification + *

* Options that have {@literal null} values are considered single string options where the name of the option is the * string to be used. Otherwise, the result of {@link Object#toString()} is considered to be the value of the option * with the given name. The value, after conversion to string, may have embedded single quotes escaped according to diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/support/CachedPreparedStatementCreator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/support/CachedPreparedStatementCreator.java index 1eff2af46..defe9a538 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/support/CachedPreparedStatementCreator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/support/CachedPreparedStatementCreator.java @@ -27,7 +27,7 @@ import com.datastax.oss.driver.api.core.cql.Statement; /** * {@link PreparedStatementCreator} implementation using caching of prepared statements. - *

+ *

* Regular CQL statements are prepared on first use and executed as prepared statements. Prepared statements are cached * by Cassandra itself (invalidation/eviction possible), in the driver to be able to re-prepare a statement and in this * {@link CachedPreparedStatementCreator} using {@link PreparedStatementCache}. @@ -35,7 +35,8 @@ import com.datastax.oss.driver.api.core.cql.Statement; * @author Mark Paluch * @since 2.0 * @see PreparedStatementCache - * @deprecated since 3.2, the Cassandra driver has a built-in prepared statement cache with makes external caching of prepared statements superfluous. + * @deprecated since 3.2, the Cassandra driver has a built-in prepared statement cache with makes external caching of + * prepared statements superfluous. */ @Deprecated public class CachedPreparedStatementCreator implements PreparedStatementCreator { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/support/MapPreparedStatementCache.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/support/MapPreparedStatementCache.java index c8120973b..7044b97a9 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/support/MapPreparedStatementCache.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/support/MapPreparedStatementCache.java @@ -29,14 +29,15 @@ import com.datastax.oss.driver.api.core.cql.SimpleStatement; /** * {@link PreparedStatementCache} backed by a {@link Map} cache. Defaults to simple {@link ConcurrentHashMap} caching. - *

+ *

* Statements are cached with a key consisting of {@link CqlSession#getName() session name}, {@code keyspace} and the * {@code cql} text. Statement options (idempotency, timeouts) apply from the statement that was initially prepared. * * @author Mark Paluch * @author Aldo Bongio * @since 2.0 - * @deprecated since 3.2, the Cassandra driver has a built-in prepared statement cache with makes external caching of prepared statements superfluous. + * @deprecated since 3.2, the Cassandra driver has a built-in prepared statement cache with makes external caching of + * prepared statements superfluous. */ @Deprecated public class MapPreparedStatementCache implements PreparedStatementCache { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/support/PreparedStatementCache.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/support/PreparedStatementCache.java index edea784de..ceaf9e037 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/support/PreparedStatementCache.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/support/PreparedStatementCache.java @@ -23,7 +23,7 @@ import com.datastax.oss.driver.api.core.cql.SimpleStatement; /** * Cache interface to synchronously prepare CQL statements. - *

+ *

* Implementing classes of {@link PreparedStatementCache} come with own synchronization and cache implementation * characteristics. A cache implementation should optimize for reduction of preparation calls and cache statements using * Cassandras cache key which is specific to the Cluster, keyspace, and CQL text. diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/BasicMapId.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/BasicMapId.java index 7b85b076f..4320fbccb 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/BasicMapId.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/BasicMapId.java @@ -25,7 +25,7 @@ import org.springframework.util.Assert; /** * Simple implementation of {@link MapId}. - *

+ *

* Note: This could be extended in various cool ways, like one that takes a type and validates that the given * name corresponds to an actual field or bean property on that type. There could also be another one that uses a * {@link CassandraPersistentEntity} and {@link CassandraPersistentProperty} instead of a String name. diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraPersistentPropertyComparator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraPersistentPropertyComparator.java index 356f0ee79..7a14269c6 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraPersistentPropertyComparator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraPersistentPropertyComparator.java @@ -25,8 +25,7 @@ import java.util.Comparator; *

  • Composite primary keys first (equal if both {@link CassandraPersistentProperty} are a composite primary key)
    • *
  • Primary key columns (see {@link CassandraPrimaryKeyColumnAnnotationComparator}, compare by ordinal/name/ordering) *
    • - *
  • Regular columns, compared by column name (see - * {@link com.datastax.oss.driver.api.core.CqlIdentifier#compareTo(CqlIdentifier)})
    • + *
  • Regular columns, compared by column name (see {@link String#compareTo(String)}).
    • * * * @author Alex Shvid diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraType.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraType.java index 1c3658086..0e00540f1 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraType.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CassandraType.java @@ -43,10 +43,10 @@ public @interface CassandraType { /** * If the property is {@link java.util.Collection Collection-like}, then this attribute holds a single {@link Name * DataType Name} representing the element type of the {@link java.util.Collection}. - *

    + *

    * If the property is a {@link java.util.Map}, then this attribute holds exactly two {@link Name DataType Names}; the * first is the key type and the second is the value type. - *

    + *

    * If the property is neither {@link java.util.Collection Collection-like} nor a {@link java.util.Map}, then this * attribute is ignored. * diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CodecRegistryTupleTypeFactory.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CodecRegistryTupleTypeFactory.java index a8a84b788..e725fe89d 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CodecRegistryTupleTypeFactory.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/CodecRegistryTupleTypeFactory.java @@ -23,9 +23,8 @@ import com.datastax.oss.driver.api.core.type.TupleType; import com.datastax.oss.driver.api.core.type.codec.registry.CodecRegistry; /** - * {@link CodecRegistry}-based {@link TupleTypeFactory} using - * {@link TupleType#of(ProtocolVersion, CodecRegistry, DataType...)} to create tuple types. {@link TupleType tuple - * types}. + * {@link CodecRegistry}-based {@link TupleTypeFactory} using {@link SimpleTupleTypeFactory#create(DataType...)} to + * create tuple types. {@link TupleType tuple types}. * * @author Mark Paluch * @since 2.1 diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/Embedded.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/Embedded.java index 720e11228..4c6dffb97 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/Embedded.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/Embedded.java @@ -27,7 +27,7 @@ import org.springframework.core.annotation.AliasFor; /** * The annotation to configure a value object as embedded in the current table. - *

    + *

    * Depending on the {@link OnEmpty value} of {@link #onEmpty()} the property is set to {@literal null} or an empty * instance in the case all embedded values are {@literal null} when reading from the result set. * @@ -41,10 +41,10 @@ public @interface Embedded { /** * Set the load strategy for the embedded object if all contained fields yield {@literal null} values. - *

    + *

    * {@link Nullable @Embedded.Nullable} and {@link Empty @Embedded.Empty} offer shortcuts for this. * - * @return never {@link} null. + * @return never {@code null}. */ OnEmpty onEmpty(); diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/IdInterfaceValidator.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/IdInterfaceValidator.java index 12a0a3969..ae86ebbc7 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/IdInterfaceValidator.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/IdInterfaceValidator.java @@ -32,7 +32,7 @@ class IdInterfaceValidator { * then an {@link IdInterfaceExceptions} is thrown containing all of the violations encountered, which can be obtained * from {@link IdInterfaceExceptions#getExceptions()} or, as a convenience, * {@link IdInterfaceExceptions#getMessages()}. - *

    + *

    * Id interfaces are intended to have methods representing setters and getters. Getter methods take the form *

    * setter methods may also declare that they return their id interface type to support method chaining. - *

    + *

    * Id interfaces *