DATAJPA-1267 - Polishing.

Tweak error messages. Make method static where possible. Typos.

Original pull request: #250.

Author: mp911de

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

@@ -233,7 +233,6 @@ private String parseParameterBindingsOfQueryIntoBindingsAndReturnCleanedQuery(St
 				List<ParameterBinding> bindings, Metadata queryMeta) {
 
 			int greatestParameterIndex = tryFindGreatestParameterIndexIn(query);
-
 			boolean parametersShouldBeAccessedByIndex = greatestParameterIndex != -1;
 
 			/*
@@ -267,7 +266,7 @@ private String parseParameterBindingsOfQueryIntoBindingsAndReturnCleanedQuery(St
 				String expression = spelExtractor.getParameter(parameterName == null ? parameterIndexString : parameterName);
 				String replacement = null;
 
-				Assert.isTrue(parameterIndexString != null || parameterName != null, "We need either a name or an index.");
+				Assert.isTrue(parameterIndexString != null || parameterName != null, () -> String.format("We need either a name or an index! Offending query string: %s", query));
 
 				expressionParameterIndex++;
 				if ("".equals(parameterIndexString)) {
@@ -279,7 +278,7 @@ private String parseParameterBindingsOfQueryIntoBindingsAndReturnCleanedQuery(St
 				}
 
 				if (usesJpaStyleParameters && queryMeta.usesJdbcStyleParameters) {
-					throw new IllegalArgumentException("Mixing of ? parameters and other forms like ?1 is not supported");
+					throw new IllegalArgumentException("Mixing of ? parameters and other forms like ?1 is not supported!");
 				}
 
 				switch (ParameterBindingType.of(typeSource)) {
@@ -325,7 +324,7 @@ private String parseParameterBindingsOfQueryIntoBindingsAndReturnCleanedQuery(St
 			return resultingQuery;
 		}
 
-		private SpelExtractor createSpelExtractor(String queryWithSpel, boolean parametersShouldBeAccessedByIndex,
+		private static SpelExtractor createSpelExtractor(String queryWithSpel, boolean parametersShouldBeAccessedByIndex,
 				int greatestParameterIndex) {
 
 			/*
@@ -345,7 +344,7 @@ private SpelExtractor createSpelExtractor(String queryWithSpel, boolean paramete
 			return SpelQueryContext.of(indexToParameterName, parameterNameToReplacement).parse(queryWithSpel);
 		}
 
-		private String replaceFirst(String text, String substring, String replacement) {
+		private static String replaceFirst(String text, String substring, String replacement) {
 
 			int index = text.indexOf(substring);
 			if (index < 0) {
@@ -356,15 +355,15 @@ private String replaceFirst(String text, String substring, String replacement) {
 		}
 
 		@Nullable
-		private Integer getParameterIndex(@Nullable String parameterIndexString) {
+		private static Integer getParameterIndex(@Nullable String parameterIndexString) {
 
 			if (parameterIndexString == null || parameterIndexString.isEmpty()) {
 				return null;
 			}
 			return Integer.valueOf(parameterIndexString);
 		}
 
-		private int tryFindGreatestParameterIndexIn(String query) {
+		private static int tryFindGreatestParameterIndexIn(String query) {
 
 			Matcher parameterIndexMatcher = PARAMETER_BINDING_BY_INDEX.matcher(query);
 
@@ -440,7 +439,6 @@ static ParameterBindingType of(String typeSource) {
 				throw new IllegalArgumentException(String.format("Unsupported parameter binding type %s!", typeSource));
 			}
 		}
-
 	}
 
 	/**

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

@@ -27,7 +27,7 @@
 public class ParameterBindingParserUnitTests {
 
 	@Test // DATAJPA-1200
-	public void idenficationOfParameters() {
+	public void identificationOfParameters() {
 
 		SoftAssertions softly = new SoftAssertions();
 
@@ -63,7 +63,7 @@ public void idenficationOfParameters() {
 		softly.assertAll();
 	}
 
-	public void checkHasParameter(SoftAssertions softly, String query, boolean containsParameter, String label) {
+	private void checkHasParameter(SoftAssertions softly, String query, boolean containsParameter, String label) {
 
 		StringQuery stringQuery = new StringQuery(query);