Skip to content

Commit d29ce61

Browse files
author
elasticsearchmachine
committed
[CI] Auto commit changes from spotless
1 parent b42286f commit d29ce61

File tree

11 files changed

+73
-41
lines changed

11 files changed

+73
-41
lines changed

modules/data-streams/src/main/java/org/elasticsearch/datastreams/action/TransportGetDataStreamsAction.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -207,7 +207,8 @@ static IndexMode resolveMode(
207207
Instant.now(),
208208
settings,
209209
List.of(),
210-
ImmutableOpenMap.builder());
210+
ImmutableOpenMap.builder()
211+
);
211212
var rawMode = addlSettinsg.get(IndexSettings.MODE.getKey());
212213
if (rawMode != null) {
213214
indexMode = Enum.valueOf(IndexMode.class, rawMode.toUpperCase(Locale.ROOT));

modules/data-streams/src/test/java/org/elasticsearch/datastreams/action/TransportGetDataStreamsActionTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,8 @@ public void testProvidersAffectMode() {
499499
metadata,
500500
resolvedAt,
501501
indexTemplateAndCreateRequestSettings,
502-
combinedTemplateMappings, customMetadataBuilder) -> Settings.builder().put("index.mode", IndexMode.LOOKUP).build()
502+
combinedTemplateMappings,
503+
customMetadataBuilder) -> Settings.builder().put("index.mode", IndexMode.LOOKUP).build()
503504
)
504505
),
505506
null

server/src/main/java/org/elasticsearch/action/admin/indices/template/post/TransportSimulateIndexTemplateAction.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -287,7 +287,8 @@ public static Template resolveTemplate(
287287
now,
288288
templateSettings,
289289
mappings,
290-
ImmutableOpenMap.builder());
290+
ImmutableOpenMap.builder()
291+
);
291292
MetadataCreateIndexService.validateAdditionalSettings(provider, result, additionalSettings);
292293
dummySettings.put(result);
293294
additionalSettings.put(result);

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

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1163,7 +1163,8 @@ static Settings aggregateIndexSettings(
11631163
resolvedAt,
11641164
templateAndRequestSettings,
11651165
combinedTemplateMappings,
1166-
customMetadataBuilder);
1166+
customMetadataBuilder
1167+
);
11671168
validateAdditionalSettings(provider, newAdditionalSettings, additionalIndexSettings);
11681169
additionalIndexSettings.put(newAdditionalSettings);
11691170
if (provider.overrulesTemplateAndRequestSettings()) {
@@ -1500,7 +1501,8 @@ static IndexMetadata buildIndexMetadata(
15001501
int routingNumShards,
15011502
@Nullable IndexMetadata sourceMetadata,
15021503
boolean isSystem,
1503-
Map<String, DiffableStringMap> customData) {
1504+
Map<String, DiffableStringMap> customData
1505+
) {
15041506
IndexMetadata.Builder indexMetadataBuilder = createIndexMetadataBuilder(indexName, sourceMetadata, indexSettings, routingNumShards);
15051507
indexMetadataBuilder.system(isSystem);
15061508
// now, update the mappings with the actual source

server/src/main/java/org/elasticsearch/cluster/routing/allocation/DataTier.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -233,7 +233,8 @@ public Settings getAdditionalIndexSettings(
233233
Instant resolvedAt,
234234
Settings indexTemplateAndCreateRequestSettings,
235235
List<CompressedXContent> combinedTemplateMappings,
236-
ImmutableOpenMap.Builder<String, Map<String, String>> extraCustomMetadata) {
236+
ImmutableOpenMap.Builder<String, Map<String, String>> extraCustomMetadata
237+
) {
237238
Set<String> settings = indexTemplateAndCreateRequestSettings.keySet();
238239
if (settings.contains(TIER_PREFERENCE)) {
239240
// just a marker -- this null value will be removed or overridden by the template/request settings

server/src/main/java/org/elasticsearch/index/CustomIndexMetadataProvider.java

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@
2222

2323
public interface CustomIndexMetadataProvider {
2424

25-
2625
Map<String, Map<String, String>> onCreateIndex(
2726
String indexName,
2827
@Nullable String dataStreamName,
@@ -33,8 +32,5 @@ Map<String, Map<String, String>> onCreateIndex(
3332
List<CompressedXContent> combinedTemplateMappings
3433
);
3534

36-
Map<String, Map<String, String>> onMappingUpdate(
37-
IndexMetadata indexMetadata,
38-
MapperService mapperService
39-
);
35+
Map<String, Map<String, String>> onMappingUpdate(IndexMetadata indexMetadata, MapperService mapperService);
4036
}

server/src/main/java/org/elasticsearch/index/IndexMode.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -622,7 +622,8 @@ public Settings getAdditionalIndexSettings(
622622
Instant resolvedAt,
623623
Settings indexTemplateAndCreateRequestSettings,
624624
List<CompressedXContent> combinedTemplateMappings,
625-
ImmutableOpenMap.Builder<String, Map<String, String>> extraCustomMetadata) {
625+
ImmutableOpenMap.Builder<String, Map<String, String>> extraCustomMetadata
626+
) {
626627
IndexMode indexMode = templateIndexMode;
627628
if (indexMode == null) {
628629
String modeName = indexTemplateAndCreateRequestSettings.get(IndexSettings.MODE.getKey());

server/src/test/java/org/elasticsearch/action/admin/indices/template/post/TransportSimulateIndexTemplateActionTests.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,8 @@ public Settings getAdditionalIndexSettings(
7171
Instant resolvedAt,
7272
Settings allSettings,
7373
List<CompressedXContent> combinedTemplateMappings,
74-
ImmutableOpenMap.Builder<String, Map<String, String>> extraCustomMetadata) {
74+
ImmutableOpenMap.Builder<String, Map<String, String>> extraCustomMetadata
75+
) {
7576
return Settings.builder().put("test-setting", 0).build();
7677
}
7778
}, new IndexSettingProvider() {
@@ -84,7 +85,8 @@ public Settings getAdditionalIndexSettings(
8485
Instant resolvedAt,
8586
Settings indexTemplateAndCreateRequestSettings,
8687
List<CompressedXContent> combinedTemplateMappings,
87-
ImmutableOpenMap.Builder<String, Map<String, String>> extraCustomMetadata) {
88+
ImmutableOpenMap.Builder<String, Map<String, String>> extraCustomMetadata
89+
) {
8890
return Settings.builder().put("test-setting-2", 10).build();
8991
}
9092

server/src/test/java/org/elasticsearch/index/IndexSettingProviderTests.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,8 @@ public Settings getAdditionalIndexSettings(
9595
Instant resolvedAt,
9696
Settings indexTemplateAndCreateRequestSettings,
9797
List<CompressedXContent> combinedTemplateMappings,
98-
ImmutableOpenMap.Builder<String, Map<String, String>> extraCustomMetadata) {
98+
ImmutableOpenMap.Builder<String, Map<String, String>> extraCustomMetadata
99+
) {
99100
if (enabled.get()) {
100101
var builder = Settings.builder().put("index.refresh_interval", intervalValue);
101102
if (INDEX_SETTING_DEPTH_ENABLED.get()) {

x-pack/plugin/logsdb/src/main/java/org/elasticsearch/xpack/logsdb/LogsdbIndexModeSettingsProvider.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,8 @@ public Settings getAdditionalIndexSettings(
100100
final Instant resolvedAt,
101101
Settings settings,
102102
final List<CompressedXContent> combinedTemplateMappings,
103-
ImmutableOpenMap.Builder<String, Map<String, String>> extraCustomMetadata) {
103+
ImmutableOpenMap.Builder<String, Map<String, String>> extraCustomMetadata
104+
) {
104105
Settings.Builder settingsBuilder = null;
105106
boolean isLogsDB = templateIndexMode == IndexMode.LOGSDB;
106107
// This index name is used when validating component and index templates, we should skip this check in that case.

0 commit comments

Comments
 (0)