Skip to content

Commit a9d1986

Browse files
rjernstrjernst
authored
Remove ImmutableOpenMap from most tests (elastic#88285)
This commit removes ImmutableOpenMap from most test cases from server, where the type is no longer needed because Map is used by the class being constructed. relates elastic#86239
1 parent bff8840 commit a9d1986

28 files changed

+122
-208
lines changed

‎server/src/test/java/org/elasticsearch/action/admin/cluster/migration/TransportGetFeatureUpgradeStatusActionTests.java

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,14 +12,14 @@
1212
import org.elasticsearch.cluster.ClusterState;
1313
import org.elasticsearch.cluster.metadata.IndexMetadata;
1414
import org.elasticsearch.cluster.metadata.Metadata;
15-
import org.elasticsearch.common.collect.ImmutableOpenMap;
1615
import org.elasticsearch.common.settings.Settings;
1716
import org.elasticsearch.indices.SystemIndexDescriptor;
1817
import org.elasticsearch.indices.SystemIndices;
1918
import org.elasticsearch.test.ESTestCase;
2019

2120
import java.util.ArrayList;
2221
import java.util.List;
22+
import java.util.Map;
2323

2424
import static org.elasticsearch.action.admin.cluster.migration.GetFeatureUpgradeStatusResponse.UpgradeStatus.MIGRATION_NEEDED;
2525
import static org.hamcrest.Matchers.equalTo;
@@ -87,12 +87,7 @@ private static ClusterState getClusterState() {
8787
.build();
8888

8989
ClusterState clusterState = new ClusterState.Builder(ClusterState.EMPTY_STATE).metadata(
90-
new Metadata.Builder().indices(
91-
ImmutableOpenMap.<String, IndexMetadata>builder()
92-
.fPut(".test-index-1", indexMetadata1)
93-
.fPut(".test-index-2", indexMetadata2)
94-
.build()
95-
).build()
90+
new Metadata.Builder().indices(Map.of(".test-index-1", indexMetadata1, ".test-index-2", indexMetadata2)).build()
9691
).build();
9792
return clusterState;
9893
}

‎server/src/test/java/org/elasticsearch/action/admin/cluster/reroute/ClusterRerouteResponseTests.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
import org.elasticsearch.cluster.routing.allocation.command.AllocateReplicaAllocationCommand;
2121
import org.elasticsearch.cluster.routing.allocation.decider.Decision;
2222
import org.elasticsearch.common.Strings;
23-
import org.elasticsearch.common.collect.ImmutableOpenMap;
2423
import org.elasticsearch.common.settings.Settings;
2524
import org.elasticsearch.common.transport.TransportAddress;
2625
import org.elasticsearch.common.xcontent.XContentHelper;
@@ -50,9 +49,7 @@ public void testToXContent() throws IOException {
5049
.build()
5150
)
5251
.build();
53-
ImmutableOpenMap.Builder<String, IndexMetadata> openMapBuilder = ImmutableOpenMap.builder();
54-
openMapBuilder.put("index", indexMetadata);
55-
Metadata metadata = Metadata.builder().indices(openMapBuilder.build()).build();
52+
Metadata metadata = Metadata.builder().indices(Map.of("index", indexMetadata)).build();
5653
ClusterState clusterState = ClusterState.builder(new ClusterName("test")).nodes(nodes).metadata(metadata).build();
5754

5855
RoutingExplanations routingExplanations = new RoutingExplanations();

‎server/src/test/java/org/elasticsearch/action/admin/indices/alias/get/TransportGetAliasesActionTests.java

Lines changed: 13 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@
1616
import org.elasticsearch.cluster.metadata.IndexMetadata;
1717
import org.elasticsearch.cluster.metadata.IndexNameExpressionResolver;
1818
import org.elasticsearch.cluster.metadata.Metadata;
19-
import org.elasticsearch.common.collect.ImmutableOpenMap;
2019
import org.elasticsearch.common.settings.Settings;
2120
import org.elasticsearch.common.util.concurrent.ThreadContext;
2221
import org.elasticsearch.core.Tuple;
@@ -45,9 +44,7 @@ public void testPostProcess() {
4544
ClusterState clusterState = ClusterState.builder(ClusterState.EMPTY_STATE).metadata(metadata).build();
4645

4746
GetAliasesRequest request = new GetAliasesRequest();
48-
ImmutableOpenMap<String, List<AliasMetadata>> aliases = ImmutableOpenMap.<String, List<AliasMetadata>>builder()
49-
.fPut("b", Collections.singletonList(new AliasMetadata.Builder("y").build()))
50-
.build();
47+
Map<String, List<AliasMetadata>> aliases = Map.of("b", Collections.singletonList(new AliasMetadata.Builder("y").build()));
5148
Map<String, List<AliasMetadata>> result = TransportGetAliasesAction.postProcess(
5249
request,
5350
new String[] { "a", "b", "c" },
@@ -64,9 +61,7 @@ public void testPostProcess() {
6461

6562
request = new GetAliasesRequest();
6663
request.replaceAliases("y", "z");
67-
aliases = ImmutableOpenMap.<String, List<AliasMetadata>>builder()
68-
.fPut("b", Collections.singletonList(new AliasMetadata.Builder("y").build()))
69-
.build();
64+
aliases = Map.of("b", Collections.singletonList(new AliasMetadata.Builder("y").build()));
7065
result = TransportGetAliasesAction.postProcess(
7166
request,
7267
new String[] { "a", "b", "c" },
@@ -82,9 +77,7 @@ public void testPostProcess() {
8277
assertThat(result.get("c").size(), equalTo(0));
8378

8479
request = new GetAliasesRequest("y", "z");
85-
aliases = ImmutableOpenMap.<String, List<AliasMetadata>>builder()
86-
.fPut("b", Collections.singletonList(new AliasMetadata.Builder("y").build()))
87-
.build();
80+
aliases = Map.of("b", Collections.singletonList(new AliasMetadata.Builder("y").build()));
8881
result = TransportGetAliasesAction.postProcess(
8982
request,
9083
new String[] { "a", "b", "c" },
@@ -102,10 +95,12 @@ public void testDeprecationWarningEmittedForTotalWildcard() {
10295
ClusterState state = systemIndexTestClusterState();
10396

10497
GetAliasesRequest request = new GetAliasesRequest();
105-
ImmutableOpenMap<String, List<AliasMetadata>> aliases = ImmutableOpenMap.<String, List<AliasMetadata>>builder()
106-
.fPut(".b", Collections.singletonList(new AliasMetadata.Builder(".y").build()))
107-
.fPut("c", Collections.singletonList(new AliasMetadata.Builder("d").build()))
108-
.build();
98+
Map<String, List<AliasMetadata>> aliases = Map.of(
99+
".b",
100+
Collections.singletonList(new AliasMetadata.Builder(".y").build()),
101+
"c",
102+
Collections.singletonList(new AliasMetadata.Builder("d").build())
103+
);
109104
final String[] concreteIndices = { "a", ".b", "c" };
110105
assertEquals(state.metadata().findAliases(request.aliases(), concreteIndices), aliases);
111106
Map<String, List<AliasMetadata>> result = TransportGetAliasesAction.postProcess(
@@ -136,9 +131,7 @@ public void testDeprecationWarningEmittedWhenSystemIndexIsRequested() {
136131

137132
GetAliasesRequest request = new GetAliasesRequest();
138133
request.indices(".b");
139-
ImmutableOpenMap<String, List<AliasMetadata>> aliases = ImmutableOpenMap.<String, List<AliasMetadata>>builder()
140-
.fPut(".b", Collections.singletonList(new AliasMetadata.Builder(".y").build()))
141-
.build();
134+
Map<String, List<AliasMetadata>> aliases = Map.of(".b", Collections.singletonList(new AliasMetadata.Builder(".y").build()));
142135
final String[] concreteIndices = { ".b" };
143136
assertEquals(state.metadata().findAliases(request.aliases(), concreteIndices), aliases);
144137
Map<String, List<AliasMetadata>> result = TransportGetAliasesAction.postProcess(
@@ -166,9 +159,7 @@ public void testDeprecationWarningEmittedWhenSystemIndexIsRequestedByAlias() {
166159
ClusterState state = systemIndexTestClusterState();
167160

168161
GetAliasesRequest request = new GetAliasesRequest(".y");
169-
ImmutableOpenMap<String, List<AliasMetadata>> aliases = ImmutableOpenMap.<String, List<AliasMetadata>>builder()
170-
.fPut(".b", Collections.singletonList(new AliasMetadata.Builder(".y").build()))
171-
.build();
162+
Map<String, List<AliasMetadata>> aliases = Map.of(".b", Collections.singletonList(new AliasMetadata.Builder(".y").build()));
172163
final String[] concreteIndices = { "a", ".b", "c" };
173164
assertEquals(state.metadata().findAliases(request.aliases(), concreteIndices), aliases);
174165
Map<String, List<AliasMetadata>> result = TransportGetAliasesAction.postProcess(
@@ -196,9 +187,7 @@ public void testDeprecationWarningNotEmittedWhenSystemAccessAllowed() {
196187
ClusterState state = systemIndexTestClusterState();
197188

198189
GetAliasesRequest request = new GetAliasesRequest(".y");
199-
ImmutableOpenMap<String, List<AliasMetadata>> aliases = ImmutableOpenMap.<String, List<AliasMetadata>>builder()
200-
.fPut(".b", Collections.singletonList(new AliasMetadata.Builder(".y").build()))
201-
.build();
190+
Map<String, List<AliasMetadata>> aliases = Map.of(".b", Collections.singletonList(new AliasMetadata.Builder(".y").build()));
202191
final String[] concreteIndices = { "a", ".b", "c" };
203192
assertEquals(state.metadata().findAliases(request.aliases(), concreteIndices), aliases);
204193
Map<String, List<AliasMetadata>> result = TransportGetAliasesAction.postProcess(
@@ -222,9 +211,7 @@ public void testDeprecationWarningNotEmittedWhenOnlyNonsystemIndexRequested() {
222211

223212
GetAliasesRequest request = new GetAliasesRequest();
224213
request.indices("c");
225-
ImmutableOpenMap<String, List<AliasMetadata>> aliases = ImmutableOpenMap.<String, List<AliasMetadata>>builder()
226-
.fPut("c", Collections.singletonList(new AliasMetadata.Builder("d").build()))
227-
.build();
214+
Map<String, List<AliasMetadata>> aliases = Map.of("c", Collections.singletonList(new AliasMetadata.Builder("d").build()));
228215
final String[] concreteIndices = { "c" };
229216
assertEquals(state.metadata().findAliases(request.aliases(), concreteIndices), aliases);
230217
Map<String, List<AliasMetadata>> result = TransportGetAliasesAction.postProcess(

‎server/src/test/java/org/elasticsearch/action/admin/indices/get/GetIndexResponseTests.java

Lines changed: 8 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
import org.elasticsearch.action.admin.indices.mapping.get.GetMappingsResponseTests;
1414
import org.elasticsearch.cluster.metadata.AliasMetadata;
1515
import org.elasticsearch.cluster.metadata.MappingMetadata;
16-
import org.elasticsearch.common.collect.ImmutableOpenMap;
1716
import org.elasticsearch.common.io.stream.Writeable;
1817
import org.elasticsearch.common.settings.IndexScopedSettings;
1918
import org.elasticsearch.common.settings.Settings;
@@ -23,8 +22,10 @@
2322
import java.util.ArrayList;
2423
import java.util.Collections;
2524
import java.util.Comparator;
25+
import java.util.HashMap;
2626
import java.util.List;
2727
import java.util.Locale;
28+
import java.util.Map;
2829

2930
public class GetIndexResponseTests extends AbstractWireSerializingTestCase<GetIndexResponse> {
3031

@@ -36,11 +37,11 @@ protected Writeable.Reader<GetIndexResponse> instanceReader() {
3637
@Override
3738
protected GetIndexResponse createTestInstance() {
3839
String[] indices = generateRandomStringArray(5, 5, false, false);
39-
ImmutableOpenMap.Builder<String, MappingMetadata> mappings = ImmutableOpenMap.builder();
40-
ImmutableOpenMap.Builder<String, List<AliasMetadata>> aliases = ImmutableOpenMap.builder();
41-
ImmutableOpenMap.Builder<String, Settings> settings = ImmutableOpenMap.builder();
42-
ImmutableOpenMap.Builder<String, Settings> defaultSettings = ImmutableOpenMap.builder();
43-
ImmutableOpenMap.Builder<String, String> dataStreams = ImmutableOpenMap.builder();
40+
Map<String, MappingMetadata> mappings = new HashMap<>();
41+
Map<String, List<AliasMetadata>> aliases = new HashMap<>();
42+
Map<String, Settings> settings = new HashMap<>();
43+
Map<String, Settings> defaultSettings = new HashMap<>();
44+
Map<String, String> dataStreams = new HashMap<>();
4445
IndexScopedSettings indexScopedSettings = IndexScopedSettings.DEFAULT_SCOPED_SETTINGS;
4546
boolean includeDefaults = randomBoolean();
4647
for (String index : indices) {
@@ -70,13 +71,6 @@ protected GetIndexResponse createTestInstance() {
7071
dataStreams.put(index, randomAlphaOfLength(5).toLowerCase(Locale.ROOT));
7172
}
7273
}
73-
return new GetIndexResponse(
74-
indices,
75-
mappings.build(),
76-
aliases.build(),
77-
settings.build(),
78-
defaultSettings.build(),
79-
dataStreams.build()
80-
);
74+
return new GetIndexResponse(indices, mappings, aliases, settings, defaultSettings, dataStreams);
8175
}
8276
}

‎server/src/test/java/org/elasticsearch/action/admin/indices/mapping/get/GetMappingsResponseTests.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
package org.elasticsearch.action.admin.indices.mapping.get;
1010

1111
import org.elasticsearch.cluster.metadata.MappingMetadata;
12-
import org.elasticsearch.common.collect.ImmutableOpenMap;
1312
import org.elasticsearch.common.io.stream.Writeable;
1413
import org.elasticsearch.index.mapper.MapperService;
1514
import org.elasticsearch.test.AbstractWireSerializingTestCase;
@@ -59,9 +58,7 @@ public static MappingMetadata createMappingsForIndex() {
5958

6059
@Override
6160
protected GetMappingsResponse createTestInstance() {
62-
ImmutableOpenMap.Builder<String, MappingMetadata> indexBuilder = ImmutableOpenMap.builder();
63-
indexBuilder.put("index-" + randomAlphaOfLength(5), createMappingsForIndex());
64-
GetMappingsResponse resp = new GetMappingsResponse(indexBuilder.build());
61+
GetMappingsResponse resp = new GetMappingsResponse(Map.of("index-" + randomAlphaOfLength(5), createMappingsForIndex()));
6562
logger.debug("--> created: {}", resp);
6663
return resp;
6764
}

‎server/src/test/java/org/elasticsearch/action/admin/indices/settings/get/GetSettingsResponseTests.java

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88

99
package org.elasticsearch.action.admin.indices.settings.get;
1010

11-
import org.elasticsearch.common.collect.ImmutableOpenMap;
1211
import org.elasticsearch.common.io.stream.Writeable;
1312
import org.elasticsearch.common.settings.IndexScopedSettings;
1413
import org.elasticsearch.common.settings.Settings;
@@ -48,9 +47,6 @@ protected GetSettingsResponse createTestInstance() {
4847
builder.put("index.refresh_interval", "1s");
4948
indexToSettings.put(indexName, builder.build());
5049
}
51-
ImmutableOpenMap<String, Settings> immutableIndexToSettings = ImmutableOpenMap.<String, Settings>builder()
52-
.putAllFromMap(indexToSettings)
53-
.build();
5450

5551
if (randomBoolean()) {
5652
for (String indexName : indexToSettings.keySet()) {
@@ -59,11 +55,7 @@ protected GetSettingsResponse createTestInstance() {
5955
}
6056
}
6157

62-
ImmutableOpenMap<String, Settings> immutableIndexToDefaultSettings = ImmutableOpenMap.<String, Settings>builder()
63-
.putAllFromMap(indexToDefaultSettings)
64-
.build();
65-
66-
return new GetSettingsResponse(immutableIndexToSettings, immutableIndexToDefaultSettings);
58+
return new GetSettingsResponse(indexToSettings, indexToDefaultSettings);
6759
}
6860

6961
@Override

‎server/src/test/java/org/elasticsearch/action/bulk/TransportBulkActionIngestTests.java

Lines changed: 17 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -202,28 +202,22 @@ public void setupAction() {
202202
when(state.getNodes()).thenReturn(nodes);
203203
Metadata metadata = Metadata.builder()
204204
.indices(
205-
ImmutableOpenMap.<String, IndexMetadata>builder()
206-
.putAllFromMap(
207-
Map.of(
208-
WITH_DEFAULT_PIPELINE,
209-
IndexMetadata.builder(WITH_DEFAULT_PIPELINE)
210-
.settings(
211-
settings(Version.CURRENT).put(IndexSettings.DEFAULT_PIPELINE.getKey(), "default_pipeline").build()
212-
)
213-
.putAlias(AliasMetadata.builder(WITH_DEFAULT_PIPELINE_ALIAS).build())
214-
.numberOfShards(1)
215-
.numberOfReplicas(1)
216-
.build(),
217-
".system",
218-
IndexMetadata.builder(".system")
219-
.settings(settings(Version.CURRENT))
220-
.system(true)
221-
.numberOfShards(1)
222-
.numberOfReplicas(0)
223-
.build()
224-
)
225-
)
226-
.build()
205+
Map.of(
206+
WITH_DEFAULT_PIPELINE,
207+
IndexMetadata.builder(WITH_DEFAULT_PIPELINE)
208+
.settings(settings(Version.CURRENT).put(IndexSettings.DEFAULT_PIPELINE.getKey(), "default_pipeline").build())
209+
.putAlias(AliasMetadata.builder(WITH_DEFAULT_PIPELINE_ALIAS).build())
210+
.numberOfShards(1)
211+
.numberOfReplicas(1)
212+
.build(),
213+
".system",
214+
IndexMetadata.builder(".system")
215+
.settings(settings(Version.CURRENT))
216+
.system(true)
217+
.numberOfShards(1)
218+
.numberOfReplicas(0)
219+
.build()
220+
)
227221
)
228222
.build();
229223
when(state.getMetadata()).thenReturn(metadata);
@@ -667,7 +661,7 @@ public void testFindDefaultPipelineFromTemplateMatch() {
667661
when(state.getMetadata()).thenReturn(metadata);
668662
when(metadata.templates()).thenReturn(templateMetadata);
669663
when(metadata.getTemplates()).thenReturn(templateMetadata);
670-
when(metadata.indices()).thenReturn(ImmutableOpenMap.of());
664+
when(metadata.indices()).thenReturn(Map.of());
671665

672666
IndexRequest indexRequest = new IndexRequest("missing_index").id("id");
673667
indexRequest.source(Collections.emptyMap());

‎server/src/test/java/org/elasticsearch/cluster/ClusterStateTests.java

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import org.elasticsearch.cluster.routing.TestShardRouting;
2828
import org.elasticsearch.common.Strings;
2929
import org.elasticsearch.common.UUIDs;
30-
import org.elasticsearch.common.collect.ImmutableOpenMap;
3130
import org.elasticsearch.common.settings.Settings;
3231
import org.elasticsearch.common.transport.TransportAddress;
3332
import org.elasticsearch.common.xcontent.XContentHelper;
@@ -102,10 +101,9 @@ public void testBuilderRejectsNullCustom() {
102101
public void testBuilderRejectsNullInCustoms() {
103102
final ClusterState.Builder builder = ClusterState.builder(ClusterName.DEFAULT);
104103
final String key = randomAlphaOfLength(10);
105-
final ImmutableOpenMap.Builder<String, ClusterState.Custom> mapBuilder = ImmutableOpenMap.builder();
106-
mapBuilder.put(key, null);
107-
final ImmutableOpenMap<String, ClusterState.Custom> map = mapBuilder.build();
108-
assertThat(expectThrows(NullPointerException.class, () -> builder.customs(map)).getMessage(), containsString(key));
104+
final Map<String, ClusterState.Custom> customs = new HashMap<>();
105+
customs.put(key, null);
106+
assertThat(expectThrows(NullPointerException.class, () -> builder.customs(customs)).getMessage(), containsString(key));
109107
}
110108

111109
public void testCopyAndUpdate() throws IOException {

‎server/src/test/java/org/elasticsearch/cluster/metadata/IndexMetadataTests.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
import org.elasticsearch.cluster.routing.allocation.DataTier;
1919
import org.elasticsearch.common.Strings;
2020
import org.elasticsearch.common.bytes.BytesReference;
21-
import org.elasticsearch.common.collect.ImmutableOpenMap;
2221
import org.elasticsearch.common.io.stream.BytesStreamOutput;
2322
import org.elasticsearch.common.io.stream.NamedWriteableAwareStreamInput;
2423
import org.elasticsearch.common.io.stream.NamedWriteableRegistry;
@@ -124,9 +123,7 @@ public void testIndexMetadataSerialization() throws IOException {
124123
assertEquals(metadata.getRoutingFactor(), fromXContentMeta.getRoutingFactor());
125124
assertEquals(metadata.primaryTerm(0), fromXContentMeta.primaryTerm(0));
126125
assertEquals(metadata.isSystem(), fromXContentMeta.isSystem());
127-
ImmutableOpenMap.Builder<String, DiffableStringMap> expectedCustomBuilder = ImmutableOpenMap.builder();
128-
expectedCustomBuilder.put("my_custom", new DiffableStringMap(customMap));
129-
ImmutableOpenMap<String, DiffableStringMap> expectedCustom = expectedCustomBuilder.build();
126+
Map<String, DiffableStringMap> expectedCustom = Map.of("my_custom", new DiffableStringMap(customMap));
130127
assertEquals(metadata.getCustomData(), expectedCustom);
131128
assertEquals(metadata.getCustomData(), fromXContentMeta.getCustomData());
132129

0 commit comments

Comments
 (0)