From beb5986256f832ef9fc4cd3639120e2b97701296 Mon Sep 17 00:00:00 2001
From: Shay Banon <kimchy@gmail.com>
Date: Tue, 3 Jan 2012 01:04:08 +0200
Subject: [PATCH] nicer main action names

---
 .../action/TransportActions.java              | 43 +++++++------------
 .../action/bulk/TransportShardBulkAction.java |  3 +-
 .../action/count/TransportCountAction.java    |  2 +-
 .../TransportIndexDeleteByQueryAction.java    |  3 +-
 .../TransportShardDeleteByQueryAction.java    |  3 +-
 .../action/get/TransportGetAction.java        |  4 +-
 .../get/TransportShardMultiGetAction.java     |  5 ++-
 .../percolate/TransportPercolateAction.java   |  2 +-
 8 files changed, 27 insertions(+), 38 deletions(-)

diff --git a/src/main/java/org/elasticsearch/action/TransportActions.java b/src/main/java/org/elasticsearch/action/TransportActions.java
index 9e6c061e518..f98af2c008a 100644
--- a/src/main/java/org/elasticsearch/action/TransportActions.java
+++ b/src/main/java/org/elasticsearch/action/TransportActions.java
@@ -24,39 +24,26 @@ package org.elasticsearch.action;
  */
 public class TransportActions {
 
-    public static final String BULK = "indices/bulk";
-
-    public static final String INDEX = "indices/index/shard/index";
-
+    public static final String BULK = "bulk";
+    public static final String INDEX = "index";
     public static final String UPDATE = "update";
-
-    public static final String COUNT = "indices/count";
-
-    public static final String DELETE = "indices/index/shard/delete";
-
-    public static final String DELETE_BY_QUERY = "indices/deleteByQuery";
-
-    public static final String GET = "indices/get";
-
-    public static final String MULTI_GET = "indices/mget";
-
-    public static final String SEARCH = "indices/search";
-
-    public static final String SEARCH_SCROLL = "indices/searchScroll";
-
-    public static final String TERMS = "indices/terms";
-
-    public static final String MORE_LIKE_THIS = "indices/moreLikeThis";
-
-    public static final String PERCOLATE = "indices/percolate";
+    public static final String COUNT = "count";
+    public static final String DELETE = "delete";
+    public static final String DELETE_BY_QUERY = "deleteByQuery";
+    public static final String GET = "get";
+    public static final String MULTI_GET = "mget";
+    public static final String SEARCH = "search";
+    public static final String SEARCH_SCROLL = "searchScroll";
+    public static final String MORE_LIKE_THIS = "mlt";
+    public static final String PERCOLATE = "percolate";
 
     public static class Admin {
 
         public static class Indices {
-            public static final String CREATE = "indices/createIndex";
-            public static final String DELETE = "indices/deleteIndex";
-            public static final String OPEN = "indices/openIndex";
-            public static final String CLOSE = "indices/closeIndex";
+            public static final String CREATE = "indices/create";
+            public static final String DELETE = "indices/delete";
+            public static final String OPEN = "indices/open";
+            public static final String CLOSE = "indices/close";
             public static final String FLUSH = "indices/flush";
             public static final String REFRESH = "indices/refresh";
             public static final String OPTIMIZE = "indices/optimize";
diff --git a/src/main/java/org/elasticsearch/action/bulk/TransportShardBulkAction.java b/src/main/java/org/elasticsearch/action/bulk/TransportShardBulkAction.java
index dbd0ed0df8b..d397be17531 100644
--- a/src/main/java/org/elasticsearch/action/bulk/TransportShardBulkAction.java
+++ b/src/main/java/org/elasticsearch/action/bulk/TransportShardBulkAction.java
@@ -23,6 +23,7 @@ import org.elasticsearch.ElasticSearchException;
 import org.elasticsearch.ExceptionsHelper;
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.RoutingMissingException;
+import org.elasticsearch.action.TransportActions;
 import org.elasticsearch.action.delete.DeleteRequest;
 import org.elasticsearch.action.delete.DeleteResponse;
 import org.elasticsearch.action.index.IndexRequest;
@@ -102,7 +103,7 @@ public class TransportShardBulkAction extends TransportShardReplicationOperation
 
     @Override
     protected String transportAction() {
-        return "indices/index/shard/bulk";
+        return TransportActions.BULK + "/shard";
     }
 
     @Override
diff --git a/src/main/java/org/elasticsearch/action/count/TransportCountAction.java b/src/main/java/org/elasticsearch/action/count/TransportCountAction.java
index 117730cae4c..5f59c4ced22 100644
--- a/src/main/java/org/elasticsearch/action/count/TransportCountAction.java
+++ b/src/main/java/org/elasticsearch/action/count/TransportCountAction.java
@@ -69,7 +69,7 @@ public class TransportCountAction extends TransportBroadcastOperationAction<Coun
 
     @Override
     protected String transportShardAction() {
-        return "indices/count/shard";
+        return TransportActions.COUNT + "/shard";
     }
 
     @Override
diff --git a/src/main/java/org/elasticsearch/action/deletebyquery/TransportIndexDeleteByQueryAction.java b/src/main/java/org/elasticsearch/action/deletebyquery/TransportIndexDeleteByQueryAction.java
index cf4de3a1300..6c52fe0b64a 100644
--- a/src/main/java/org/elasticsearch/action/deletebyquery/TransportIndexDeleteByQueryAction.java
+++ b/src/main/java/org/elasticsearch/action/deletebyquery/TransportIndexDeleteByQueryAction.java
@@ -19,6 +19,7 @@
 
 package org.elasticsearch.action.deletebyquery;
 
+import org.elasticsearch.action.TransportActions;
 import org.elasticsearch.action.support.replication.TransportIndexReplicationOperationAction;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
@@ -68,7 +69,7 @@ public class TransportIndexDeleteByQueryAction extends TransportIndexReplication
 
     @Override
     protected String transportAction() {
-        return "indices/index/deleteByQuery";
+        return TransportActions.DELETE_BY_QUERY + "/index";
     }
 
     @Override
diff --git a/src/main/java/org/elasticsearch/action/deletebyquery/TransportShardDeleteByQueryAction.java b/src/main/java/org/elasticsearch/action/deletebyquery/TransportShardDeleteByQueryAction.java
index d4958569020..8738aa17b48 100644
--- a/src/main/java/org/elasticsearch/action/deletebyquery/TransportShardDeleteByQueryAction.java
+++ b/src/main/java/org/elasticsearch/action/deletebyquery/TransportShardDeleteByQueryAction.java
@@ -20,6 +20,7 @@
 package org.elasticsearch.action.deletebyquery;
 
 import org.elasticsearch.ElasticSearchIllegalStateException;
+import org.elasticsearch.action.TransportActions;
 import org.elasticsearch.action.support.replication.TransportShardReplicationOperationAction;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
@@ -74,7 +75,7 @@ public class TransportShardDeleteByQueryAction extends TransportShardReplication
 
     @Override
     protected String transportAction() {
-        return "indices/index/shard/deleteByQuery";
+        return TransportActions.DELETE_BY_QUERY + "/shard";
     }
 
     @Override
diff --git a/src/main/java/org/elasticsearch/action/get/TransportGetAction.java b/src/main/java/org/elasticsearch/action/get/TransportGetAction.java
index 202670c3f6d..c8987763f55 100644
--- a/src/main/java/org/elasticsearch/action/get/TransportGetAction.java
+++ b/src/main/java/org/elasticsearch/action/get/TransportGetAction.java
@@ -40,8 +40,6 @@ import org.elasticsearch.transport.TransportService;
 
 /**
  * Performs the get operation.
- *
- *
  */
 public class TransportGetAction extends TransportShardSingleOperationAction<GetRequest, GetResponse> {
 
@@ -70,7 +68,7 @@ public class TransportGetAction extends TransportShardSingleOperationAction<GetR
 
     @Override
     protected String transportShardAction() {
-        return "indices/get/shard";
+        return TransportActions.GET + "/shard";
     }
 
     @Override
diff --git a/src/main/java/org/elasticsearch/action/get/TransportShardMultiGetAction.java b/src/main/java/org/elasticsearch/action/get/TransportShardMultiGetAction.java
index f64a32547d6..29921f1ac9b 100644
--- a/src/main/java/org/elasticsearch/action/get/TransportShardMultiGetAction.java
+++ b/src/main/java/org/elasticsearch/action/get/TransportShardMultiGetAction.java
@@ -22,6 +22,7 @@ package org.elasticsearch.action.get;
 import org.elasticsearch.ElasticSearchException;
 import org.elasticsearch.ExceptionsHelper;
 import org.elasticsearch.action.ActionListener;
+import org.elasticsearch.action.TransportActions;
 import org.elasticsearch.action.support.single.shard.TransportShardSingleOperationAction;
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.ClusterState;
@@ -63,12 +64,12 @@ public class TransportShardMultiGetAction extends TransportShardSingleOperationA
 
     @Override
     protected String transportAction() {
-        return "indices/mget/shard";
+        return TransportActions.MULTI_GET + "/shard";
     }
 
     @Override
     protected String transportShardAction() {
-        return "indices/mget/shard/s";
+        return TransportActions.MULTI_GET + "/shard/s";
     }
 
     @Override
diff --git a/src/main/java/org/elasticsearch/action/percolate/TransportPercolateAction.java b/src/main/java/org/elasticsearch/action/percolate/TransportPercolateAction.java
index 2d532a5c594..bffca15e53d 100644
--- a/src/main/java/org/elasticsearch/action/percolate/TransportPercolateAction.java
+++ b/src/main/java/org/elasticsearch/action/percolate/TransportPercolateAction.java
@@ -70,7 +70,7 @@ public class TransportPercolateAction extends TransportSingleCustomOperationActi
 
     @Override
     protected String transportShardAction() {
-        return "indices/percolate/shard";
+        return TransportActions.PERCOLATE + "/shard";
     }
 
     @Override