From 03c4ef9553bfaac6f2fd382d25f0ffd030119415 Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 20 Sep 2021 20:00:21 -0700 Subject: [PATCH] Adapt to API changes in Spring Data Commons 3.0. See #1170. --- .../convert/AnnotatedCassandraConstructorProperty.java | 5 ----- .../core/convert/CassandraConstructorProperty.java | 5 ----- .../cassandra/core/mapping/EmbeddedEntityOperations.java | 5 ----- .../repository/query/ConvertingParameterAccessor.java | 9 --------- .../repository/query/StubParameterAccessor.java | 7 ------- 5 files changed, 31 deletions(-) diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/AnnotatedCassandraConstructorProperty.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/AnnotatedCassandraConstructorProperty.java index aaa7bd61a..55ae73890 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/AnnotatedCassandraConstructorProperty.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/AnnotatedCassandraConstructorProperty.java @@ -145,11 +145,6 @@ class AnnotatedCassandraConstructorProperty implements CassandraPersistentProper return delegate.getTypeInformation(); } - @Override - public Iterable> getPersistentEntityTypes() { - return delegate.getPersistentEntityTypes(); - } - @Override @Nullable public Method getGetter() { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraConstructorProperty.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraConstructorProperty.java index 1ec9b28a3..734e03f7b 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraConstructorProperty.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/convert/CassandraConstructorProperty.java @@ -134,11 +134,6 @@ class CassandraConstructorProperty implements CassandraPersistentProperty { return typeInformation; } - @Override - public Iterable> getPersistentEntityTypes() { - return Collections.emptyList(); - } - @Nullable @Override public Method getGetter() { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/EmbeddedEntityOperations.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/EmbeddedEntityOperations.java index 57042e008..e8f4bf5ce 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/EmbeddedEntityOperations.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/core/mapping/EmbeddedEntityOperations.java @@ -440,11 +440,6 @@ public class EmbeddedEntityOperations { return delegate.getTypeInformation(); } - @Override - public Iterable> getPersistentEntityTypes() { - return delegate.getPersistentEntityTypes(); - } - @Override @org.springframework.lang.Nullable public Method getGetter() { diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ConvertingParameterAccessor.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ConvertingParameterAccessor.java index e12943365..18e265f0a 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ConvertingParameterAccessor.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/ConvertingParameterAccessor.java @@ -17,7 +17,6 @@ package org.springframework.data.cassandra.repository.query; import java.util.Collection; import java.util.Iterator; -import java.util.Optional; import org.springframework.data.cassandra.core.convert.CassandraConverter; import org.springframework.data.cassandra.core.cql.QueryOptions; @@ -66,14 +65,6 @@ class ConvertingParameterAccessor implements CassandraParameterAccessor { return this.delegate.getSort(); } - /* (non-Javadoc) - * @see org.springframework.data.repository.query.ParameterAccessor#getDynamicProjection() - */ - @Override - public Optional> getDynamicProjection() { - return this.delegate.getDynamicProjection(); - } - /* (non-Javadoc) * @see org.springframework.data.repository.query.ParameterAccessor#findDynamicProjection() */ diff --git a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/StubParameterAccessor.java b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/StubParameterAccessor.java index 57cf6dfc3..66e3cee04 100644 --- a/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/StubParameterAccessor.java +++ b/spring-data-cassandra/src/test/java/org/springframework/data/cassandra/repository/query/StubParameterAccessor.java @@ -17,7 +17,6 @@ package org.springframework.data.cassandra.repository.query; import java.util.Arrays; import java.util.Iterator; -import java.util.Optional; import org.springframework.data.cassandra.core.convert.CassandraConverter; import org.springframework.data.cassandra.core.cql.QueryOptions; @@ -51,7 +50,6 @@ class StubParameterAccessor implements CassandraParameterAccessor { return new ConvertingParameterAccessor(converter, new StubParameterAccessor(parameters)); } - @SuppressWarnings("unchecked") private StubParameterAccessor(Object... values) { this.values = values; } @@ -82,11 +80,6 @@ class StubParameterAccessor implements CassandraParameterAccessor { return null; } - @Override - public Optional> getDynamicProjection() { - return Optional.empty(); - } - @Nullable @Override public Class findDynamicProjection() {