From 870a85582716caccb8f11ec762f932ee8be847bb Mon Sep 17 00:00:00 2001 From: Chris Earle Date: Wed, 13 Jul 2016 16:06:02 -0400 Subject: [PATCH] [License] Fix expected endpoint from [_xpack/_license] to [_xpack/license] Original commit: elastic/x-pack-elasticsearch@7a48bc674cb00070515575b34f46c46876589030 --- .../license/plugin/rest/RestDeleteLicenseAction.java | 2 +- .../license/plugin/rest/RestGetLicenseAction.java | 2 +- .../license/plugin/rest/RestPutLicenseAction.java | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/plugin/rest/RestDeleteLicenseAction.java b/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/plugin/rest/RestDeleteLicenseAction.java index be6cec8a7e9..e92e5a24f75 100644 --- a/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/plugin/rest/RestDeleteLicenseAction.java +++ b/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/plugin/rest/RestDeleteLicenseAction.java @@ -24,7 +24,7 @@ public class RestDeleteLicenseAction extends XPackRestHandler { public RestDeleteLicenseAction(Settings settings, RestController controller) { super(settings); // @deprecated Remove deprecations in 6.0 - controller.registerWithDeprecatedHandler(DELETE, URI_BASE + "/_license", this, + controller.registerWithDeprecatedHandler(DELETE, URI_BASE + "/license", this, DELETE, "/_license", deprecationLogger); // Remove _licenses support entirely in 6.0 diff --git a/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/plugin/rest/RestGetLicenseAction.java b/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/plugin/rest/RestGetLicenseAction.java index e1072fbe038..4851d0a1aae 100644 --- a/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/plugin/rest/RestGetLicenseAction.java +++ b/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/plugin/rest/RestGetLicenseAction.java @@ -35,7 +35,7 @@ public class RestGetLicenseAction extends XPackRestHandler { public RestGetLicenseAction(Settings settings, RestController controller) { super(settings); // @deprecated Remove deprecations in 6.0 - controller.registerWithDeprecatedHandler(GET, URI_BASE + "/_license", this, + controller.registerWithDeprecatedHandler(GET, URI_BASE + "/license", this, GET, "/_license", deprecationLogger); // Remove _licenses support entirely in 6.0 diff --git a/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/plugin/rest/RestPutLicenseAction.java b/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/plugin/rest/RestPutLicenseAction.java index 8aa5622121d..a5138db8fd3 100644 --- a/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/plugin/rest/RestPutLicenseAction.java +++ b/elasticsearch/x-pack/license-plugin/src/main/java/org/elasticsearch/license/plugin/rest/RestPutLicenseAction.java @@ -31,9 +31,9 @@ public class RestPutLicenseAction extends XPackRestHandler { public RestPutLicenseAction(Settings settings, RestController controller) { super(settings); // @deprecated Remove deprecations in 6.0 - controller.registerWithDeprecatedHandler(POST, URI_BASE + "/_license", this, + controller.registerWithDeprecatedHandler(POST, URI_BASE + "/license", this, POST, "/_license", deprecationLogger); - controller.registerWithDeprecatedHandler(PUT, URI_BASE + "/_license", this, + controller.registerWithDeprecatedHandler(PUT, URI_BASE + "/license", this, PUT, "/_license", deprecationLogger); // Remove _licenses support entirely in 6.0