DATADOC-137 - Repositories now correctly replace multiple placeholders in JSON based queries.

When annotation a repository method with e.g. @query("{ 'firstname' : ?0, 'lastname' : ?1 }") all placeholders get now replaced correctly. Added unit tests and fixed broken logging in StringBasedQueryCreator,

Author: odrotbohm

spring-data-mongodb/src/main/java/org/springframework/data/document/mongodb/repository/StringBasedMongoQuery.java

@@ -72,7 +72,7 @@ protected Query createQuery(ConvertingParameterAccessor accessor) {
 		}
 
 		if (LOG.isDebugEnabled()) {
-			LOG.debug(String.format("Created query {}", query.getQueryObject()));
+			LOG.debug(String.format("Created query %s", query.getQueryObject()));
 		}
 
 		return query;
@@ -86,7 +86,7 @@ private String replacePlaceholders(String input, ConvertingParameterAccessor acc
 		while (matcher.find()) {
 			String group = matcher.group();
 			int index = Integer.parseInt(matcher.group(1));
-			result = input.replace(group, getParameterWithIndex(accessor, index));
+			result = result.replace(group, getParameterWithIndex(accessor, index));
 		}
 
 		return result;

spring-data-mongodb/src/test/java/org/springframework/data/document/mongodb/repository/StringBasedMongoQueryUnitTests.java

@@ -92,12 +92,35 @@ public void bindsComplexPropertyCorrectly() throws Exception {
 		assertThat(query.getQueryObject(), is(reference.getQueryObject()));
 	}
 
+	@Test
+	public void bindsMultipleParametersCorrectly() throws SecurityException, NoSuchMethodException {
+		
+		Method method = SampleRepository.class.getMethod("findByLastnameAndAddress", String.class, Address.class);
+		MongoQueryMethod queryMethod = new MongoQueryMethod(method, metadata, creator);
+		StringBasedMongoQuery mongoQuery = new StringBasedMongoQuery(queryMethod, template);
+		
+		Address address = new Address("Foo", "0123", "Bar");
+		ConvertingParameterAccessor accesor = StubParameterAccessor.getAccessor(converter, "Matthews", address);
+		
+		DBObject addressDbObject = new BasicDBObject();
+		converter.write(address, addressDbObject);
+		
+		DBObject reference = new BasicDBObject("address", addressDbObject);
+		reference.put("lastname", "Matthews");
+
+		org.springframework.data.document.mongodb.query.Query query = mongoQuery.createQuery(accesor);
+		assertThat(query.getQueryObject(), is(reference));
+	}
+	
 	private interface SampleRepository {
 
 		@Query("{ 'lastname' : ?0 }")
 		Person findByLastname(String lastname);
 
 		@Query("{ 'address' : ?0 }")
 		Person findByAddress(Address address);
+		
+		@Query("{ 'lastname' : ?0, 'address' : ?1 }")
+		Person findByLastnameAndAddress(String lastname, Address address);
 	}
 }