Skip to content

Commit 6afa74a

Browse files
authored
Remove @UpdateForV9 annotations from Data Management code (elastic#123171) (elastic#123411)
* Remove `@UpdateForV9` as necessary backport has been done * Change UpdateForV9 to UpdateForV10 for ESRestTestCase due to N-2 support
1 parent 67f25ca commit 6afa74a

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

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

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import org.elasticsearch.common.io.stream.StreamOutput;
2020
import org.elasticsearch.common.io.stream.Writeable;
2121
import org.elasticsearch.core.Nullable;
22-
import org.elasticsearch.core.UpdateForV9;
2322
import org.elasticsearch.index.mapper.DataStreamTimestampFieldMapper;
2423
import org.elasticsearch.index.mapper.MapperService;
2524
import org.elasticsearch.xcontent.ConstructingObjectParser;
@@ -373,8 +372,6 @@ public static class DataStreamTemplate implements Writeable, ToXContentObject {
373372

374373
private static final ParseField HIDDEN = new ParseField("hidden");
375374
private static final ParseField ALLOW_CUSTOM_ROUTING = new ParseField("allow_custom_routing");
376-
// Remove this after this PR gets backported
377-
@UpdateForV9(owner = UpdateForV9.Owner.DATA_MANAGEMENT)
378375
private static final ParseField FAILURE_STORE = new ParseField("failure_store");
379376

380377
public static final ConstructingObjectParser<DataStreamTemplate, Void> PARSER = new ConstructingObjectParser<>(

test/framework/src/main/java/org/elasticsearch/test/rest/ESRestTestCase.java

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
import org.elasticsearch.core.Nullable;
6565
import org.elasticsearch.core.PathUtils;
6666
import org.elasticsearch.core.TimeValue;
67-
import org.elasticsearch.core.UpdateForV9;
67+
import org.elasticsearch.core.UpdateForV10;
6868
import org.elasticsearch.features.NodeFeature;
6969
import org.elasticsearch.health.node.selection.HealthNode;
7070
import org.elasticsearch.index.IndexSettings;
@@ -1993,11 +1993,12 @@ protected static boolean indexExists(RestClient client, String index) throws IOE
19931993
}
19941994

19951995
/**
1996-
* Deprecation message emitted since 7.12.0 for the rest of the 7.x series. Can be removed in v9 since it is not
1997-
* emitted in v8. Note that this message is also permitted in certain YAML test cases, it can be removed there too.
1998-
* See https://github.com/elastic/elasticsearch/issues/66419 for more details.
1996+
* Deprecation message emitted since 7.12.0 for the rest of the 7.x series. Can be removed in v10 since it is not
1997+
* emitted in v8 or v9 and N-2 versions are now supported.
1998+
* Note that this message is also permitted in certain YAML test cases, it can be removed there too.
1999+
* See https://github.com/elastic/elasticsearch/issues/66419 and https://github.com/elastic/elasticsearch/pull/119594 for more details.
19992000
*/
2000-
@UpdateForV9(owner = UpdateForV9.Owner.DATA_MANAGEMENT)
2001+
@UpdateForV10(owner = UpdateForV10.Owner.DISTRIBUTED_COORDINATION)
20012002
private static final String WAIT_FOR_ACTIVE_SHARDS_DEFAULT_DEPRECATION_MESSAGE = "the default value for the ?wait_for_active_shards "
20022003
+ "parameter will change from '0' to 'index-setting' in version 8; specify '?wait_for_active_shards=index-setting' "
20032004
+ "to adopt the future default behaviour, or '?wait_for_active_shards=0' to preserve today's behaviour";

0 commit comments

Comments
 (0)