rename create mapping to put mapping

Author: kimchy

modules/elasticsearch/src/main/java/org/elasticsearch/action/TransportActionModule.java

@@ -33,7 +33,7 @@
 import org.elasticsearch.action.admin.indices.gateway.snapshot.TransportGatewaySnapshotAction;
 import org.elasticsearch.action.admin.indices.gateway.snapshot.TransportIndexGatewaySnapshotAction;
 import org.elasticsearch.action.admin.indices.gateway.snapshot.TransportShardGatewaySnapshotAction;
-import org.elasticsearch.action.admin.indices.mapping.create.TransportCreateMappingAction;
+import org.elasticsearch.action.admin.indices.mapping.put.TransportPutMappingAction;
 import org.elasticsearch.action.admin.indices.optimize.TransportOptimizeAction;
 import org.elasticsearch.action.admin.indices.refresh.TransportRefreshAction;
 import org.elasticsearch.action.admin.indices.status.TransportIndicesStatusAction;
@@ -67,7 +67,7 @@ public class TransportActionModule extends AbstractModule {
 
         bind(TransportIndicesStatusAction.class).asEagerSingleton();
         bind(TransportCreateIndexAction.class).asEagerSingleton();
-        bind(TransportCreateMappingAction.class).asEagerSingleton();
+        bind(TransportPutMappingAction.class).asEagerSingleton();
         bind(TransportDeleteIndexAction.class).asEagerSingleton();
 
         bind(TransportShardGatewaySnapshotAction.class).asEagerSingleton();

modules/elasticsearch/src/main/java/org/elasticsearch/action/TransportActions.java

@@ -20,7 +20,7 @@
 package org.elasticsearch.action;
 
 /**
- * @author kimchy (Shay Banon)
+ * @author kimchy (shay.banon)
  */
 public class TransportActions {
 
@@ -55,7 +55,7 @@ public static class Gateway {
             }
 
             public static class Mapping {
-                public static final String CREATE = "indices/createMapping";
+                public static final String PUT = "indices/mapping/put";
             }
         }
 

modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/mapping/create/TransportCreateMappingAction.java

@@ -17,13 +17,12 @@
  * under the License.
  */
 
-package org.elasticsearch.action.admin.indices.mapping.create;
+package org.elasticsearch.action.admin.indices.mapping.put;
 
-import org.elasticsearch.action.ActionRequest;
 import org.elasticsearch.action.ActionRequestValidationException;
+import org.elasticsearch.action.support.master.MasterNodeOperationRequest;
 import org.elasticsearch.util.Required;
 import org.elasticsearch.util.TimeValue;
-import org.elasticsearch.util.io.Streamable;
 
 import java.io.DataInput;
 import java.io.DataOutput;
@@ -36,7 +35,7 @@
 /**
  * @author kimchy (Shay Banon)
  */
-public class CreateMappingRequest implements ActionRequest, Streamable {
+public class PutMappingRequest extends MasterNodeOperationRequest {
 
     private String[] indices;
 
@@ -46,18 +45,18 @@ public class CreateMappingRequest implements ActionRequest, Streamable {
 
     private TimeValue timeout = new TimeValue(10, TimeUnit.SECONDS);
 
-    CreateMappingRequest() {
+    PutMappingRequest() {
     }
 
-    public CreateMappingRequest(String... indices) {
+    public PutMappingRequest(String... indices) {
         this.indices = indices;
     }
 
-    public CreateMappingRequest(String index, String mappingType, String mappingSource) {
+    public PutMappingRequest(String index, String mappingType, String mappingSource) {
         this(new String[]{index}, mappingType, mappingSource);
     }
 
-    public CreateMappingRequest(String[] indices, String mappingType, String mappingSource) {
+    public PutMappingRequest(String[] indices, String mappingType, String mappingSource) {
         this.indices = indices;
         this.mappingType = mappingType;
         this.mappingSource = mappingSource;
@@ -71,12 +70,7 @@ public CreateMappingRequest(String[] indices, String mappingType, String mapping
         return validationException;
     }
 
-    @Override public boolean listenerThreaded() {
-        // we don't really care about this...
-        return true;
-    }
-
-    @Override public CreateMappingRequest listenerThreaded(boolean threadedListener) {
+    @Override public PutMappingRequest listenerThreaded(boolean threadedListener) {
         return this;
     }
 
@@ -92,7 +86,7 @@ String type() {
      * The type of the mappings. Not required since it can be defined explicitly within the mapping source.
      * If it is not defined within the mapping source, then it is required.
      */
-    public CreateMappingRequest type(String mappingType) {
+    public PutMappingRequest type(String mappingType) {
         this.mappingType = mappingType;
         return this;
     }
@@ -101,7 +95,7 @@ String mappingSource() {
         return mappingSource;
     }
 
-    @Required public CreateMappingRequest mappingSource(String mappingSource) {
+    @Required public PutMappingRequest mappingSource(String mappingSource) {
         this.mappingSource = mappingSource;
         return this;
     }
@@ -110,12 +104,13 @@ TimeValue timeout() {
         return timeout;
     }
 
-    public CreateMappingRequest timeout(TimeValue timeout) {
+    public PutMappingRequest timeout(TimeValue timeout) {
         this.timeout = timeout;
         return this;
     }
 
     @Override public void readFrom(DataInput in) throws IOException, ClassNotFoundException {
+        super.readFrom(in);
         indices = new String[in.readInt()];
         for (int i = 0; i < indices.length; i++) {
             indices[i] = in.readUTF();
@@ -128,6 +123,7 @@ public CreateMappingRequest timeout(TimeValue timeout) {
     }
 
     @Override public void writeTo(DataOutput out) throws IOException {
+        super.writeTo(out);
         if (indices == null) {
             out.writeInt(0);
         } else {

modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/mapping/create/CreateMappingRequest.java renamed to modules/elasticsearch/src/main/java/org/elasticsearch/action/admin/indices/mapping/put/PutMappingRequest.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.action.admin.indices.mapping.create;
+package org.elasticsearch.action.admin.indices.mapping.put;
 
 import org.elasticsearch.action.ActionResponse;
 import org.elasticsearch.util.io.Streamable;
@@ -27,9 +27,9 @@
 import java.io.IOException;
 
 /**
- * @author kimchy (Shay Banon)
+ * @author kimchy (shay.banon)
  */
-public class CreateMappingResponse implements ActionResponse, Streamable {
+public class PutMappingResponse implements ActionResponse, Streamable {
 
     @Override public void readFrom(DataInput in) throws IOException, ClassNotFoundException {
     }