Address and remove all occurrences of the Java annotation @UpdateForV9 (ES-9378)

build-tools-internal/src/main/java/org/elasticsearch/gradle/internal/test/rest/compat/compat/AbstractYamlRestCompatTestPlugin.java

@@ -243,7 +243,6 @@ public void apply(Project project) {
         // setup the test task
         TaskProvider<? extends Test> yamlRestCompatTestTask = registerTestTask(project, yamlCompatTestSourceSet);
         yamlRestCompatTestTask.configure(testTask -> {
-            testTask.systemProperty("tests.restCompat", true);
             // Use test runner and classpath from "normal" yaml source set
             FileCollection outputFileCollection = yamlCompatTestSourceSet.getOutput();
             testTask.setTestClassesDirs(

rest-api-spec/src/yamlRestTest/java/org/elasticsearch/test/rest/ClientYamlTestSuiteIT.java

@@ -14,7 +14,6 @@
 import com.carrotsearch.randomizedtesting.annotations.TimeoutSuite;
 
 import org.apache.lucene.tests.util.TimeUnits;
-import org.elasticsearch.core.UpdateForV9;
 import org.elasticsearch.test.cluster.ElasticsearchCluster;
 import org.elasticsearch.test.cluster.FeatureFlag;
 import org.elasticsearch.test.rest.yaml.ClientYamlTestCandidate;
@@ -43,15 +42,9 @@ public ClientYamlTestSuiteIT(@Name("yaml") ClientYamlTestCandidate testCandidate
         super(testCandidate);
     }
 
-    @UpdateForV9(owner = UpdateForV9.Owner.CORE_INFRA) // remove restCompat check
     @ParametersFactory
     public static Iterable<Object[]> parameters() throws Exception {
-        String restCompatProperty = System.getProperty("tests.restCompat");
-        if ("true".equals(restCompatProperty)) {
-            return createParametersWithLegacyNodeSelectorSupport();
-        } else {
-            return createParameters();
-        }
+        return createParameters();
     }
 
     @Override

server/src/main/java/org/elasticsearch/ReleaseVersions.java

@@ -10,7 +10,7 @@
 package org.elasticsearch;
 
 import org.elasticsearch.common.Strings;
-import org.elasticsearch.core.UpdateForV9;
+import org.elasticsearch.core.UpdateForV10;
 import org.elasticsearch.internal.BuildExtension;
 import org.elasticsearch.plugins.ExtensionLoader;
 
@@ -114,8 +114,7 @@ private static IntFunction<String> lookupFunction(NavigableMap<Integer, List<Ver
                     // this will no longer be the case with ES 10 (which won't know about ES v8.x where we introduced separated versions)
                     // maybe keep the release mapping around in the csv file?
                     // SEP for now
-                    @UpdateForV9(owner = UpdateForV9.Owner.CORE_INFRA)
-                    // @UpdateForV10(owner = UpdateForV10.Owner.CORE_INFRA)
+                    @UpdateForV10(owner = UpdateForV10.Owner.CORE_INFRA)
                     Version oldVersion = Version.fromId(id);
                     return oldVersion.toString();
                 }

server/src/main/java/org/elasticsearch/Version.java

@@ -14,8 +14,8 @@
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;
 import org.elasticsearch.core.Assertions;
+import org.elasticsearch.core.RestApiVersion;
 import org.elasticsearch.core.SuppressForbidden;
-import org.elasticsearch.core.UpdateForV9;
 import org.elasticsearch.monitor.jvm.JvmInfo;
 import org.elasticsearch.xcontent.ToXContentFragment;
 import org.elasticsearch.xcontent.XContentBuilder;
@@ -238,17 +238,15 @@ public class Version implements VersionId<Version>, ToXContentFragment {
         VERSION_STRINGS = Map.copyOf(builderByString);
     }
 
-    @UpdateForV9(owner = UpdateForV9.Owner.CORE_INFRA)
-    // Re-enable this assertion once the rest api version is bumped
     private static void assertRestApiVersion() {
-        // assert RestApiVersion.current().major == CURRENT.major && RestApiVersion.previous().major == CURRENT.major - 1
-        // : "RestApiVersion must be upgraded "
-        // + "to reflect major from Version.CURRENT ["
-        // + CURRENT.major
-        // + "]"
-        // + " but is still set to ["
-        // + RestApiVersion.current().major
-        // + "]";
+        assert RestApiVersion.current().major == CURRENT.major && RestApiVersion.previous().major == CURRENT.major - 1
+            : "RestApiVersion must be upgraded "
+                + "to reflect major from Version.CURRENT ["
+                + CURRENT.major
+                + "]"
+                + " but is still set to ["
+                + RestApiVersion.current().major
+                + "]";
     }
 
     public static Version readVersion(StreamInput in) throws IOException {

server/src/main/java/org/elasticsearch/cluster/ClusterState.java

@@ -47,7 +47,6 @@
 import org.elasticsearch.common.xcontent.ChunkedToXContentHelper;
 import org.elasticsearch.core.Nullable;
 import org.elasticsearch.core.SuppressForbidden;
-import org.elasticsearch.core.UpdateForV9;
 import org.elasticsearch.index.shard.IndexLongFieldRange;
 import org.elasticsearch.indices.SystemIndexDescriptor;
 import org.elasticsearch.xcontent.ToXContent;
@@ -1037,12 +1036,6 @@ public static ClusterState readFrom(StreamInput in, DiscoveryNode localNode) thr
         return builder.build();
     }
 
-    /**
-     * If the cluster state does not contain transport version information, this is the version
-     * that is inferred for all nodes on version 8.8.0 or above.
-     */
-    @UpdateForV9(owner = UpdateForV9.Owner.CORE_INFRA)
-    public static final TransportVersion INFERRED_TRANSPORT_VERSION = TransportVersions.V_8_8_0;
     public static final Version VERSION_INTRODUCING_TRANSPORT_VERSIONS = Version.V_8_8_0;
 
     @Override

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

@@ -510,30 +510,6 @@ public Iterator<Setting<?>> settings() {
         Property.ServerlessPublic
     );
 
-    /**
-     * Legacy index setting, kept for 7.x BWC compatibility. This setting has no effect in 8.x. Do not use.
-     * TODO: Remove in 9.0
-     */
-    @Deprecated
-    public static final Setting<String> INDEX_ROLLUP_SOURCE_UUID = Setting.simpleString(
-        "index.rollup.source.uuid",
-        Property.IndexScope,
-        Property.PrivateIndex,
-        Property.IndexSettingDeprecatedInV7AndRemovedInV8
-    );
-
-    /**
-     * Legacy index setting, kept for 7.x BWC compatibility. This setting has no effect in 8.x. Do not use.
-     * TODO: Remove in 9.0
-     */
-    @Deprecated
-    public static final Setting<String> INDEX_ROLLUP_SOURCE_NAME = Setting.simpleString(
-        "index.rollup.source.name",
-        Property.IndexScope,
-        Property.PrivateIndex,
-        Property.IndexSettingDeprecatedInV7AndRemovedInV8
-    );
-
     public static final String KEY_IN_SYNC_ALLOCATIONS = "in_sync_allocations";
 
     public static final List<String> PARTIALLY_MOUNTED_INDEX_TIER_PREFERENCE = List.of(DataTier.DATA_FROZEN);

server/src/main/java/org/elasticsearch/common/settings/IndexScopedSettings.java

@@ -208,16 +208,7 @@ public final class IndexScopedSettings extends AbstractScopedSettings {
         IndexSettings.MODE,
         IndexMetadata.INDEX_ROUTING_PATH,
         IndexSettings.TIME_SERIES_START_TIME,
-        IndexSettings.TIME_SERIES_END_TIME,
-
-        // Legacy index settings we must keep around for BWC from 7.x
-        EngineConfig.INDEX_OPTIMIZE_AUTO_GENERATED_IDS,
-        IndexMetadata.INDEX_ROLLUP_SOURCE_NAME,
-        IndexMetadata.INDEX_ROLLUP_SOURCE_UUID,
-        IndexSettings.MAX_ADJACENCY_MATRIX_FILTERS_SETTING,
-        IndexingSlowLog.INDEX_INDEXING_SLOWLOG_LEVEL_SETTING,
-        SearchSlowLog.INDEX_SEARCH_SLOWLOG_LEVEL,
-        Store.FORCE_RAM_TERM_DICT
+        IndexSettings.TIME_SERIES_END_TIME
     );
 
     public static final IndexScopedSettings DEFAULT_SCOPED_SETTINGS = new IndexScopedSettings(Settings.EMPTY, BUILT_IN_INDEX_SETTINGS);

server/src/main/java/org/elasticsearch/common/settings/Setting.java

@@ -148,11 +148,10 @@ public enum Property {
         PrivateIndex,
 
         /**
-         * Indicates that this index-level setting was deprecated in {@link Version#V_7_17_0} and is
-         * forbidden in indices created from {@link Version#V_8_0_0} onwards.
+         * Indicates that this index-level setting was deprecated in {@link Version#V_8_18_0} and is
+         * forbidden in indices created from {@link Version#V_9_0_0} onwards.
          */
-        @UpdateForV9(owner = UpdateForV9.Owner.CORE_INFRA) // introduce IndexSettingDeprecatedInV8AndRemovedInV9 to replace this constant
-        IndexSettingDeprecatedInV7AndRemovedInV8,
+        IndexSettingDeprecatedInV8AndRemovedInV9,
 
         /**
          * Indicates that this setting is accessible by non-operator users (public) in serverless
@@ -175,7 +174,7 @@ public enum Property {
     private static final EnumSet<Property> DEPRECATED_PROPERTIES = EnumSet.of(
         Property.Deprecated,
         Property.DeprecatedWarning,
-        Property.IndexSettingDeprecatedInV7AndRemovedInV8
+        Property.IndexSettingDeprecatedInV8AndRemovedInV9
     );
 
     @SuppressWarnings("this-escape")
@@ -214,7 +213,7 @@ private Setting(
             checkPropertyRequiresIndexScope(propertiesAsSet, Property.NotCopyableOnResize);
             checkPropertyRequiresIndexScope(propertiesAsSet, Property.InternalIndex);
             checkPropertyRequiresIndexScope(propertiesAsSet, Property.PrivateIndex);
-            checkPropertyRequiresIndexScope(propertiesAsSet, Property.IndexSettingDeprecatedInV7AndRemovedInV8);
+            checkPropertyRequiresIndexScope(propertiesAsSet, Property.IndexSettingDeprecatedInV8AndRemovedInV9);
             checkPropertyRequiresNodeScope(propertiesAsSet);
             this.properties = propertiesAsSet;
         }
@@ -449,15 +448,15 @@ public boolean hasIndexScope() {
     private boolean isDeprecated() {
         return properties.contains(Property.Deprecated)
             || properties.contains(Property.DeprecatedWarning)
-            || properties.contains(Property.IndexSettingDeprecatedInV7AndRemovedInV8);
+            || properties.contains(Property.IndexSettingDeprecatedInV8AndRemovedInV9);
     }
 
     private boolean isDeprecatedWarningOnly() {
         return properties.contains(Property.DeprecatedWarning);
     }
 
     public boolean isDeprecatedAndRemoved() {
-        return properties.contains(Property.IndexSettingDeprecatedInV7AndRemovedInV8);
+        return properties.contains(Property.IndexSettingDeprecatedInV8AndRemovedInV9);
     }
 
     /**

server/src/main/java/org/elasticsearch/env/NodeEnvironment.java

@@ -23,6 +23,7 @@
 import org.apache.lucene.store.NativeFSLockFactory;
 import org.elasticsearch.Build;
 import org.elasticsearch.ElasticsearchException;
+import org.elasticsearch.Version;
 import org.elasticsearch.cluster.metadata.IndexMetadata;
 import org.elasticsearch.cluster.node.DiscoveryNode;
 import org.elasticsearch.cluster.node.DiscoveryNodeRole;
@@ -86,8 +87,6 @@
 import java.util.function.Consumer;
 import java.util.function.Function;
 import java.util.function.Predicate;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 import java.util.stream.Stream;
 
@@ -525,7 +524,7 @@ static void checkForIndexCompatibility(Logger logger, DataPath... dataPaths) thr
         logger.info("oldest index version recorded in NodeMetadata {}", metadata.oldestIndexVersion());
 
         if (metadata.oldestIndexVersion().before(IndexVersions.MINIMUM_COMPATIBLE)) {
-            String bestDowngradeVersion = getBestDowngradeVersion(metadata.previousNodeVersion().toString());
+            BuildVersion bestDowngradeVersion = getBestDowngradeVersion(metadata.previousNodeVersion());
             throw new IllegalStateException(
                 "Cannot start this node because it holds metadata for indices with version ["
                     + metadata.oldestIndexVersion().toReleaseVersion()
@@ -1504,28 +1503,17 @@ private static void tryWriteTempFile(Path path) throws IOException {
     /**
      * Get a useful version string to direct a user's downgrade operation
      *
-     * <p>If a user is trying to install 8.0 but has incompatible indices, the user should
-     * downgrade to 7.17.x. We return 7.17.0, unless the user is trying to upgrade from
-     * a 7.17.x release, in which case we return the last installed version.
+     * <p>If a user is trying to install 9.0 (current major) but has incompatible indices, the user should
+     * downgrade to 8.18.x (last minor of the previous major). We return 8.18.0, unless the user is trying to upgrade from
+     * a 8.18.x release, in which case we return the last installed version.
      * @return Version to downgrade to
      */
     // visible for testing
-    static String getBestDowngradeVersion(String previousNodeVersion) {
-        // this method should only be called in the context of an upgrade to 8.x
-        assert Build.current().version().startsWith("9.") == false;
-        Pattern pattern = Pattern.compile("^7\\.(\\d+)\\.\\d+$");
-        Matcher matcher = pattern.matcher(previousNodeVersion);
-        if (matcher.matches()) {
-            try {
-                int minorVersion = Integer.parseInt(matcher.group(1));
-                if (minorVersion >= 17) {
-                    return previousNodeVersion;
-                }
-            } catch (NumberFormatException e) {
-                // continue and return default
-            }
+    static BuildVersion getBestDowngradeVersion(BuildVersion previousNodeVersion) {
+        if (previousNodeVersion.onOrAfterMinimumCompatible()) {
+            return previousNodeVersion;
         }
-        return "7.17.0";
+        return BuildVersion.fromVersionId(Version.CURRENT.minimumCompatibilityVersion().id);
     }
 
 }

server/src/main/java/org/elasticsearch/env/NodeMetadata.java

@@ -10,7 +10,6 @@
 package org.elasticsearch.env;
 
 import org.elasticsearch.Build;
-import org.elasticsearch.core.UpdateForV9;
 import org.elasticsearch.gateway.MetadataStateFormat;
 import org.elasticsearch.index.IndexVersion;
 import org.elasticsearch.index.IndexVersions;
@@ -158,12 +157,11 @@ public void setOldestIndexVersion(int oldestIndexVersion) {
             this.oldestIndexVersion = IndexVersion.fromId(oldestIndexVersion);
         }
 
-        @UpdateForV9(owner = UpdateForV9.Owner.CORE_INFRA) // version is required in the node metadata from v9 onwards
         public NodeMetadata build() {
             final IndexVersion oldestIndexVersion;
 
             if (this.nodeVersion == null) {
-                nodeVersion = BuildVersion.fromVersionId(0);
+                throw new IllegalStateException("Node version is required in node metadata");
             }
             if (this.previousNodeVersion == null) {
                 previousNodeVersion = nodeVersion;

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

@@ -748,20 +748,6 @@ public Iterator<Setting<?>> settings() {
         Property.ServerlessPublic
     );
 
-    /**
-     * Legacy index setting, kept for 7.x BWC compatibility. This setting has no effect in 8.x. Do not use.
-     * TODO: Remove in 9.0
-     */
-    @Deprecated
-    public static final Setting<Integer> MAX_ADJACENCY_MATRIX_FILTERS_SETTING = Setting.intSetting(
-        "index.max_adjacency_matrix_filters",
-        100,
-        2,
-        Property.Dynamic,
-        Property.IndexScope,
-        Property.IndexSettingDeprecatedInV7AndRemovedInV8
-    );
-
     /**
      * The `index.mapping.ignore_above` setting defines the maximum length for the content of a field that will be indexed
      * or stored. If the length of the field’s content exceeds this limit, the field value will be ignored during indexing.

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

@@ -62,25 +62,18 @@ private static Version parseUnchecked(String version) {
     public static final IndexVersion ZERO = def(0, Version.LATEST);
 
     public static final IndexVersion V_7_0_0 = def(7_00_00_99, parseUnchecked("8.0.0"));
-    public static final IndexVersion V_7_1_0 = def(7_01_00_99, parseUnchecked("8.0.0"));
     public static final IndexVersion V_7_2_0 = def(7_02_00_99, parseUnchecked("8.0.0"));
     public static final IndexVersion V_7_2_1 = def(7_02_01_99, parseUnchecked("8.0.0"));
     public static final IndexVersion V_7_3_0 = def(7_03_00_99, parseUnchecked("8.1.0"));
     public static final IndexVersion V_7_4_0 = def(7_04_00_99, parseUnchecked("8.2.0"));
     public static final IndexVersion V_7_5_0 = def(7_05_00_99, parseUnchecked("8.3.0"));
-    public static final IndexVersion V_7_5_2 = def(7_05_02_99, parseUnchecked("8.3.0"));
     public static final IndexVersion V_7_6_0 = def(7_06_00_99, parseUnchecked("8.4.0"));
-    public static final IndexVersion V_7_7_0 = def(7_07_00_99, parseUnchecked("8.5.1"));
     public static final IndexVersion V_7_8_0 = def(7_08_00_99, parseUnchecked("8.5.1"));
     public static final IndexVersion V_7_9_0 = def(7_09_00_99, parseUnchecked("8.6.0"));
     public static final IndexVersion V_7_10_0 = def(7_10_00_99, parseUnchecked("8.7.0"));
-    public static final IndexVersion V_7_11_0 = def(7_11_00_99, parseUnchecked("8.7.0"));
     public static final IndexVersion V_7_12_0 = def(7_12_00_99, parseUnchecked("8.8.0"));
-    public static final IndexVersion V_7_13_0 = def(7_13_00_99, parseUnchecked("8.8.2"));
-    public static final IndexVersion V_7_14_0 = def(7_14_00_99, parseUnchecked("8.9.0"));
     public static final IndexVersion V_7_15_0 = def(7_15_00_99, parseUnchecked("8.9.0"));
     public static final IndexVersion V_7_16_0 = def(7_16_00_99, parseUnchecked("8.10.1"));
-    public static final IndexVersion V_7_17_0 = def(7_17_00_99, parseUnchecked("8.11.1"));
     public static final IndexVersion V_8_0_0 = def(8_00_00_99, Version.LUCENE_9_0_0);
     public static final IndexVersion V_8_1_0 = def(8_01_00_99, Version.LUCENE_9_0_0);
     public static final IndexVersion V_8_2_0 = def(8_02_00_99, Version.LUCENE_9_1_0);
@@ -243,8 +236,6 @@ static NavigableMap<Integer, IndexVersion> getAllVersionIds(Class<?> cls) {
         return Collections.unmodifiableNavigableMap(builder);
     }
 
-    @UpdateForV9(owner = UpdateForV9.Owner.CORE_INFRA)
-    // We can simplify this once we've removed all references to index versions earlier than MINIMUM_COMPATIBLE
     static Collection<IndexVersion> getAllVersions() {
         return VERSION_IDS.values().stream().filter(v -> v.onOrAfter(MINIMUM_COMPATIBLE)).toList();
     }

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

@@ -75,20 +75,6 @@ public final class IndexingSlowLog implements IndexingOperationListener {
         Property.IndexScope
     );
 
-    /**
-     * Legacy index setting, kept for 7.x BWC compatibility. This setting has no effect in 8.x. Do not use.
-     * TODO: Remove in 9.0
-     */
-    @Deprecated
-    public static final Setting<SlowLogLevel> INDEX_INDEXING_SLOWLOG_LEVEL_SETTING = new Setting<>(
-        INDEX_INDEXING_SLOWLOG_PREFIX + ".level",
-        SlowLogLevel.TRACE.name(),
-        SlowLogLevel::parse,
-        Property.Dynamic,
-        Property.IndexScope,
-        Property.IndexSettingDeprecatedInV7AndRemovedInV8
-    );
-
     private static final Logger indexLogger = LogManager.getLogger(INDEX_INDEXING_SLOWLOG_PREFIX + ".index");
 
     private final Index index;

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

@@ -110,20 +110,6 @@ public final class SearchSlowLog implements SearchOperationListener {
         Property.IndexScope
     );
 
-    /**
-     * Legacy index setting, kept for 7.x BWC compatibility. This setting has no effect in 8.x. Do not use.
-     * TODO: Remove in 9.0
-     */
-    @Deprecated
-    public static final Setting<SlowLogLevel> INDEX_SEARCH_SLOWLOG_LEVEL = new Setting<>(
-        INDEX_SEARCH_SLOWLOG_PREFIX + ".level",
-        SlowLogLevel.TRACE.name(),
-        SlowLogLevel::parse,
-        Property.Dynamic,
-        Property.IndexScope,
-        Property.IndexSettingDeprecatedInV7AndRemovedInV8
-    );
-
     private static final ToXContent.Params FORMAT_PARAMS = new ToXContent.MapParams(Collections.singletonMap("pretty", "false"));
 
     public SearchSlowLog(IndexSettings indexSettings, SlowLogFieldProvider slowLogFieldProvider) {