diff --git a/core/src/main/java/org/elasticsearch/action/ActionModule.java b/core/src/main/java/org/elasticsearch/action/ActionModule.java index 09a6dc6dceb..67d17a2cc0d 100644 --- a/core/src/main/java/org/elasticsearch/action/ActionModule.java +++ b/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; diff --git a/core/src/main/java/org/elasticsearch/action/ingest/delete/DeletePipelineAction.java b/core/src/main/java/org/elasticsearch/action/ingest/DeletePipelineAction.java similarity index 97% rename from core/src/main/java/org/elasticsearch/action/ingest/delete/DeletePipelineAction.java rename to core/src/main/java/org/elasticsearch/action/ingest/DeletePipelineAction.java index a27340427e5..8456d7e0e6a 100644 --- a/core/src/main/java/org/elasticsearch/action/ingest/delete/DeletePipelineAction.java +++ b/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; diff --git a/core/src/main/java/org/elasticsearch/action/ingest/delete/DeletePipelineRequest.java b/core/src/main/java/org/elasticsearch/action/ingest/DeletePipelineRequest.java similarity index 97% rename from core/src/main/java/org/elasticsearch/action/ingest/delete/DeletePipelineRequest.java rename to core/src/main/java/org/elasticsearch/action/ingest/DeletePipelineRequest.java index 9d1877aa404..3d958f886ac 100644 --- a/core/src/main/java/org/elasticsearch/action/ingest/delete/DeletePipelineRequest.java +++ b/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; diff --git a/core/src/main/java/org/elasticsearch/action/ingest/delete/DeletePipelineRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/ingest/DeletePipelineRequestBuilder.java similarity index 96% rename from core/src/main/java/org/elasticsearch/action/ingest/delete/DeletePipelineRequestBuilder.java rename to core/src/main/java/org/elasticsearch/action/ingest/DeletePipelineRequestBuilder.java index 8f878dd4957..29563fa05d5 100644 --- a/core/src/main/java/org/elasticsearch/action/ingest/delete/DeletePipelineRequestBuilder.java +++ b/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; diff --git a/core/src/main/java/org/elasticsearch/action/ingest/delete/DeletePipelineTransportAction.java b/core/src/main/java/org/elasticsearch/action/ingest/DeletePipelineTransportAction.java similarity index 97% rename from core/src/main/java/org/elasticsearch/action/ingest/delete/DeletePipelineTransportAction.java rename to core/src/main/java/org/elasticsearch/action/ingest/DeletePipelineTransportAction.java index 1aba6e6decd..4f25a9d330c 100644 --- a/core/src/main/java/org/elasticsearch/action/ingest/delete/DeletePipelineTransportAction.java +++ b/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; diff --git a/core/src/main/java/org/elasticsearch/action/ingest/get/GetPipelineAction.java b/core/src/main/java/org/elasticsearch/action/ingest/GetPipelineAction.java similarity index 97% rename from core/src/main/java/org/elasticsearch/action/ingest/get/GetPipelineAction.java rename to core/src/main/java/org/elasticsearch/action/ingest/GetPipelineAction.java index 8025eaebfcb..f6bc3d9a778 100644 --- a/core/src/main/java/org/elasticsearch/action/ingest/get/GetPipelineAction.java +++ b/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; diff --git a/core/src/main/java/org/elasticsearch/action/ingest/get/GetPipelineRequest.java b/core/src/main/java/org/elasticsearch/action/ingest/GetPipelineRequest.java similarity index 97% rename from core/src/main/java/org/elasticsearch/action/ingest/get/GetPipelineRequest.java rename to core/src/main/java/org/elasticsearch/action/ingest/GetPipelineRequest.java index 69c15112536..e0bfca6cac4 100644 --- a/core/src/main/java/org/elasticsearch/action/ingest/get/GetPipelineRequest.java +++ b/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; diff --git a/core/src/main/java/org/elasticsearch/action/ingest/get/GetPipelineRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/ingest/GetPipelineRequestBuilder.java similarity index 96% rename from core/src/main/java/org/elasticsearch/action/ingest/get/GetPipelineRequestBuilder.java rename to core/src/main/java/org/elasticsearch/action/ingest/GetPipelineRequestBuilder.java index 07099562695..c339603104e 100644 --- a/core/src/main/java/org/elasticsearch/action/ingest/get/GetPipelineRequestBuilder.java +++ b/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; diff --git a/core/src/main/java/org/elasticsearch/action/ingest/get/GetPipelineResponse.java b/core/src/main/java/org/elasticsearch/action/ingest/GetPipelineResponse.java similarity index 98% rename from core/src/main/java/org/elasticsearch/action/ingest/get/GetPipelineResponse.java rename to core/src/main/java/org/elasticsearch/action/ingest/GetPipelineResponse.java index ff2eafc8172..9a12f4b1d03 100644 --- a/core/src/main/java/org/elasticsearch/action/ingest/get/GetPipelineResponse.java +++ b/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; diff --git a/core/src/main/java/org/elasticsearch/action/ingest/get/GetPipelineTransportAction.java b/core/src/main/java/org/elasticsearch/action/ingest/GetPipelineTransportAction.java similarity index 98% rename from core/src/main/java/org/elasticsearch/action/ingest/get/GetPipelineTransportAction.java rename to core/src/main/java/org/elasticsearch/action/ingest/GetPipelineTransportAction.java index 01b401d1fee..471238e0587 100644 --- a/core/src/main/java/org/elasticsearch/action/ingest/get/GetPipelineTransportAction.java +++ b/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; diff --git a/core/src/main/java/org/elasticsearch/action/ingest/put/PutPipelineAction.java b/core/src/main/java/org/elasticsearch/action/ingest/PutPipelineAction.java similarity index 97% rename from core/src/main/java/org/elasticsearch/action/ingest/put/PutPipelineAction.java rename to core/src/main/java/org/elasticsearch/action/ingest/PutPipelineAction.java index ed36d067187..7f37009577e 100644 --- a/core/src/main/java/org/elasticsearch/action/ingest/put/PutPipelineAction.java +++ b/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; diff --git a/core/src/main/java/org/elasticsearch/action/ingest/put/PutPipelineRequest.java b/core/src/main/java/org/elasticsearch/action/ingest/PutPipelineRequest.java similarity index 98% rename from core/src/main/java/org/elasticsearch/action/ingest/put/PutPipelineRequest.java rename to core/src/main/java/org/elasticsearch/action/ingest/PutPipelineRequest.java index 9084632dd0a..3ee46a0f71f 100644 --- a/core/src/main/java/org/elasticsearch/action/ingest/put/PutPipelineRequest.java +++ b/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; diff --git a/core/src/main/java/org/elasticsearch/action/ingest/put/PutPipelineRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/ingest/PutPipelineRequestBuilder.java similarity index 97% rename from core/src/main/java/org/elasticsearch/action/ingest/put/PutPipelineRequestBuilder.java rename to core/src/main/java/org/elasticsearch/action/ingest/PutPipelineRequestBuilder.java index 848e20c38a9..f2b5a8d9e1c 100644 --- a/core/src/main/java/org/elasticsearch/action/ingest/put/PutPipelineRequestBuilder.java +++ b/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; diff --git a/core/src/main/java/org/elasticsearch/action/ingest/put/PutPipelineTransportAction.java b/core/src/main/java/org/elasticsearch/action/ingest/PutPipelineTransportAction.java similarity index 97% rename from core/src/main/java/org/elasticsearch/action/ingest/put/PutPipelineTransportAction.java rename to core/src/main/java/org/elasticsearch/action/ingest/PutPipelineTransportAction.java index 325f4b235d1..067a03d2ae4 100644 --- a/core/src/main/java/org/elasticsearch/action/ingest/put/PutPipelineTransportAction.java +++ b/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; diff --git a/core/src/main/java/org/elasticsearch/action/ingest/reload/ReloadPipelinesAction.java b/core/src/main/java/org/elasticsearch/action/ingest/ReloadPipelinesAction.java similarity index 98% rename from core/src/main/java/org/elasticsearch/action/ingest/reload/ReloadPipelinesAction.java rename to core/src/main/java/org/elasticsearch/action/ingest/ReloadPipelinesAction.java index 8d38c08c4b6..452f3a3341f 100644 --- a/core/src/main/java/org/elasticsearch/action/ingest/reload/ReloadPipelinesAction.java +++ b/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; diff --git a/core/src/main/java/org/elasticsearch/action/ingest/simulate/SimulateDocumentResult.java b/core/src/main/java/org/elasticsearch/action/ingest/SimulateDocumentResult.java similarity index 95% rename from core/src/main/java/org/elasticsearch/action/ingest/simulate/SimulateDocumentResult.java rename to core/src/main/java/org/elasticsearch/action/ingest/SimulateDocumentResult.java index f817fe392e8..7e7682bc250 100644 --- a/core/src/main/java/org/elasticsearch/action/ingest/simulate/SimulateDocumentResult.java +++ b/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; diff --git a/core/src/main/java/org/elasticsearch/action/ingest/simulate/SimulateDocumentSimpleResult.java b/core/src/main/java/org/elasticsearch/action/ingest/SimulateDocumentSimpleResult.java similarity index 98% rename from core/src/main/java/org/elasticsearch/action/ingest/simulate/SimulateDocumentSimpleResult.java rename to core/src/main/java/org/elasticsearch/action/ingest/SimulateDocumentSimpleResult.java index 115a68eeac9..3249775a8e4 100644 --- a/core/src/main/java/org/elasticsearch/action/ingest/simulate/SimulateDocumentSimpleResult.java +++ b/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; diff --git a/core/src/main/java/org/elasticsearch/action/ingest/simulate/SimulateDocumentVerboseResult.java b/core/src/main/java/org/elasticsearch/action/ingest/SimulateDocumentVerboseResult.java similarity index 98% rename from core/src/main/java/org/elasticsearch/action/ingest/simulate/SimulateDocumentVerboseResult.java rename to core/src/main/java/org/elasticsearch/action/ingest/SimulateDocumentVerboseResult.java index 08984ed0f03..2b119afb9d5 100644 --- a/core/src/main/java/org/elasticsearch/action/ingest/simulate/SimulateDocumentVerboseResult.java +++ b/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; diff --git a/core/src/main/java/org/elasticsearch/action/ingest/simulate/SimulateExecutionService.java b/core/src/main/java/org/elasticsearch/action/ingest/SimulateExecutionService.java similarity index 98% rename from core/src/main/java/org/elasticsearch/action/ingest/simulate/SimulateExecutionService.java rename to core/src/main/java/org/elasticsearch/action/ingest/SimulateExecutionService.java index 8d3e96694d1..ccfb6526ab0 100644 --- a/core/src/main/java/org/elasticsearch/action/ingest/simulate/SimulateExecutionService.java +++ b/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; diff --git a/core/src/main/java/org/elasticsearch/action/ingest/simulate/SimulatePipelineAction.java b/core/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineAction.java similarity index 96% rename from core/src/main/java/org/elasticsearch/action/ingest/simulate/SimulatePipelineAction.java rename to core/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineAction.java index 7f92f0ea35a..c1d219a4190 100644 --- a/core/src/main/java/org/elasticsearch/action/ingest/simulate/SimulatePipelineAction.java +++ b/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; diff --git a/core/src/main/java/org/elasticsearch/action/ingest/simulate/SimulatePipelineRequest.java b/core/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineRequest.java similarity index 99% rename from core/src/main/java/org/elasticsearch/action/ingest/simulate/SimulatePipelineRequest.java rename to core/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineRequest.java index e0ba5574e4f..ccc51e7bdd7 100644 --- a/core/src/main/java/org/elasticsearch/action/ingest/simulate/SimulatePipelineRequest.java +++ b/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; diff --git a/core/src/main/java/org/elasticsearch/action/ingest/simulate/SimulatePipelineRequestBuilder.java b/core/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineRequestBuilder.java similarity index 97% rename from core/src/main/java/org/elasticsearch/action/ingest/simulate/SimulatePipelineRequestBuilder.java rename to core/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineRequestBuilder.java index e77ed3fecc1..d2e259fd578 100644 --- a/core/src/main/java/org/elasticsearch/action/ingest/simulate/SimulatePipelineRequestBuilder.java +++ b/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; diff --git a/core/src/main/java/org/elasticsearch/action/ingest/simulate/SimulatePipelineResponse.java b/core/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineResponse.java similarity index 98% rename from core/src/main/java/org/elasticsearch/action/ingest/simulate/SimulatePipelineResponse.java rename to core/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineResponse.java index 9a5706dd17d..7a9ab0b5f8b 100644 --- a/core/src/main/java/org/elasticsearch/action/ingest/simulate/SimulatePipelineResponse.java +++ b/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; diff --git a/core/src/main/java/org/elasticsearch/action/ingest/simulate/SimulatePipelineTransportAction.java b/core/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineTransportAction.java similarity index 98% rename from core/src/main/java/org/elasticsearch/action/ingest/simulate/SimulatePipelineTransportAction.java rename to core/src/main/java/org/elasticsearch/action/ingest/SimulatePipelineTransportAction.java index e12ac6f6a1d..3d5e02a9332 100644 --- a/core/src/main/java/org/elasticsearch/action/ingest/simulate/SimulatePipelineTransportAction.java +++ b/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; diff --git a/core/src/main/java/org/elasticsearch/action/ingest/simulate/SimulateProcessorResult.java b/core/src/main/java/org/elasticsearch/action/ingest/SimulateProcessorResult.java similarity index 98% rename from core/src/main/java/org/elasticsearch/action/ingest/simulate/SimulateProcessorResult.java rename to core/src/main/java/org/elasticsearch/action/ingest/SimulateProcessorResult.java index d7612b0c3af..afa85b4c219 100644 --- a/core/src/main/java/org/elasticsearch/action/ingest/simulate/SimulateProcessorResult.java +++ b/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; diff --git a/core/src/main/java/org/elasticsearch/action/ingest/simulate/WriteableIngestDocument.java b/core/src/main/java/org/elasticsearch/action/ingest/WriteableIngestDocument.java similarity index 98% rename from core/src/main/java/org/elasticsearch/action/ingest/simulate/WriteableIngestDocument.java rename to core/src/main/java/org/elasticsearch/action/ingest/WriteableIngestDocument.java index 532d2ff3e60..0f33f00faf4 100644 --- a/core/src/main/java/org/elasticsearch/action/ingest/simulate/WriteableIngestDocument.java +++ b/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; diff --git a/core/src/main/java/org/elasticsearch/ingest/PipelineStore.java b/core/src/main/java/org/elasticsearch/ingest/PipelineStore.java index 217ef42e4a2..7860a84adda 100644 --- a/core/src/main/java/org/elasticsearch/ingest/PipelineStore.java +++ b/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; diff --git a/core/src/main/java/org/elasticsearch/rest/action/ingest/RestDeletePipelineAction.java b/core/src/main/java/org/elasticsearch/rest/action/ingest/RestDeletePipelineAction.java index d5c258ff47d..994e0300407 100644 --- a/core/src/main/java/org/elasticsearch/rest/action/ingest/RestDeletePipelineAction.java +++ b/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; diff --git a/core/src/main/java/org/elasticsearch/rest/action/ingest/RestGetPipelineAction.java b/core/src/main/java/org/elasticsearch/rest/action/ingest/RestGetPipelineAction.java index fed1f8fc448..47f41fc437b 100644 --- a/core/src/main/java/org/elasticsearch/rest/action/ingest/RestGetPipelineAction.java +++ b/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; diff --git a/core/src/main/java/org/elasticsearch/rest/action/ingest/RestPutPipelineAction.java b/core/src/main/java/org/elasticsearch/rest/action/ingest/RestPutPipelineAction.java index 2a36773bc79..b63b2eb44a7 100644 --- a/core/src/main/java/org/elasticsearch/rest/action/ingest/RestPutPipelineAction.java +++ b/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; diff --git a/core/src/main/java/org/elasticsearch/rest/action/ingest/RestSimulatePipelineAction.java b/core/src/main/java/org/elasticsearch/rest/action/ingest/RestSimulatePipelineAction.java index 80f0d013b72..ed859e2a442 100644 --- a/core/src/main/java/org/elasticsearch/rest/action/ingest/RestSimulatePipelineAction.java +++ b/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; diff --git a/core/src/test/java/org/elasticsearch/action/ingest/reload/ReloadPipelinesActionTests.java b/core/src/test/java/org/elasticsearch/action/ingest/ReloadPipelinesActionTests.java similarity index 98% rename from core/src/test/java/org/elasticsearch/action/ingest/reload/ReloadPipelinesActionTests.java rename to core/src/test/java/org/elasticsearch/action/ingest/ReloadPipelinesActionTests.java index b6f767323c1..8a0284d80cf 100644 --- a/core/src/test/java/org/elasticsearch/action/ingest/reload/ReloadPipelinesActionTests.java +++ b/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; diff --git a/core/src/test/java/org/elasticsearch/action/ingest/simulate/SimulateDocumentSimpleResultTests.java b/core/src/test/java/org/elasticsearch/action/ingest/SimulateDocumentSimpleResultTests.java similarity index 95% rename from core/src/test/java/org/elasticsearch/action/ingest/simulate/SimulateDocumentSimpleResultTests.java rename to core/src/test/java/org/elasticsearch/action/ingest/SimulateDocumentSimpleResultTests.java index 685db51c7cd..dc8f7fcb7b9 100644 --- a/core/src/test/java/org/elasticsearch/action/ingest/simulate/SimulateDocumentSimpleResultTests.java +++ b/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; diff --git a/core/src/test/java/org/elasticsearch/action/ingest/simulate/SimulateExecutionServiceTests.java b/core/src/test/java/org/elasticsearch/action/ingest/SimulateExecutionServiceTests.java similarity index 96% rename from core/src/test/java/org/elasticsearch/action/ingest/simulate/SimulateExecutionServiceTests.java rename to core/src/test/java/org/elasticsearch/action/ingest/SimulateExecutionServiceTests.java index 2189faa8749..e292b45c47a 100644 --- a/core/src/test/java/org/elasticsearch/action/ingest/simulate/SimulateExecutionServiceTests.java +++ b/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; diff --git a/core/src/test/java/org/elasticsearch/action/ingest/simulate/SimulatePipelineRequestParsingTests.java b/core/src/test/java/org/elasticsearch/action/ingest/SimulatePipelineRequestParsingTests.java similarity index 98% rename from core/src/test/java/org/elasticsearch/action/ingest/simulate/SimulatePipelineRequestParsingTests.java rename to core/src/test/java/org/elasticsearch/action/ingest/SimulatePipelineRequestParsingTests.java index f84cb550ed9..eabc1821d2a 100644 --- a/core/src/test/java/org/elasticsearch/action/ingest/simulate/SimulatePipelineRequestParsingTests.java +++ b/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; diff --git a/core/src/test/java/org/elasticsearch/action/ingest/simulate/SimulatePipelineResponseTests.java b/core/src/test/java/org/elasticsearch/action/ingest/SimulatePipelineResponseTests.java similarity index 94% rename from core/src/test/java/org/elasticsearch/action/ingest/simulate/SimulatePipelineResponseTests.java rename to core/src/test/java/org/elasticsearch/action/ingest/SimulatePipelineResponseTests.java index 65c9996d533..905baa86485 100644 --- a/core/src/test/java/org/elasticsearch/action/ingest/simulate/SimulatePipelineResponseTests.java +++ b/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; diff --git a/core/src/test/java/org/elasticsearch/action/ingest/simulate/SimulateProcessorResultTests.java b/core/src/test/java/org/elasticsearch/action/ingest/SimulateProcessorResultTests.java similarity index 96% rename from core/src/test/java/org/elasticsearch/action/ingest/simulate/SimulateProcessorResultTests.java rename to core/src/test/java/org/elasticsearch/action/ingest/SimulateProcessorResultTests.java index 312d6ec3a96..208d2534a4c 100644 --- a/core/src/test/java/org/elasticsearch/action/ingest/simulate/SimulateProcessorResultTests.java +++ b/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; diff --git a/core/src/test/java/org/elasticsearch/action/ingest/simulate/WriteableIngestDocumentTests.java b/core/src/test/java/org/elasticsearch/action/ingest/WriteableIngestDocumentTests.java similarity index 99% rename from core/src/test/java/org/elasticsearch/action/ingest/simulate/WriteableIngestDocumentTests.java rename to core/src/test/java/org/elasticsearch/action/ingest/WriteableIngestDocumentTests.java index 17a6e15bdf6..120825a7beb 100644 --- a/core/src/test/java/org/elasticsearch/action/ingest/simulate/WriteableIngestDocumentTests.java +++ b/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; diff --git a/core/src/test/java/org/elasticsearch/ingest/IngestClientIT.java b/core/src/test/java/org/elasticsearch/ingest/IngestClientIT.java index 8ffa53d2b86..2d7d2021838 100644 --- a/core/src/test/java/org/elasticsearch/ingest/IngestClientIT.java +++ b/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;