From 9596fa583faa8d86e8fb123476c0f2fb5b92cc4a Mon Sep 17 00:00:00 2001 From: olcbean Date: Fri, 9 Mar 2018 13:12:10 +0100 Subject: [PATCH 1/3] RestUpgradeAction : remove explicit http method check --- .../rest/action/admin/indices/RestUpgradeAction.java | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestUpgradeAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestUpgradeAction.java index 1d32c14655ade..fd7e150b95034 100644 --- a/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestUpgradeAction.java +++ b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestUpgradeAction.java @@ -64,11 +64,8 @@ public String getName() { public RestChannelConsumer prepareRequest(RestRequest request, NodeClient client) throws IOException { if (request.method().equals(RestRequest.Method.GET)) { return handleGet(request, client); - } else if (request.method().equals(RestRequest.Method.POST)) { - return handlePost(request, client); - } else { - throw new IllegalArgumentException("illegal method [" + request.method() + "] for request [" + request.path() + "]"); - } + } + return handlePost(request, client); } private RestChannelConsumer handleGet(final RestRequest request, NodeClient client) { From 80ad35c94e39bb1884144fec9d24c565899e3b5e Mon Sep 17 00:00:00 2001 From: olcbean Date: Tue, 13 Mar 2018 12:44:49 +0100 Subject: [PATCH 2/3] addressing reviewers comments --- .../rest/action/admin/indices/RestUpgradeAction.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestUpgradeAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestUpgradeAction.java index fd7e150b95034..34b362ba2ed97 100644 --- a/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestUpgradeAction.java +++ b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestUpgradeAction.java @@ -65,7 +65,11 @@ public RestChannelConsumer prepareRequest(RestRequest request, NodeClient client if (request.method().equals(RestRequest.Method.GET)) { return handleGet(request, client); } - return handlePost(request, client); + if (request.method().equals(RestRequest.Method.POST)) { + return handlePost(request, client); + } + assert false; + return null; } private RestChannelConsumer handleGet(final RestRequest request, NodeClient client) { From d1baa66e7f943c1dc63396b483634ad17215db84 Mon Sep 17 00:00:00 2001 From: olcbean Date: Tue, 13 Mar 2018 15:08:11 +0100 Subject: [PATCH 3/3] throw AsserionError instead of assert false --- .../rest/action/admin/indices/RestUpgradeAction.java | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestUpgradeAction.java b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestUpgradeAction.java index 34b362ba2ed97..1b629ea5e62e8 100644 --- a/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestUpgradeAction.java +++ b/server/src/main/java/org/elasticsearch/rest/action/admin/indices/RestUpgradeAction.java @@ -64,12 +64,11 @@ public String getName() { public RestChannelConsumer prepareRequest(RestRequest request, NodeClient client) throws IOException { if (request.method().equals(RestRequest.Method.GET)) { return handleGet(request, client); - } - if (request.method().equals(RestRequest.Method.POST)) { + } else if (request.method().equals(RestRequest.Method.POST)) { return handlePost(request, client); + } else { + throw new AssertionError("unsupported method [" + request.method() + "] for request [" + request.path() + "]"); } - assert false; - return null; } private RestChannelConsumer handleGet(final RestRequest request, NodeClient client) {