Fix malformed Javadoc.

See #1171

Author: mp911de

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/ReactiveSession.java

@@ -35,11 +35,11 @@
  * 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}.
- * <p/>
+ * <p>
  * 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).
- * <p/>
+ * <p>
  * 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.
-	 * <p/>
+	 * <p>
 	 * 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()}).
-	 * <p/>
+	 * <p>
 	 * As a consequence of the above, you should call this method each time you need a fresh view of the metadata. <b>Do
 	 * not</b> call it once and store the result, because it is a frozen snapshot that will become stale over time.
 	 * <p>
@@ -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.
-	 * <p/>
+	 * <p>
 	 * 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.
-	 * <p/>
+	 * <p>
 	 * 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.
-	 * <p/>
+	 * <p>
 	 * 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.
-	 * <p/>
+	 * <p>
 	 * 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.
-	 * <p/>
+	 * <p>
 	 * 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.
-	 * <p/>
+	 * <p>
 	 * 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.
-	 * <p/>
+	 * <p>
 	 * 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 {
 	 * </pre>
 	 *
 	 * the final execution will be performed with Quorum consistency.
-	 * <p/>
+	 * <p>
 	 * 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.

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/ReactiveSessionFactory.java

@@ -34,7 +34,8 @@
 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}.
 	 */

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

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/config/ParsingUtils.java

@@ -143,7 +143,7 @@ public static void addRequiredPropertyValue(BeanDefinitionBuilder builder, Strin
 	/**
 	 * 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.
-	 * <p/>
+	 * <p>
 	 * If {@code required} is <code>false</code>, <code>value</code> 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.
 	 *

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));

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

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.
 	 * <p>
-	 * 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 <T> 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.
 	 * <p>
-	 * 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 <T> 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.
 	 * <p>
-	 * 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 <T> element return type.
 	 * @param query query to execute. Must not be empty or {@literal null}.

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
 	 */

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 CassandraTemplate(CqlSession session) {
 	 * @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 CassandraTemplate(SessionFactory sessionFactory, CassandraConverter conve
 	 * @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) {
 

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ExecutableSelectOperation.java

@@ -24,14 +24,15 @@
 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
  * in a fluent API style.
  * <p>
  * 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.
  * <p>
  * By default, the table to operate on is derived from the initial {@literal domainType} and can be defined there with
@@ -212,8 +213,8 @@ default Optional<T> one() {
 		/**
 		 * 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()
 		 */

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveCassandraBatchTemplate.java

@@ -85,7 +85,7 @@ private void assertNotExecuted() {
 
 	/**
 	 * 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

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 ReactiveCassandraTemplate(ReactiveSession session) {
 	 * @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 ReactiveCassandraTemplate(ReactiveSession session, CassandraConverter con
 	 * @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 ReactiveCassandraTemplate(ReactiveSessionFactory sessionFactory, Cassandr
 	 * @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) {
 

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/ReactiveSelectOperation.java

@@ -29,7 +29,7 @@
  * <p>
  * 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.
  * <p>
  * By default, the table to operate on is derived from the initial {@literal domainType} and can be defined there via

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraJodaTimeConverters.java

@@ -52,7 +52,6 @@ private 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<Converter<?, ?>> getConvertersToRegister() {
 

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraThreeTenBackPortConverters.java

@@ -58,7 +58,6 @@ private 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<Converter<?, ?>> getConvertersToRegister() {
 

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraUDTValueProvider.java

@@ -44,7 +44,7 @@ public CassandraUDTValueProvider(UdtValue udtValue, CodecRegistry codecRegistry,
 	}
 
 	/**
-	 * 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}.

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/MappingCassandraConverter.java

@@ -137,9 +137,8 @@ public MappingCassandraConverter(CassandraMappingContext mappingContext) {
 	}
 
 	/**
-	 * 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() {

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) {

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) {

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}.

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/AsyncCqlTemplate.java

@@ -838,7 +838,7 @@ protected AsyncRowCallbackHandlerResultSetExtractor(RowCallbackHandler rowCallba
 		}
 
 		/* (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

spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/cql/AsyncRowMapperResultSetExtractor.java

@@ -18,13 +18,13 @@
 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 AsyncRowMapperResultSetExtractor(RowMapper<T> rowMapper) {
 	}
 
 	/* (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<List<T>> extractData(AsyncResultSet resultSet) throws DriverException, DataAccessException {