From 1e8995d984b782d3439ae4f18e082a622ae866e4 Mon Sep 17 00:00:00 2001 From: javanna Date: Wed, 6 Jan 2016 12:36:27 +0100 Subject: [PATCH] move all the processors under the same package org.elasticsearch.ingest.processor --- .../{append => }/AppendProcessor.java | 4 +-- .../{convert => }/ConvertProcessor.java | 4 +-- .../processor/{date => }/DateFormat.java | 2 +- .../processor/{date => }/DateProcessor.java | 4 +-- .../processor/{fail => }/FailProcessor.java | 4 +-- .../{fail => }/FailProcessorException.java | 2 +- .../processor/{geoip => }/GeoIpProcessor.java | 3 +- .../ingest/processor/{grok => }/Grok.java | 2 +- .../processor/{grok => }/GrokMatchGroup.java | 2 +- .../processor/{grok => }/GrokProcessor.java | 4 +-- .../processor/{gsub => }/GsubProcessor.java | 4 +-- .../processor/{join => }/JoinProcessor.java | 4 +-- .../{lowercase => }/LowercaseProcessor.java | 4 +-- .../{remove => }/RemoveProcessor.java | 4 +-- .../{rename => }/RenameProcessor.java | 4 +-- .../processor/{set => }/SetProcessor.java | 4 +-- .../processor/{split => }/SplitProcessor.java | 4 +-- .../processor/{trim => }/TrimProcessor.java | 4 +-- .../{uppercase => }/UppercaseProcessor.java | 4 +-- .../plugin/ingest/IngestModule.java | 30 +++++++++---------- .../AppendProcessorFactoryTests.java | 2 +- .../{append => }/AppendProcessorTests.java | 3 +- .../ConvertProcessorFactoryTests.java | 3 +- .../{convert => }/ConvertProcessorTests.java | 5 ++-- .../processor/{date => }/DateFormatTests.java | 3 +- .../{date => }/DateProcessorFactoryTests.java | 3 +- .../{date => }/DateProcessorTests.java | 2 +- .../{fail => }/FailProcessorFactoryTests.java | 3 +- .../{fail => }/FailProcessorTests.java | 4 ++- .../GeoIpProcessorFactoryTests.java | 3 +- .../{geoip => }/GeoIpProcessorTests.java | 3 +- .../{grok => }/GrokProcessorFactoryTests.java | 3 +- .../{grok => }/GrokProcessorTests.java | 4 ++- .../processor/{grok => }/GrokTests.java | 4 ++- .../{gsub => }/GsubProcessorFactoryTests.java | 3 +- .../{gsub => }/GsubProcessorTests.java | 3 +- .../{join => }/JoinProcessorFactoryTests.java | 2 +- .../{join => }/JoinProcessorTests.java | 3 +- .../LowercaseProcessorFactoryTests.java | 2 +- .../LowercaseProcessorTests.java | 5 +--- .../RemoveProcessorFactoryTests.java | 2 +- .../{remove => }/RemoveProcessorTests.java | 3 +- .../RenameProcessorFactoryTests.java | 2 +- .../{rename => }/RenameProcessorTests.java | 3 +- .../{set => }/SetProcessorFactoryTests.java | 2 +- .../{set => }/SetProcessorTests.java | 3 +- .../SplitProcessorFactoryTests.java | 2 +- .../{split => }/SplitProcessorTests.java | 3 +- .../{trim => }/TrimProcessorFactoryTests.java | 2 +- .../{trim => }/TrimProcessorTests.java | 5 +--- .../UppercaseProcessorFactoryTests.java | 2 +- .../UppercaseProcessorTests.java | 5 +--- .../ingest/PipelineExecutionServiceTests.java | 2 +- .../IngestMustacheRemoveProcessorIT.java | 2 +- .../ingest/IngestMustacheSetProcessorIT.java | 2 +- 55 files changed, 87 insertions(+), 113 deletions(-) rename plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/{append => }/AppendProcessor.java (93%) rename plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/{convert => }/ConvertProcessor.java (96%) rename plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/{date => }/DateFormat.java (98%) rename plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/{date => }/DateProcessor.java (96%) rename plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/{fail => }/FailProcessor.java (92%) rename plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/{fail => }/FailProcessorException.java (95%) rename plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/{geoip => }/GeoIpProcessor.java (99%) rename plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/{grok => }/Grok.java (99%) rename plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/{grok => }/GrokMatchGroup.java (97%) rename plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/{grok => }/GrokProcessor.java (96%) rename plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/{gsub => }/GsubProcessor.java (94%) rename plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/{join => }/JoinProcessor.java (93%) rename plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/{lowercase => }/LowercaseProcessor.java (92%) rename plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/{remove => }/RemoveProcessor.java (92%) rename plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/{rename => }/RenameProcessor.java (94%) rename plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/{set => }/SetProcessor.java (93%) rename plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/{split => }/SplitProcessor.java (93%) rename plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/{trim => }/TrimProcessor.java (92%) rename plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/{uppercase => }/UppercaseProcessor.java (92%) rename plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/{append => }/AppendProcessorFactoryTests.java (98%) rename plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/{append => }/AppendProcessorTests.java (98%) rename plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/{convert => }/ConvertProcessorFactoryTests.java (96%) rename plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/{convert => }/ConvertProcessorTests.java (98%) rename plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/{date => }/DateFormatTests.java (97%) rename plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/{date => }/DateProcessorFactoryTests.java (98%) rename plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/{date => }/DateProcessorTests.java (99%) rename plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/{fail => }/FailProcessorFactoryTests.java (95%) rename plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/{fail => }/FailProcessorTests.java (90%) rename plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/{geoip => }/GeoIpProcessorFactoryTests.java (98%) rename plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/{geoip => }/GeoIpProcessorTests.java (97%) rename plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/{grok => }/GrokProcessorFactoryTests.java (96%) rename plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/{grok => }/GrokProcessorTests.java (95%) rename plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/{grok => }/GrokTests.java (99%) rename plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/{gsub => }/GsubProcessorFactoryTests.java (96%) rename plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/{gsub => }/GsubProcessorTests.java (97%) rename plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/{join => }/JoinProcessorFactoryTests.java (98%) rename plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/{join => }/JoinProcessorTests.java (97%) rename plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/{lowercase => }/LowercaseProcessorFactoryTests.java (97%) rename plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/{lowercase => }/LowercaseProcessorTests.java (85%) rename plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/{remove => }/RemoveProcessorFactoryTests.java (97%) rename plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/{remove => }/RemoveProcessorTests.java (95%) rename plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/{rename => }/RenameProcessorFactoryTests.java (97%) rename plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/{rename => }/RenameProcessorTests.java (98%) rename plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/{set => }/SetProcessorFactoryTests.java (98%) rename plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/{set => }/SetProcessorTests.java (97%) rename plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/{split => }/SplitProcessorFactoryTests.java (97%) rename plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/{split => }/SplitProcessorTests.java (97%) rename plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/{trim => }/TrimProcessorFactoryTests.java (97%) rename plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/{trim => }/TrimProcessorTests.java (89%) rename plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/{uppercase => }/UppercaseProcessorFactoryTests.java (97%) rename plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/{uppercase => }/UppercaseProcessorTests.java (85%) diff --git a/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/append/AppendProcessor.java b/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/AppendProcessor.java similarity index 93% rename from plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/append/AppendProcessor.java rename to plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/AppendProcessor.java index 3b1c3a7a68b..f8d53f07af3 100644 --- a/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/append/AppendProcessor.java +++ b/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/AppendProcessor.java @@ -17,13 +17,11 @@ * under the License. */ -package org.elasticsearch.ingest.processor.append; +package org.elasticsearch.ingest.processor; import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.TemplateService; import org.elasticsearch.ingest.ValueSource; -import org.elasticsearch.ingest.processor.ConfigurationUtils; -import org.elasticsearch.ingest.processor.Processor; import java.util.Map; diff --git a/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/convert/ConvertProcessor.java b/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/ConvertProcessor.java similarity index 96% rename from plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/convert/ConvertProcessor.java rename to plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/ConvertProcessor.java index 4ef2663101e..b3c287dc9ba 100644 --- a/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/convert/ConvertProcessor.java +++ b/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/ConvertProcessor.java @@ -17,11 +17,9 @@ * under the License. */ -package org.elasticsearch.ingest.processor.convert; +package org.elasticsearch.ingest.processor; import org.elasticsearch.ingest.IngestDocument; -import org.elasticsearch.ingest.processor.ConfigurationUtils; -import org.elasticsearch.ingest.processor.Processor; import java.util.ArrayList; import java.util.List; diff --git a/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/date/DateFormat.java b/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/DateFormat.java similarity index 98% rename from plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/date/DateFormat.java rename to plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/DateFormat.java index 224d43f238f..5748d3788ab 100644 --- a/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/date/DateFormat.java +++ b/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/DateFormat.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.ingest.processor.date; +package org.elasticsearch.ingest.processor; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; diff --git a/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/date/DateProcessor.java b/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/DateProcessor.java similarity index 96% rename from plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/date/DateProcessor.java rename to plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/DateProcessor.java index 0f2be638710..6fce95436f9 100644 --- a/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/date/DateProcessor.java +++ b/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/DateProcessor.java @@ -17,11 +17,9 @@ * under the License. */ -package org.elasticsearch.ingest.processor.date; +package org.elasticsearch.ingest.processor; import org.elasticsearch.ingest.IngestDocument; -import org.elasticsearch.ingest.processor.ConfigurationUtils; -import org.elasticsearch.ingest.processor.Processor; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; import org.joda.time.format.ISODateTimeFormat; diff --git a/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/fail/FailProcessor.java b/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/FailProcessor.java similarity index 92% rename from plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/fail/FailProcessor.java rename to plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/FailProcessor.java index e4b8e23fd8f..727736fd283 100644 --- a/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/fail/FailProcessor.java +++ b/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/FailProcessor.java @@ -17,12 +17,10 @@ * under the License. */ -package org.elasticsearch.ingest.processor.fail; +package org.elasticsearch.ingest.processor; import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.TemplateService; -import org.elasticsearch.ingest.processor.ConfigurationUtils; -import org.elasticsearch.ingest.processor.Processor; import java.util.Map; diff --git a/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/fail/FailProcessorException.java b/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/FailProcessorException.java similarity index 95% rename from plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/fail/FailProcessorException.java rename to plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/FailProcessorException.java index 8c451c63864..846ba40c136 100644 --- a/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/fail/FailProcessorException.java +++ b/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/FailProcessorException.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.ingest.processor.fail; +package org.elasticsearch.ingest.processor; /** * Exception class thrown by {@link FailProcessor}. diff --git a/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/geoip/GeoIpProcessor.java b/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/GeoIpProcessor.java similarity index 99% rename from plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/geoip/GeoIpProcessor.java rename to plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/GeoIpProcessor.java index 30ca9541a4d..bfeaad4e15e 100644 --- a/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/geoip/GeoIpProcessor.java +++ b/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/GeoIpProcessor.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.ingest.processor.geoip; +package org.elasticsearch.ingest.processor; import com.maxmind.geoip2.DatabaseReader; import com.maxmind.geoip2.exception.AddressNotFoundException; @@ -32,7 +32,6 @@ import org.apache.lucene.util.IOUtils; import org.elasticsearch.SpecialPermission; import org.elasticsearch.common.network.NetworkAddress; import org.elasticsearch.ingest.IngestDocument; -import org.elasticsearch.ingest.processor.Processor; import java.io.Closeable; import java.io.IOException; diff --git a/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/grok/Grok.java b/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/Grok.java similarity index 99% rename from plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/grok/Grok.java rename to plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/Grok.java index bfad4e7e319..bb88aaa3436 100644 --- a/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/grok/Grok.java +++ b/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/Grok.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.ingest.processor.grok; +package org.elasticsearch.ingest.processor; import org.jcodings.specific.UTF8Encoding; import org.joni.Matcher; diff --git a/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/grok/GrokMatchGroup.java b/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/GrokMatchGroup.java similarity index 97% rename from plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/grok/GrokMatchGroup.java rename to plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/GrokMatchGroup.java index f44d758d7b8..3371a79c7e5 100644 --- a/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/grok/GrokMatchGroup.java +++ b/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/GrokMatchGroup.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.ingest.processor.grok; +package org.elasticsearch.ingest.processor; final class GrokMatchGroup { private static final String DEFAULT_TYPE = "string"; diff --git a/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/grok/GrokProcessor.java b/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/GrokProcessor.java similarity index 96% rename from plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/grok/GrokProcessor.java rename to plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/GrokProcessor.java index 562a86a402a..60c7cee7ead 100644 --- a/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/grok/GrokProcessor.java +++ b/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/GrokProcessor.java @@ -17,11 +17,9 @@ * under the License. */ -package org.elasticsearch.ingest.processor.grok; +package org.elasticsearch.ingest.processor; import org.elasticsearch.ingest.IngestDocument; -import org.elasticsearch.ingest.processor.ConfigurationUtils; -import org.elasticsearch.ingest.processor.Processor; import java.io.BufferedReader; import java.io.IOException; diff --git a/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/gsub/GsubProcessor.java b/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/GsubProcessor.java similarity index 94% rename from plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/gsub/GsubProcessor.java rename to plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/GsubProcessor.java index e15f99d9fed..897592a4f15 100644 --- a/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/gsub/GsubProcessor.java +++ b/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/GsubProcessor.java @@ -17,11 +17,9 @@ * under the License. */ -package org.elasticsearch.ingest.processor.gsub; +package org.elasticsearch.ingest.processor; import org.elasticsearch.ingest.IngestDocument; -import org.elasticsearch.ingest.processor.ConfigurationUtils; -import org.elasticsearch.ingest.processor.Processor; import java.util.Map; import java.util.regex.Matcher; diff --git a/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/join/JoinProcessor.java b/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/JoinProcessor.java similarity index 93% rename from plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/join/JoinProcessor.java rename to plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/JoinProcessor.java index 542c536786b..fdc9aade1f8 100644 --- a/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/join/JoinProcessor.java +++ b/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/JoinProcessor.java @@ -17,11 +17,9 @@ * under the License. */ -package org.elasticsearch.ingest.processor.join; +package org.elasticsearch.ingest.processor; import org.elasticsearch.ingest.IngestDocument; -import org.elasticsearch.ingest.processor.ConfigurationUtils; -import org.elasticsearch.ingest.processor.Processor; import java.util.List; import java.util.Map; diff --git a/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/lowercase/LowercaseProcessor.java b/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/LowercaseProcessor.java similarity index 92% rename from plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/lowercase/LowercaseProcessor.java rename to plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/LowercaseProcessor.java index e1d6cf222ad..e3e49f77c59 100644 --- a/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/lowercase/LowercaseProcessor.java +++ b/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/LowercaseProcessor.java @@ -17,9 +17,7 @@ * under the License. */ -package org.elasticsearch.ingest.processor.lowercase; - -import org.elasticsearch.ingest.processor.AbstractStringProcessor; +package org.elasticsearch.ingest.processor; import java.util.Locale; diff --git a/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/remove/RemoveProcessor.java b/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/RemoveProcessor.java similarity index 92% rename from plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/remove/RemoveProcessor.java rename to plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/RemoveProcessor.java index 9bdde91f38c..bbcf3e3f3d5 100644 --- a/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/remove/RemoveProcessor.java +++ b/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/RemoveProcessor.java @@ -17,12 +17,10 @@ * under the License. */ -package org.elasticsearch.ingest.processor.remove; +package org.elasticsearch.ingest.processor; import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.TemplateService; -import org.elasticsearch.ingest.processor.ConfigurationUtils; -import org.elasticsearch.ingest.processor.Processor; import java.util.Map; diff --git a/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/rename/RenameProcessor.java b/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/RenameProcessor.java similarity index 94% rename from plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/rename/RenameProcessor.java rename to plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/RenameProcessor.java index bc340db8275..9aa76ab2d69 100644 --- a/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/rename/RenameProcessor.java +++ b/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/RenameProcessor.java @@ -17,11 +17,9 @@ * under the License. */ -package org.elasticsearch.ingest.processor.rename; +package org.elasticsearch.ingest.processor; import org.elasticsearch.ingest.IngestDocument; -import org.elasticsearch.ingest.processor.ConfigurationUtils; -import org.elasticsearch.ingest.processor.Processor; import java.util.Map; diff --git a/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/set/SetProcessor.java b/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/SetProcessor.java similarity index 93% rename from plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/set/SetProcessor.java rename to plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/SetProcessor.java index c872c479f2b..2bf69b73772 100644 --- a/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/set/SetProcessor.java +++ b/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/SetProcessor.java @@ -17,13 +17,11 @@ * under the License. */ -package org.elasticsearch.ingest.processor.set; +package org.elasticsearch.ingest.processor; import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.TemplateService; import org.elasticsearch.ingest.ValueSource; -import org.elasticsearch.ingest.processor.ConfigurationUtils; -import org.elasticsearch.ingest.processor.Processor; import java.util.Map; diff --git a/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/split/SplitProcessor.java b/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/SplitProcessor.java similarity index 93% rename from plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/split/SplitProcessor.java rename to plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/SplitProcessor.java index a95c70cb66f..8838a384530 100644 --- a/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/split/SplitProcessor.java +++ b/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/SplitProcessor.java @@ -17,11 +17,9 @@ * under the License. */ -package org.elasticsearch.ingest.processor.split; +package org.elasticsearch.ingest.processor; import org.elasticsearch.ingest.IngestDocument; -import org.elasticsearch.ingest.processor.ConfigurationUtils; -import org.elasticsearch.ingest.processor.Processor; import java.util.Arrays; import java.util.Map; diff --git a/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/trim/TrimProcessor.java b/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/TrimProcessor.java similarity index 92% rename from plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/trim/TrimProcessor.java rename to plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/TrimProcessor.java index 8ed3afefe88..d1325510cd9 100644 --- a/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/trim/TrimProcessor.java +++ b/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/TrimProcessor.java @@ -17,9 +17,7 @@ * under the License. */ -package org.elasticsearch.ingest.processor.trim; - -import org.elasticsearch.ingest.processor.AbstractStringProcessor; +package org.elasticsearch.ingest.processor; /** * Processor that trims the content of string fields. diff --git a/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/uppercase/UppercaseProcessor.java b/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/UppercaseProcessor.java similarity index 92% rename from plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/uppercase/UppercaseProcessor.java rename to plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/UppercaseProcessor.java index a599f6cf32a..0f1757eaeec 100644 --- a/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/uppercase/UppercaseProcessor.java +++ b/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/UppercaseProcessor.java @@ -17,9 +17,7 @@ * under the License. */ -package org.elasticsearch.ingest.processor.uppercase; - -import org.elasticsearch.ingest.processor.AbstractStringProcessor; +package org.elasticsearch.ingest.processor; import java.util.Locale; diff --git a/plugins/ingest/src/main/java/org/elasticsearch/plugin/ingest/IngestModule.java b/plugins/ingest/src/main/java/org/elasticsearch/plugin/ingest/IngestModule.java index bb987e5fac1..a63ebdf1ed5 100644 --- a/plugins/ingest/src/main/java/org/elasticsearch/plugin/ingest/IngestModule.java +++ b/plugins/ingest/src/main/java/org/elasticsearch/plugin/ingest/IngestModule.java @@ -21,21 +21,21 @@ package org.elasticsearch.plugin.ingest; import org.elasticsearch.common.inject.AbstractModule; import org.elasticsearch.common.inject.multibindings.MapBinder; -import org.elasticsearch.ingest.processor.append.AppendProcessor; -import org.elasticsearch.ingest.processor.convert.ConvertProcessor; -import org.elasticsearch.ingest.processor.date.DateProcessor; -import org.elasticsearch.ingest.processor.fail.FailProcessor; -import org.elasticsearch.ingest.processor.geoip.GeoIpProcessor; -import org.elasticsearch.ingest.processor.grok.GrokProcessor; -import org.elasticsearch.ingest.processor.gsub.GsubProcessor; -import org.elasticsearch.ingest.processor.join.JoinProcessor; -import org.elasticsearch.ingest.processor.lowercase.LowercaseProcessor; -import org.elasticsearch.ingest.processor.remove.RemoveProcessor; -import org.elasticsearch.ingest.processor.rename.RenameProcessor; -import org.elasticsearch.ingest.processor.set.SetProcessor; -import org.elasticsearch.ingest.processor.split.SplitProcessor; -import org.elasticsearch.ingest.processor.trim.TrimProcessor; -import org.elasticsearch.ingest.processor.uppercase.UppercaseProcessor; +import org.elasticsearch.ingest.processor.AppendProcessor; +import org.elasticsearch.ingest.processor.ConvertProcessor; +import org.elasticsearch.ingest.processor.DateProcessor; +import org.elasticsearch.ingest.processor.FailProcessor; +import org.elasticsearch.ingest.processor.GeoIpProcessor; +import org.elasticsearch.ingest.processor.GrokProcessor; +import org.elasticsearch.ingest.processor.GsubProcessor; +import org.elasticsearch.ingest.processor.JoinProcessor; +import org.elasticsearch.ingest.processor.LowercaseProcessor; +import org.elasticsearch.ingest.processor.RemoveProcessor; +import org.elasticsearch.ingest.processor.RenameProcessor; +import org.elasticsearch.ingest.processor.SetProcessor; +import org.elasticsearch.ingest.processor.SplitProcessor; +import org.elasticsearch.ingest.processor.TrimProcessor; +import org.elasticsearch.ingest.processor.UppercaseProcessor; import org.elasticsearch.plugin.ingest.rest.IngestRestFilter; import java.util.HashMap; diff --git a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/append/AppendProcessorFactoryTests.java b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/AppendProcessorFactoryTests.java similarity index 98% rename from plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/append/AppendProcessorFactoryTests.java rename to plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/AppendProcessorFactoryTests.java index 7ebb424e2d4..09ce465c002 100644 --- a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/append/AppendProcessorFactoryTests.java +++ b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/AppendProcessorFactoryTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.ingest.processor.append; +package org.elasticsearch.ingest.processor; import org.elasticsearch.ingest.TestTemplateService; import org.elasticsearch.test.ESTestCase; diff --git a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/append/AppendProcessorTests.java b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/AppendProcessorTests.java similarity index 98% rename from plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/append/AppendProcessorTests.java rename to plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/AppendProcessorTests.java index 787a698e76f..df9cc4074c4 100644 --- a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/append/AppendProcessorTests.java +++ b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/AppendProcessorTests.java @@ -17,13 +17,14 @@ * under the License. */ -package org.elasticsearch.ingest.processor.append; +package org.elasticsearch.ingest.processor; import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.RandomDocumentPicks; import org.elasticsearch.ingest.TemplateService; import org.elasticsearch.ingest.TestTemplateService; import org.elasticsearch.ingest.ValueSource; +import org.elasticsearch.ingest.processor.AppendProcessor; import org.elasticsearch.ingest.processor.Processor; import org.elasticsearch.test.ESTestCase; diff --git a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/convert/ConvertProcessorFactoryTests.java b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/ConvertProcessorFactoryTests.java similarity index 96% rename from plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/convert/ConvertProcessorFactoryTests.java rename to plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/ConvertProcessorFactoryTests.java index f1b6fce6ced..4feb20d41c4 100644 --- a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/convert/ConvertProcessorFactoryTests.java +++ b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/ConvertProcessorFactoryTests.java @@ -17,8 +17,9 @@ * under the License. */ -package org.elasticsearch.ingest.processor.convert; +package org.elasticsearch.ingest.processor; +import org.elasticsearch.ingest.processor.ConvertProcessor; import org.elasticsearch.test.ESTestCase; import org.hamcrest.Matchers; diff --git a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/convert/ConvertProcessorTests.java b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/ConvertProcessorTests.java similarity index 98% rename from plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/convert/ConvertProcessorTests.java rename to plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/ConvertProcessorTests.java index 062f72f64bc..77ecd5056c3 100644 --- a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/convert/ConvertProcessorTests.java +++ b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/ConvertProcessorTests.java @@ -17,10 +17,11 @@ * under the License. */ -package org.elasticsearch.ingest.processor.convert; +package org.elasticsearch.ingest.processor; import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.RandomDocumentPicks; +import org.elasticsearch.ingest.processor.ConvertProcessor; import org.elasticsearch.ingest.processor.Processor; import org.elasticsearch.test.ESTestCase; @@ -31,7 +32,7 @@ import java.util.List; import java.util.Locale; import java.util.Map; -import static org.elasticsearch.ingest.processor.convert.ConvertProcessor.Type; +import static org.elasticsearch.ingest.processor.ConvertProcessor.Type; import static org.hamcrest.Matchers.containsString; import static org.hamcrest.Matchers.equalTo; diff --git a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/date/DateFormatTests.java b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/DateFormatTests.java similarity index 97% rename from plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/date/DateFormatTests.java rename to plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/DateFormatTests.java index a3f5c337fca..c53b420b244 100644 --- a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/date/DateFormatTests.java +++ b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/DateFormatTests.java @@ -17,8 +17,9 @@ * under the License. */ -package org.elasticsearch.ingest.processor.date; +package org.elasticsearch.ingest.processor; +import org.elasticsearch.ingest.processor.DateFormat; import org.elasticsearch.test.ESTestCase; import org.joda.time.DateTime; import org.joda.time.DateTimeZone; diff --git a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/date/DateProcessorFactoryTests.java b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/DateProcessorFactoryTests.java similarity index 98% rename from plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/date/DateProcessorFactoryTests.java rename to plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/DateProcessorFactoryTests.java index 08b546dead4..4f62461ce46 100644 --- a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/date/DateProcessorFactoryTests.java +++ b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/DateProcessorFactoryTests.java @@ -17,8 +17,9 @@ * under the License. */ -package org.elasticsearch.ingest.processor.date; +package org.elasticsearch.ingest.processor; +import org.elasticsearch.ingest.processor.DateProcessor; import org.elasticsearch.test.ESTestCase; import org.joda.time.DateTimeZone; diff --git a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/date/DateProcessorTests.java b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/DateProcessorTests.java similarity index 99% rename from plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/date/DateProcessorTests.java rename to plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/DateProcessorTests.java index 43724480004..46a81ca48ba 100644 --- a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/date/DateProcessorTests.java +++ b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/DateProcessorTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.ingest.processor.date; +package org.elasticsearch.ingest.processor; import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.RandomDocumentPicks; diff --git a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/fail/FailProcessorFactoryTests.java b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/FailProcessorFactoryTests.java similarity index 95% rename from plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/fail/FailProcessorFactoryTests.java rename to plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/FailProcessorFactoryTests.java index 346409c72fb..4793cb62c25 100644 --- a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/fail/FailProcessorFactoryTests.java +++ b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/FailProcessorFactoryTests.java @@ -17,9 +17,10 @@ * under the License. */ -package org.elasticsearch.ingest.processor.fail; +package org.elasticsearch.ingest.processor; import org.elasticsearch.ingest.TestTemplateService; +import org.elasticsearch.ingest.processor.FailProcessor; import org.elasticsearch.test.ESTestCase; import org.junit.Before; diff --git a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/fail/FailProcessorTests.java b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/FailProcessorTests.java similarity index 90% rename from plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/fail/FailProcessorTests.java rename to plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/FailProcessorTests.java index 51e33034a4b..c79cb7b73e5 100644 --- a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/fail/FailProcessorTests.java +++ b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/FailProcessorTests.java @@ -17,11 +17,13 @@ * under the License. */ -package org.elasticsearch.ingest.processor.fail; +package org.elasticsearch.ingest.processor; import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.RandomDocumentPicks; import org.elasticsearch.ingest.TestTemplateService; +import org.elasticsearch.ingest.processor.FailProcessor; +import org.elasticsearch.ingest.processor.FailProcessorException; import org.elasticsearch.ingest.processor.Processor; import org.elasticsearch.test.ESTestCase; diff --git a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/geoip/GeoIpProcessorFactoryTests.java b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/GeoIpProcessorFactoryTests.java similarity index 98% rename from plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/geoip/GeoIpProcessorFactoryTests.java rename to plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/GeoIpProcessorFactoryTests.java index 9716bcbd3c0..b19168ec920 100644 --- a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/geoip/GeoIpProcessorFactoryTests.java +++ b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/GeoIpProcessorFactoryTests.java @@ -17,8 +17,9 @@ * under the License. */ -package org.elasticsearch.ingest.processor.geoip; +package org.elasticsearch.ingest.processor; +import org.elasticsearch.ingest.processor.GeoIpProcessor; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.StreamsUtils; import org.junit.Before; diff --git a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/geoip/GeoIpProcessorTests.java b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/GeoIpProcessorTests.java similarity index 97% rename from plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/geoip/GeoIpProcessorTests.java rename to plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/GeoIpProcessorTests.java index 479541b0f32..4f830fe5559 100644 --- a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/geoip/GeoIpProcessorTests.java +++ b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/GeoIpProcessorTests.java @@ -17,11 +17,12 @@ * under the License. */ -package org.elasticsearch.ingest.processor.geoip; +package org.elasticsearch.ingest.processor; import com.maxmind.geoip2.DatabaseReader; import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.RandomDocumentPicks; +import org.elasticsearch.ingest.processor.GeoIpProcessor; import org.elasticsearch.test.ESTestCase; import java.io.InputStream; diff --git a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/grok/GrokProcessorFactoryTests.java b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/GrokProcessorFactoryTests.java similarity index 96% rename from plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/grok/GrokProcessorFactoryTests.java rename to plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/GrokProcessorFactoryTests.java index e8d44d392d7..833228d18d7 100644 --- a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/grok/GrokProcessorFactoryTests.java +++ b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/GrokProcessorFactoryTests.java @@ -17,8 +17,9 @@ * under the License. */ -package org.elasticsearch.ingest.processor.grok; +package org.elasticsearch.ingest.processor; +import org.elasticsearch.ingest.processor.GrokProcessor; import org.elasticsearch.test.ESTestCase; import org.junit.Before; diff --git a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/grok/GrokProcessorTests.java b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/GrokProcessorTests.java similarity index 95% rename from plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/grok/GrokProcessorTests.java rename to plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/GrokProcessorTests.java index 14164523726..c554b31aaf1 100644 --- a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/grok/GrokProcessorTests.java +++ b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/GrokProcessorTests.java @@ -17,10 +17,12 @@ * under the License. */ -package org.elasticsearch.ingest.processor.grok; +package org.elasticsearch.ingest.processor; import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.RandomDocumentPicks; +import org.elasticsearch.ingest.processor.Grok; +import org.elasticsearch.ingest.processor.GrokProcessor; import org.elasticsearch.test.ESTestCase; import java.util.Collections; diff --git a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/grok/GrokTests.java b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/GrokTests.java similarity index 99% rename from plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/grok/GrokTests.java rename to plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/GrokTests.java index c253f7dfd84..7565352885b 100644 --- a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/grok/GrokTests.java +++ b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/GrokTests.java @@ -17,8 +17,10 @@ * under the License. */ -package org.elasticsearch.ingest.processor.grok; +package org.elasticsearch.ingest.processor; +import org.elasticsearch.ingest.processor.Grok; +import org.elasticsearch.ingest.processor.GrokProcessor; import org.elasticsearch.test.ESTestCase; import org.junit.Before; diff --git a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/gsub/GsubProcessorFactoryTests.java b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/GsubProcessorFactoryTests.java similarity index 96% rename from plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/gsub/GsubProcessorFactoryTests.java rename to plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/GsubProcessorFactoryTests.java index bcf00244809..7a7377b9045 100644 --- a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/gsub/GsubProcessorFactoryTests.java +++ b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/GsubProcessorFactoryTests.java @@ -17,8 +17,9 @@ * under the License. */ -package org.elasticsearch.ingest.processor.gsub; +package org.elasticsearch.ingest.processor; +import org.elasticsearch.ingest.processor.GsubProcessor; import org.elasticsearch.test.ESTestCase; import java.util.HashMap; diff --git a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/gsub/GsubProcessorTests.java b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/GsubProcessorTests.java similarity index 97% rename from plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/gsub/GsubProcessorTests.java rename to plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/GsubProcessorTests.java index f64d271539f..76e00b218e1 100644 --- a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/gsub/GsubProcessorTests.java +++ b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/GsubProcessorTests.java @@ -17,10 +17,11 @@ * under the License. */ -package org.elasticsearch.ingest.processor.gsub; +package org.elasticsearch.ingest.processor; import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.RandomDocumentPicks; +import org.elasticsearch.ingest.processor.GsubProcessor; import org.elasticsearch.ingest.processor.Processor; import org.elasticsearch.test.ESTestCase; diff --git a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/join/JoinProcessorFactoryTests.java b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/JoinProcessorFactoryTests.java similarity index 98% rename from plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/join/JoinProcessorFactoryTests.java rename to plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/JoinProcessorFactoryTests.java index deebe50b9c5..2d7bee118f5 100644 --- a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/join/JoinProcessorFactoryTests.java +++ b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/JoinProcessorFactoryTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.ingest.processor.join; +package org.elasticsearch.ingest.processor; import org.elasticsearch.test.ESTestCase; diff --git a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/join/JoinProcessorTests.java b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/JoinProcessorTests.java similarity index 97% rename from plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/join/JoinProcessorTests.java rename to plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/JoinProcessorTests.java index 6a8acc745ff..3afc8132999 100644 --- a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/join/JoinProcessorTests.java +++ b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/JoinProcessorTests.java @@ -17,11 +17,10 @@ * under the License. */ -package org.elasticsearch.ingest.processor.join; +package org.elasticsearch.ingest.processor; import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.RandomDocumentPicks; -import org.elasticsearch.ingest.processor.Processor; import org.elasticsearch.test.ESTestCase; import java.util.ArrayList; diff --git a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/lowercase/LowercaseProcessorFactoryTests.java b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/LowercaseProcessorFactoryTests.java similarity index 97% rename from plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/lowercase/LowercaseProcessorFactoryTests.java rename to plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/LowercaseProcessorFactoryTests.java index 4ca0f1b8f04..478bb70b6fe 100644 --- a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/lowercase/LowercaseProcessorFactoryTests.java +++ b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/LowercaseProcessorFactoryTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.ingest.processor.lowercase; +package org.elasticsearch.ingest.processor; import org.elasticsearch.test.ESTestCase; diff --git a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/lowercase/LowercaseProcessorTests.java b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/LowercaseProcessorTests.java similarity index 85% rename from plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/lowercase/LowercaseProcessorTests.java rename to plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/LowercaseProcessorTests.java index 8608bb769a0..898e431faff 100644 --- a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/lowercase/LowercaseProcessorTests.java +++ b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/LowercaseProcessorTests.java @@ -17,10 +17,7 @@ * under the License. */ -package org.elasticsearch.ingest.processor.lowercase; - -import org.elasticsearch.ingest.processor.AbstractStringProcessor; -import org.elasticsearch.ingest.processor.AbstractStringProcessorTestCase; +package org.elasticsearch.ingest.processor; import java.util.Locale; diff --git a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/remove/RemoveProcessorFactoryTests.java b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/RemoveProcessorFactoryTests.java similarity index 97% rename from plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/remove/RemoveProcessorFactoryTests.java rename to plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/RemoveProcessorFactoryTests.java index 3a370223813..6c0e899f6c8 100644 --- a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/remove/RemoveProcessorFactoryTests.java +++ b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/RemoveProcessorFactoryTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.ingest.processor.remove; +package org.elasticsearch.ingest.processor; import org.elasticsearch.ingest.TestTemplateService; import org.elasticsearch.test.ESTestCase; diff --git a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/remove/RemoveProcessorTests.java b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/RemoveProcessorTests.java similarity index 95% rename from plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/remove/RemoveProcessorTests.java rename to plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/RemoveProcessorTests.java index 9800c48702a..39d31d3a0c2 100644 --- a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/remove/RemoveProcessorTests.java +++ b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/RemoveProcessorTests.java @@ -17,12 +17,11 @@ * under the License. */ -package org.elasticsearch.ingest.processor.remove; +package org.elasticsearch.ingest.processor; import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.RandomDocumentPicks; import org.elasticsearch.ingest.TestTemplateService; -import org.elasticsearch.ingest.processor.Processor; import org.elasticsearch.test.ESTestCase; import java.util.HashMap; diff --git a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/rename/RenameProcessorFactoryTests.java b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/RenameProcessorFactoryTests.java similarity index 97% rename from plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/rename/RenameProcessorFactoryTests.java rename to plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/RenameProcessorFactoryTests.java index 62c7fb7c9bd..e0298a927d6 100644 --- a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/rename/RenameProcessorFactoryTests.java +++ b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/RenameProcessorFactoryTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.ingest.processor.rename; +package org.elasticsearch.ingest.processor; import org.elasticsearch.test.ESTestCase; diff --git a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/rename/RenameProcessorTests.java b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/RenameProcessorTests.java similarity index 98% rename from plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/rename/RenameProcessorTests.java rename to plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/RenameProcessorTests.java index 8dc40360390..75a5ec8e36b 100644 --- a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/rename/RenameProcessorTests.java +++ b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/RenameProcessorTests.java @@ -17,11 +17,10 @@ * under the License. */ -package org.elasticsearch.ingest.processor.rename; +package org.elasticsearch.ingest.processor; import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.RandomDocumentPicks; -import org.elasticsearch.ingest.processor.Processor; import org.elasticsearch.test.ESTestCase; import java.util.ArrayList; diff --git a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/set/SetProcessorFactoryTests.java b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/SetProcessorFactoryTests.java similarity index 98% rename from plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/set/SetProcessorFactoryTests.java rename to plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/SetProcessorFactoryTests.java index ddbec7c8546..22ece637739 100644 --- a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/set/SetProcessorFactoryTests.java +++ b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/SetProcessorFactoryTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.ingest.processor.set; +package org.elasticsearch.ingest.processor; import org.elasticsearch.ingest.TestTemplateService; import org.elasticsearch.test.ESTestCase; diff --git a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/set/SetProcessorTests.java b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/SetProcessorTests.java similarity index 97% rename from plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/set/SetProcessorTests.java rename to plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/SetProcessorTests.java index f4947d3ae3a..bf91da0dab5 100644 --- a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/set/SetProcessorTests.java +++ b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/SetProcessorTests.java @@ -17,14 +17,13 @@ * under the License. */ -package org.elasticsearch.ingest.processor.set; +package org.elasticsearch.ingest.processor; import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.RandomDocumentPicks; import org.elasticsearch.ingest.TemplateService; import org.elasticsearch.ingest.TestTemplateService; import org.elasticsearch.ingest.ValueSource; -import org.elasticsearch.ingest.processor.Processor; import org.elasticsearch.test.ESTestCase; import org.hamcrest.Matchers; diff --git a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/split/SplitProcessorFactoryTests.java b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/SplitProcessorFactoryTests.java similarity index 97% rename from plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/split/SplitProcessorFactoryTests.java rename to plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/SplitProcessorFactoryTests.java index 5f144593ee3..d9cf2a0fdd8 100644 --- a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/split/SplitProcessorFactoryTests.java +++ b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/SplitProcessorFactoryTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.ingest.processor.split; +package org.elasticsearch.ingest.processor; import org.elasticsearch.test.ESTestCase; diff --git a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/split/SplitProcessorTests.java b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/SplitProcessorTests.java similarity index 97% rename from plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/split/SplitProcessorTests.java rename to plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/SplitProcessorTests.java index 945faaf9fb4..7c1f1a13047 100644 --- a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/split/SplitProcessorTests.java +++ b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/SplitProcessorTests.java @@ -17,11 +17,10 @@ * under the License. */ -package org.elasticsearch.ingest.processor.split; +package org.elasticsearch.ingest.processor; import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.RandomDocumentPicks; -import org.elasticsearch.ingest.processor.Processor; import org.elasticsearch.test.ESTestCase; import java.util.Arrays; diff --git a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/trim/TrimProcessorFactoryTests.java b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/TrimProcessorFactoryTests.java similarity index 97% rename from plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/trim/TrimProcessorFactoryTests.java rename to plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/TrimProcessorFactoryTests.java index d955cec0d0f..f7bcf832973 100644 --- a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/trim/TrimProcessorFactoryTests.java +++ b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/TrimProcessorFactoryTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.ingest.processor.trim; +package org.elasticsearch.ingest.processor; import org.elasticsearch.test.ESTestCase; diff --git a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/trim/TrimProcessorTests.java b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/TrimProcessorTests.java similarity index 89% rename from plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/trim/TrimProcessorTests.java rename to plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/TrimProcessorTests.java index eea867e57bd..265040ead19 100644 --- a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/trim/TrimProcessorTests.java +++ b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/TrimProcessorTests.java @@ -17,10 +17,7 @@ * under the License. */ -package org.elasticsearch.ingest.processor.trim; - -import org.elasticsearch.ingest.processor.AbstractStringProcessor; -import org.elasticsearch.ingest.processor.AbstractStringProcessorTestCase; +package org.elasticsearch.ingest.processor; public class TrimProcessorTests extends AbstractStringProcessorTestCase { diff --git a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/uppercase/UppercaseProcessorFactoryTests.java b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/UppercaseProcessorFactoryTests.java similarity index 97% rename from plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/uppercase/UppercaseProcessorFactoryTests.java rename to plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/UppercaseProcessorFactoryTests.java index 4dd50e2c1e6..c683e8ebbc2 100644 --- a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/uppercase/UppercaseProcessorFactoryTests.java +++ b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/UppercaseProcessorFactoryTests.java @@ -17,7 +17,7 @@ * under the License. */ -package org.elasticsearch.ingest.processor.uppercase; +package org.elasticsearch.ingest.processor; import org.elasticsearch.test.ESTestCase; diff --git a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/uppercase/UppercaseProcessorTests.java b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/UppercaseProcessorTests.java similarity index 85% rename from plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/uppercase/UppercaseProcessorTests.java rename to plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/UppercaseProcessorTests.java index 8327dc9f831..343fff1b588 100644 --- a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/uppercase/UppercaseProcessorTests.java +++ b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/UppercaseProcessorTests.java @@ -17,10 +17,7 @@ * under the License. */ -package org.elasticsearch.ingest.processor.uppercase; - -import org.elasticsearch.ingest.processor.AbstractStringProcessor; -import org.elasticsearch.ingest.processor.AbstractStringProcessorTestCase; +package org.elasticsearch.ingest.processor; import java.util.Locale; diff --git a/plugins/ingest/src/test/java/org/elasticsearch/plugin/ingest/PipelineExecutionServiceTests.java b/plugins/ingest/src/test/java/org/elasticsearch/plugin/ingest/PipelineExecutionServiceTests.java index 7140bf53a8d..9a31b4f9006 100644 --- a/plugins/ingest/src/test/java/org/elasticsearch/plugin/ingest/PipelineExecutionServiceTests.java +++ b/plugins/ingest/src/test/java/org/elasticsearch/plugin/ingest/PipelineExecutionServiceTests.java @@ -31,7 +31,7 @@ import org.elasticsearch.ingest.Pipeline; import org.elasticsearch.ingest.TestTemplateService; import org.elasticsearch.ingest.processor.CompoundProcessor; import org.elasticsearch.ingest.processor.Processor; -import org.elasticsearch.ingest.processor.set.SetProcessor; +import org.elasticsearch.ingest.processor.SetProcessor; import org.elasticsearch.test.ESTestCase; import org.elasticsearch.threadpool.ThreadPool; import org.junit.Before; diff --git a/qa/ingest-with-mustache/src/test/java/org/elasticsearch/plugin/ingest/IngestMustacheRemoveProcessorIT.java b/qa/ingest-with-mustache/src/test/java/org/elasticsearch/plugin/ingest/IngestMustacheRemoveProcessorIT.java index 9931b15f231..dccabb28a57 100644 --- a/qa/ingest-with-mustache/src/test/java/org/elasticsearch/plugin/ingest/IngestMustacheRemoveProcessorIT.java +++ b/qa/ingest-with-mustache/src/test/java/org/elasticsearch/plugin/ingest/IngestMustacheRemoveProcessorIT.java @@ -19,7 +19,7 @@ package org.elasticsearch.plugin.ingest; -import org.elasticsearch.ingest.processor.remove.RemoveProcessor; +import org.elasticsearch.ingest.processor.RemoveProcessor; import org.hamcrest.CoreMatchers; import java.util.Collections; diff --git a/qa/ingest-with-mustache/src/test/java/org/elasticsearch/plugin/ingest/IngestMustacheSetProcessorIT.java b/qa/ingest-with-mustache/src/test/java/org/elasticsearch/plugin/ingest/IngestMustacheSetProcessorIT.java index b979eea5098..b496d189f18 100644 --- a/qa/ingest-with-mustache/src/test/java/org/elasticsearch/plugin/ingest/IngestMustacheSetProcessorIT.java +++ b/qa/ingest-with-mustache/src/test/java/org/elasticsearch/plugin/ingest/IngestMustacheSetProcessorIT.java @@ -23,7 +23,7 @@ package org.elasticsearch.plugin.ingest; import org.elasticsearch.ingest.IngestDocument; import org.elasticsearch.ingest.ValueSource; import org.elasticsearch.ingest.processor.Processor; -import org.elasticsearch.ingest.processor.set.SetProcessor; +import org.elasticsearch.ingest.processor.SetProcessor; import org.hamcrest.Matchers; import java.util.Collections;