Skip to content

Commit dbd99a3

Browse files
sothawosothawo
committed
Polishing.
1 parent e6c6d34 commit dbd99a3

File tree

2 files changed

+122
-119
lines changed

2 files changed

+122
-119
lines changed

Diff for: ‎src/main/java/org/springframework/data/elasticsearch/core/convert/MappingElasticsearchConverter.java

+4-2
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ protected <R> R readEntity(ElasticsearchPersistentEntity<?> entity, Map<String,
187187

188188
EntityInstantiator instantiator = instantiators.getInstantiatorFor(targetEntity);
189189

190-
@SuppressWarnings({"unchecked", "ConstantConditions"})
190+
@SuppressWarnings({ "unchecked", "ConstantConditions" })
191191
R instance = (R) instantiator.createInstance(targetEntity,
192192
new PersistentEntityParameterValueProvider<>(targetEntity, propertyValueProvider, null));
193193

@@ -800,6 +800,7 @@ private boolean isSimpleType(Class<?> type) {
800800
// region queries
801801
@Override
802802
public void updateCriteriaQuery(CriteriaQuery criteriaQuery, Class<?> domainClass) {
803+
803804
ElasticsearchPersistentEntity<?> persistentEntity = mappingContext.getPersistentEntity(domainClass);
804805

805806
if (persistentEntity != null) {
@@ -828,7 +829,8 @@ private void updateCriteria(Criteria criteria, ElasticsearchPersistentEntity<?>
828829
field.setName(property.getFieldName());
829830

830831
if (property.hasPropertyConverter()) {
831-
ElasticsearchPersistentPropertyConverter propertyConverter = Objects.requireNonNull(property.getPropertyConverter());
832+
ElasticsearchPersistentPropertyConverter propertyConverter = Objects
833+
.requireNonNull(property.getPropertyConverter());
832834
criteria.getQueryCriteriaEntries().forEach(criteriaEntry -> {
833835
Object value = criteriaEntry.getValue();
834836
if (value.getClass().isArray()) {

Diff for: ‎src/test/java/org/springframework/data/elasticsearch/core/CriteriaQueryMappingUnitTests.java

+118-117
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@
1818
import static org.skyscreamer.jsonassert.JSONAssert.*;
1919

2020
import java.time.LocalDate;
21-
import java.util.*;
21+
import java.util.Base64;
22+
import java.util.Collections;
23+
import java.util.Date;
24+
import java.util.Objects;
2225

2326
import org.json.JSONException;
2427
import org.junit.jupiter.api.BeforeEach;
@@ -113,67 +116,66 @@ void shouldMapNamesAndConvertValuesInCriteriaQueryForSubCriteria() throws JSONEx
113116

114117
// use POJO properties and types in the query building
115118
CriteriaQuery criteriaQuery = new CriteriaQuery( //
116-
Criteria.or()
117-
.subCriteria( Criteria.where("birthDate") //
118-
.between(LocalDate.of(1989, 11, 9), LocalDate.of(1990, 11, 9)) ) //
119-
.subCriteria( Criteria.where( "birthDate").is(LocalDate.of(2019, 12, 28)) ) //
119+
Criteria.or().subCriteria(Criteria.where("birthDate") //
120+
.between(LocalDate.of(1989, 11, 9), LocalDate.of(1990, 11, 9))) //
121+
.subCriteria(Criteria.where("birthDate").is(LocalDate.of(2019, 12, 28))) //
120122
);
121123

122124
// mapped field name and converted parameter
123-
String expected = "{\n" +
124-
" \"bool\" : {\n" +
125-
" \"should\" : [\n" +
126-
" {\n" +
127-
" \"bool\" : {\n" +
128-
" \"must\" : [\n" +
129-
" {\n" +
130-
" \"range\" : {\n" +
131-
" \"birth-date\" : {\n" +
132-
" \"from\" : \"09.11.1989\",\n" +
133-
" \"to\" : \"09.11.1990\",\n" +
134-
" \"include_lower\" : true,\n" +
135-
" \"include_upper\" : true,\n" +
136-
" \"boost\" : 1.0\n" +
137-
" }\n" +
138-
" }\n" +
139-
" }\n" +
140-
" ],\n" +
141-
" \"adjust_pure_negative\" : true,\n" +
142-
" \"boost\" : 1.0\n" +
143-
" }\n" +
144-
" },\n" +
145-
" {\n" +
146-
" \"bool\" : {\n" +
147-
" \"must\" : [\n" +
148-
" {\n" +
149-
" \"query_string\" : {\n" +
150-
" \"query\" : \"28.12.2019\",\n" +
151-
" \"fields\" : [\n" +
152-
" \"birth-date^1.0\"\n" +
153-
" ],\n" +
154-
" \"type\" : \"best_fields\",\n" +
155-
" \"default_operator\" : \"and\",\n" +
156-
" \"max_determinized_states\" : 10000,\n" +
157-
" \"enable_position_increments\" : true,\n" +
158-
" \"fuzziness\" : \"AUTO\",\n" +
159-
" \"fuzzy_prefix_length\" : 0,\n" +
160-
" \"fuzzy_max_expansions\" : 50,\n" +
161-
" \"phrase_slop\" : 0,\n" +
162-
" \"escape\" : false,\n" +
163-
" \"auto_generate_synonyms_phrase_query\" : true,\n" +
164-
" \"fuzzy_transpositions\" : true,\n" +
165-
" \"boost\" : 1.0\n" +
166-
" }\n" +
167-
" }\n" +
168-
" ],\n" +
169-
" \"adjust_pure_negative\" : true,\n" +
170-
" \"boost\" : 1.0\n" +
171-
" }\n" +
172-
" }\n" +
173-
" ],\n" +
174-
" \"adjust_pure_negative\" : true,\n" +
175-
" \"boost\" : 1.0\n" +
176-
" }\n" +
125+
String expected = "{\n" + //
126+
" \"bool\" : {\n" + //
127+
" \"should\" : [\n" + //
128+
" {\n" + //
129+
" \"bool\" : {\n" + //
130+
" \"must\" : [\n" + //
131+
" {\n" + //
132+
" \"range\" : {\n" + //
133+
" \"birth-date\" : {\n" + //
134+
" \"from\" : \"09.11.1989\",\n" + //
135+
" \"to\" : \"09.11.1990\",\n" + //
136+
" \"include_lower\" : true,\n" + //
137+
" \"include_upper\" : true,\n" + //
138+
" \"boost\" : 1.0\n" + //
139+
" }\n" + //
140+
" }\n" + //
141+
" }\n" + //
142+
" ],\n" + //
143+
" \"adjust_pure_negative\" : true,\n" + //
144+
" \"boost\" : 1.0\n" + //
145+
" }\n" + //
146+
" },\n" + //
147+
" {\n" + //
148+
" \"bool\" : {\n" + //
149+
" \"must\" : [\n" + //
150+
" {\n" + //
151+
" \"query_string\" : {\n" + //
152+
" \"query\" : \"28.12.2019\",\n" + //
153+
" \"fields\" : [\n" + //
154+
" \"birth-date^1.0\"\n" + //
155+
" ],\n" + //
156+
" \"type\" : \"best_fields\",\n" + //
157+
" \"default_operator\" : \"and\",\n" + //
158+
" \"max_determinized_states\" : 10000,\n" + //
159+
" \"enable_position_increments\" : true,\n" + //
160+
" \"fuzziness\" : \"AUTO\",\n" + //
161+
" \"fuzzy_prefix_length\" : 0,\n" + //
162+
" \"fuzzy_max_expansions\" : 50,\n" + //
163+
" \"phrase_slop\" : 0,\n" + //
164+
" \"escape\" : false,\n" + //
165+
" \"auto_generate_synonyms_phrase_query\" : true,\n" + //
166+
" \"fuzzy_transpositions\" : true,\n" + //
167+
" \"boost\" : 1.0\n" + //
168+
" }\n" + //
169+
" }\n" + //
170+
" ],\n" + //
171+
" \"adjust_pure_negative\" : true,\n" + //
172+
" \"boost\" : 1.0\n" + //
173+
" }\n" + //
174+
" }\n" + //
175+
" ],\n" + //
176+
" \"adjust_pure_negative\" : true,\n" + //
177+
" \"boost\" : 1.0\n" + //
178+
" }\n" + //
177179
"}"; //
178180

179181
mappingElasticsearchConverter.updateQuery(criteriaQuery, Person.class);
@@ -187,67 +189,66 @@ void shouldMapNamesAndConvertValuesInCriteriaQueryForSubCriteria() throws JSONEx
187189
void shouldMapNamesAndConvertValuesInCriteriaQueryForSubCriteriaWithDate() throws JSONException {
188190
// use POJO properties and types in the query building
189191
CriteriaQuery criteriaQuery = new CriteriaQuery( //
190-
Criteria.or()
191-
.subCriteria( Criteria.where("birthDate") //
192-
.between(LocalDate.of(1989, 11, 9), LocalDate.of(1990, 11, 9)) ) //
193-
.subCriteria( Criteria.where( "createdDate").is(383745721653L) ) //
192+
Criteria.or().subCriteria(Criteria.where("birthDate") //
193+
.between(LocalDate.of(1989, 11, 9), LocalDate.of(1990, 11, 9))) //
194+
.subCriteria(Criteria.where("createdDate").is(383745721653L)) //
194195
);
195196

196197
// mapped field name and converted parameter
197-
String expected = "{\n" +
198-
" \"bool\" : {\n" +
199-
" \"should\" : [\n" +
200-
" {\n" +
201-
" \"bool\" : {\n" +
202-
" \"must\" : [\n" +
203-
" {\n" +
204-
" \"range\" : {\n" +
205-
" \"birth-date\" : {\n" +
206-
" \"from\" : \"09.11.1989\",\n" +
207-
" \"to\" : \"09.11.1990\",\n" +
208-
" \"include_lower\" : true,\n" +
209-
" \"include_upper\" : true,\n" +
210-
" \"boost\" : 1.0\n" +
211-
" }\n" +
212-
" }\n" +
213-
" }\n" +
214-
" ],\n" +
215-
" \"adjust_pure_negative\" : true,\n" +
216-
" \"boost\" : 1.0\n" +
217-
" }\n" +
218-
" },\n" +
219-
" {\n" +
220-
" \"bool\" : {\n" +
221-
" \"must\" : [\n" +
222-
" {\n" +
223-
" \"query_string\" : {\n" +
224-
" \"query\" : \"383745721653\",\n" +
225-
" \"fields\" : [\n" +
226-
" \"created-date^1.0\"\n" +
227-
" ],\n" +
228-
" \"type\" : \"best_fields\",\n" +
229-
" \"default_operator\" : \"and\",\n" +
230-
" \"max_determinized_states\" : 10000,\n" +
231-
" \"enable_position_increments\" : true,\n" +
232-
" \"fuzziness\" : \"AUTO\",\n" +
233-
" \"fuzzy_prefix_length\" : 0,\n" +
234-
" \"fuzzy_max_expansions\" : 50,\n" +
235-
" \"phrase_slop\" : 0,\n" +
236-
" \"escape\" : false,\n" +
237-
" \"auto_generate_synonyms_phrase_query\" : true,\n" +
238-
" \"fuzzy_transpositions\" : true,\n" +
239-
" \"boost\" : 1.0\n" +
240-
" }\n" +
241-
" }\n" +
242-
" ],\n" +
243-
" \"adjust_pure_negative\" : true,\n" +
244-
" \"boost\" : 1.0\n" +
245-
" }\n" +
246-
" }\n" +
247-
" ],\n" +
248-
" \"adjust_pure_negative\" : true,\n" +
249-
" \"boost\" : 1.0\n" +
250-
" }\n" +
198+
String expected = "{\n" + //
199+
" \"bool\" : {\n" + //
200+
" \"should\" : [\n" + //
201+
" {\n" + //
202+
" \"bool\" : {\n" + //
203+
" \"must\" : [\n" + //
204+
" {\n" + //
205+
" \"range\" : {\n" + //
206+
" \"birth-date\" : {\n" + //
207+
" \"from\" : \"09.11.1989\",\n" + //
208+
" \"to\" : \"09.11.1990\",\n" + //
209+
" \"include_lower\" : true,\n" + //
210+
" \"include_upper\" : true,\n" + //
211+
" \"boost\" : 1.0\n" + //
212+
" }\n" + //
213+
" }\n" + //
214+
" }\n" + //
215+
" ],\n" + //
216+
" \"adjust_pure_negative\" : true,\n" + //
217+
" \"boost\" : 1.0\n" + //
218+
" }\n" + //
219+
" },\n" + //
220+
" {\n" + //
221+
" \"bool\" : {\n" + //
222+
" \"must\" : [\n" + //
223+
" {\n" + //
224+
" \"query_string\" : {\n" + //
225+
" \"query\" : \"383745721653\",\n" + //
226+
" \"fields\" : [\n" + //
227+
" \"created-date^1.0\"\n" + //
228+
" ],\n" + //
229+
" \"type\" : \"best_fields\",\n" + //
230+
" \"default_operator\" : \"and\",\n" + //
231+
" \"max_determinized_states\" : 10000,\n" + //
232+
" \"enable_position_increments\" : true,\n" + //
233+
" \"fuzziness\" : \"AUTO\",\n" + //
234+
" \"fuzzy_prefix_length\" : 0,\n" + //
235+
" \"fuzzy_max_expansions\" : 50,\n" + //
236+
" \"phrase_slop\" : 0,\n" + //
237+
" \"escape\" : false,\n" + //
238+
" \"auto_generate_synonyms_phrase_query\" : true,\n" + //
239+
" \"fuzzy_transpositions\" : true,\n" + //
240+
" \"boost\" : 1.0\n" + //
241+
" }\n" + //
242+
" }\n" + //
243+
" ],\n" + //
244+
" \"adjust_pure_negative\" : true,\n" + //
245+
" \"boost\" : 1.0\n" + //
246+
" }\n" + //
247+
" }\n" + //
248+
" ],\n" + //
249+
" \"adjust_pure_negative\" : true,\n" + //
250+
" \"boost\" : 1.0\n" + //
251+
" }\n" + //
251252
"}"; //
252253

253254
mappingElasticsearchConverter.updateQuery(criteriaQuery, Person.class);

0 commit comments

Comments
 (0)