Skip to content

Commit f6a66ba

Browse files
committed
Prepare for removal of ListenableFuture.
Suppress warnings for using deprecated-for-removal code. Closes #1530
1 parent 2f07b82 commit f6a66ba

17 files changed

+16
-127
lines changed

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

Lines changed: 0 additions & 127 deletions
This file was deleted.

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,6 +51,7 @@
5151
* {@link org.springframework.data.cassandra.core.cql.AsyncCqlOperations}.
5252
*/
5353
@Deprecated(since = "4.0", forRemoval = true)
54+
@SuppressWarnings("removal")
5455
public interface AsyncCqlOperations {
5556

5657
// -------------------------------------------------------------------------

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,6 +89,7 @@
8989
* {@link org.springframework.data.cassandra.core.cql.AsyncCqlTemplate}.
9090
*/
9191
@Deprecated(since = "4.0", forRemoval = true)
92+
@SuppressWarnings("removal")
9293
public class AsyncCqlTemplate extends CassandraAccessor implements AsyncCqlOperations {
9394

9495
/**

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,7 @@
4848
*/
4949
@Deprecated(since = "4.0", forRemoval = true)
5050
@FunctionalInterface
51+
@SuppressWarnings("removal")
5152
public interface AsyncPreparedStatementCreator {
5253

5354
/**

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -46,6 +46,7 @@
4646
*/
4747
@Deprecated(since = "4.0", forRemoval = true)
4848
@FunctionalInterface
49+
@SuppressWarnings("removal")
4950
public interface AsyncResultSetExtractor<T> {
5051

5152
/**

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
* @since 4.0
3737
*/
3838
@Deprecated(since = "4.0", forRemoval = true)
39+
@SuppressWarnings("removal")
3940
class AsyncResultStream<T> {
4041

4142
private final AsyncResultSet resultSet;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -45,6 +45,7 @@
4545
* @deprecated since 4.0, use the {@link java.util.concurrent.CompletableFuture}-based variant.
4646
*/
4747
@Deprecated(since = "4.0", forRemoval = true)
48+
@SuppressWarnings("removal")
4849
public class AsyncRowMapperResultSetExtractor<T> implements AsyncResultSetExtractor<List<T>> {
4950

5051
private final RowMapper<T> rowMapper;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
*/
4040
@Deprecated(since = "4.0", forRemoval = true)
4141
@FunctionalInterface
42+
@SuppressWarnings("removal")
4243
public interface AsyncSessionCallback<T> {
4344

4445
/**

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
* @since 4.0
3838
*/
3939
@Deprecated(since = "4.0", forRemoval = true)
40+
@SuppressWarnings("removal")
4041
class ExceptionTranslatingListenableFutureAdapter<T> implements ListenableFuture<T> {
4142

4243
private final ListenableFuture<T> adaptee;

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -53,6 +53,7 @@
5353
* {@link org.springframework.data.cassandra.core.AsyncCassandraTemplate}.
5454
*/
5555
@Deprecated(since = "4.0", forRemoval = true)
56+
@SuppressWarnings("removal")
5657
public interface AsyncCassandraOperations {
5758

5859
/**

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@
131131
* {@link org.springframework.data.cassandra.core.AsyncCassandraTemplate}.
132132
*/
133133
@Deprecated(since = "4.0", forRemoval = true)
134+
@SuppressWarnings("removal")
134135
public class AsyncCassandraTemplate
135136
implements AsyncCassandraOperations, ApplicationEventPublisherAware, ApplicationContextAware {
136137

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -49,6 +49,7 @@
4949
* @since 4.0
5050
*/
5151
@Deprecated(since = "4.0", forRemoval = true)
52+
@SuppressWarnings("removal")
5253
class EntityOperations {
5354

5455
private final MappingContext<? extends CassandraPersistentEntity<?>, CassandraPersistentProperty> mappingContext;

spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/legacy/AsyncCqlTemplateIntegrationTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,7 @@
3535
*
3636
* @author Mark Paluch
3737
*/
38+
@SuppressWarnings("removal")
3839
class AsyncCqlTemplateIntegrationTests extends AbstractKeyspaceCreatingIntegrationTests {
3940

4041
private static final AtomicBoolean initialized = new AtomicBoolean();

spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/legacy/AsyncCqlTemplateUnitTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,7 @@
6464
*/
6565
@ExtendWith(MockitoExtension.class)
6666
@MockitoSettings(strictness = Strictness.LENIENT)
67+
@SuppressWarnings("removal")
6768
class AsyncCqlTemplateUnitTests {
6869

6970
@Mock CqlSession session;

spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/cql/legacy/AsyncResultStreamUnitTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
*
3737
* @author Mark Paluch
3838
*/
39+
@SuppressWarnings("removal")
3940
class AsyncResultStreamUnitTests {
4041

4142
private AsyncResultSet first = mock(AsyncResultSet.class);

spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/legacy/AsyncCassandraTemplateIntegrationTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@
5050
*
5151
* @author Mark Paluch
5252
*/
53+
@SuppressWarnings("removal")
5354
class AsyncCassandraTemplateIntegrationTests extends AbstractKeyspaceCreatingIntegrationTests {
5455

5556
private AsyncCassandraTemplate template;

spring-data-cassandra/src/test/java/org/springframework/data/cassandra/core/legacy/AsyncCassandraTemplateUnitTests.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@
7070
*/
7171
@ExtendWith(MockitoExtension.class)
7272
@MockitoSettings(strictness = Strictness.LENIENT)
73+
@SuppressWarnings("removal")
7374
class AsyncCassandraTemplateUnitTests {
7475

7576
@Mock CqlSession session;

0 commit comments

Comments
 (0)