From 6b683f4346c6476f3c80e56e6bcd0df5b3eed4bc Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Mon, 24 Oct 2016 11:58:22 +0200 Subject: [PATCH] DATACASS-350 - Add since version to existing deprecations. --- .../cassandra/core/ConsistencyLevel.java | 8 +++--- .../core/ConsistencyLevelResolver.java | 2 +- .../cassandra/core/QueryOptions.java | 2 +- .../cassandra/core/RetryPolicy.java | 2 +- .../cassandra/core/CassandraOperations.java | 16 +++++------ .../cassandra/core/CassandraTemplate.java | 14 +++++----- .../query/AbstractCassandraQuery.java | 27 ++++++++++++------- .../test/integration/composites/Comment.java | 4 --- .../integration/composites/CommentKey.java | 6 ----- ...ateMapIdProxyDelegateIntegrationTests.java | 14 ---------- .../mapid/repo/MultiPrimaryKeyColumns.java | 7 ----- .../mapid/repo/SinglePrimaryKeyColumn.java | 7 ----- ...CassandraTemplateMapIdIntegrationTest.java | 14 ---------- 13 files changed, 40 insertions(+), 83 deletions(-) diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/ConsistencyLevel.java b/spring-cql/src/main/java/org/springframework/cassandra/core/ConsistencyLevel.java index eb5239f3d..f98b062f3 100644 --- a/spring-cql/src/main/java/org/springframework/cassandra/core/ConsistencyLevel.java +++ b/spring-cql/src/main/java/org/springframework/cassandra/core/ConsistencyLevel.java @@ -20,7 +20,7 @@ package org.springframework.cassandra.core; * * @author David Webb * @author Antoine Toulme - * @deprecated Use the driver's {@link com.datastax.driver.core.ConsistencyLevel}. + * @deprecated as of 1.5, use the driver's {@link com.datastax.driver.core.ConsistencyLevel}. */ @Deprecated public enum ConsistencyLevel { @@ -28,17 +28,17 @@ public enum ConsistencyLevel { ANY, ONE, TWO, THREE, /** - * @deprecated Use {@link #QUORUM} + * @deprecated as of 1.5, use {@link #QUORUM} */ @Deprecated QUOROM, /** - * @deprecated Use {@link #LOCAL_QUORUM} + * @deprecated as of 1.5, use {@link #LOCAL_QUORUM} */ @Deprecated LOCAL_QUOROM, /** - * @deprecated Use {@link #EACH_QUORUM} + * @deprecated as of 1.5, use {@link #EACH_QUORUM} */ @Deprecated EACH_QUOROM, diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/ConsistencyLevelResolver.java b/spring-cql/src/main/java/org/springframework/cassandra/core/ConsistencyLevelResolver.java index 30c4cee7e..60f25bcae 100644 --- a/spring-cql/src/main/java/org/springframework/cassandra/core/ConsistencyLevelResolver.java +++ b/spring-cql/src/main/java/org/springframework/cassandra/core/ConsistencyLevelResolver.java @@ -22,7 +22,7 @@ import org.springframework.util.Assert; * * @author David Webb * @author Antoine Toulme - * @deprecated Use the driver's {@link com.datastax.driver.core.ConsistencyLevel}. + * @deprecated as of 1.5, use the driver's {@link com.datastax.driver.core.ConsistencyLevel}. */ @Deprecated public final class ConsistencyLevelResolver { diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/QueryOptions.java b/spring-cql/src/main/java/org/springframework/cassandra/core/QueryOptions.java index 128ec631f..6f7180f71 100644 --- a/spring-cql/src/main/java/org/springframework/cassandra/core/QueryOptions.java +++ b/spring-cql/src/main/java/org/springframework/cassandra/core/QueryOptions.java @@ -72,7 +72,7 @@ public class QueryOptions { * Returns the {@link ConsistencyLevel}. * * @return the consistencyLevel. - * @deprecated Use {@link #setConsistencyLevel(com.datastax.driver.core.ConsistencyLevel)} + * @deprecated as of 1.5, use {@link #setConsistencyLevel(com.datastax.driver.core.ConsistencyLevel)} */ @Deprecated public ConsistencyLevel getConsistencyLevel() { diff --git a/spring-cql/src/main/java/org/springframework/cassandra/core/RetryPolicy.java b/spring-cql/src/main/java/org/springframework/cassandra/core/RetryPolicy.java index c9c441b44..8cddc5335 100644 --- a/spring-cql/src/main/java/org/springframework/cassandra/core/RetryPolicy.java +++ b/spring-cql/src/main/java/org/springframework/cassandra/core/RetryPolicy.java @@ -21,7 +21,7 @@ package org.springframework.cassandra.core; * * @author David Webb * @author Mark Paluch - * @deprecated Use the driver's {@link com.datastax.driver.core.policies.RetryPolicy}. + * @deprecated as of 1.5, use the driver's {@link com.datastax.driver.core.policies.RetryPolicy}. */ @Deprecated public enum RetryPolicy { 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 fc9dc90b6..9d4b99a80 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 @@ -247,7 +247,7 @@ public interface CassandraOperations extends CqlOperations { * @param entity The entity to insert * @return The entity given * @see #insertAsynchronously(Object, WriteListener) - * @deprecated This method does not allow for query cancellation or notification of completion. Favor + * @deprecated as of 1.2, this method does not allow for query cancellation or notification of completion. Favor * {@link #insertAsynchronously(Object, WriteListener)}. */ @Deprecated @@ -259,7 +259,7 @@ public interface CassandraOperations extends CqlOperations { * @param entity The entity to insert * @return The entity given * @see #insertAsynchronously(Object, WriteOptions) - * @deprecated This method does not allow for query cancellation or notification of completion. Favor + * @deprecated as of 1.2, this method does not allow for query cancellation or notification of completion. Favor * {@link #insertAsynchronously(Object, WriteListener, WriteOptions)}. */ @Deprecated @@ -290,7 +290,7 @@ public interface CassandraOperations extends CqlOperations { * @param entities The entities to insert * @return The entities given * @see #insertAsynchronously(List, WriteListener) - * @deprecated This method does not allow for query cancellation or notification of completion. Favor + * @deprecated as of 1.2, this method does not allow for query cancellation or notification of completion. Favor * {@link #insertAsynchronously(List, WriteListener)}. */ @Deprecated @@ -302,7 +302,7 @@ public interface CassandraOperations extends CqlOperations { * @param entities The entities to insert * @return The entities given * @see #insertAsynchronously(List, WriteListener, WriteOptions) - * @deprecated This method does not allow for query cancellation or notification of completion. Favor + * @deprecated as of 1.2, this method does not allow for query cancellation or notification of completion. Favor * {@link #insertAsynchronously(List, WriteListener, WriteOptions)}. */ @Deprecated @@ -386,7 +386,7 @@ public interface CassandraOperations extends CqlOperations { * @param entity The entity to update * @return The entity given * @see #updateAsynchronously(Object, WriteListener) - * @deprecated This method does not allow for query cancellation or notification of completion. Favor + * @deprecated as of 1.2, this method does not allow for query cancellation or notification of completion. Favor * {@link #updateAsynchronously(Object, WriteListener)}. */ @Deprecated @@ -398,7 +398,7 @@ public interface CassandraOperations extends CqlOperations { * @param entity The entity to update * @return The entity given * @see #updateAsynchronously(Object, WriteOptions) - * @deprecated This method does not allow for query cancellation or notification of completion. Favor + * @deprecated as of 1.2, this method does not allow for query cancellation or notification of completion. Favor * {@link #updateAsynchronously(Object, WriteListener, WriteOptions)}. */ @Deprecated @@ -429,7 +429,7 @@ public interface CassandraOperations extends CqlOperations { * @param entities The entities to update * @return The entities given * @see #updateAsynchronously(List, WriteListener) - * @deprecated This method does not allow for query cancellation or notification of completion. Favor + * @deprecated as of 1.2, this method does not allow for query cancellation or notification of completion. Favor * {@link #updateAsynchronously(List, WriteListener)}. */ @Deprecated @@ -441,7 +441,7 @@ public interface CassandraOperations extends CqlOperations { * @param entities The entities to update * @return The entities given * @see #updateAsynchronously(List, WriteListener, WriteOptions) - * @deprecated This method does not allow for query cancellation or notification of completion. Favor + * @deprecated as of 1.2, this method does not allow for query cancellation or notification of completion. Favor * {@link #updateAsynchronously(List, WriteListener, WriteOptions)}. */ @Deprecated 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 58a9a5e2a..b46027c5b 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 @@ -142,7 +142,7 @@ public class CassandraTemplate extends CqlTemplate implements CassandraOperation } /** - * @deprecated see {@link #getMappingContext()}. + * @deprecated as of 1.5, see {@link #getMappingContext()}. */ @Deprecated public CassandraMappingContext getCassandraMappingContext() { @@ -291,7 +291,7 @@ public class CassandraTemplate extends CqlTemplate implements CassandraOperation } /** - * @deprecated See {@link #insertAsynchronously(Object, WriteListener)} + * @deprecated as of 1.2, see {@link #insertAsynchronously(Object, WriteListener)} */ @Deprecated @Override @@ -301,7 +301,7 @@ public class CassandraTemplate extends CqlTemplate implements CassandraOperation } /** - * @deprecated See {@link #insertAsynchronously(List, WriteListener, WriteOptions)} + * @deprecated as of 1.2, see {@link #insertAsynchronously(List, WriteListener, WriteOptions)} */ @Deprecated @Override @@ -330,7 +330,7 @@ public class CassandraTemplate extends CqlTemplate implements CassandraOperation } /** - * @deprecated See {@link #insertAsynchronously(List, WriteListener, WriteOptions)}. + * @deprecated as of 1.2, see {@link #insertAsynchronously(List, WriteListener, WriteOptions)}. */ @Deprecated @Override @@ -340,7 +340,7 @@ public class CassandraTemplate extends CqlTemplate implements CassandraOperation } /** - * @deprecated See {@link #insertAsynchronously(List, WriteListener, WriteOptions)}. + * @deprecated as of 1.2, see {@link #insertAsynchronously(List, WriteListener, WriteOptions)}. */ @Deprecated @Override @@ -1028,7 +1028,7 @@ public class CassandraTemplate extends CqlTemplate implements CassandraOperation } /** - * @deprecated Method renamed. Use {@link #createUpdateBatchQuery(String, List, WriteOptions, EntityWriter)} + * @deprecated as of 1.2, method renamed. Use {@link #createUpdateBatchQuery(String, List, WriteOptions, EntityWriter)} * @see #createUpdateBatchQuery(String, List, WriteOptions, EntityWriter) */ @Deprecated @@ -1039,7 +1039,7 @@ public class CassandraTemplate extends CqlTemplate implements CassandraOperation } /** - * @deprecated Method renamed. Use {@link #createUpdateQuery(String, Object, WriteOptions, EntityWriter)} + * @deprecated as of 1.2, method renamed. Use {@link #createUpdateQuery(String, Object, WriteOptions, EntityWriter)} * @see #createUpdateQuery(String, Object, WriteOptions, EntityWriter) */ @Deprecated diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/AbstractCassandraQuery.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/AbstractCassandraQuery.java index a17984ed7..b41668579 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/AbstractCassandraQuery.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/AbstractCassandraQuery.java @@ -98,13 +98,12 @@ public abstract class AbstractCassandraQuery implements RepositoryQuery { ResultProcessor resultProcessor = queryMethod.getResultProcessor().withDynamicProjection(parameterAccessor); CassandraQueryExecution queryExecution = getExecution(query, parameterAccessor, - new ResultProcessingConverter(resultProcessor)); + new ResultProcessingConverter(resultProcessor)); CassandraReturnedType returnedType = new CassandraReturnedType(resultProcessor.getReturnedType(), - template.getConverter().getCustomConversions()); + template.getConverter().getCustomConversions()); - Class resultType = (returnedType.isProjecting() ? returnedType.getDomainType() - : returnedType.getReturnedType()); + Class resultType = (returnedType.isProjecting() ? returnedType.getDomainType() : returnedType.getReturnedType()); return queryExecution.execute(query, resultType); } @@ -141,7 +140,8 @@ public abstract class AbstractCassandraQuery implements RepositoryQuery { * @param declaredReturnType * @param returnedUnwrappedObjectType * @return - * @deprecated {@link org.springframework.data.cassandra.mapping.CassandraMappingContext} handles type conversion. + * @deprecated as of 1.5, {@link org.springframework.data.cassandra.mapping.CassandraMappingContext} handles type + * conversion. */ @Deprecated public Object getCollectionOfEntity(ResultSet resultSet, Class declaredReturnType, @@ -170,7 +170,8 @@ public abstract class AbstractCassandraQuery implements RepositoryQuery { * @param resultSet * @param type * @return - * @deprecated {@link org.springframework.data.cassandra.mapping.CassandraMappingContext} handles type conversion. + * @deprecated as of 1.5, {@link org.springframework.data.cassandra.mapping.CassandraMappingContext} handles type + * conversion. */ @Deprecated public Object getSingleEntity(ResultSet resultSet, Class type) { @@ -183,6 +184,7 @@ public abstract class AbstractCassandraQuery implements RepositoryQuery { } private void warnIfMoreResults(ResultSet resultSet) { + if (log.isWarnEnabled() && !resultSet.isExhausted()) { int count = 0; @@ -196,11 +198,13 @@ public abstract class AbstractCassandraQuery implements RepositoryQuery { @Deprecated protected void warnIfMoreResults(Iterator iterator) { + if (log.isWarnEnabled() && iterator.hasNext()) { int count = 0; - for ( ; iterator.hasNext(); iterator.next()) { + while (iterator.hasNext()) { count++; + iterator.next(); } log.warn("ignoring extra {} row{}", count, count == 1 ? "" : "s"); @@ -208,14 +212,19 @@ public abstract class AbstractCassandraQuery implements RepositoryQuery { } /** - * @deprecated {@link org.springframework.data.cassandra.mapping.CassandraMappingContext} handles type conversion. + * @deprecated as of 1.5, {@link org.springframework.data.cassandra.mapping.CassandraMappingContext} handles type + * conversion. */ @Deprecated public void setConversionService(ConversionService conversionService) { throw new UnsupportedOperationException("setConversionService(ConversionService) is not supported anymore. " - + "Please use CassandraMappingContext instead"); + + "Please use CassandraMappingContext instead"); } + /** + * @deprecated as of 1.5, {@link org.springframework.data.cassandra.mapping.CassandraMappingContext} handles type + * conversion. + */ @Deprecated public ConversionService getConversionService() { return template.getConverter().getConversionService(); diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/composites/Comment.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/composites/Comment.java index 80b68c562..e49ab100f 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/composites/Comment.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/composites/Comment.java @@ -33,10 +33,6 @@ public class Comment { private String text; - /** - * @deprecated Only for use by persistence infrastructure - */ - @Deprecated protected Comment() {} public Comment(String author, String company) { diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/composites/CommentKey.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/composites/CommentKey.java index 2d8380ee7..b99d431d4 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/composites/CommentKey.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/composites/CommentKey.java @@ -36,12 +36,6 @@ public class CommentKey implements Serializable { @PrimaryKeyColumn(ordinal = 1) private String company; - /** - * @deprecated Only for use by persistence infrastructure - */ - @Deprecated - protected CommentKey() {} - public CommentKey(String author, String company) { setAuthor(author); setCompany(company); diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/mapid/proxy/CassandraTemplateMapIdProxyDelegateIntegrationTests.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/mapid/proxy/CassandraTemplateMapIdProxyDelegateIntegrationTests.java index e7fa6b3b7..1bde946ce 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/mapid/proxy/CassandraTemplateMapIdProxyDelegateIntegrationTests.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/mapid/proxy/CassandraTemplateMapIdProxyDelegateIntegrationTests.java @@ -95,13 +95,6 @@ public class CassandraTemplateMapIdProxyDelegateIntegrationTests extends Abstrac @Column String value; - /** - * @deprecated for persistence use only - */ - @Deprecated - @SuppressWarnings("unused") - private SinglePkc() {} - public SinglePkc(String key) { setKey(key); } @@ -173,13 +166,6 @@ public class CassandraTemplateMapIdProxyDelegateIntegrationTests extends Abstrac @Column String value; - /** - * @deprecated for persistence use only - */ - @Deprecated - @SuppressWarnings("unused") - private MultiPkc() {} - public MultiPkc(String key0, String key1) { setKey0(key0); setKey1(key1); diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/mapid/repo/MultiPrimaryKeyColumns.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/mapid/repo/MultiPrimaryKeyColumns.java index a747f3a4d..ade1ae1a2 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/mapid/repo/MultiPrimaryKeyColumns.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/mapid/repo/MultiPrimaryKeyColumns.java @@ -32,13 +32,6 @@ public class MultiPrimaryKeyColumns { @Column String value; - /** - * @deprecated for persistence use only - */ - @Deprecated - @SuppressWarnings("unused") - private MultiPrimaryKeyColumns() {} - public MultiPrimaryKeyColumns(String key0, String key1) { setKey0(key0); setKey1(key1); diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/mapid/repo/SinglePrimaryKeyColumn.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/mapid/repo/SinglePrimaryKeyColumn.java index 34086f655..5dd8e6e33 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/mapid/repo/SinglePrimaryKeyColumn.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/mapid/repo/SinglePrimaryKeyColumn.java @@ -30,13 +30,6 @@ public class SinglePrimaryKeyColumn { @Column String value; - /** - * @deprecated for persistence use only - */ - @Deprecated - @SuppressWarnings("unused") - private SinglePrimaryKeyColumn() {} - public SinglePrimaryKeyColumn(String key) { setKey(key); } diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/mapid/template/CassandraTemplateMapIdIntegrationTest.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/mapid/template/CassandraTemplateMapIdIntegrationTest.java index dadf645ae..2389f3ae4 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/mapid/template/CassandraTemplateMapIdIntegrationTest.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/test/integration/mapping/mapid/template/CassandraTemplateMapIdIntegrationTest.java @@ -89,13 +89,6 @@ public class CassandraTemplateMapIdIntegrationTest extends AbstractKeyspaceCreat @Column String value; - /** - * @deprecated for persistence use only - */ - @Deprecated - @SuppressWarnings("unused") - private SinglePkc() {} - public SinglePkc(String key) { setKey(key); } @@ -157,13 +150,6 @@ public class CassandraTemplateMapIdIntegrationTest extends AbstractKeyspaceCreat @Column String value; - /** - * @deprecated for persistence use only - */ - @Deprecated - @SuppressWarnings("unused") - private MultiPkc() {} - public MultiPkc(String key0, String key1) { setKey0(key0); setKey1(key1);