From 8bf9b95033bd232b5d2c49877bd8947c02971d43 Mon Sep 17 00:00:00 2001 From: Areek Zillur Date: Fri, 14 Nov 2014 19:34:45 -0500 Subject: [PATCH] Change action names to indicate it is a plugin action closes elastic/elasticsearch#10 Original commit: elastic/x-pack-elasticsearch@badae4062a399a01d592b1e292d5cd8b82523ef9 --- .../license/plugin/action/delete/DeleteLicenseAction.java | 2 +- .../license/plugin/action/get/GetLicenseAction.java | 2 +- .../license/plugin/action/put/PutLicenseAction.java | 2 +- .../org/elasticsearch/license/plugin/core/LicensesService.java | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/org/elasticsearch/license/plugin/action/delete/DeleteLicenseAction.java b/src/main/java/org/elasticsearch/license/plugin/action/delete/DeleteLicenseAction.java index 0c811d01465..bf7b7ae5950 100644 --- a/src/main/java/org/elasticsearch/license/plugin/action/delete/DeleteLicenseAction.java +++ b/src/main/java/org/elasticsearch/license/plugin/action/delete/DeleteLicenseAction.java @@ -11,7 +11,7 @@ import org.elasticsearch.client.ClusterAdminClient; public class DeleteLicenseAction extends ClusterAction { public static final DeleteLicenseAction INSTANCE = new DeleteLicenseAction(); - public static final String NAME = "cluster:admin/license/delete"; + public static final String NAME = "cluster:admin/plugin/license/delete"; private DeleteLicenseAction() { super(NAME); diff --git a/src/main/java/org/elasticsearch/license/plugin/action/get/GetLicenseAction.java b/src/main/java/org/elasticsearch/license/plugin/action/get/GetLicenseAction.java index cbb8487a1d1..6ffa332493a 100644 --- a/src/main/java/org/elasticsearch/license/plugin/action/get/GetLicenseAction.java +++ b/src/main/java/org/elasticsearch/license/plugin/action/get/GetLicenseAction.java @@ -11,7 +11,7 @@ import org.elasticsearch.client.ClusterAdminClient; public class GetLicenseAction extends ClusterAction { public static final GetLicenseAction INSTANCE = new GetLicenseAction(); - public static final String NAME = "cluster:admin/license/get"; + public static final String NAME = "cluster:admin/plugin/license/get"; private GetLicenseAction() { super(NAME); diff --git a/src/main/java/org/elasticsearch/license/plugin/action/put/PutLicenseAction.java b/src/main/java/org/elasticsearch/license/plugin/action/put/PutLicenseAction.java index 79c890d3d75..554fc4dcb67 100644 --- a/src/main/java/org/elasticsearch/license/plugin/action/put/PutLicenseAction.java +++ b/src/main/java/org/elasticsearch/license/plugin/action/put/PutLicenseAction.java @@ -11,7 +11,7 @@ import org.elasticsearch.client.ClusterAdminClient; public class PutLicenseAction extends ClusterAction { public static final PutLicenseAction INSTANCE = new PutLicenseAction(); - public static final String NAME = "cluster:admin/license/put"; + public static final String NAME = "cluster:admin/plugin/license/put"; private PutLicenseAction() { super(NAME); diff --git a/src/main/java/org/elasticsearch/license/plugin/core/LicensesService.java b/src/main/java/org/elasticsearch/license/plugin/core/LicensesService.java index d12249e54cd..a8ec72f5c80 100644 --- a/src/main/java/org/elasticsearch/license/plugin/core/LicensesService.java +++ b/src/main/java/org/elasticsearch/license/plugin/core/LicensesService.java @@ -87,7 +87,7 @@ import static org.elasticsearch.license.core.ESLicenses.reduceAndMap; @Singleton public class LicensesService extends AbstractLifecycleComponent implements ClusterStateListener, LicensesManagerService, LicensesClientService { - public static final String REGISTER_TRIAL_LICENSE_ACTION_NAME = "internal:cluster/licenses/register_trial_license"; + public static final String REGISTER_TRIAL_LICENSE_ACTION_NAME = "internal:plugin/licenses/cluster/register_trial_license"; private final ESLicenseManager licenseManager;