DATAES-552 - @query annotation fail when passing over 10 parameters

Updated the replacePlaceholders methods to use replaceFirst to prevent duplication substitutions.

Original Pull Request: spring-projects#267

Author: Taylor

src/main/java/org/springframework/data/elasticsearch/repository/query/ElasticsearchStringQuery.java

@@ -32,6 +32,7 @@
  * @author Rizwan Idrees
  * @author Mohsin Husen
  * @author Mark Paluch
+ * @author Taylor Ono
  */
 public class ElasticsearchStringQuery extends AbstractElasticsearchRepositoryQuery {
 
@@ -86,8 +87,9 @@ private String replacePlaceholders(String input, ParametersParameterAccessor acc
 		String result = input;
 		while (matcher.find()) {
 			String group = matcher.group();
+			group = "\\" + group;
 			int index = Integer.parseInt(matcher.group(1));
-			result = result.replace(group, getParameterWithIndex(accessor, index));
+			result = result.replaceFirst(group, getParameterWithIndex(accessor, index));
 		}
 		return result;
 	}

src/main/java/org/springframework/data/elasticsearch/repository/query/ReactiveElasticsearchStringQuery.java

@@ -26,6 +26,7 @@
 
 /**
  * @author Christoph Strobl
+ * @author Taylor Ono
  * @since 3.2
  */
 public class ReactiveElasticsearchStringQuery extends AbstractReactiveElasticsearchRepositoryQuery {
@@ -60,8 +61,9 @@ private String replacePlaceholders(String input, ElasticsearchParameterAccessor
 		String result = input;
 		while (matcher.find()) {
 			String group = matcher.group();
+			group = "\\" + group;
 			int index = Integer.parseInt(matcher.group(1));
-			result = result.replace(group, getParameterWithIndex(accessor, index));
+			result = result.replaceFirst(group, getParameterWithIndex(accessor, index));
 		}
 		return result;
 	}

src/test/java/org/springframework/data/elasticsearch/repository/query/ReactiveElasticsearchStringQueryUnitTests.java

@@ -87,6 +87,20 @@ public void bindsExpressionPropertyCorrectly() throws Exception {
 		assertThat(((StringQuery) query).getSource()).isEqualTo(reference.getSource());
 	}
 
+	@Test // DATAES-552
+	public void shouldReplaceLotsOfParametersCorrectly() throws Exception {
+
+		ReactiveElasticsearchStringQuery elasticsearchStringQuery = createQueryForMethod("findWithQuiteSomeParameters",
+				String.class, String.class, String.class, String.class, String.class, String.class, String.class, String.class,
+				String.class, String.class, String.class, String.class);
+		StubParameterAccessor accesor = new StubParameterAccessor("a", "b", "c", "d", "e", "f", "g", "h", "i", "j", "k",
+				"l");
+		org.springframework.data.elasticsearch.core.query.Query query = elasticsearchStringQuery.createQuery(accesor);
+		StringQuery reference = new StringQuery("name:(a, b, c, d, e, f, g, h, i, j, k, l)");
+		assertThat(query).isInstanceOf(StringQuery.class);
+		assertThat(((StringQuery) query).getSource()).isEqualTo(reference.getSource());
+	}
+
 	private ReactiveElasticsearchStringQuery createQueryForMethod(String name, Class<?>... parameters) throws Exception {
 
 		Method method = SampleRepository.class.getMethod(name, parameters);
@@ -104,5 +118,9 @@ private interface SampleRepository extends Repository<Person, String> {
 
 		@Query("{ 'bool' : { 'must' : { 'term' : { 'name' : '?#{[0]}' } } } }")
 		Flux<Person> findByNameWithExpression(String param0);
+
+		@Query(value = "name:(?0, ?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11)")
+		Person findWithQuiteSomeParameters(String arg0, String arg1, String arg2, String arg3, String arg4, String arg5,
+				String arg6, String arg7, String arg8, String arg9, String arg10, String arg11);
 	}
 }