Skip to content

Commit 1278a60

Browse files
committed
Merge switch branches in ElasticsearchQueryCreator.
1 parent b8493e5 commit 1278a60

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed

src/main/java/org/springframework/data/elasticsearch/repository/query/parser/ElasticsearchQueryCreator.java

+5-10
Original file line numberDiff line numberDiff line change
@@ -109,31 +109,27 @@ private Criteria from(Part part, Criteria criteria, Iterator<?> parameters) {
109109
return criteria.is(parameters.next()).not();
110110
case REGEX:
111111
return criteria.expression(parameters.next().toString());
112-
case LIKE:
113-
case STARTING_WITH:
112+
case LIKE, STARTING_WITH:
114113
return criteria.startsWith(parameters.next().toString());
115114
case ENDING_WITH:
116115
return criteria.endsWith(parameters.next().toString());
117116
case CONTAINING:
118117
return criteria.contains(parameters.next().toString());
119118
case GREATER_THAN:
120119
return criteria.greaterThan(parameters.next());
121-
case AFTER:
122-
case GREATER_THAN_EQUAL:
120+
case AFTER, GREATER_THAN_EQUAL:
123121
return criteria.greaterThanEqual(parameters.next());
124122
case LESS_THAN:
125123
return criteria.lessThan(parameters.next());
126-
case BEFORE:
127-
case LESS_THAN_EQUAL:
124+
case BEFORE, LESS_THAN_EQUAL:
128125
return criteria.lessThanEqual(parameters.next());
129126
case BETWEEN:
130127
return criteria.between(parameters.next(), parameters.next());
131128
case IN:
132129
return criteria.in(asArray(parameters.next()));
133130
case NOT_IN:
134131
return criteria.notIn(asArray(parameters.next()));
135-
case SIMPLE_PROPERTY:
136-
case WITHIN: {
132+
case SIMPLE_PROPERTY, WITHIN: {
137133
Object firstParameter = parameters.next();
138134
Object secondParameter = null;
139135
if (type == Part.Type.SIMPLE_PROPERTY) {
@@ -171,8 +167,7 @@ private Criteria from(Part part, Criteria criteria, Iterator<?> parameters) {
171167

172168
return doWithinIfPossible(criteria, firstParameter, secondParameter);
173169
}
174-
case EXISTS:
175-
case IS_NOT_NULL:
170+
case EXISTS, IS_NOT_NULL:
176171
return criteria.exists();
177172
case IS_NULL:
178173
return criteria.not().exists();

0 commit comments

Comments
 (0)