fix tests and nits

jakelandis · Sep 27, 2024 · 34a1479 · 34a1479
1 parent 7203962
commit 34a1479
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 15 deletions.
diff --git a/server/src/main/java/org/elasticsearch/rest/RestController.java b/server/src/main/java/org/elasticsearch/rest/RestController.java
@@ -163,20 +163,22 @@ protected void registerAsDeprecatedHandler(
         Level deprecationLevel
     ) {
         assert (handler instanceof DeprecationRestHandler) == false;
-        registerHandler(
-            method,
-            path,
-            version,
-            new DeprecationRestHandler(
-                handler,
+        if (RestApiVersion.onOrAfter(RestApiVersion.minimumSupported()).test(version)) {
+            registerHandler(
                 method,
                 path,
-                deprecationLevel,
-                deprecationMessage,
-                deprecationLogger,
-                version != RestApiVersion.current()
-            )
-        );
+                version,
+                new DeprecationRestHandler(
+                    handler,
+                    method,
+                    path,
+                    deprecationLevel,
+                    deprecationMessage,
+                    deprecationLogger,
+                    version != RestApiVersion.current()
+                )
+            );
+        }
     }
 
     /**
@@ -237,7 +239,15 @@ protected void registerHandler(RestRequest.Method method, String path, RestApiVe
 
     private void registerHandlerNoWrap(RestRequest.Method method, String path, RestApiVersion version, RestHandler handler) {
         assert RestApiVersion.minimumSupported() == version || RestApiVersion.current() == version
-            : "REST API compatibility is only supported for version " + RestApiVersion.minimumSupported().major;
+            : "REST API compatibility is only supported for version "
+                + RestApiVersion.minimumSupported().major
+                + " [method="
+                + method
+                + ", path="
+                + path
+                + ", handler="
+                + handler.getClass().getCanonicalName()
+                + "]";
 
         if (RESERVED_PATHS.contains(path)) {
             throw new IllegalArgumentException("path [" + path + "] is a reserved path and may not be registered");
@@ -252,7 +262,7 @@ private void registerHandlerNoWrap(RestRequest.Method method, String path, RestA
     }
 
     public void registerHandler(final Route route, final RestHandler handler) {
-        if (route.isReplacement()) {
+        if (route.hasReplacement()) {
             Route replaced = route.getReplacedRoute();
             registerAsReplacedHandler(
                 route.getMethod(),

diff --git a/server/src/main/java/org/elasticsearch/rest/RestHandler.java b/server/src/main/java/org/elasticsearch/rest/RestHandler.java
@@ -343,7 +343,7 @@ public Route getReplacedRoute() {
             return replacedRoute;
         }
 
-        public boolean isReplacement() {
+        public boolean hasReplacement() {
             return replacedRoute != null;
         }
     }