Restore check in RestCompatibleVersionHelper

alexey-ivanov-es · Dec 12, 2024 · a7b77d1 · a7b77d1
1 parent f458502
commit a7b77d1
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 10 deletions.
diff --git a/server/src/main/java/org/elasticsearch/rest/RestCompatibleVersionHelper.java b/server/src/main/java/org/elasticsearch/rest/RestCompatibleVersionHelper.java
@@ -11,7 +11,6 @@
 import org.elasticsearch.ElasticsearchStatusException;
 import org.elasticsearch.core.Nullable;
 import org.elasticsearch.core.RestApiVersion;
-import org.elasticsearch.core.UpdateForV9;
 import org.elasticsearch.xcontent.MediaType;
 import org.elasticsearch.xcontent.ParsedMediaType;
 
@@ -27,7 +26,6 @@ class RestCompatibleVersionHelper {
     /**
      * @return The requested API version, or {@link Optional#empty()} if there was no explicit version in the request.
      */
-    @UpdateForV9(owner = UpdateForV9.Owner.CORE_INFRA)
     static Optional<RestApiVersion> getCompatibleVersion(
         @Nullable ParsedMediaType acceptHeader,
         @Nullable ParsedMediaType contentTypeHeader,
@@ -52,8 +50,7 @@ static Optional<RestApiVersion> getCompatibleVersion(
         if (hasContent) {
 
             // content-type version must be current or prior
-            // This can be uncommented once all references to RestApiVersion.V_7 are removed
-            /*if (contentTypeVersion > RestApiVersion.current().major || contentTypeVersion < RestApiVersion.minimumSupported().major) {
+            if (contentTypeVersion > RestApiVersion.current().major || contentTypeVersion < RestApiVersion.minimumSupported().major) {
                 throw new ElasticsearchStatusException(
                     "Content-Type version must be either version {} or {}, but found {}. Content-Type={}",
                     RestStatus.BAD_REQUEST,
@@ -62,7 +59,7 @@ static Optional<RestApiVersion> getCompatibleVersion(
                     contentTypeVersion,
                     contentTypeHeader
                 );
-            }*/
+            }
             // if both accept and content-type are sent, the version must match
             if (contentTypeVersion != acceptVersion) {
                 throw new ElasticsearchStatusException(

diff --git a/server/src/test/java/org/elasticsearch/rest/RestCompatibleVersionHelperTests.java b/server/src/test/java/org/elasticsearch/rest/RestCompatibleVersionHelperTests.java
@@ -210,11 +210,14 @@ public void testObsoleteVersion() {
         assertThat(
             e.getMessage(),
             equalTo(
-                "A compatible version is required on both Content-Type and Accept headers if either one has requested a "
-                    + "compatible version and the compatible versions must match. "
-                    + "Accept="
-                    + acceptHeader(PREVIOUS_VERSION)
-                    + ", Content-Type="
+                "Content-Type version must be either version "
+                    + CURRENT_VERSION
+                    + " or "
+                    + PREVIOUS_VERSION
+                    + ", but found "
+                    + OBSOLETE_VERSION
+                    + ". "
+                    + "Content-Type="
                     + contentTypeHeader(OBSOLETE_VERSION)
             )
         );