From dd004002e9df05fb58cd243548157e294e16e347 Mon Sep 17 00:00:00 2001 From: John Blum Date: Mon, 14 May 2018 08:51:20 -0700 Subject: [PATCH] DATAGEODE-106 - Adapt to SpEL Extension API changes in Spring Data Commons. --- .../repository/support/GemfireRepositoryFactory.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactory.java b/src/main/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactory.java index 87b0b4ae..70d63cd0 100644 --- a/src/main/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactory.java +++ b/src/main/java/org/springframework/data/gemfire/repository/support/GemfireRepositoryFactory.java @@ -23,7 +23,6 @@ import java.lang.reflect.Method; import java.util.Optional; import org.apache.geode.cache.Region; -import org.springframework.context.ApplicationContext; import org.springframework.data.gemfire.GemfireTemplate; import org.springframework.data.gemfire.mapping.GemfirePersistentEntity; import org.springframework.data.gemfire.mapping.GemfirePersistentProperty; @@ -40,10 +39,10 @@ import org.springframework.data.repository.core.NamedQueries; import org.springframework.data.repository.core.RepositoryInformation; import org.springframework.data.repository.core.RepositoryMetadata; import org.springframework.data.repository.core.support.RepositoryFactorySupport; -import org.springframework.data.repository.query.EvaluationContextProvider; import org.springframework.data.repository.query.QueryLookupStrategy; import org.springframework.data.repository.query.QueryLookupStrategy.Key; import org.springframework.data.repository.query.QueryMethod; +import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider; import org.springframework.lang.NonNull; import org.springframework.lang.Nullable; import org.springframework.util.Assert; @@ -249,7 +248,7 @@ public class GemfireRepositoryFactory extends RepositoryFactorySupport { */ @Override protected Optional getQueryLookupStrategy(Key key, - EvaluationContextProvider evaluationContextProvider) { + QueryMethodEvaluationContextProvider evaluationContextProvider) { return Optional.of((Method method, RepositoryMetadata repositoryMetadata, ProjectionFactory projectionFactory, NamedQueries namedQueries) -> { @@ -276,7 +275,7 @@ public class GemfireRepositoryFactory extends RepositoryFactorySupport { @SuppressWarnings({ "unchecked", "unused" }) protected T newQueryMethod(Method method, RepositoryMetadata repositoryMetadata, - ProjectionFactory projectionFactory, EvaluationContextProvider evaluationContextProvider) { + ProjectionFactory projectionFactory, QueryMethodEvaluationContextProvider evaluationContextProvider) { return (T) new GemfireQueryMethod(method, repositoryMetadata, projectionFactory, getMappingContext()); }