Skip to content

Commit 01a67ee

Browse files
committed
DATAES-164 - CriteriaQuery equals method has to use AND operator instead of OR
1 parent 0825f15 commit 01a67ee

File tree

2 files changed

+3
-3
lines changed

2 files changed

+3
-3
lines changed

src/main/java/org/springframework/data/elasticsearch/core/CriteriaQueryProcessor.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@ private QueryBuilder processCriteriaEntry(OperationKey key, Object value, String
122122

123123
switch (key) {
124124
case EQUALS:
125-
query = queryString(searchText).field(fieldName);
125+
query = queryString(searchText).field(fieldName).defaultOperator(QueryStringQueryBuilder.Operator.AND);
126126
break;
127127
case CONTAINS:
128128
query = queryString("*" + searchText + "*").field(fieldName).analyzeWildcard(true);

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -223,12 +223,12 @@ public void shouldPerformMultipleIsOperations() {
223223

224224
elasticsearchTemplate.bulkIndex(indexQueries);
225225
elasticsearchTemplate.refresh(SampleEntity.class, true);
226-
CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria("message").is("some message").is("test message"));
226+
CriteriaQuery criteriaQuery = new CriteriaQuery(new Criteria("message").is("some message"));
227227
// when
228228
Page<SampleEntity> page = elasticsearchTemplate.queryForPage(criteriaQuery, SampleEntity.class);
229229
// then
230230
assertThat("message", is(criteriaQuery.getCriteria().getField().getName()));
231-
assertThat(page.getTotalElements(), is(greaterThanOrEqualTo(2L)));
231+
assertThat(page.getTotalElements(), is(equalTo(1L)));
232232
}
233233

234234
@Test

0 commit comments

Comments
 (0)