Avoid override of routes() in BaseRestHandler to respect the default …

…behavior defined in RestHandler (#889)
opensearch-project · Jul 14, 2021 · 7241127 · 7241127
1 parent 4906a3c
commit 7241127
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 59 deletions.
diff --git a/server/src/main/java/org/opensearch/rest/BaseRestHandler.java b/server/src/main/java/org/opensearch/rest/BaseRestHandler.java
@@ -95,12 +95,6 @@ public final long getUsageCount() {
      */
     public abstract String getName();
 
-    /**
-     * {@inheritDoc}
-     */
-    @Override
-    public abstract List<Route> routes();
-
     @Override
     public final void handleRequest(RestRequest request, RestChannel channel, NodeClient client) throws Exception {
         // prepare the request for execution; has the side effect of touching the request parameters

diff --git a/server/src/test/java/org/opensearch/rest/BaseRestHandlerTests.java b/server/src/test/java/org/opensearch/rest/BaseRestHandlerTests.java
@@ -49,7 +49,6 @@
 import java.io.IOException;
 import java.util.Collections;
 import java.util.HashMap;
-import java.util.List;
 import java.util.Set;
 import java.util.concurrent.atomic.AtomicBoolean;
 
@@ -87,11 +86,6 @@ protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient cli
             public String getName() {
                 return "test_one_unconsumed_response_action";
             }
-
-            @Override
-            public List<Route> routes() {
-                return Collections.emptyList();
-            }
         };
 
         final HashMap<String, String> params = new HashMap<>();
@@ -118,11 +112,6 @@ protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient cli
             public String getName() {
                 return "test_multiple_unconsumed_response_action";
             }
-
-            @Override
-            public List<Route> routes() {
-                return Collections.emptyList();
-            }
         };
 
         final HashMap<String, String> params = new HashMap<>();
@@ -159,11 +148,6 @@ protected Set<String> responseParams() {
             public String getName() {
                 return "test_unconsumed_did_you_mean_response_action";
             }
-
-            @Override
-            public List<Route> routes() {
-                return Collections.emptyList();
-            }
         };
 
         final HashMap<String, String> params = new HashMap<>();
@@ -207,11 +191,6 @@ protected Set<String> responseParams() {
             public String getName() {
                 return "test_unconsumed_response_action";
             }
-
-            @Override
-            public List<Route> routes() {
-                return Collections.emptyList();
-            }
         };
 
         final HashMap<String, String> params = new HashMap<>();
@@ -235,11 +214,6 @@ protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient cli
             public String getName() {
                 return "test_default_response_action";
             }
-
-            @Override
-            public List<Route> routes() {
-                return Collections.emptyList();
-            }
         };
 
         final HashMap<String, String> params = new HashMap<>();
@@ -275,11 +249,6 @@ protected Table getTableWithHeader(RestRequest request) {
             public String getName() {
                 return "test_cat_response_action";
             }
-
-            @Override
-            public List<Route> routes() {
-                return Collections.emptyList();
-            }
         };
 
         final HashMap<String, String> params = new HashMap<>();
@@ -310,11 +279,6 @@ protected RestChannelConsumer prepareRequest(final RestRequest request, final No
             public String getName() {
                 return "test_consumed_body";
             }
-
-            @Override
-            public List<Route> routes() {
-                return Collections.emptyList();
-            }
         };
 
         try (XContentBuilder builder = JsonXContent.contentBuilder().startObject().endObject()) {
@@ -339,11 +303,6 @@ protected RestChannelConsumer prepareRequest(final RestRequest request, final No
             public String getName() {
                 return "test_unconsumed_body";
             }
-
-            @Override
-            public List<Route> routes() {
-                return Collections.emptyList();
-            }
         };
 
         final RestRequest request = new FakeRestRequest.Builder(xContentRegistry()).build();
@@ -364,11 +323,6 @@ protected RestChannelConsumer prepareRequest(final RestRequest request, final No
             public String getName() {
                 return "test_unconsumed_body";
             }
-
-            @Override
-            public List<Route> routes() {
-                return Collections.emptyList();
-            }
         };
 
         try (XContentBuilder builder = JsonXContent.contentBuilder().startObject().endObject()) {

diff --git a/server/src/test/java/org/opensearch/usage/UsageServiceTests.java b/server/src/test/java/org/opensearch/usage/UsageServiceTests.java
@@ -40,8 +40,6 @@
 import org.opensearch.test.client.NoOpNodeClient;
 import org.opensearch.test.rest.FakeRestRequest;
 
-import java.util.Collections;
-import java.util.List;
 import java.util.Locale;
 import java.util.Map;
 
@@ -200,11 +198,6 @@ public String getName() {
             return name;
         }
 
-        @Override
-        public List<Route> routes() {
-            return Collections.emptyList();
-        }
-
         @Override
         protected RestChannelConsumer prepareRequest(RestRequest request, NodeClient client) {
             return channel -> {