Skip to content

Commit a1b6ceb

Browse files
author
elasticsearchmachine
committed
[CI] Auto commit changes from spotless
1 parent 5e92c45 commit a1b6ceb

File tree

2 files changed

+18
-11
lines changed

2 files changed

+18
-11
lines changed

server/src/main/java/org/elasticsearch/cluster/metadata/SystemIndexMetadataUpgradeService.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -193,10 +193,7 @@ private List<DataStream> updateDataStreams(ClusterState currentState) {
193193
List<DataStream> updatedDataStreams = new ArrayList<>();
194194
for (DataStream dataStream : currentState.getMetadata().dataStreams().values()) {
195195
if (dataStream.isSystem() == false && systemIndices.isSystemDataStream(dataStream.getName())) {
196-
DataStream updatedDataStream = dataStream.copy()
197-
.setSystem(true)
198-
.setHidden(true)
199-
.build();
196+
DataStream updatedDataStream = dataStream.copy().setSystem(true).setHidden(true).build();
200197

201198
updatedDataStreams.add(updatedDataStream);
202199
}

server/src/test/java/org/elasticsearch/cluster/metadata/SystemIndexMetadataUpgradeServiceTests.java

Lines changed: 17 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,12 @@ public class SystemIndexMetadataUpgradeServiceTests extends ESTestCase {
5555
private static final String SYSTEM_DATA_STREAM_NAME = ".my-ds";
5656
private static final String SYSTEM_DATA_STREAM_INDEX_NAME = DataStream.BACKING_INDEX_PREFIX + SYSTEM_DATA_STREAM_NAME + "-1";
5757
private static final SystemDataStreamDescriptor SYSTEM_DATA_STREAM_DESCRIPTOR = new SystemDataStreamDescriptor(
58-
SYSTEM_DATA_STREAM_NAME, "System datastream for test", SystemDataStreamDescriptor.Type.INTERNAL,
59-
ComposableIndexTemplate.builder().build(), Collections.emptyMap(), Collections.singletonList("FAKE_ORIGIN"),
58+
SYSTEM_DATA_STREAM_NAME,
59+
"System datastream for test",
60+
SystemDataStreamDescriptor.Type.INTERNAL,
61+
ComposableIndexTemplate.builder().build(),
62+
Collections.emptyMap(),
63+
Collections.singletonList("FAKE_ORIGIN"),
6064
ExecutorNames.DEFAULT_SYSTEM_DATA_STREAM_THREAD_POOLS
6165
);
6266

@@ -66,11 +70,17 @@ public class SystemIndexMetadataUpgradeServiceTests extends ESTestCase {
6670
public void setUpTest() {
6771
// set up a system index upgrade service
6872
this.service = new SystemIndexMetadataUpgradeService(
69-
new SystemIndices(List.of(
70-
new SystemIndices.Feature("foo", "a test feature", List.of(DESCRIPTOR)),
71-
new SystemIndices.Feature("sds", "system data stream feature",
72-
Collections.emptyList(), Collections.singletonList(SYSTEM_DATA_STREAM_DESCRIPTOR))
73-
)),
73+
new SystemIndices(
74+
List.of(
75+
new SystemIndices.Feature("foo", "a test feature", List.of(DESCRIPTOR)),
76+
new SystemIndices.Feature(
77+
"sds",
78+
"system data stream feature",
79+
Collections.emptyList(),
80+
Collections.singletonList(SYSTEM_DATA_STREAM_DESCRIPTOR)
81+
)
82+
)
83+
),
7484
mock(ClusterService.class)
7585
);
7686
}

0 commit comments

Comments
 (0)