From c8d38a62cd050c50a273e1ac27d613bf48c77680 Mon Sep 17 00:00:00 2001 From: Mark Paluch Date: Fri, 26 Jul 2019 09:14:45 +0200 Subject: [PATCH] DATACASS-677 - Adapt to API changes in Commons. --- .../query/CassandraParametersParameterAccessor.java | 9 +-------- .../repository/query/ConvertingParameterAccessor.java | 9 +++++++++ .../repository/query/StubParameterAccessor.java | 6 ++++++ 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraParametersParameterAccessor.java b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraParametersParameterAccessor.java index 21b09e84d..faa08d438 100644 --- a/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraParametersParameterAccessor.java +++ b/spring-data-cassandra/src/main/java/org/springframework/data/cassandra/repository/query/CassandraParametersParameterAccessor.java @@ -15,9 +15,6 @@ */ package org.springframework.data.cassandra.repository.query; -import java.util.Arrays; -import java.util.List; - import org.springframework.data.cassandra.core.cql.QueryOptions; import org.springframework.data.cassandra.core.mapping.CassandraSimpleTypeHolder; import org.springframework.data.cassandra.core.mapping.CassandraType; @@ -38,8 +35,6 @@ import com.datastax.driver.core.DataType; public class CassandraParametersParameterAccessor extends ParametersParameterAccessor implements CassandraParameterAccessor { - private final List values; - /** * Create a new {@link CassandraParametersParameterAccessor}. * @@ -49,8 +44,6 @@ public class CassandraParametersParameterAccessor extends ParametersParameterAcc public CassandraParametersParameterAccessor(CassandraQueryMethod method, Object... values) { super(method.getParameters(), values); - - this.values = Arrays.asList(values); } /* @@ -95,7 +88,7 @@ public class CassandraParametersParameterAccessor extends ParametersParameterAcc */ @Override public Object[] getValues() { - return this.values.toArray(); + return super.getValues(); } /* (non-Javadoc) 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 c9ba4da90..b6c8c35ae 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 @@ -86,6 +86,15 @@ class ConvertingParameterAccessor implements CassandraParameterAccessor { return this.delegate.getDynamicProjection(); } + /* (non-Javadoc) + * @see org.springframework.data.repository.query.ParameterAccessor#findDynamicProjection() + */ + @Nullable + @Override + public Class findDynamicProjection() { + return this.delegate.findDynamicProjection(); + } + /* (non-Javadoc) * @see org.springframework.data.repository.query.ParameterAccessor#getBindableValue(int) */ 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 7009e3a7e..cba848022 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 @@ -88,6 +88,12 @@ class StubParameterAccessor implements CassandraParameterAccessor { return Optional.empty(); } + @Nullable + @Override + public Class findDynamicProjection() { + return null; + } + @Override public Object getBindableValue(int index) { return values[index];