Skip to content

Commit 61f9c4f

Browse files
author
elasticsearchmachine
committed
[CI] Auto commit changes from spotless
1 parent 4ef97b4 commit 61f9c4f

File tree

3 files changed

+8
-13
lines changed

3 files changed

+8
-13
lines changed

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

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -254,19 +254,17 @@ private List<IndexMetadata> updateIndicesBackingDataStreams(ClusterState current
254254

255255
for (DataStream updatedDataStream : updatedDataStreams) {
256256
boolean shouldBeSystem = updatedDataStream.isSystem();
257-
List<IndexMetadata> updatedIndicesMetadata = getIndicesBackingDataStreamMetadata(metadata, updatedDataStream)
258-
.map(idx -> updateIndexIfNecessary(idx, shouldBeSystem))
259-
.filter(Objects::nonNull)
260-
.toList();
257+
List<IndexMetadata> updatedIndicesMetadata = getIndicesBackingDataStreamMetadata(metadata, updatedDataStream).map(
258+
idx -> updateIndexIfNecessary(idx, shouldBeSystem)
259+
).filter(Objects::nonNull).toList();
261260

262261
updatedMetadata.addAll(updatedIndicesMetadata);
263262
}
264263
return updatedMetadata;
265264
}
266265

267266
private Stream<IndexMetadata> getIndicesBackingDataStreamMetadata(Metadata metadata, DataStream dataStream) {
268-
return Stream.concat(dataStream.getIndices().stream(), dataStream.getFailureIndices().stream())
269-
.map(metadata::index);
267+
return Stream.concat(dataStream.getIndices().stream(), dataStream.getFailureIndices().stream()).map(metadata::index);
270268
}
271269

272270
@Override

server/src/main/java/org/elasticsearch/indices/SystemDataStreamDescriptor.java

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import org.elasticsearch.cluster.metadata.ComponentTemplate;
1313
import org.elasticsearch.cluster.metadata.ComposableIndexTemplate;
1414
import org.elasticsearch.cluster.metadata.DataStream;
15-
import org.elasticsearch.cluster.metadata.IndexAbstraction;
1615
import org.elasticsearch.cluster.metadata.Metadata;
1716
import org.elasticsearch.index.Index;
1817

@@ -112,9 +111,7 @@ public List<String> getBackingIndexNames(Metadata metadata) {
112111
if (dataStream == null) {
113112
return Collections.emptyList();
114113
}
115-
return Stream.concat(dataStream.getIndices().stream(), dataStream.getFailureIndices().stream())
116-
.map(Index::getName)
117-
.toList();
114+
return Stream.concat(dataStream.getIndices().stream(), dataStream.getFailureIndices().stream()).map(Index::getName).toList();
118115
}
119116

120117
public String getDescription() {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -110,9 +110,9 @@ public void testUpgradeDataStreamToSystemDataStream() {
110110
.system(false)
111111
.settings(getSettingsBuilder().put(IndexMetadata.SETTING_INDEX_HIDDEN, true))
112112
.build();
113-
DataStream.DataStreamIndices failureIndices = DataStream.DataStreamIndices
114-
.failureIndicesBuilder(Collections.singletonList(fsIndexMetadata.getIndex()))
115-
.build();
113+
DataStream.DataStreamIndices failureIndices = DataStream.DataStreamIndices.failureIndicesBuilder(
114+
Collections.singletonList(fsIndexMetadata.getIndex())
115+
).build();
116116
DataStream dataStream = DataStream.builder(SYSTEM_DATA_STREAM_NAME, Collections.singletonList(dsIndexMetadata.getIndex()))
117117
.setFailureIndices(failureIndices)
118118
.setHidden(false)

0 commit comments

Comments
 (0)