Cwikius-Spring/spring-data-elasticsearch
1
0
Fork 0
mirror of https://github.com/spring-projects/spring-data-elasticsearch.git synced 2025-06-25 13:32:10 +00:00
Code Issues Packages Projects Releases Wiki Activity

DATAES-164 - CriteriaQuery equals method has to use AND operator instead of OR

Browse Source
This commit is contained in:
Mohsin Husen 2015-05-15 12:25:45 +01:00
parent 55ed490776
commit 6639d6a65b
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/org/springframework/data/elasticsearch/core/CriteriaQueryProcessor.java
View File

@ -122,7 +122,7 @@ class CriteriaQueryProcessor {
switch (key) { switch (key) {
case EQUALS: case EQUALS:
query = queryString(searchText).field(fieldName); query = queryString(searchText).field(fieldName).defaultOperator(QueryStringQueryBuilder.Operator.AND);
break; break;
case CONTAINS: case CONTAINS:
query = queryString("*" + searchText + "*").field(fieldName).analyzeWildcard(true); query = queryString("*" + searchText + "*").field(fieldName).analyzeWildcard(true);

4
src/test/java/org/springframework/data/elasticsearch/core/query/CriteriaQueryTests.java
View File

@ -223,12 +223,12 @@ public class CriteriaQueryTests {
elasticsearchTemplate.bulkIndex(indexQueries); elasticsearchTemplate.bulkIndex(indexQueries);
elasticsearchTemplate.refresh(SampleEntity.class, true); elasticsearchTemplate.refresh(SampleEntity.class, true);
CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria("message").is("some message").is("test message")); CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria("message").is("some message"));
// when // when
Page<SampleEntity> page = elasticsearchTemplate.queryForPage(criteriaQuery, SampleEntity.class); Page<SampleEntity> page = elasticsearchTemplate.queryForPage(criteriaQuery, SampleEntity.class);
// then // then
assertThat("message", is(criteriaQuery.getCriteria().getField().getName())); assertThat("message", is(criteriaQuery.getCriteria().getField().getName()));
assertThat(page.getTotalElements(), is(greaterThanOrEqualTo(2L))); assertThat(page.getTotalElements(), is(equalTo(1L)));
} }
@Test @Test