From 588de6ccffb34dcd4a1952020b809c1ec1fd5bf7 Mon Sep 17 00:00:00 2001 From: javanna Date: Fri, 6 Nov 2015 12:53:20 +0100 Subject: [PATCH] Add generic type to Processor.Factory and rename Geo*Tests to GeoIp*Tests --- .../elasticsearch/ingest/processor/Processor.java | 5 +++-- .../ingest/processor/geoip/GeoIpProcessor.java | 9 ++++----- .../ingest/processor/grok/GrokProcessor.java | 4 ++-- .../ingest/processor/simple/SimpleProcessor.java | 5 ++--- ...yTests.java => GeoIpProcessorFactoryTests.java} | 14 +++++++------- ...rocessorTests.java => GeoIpProcessorTests.java} | 2 +- .../processor/grok/GrokProcessorFactoryTests.java | 2 +- 7 files changed, 20 insertions(+), 21 deletions(-) rename plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/geoip/{GeoProcessorFactoryTests.java => GeoIpProcessorFactoryTests.java} (91%) rename plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/geoip/{GeoProcessorTests.java => GeoIpProcessorTests.java} (98%) diff --git a/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/Processor.java b/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/Processor.java index 9916e24a587..a023b78ade4 100644 --- a/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/Processor.java +++ b/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/Processor.java @@ -41,14 +41,15 @@ public interface Processor { /** * A factory that knows how to construct a processor based on a map of maps. */ - interface Factory extends Closeable { + interface Factory

extends Closeable { /** * Creates a processor based on the specified map of maps config */ - Processor create(Map config) throws IOException; + P create(Map config) throws IOException; /** + * Sets the configuration directory when needed to read additional config files */ default void setConfigDirectory(Path configDirectory) { } 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/geoip/GeoIpProcessor.java index 77d9833d0ab..020b88a23e0 100644 --- a/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/geoip/GeoIpProcessor.java +++ b/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/geoip/GeoIpProcessor.java @@ -27,14 +27,13 @@ import com.maxmind.geoip2.record.*; import org.elasticsearch.SpecialPermission; import org.elasticsearch.common.network.NetworkAddress; import org.elasticsearch.ingest.Data; -import org.elasticsearch.ingest.processor.ConfigurationUtils; import org.elasticsearch.ingest.processor.Processor; +import java.io.IOException; import java.io.InputStream; +import java.net.InetAddress; import java.net.UnknownHostException; import java.nio.file.Files; -import java.io.IOException; -import java.net.InetAddress; import java.nio.file.Path; import java.nio.file.StandardOpenOption; import java.security.AccessController; @@ -159,12 +158,12 @@ public final class GeoIpProcessor implements Processor { return geoData; } - public static class Factory implements Processor.Factory { + public static class Factory implements Processor.Factory { private Path geoIpConfigDirectory; private final DatabaseReaderService databaseReaderService = new DatabaseReaderService(); - public Processor create(Map config) throws IOException { + public GeoIpProcessor create(Map config) throws IOException { String ipField = readStringProperty(config, "ip_field", null); String targetField = readStringProperty(config, "target_field", "geoip"); String databaseFile = readStringProperty(config, "database_file", "GeoLite2-City.mmdb"); 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/grok/GrokProcessor.java index 7d7af7ecaa4..9f7a7c78c07 100644 --- a/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/grok/GrokProcessor.java +++ b/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/grok/GrokProcessor.java @@ -64,10 +64,10 @@ public final class GrokProcessor implements Processor { return grok; } - public static class Factory implements Processor.Factory { + public static class Factory implements Processor.Factory { private Path grokConfigDirectory; - public Processor create(Map config) throws IOException { + public GrokProcessor create(Map config) throws IOException { String matchField = ConfigurationUtils.readStringProperty(config, "field", null); String matchPattern = ConfigurationUtils.readStringProperty(config, "pattern", null); Map patternBank = new HashMap<>(); diff --git a/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/simple/SimpleProcessor.java b/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/simple/SimpleProcessor.java index 4ae28989cd5..0bfd07de462 100644 --- a/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/simple/SimpleProcessor.java +++ b/plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/simple/SimpleProcessor.java @@ -23,7 +23,6 @@ import org.elasticsearch.ingest.Data; import org.elasticsearch.ingest.processor.ConfigurationUtils; import org.elasticsearch.ingest.processor.Processor; -import java.io.IOException; import java.util.Map; public final class SimpleProcessor implements Processor { @@ -53,9 +52,9 @@ public final class SimpleProcessor implements Processor { } } - public static class Factory implements Processor.Factory { + public static class Factory implements Processor.Factory { - public Processor create(Map config) { + public SimpleProcessor create(Map config) { String path = ConfigurationUtils.readStringProperty(config, "path", null); String expectedValue = ConfigurationUtils.readStringProperty(config, "expected_value", null); String addField = ConfigurationUtils.readStringProperty(config, "add_field", null); diff --git a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/geoip/GeoProcessorFactoryTests.java b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/geoip/GeoIpProcessorFactoryTests.java similarity index 91% rename from plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/geoip/GeoProcessorFactoryTests.java rename to plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/geoip/GeoIpProcessorFactoryTests.java index 7a0119ce10b..ad270d18e96 100644 --- a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/geoip/GeoProcessorFactoryTests.java +++ b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/geoip/GeoIpProcessorFactoryTests.java @@ -23,16 +23,16 @@ import org.elasticsearch.test.ESTestCase; import org.elasticsearch.test.StreamsUtils; import org.junit.Before; -import static org.hamcrest.Matchers.*; - import java.io.ByteArrayInputStream; import java.nio.file.Files; import java.nio.file.Path; -import java.util.Collections; import java.util.HashMap; import java.util.Map; -public class GeoProcessorFactoryTests extends ESTestCase { +import static org.hamcrest.Matchers.equalTo; +import static org.hamcrest.Matchers.startsWith; + +public class GeoIpProcessorFactoryTests extends ESTestCase { private Path configDir; @@ -52,7 +52,7 @@ public class GeoProcessorFactoryTests extends ESTestCase { Map config = new HashMap<>(); config.put("ip_field", "_field"); - GeoIpProcessor processor = (GeoIpProcessor) factory.create(config); + GeoIpProcessor processor = factory.create(config); assertThat(processor.getIpField(), equalTo("_field")); assertThat(processor.getTargetField(), equalTo("geoip")); assertThat(processor.getDbReader().getMetadata().getDatabaseType(), equalTo("GeoLite2-City")); @@ -64,7 +64,7 @@ public class GeoProcessorFactoryTests extends ESTestCase { Map config = new HashMap<>(); config.put("ip_field", "_field"); config.put("target_field", "_field"); - GeoIpProcessor processor = (GeoIpProcessor) factory.create(config); + GeoIpProcessor processor = factory.create(config); assertThat(processor.getIpField(), equalTo("_field")); assertThat(processor.getTargetField(), equalTo("_field")); } @@ -75,7 +75,7 @@ public class GeoProcessorFactoryTests extends ESTestCase { Map config = new HashMap<>(); config.put("ip_field", "_field"); config.put("database_file", "GeoLite2-Country.mmdb"); - GeoIpProcessor processor = (GeoIpProcessor) factory.create(config); + GeoIpProcessor processor = factory.create(config); assertThat(processor.getIpField(), equalTo("_field")); assertThat(processor.getTargetField(), equalTo("geoip")); assertThat(processor.getDbReader().getMetadata().getDatabaseType(), equalTo("GeoLite2-Country")); diff --git a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/geoip/GeoProcessorTests.java b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/geoip/GeoIpProcessorTests.java similarity index 98% rename from plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/geoip/GeoProcessorTests.java rename to plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/geoip/GeoIpProcessorTests.java index 43b293501ae..735776ec43d 100644 --- a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/geoip/GeoProcessorTests.java +++ b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/geoip/GeoIpProcessorTests.java @@ -29,7 +29,7 @@ import java.util.Map; import static org.hamcrest.Matchers.equalTo; -public class GeoProcessorTests extends ESTestCase { +public class GeoIpProcessorTests extends ESTestCase { public void testCity() throws Exception { InputStream database = GeoIpProcessor.class.getResourceAsStream("/GeoLite2-City.mmdb"); 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/grok/GrokProcessorFactoryTests.java index 25a8321575d..9291c1bb04a 100644 --- a/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/grok/GrokProcessorFactoryTests.java +++ b/plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/grok/GrokProcessorFactoryTests.java @@ -49,7 +49,7 @@ public class GrokProcessorFactoryTests extends ESTestCase { Map config = new HashMap<>(); config.put("field", "_field"); config.put("pattern", "(?\\w+)"); - GrokProcessor processor = (GrokProcessor) factory.create(config); + GrokProcessor processor = factory.create(config); assertThat(processor.getMatchField(), equalTo("_field")); assertThat(processor.getGrok(), notNullValue()); }