Skip to content

Commit 24ddc07

Browse files
committed
Remove unused parameter
1 parent 9135578 commit 24ddc07

File tree

2 files changed

+12
-13
lines changed

2 files changed

+12
-13
lines changed

server/src/main/java/org/elasticsearch/action/admin/indices/rollover/MetadataRolloverService.java

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -152,7 +152,7 @@ public RolloverResult rolloverClusterState(
152152
@Nullable AutoShardingResult autoShardingResult,
153153
boolean isFailureStoreRollover
154154
) throws Exception {
155-
validate(currentState.metadata(), rolloverTarget, newIndexName, createIndexRequest, isFailureStoreRollover);
155+
validate(currentState.metadata(), rolloverTarget, newIndexName, createIndexRequest);
156156
final IndexAbstraction indexAbstraction = currentState.metadata().getIndicesLookup().get(rolloverTarget);
157157
return switch (indexAbstraction.getType()) {
158158
case ALIAS -> rolloverAlias(
@@ -194,7 +194,7 @@ public static NameResolution resolveRolloverNames(
194194
CreateIndexRequest createIndexRequest,
195195
boolean isFailureStoreRollover
196196
) {
197-
validate(project, rolloverTarget, newIndexName, createIndexRequest, isFailureStoreRollover);
197+
validate(project, rolloverTarget, newIndexName, createIndexRequest);
198198
final IndexAbstraction indexAbstraction = project.getIndicesLookup().get(rolloverTarget);
199199
return switch (indexAbstraction.getType()) {
200200
case ALIAS -> resolveAliasRolloverNames(project, indexAbstraction, newIndexName);
@@ -660,8 +660,7 @@ static void validate(
660660
ProjectMetadata project,
661661
String rolloverTarget,
662662
String newIndexName,
663-
CreateIndexRequest request,
664-
boolean isFailureStoreRollover
663+
CreateIndexRequest request
665664
) {
666665
final IndexAbstraction indexAbstraction = project.getIndicesLookup().get(rolloverTarget);
667666
if (indexAbstraction == null) {

server/src/test/java/org/elasticsearch/action/admin/indices/rollover/MetadataRolloverServiceTests.java

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -205,21 +205,21 @@ public void testAliasValidation() {
205205

206206
IllegalArgumentException exception = expectThrows(
207207
IllegalArgumentException.class,
208-
() -> MetadataRolloverService.validate(metadata, aliasWithNoWriteIndex, randomAlphaOfLength(5), req, false)
208+
() -> MetadataRolloverService.validate(metadata, aliasWithNoWriteIndex, randomAlphaOfLength(5), req)
209209
);
210210
assertThat(exception.getMessage(), equalTo("rollover target [" + aliasWithNoWriteIndex + "] does not point to a write index"));
211211
exception = expectThrows(
212212
IllegalArgumentException.class,
213-
() -> MetadataRolloverService.validate(metadata, randomFrom(index1, index2), randomAlphaOfLength(5), req, false)
213+
() -> MetadataRolloverService.validate(metadata, randomFrom(index1, index2), randomAlphaOfLength(5), req)
214214
);
215215
assertThat(exception.getMessage(), equalTo("rollover target is a [concrete index] but one of [alias,data_stream] was expected"));
216216
final String aliasName = randomAlphaOfLength(5);
217217
exception = expectThrows(
218218
IllegalArgumentException.class,
219-
() -> MetadataRolloverService.validate(metadata, aliasName, randomAlphaOfLength(5), req, false)
219+
() -> MetadataRolloverService.validate(metadata, aliasName, randomAlphaOfLength(5), req)
220220
);
221221
assertThat(exception.getMessage(), equalTo("rollover target [" + aliasName + "] does not exist"));
222-
MetadataRolloverService.validate(metadata, aliasWithWriteIndex, randomAlphaOfLength(5), req, false);
222+
MetadataRolloverService.validate(metadata, aliasWithWriteIndex, randomAlphaOfLength(5), req);
223223
}
224224

225225
public void testDataStreamValidation() throws IOException {
@@ -232,18 +232,18 @@ public void testDataStreamValidation() throws IOException {
232232
ProjectMetadata metadata = md.build();
233233
CreateIndexRequest req = new CreateIndexRequest();
234234

235-
MetadataRolloverService.validate(metadata, randomDataStream.getName(), null, req, false);
235+
MetadataRolloverService.validate(metadata, randomDataStream.getName(), null, req);
236236

237237
IllegalArgumentException exception = expectThrows(
238238
IllegalArgumentException.class,
239-
() -> MetadataRolloverService.validate(metadata, randomDataStream.getName(), randomAlphaOfLength(5), req, false)
239+
() -> MetadataRolloverService.validate(metadata, randomDataStream.getName(), randomAlphaOfLength(5), req)
240240
);
241241
assertThat(exception.getMessage(), equalTo("new index name may not be specified when rolling over a data stream"));
242242

243243
CreateIndexRequest aliasReq = new CreateIndexRequest().alias(new Alias("no_aliases_permitted"));
244244
exception = expectThrows(
245245
IllegalArgumentException.class,
246-
() -> MetadataRolloverService.validate(metadata, randomDataStream.getName(), null, aliasReq, false)
246+
() -> MetadataRolloverService.validate(metadata, randomDataStream.getName(), null, aliasReq)
247247
);
248248
assertThat(
249249
exception.getMessage(),
@@ -254,7 +254,7 @@ public void testDataStreamValidation() throws IOException {
254254
CreateIndexRequest mappingReq = new CreateIndexRequest().mapping(mapping);
255255
exception = expectThrows(
256256
IllegalArgumentException.class,
257-
() -> MetadataRolloverService.validate(metadata, randomDataStream.getName(), null, mappingReq, false)
257+
() -> MetadataRolloverService.validate(metadata, randomDataStream.getName(), null, mappingReq)
258258
);
259259
assertThat(
260260
exception.getMessage(),
@@ -264,7 +264,7 @@ public void testDataStreamValidation() throws IOException {
264264
CreateIndexRequest settingReq = new CreateIndexRequest().settings(Settings.builder().put("foo", "bar"));
265265
exception = expectThrows(
266266
IllegalArgumentException.class,
267-
() -> MetadataRolloverService.validate(metadata, randomDataStream.getName(), null, settingReq, false)
267+
() -> MetadataRolloverService.validate(metadata, randomDataStream.getName(), null, settingReq)
268268
);
269269
assertThat(
270270
exception.getMessage(),

0 commit comments

Comments
 (0)