move all the processors under the same package org.elasticsearch.ingest.processor

This commit is contained in:
javanna 2016-01-06 12:36:27 +01:00 committed by Luca Cavanna
parent 82d87e7149
commit 1e8995d984
55 changed files with 87 additions and 113 deletions

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.ingest.processor.fail;
package org.elasticsearch.ingest.processor;
/**
* Exception class thrown by {@link FailProcessor}.

View File

@ -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;

View File

@ -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;

View File

@ -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";

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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.

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.ingest.processor.join;
package org.elasticsearch.ingest.processor;
import org.elasticsearch.test.ESTestCase;

View File

@ -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;

View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.ingest.processor.lowercase;
package org.elasticsearch.ingest.processor;
import org.elasticsearch.test.ESTestCase;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.ingest.processor.rename;
package org.elasticsearch.ingest.processor;
import org.elasticsearch.test.ESTestCase;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.ingest.processor.split;
package org.elasticsearch.ingest.processor;
import org.elasticsearch.test.ESTestCase;

View File

@ -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;

View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.ingest.processor.trim;
package org.elasticsearch.ingest.processor;
import org.elasticsearch.test.ESTestCase;

View File

@ -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 {

View File

@ -17,7 +17,7 @@
* under the License.
*/
package org.elasticsearch.ingest.processor.uppercase;
package org.elasticsearch.ingest.processor;
import org.elasticsearch.test.ESTestCase;

View File

@ -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;

View File

@ -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;

View File

@ -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;

View File

@ -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;