move all transport actions under same package org.elasticsearch.action.ingest

core/src/main/java/org/elasticsearch/action/ActionModule.java

@@ -157,14 +157,14 @@ import org.elasticsearch.action.indexedscripts.put.PutIndexedScriptAction;
 import org.elasticsearch.action.indexedscripts.put.TransportPutIndexedScriptAction;
 import org.elasticsearch.action.ingest.IngestActionFilter;
 import org.elasticsearch.action.ingest.IngestDisabledActionFilter;
-import org.elasticsearch.action.ingest.delete.DeletePipelineAction;
-import org.elasticsearch.action.ingest.delete.DeletePipelineTransportAction;
-import org.elasticsearch.action.ingest.get.GetPipelineAction;
-import org.elasticsearch.action.ingest.get.GetPipelineTransportAction;
-import org.elasticsearch.action.ingest.put.PutPipelineAction;
-import org.elasticsearch.action.ingest.put.PutPipelineTransportAction;
-import org.elasticsearch.action.ingest.simulate.SimulatePipelineAction;
-import org.elasticsearch.action.ingest.simulate.SimulatePipelineTransportAction;
+import org.elasticsearch.action.ingest.DeletePipelineAction;
+import org.elasticsearch.action.ingest.DeletePipelineTransportAction;
+import org.elasticsearch.action.ingest.GetPipelineAction;
+import org.elasticsearch.action.ingest.GetPipelineTransportAction;
+import org.elasticsearch.action.ingest.PutPipelineAction;
+import org.elasticsearch.action.ingest.PutPipelineTransportAction;
+import org.elasticsearch.action.ingest.SimulatePipelineAction;
+import org.elasticsearch.action.ingest.SimulatePipelineTransportAction;
 import org.elasticsearch.action.percolate.MultiPercolateAction;
 import org.elasticsearch.action.percolate.PercolateAction;
 import org.elasticsearch.action.percolate.TransportMultiPercolateAction;

core/src/main/java/org/elasticsearch/action/ingest/DeletePipelineAction.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.action.ingest.delete;
+package org.elasticsearch.action.ingest;
 
 import org.elasticsearch.action.Action;
 import org.elasticsearch.action.delete.DeleteResponse;

core/src/main/java/org/elasticsearch/action/ingest/DeletePipelineRequest.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.action.ingest.delete;
+package org.elasticsearch.action.ingest;
 
 import org.elasticsearch.action.ActionRequest;
 import org.elasticsearch.action.ActionRequestValidationException;

core/src/main/java/org/elasticsearch/action/ingest/DeletePipelineRequestBuilder.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.action.ingest.delete;
+package org.elasticsearch.action.ingest;
 
 import org.elasticsearch.action.ActionRequestBuilder;
 import org.elasticsearch.action.delete.DeleteResponse;

core/src/main/java/org/elasticsearch/action/ingest/DeletePipelineTransportAction.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.action.ingest.delete;
+package org.elasticsearch.action.ingest;
 
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.delete.DeleteResponse;

core/src/main/java/org/elasticsearch/action/ingest/GetPipelineAction.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.action.ingest.get;
+package org.elasticsearch.action.ingest;
 
 import org.elasticsearch.action.Action;
 import org.elasticsearch.client.ElasticsearchClient;

core/src/main/java/org/elasticsearch/action/ingest/GetPipelineRequest.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.action.ingest.get;
+package org.elasticsearch.action.ingest;
 
 import org.elasticsearch.action.ActionRequest;
 import org.elasticsearch.action.ActionRequestValidationException;

core/src/main/java/org/elasticsearch/action/ingest/GetPipelineRequestBuilder.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.action.ingest.get;
+package org.elasticsearch.action.ingest;
 
 import org.elasticsearch.action.ActionRequestBuilder;
 import org.elasticsearch.client.ElasticsearchClient;

core/src/main/java/org/elasticsearch/action/ingest/GetPipelineResponse.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.action.ingest.get;
+package org.elasticsearch.action.ingest;
 
 import org.elasticsearch.action.ActionResponse;
 import org.elasticsearch.common.io.stream.StreamInput;

core/src/main/java/org/elasticsearch/action/ingest/GetPipelineTransportAction.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.action.ingest.get;
+package org.elasticsearch.action.ingest;
 
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.support.ActionFilters;

core/src/main/java/org/elasticsearch/action/ingest/PutPipelineAction.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.action.ingest.put;
+package org.elasticsearch.action.ingest;
 
 import org.elasticsearch.action.Action;
 import org.elasticsearch.action.index.IndexResponse;

core/src/main/java/org/elasticsearch/action/ingest/PutPipelineRequest.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.action.ingest.put;
+package org.elasticsearch.action.ingest;
 
 import org.elasticsearch.action.ActionRequest;
 import org.elasticsearch.action.ActionRequestValidationException;

core/src/main/java/org/elasticsearch/action/ingest/PutPipelineRequestBuilder.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.action.ingest.put;
+package org.elasticsearch.action.ingest;
 
 import org.elasticsearch.action.ActionRequestBuilder;
 import org.elasticsearch.action.index.IndexResponse;

core/src/main/java/org/elasticsearch/action/ingest/PutPipelineTransportAction.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.action.ingest.put;
+package org.elasticsearch.action.ingest;
 
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.index.IndexResponse;

core/src/main/java/org/elasticsearch/action/ingest/ReloadPipelinesAction.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.action.ingest.reload;
+package org.elasticsearch.action.ingest;
 
 import org.elasticsearch.cluster.ClusterService;
 import org.elasticsearch.cluster.node.DiscoveryNode;

core/src/main/java/org/elasticsearch/action/ingest/SimulateDocumentResult.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.action.ingest.simulate;
+package org.elasticsearch.action.ingest;
 
 import org.elasticsearch.common.io.stream.Writeable;
 import org.elasticsearch.common.xcontent.ToXContent;

core/src/main/java/org/elasticsearch/action/ingest/SimulateDocumentSimpleResult.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.action.ingest.simulate;
+package org.elasticsearch.action.ingest;
 
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.common.io.stream.StreamInput;

core/src/main/java/org/elasticsearch/action/ingest/SimulateDocumentVerboseResult.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.action.ingest.simulate;
+package org.elasticsearch.action.ingest;
 
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;

core/src/main/java/org/elasticsearch/action/ingest/SimulateExecutionService.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.action.ingest.simulate;
+package org.elasticsearch.action.ingest;
 
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.ingest.core.IngestDocument;

core/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineAction.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.action.ingest.simulate;
+package org.elasticsearch.action.ingest;
 
 import org.elasticsearch.action.Action;
 import org.elasticsearch.client.ElasticsearchClient;

core/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineRequest.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.action.ingest.simulate;
+package org.elasticsearch.action.ingest;
 
 import org.elasticsearch.action.ActionRequest;
 import org.elasticsearch.action.ActionRequestValidationException;

core/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineRequestBuilder.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.action.ingest.simulate;
+package org.elasticsearch.action.ingest;
 
 import org.elasticsearch.action.ActionRequestBuilder;
 import org.elasticsearch.client.ElasticsearchClient;

core/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineResponse.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.action.ingest.simulate;
+package org.elasticsearch.action.ingest;
 
 import org.elasticsearch.action.ActionResponse;
 import org.elasticsearch.common.io.stream.StreamInput;

core/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineTransportAction.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.action.ingest.simulate;
+package org.elasticsearch.action.ingest;
 
 import org.elasticsearch.action.ActionListener;
 import org.elasticsearch.action.support.ActionFilters;

core/src/main/java/org/elasticsearch/action/ingest/SimulateProcessorResult.java

@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.elasticsearch.action.ingest.simulate;
+package org.elasticsearch.action.ingest;
 
 import org.elasticsearch.ElasticsearchException;
 import org.elasticsearch.common.io.stream.StreamInput;

core/src/main/java/org/elasticsearch/action/ingest/WriteableIngestDocument.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.action.ingest.simulate;
+package org.elasticsearch.action.ingest;
 
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.common.io.stream.StreamOutput;

core/src/main/java/org/elasticsearch/ingest/PipelineStore.java

@@ -40,9 +40,9 @@ import org.elasticsearch.common.unit.TimeValue;
 import org.elasticsearch.common.xcontent.XContentHelper;
 import org.elasticsearch.env.Environment;
 import org.elasticsearch.index.IndexNotFoundException;
-import org.elasticsearch.action.ingest.delete.DeletePipelineRequest;
-import org.elasticsearch.action.ingest.put.PutPipelineRequest;
-import org.elasticsearch.action.ingest.reload.ReloadPipelinesAction;
+import org.elasticsearch.action.ingest.DeletePipelineRequest;
+import org.elasticsearch.action.ingest.PutPipelineRequest;
+import org.elasticsearch.action.ingest.ReloadPipelinesAction;
 import org.elasticsearch.ingest.core.Pipeline;
 import org.elasticsearch.ingest.core.Processor;
 import org.elasticsearch.ingest.core.TemplateService;

core/src/main/java/org/elasticsearch/rest/action/ingest/RestDeletePipelineAction.java

@@ -22,8 +22,8 @@ package org.elasticsearch.rest.action.ingest;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.action.ingest.delete.DeletePipelineAction;
-import org.elasticsearch.action.ingest.delete.DeletePipelineRequest;
+import org.elasticsearch.action.ingest.DeletePipelineAction;
+import org.elasticsearch.action.ingest.DeletePipelineRequest;
 import org.elasticsearch.rest.BaseRestHandler;
 import org.elasticsearch.rest.RestChannel;
 import org.elasticsearch.rest.RestController;

core/src/main/java/org/elasticsearch/rest/action/ingest/RestGetPipelineAction.java

@@ -23,8 +23,8 @@ import org.elasticsearch.client.Client;
 import org.elasticsearch.common.Strings;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.action.ingest.get.GetPipelineAction;
-import org.elasticsearch.action.ingest.get.GetPipelineRequest;
+import org.elasticsearch.action.ingest.GetPipelineAction;
+import org.elasticsearch.action.ingest.GetPipelineRequest;
 import org.elasticsearch.rest.BaseRestHandler;
 import org.elasticsearch.rest.RestChannel;
 import org.elasticsearch.rest.RestController;

core/src/main/java/org/elasticsearch/rest/action/ingest/RestPutPipelineAction.java

@@ -22,8 +22,8 @@ package org.elasticsearch.rest.action.ingest;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.action.ingest.put.PutPipelineAction;
-import org.elasticsearch.action.ingest.put.PutPipelineRequest;
+import org.elasticsearch.action.ingest.PutPipelineAction;
+import org.elasticsearch.action.ingest.PutPipelineRequest;
 import org.elasticsearch.rest.BaseRestHandler;
 import org.elasticsearch.rest.RestChannel;
 import org.elasticsearch.rest.RestController;

core/src/main/java/org/elasticsearch/rest/action/ingest/RestSimulatePipelineAction.java

@@ -22,8 +22,8 @@ package org.elasticsearch.rest.action.ingest;
 import org.elasticsearch.client.Client;
 import org.elasticsearch.common.inject.Inject;
 import org.elasticsearch.common.settings.Settings;
-import org.elasticsearch.action.ingest.simulate.SimulatePipelineAction;
-import org.elasticsearch.action.ingest.simulate.SimulatePipelineRequest;
+import org.elasticsearch.action.ingest.SimulatePipelineAction;
+import org.elasticsearch.action.ingest.SimulatePipelineRequest;
 import org.elasticsearch.rest.BaseRestHandler;
 import org.elasticsearch.rest.RestChannel;
 import org.elasticsearch.rest.RestController;

core/src/test/java/org/elasticsearch/action/ingest/ReloadPipelinesActionTests.java

@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.elasticsearch.action.ingest.reload;
+package org.elasticsearch.action.ingest;
 
 import org.elasticsearch.Version;
 import org.elasticsearch.cluster.ClusterName;

core/src/test/java/org/elasticsearch/action/ingest/SimulateDocumentSimpleResultTests.java

@@ -17,8 +17,9 @@
  * under the License.
  */
 
-package org.elasticsearch.action.ingest.simulate;
+package org.elasticsearch.action.ingest;
 
+import org.elasticsearch.action.ingest.SimulateDocumentSimpleResult;
 import org.elasticsearch.common.io.stream.BytesStreamOutput;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.ingest.core.IngestDocument;

core/src/test/java/org/elasticsearch/action/ingest/SimulateExecutionServiceTests.java

@@ -17,8 +17,12 @@
  * under the License.
  */
 
-package org.elasticsearch.action.ingest.simulate;
+package org.elasticsearch.action.ingest;
 
+import org.elasticsearch.action.ingest.SimulateDocumentResult;
+import org.elasticsearch.action.ingest.SimulateDocumentSimpleResult;
+import org.elasticsearch.action.ingest.SimulateDocumentVerboseResult;
+import org.elasticsearch.action.ingest.SimulateExecutionService;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.ingest.RandomDocumentPicks;
 import org.elasticsearch.ingest.TestProcessor;

core/src/test/java/org/elasticsearch/action/ingest/SimulatePipelineRequestParsingTests.java

@@ -17,8 +17,9 @@
  * under the License.
  */
 
-package org.elasticsearch.action.ingest.simulate;
+package org.elasticsearch.action.ingest;
 
+import org.elasticsearch.action.ingest.SimulatePipelineRequest;
 import org.elasticsearch.ingest.PipelineStore;
 import org.elasticsearch.ingest.TestProcessor;
 import org.elasticsearch.ingest.core.CompoundProcessor;
@@ -36,7 +37,7 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
 
-import static org.elasticsearch.action.ingest.simulate.SimulatePipelineRequest.Fields;
+import static org.elasticsearch.action.ingest.SimulatePipelineRequest.Fields;
 import static org.elasticsearch.ingest.core.IngestDocument.MetaData.ID;
 import static org.elasticsearch.ingest.core.IngestDocument.MetaData.INDEX;
 import static org.elasticsearch.ingest.core.IngestDocument.MetaData.TYPE;

core/src/test/java/org/elasticsearch/action/ingest/SimulatePipelineResponseTests.java

@@ -17,8 +17,13 @@
  * under the License.
  */
 
-package org.elasticsearch.action.ingest.simulate;
+package org.elasticsearch.action.ingest;
 
+import org.elasticsearch.action.ingest.SimulateDocumentResult;
+import org.elasticsearch.action.ingest.SimulateDocumentSimpleResult;
+import org.elasticsearch.action.ingest.SimulateDocumentVerboseResult;
+import org.elasticsearch.action.ingest.SimulatePipelineResponse;
+import org.elasticsearch.action.ingest.SimulateProcessorResult;
 import org.elasticsearch.common.io.stream.BytesStreamOutput;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.ingest.core.IngestDocument;

core/src/test/java/org/elasticsearch/action/ingest/SimulateProcessorResultTests.java

@@ -17,8 +17,9 @@
  * under the License.
  */
 
-package org.elasticsearch.action.ingest.simulate;
+package org.elasticsearch.action.ingest;
 
+import org.elasticsearch.action.ingest.SimulateProcessorResult;
 import org.elasticsearch.common.io.stream.BytesStreamOutput;
 import org.elasticsearch.common.io.stream.StreamInput;
 import org.elasticsearch.ingest.core.IngestDocument;

core/src/test/java/org/elasticsearch/action/ingest/WriteableIngestDocumentTests.java

@@ -17,12 +17,12 @@
  * under the License.
  */
 
-package org.elasticsearch.action.ingest.simulate;
+package org.elasticsearch.action.ingest;
 
 import org.elasticsearch.common.io.stream.BytesStreamOutput;
 import org.elasticsearch.common.io.stream.StreamInput;
-import org.elasticsearch.ingest.core.IngestDocument;
 import org.elasticsearch.ingest.RandomDocumentPicks;
+import org.elasticsearch.ingest.core.IngestDocument;
 import org.elasticsearch.test.ESTestCase;
 
 import java.io.IOException;

core/src/test/java/org/elasticsearch/ingest/IngestClientIT.java

@@ -26,17 +26,17 @@ import org.elasticsearch.action.delete.DeleteResponse;
 import org.elasticsearch.action.index.IndexRequest;
 import org.elasticsearch.action.index.IndexResponse;
 import org.elasticsearch.action.ingest.IngestActionFilter;
-import org.elasticsearch.action.ingest.delete.DeletePipelineAction;
-import org.elasticsearch.action.ingest.delete.DeletePipelineRequestBuilder;
-import org.elasticsearch.action.ingest.get.GetPipelineAction;
-import org.elasticsearch.action.ingest.get.GetPipelineRequestBuilder;
-import org.elasticsearch.action.ingest.get.GetPipelineResponse;
-import org.elasticsearch.action.ingest.put.PutPipelineAction;
-import org.elasticsearch.action.ingest.put.PutPipelineRequestBuilder;
-import org.elasticsearch.action.ingest.simulate.SimulateDocumentSimpleResult;
-import org.elasticsearch.action.ingest.simulate.SimulatePipelineAction;
-import org.elasticsearch.action.ingest.simulate.SimulatePipelineRequestBuilder;
-import org.elasticsearch.action.ingest.simulate.SimulatePipelineResponse;
+import org.elasticsearch.action.ingest.DeletePipelineAction;
+import org.elasticsearch.action.ingest.DeletePipelineRequestBuilder;
+import org.elasticsearch.action.ingest.GetPipelineAction;
+import org.elasticsearch.action.ingest.GetPipelineRequestBuilder;
+import org.elasticsearch.action.ingest.GetPipelineResponse;
+import org.elasticsearch.action.ingest.PutPipelineAction;
+import org.elasticsearch.action.ingest.PutPipelineRequestBuilder;
+import org.elasticsearch.action.ingest.SimulateDocumentSimpleResult;
+import org.elasticsearch.action.ingest.SimulatePipelineAction;
+import org.elasticsearch.action.ingest.SimulatePipelineRequestBuilder;
+import org.elasticsearch.action.ingest.SimulatePipelineResponse;
 import org.elasticsearch.common.settings.Settings;
 import org.elasticsearch.ingest.core.IngestDocument;
 import org.elasticsearch.plugins.Plugin;