Skip to content

Commit 4bd5039

Browse files
alexey-ivanov-esalexey-ivanov-es
committed
Fix compilation
1 parent 49d4c14 commit 4bd5039

File tree

8 files changed

+62
-61
lines changed

8 files changed

+62
-61
lines changed

‎x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/analysis/AnalyzerTests.java‎

Lines changed: 38 additions & 36 deletions
Original file line numberDiff line numberDiff line change
@@ -3152,13 +3152,14 @@ public void testResolveInsist_multiIndexFieldPartiallyMappedWithSingleKeywordTyp
31523152
IndexResolution resolution = IndexResolver.mergedMappings(
31533153
"foo, bar",
31543154
new IndexResolver.FieldsInfo(
3155-
new FieldCapabilitiesResponse(
3156-
List.of(
3157-
fieldCapabilitiesIndexResponse("foo", messageResponseMap("keyword")),
3158-
fieldCapabilitiesIndexResponse("bar", Map.of())
3159-
),
3160-
List.of()
3161-
),
3155+
FieldCapabilitiesResponse.builder()
3156+
.withIndexResponses(
3157+
List.of(
3158+
fieldCapabilitiesIndexResponse("foo", messageResponseMap("keyword")),
3159+
fieldCapabilitiesIndexResponse("bar", Map.of())
3160+
)
3161+
)
3162+
.build(),
31623163
true,
31633164
true
31643165
)
@@ -3179,13 +3180,14 @@ public void testResolveInsist_multiIndexFieldExistsWithSingleTypeButIsNotKeyword
31793180
IndexResolution resolution = IndexResolver.mergedMappings(
31803181
"foo, bar",
31813182
new IndexResolver.FieldsInfo(
3182-
new FieldCapabilitiesResponse(
3183+
FieldCapabilitiesResponse.builder()
3184+
.withIndexResponses(
31833185
List.of(
31843186
fieldCapabilitiesIndexResponse("foo", messageResponseMap("long")),
31853187
fieldCapabilitiesIndexResponse("bar", Map.of())
3186-
),
3187-
List.of()
3188-
),
3188+
)
3189+
)
3190+
.build(),
31893191
true,
31903192
true
31913193
)
@@ -3207,14 +3209,14 @@ public void testResolveInsist_multiIndexFieldPartiallyExistsWithMultiTypesNoKeyw
32073209
IndexResolution resolution = IndexResolver.mergedMappings(
32083210
"foo, bar",
32093211
new IndexResolver.FieldsInfo(
3210-
new FieldCapabilitiesResponse(
3212+
FieldCapabilitiesResponse.builder()
3213+
.withIndexResponses(
32113214
List.of(
32123215
fieldCapabilitiesIndexResponse("foo", messageResponseMap("long")),
32133216
fieldCapabilitiesIndexResponse("bar", messageResponseMap("date")),
32143217
fieldCapabilitiesIndexResponse("bazz", Map.of())
3215-
),
3216-
List.of()
3217-
),
3218+
))
3219+
.build(),
32183220
true,
32193221
true
32203222
)
@@ -3235,13 +3237,13 @@ public void testResolveInsist_multiIndexSameMapping_fieldIsMapped() {
32353237
IndexResolution resolution = IndexResolver.mergedMappings(
32363238
"foo, bar",
32373239
new IndexResolver.FieldsInfo(
3238-
new FieldCapabilitiesResponse(
3240+
FieldCapabilitiesResponse.builder()
3241+
.withIndexResponses(
32393242
List.of(
32403243
fieldCapabilitiesIndexResponse("foo", messageResponseMap("long")),
32413244
fieldCapabilitiesIndexResponse("bar", messageResponseMap("long"))
3242-
),
3243-
List.of()
3244-
),
3245+
))
3246+
.build(),
32453247
true,
32463248
true
32473249
)
@@ -3260,15 +3262,15 @@ public void testResolveInsist_multiIndexFieldPartiallyExistsWithMultiTypesWithKe
32603262
IndexResolution resolution = IndexResolver.mergedMappings(
32613263
"foo, bar",
32623264
new IndexResolver.FieldsInfo(
3263-
new FieldCapabilitiesResponse(
3265+
FieldCapabilitiesResponse.builder()
3266+
.withIndexResponses(
32643267
List.of(
32653268
fieldCapabilitiesIndexResponse("foo", messageResponseMap("long")),
32663269
fieldCapabilitiesIndexResponse("bar", messageResponseMap("date")),
32673270
fieldCapabilitiesIndexResponse("bazz", messageResponseMap("keyword")),
32683271
fieldCapabilitiesIndexResponse("qux", Map.of())
3269-
),
3270-
List.of()
3271-
),
3272+
))
3273+
.build(),
32723274
true,
32733275
true
32743276
)
@@ -3289,14 +3291,14 @@ public void testResolveInsist_multiIndexFieldPartiallyExistsWithMultiTypesWithCa
32893291
IndexResolution resolution = IndexResolver.mergedMappings(
32903292
"foo, bar",
32913293
new IndexResolver.FieldsInfo(
3292-
new FieldCapabilitiesResponse(
3294+
FieldCapabilitiesResponse.builder()
3295+
.withIndexResponses(
32933296
List.of(
32943297
fieldCapabilitiesIndexResponse("foo", messageResponseMap("long")),
32953298
fieldCapabilitiesIndexResponse("bar", messageResponseMap("date")),
32963299
fieldCapabilitiesIndexResponse("bazz", Map.of())
3297-
),
3298-
List.of()
3299-
),
3300+
))
3301+
.build(),
33003302
true,
33013303
true
33023304
)
@@ -3313,10 +3315,10 @@ public void testResolveInsist_multiIndexFieldPartiallyExistsWithMultiTypesWithCa
33133315
}
33143316

33153317
public void testResolveDenseVector() {
3316-
FieldCapabilitiesResponse caps = new FieldCapabilitiesResponse(
3317-
List.of(fieldCapabilitiesIndexResponse("foo", Map.of("v", new IndexFieldCapabilitiesBuilder("v", "dense_vector").build()))),
3318-
List.of()
3319-
);
3318+
FieldCapabilitiesResponse caps = FieldCapabilitiesResponse.builder()
3319+
.withIndexResponses(
3320+
List.of(fieldCapabilitiesIndexResponse("foo", Map.of("v", new IndexFieldCapabilitiesBuilder("v", "dense_vector").build())))
3321+
).build();
33203322
{
33213323
IndexResolution resolution = IndexResolver.mergedMappings("foo", new IndexResolver.FieldsInfo(caps, true, true));
33223324
var plan = analyze("FROM foo", analyzer(resolution, TEST_VERIFIER));
@@ -3332,15 +3334,15 @@ public void testResolveDenseVector() {
33323334
}
33333335

33343336
public void testResolveAggregateMetricDouble() {
3335-
FieldCapabilitiesResponse caps = new FieldCapabilitiesResponse(
3337+
FieldCapabilitiesResponse caps = FieldCapabilitiesResponse.builder()
3338+
.withIndexResponses(
33363339
List.of(
33373340
fieldCapabilitiesIndexResponse(
33383341
"foo",
33393342
Map.of("v", new IndexFieldCapabilitiesBuilder("v", "aggregate_metric_double").build())
33403343
)
3341-
),
3342-
List.of()
3343-
);
3344+
)
3345+
).build();
33443346
{
33453347
IndexResolution resolution = IndexResolver.mergedMappings("foo", new IndexResolver.FieldsInfo(caps, true, true));
33463348
var plan = analyze("FROM foo", analyzer(resolution, TEST_VERIFIER));
@@ -3801,7 +3803,7 @@ private static LogicalPlan analyzeWithEmptyFieldCapsResponse(String query) throw
38013803
List<FieldCapabilitiesIndexResponse> idxResponses = List.of(
38023804
new FieldCapabilitiesIndexResponse("idx", "idx", Map.of(), true, IndexMode.STANDARD)
38033805
);
3804-
IndexResolver.FieldsInfo caps = new IndexResolver.FieldsInfo(new FieldCapabilitiesResponse(idxResponses, List.of()), true, true);
3806+
IndexResolver.FieldsInfo caps = new IndexResolver.FieldsInfo(FieldCapabilitiesResponse.builder().withIndexResponses(idxResponses).build(), true, true);
38053807
IndexResolution resolution = IndexResolver.mergedMappings("test*", caps);
38063808
var analyzer = analyzer(resolution, TEST_VERIFIER, configuration(query));
38073809
return analyze(query, analyzer);

‎x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/enrich/EnrichPolicyResolverTests.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -506,9 +506,9 @@ protected <Request extends ActionRequest, Response extends ActionResponse> void
506506
fieldCaps.put(e.getKey(), f);
507507
}
508508
var indexResponse = new FieldCapabilitiesIndexResponse(alias, null, fieldCaps, true, IndexMode.STANDARD);
509-
response = new FieldCapabilitiesResponse(List.of(indexResponse), List.of());
509+
response = FieldCapabilitiesResponse.builder().withIndexResponses(List.of(indexResponse)).build();
510510
} else {
511-
response = new FieldCapabilitiesResponse(List.of(), List.of());
511+
response = FieldCapabilitiesResponse.empty();
512512
}
513513
threadPool().executor(ThreadPool.Names.SEARCH_COORDINATION)
514514
.execute(

‎x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/telemetry/PlanExecutorMetricsTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -150,7 +150,7 @@ public void testFailedMetric() {
150150
// simulate a valid field_caps response so we can parse and correctly analyze de query
151151
listener.onResponse(
152152
new EsqlResolveFieldsResponse(
153-
new FieldCapabilitiesResponse(indexFieldCapabilities(indices), List.of()),
153+
FieldCapabilitiesResponse.builder().withIndexResponses(indexFieldCapabilities(indices)).build(),
154154
TransportVersion.current()
155155
)
156156
);

‎x-pack/plugin/esql/src/test/java/org/elasticsearch/xpack/esql/type/EsqlDataTypeRegistryTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ private void resolve(String esTypeName, TimeSeriesParams.MetricType metricType,
5252
)
5353
);
5454

55-
FieldCapabilitiesResponse caps = new FieldCapabilitiesResponse(idxResponses, List.of());
55+
FieldCapabilitiesResponse caps = FieldCapabilitiesResponse.builder().withIndexResponses(idxResponses).build();
5656
// IndexResolver uses EsqlDataTypeRegistry directly
5757
IndexResolution resolution = IndexResolver.mergedMappings("idx-*", new IndexResolver.FieldsInfo(caps, true, true));
5858
EsField f = resolution.get().mapping().get(field);

‎x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/dataframe/DestinationIndexTests.java‎

Lines changed: 14 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -285,14 +285,13 @@ private Map<String, Object> testCreateDestinationIndex(DataFrameAnalysis analysi
285285
doAnswer(callListenerOnResponse(getMappingsResponse)).when(client)
286286
.execute(eq(GetMappingsAction.INSTANCE), getMappingsRequestCaptor.capture(), any());
287287

288-
FieldCapabilitiesResponse fieldCapabilitiesResponse = new FieldCapabilitiesResponse(new String[0], new HashMap<>() {
289-
{
290-
put(NUMERICAL_FIELD, singletonMap("integer", createFieldCapabilities(NUMERICAL_FIELD, "integer")));
291-
put(OUTER_FIELD + "." + INNER_FIELD, singletonMap("integer", createFieldCapabilities(NUMERICAL_FIELD, "integer")));
292-
put(ALIAS_TO_NUMERICAL_FIELD, singletonMap("integer", createFieldCapabilities(NUMERICAL_FIELD, "integer")));
293-
put(ALIAS_TO_NESTED_FIELD, singletonMap("integer", createFieldCapabilities(NUMERICAL_FIELD, "integer")));
294-
}
295-
});
288+
FieldCapabilitiesResponse fieldCapabilitiesResponse = FieldCapabilitiesResponse.builder().withFields(Map.of(
289+
NUMERICAL_FIELD, singletonMap("integer", createFieldCapabilities(NUMERICAL_FIELD, "integer")),
290+
OUTER_FIELD + "." + INNER_FIELD, singletonMap("integer", createFieldCapabilities(NUMERICAL_FIELD, "integer")),
291+
ALIAS_TO_NUMERICAL_FIELD, singletonMap("integer", createFieldCapabilities(NUMERICAL_FIELD, "integer")),
292+
ALIAS_TO_NESTED_FIELD, singletonMap("integer", createFieldCapabilities(NUMERICAL_FIELD, "integer"))
293+
))
294+
.build();
296295

297296
doAnswer(callListenerOnResponse(fieldCapabilitiesResponse)).when(client)
298297
.execute(eq(TransportFieldCapabilitiesAction.TYPE), fieldCapabilitiesRequestCaptor.capture(), any());
@@ -615,14 +614,13 @@ private Map<String, Object> testUpdateMappingsToDestIndex(DataFrameAnalysis anal
615614
doAnswer(callListenerOnResponse(AcknowledgedResponse.TRUE)).when(client)
616615
.execute(eq(TransportPutMappingAction.TYPE), putMappingRequestCaptor.capture(), any());
617616

618-
FieldCapabilitiesResponse fieldCapabilitiesResponse = new FieldCapabilitiesResponse(new String[0], new HashMap<>() {
619-
{
620-
put(NUMERICAL_FIELD, singletonMap("integer", createFieldCapabilities(NUMERICAL_FIELD, "integer")));
621-
put(OUTER_FIELD + "." + INNER_FIELD, singletonMap("integer", createFieldCapabilities(NUMERICAL_FIELD, "integer")));
622-
put(ALIAS_TO_NUMERICAL_FIELD, singletonMap("integer", createFieldCapabilities(NUMERICAL_FIELD, "integer")));
623-
put(ALIAS_TO_NESTED_FIELD, singletonMap("integer", createFieldCapabilities(NUMERICAL_FIELD, "integer")));
624-
}
625-
});
617+
FieldCapabilitiesResponse fieldCapabilitiesResponse = FieldCapabilitiesResponse.builder().withFields(Map.of(
618+
NUMERICAL_FIELD, singletonMap("integer", createFieldCapabilities(NUMERICAL_FIELD, "integer")),
619+
OUTER_FIELD + "." + INNER_FIELD, singletonMap("integer", createFieldCapabilities(NUMERICAL_FIELD, "integer")),
620+
ALIAS_TO_NUMERICAL_FIELD, singletonMap("integer", createFieldCapabilities(NUMERICAL_FIELD, "integer")),
621+
ALIAS_TO_NESTED_FIELD, singletonMap("integer", createFieldCapabilities(NUMERICAL_FIELD, "integer"))
622+
))
623+
.build();
626624

627625
doAnswer(callListenerOnResponse(fieldCapabilitiesResponse)).when(client)
628626
.execute(eq(TransportFieldCapabilitiesAction.TYPE), fieldCapabilitiesRequestCaptor.capture(), any());

‎x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/dataframe/extractor/ExtractedFieldsDetectorTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1724,7 +1724,7 @@ private MockFieldCapsResponseBuilder addField(String field, boolean isMetadataFi
17241724
}
17251725

17261726
private FieldCapabilitiesResponse build() {
1727-
return new FieldCapabilitiesResponse(new String[] { "test" }, fieldCaps);
1727+
return FieldCapabilitiesResponse.builder().withIndices(new String[] { "test" }).withFields(fieldCaps).build();
17281728
}
17291729
}
17301730
}

‎x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/transforms/common/DocumentConversionUtilsTests.java‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -87,16 +87,17 @@ public void testRemoveInternalFields() {
8787
}
8888

8989
public void testExtractFieldMappings() {
90-
FieldCapabilitiesResponse response = new FieldCapabilitiesResponse(
91-
new String[] { "some-index" },
90+
FieldCapabilitiesResponse response = FieldCapabilitiesResponse.builder().withIndices(
91+
new String[] { "some-index" })
92+
.withFields(
9293
Map.ofEntries(
9394
entry("field-1", Map.of("keyword", createFieldCapabilities("field-1", "keyword"))),
9495
entry(
9596
"field-2",
9697
Map.of("long", createFieldCapabilities("field-2", "long"), "keyword", createFieldCapabilities("field-2", "keyword"))
9798
)
9899
)
99-
);
100+
).build();
100101

101102
assertThat(
102103
DocumentConversionUtils.extractFieldMappings(response),

‎x-pack/plugin/transform/src/test/java/org/elasticsearch/xpack/transform/transforms/pivot/SchemaUtilTests.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,7 @@ protected <Request extends ActionRequest, Response extends ActionResponse> void
287287
responseMap.put(field, singletonMap(field, createFieldCapabilities(field, type)));
288288
}
289289

290-
final FieldCapabilitiesResponse response = new FieldCapabilitiesResponse(fieldCapsRequest.indices(), responseMap);
290+
final FieldCapabilitiesResponse response = FieldCapabilitiesResponse.builder().withIndices(fieldCapsRequest.indices()).withFields(responseMap).build();
291291
listener.onResponse((Response) response);
292292
return;
293293
}

0 commit comments

Comments
 (0)