DATAJPA-1267 - Polishing.

Adapt to polished API for DATACMNS-1258.

Related tickets: DATACMNS-1258.

Author: odrotbohm

src/main/java/org/springframework/data/jpa/repository/query/StringQuery.java

@@ -27,9 +27,9 @@
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import org.springframework.data.repository.query.SpelQueryContext;
+import org.springframework.data.repository.query.SpelQueryContext.SpelExtractor;
 import org.springframework.data.repository.query.parser.Part.Type;
-import org.springframework.data.repository.query.parser.QuotationMap;
-import org.springframework.data.repository.query.parser.SpelQueryContext;
 import org.springframework.lang.Nullable;
 import org.springframework.util.Assert;
 import org.springframework.util.ObjectUtils;
@@ -202,26 +202,22 @@ enum ParameterBindingParser {
 		private String parseParameterBindingsOfQueryIntoBindingsAndReturnCleanedQuery(String query,
 				List<ParameterBinding> bindings) {
 
-			SpelQueryContext.SpelExtractor spelExtractor = createSpelExtractor(query);
+			SpelExtractor spelExtractor = createSpelExtractor(query);
 
-			String resultingQuery = spelExtractor.query();
-
-			Matcher matcher = PARAMETER_BINDING_PATTERN.matcher(spelExtractor.query());
-
-			QuotationMap quotationMap = new QuotationMap(spelExtractor.query());
+			String resultingQuery = spelExtractor.getQueryString();
+			Matcher matcher = PARAMETER_BINDING_PATTERN.matcher(resultingQuery);
 
 			while (matcher.find()) {
 
-				if (quotationMap.isQuoted(matcher.start())) {
+				if (spelExtractor.isQuoted(matcher.start())) {
 					continue;
 				}
 
 				String parameterIndexString = matcher.group(INDEXED_PARAMETER_GROUP);
 				String parameterName = parameterIndexString != null ? null : matcher.group(NAMED_PARAMETER_GROUP);
 				Integer parameterIndex = parameterIndexString == null ? null : Integer.valueOf(parameterIndexString);
 				String typeSource = matcher.group(COMPARISION_TYPE_GROUP);
-				String expression = spelExtractor.parameterNameToSpelMap()
-						.get(parameterName == null ? parameterIndexString : parameterName);
+				String expression = spelExtractor.getParameter(parameterName == null ? parameterIndexString : parameterName);
 				String replacement = null;
 
 				Assert.isTrue(parameterIndex != null || parameterName != null, "We need either a name or an index.");
@@ -269,7 +265,8 @@ private String parseParameterBindingsOfQueryIntoBindingsAndReturnCleanedQuery(St
 			return resultingQuery;
 		}
 
-		private SpelQueryContext.SpelExtractor createSpelExtractor(String queryWithSpel) {
+		private SpelExtractor createSpelExtractor(String queryWithSpel) {
+
 			int greatestParameterIndex = tryFindGreatestParameterIndexIn(queryWithSpel);
 
 			boolean parametersShouldBeAccessedByIndex = greatestParameterIndex != -1;
@@ -296,7 +293,7 @@ private SpelQueryContext.SpelExtractor createSpelExtractor(String queryWithSpel)
 
 			BiFunction<String, String, String> parameterNameToReplacement = (prefix, name) -> fixedPrefix + name;
 
-			return new SpelQueryContext(indexToParameterName, parameterNameToReplacement).parse(queryWithSpel);
+			return SpelQueryContext.of(indexToParameterName, parameterNameToReplacement).parse(queryWithSpel);
 		}
 
 		private String replaceFirst(String text, String substring, String replacement) {
@@ -322,13 +319,11 @@ private int tryFindGreatestParameterIndexIn(String query) {
 			return greatestParameterIndex;
 		}
 
-		private void checkAndRegister(ParameterBinding binding, List<ParameterBinding> bindings) {
+		private static void checkAndRegister(ParameterBinding binding, List<ParameterBinding> bindings) {
 
-			for (ParameterBinding existing : bindings) {
-				if (existing.hasName(binding.getName()) || existing.hasPosition(binding.getPosition())) {
-					Assert.isTrue(existing.equals(binding), String.format(MESSAGE, existing, binding));
-				}
-			}
+			bindings.stream() //
+					.filter(it -> it.hasName(binding.getName()) || it.hasPosition(binding.getPosition())) //
+					.forEach(it -> Assert.isTrue(it.equals(binding), String.format(MESSAGE, it, binding)));
 
 			if (!bindings.contains(binding)) {
 				bindings.add(binding);

src/test/java/org/springframework/data/jpa/repository/query/ParameterBindingParserUnitTests.java

@@ -15,12 +15,8 @@
  */
 package org.springframework.data.jpa.repository.query;
 
-import java.util.ArrayList;
-import java.util.List;
-
 import org.assertj.core.api.SoftAssertions;
 import org.junit.Test;
-import org.springframework.data.jpa.repository.query.StringQuery.ParameterBinding;
 import org.springframework.data.jpa.repository.query.StringQuery.ParameterBindingParser;
 
 /**