refactor(spring-data-40): last refactoring

Author: nickkkccc

tarantool-spring-data/tarantool-spring-data-40/src/main/java/io/tarantool/spring/data40/query/TarantoolPartTreeQuery.java

@@ -26,8 +26,8 @@
 import org.springframework.data.repository.query.Parameters;
 import org.springframework.data.repository.query.ParametersParameterAccessor;
 import org.springframework.data.repository.query.QueryMethod;
-import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
 import org.springframework.data.repository.query.RepositoryQuery;
+import org.springframework.data.repository.query.ValueExpressionDelegate;
 import org.springframework.data.repository.query.parser.AbstractQueryCreator;
 import org.springframework.data.repository.query.parser.Part;
 import org.springframework.data.repository.query.parser.PartTree;
@@ -79,16 +79,15 @@ public class TarantoolPartTreeQuery extends KeyValuePartTreeQuery {
    * repository.
    *
    * @param queryMethod Method defined in Tarantool Repositories
-   * @param evaluationContextProvider Not used
    * @param keyValueOperations Interface to Tarantool
    * @param queryCreator Not used
    */
   public TarantoolPartTreeQuery(
       QueryMethod queryMethod,
-      QueryMethodEvaluationContextProvider evaluationContextProvider,
+      ValueExpressionDelegate valueExpressionDelegate,
       KeyValueOperations keyValueOperations,
       Class<? extends AbstractQueryCreator<?, ?>> queryCreator) {
-    super(queryMethod, evaluationContextProvider, keyValueOperations, queryCreator);
+    super(queryMethod, valueExpressionDelegate, keyValueOperations, queryCreator);
     this.queryMethod = queryMethod;
     this.keyValueOperations = keyValueOperations;
     this.isRearrangeKnown = false;

tarantool-spring-data/tarantool-spring-data-40/src/main/java/io/tarantool/spring/data40/repository/TarantoolRepositoryFactory.java

@@ -12,7 +12,7 @@
 import org.springframework.data.keyvalue.repository.support.KeyValueRepositoryFactory;
 import org.springframework.data.repository.core.RepositoryMetadata;
 import org.springframework.data.repository.query.QueryLookupStrategy;
-import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
+import org.springframework.data.repository.query.ValueExpressionDelegate;
 import org.springframework.data.repository.query.parser.AbstractQueryCreator;
 
 import io.tarantool.client.crud.TarantoolCrudClient;
@@ -68,10 +68,10 @@ public TarantoolRepositoryFactory(
    */
   @Override
   protected Optional<QueryLookupStrategy> getQueryLookupStrategy(
-      QueryLookupStrategy.Key key, QueryMethodEvaluationContextProvider evaluationContextProvider) {
+      QueryLookupStrategy.Key key, ValueExpressionDelegate valueExpressionDelegate) {
     return Optional.of(
         new TarantoolQueryLookupStrategy(
-            client, key, evaluationContextProvider, keyValueOperations, queryCreator));
+            client, key, valueExpressionDelegate, keyValueOperations, queryCreator));
   }
 
   @Override

tarantool-spring-data/tarantool-spring-data-40/src/main/java/io/tarantool/spring/data40/repository/config/TarantoolQueryLookupStrategy.java

@@ -13,8 +13,8 @@
 import org.springframework.data.repository.core.NamedQueries;
 import org.springframework.data.repository.core.RepositoryMetadata;
 import org.springframework.data.repository.query.QueryLookupStrategy;
-import org.springframework.data.repository.query.QueryMethodEvaluationContextProvider;
 import org.springframework.data.repository.query.RepositoryQuery;
+import org.springframework.data.repository.query.ValueExpressionDelegate;
 import org.springframework.data.repository.query.parser.AbstractQueryCreator;
 import org.springframework.util.Assert;
 
@@ -31,7 +31,7 @@
  */
 public class TarantoolQueryLookupStrategy implements QueryLookupStrategy {
 
-  private final QueryMethodEvaluationContextProvider evaluationContextProvider;
+  private final ValueExpressionDelegate valueExpressionDelegate;
   private final KeyValueOperations keyValueOperations;
   private final Class<? extends AbstractQueryCreator<?, ?>> queryCreator;
   private final TarantoolCrudClient client;
@@ -41,23 +41,22 @@ public class TarantoolQueryLookupStrategy implements QueryLookupStrategy {
    *
    * @param client tarantool crud client
    * @param key Not used
-   * @param evaluationContextProvider For evaluation of query expressions
    * @param keyValueOperations Bean to use for Key/Value operations on Tarantool repos
    * @param queryCreator Query creator
    */
   public TarantoolQueryLookupStrategy(
       TarantoolCrudClient client,
       Key key,
-      QueryMethodEvaluationContextProvider evaluationContextProvider,
+      ValueExpressionDelegate valueExpressionDelegate,
       KeyValueOperations keyValueOperations,
       Class<? extends AbstractQueryCreator<?, ?>> queryCreator) {
 
-    Assert.notNull(evaluationContextProvider, "EvaluationContextProvider must not be null!");
+    Assert.notNull(valueExpressionDelegate, "EvaluationContextProvider must not be null!");
     Assert.notNull(keyValueOperations, "KeyValueOperations must not be null!");
     Assert.notNull(queryCreator, "Query creator type must not be null!");
 
     this.client = client;
-    this.evaluationContextProvider = evaluationContextProvider;
+    this.valueExpressionDelegate = valueExpressionDelegate;
     this.keyValueOperations = keyValueOperations;
     this.queryCreator = queryCreator;
   }
@@ -85,6 +84,6 @@ public RepositoryQuery resolveQuery(
     }
 
     return new TarantoolPartTreeQuery(
-        queryMethod, evaluationContextProvider, this.keyValueOperations, this.queryCreator);
+        queryMethod, valueExpressionDelegate, this.keyValueOperations, this.queryCreator);
   }
 }