Release version 4.2.3 (2021.0.3).

See #1850

pom.xml

@@ -5,12 +5,12 @@
 
 	<groupId>org.springframework.data</groupId>
 	<artifactId>spring-data-elasticsearch</artifactId>
-	<version>4.2.2</version>
+	<version>4.2.3</version>
 
 	<parent>
 		<groupId>org.springframework.data.build</groupId>
 		<artifactId>spring-data-parent</artifactId>
-		<version>2.5.2</version>
+		<version>2.5.3</version>
 	</parent>
 
 	<name>Spring Data Elasticsearch</name>
@@ -22,7 +22,7 @@
 		<elasticsearch>7.12.1</elasticsearch>
 		<log4j>2.13.3</log4j>
 		<netty>4.1.52.Final</netty>
-		<springdata.commons>2.5.2</springdata.commons>
+		<springdata.commons>2.5.3</springdata.commons>
 		<testcontainers>1.15.1</testcontainers>
 		<java-module-name>spring.data.elasticsearch</java-module-name>
 	</properties>

src/main/java/org/springframework/data/elasticsearch/core/join/JoinField.java

@@ -15,10 +15,14 @@
  */
 package org.springframework.data.elasticsearch.core.join;
 
+import java.util.Objects;
+
+import org.springframework.data.annotation.PersistenceConstructor;
 import org.springframework.lang.Nullable;
 
 /**
  * @author Subhobrata Dey
+ * @author Sascha Woo
  * @since 4.1
  */
 public class JoinField<ID> {
@@ -35,6 +39,7 @@ public class JoinField<ID> {
 		this(name, null);
 	}
 
+	@PersistenceConstructor
 	public JoinField(String name, @Nullable ID parent) {
 		this.name = name;
 		this.parent = parent;
@@ -52,4 +57,21 @@ public class JoinField<ID> {
 	public String getName() {
 		return name;
 	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(name, parent);
+	}
+
+	@Override
+	public boolean equals(Object obj) {
+		if (this == obj) {
+			return true;
+		}
+		if (!(obj instanceof JoinField)) {
+			return false;
+		}
+		JoinField other = (JoinField) obj;
+		return Objects.equals(name, other.name) && Objects.equals(parent, other.parent);
+	}
 }

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

@@ -105,7 +105,8 @@ public class ElasticsearchStringQuery extends AbstractElasticsearchRepositoryQue
 	}
 
 	protected StringQuery createQuery(ParametersParameterAccessor parameterAccessor) {
-		String queryString = StringQueryUtil.replacePlaceholders(this.query, parameterAccessor);
+		String queryString = new StringQueryUtil(elasticsearchOperations.getElasticsearchConverter().getConversionService())
+				.replacePlaceholders(this.query, parameterAccessor);
 		return new StringQuery(queryString);
 	}
 

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

@@ -47,7 +47,9 @@ public class ReactiveElasticsearchStringQuery extends AbstractReactiveElasticsea
 
 	@Override
 	protected StringQuery createQuery(ElasticsearchParameterAccessor parameterAccessor) {
-		String queryString = StringQueryUtil.replacePlaceholders(this.query, parameterAccessor);
+		String queryString = new StringQueryUtil(
+				getElasticsearchOperations().getElasticsearchConverter().getConversionService()).replacePlaceholders(this.query,
+						parameterAccessor);
 		return new StringQuery(queryString);
 	}
 

src/main/java/org/springframework/data/elasticsearch/repository/support/StringQueryUtil.java

@@ -15,41 +15,59 @@
  */
 package org.springframework.data.elasticsearch.repository.support;
 
+import java.util.Collection;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
+import java.util.stream.Collectors;
 
+import org.springframework.core.convert.ConversionService;
 import org.springframework.core.convert.support.GenericConversionService;
 import org.springframework.data.elasticsearch.core.convert.DateTimeConverters;
 import org.springframework.data.elasticsearch.repository.query.ElasticsearchStringQuery;
 import org.springframework.data.repository.query.ParameterAccessor;
+import org.springframework.util.Assert;
 import org.springframework.util.ClassUtils;
 import org.springframework.util.NumberUtils;
 
 /**
  * @author Peter-Josef Meisch
+ * @author Niklas Herder
  */
 final public class StringQueryUtil {
 
 	private static final Pattern PARAMETER_PLACEHOLDER = Pattern.compile("\\?(\\d+)");
-	private static final GenericConversionService conversionService = new GenericConversionService();
 
-    {
-        if (!conversionService.canConvert(java.util.Date.class, String.class)) {
-            conversionService.addConverter(DateTimeConverters.JavaDateConverter.INSTANCE);
-        }
-        if (ClassUtils.isPresent("org.joda.time.DateTimeZone", ElasticsearchStringQuery.class.getClassLoader())) {
-            if (!conversionService.canConvert(org.joda.time.ReadableInstant.class, String.class)) {
-                conversionService.addConverter(DateTimeConverters.JodaDateTimeConverter.INSTANCE);
-            }
-            if (!conversionService.canConvert(org.joda.time.LocalDateTime.class, String.class)) {
-                conversionService.addConverter(DateTimeConverters.JodaLocalDateTimeConverter.INSTANCE);
-            }
-        }
-    }
+	private final ConversionService conversionService;
+	private final GenericConversionService genericConversionService;
 
-    private StringQueryUtil() {}
+	public StringQueryUtil(ConversionService conversionService) {
 
-	public static String replacePlaceholders(String input, ParameterAccessor accessor) {
+		Assert.notNull(conversionService, "conversionService must not be null");
+
+		this.conversionService = conversionService;
+		genericConversionService = setupGenericConversionService();
+	}
+
+	private GenericConversionService setupGenericConversionService() {
+
+		GenericConversionService genericConversionService = new GenericConversionService();
+
+		if (!genericConversionService.canConvert(java.util.Date.class, String.class)) {
+			genericConversionService.addConverter(DateTimeConverters.JavaDateConverter.INSTANCE);
+		}
+
+		if (ClassUtils.isPresent("org.joda.time.DateTimeZone", ElasticsearchStringQuery.class.getClassLoader())) {
+			if (!genericConversionService.canConvert(org.joda.time.ReadableInstant.class, String.class)) {
+				genericConversionService.addConverter(DateTimeConverters.JodaDateTimeConverter.INSTANCE);
+			}
+			if (!genericConversionService.canConvert(org.joda.time.LocalDateTime.class, String.class)) {
+				genericConversionService.addConverter(DateTimeConverters.JodaLocalDateTimeConverter.INSTANCE);
+			}
+		}
+		return genericConversionService;
+	}
+
+	public String replacePlaceholders(String input, ParameterAccessor accessor) {
 
 		Matcher matcher = PARAMETER_PLACEHOLDER.matcher(input);
 		String result = input;
@@ -62,7 +80,7 @@ final public class StringQueryUtil {
 		return result;
 	}
 
-	private static String getParameterWithIndex(ParameterAccessor accessor, int index) {
+	private String getParameterWithIndex(ParameterAccessor accessor, int index) {
 
 		Object parameter = accessor.getBindableValue(index);
 		String parameterValue = "null";
@@ -70,20 +88,48 @@ final public class StringQueryUtil {
 		// noinspection ConstantConditions
 		if (parameter != null) {
 
+			parameterValue = convert(parameter);
+		}
+
+		return parameterValue;
+
+	}
+
+	private String convert(Object parameter) {
+		if (Collection.class.isAssignableFrom(parameter.getClass())) {
+			Collection<?> collectionParam = (Collection<?>) parameter;
+			StringBuilder sb = new StringBuilder("[");
+			sb.append(collectionParam.stream().map(o -> {
+				if (o instanceof String) {
+					return "\"" + convert(o) + "\"";
+				} else {
+					return convert(o);
+				}
+			}).collect(Collectors.joining(",")));
+			sb.append("]");
+			return sb.toString();
+		} else {
+			String parameterValue = "null";
 			if (conversionService.canConvert(parameter.getClass(), String.class)) {
 				String converted = conversionService.convert(parameter, String.class);
 
 				if (converted != null) {
 					parameterValue = converted;
 				}
+			} else if (genericConversionService.canConvert(parameter.getClass(), String.class)) {
+				String converted = genericConversionService.convert(parameter, String.class);
+
+				if (converted != null) {
+					parameterValue = converted;
+
+				}
 			} else {
 				parameterValue = parameter.toString();
 			}
+
+			parameterValue = parameterValue.replaceAll("\"", Matcher.quoteReplacement("\\\""));
+			return parameterValue;
 		}
-
-		parameterValue = parameterValue.replaceAll("\"", Matcher.quoteReplacement("\\\""));
-		return parameterValue;
-
 	}
 
 }

src/main/resources/changelog.txt

@@ -1,6 +1,13 @@
 Spring Data Elasticsearch Changelog
 ===================================
 
+Changes in version 4.2.3 (2021-07-16)
+-------------------------------------
+* #1866 - Queries defined with `@Query` are not using registered converters for parameter conversion.
+* #1858 - Collection parameters for @Query-annotated methods get escaped wrongly.
+* #1846 - Missing hashCode and equals methods in JoinField.
+
+
 Changes in version 4.2.2 (2021-06-22)
 -------------------------------------
 * #1834 - TopMetricsAggregation NamedObjectNotFoundException: unknown field [top_metrics].
@@ -1637,5 +1644,6 @@ Release Notes - Spring Data Elasticsearch - Version 1.0 M1 (2014-02-07)
 
 
 
+
 
 

src/main/resources/notice.txt

@@ -1,4 +1,4 @@
-Spring Data Elasticsearch 4.2.2 (2021.0.2)
+Spring Data Elasticsearch 4.2.3 (2021.0.3)
 Copyright (c) [2013-2021] Pivotal Software, Inc.
 
 This product is licensed to you under the Apache License, Version 2.0 (the "License").
@@ -27,5 +27,6 @@ conditions of the subcomponent's license, as noted in the LICENSE file.
 
 
 
+
 
 

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

@@ -0,0 +1,78 @@
+/*
+ * Copyright 2021 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      https://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.springframework.data.elasticsearch.repository.query;
+
+import java.util.ArrayList;
+import java.util.Collection;
+
+import org.springframework.core.convert.converter.Converter;
+import org.springframework.data.convert.CustomConversions;
+import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
+import org.springframework.data.elasticsearch.core.convert.ElasticsearchCustomConversions;
+import org.springframework.data.elasticsearch.core.convert.MappingElasticsearchConverter;
+import org.springframework.data.elasticsearch.core.mapping.SimpleElasticsearchMappingContext;
+import org.springframework.lang.Nullable;
+
+/**
+ * @author Peter-Josef Meisch
+ */
+public class ElasticsearchStringQueryUnitTestBase {
+
+	protected ElasticsearchConverter setupConverter() {
+		MappingElasticsearchConverter converter = new MappingElasticsearchConverter(
+				new SimpleElasticsearchMappingContext());
+		Collection<Converter<?, ?>> converters = new ArrayList<>();
+		converters.add(ElasticsearchStringQueryUnitTests.CarConverter.INSTANCE);
+		CustomConversions customConversions = new ElasticsearchCustomConversions(converters);
+		converter.setConversions(customConversions);
+		converter.afterPropertiesSet();
+		return converter;
+	}
+
+	static class Car {
+		@Nullable private String name;
+		@Nullable private String model;
+
+		@Nullable
+		public String getName() {
+			return name;
+		}
+
+		public void setName(@Nullable String name) {
+			this.name = name;
+		}
+
+		@Nullable
+		public String getModel() {
+			return model;
+		}
+
+		public void setModel(@Nullable String model) {
+			this.model = model;
+		}
+	}
+
+	enum CarConverter implements Converter<Car, String> {
+		INSTANCE;
+
+		@Override
+		public String convert(ElasticsearchStringQueryUnitTests.Car car) {
+			return (car.getName() != null ? car.getName() : "null") + '-'
+					+ (car.getModel() != null ? car.getModel() : "null");
+		}
+	}
+
+}

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

@@ -16,8 +16,10 @@
 package org.springframework.data.elasticsearch.repository.query;
 
 import static org.assertj.core.api.Assertions.*;
+import static org.mockito.Mockito.*;
 
 import java.lang.reflect.Method;
+import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.Collection;
 import java.util.HashMap;
@@ -39,9 +41,6 @@ import org.springframework.data.elasticsearch.annotations.MultiField;
 import org.springframework.data.elasticsearch.annotations.Query;
 import org.springframework.data.elasticsearch.core.ElasticsearchOperations;
 import org.springframework.data.elasticsearch.core.SearchHits;
-import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
-import org.springframework.data.elasticsearch.core.convert.MappingElasticsearchConverter;
-import org.springframework.data.elasticsearch.core.mapping.SimpleElasticsearchMappingContext;
 import org.springframework.data.elasticsearch.core.query.StringQuery;
 import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
 import org.springframework.data.repository.Repository;
@@ -51,16 +50,16 @@ import org.springframework.lang.Nullable;
 /**
  * @author Christoph Strobl
  * @author Peter-Josef Meisch
+ * @author Niklas Herder
  */
 @ExtendWith(MockitoExtension.class)
-public class ElasticsearchStringQueryUnitTests {
+public class ElasticsearchStringQueryUnitTests extends ElasticsearchStringQueryUnitTestBase {
 
 	@Mock ElasticsearchOperations operations;
-	ElasticsearchConverter converter;
 
 	@BeforeEach
 	public void setUp() {
-		converter = new MappingElasticsearchConverter(new SimpleElasticsearchMappingContext());
+		when(operations.getElasticsearchConverter()).thenReturn(setupConverter());
 	}
 
 	@Test // DATAES-552
@@ -95,7 +94,42 @@ public class ElasticsearchStringQueryUnitTests {
 				.isEqualTo("{\"bool\":{\"must\": [{\"match\": {\"prefix\": {\"name\" : \"hello \\\"Stranger\\\"\"}}]}}");
 	}
 
-	private org.springframework.data.elasticsearch.core.query.Query createQuery(String methodName, String... args)
+	@Test // #1858
+	@DisplayName("should only quote String query parameters")
+	void shouldOnlyEscapeStringQueryParameters() throws Exception {
+		org.springframework.data.elasticsearch.core.query.Query query = createQuery("findByAge", Integer.valueOf(30));
+
+		assertThat(query).isInstanceOf(StringQuery.class);
+		assertThat(((StringQuery) query).getSource()).isEqualTo("{ 'bool' : { 'must' : { 'term' : { 'age' : 30 } } } }");
+
+	}
+
+	@Test // #1858
+	@DisplayName("should only quote String collection query parameters")
+	void shouldOnlyEscapeStringCollectionQueryParameters() throws Exception {
+		org.springframework.data.elasticsearch.core.query.Query query = createQuery("findByAgeIn",
+				new ArrayList<>(Arrays.asList(30, 35, 40)));
+
+		assertThat(query).isInstanceOf(StringQuery.class);
+		assertThat(((StringQuery) query).getSource())
+				.isEqualTo("{ 'bool' : { 'must' : { 'term' : { 'age' : [30,35,40] } } } }");
+
+	}
+
+	@Test // #1858
+	@DisplayName("should escape Strings in collection query parameters")
+	void shouldEscapeStringsInCollectionsQueryParameters() throws Exception {
+
+		final List<String> another_string = Arrays.asList("hello \"Stranger\"", "Another string");
+		List<String> params = new ArrayList<>(another_string);
+		org.springframework.data.elasticsearch.core.query.Query query = createQuery("findByNameIn", params);
+
+		assertThat(query).isInstanceOf(StringQuery.class);
+		assertThat(((StringQuery) query).getSource()).isEqualTo(
+				"{ 'bool' : { 'must' : { 'terms' : { 'name' : [\"hello \\\"Stranger\\\"\",\"Another string\"] } } } }");
+	}
+
+	private org.springframework.data.elasticsearch.core.query.Query createQuery(String methodName, Object... args)
 			throws NoSuchMethodException {
 
 		Class<?>[] argTypes = Arrays.stream(args).map(Object::getClass).toArray(Class[]::new);
@@ -103,6 +137,22 @@ public class ElasticsearchStringQueryUnitTests {
 		ElasticsearchStringQuery elasticsearchStringQuery = queryForMethod(queryMethod);
 		return elasticsearchStringQuery.createQuery(new ElasticsearchParametersParameterAccessor(queryMethod, args));
 	}
+
+	@Test // #1866
+	@DisplayName("should use converter on parameters")
+	void shouldUseConverterOnParameters() throws NoSuchMethodException {
+
+		Car car = new Car();
+		car.setName("Toyota");
+		car.setModel("Prius");
+
+		org.springframework.data.elasticsearch.core.query.Query query = createQuery("findByCar", car);
+
+		assertThat(query).isInstanceOf(StringQuery.class);
+		assertThat(((StringQuery) query).getSource())
+				.isEqualTo("{ 'bool' : { 'must' : { 'term' : { 'car' : 'Toyota-Prius' } } } }");
+	}
+
 	private ElasticsearchStringQuery queryForMethod(ElasticsearchQueryMethod queryMethod) {
 		return new ElasticsearchStringQuery(queryMethod, operations, queryMethod.getAnnotatedQuery());
 	}
@@ -111,36 +161,59 @@ public class ElasticsearchStringQueryUnitTests {
 
 		Method method = SampleRepository.class.getMethod(name, parameters);
 		return new ElasticsearchQueryMethod(method, new DefaultRepositoryMetadata(SampleRepository.class),
-				new SpelAwareProxyProjectionFactory(), converter.getMappingContext());
+				new SpelAwareProxyProjectionFactory(), operations.getElasticsearchConverter().getMappingContext());
 	}
 
 	private interface SampleRepository extends Repository<Person, String> {
 
+		@Query("{ 'bool' : { 'must' : { 'term' : { 'age' : ?0 } } } }")
+		List<Person> findByAge(Integer age);
+
+		@Query("{ 'bool' : { 'must' : { 'term' : { 'age' : ?0 } } } }")
+		List<Person> findByAgeIn(ArrayList<Integer> age);
+
 		@Query("{ 'bool' : { 'must' : { 'term' : { 'name' : '?0' } } } }")
 		Person findByName(String name);
 
+		@Query("{ 'bool' : { 'must' : { 'terms' : { 'name' : ?0 } } } }")
+		Person findByNameIn(ArrayList<String> names);
+
 		@Query(value = "name:(?0, ?11, ?1, ?2, ?3, ?4, ?5, ?6, ?7, ?8, ?9, ?10, ?11, ?0, ?1)")
 		Person findWithRepeatedPlaceholder(String arg0, String arg1, String arg2, String arg3, String arg4, String arg5,
 				String arg6, String arg7, String arg8, String arg9, String arg10, String arg11);
 
 		@Query("{\"bool\":{\"must\": [{\"match\": {\"prefix\": {\"name\" : \"?0\"}}]}}")
 		SearchHits<Book> findByPrefix(String prefix);
+
+		@Query("{ 'bool' : { 'must' : { 'term' : { 'car' : '?0' } } } }")
+		Person findByCar(Car car);
 	}
 
 	/**
 	 * @author Rizwan Idrees
 	 * @author Mohsin Husen
 	 * @author Artur Konczak
+	 * @author Niklas Herder
 	 */
 
 	@Document(indexName = "test-index-person-query-unittest")
 	static class Person {
 
+		@Nullable public int age;
 		@Nullable @Id private String id;
 		@Nullable private String name;
 		@Nullable @Field(type = FieldType.Nested) private List<Car> car;
 		@Nullable @Field(type = FieldType.Nested, includeInParent = true) private List<Book> books;
 
+		@Nullable
+		public int getAge() {
+			return age;
+		}
+
+		public void setAge(int age) {
+			this.age = age;
+		}
+
 		@Nullable
 		public String getId() {
 			return id;
@@ -234,29 +307,6 @@ public class ElasticsearchStringQueryUnitTests {
 		}
 	}
 
-	static class Car {
-		@Nullable private String name;
-		@Nullable private String model;
-
-		@Nullable
-		public String getName() {
-			return name;
-		}
-
-		public void setName(@Nullable String name) {
-			this.name = name;
-		}
-
-		@Nullable
-		public String getModel() {
-			return model;
-		}
-
-		public void setModel(@Nullable String model) {
-			this.model = model;
-		}
-	}
-
 	static class Author {
 
 		@Nullable private String id;
@@ -280,5 +330,4 @@ public class ElasticsearchStringQueryUnitTests {
 			this.name = name;
 		}
 	}
-
 }

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

@@ -16,6 +16,7 @@
 package org.springframework.data.elasticsearch.repository.query;
 
 import static org.assertj.core.api.Assertions.*;
+import static org.mockito.Mockito.*;
 
 import reactor.core.publisher.Flux;
 import reactor.core.publisher.Mono;
@@ -43,9 +44,6 @@ import org.springframework.data.elasticsearch.annotations.MultiField;
 import org.springframework.data.elasticsearch.annotations.Query;
 import org.springframework.data.elasticsearch.core.ReactiveElasticsearchOperations;
 import org.springframework.data.elasticsearch.core.SearchHit;
-import org.springframework.data.elasticsearch.core.convert.ElasticsearchConverter;
-import org.springframework.data.elasticsearch.core.convert.MappingElasticsearchConverter;
-import org.springframework.data.elasticsearch.core.mapping.SimpleElasticsearchMappingContext;
 import org.springframework.data.elasticsearch.core.query.StringQuery;
 import org.springframework.data.projection.SpelAwareProxyProjectionFactory;
 import org.springframework.data.repository.Repository;
@@ -59,16 +57,15 @@ import org.springframework.lang.Nullable;
  * @author Peter-Josef Meisch
  */
 @ExtendWith(MockitoExtension.class)
-public class ReactiveElasticsearchStringQueryUnitTests {
+public class ReactiveElasticsearchStringQueryUnitTests extends ElasticsearchStringQueryUnitTestBase {
 
 	SpelExpressionParser PARSER = new SpelExpressionParser();
-	ElasticsearchConverter converter;
 
 	@Mock ReactiveElasticsearchOperations operations;
 
 	@BeforeEach
 	public void setUp() {
-		converter = new MappingElasticsearchConverter(new SimpleElasticsearchMappingContext());
+		when(operations.getElasticsearchConverter()).thenReturn(setupConverter());
 	}
 
 	@Test // DATAES-519
@@ -132,7 +129,22 @@ public class ReactiveElasticsearchStringQueryUnitTests {
 				.isEqualTo("{\"bool\":{\"must\": [{\"match\": {\"prefix\": {\"name\" : \"hello \\\"Stranger\\\"\"}}]}}");
 	}
 
-	private org.springframework.data.elasticsearch.core.query.Query createQuery(String methodName, String... args)
+	@Test // #1866
+	@DisplayName("should use converter on parameters")
+	void shouldUseConverterOnParameters() throws Exception {
+
+		Car car = new Car();
+		car.setName("Toyota");
+		car.setModel("Prius");
+
+		org.springframework.data.elasticsearch.core.query.Query query = createQuery("findByCar", car);
+
+		assertThat(query).isInstanceOf(StringQuery.class);
+		assertThat(((StringQuery) query).getSource())
+				.isEqualTo("{ 'bool' : { 'must' : { 'term' : { 'car' : 'Toyota-Prius' } } } }");
+	}
+
+	private org.springframework.data.elasticsearch.core.query.Query createQuery(String methodName, Object... args)
 			throws NoSuchMethodException {
 
 		Class<?>[] argTypes = Arrays.stream(args).map(Object::getClass).toArray(Class[]::new);
@@ -152,7 +164,7 @@ public class ReactiveElasticsearchStringQueryUnitTests {
 
 		Method method = SampleRepository.class.getMethod(name, parameters);
 		return new ReactiveElasticsearchQueryMethod(method, new DefaultRepositoryMetadata(SampleRepository.class),
-				new SpelAwareProxyProjectionFactory(), converter.getMappingContext());
+				new SpelAwareProxyProjectionFactory(), operations.getElasticsearchConverter().getMappingContext());
 	}
 
 	private ReactiveElasticsearchStringQuery createQueryForMethod(String name, Class<?>... parameters) throws Exception {
@@ -180,6 +192,9 @@ public class ReactiveElasticsearchStringQueryUnitTests {
 		@Query("{\"bool\":{\"must\": [{\"match\": {\"prefix\": {\"name\" : \"?0\"}}]}}")
 		Flux<SearchHit<Book>> findByPrefix(String prefix);
 
+		@Query("{ 'bool' : { 'must' : { 'term' : { 'car' : '?0' } } } }")
+		Mono<Person> findByCar(Car car);
+
 	}
 
 	/**
@@ -292,29 +307,6 @@ public class ReactiveElasticsearchStringQueryUnitTests {
 		}
 	}
 
-	static class Car {
-		@Nullable private String name;
-		@Nullable private String model;
-
-		@Nullable
-		public String getName() {
-			return name;
-		}
-
-		public void setName(@Nullable String name) {
-			this.name = name;
-		}
-
-		@Nullable
-		public String getModel() {
-			return model;
-		}
-
-		public void setModel(@Nullable String model) {
-			this.model = model;
-		}
-	}
-
 	static class Author {
 
 		@Nullable private String id;