Skip to content

Commit 76b7ace

Browse files
l-trottal-trotta
committed
code style
1 parent d658c65 commit 76b7ace

File tree

1 file changed

+52
-44
lines changed
  • java-client/src/test/java/co/elastic/clients/elasticsearch/model

1 file changed

+52
-44
lines changed

‎java-client/src/test/java/co/elastic/clients/elasticsearch/model/UnionTests.java

+52-44
Original file line numberDiff line numberDiff line change
@@ -25,21 +25,12 @@
2525
import co.elastic.clients.elasticsearch._types.Time;
2626
import co.elastic.clients.elasticsearch._types.aggregations.Aggregate;
2727
import co.elastic.clients.elasticsearch._types.mapping.Property;
28-
import co.elastic.clients.elasticsearch._types.query_dsl.DecayFunction;
2928
import co.elastic.clients.elasticsearch._types.query_dsl.DistanceFeatureQuery;
30-
import co.elastic.clients.elasticsearch._types.query_dsl.FunctionScore;
31-
import co.elastic.clients.elasticsearch._types.query_dsl.FunctionScoreBuilders;
32-
import co.elastic.clients.elasticsearch._types.query_dsl.FunctionScoreQuery;
3329
import co.elastic.clients.elasticsearch._types.query_dsl.MultiValueMode;
3430
import co.elastic.clients.elasticsearch._types.query_dsl.Query;
35-
import co.elastic.clients.elasticsearch._types.query_dsl.RangeQuery;
3631
import co.elastic.clients.elasticsearch._types.query_dsl.RangeRelation;
3732
import co.elastic.clients.elasticsearch._types.query_dsl.TermRangeQuery;
38-
import co.elastic.clients.elasticsearch._types.query_dsl.UntypedRangeQuery;
39-
import co.elastic.clients.elasticsearch.core.SearchRequest;
4033
import co.elastic.clients.elasticsearch.core.SearchResponse;
41-
import co.elastic.clients.json.JsonData;
42-
import co.elastic.clients.json.JsonpUtils;
4334
import co.elastic.clients.testkit.ModelTestCase;
4435
import jakarta.json.Json;
4536
import jakarta.json.JsonObject;
@@ -120,7 +111,7 @@ public void testOpenInternalUnion() {
120111
public void testOpenTypedKeysUnion() {
121112
String requiredFields =
122113
"{\"took\":1,\"timed_out\":false,\"_shards\":{\"failed\":0.0,\"successful\":1.0,\"total\":1.0}," +
123-
"\"hits\":{\"total\":{\"relation\":\"eq\",\"value\":0},\"hits\":[]}}";
114+
"\"hits\":{\"total\":{\"relation\":\"eq\",\"value\":0},\"hits\":[]}}";
124115

125116
String customAgg = "{\"bar\":42}";
126117

@@ -152,16 +143,17 @@ public void testOpenTypedKeysUnion() {
152143
public void testUntaggedUnion() {
153144
// Range queries
154145
Query numberRangeQuery = Query.of(q -> q.range(r -> r
155-
.number(n -> n
156-
.field("age")
157-
.gte(10D)
158-
.lte(20D)
159-
.boost(1.0F)
160-
.relation(RangeRelation.Contains))));
146+
.number(n -> n
147+
.field("age")
148+
.gte(10D)
149+
.lte(20D)
150+
.boost(1.0F)
151+
.relation(RangeRelation.Contains))));
161152

162-
String expectedNumberRangeQuery = "{\"range\":{\"age\":{\"boost\":1.0,\"relation\":\"contains\",\"gte\":10.0,\"lte\":20.0}}}";
153+
String expectedNumberRangeQuery = "{\"range\":{\"age\":{\"boost\":1.0,\"relation\":\"contains\"," +
154+
"\"gte\":10.0,\"lte\":20.0}}}";
163155

164-
assertEquals(expectedNumberRangeQuery,toJson(numberRangeQuery));
156+
assertEquals(expectedNumberRangeQuery, toJson(numberRangeQuery));
165157

166158
Query dateRangeQuery = Query.of(q -> q.range(r -> r
167159
.date(d -> d
@@ -172,9 +164,10 @@ public void testUntaggedUnion() {
172164
.format("some-format")
173165
.relation(RangeRelation.Contains))));
174166

175-
String expectedDateRangeQuery = "{\"range\":{\"day\":{\"boost\":1.0,\"relation\":\"contains\",\"gte\":\"20-06-24\",\"lte\":\"20-07-24\"},\"format\":\"some-format\"}}";
167+
String expectedDateRangeQuery = "{\"range\":{\"day\":{\"boost\":1.0,\"relation\":\"contains\"," +
168+
"\"gte\":\"20-06-24\",\"lte\":\"20-07-24\"},\"format\":\"some-format\"}}";
176169

177-
assertEquals(expectedDateRangeQuery,toJson(dateRangeQuery));
170+
assertEquals(expectedDateRangeQuery, toJson(dateRangeQuery));
178171

179172
Query termRangeQuery = Query.of(q -> q.range(r -> r
180173
.term(d -> d
@@ -184,12 +177,13 @@ public void testUntaggedUnion() {
184177
.boost(1.0F)
185178
.relation(RangeRelation.Contains))));
186179

187-
String expectedTermRangeQuery = "{\"range\":{\"word\":{\"boost\":1.0,\"relation\":\"contains\",\"gte\":\"some\",\"lte\":\"word\"}}}";
180+
String expectedTermRangeQuery = "{\"range\":{\"word\":{\"boost\":1.0,\"relation\":\"contains\"," +
181+
"\"gte\":\"some\",\"lte\":\"word\"}}}";
188182

189-
assertEquals(expectedTermRangeQuery,toJson(termRangeQuery));
183+
assertEquals(expectedTermRangeQuery, toJson(termRangeQuery));
190184

191185
String jsonNumberRangeQuery = "{\n" +
192-
" \"range\": {\n" +
186+
" \"range\": {\n" +
193187
" \"age\": {\n" +
194188
" \"gte\": 10,\n" +
195189
" \"lte\": 20,\n" +
@@ -206,7 +200,8 @@ public void testUntaggedUnion() {
206200
assertEquals(20, numberRangeQueryFromJson.range().untyped().lte().to(Integer.class));
207201
assertEquals(RangeRelation.Contains, numberRangeQueryFromJson.range().untyped().relation());
208202

209-
Query converted = TermRangeQuery.of(trq -> trq.field("a").gte("b").lte("c"))._toRangeQuery()._toQuery();
203+
Query converted =
204+
TermRangeQuery.of(trq -> trq.field("a").gte("b").lte("c"))._toRangeQuery()._toQuery();
210205
assertTrue(converted.isRange());
211206

212207
// Distance feature queries
@@ -219,8 +214,10 @@ public void testUntaggedUnion() {
219214
.pivot("1000m")
220215
.origin(GeoLocation.of(gl -> gl.latlon(LatLonGeoLocation.of(ll -> ll.lon(-71.3).lat(41.15))))))))));
221216

222-
String expectedGeoDistFeatQuery = "{\"bool\":{\"must\":[{\"match_all\":{}}],\"should\":[{\"distance_feature\":{\"origin\":{\"lat\":41.15,\"lon\":-71.3},\"pivot\":\"1000m\",\"field\":\"location\"}}]}}";
223-
assertEquals(expectedGeoDistFeatQuery,toJson(geoDistanceFeatureQuery));
217+
String expectedGeoDistFeatQuery = "{\"bool\":{\"must\":[{\"match_all\":{}}]," +
218+
"\"should\":[{\"distance_feature\":{\"origin\":{\"lat\":41.15,\"lon\":-71.3}," +
219+
"\"pivot\":\"1000m\",\"field\":\"location\"}}]}}";
220+
assertEquals(expectedGeoDistFeatQuery, toJson(geoDistanceFeatureQuery));
224221

225222

226223
Query dateDistanceFeatureQuery = Query.of(q -> q.bool(b -> b
@@ -231,8 +228,9 @@ public void testUntaggedUnion() {
231228
.pivot(Time.of(t -> t.time("7d")))
232229
.origin("now"))))));
233230

234-
String expectedDateDistFeatQuery = "{\"bool\":{\"must\":[{\"match_all\":{}}],\"should\":[{\"distance_feature\":{\"origin\":\"now\",\"pivot\":\"7d\",\"field\":\"date\"}}]}}";
235-
assertEquals(expectedDateDistFeatQuery,toJson(dateDistanceFeatureQuery));
231+
String expectedDateDistFeatQuery = "{\"bool\":{\"must\":[{\"match_all\":{}}]," +
232+
"\"should\":[{\"distance_feature\":{\"origin\":\"now\",\"pivot\":\"7d\",\"field\":\"date\"}}]}}";
233+
assertEquals(expectedDateDistFeatQuery, toJson(dateDistanceFeatureQuery));
236234

237235
String distDateQuery = "{\n" +
238236
" \"bool\": {\n" +
@@ -251,8 +249,10 @@ public void testUntaggedUnion() {
251249

252250
Query distDateQueryFromJson = Query.of(q -> q.withJson(new StringReader(distDateQuery)));
253251
assertTrue(distDateQueryFromJson.bool().should().get(0).distanceFeature().isUntyped());
254-
assertEquals("7d",distDateQueryFromJson.bool().should().get(0).distanceFeature().untyped().pivot().to(String.class));
255-
assertEquals("date",distDateQueryFromJson.bool().should().get(0).distanceFeature().untyped().field().toString());
252+
assertEquals("7d",
253+
distDateQueryFromJson.bool().should().get(0).distanceFeature().untyped().pivot().to(String.class));
254+
assertEquals("date",
255+
distDateQueryFromJson.bool().should().get(0).distanceFeature().untyped().field().toString());
256256

257257

258258
String distGeoQuery = "{\n" +
@@ -272,8 +272,10 @@ public void testUntaggedUnion() {
272272

273273
Query distGeoQueryFromJson = Query.of(q -> q.withJson(new StringReader(distGeoQuery)));
274274
assertTrue(distGeoQueryFromJson.bool().should().get(0).distanceFeature().isUntyped());
275-
assertEquals("1000m",distGeoQueryFromJson.bool().should().get(0).distanceFeature().untyped().pivot().to(String.class));
276-
assertEquals("location", distGeoQueryFromJson.bool().should().get(0).distanceFeature().untyped().field());
275+
assertEquals("1000m",
276+
distGeoQueryFromJson.bool().should().get(0).distanceFeature().untyped().pivot().to(String.class));
277+
assertEquals("location",
278+
distGeoQueryFromJson.bool().should().get(0).distanceFeature().untyped().field());
277279

278280

279281
Query convertedDist = DistanceFeatureQuery.of(dfq -> dfq.date(d -> d
@@ -289,13 +291,14 @@ public void testUntaggedUnion() {
289291
.functions(fn -> fn
290292
.gauss(g -> g
291293
.date(d -> d.field("date").placement(pl -> pl
292-
.origin("2013-09-17")
293-
.scale(Time.of(t -> t.time("10d")))
294-
.offset(Time.of(t -> t.time("5d")))
295-
.decay(0.5D)))))));
294+
.origin("2013-09-17")
295+
.scale(Time.of(t -> t.time("10d")))
296+
.offset(Time.of(t -> t.time("5d")))
297+
.decay(0.5D)))))));
296298

297-
String expectedFunctionScoreQueryGaussDate = "{\"function_score\":{\"functions\":[{\"gauss\":{\"date\":{\"decay\":0.5,\"offset\":\"5d\",\"scale\":\"10d\",\"origin\":\"2013-09-17\"}}}]}}";
298-
assertEquals(expectedFunctionScoreQueryGaussDate,toJson(functionScoreQueryGaussDate));
299+
String expectedFunctionScoreQueryGaussDate = "{\"function_score\":{\"functions\":[{\"gauss" +
300+
"\":{\"date\":{\"decay\":0.5,\"offset\":\"5d\",\"scale\":\"10d\",\"origin\":\"2013-09-17\"}}}]}}";
301+
assertEquals(expectedFunctionScoreQueryGaussDate, toJson(functionScoreQueryGaussDate));
299302

300303
Query functionScoreQueryExpGeo = Query.of(q -> q.functionScore(fs -> fs
301304
.functions(fn -> fn
@@ -306,8 +309,10 @@ public void testUntaggedUnion() {
306309
.offset("2km")
307310
.decay(0.5D)))))));
308311

309-
String expectedFunctionScoreQueryExpGeo = "{\"function_score\":{\"functions\":[{\"exp\":{\"location\":{\"decay\":0.5,\"offset\":\"2km\",\"scale\":\"1km\",\"origin\":{\"lat\":41.15,\"lon\":-71.3}}}}]}}";
310-
assertEquals(expectedFunctionScoreQueryExpGeo,toJson(functionScoreQueryExpGeo));
312+
String expectedFunctionScoreQueryExpGeo = "{\"function_score\":{\"functions\":[{\"exp\":{\"location" +
313+
"\":{\"decay\":0.5,\"offset\":\"2km\",\"scale\":\"1km\",\"origin\":{\"lat\":41.15,\"lon\":-71" +
314+
".3}}}}]}}";
315+
assertEquals(expectedFunctionScoreQueryExpGeo, toJson(functionScoreQueryExpGeo));
311316

312317
Query functionScoreQueryLinearNumeric = Query.of(q -> q.functionScore(fs -> fs
313318
.functions(fn -> fn
@@ -318,8 +323,9 @@ public void testUntaggedUnion() {
318323
.offset(4D)
319324
.decay(0.5D)))))));
320325

321-
String expectedFunctionScoreQueryLinearNumeric = "{\"function_score\":{\"functions\":[{\"linear\":{\"nums\":{\"decay\":0.5,\"offset\":4.0,\"scale\":3.0,\"origin\":2.0}}}]}}";
322-
assertEquals(expectedFunctionScoreQueryLinearNumeric,toJson(functionScoreQueryLinearNumeric));
326+
String expectedFunctionScoreQueryLinearNumeric = "{\"function_score\":{\"functions\":[{\"linear" +
327+
"\":{\"nums\":{\"decay\":0.5,\"offset\":4.0,\"scale\":3.0,\"origin\":2.0}}}]}}";
328+
assertEquals(expectedFunctionScoreQueryLinearNumeric, toJson(functionScoreQueryLinearNumeric));
323329

324330
String funScoreQuery =
325331
" {\n" +
@@ -342,8 +348,10 @@ public void testUntaggedUnion() {
342348

343349
Query funScoreQueryFromJson = Query.of(q -> q.withJson(new StringReader(funScoreQuery)));
344350
assertTrue(funScoreQueryFromJson.functionScore().functions().get(0).gauss().isUntyped());
345-
assertEquals("2013-09-17", funScoreQueryFromJson.functionScore().functions().get(0).gauss().untyped().placement().origin().to(String.class));
346-
assertEquals(MultiValueMode.Avg, funScoreQueryFromJson.functionScore().functions().get(0).gauss().untyped().multiValueMode());
351+
assertEquals("2013-09-17",
352+
funScoreQueryFromJson.functionScore().functions().get(0).gauss().untyped().placement().origin().to(String.class));
353+
assertEquals(MultiValueMode.Avg,
354+
funScoreQueryFromJson.functionScore().functions().get(0).gauss().untyped().multiValueMode());
347355

348356

349357
}

0 commit comments

Comments
 (0)