Skip to content

Commit 9f19b8f

Browse files
felixbarnyfelixbarny
committed
Rename getAdditionalIndexSettings to onCreateIndex
1 parent 0bfcdeb commit 9f19b8f

File tree

16 files changed

+61
-61
lines changed

16 files changed

+61
-61
lines changed

‎modules/data-streams/src/main/java/org/elasticsearch/datastreams/DataStreamIndexSettingsProvider.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ public class DataStreamIndexSettingsProvider implements IndexSettingProvider {
5858
}
5959

6060
@Override
61-
public void getAdditionalIndexSettings(
61+
public void onCreateIndex(
6262
String indexName,
6363
@Nullable String dataStreamName,
6464
@Nullable IndexMode templateIndexMode,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -199,7 +199,7 @@ static IndexMode resolveMode(
199199
IndexMode indexMode = state.metadata().retrieveIndexModeFromTemplate(indexTemplate);
200200
for (IndexSettingProvider provider : indexSettingProviders.getIndexSettingProviders()) {
201201
Settings.Builder builder = Settings.builder();
202-
provider.getAdditionalIndexSettings(
202+
provider.onCreateIndex(
203203
MetadataIndexTemplateService.VALIDATE_INDEX_NAME,
204204
dataStream.getName(),
205205
indexMode,

‎modules/data-streams/src/test/java/org/elasticsearch/datastreams/DataStreamIndexSettingsProviderTests.java‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ public void testGetAdditionalIndexSettings() throws Exception {
7676
}
7777
""";
7878
Settings.Builder additionalSettings = builder();
79-
provider.getAdditionalIndexSettings(
79+
provider.onCreateIndex(
8080
DataStream.getDefaultBackingIndexName(dataStreamName, 1),
8181
dataStreamName,
8282
IndexMode.TIME_SERIES,
@@ -125,7 +125,7 @@ public void testGetAdditionalIndexSettingsIndexRoutingPathAlreadyDefined() throw
125125
}
126126
""";
127127
Settings.Builder additionalSettings = builder();
128-
provider.getAdditionalIndexSettings(
128+
provider.onCreateIndex(
129129
DataStream.getDefaultBackingIndexName(dataStreamName, 1),
130130
dataStreamName,
131131
IndexMode.TIME_SERIES,
@@ -199,7 +199,7 @@ public void testGetAdditionalIndexSettingsMappingsMerging() throws Exception {
199199
}
200200
""";
201201
Settings.Builder additionalSettings = builder();
202-
provider.getAdditionalIndexSettings(
202+
provider.onCreateIndex(
203203
DataStream.getDefaultBackingIndexName(dataStreamName, 1),
204204
dataStreamName,
205205
IndexMode.TIME_SERIES,
@@ -228,7 +228,7 @@ public void testGetAdditionalIndexSettingsNoMappings() {
228228
Instant now = Instant.now().truncatedTo(ChronoUnit.SECONDS);
229229
Settings settings = Settings.EMPTY;
230230
Settings.Builder additionalSettings = builder();
231-
provider.getAdditionalIndexSettings(
231+
provider.onCreateIndex(
232232
DataStream.getDefaultBackingIndexName(dataStreamName, 1),
233233
dataStreamName,
234234
IndexMode.TIME_SERIES,
@@ -257,7 +257,7 @@ public void testGetAdditionalIndexSettingsLookAheadTime() throws Exception {
257257
TimeValue lookAheadTime = TimeValue.timeValueMinutes(30);
258258
Settings settings = builder().put("index.mode", "time_series").put("index.look_ahead_time", lookAheadTime.getStringRep()).build();
259259
Settings.Builder additionalSettings = builder();
260-
provider.getAdditionalIndexSettings(
260+
provider.onCreateIndex(
261261
DataStream.getDefaultBackingIndexName(dataStreamName, 1),
262262
dataStreamName,
263263
IndexMode.TIME_SERIES,
@@ -286,7 +286,7 @@ public void testGetAdditionalIndexSettingsLookBackTime() throws Exception {
286286
TimeValue lookBackTime = TimeValue.timeValueHours(12);
287287
Settings settings = builder().put("index.mode", "time_series").put("index.look_back_time", lookBackTime.getStringRep()).build();
288288
Settings.Builder additionalSettings = builder();
289-
provider.getAdditionalIndexSettings(
289+
provider.onCreateIndex(
290290
DataStream.getDefaultBackingIndexName(dataStreamName, 1),
291291
dataStreamName,
292292
IndexMode.TIME_SERIES,
@@ -322,7 +322,7 @@ public void testGetAdditionalIndexSettingsDataStreamAlreadyCreated() throws Exce
322322
Instant now = sixHoursAgo.plus(6, ChronoUnit.HOURS);
323323
Settings settings = Settings.EMPTY;
324324
Settings.Builder additionalSettings = builder();
325-
provider.getAdditionalIndexSettings(
325+
provider.onCreateIndex(
326326
DataStream.getDefaultBackingIndexName(dataStreamName, 1),
327327
dataStreamName,
328328
IndexMode.TIME_SERIES,
@@ -362,7 +362,7 @@ public void testGetAdditionalIndexSettingsDataStreamAlreadyCreatedTimeSettingsMi
362362
Settings settings = Settings.EMPTY;
363363
Exception e = expectThrows(
364364
IllegalStateException.class,
365-
() -> provider.getAdditionalIndexSettings(
365+
() -> provider.onCreateIndex(
366366
DataStream.getDefaultBackingIndexName(dataStreamName, 1),
367367
dataStreamName,
368368
IndexMode.TIME_SERIES,
@@ -391,7 +391,7 @@ public void testGetAdditionalIndexSettingsNonTsdbTemplate() {
391391

392392
Settings settings = Settings.EMPTY;
393393
Settings.Builder additionalSettings = builder();
394-
provider.getAdditionalIndexSettings(
394+
provider.onCreateIndex(
395395
DataStream.getDefaultBackingIndexName(dataStreamName, 1),
396396
dataStreamName,
397397
null,
@@ -417,7 +417,7 @@ public void testGetAdditionalIndexSettingsMigrateToTsdb() {
417417

418418
Settings settings = Settings.EMPTY;
419419
Settings.Builder additionalSettings = builder();
420-
provider.getAdditionalIndexSettings(
420+
provider.onCreateIndex(
421421
DataStream.getDefaultBackingIndexName(dataStreamName, 2),
422422
dataStreamName,
423423
IndexMode.TIME_SERIES,
@@ -450,7 +450,7 @@ public void testGetAdditionalIndexSettingsDowngradeFromTsdb() {
450450
);
451451

452452
Settings.Builder additionalSettings = builder();
453-
provider.getAdditionalIndexSettings(
453+
provider.onCreateIndex(
454454
DataStream.getDefaultBackingIndexName(dataStreamName, 2),
455455
dataStreamName,
456456
null,
@@ -733,7 +733,7 @@ private Settings generateTsdbSettings(String mapping, Instant now) throws IOExce
733733
Settings settings = Settings.EMPTY;
734734

735735
Settings.Builder additionalSettings = builder();
736-
provider.getAdditionalIndexSettings(
736+
provider.onCreateIndex(
737737
DataStream.getDefaultBackingIndexName(dataStreamName, 1),
738738
dataStreamName,
739739
IndexMode.TIME_SERIES,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -279,7 +279,7 @@ public static Template resolveTemplate(
279279
Set<String> overrulingSettings = new HashSet<>();
280280
for (var provider : indexSettingProviders) {
281281
Settings.Builder builder = Settings.builder();
282-
provider.getAdditionalIndexSettings(
282+
provider.onCreateIndex(
283283
indexName,
284284
template.getDataStreamTemplate() != null ? indexName : null,
285285
simulatedProject.retrieveIndexModeFromTemplate(template),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1156,7 +1156,7 @@ static Settings aggregateIndexSettings(
11561156
Set<String> overrulingSettings = new HashSet<>();
11571157
for (IndexSettingProvider provider : indexSettingProviders) {
11581158
Settings.Builder builder = Settings.builder();
1159-
provider.getAdditionalIndexSettings(
1159+
provider.onCreateIndex(
11601160
request.index(),
11611161
request.dataStreamName(),
11621162
templateIndexMode,

‎server/src/main/java/org/elasticsearch/cluster/metadata/MetadataIndexTemplateService.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -793,7 +793,7 @@ void validateIndexTemplateV2(ProjectMetadata projectMetadata, String name, Compo
793793
ImmutableOpenMap.Builder<String, Map<String, String>> customMetadataBuilder = ImmutableOpenMap.builder();
794794
for (var provider : indexSettingProviders) {
795795
Settings.Builder builder = Settings.builder();
796-
provider.getAdditionalIndexSettings(
796+
provider.onCreateIndex(
797797
VALIDATE_INDEX_NAME,
798798
indexTemplate.getDataStreamTemplate() != null ? VALIDATE_DATA_STREAM_NAME : null,
799799
projectMetadata.retrieveIndexModeFromTemplate(indexTemplate),

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ public static class DefaultHotAllocationSettingProvider implements IndexSettingP
219219
private static final Logger logger = LogManager.getLogger(DefaultHotAllocationSettingProvider.class);
220220

221221
@Override
222-
public void getAdditionalIndexSettings(
222+
public void onCreateIndex(
223223
String indexName,
224224
@Nullable String dataStreamName,
225225
IndexMode templateIndexMode,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -616,7 +616,7 @@ public String toString() {
616616
*/
617617
public static final class IndexModeSettingsProvider implements IndexSettingProvider {
618618
@Override
619-
public void getAdditionalIndexSettings(
619+
public void onCreateIndex(
620620
String indexName,
621621
String dataStreamName,
622622
IndexMode templateIndexMode,

‎server/src/main/java/org/elasticsearch/index/IndexSettingProvider.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ public interface IndexSettingProvider {
4949
* {@linkplain IndexMetadata.Builder#putCustom(String, Map) custom index metadata}
5050
* can be added
5151
*/
52-
void getAdditionalIndexSettings(
52+
void onCreateIndex(
5353
String indexName,
5454
@Nullable String dataStreamName,
5555
@Nullable IndexMode templateIndexMode,

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ public void testSettingsProviderIsOverridden() throws Exception {
6363
// Create a setting provider that sets the test-setting to 0
6464
Set<IndexSettingProvider> indexSettingsProviders = Set.of(new IndexSettingProvider() {
6565
@Override
66-
public void getAdditionalIndexSettings(
66+
public void onCreateIndex(
6767
String indexName,
6868
String dataStreamName,
6969
IndexMode templateIndexMode,
@@ -78,7 +78,7 @@ public void getAdditionalIndexSettings(
7878
}
7979
}, new IndexSettingProvider() {
8080
@Override
81-
public void getAdditionalIndexSettings(
81+
public void onCreateIndex(
8282
String indexName,
8383
String dataStreamName,
8484
IndexMode templateIndexMode,

0 commit comments

Comments
 (0)