honeymoose
/
OpenSearch
mirror of https://github.com/honeymoose/OpenSearch.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Add generic type to Processor.Factory and rename Geo*Tests to GeoIp*Tests

This commit is contained in:
javanna 2015-11-06 12:53:20 +01:00 committed by Luca Cavanna
parent e7f0f0ed4e
commit 588de6ccff
7 changed files with 20 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/Processor.java
View File

@ -41,14 +41,15 @@ public interface Processor {
/** /**
* A factory that knows how to construct a processor based on a map of maps. * A factory that knows how to construct a processor based on a map of maps.
*/ */
interface Factory extends Closeable { interface Factory<P extends Processor> extends Closeable {
/** /**
* Creates a processor based on the specified map of maps config * Creates a processor based on the specified map of maps config
*/ */
Processor create(Map<String, Object> config) throws IOException; P create(Map<String, Object> config) throws IOException;
/** /**
* Sets the configuration directory when needed to read additional config files
*/ */
default void setConfigDirectory(Path configDirectory) { default void setConfigDirectory(Path configDirectory) {
} }

9
plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/geoip/GeoIpProcessor.java
View File

@ -27,14 +27,13 @@ import com.maxmind.geoip2.record.*;
import org.elasticsearch.SpecialPermission; import org.elasticsearch.SpecialPermission;
import org.elasticsearch.common.network.NetworkAddress; import org.elasticsearch.common.network.NetworkAddress;
import org.elasticsearch.ingest.Data; import org.elasticsearch.ingest.Data;
import org.elasticsearch.ingest.processor.ConfigurationUtils;
import org.elasticsearch.ingest.processor.Processor; import org.elasticsearch.ingest.processor.Processor;
import java.io.IOException;
import java.io.InputStream; import java.io.InputStream;
import java.net.InetAddress;
import java.net.UnknownHostException; import java.net.UnknownHostException;
import java.nio.file.Files; import java.nio.file.Files;
import java.io.IOException;
import java.net.InetAddress;
import java.nio.file.Path; import java.nio.file.Path;
import java.nio.file.StandardOpenOption; import java.nio.file.StandardOpenOption;
import java.security.AccessController; import java.security.AccessController;
@ -159,12 +158,12 @@ public final class GeoIpProcessor implements Processor {
return geoData; return geoData;
} }
public static class Factory implements Processor.Factory { public static class Factory implements Processor.Factory<GeoIpProcessor> {
private Path geoIpConfigDirectory; private Path geoIpConfigDirectory;
private final DatabaseReaderService databaseReaderService = new DatabaseReaderService(); private final DatabaseReaderService databaseReaderService = new DatabaseReaderService();
public Processor create(Map<String, Object> config) throws IOException { public GeoIpProcessor create(Map<String, Object> config) throws IOException {
String ipField = readStringProperty(config, "ip_field", null); String ipField = readStringProperty(config, "ip_field", null);
String targetField = readStringProperty(config, "target_field", "geoip"); String targetField = readStringProperty(config, "target_field", "geoip");
String databaseFile = readStringProperty(config, "database_file", "GeoLite2-City.mmdb"); String databaseFile = readStringProperty(config, "database_file", "GeoLite2-City.mmdb");

4
plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/grok/GrokProcessor.java
View File

@ -64,10 +64,10 @@ public final class GrokProcessor implements Processor {
return grok; return grok;
} }
public static class Factory implements Processor.Factory { public static class Factory implements Processor.Factory<GrokProcessor> {
private Path grokConfigDirectory; private Path grokConfigDirectory;
public Processor create(Map<String, Object> config) throws IOException { public GrokProcessor create(Map<String, Object> config) throws IOException {
String matchField = ConfigurationUtils.readStringProperty(config, "field", null); String matchField = ConfigurationUtils.readStringProperty(config, "field", null);
String matchPattern = ConfigurationUtils.readStringProperty(config, "pattern", null); String matchPattern = ConfigurationUtils.readStringProperty(config, "pattern", null);
Map<String, String> patternBank = new HashMap<>(); Map<String, String> patternBank = new HashMap<>();

5
plugins/ingest/src/main/java/org/elasticsearch/ingest/processor/simple/SimpleProcessor.java
View File

@ -23,7 +23,6 @@ import org.elasticsearch.ingest.Data;
import org.elasticsearch.ingest.processor.ConfigurationUtils; import org.elasticsearch.ingest.processor.ConfigurationUtils;
import org.elasticsearch.ingest.processor.Processor; import org.elasticsearch.ingest.processor.Processor;
import java.io.IOException;
import java.util.Map; import java.util.Map;
public final class SimpleProcessor implements Processor { 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<SimpleProcessor> {
public Processor create(Map<String, Object> config) { public SimpleProcessor create(Map<String, Object> config) {
String path = ConfigurationUtils.readStringProperty(config, "path", null); String path = ConfigurationUtils.readStringProperty(config, "path", null);
String expectedValue = ConfigurationUtils.readStringProperty(config, "expected_value", null); String expectedValue = ConfigurationUtils.readStringProperty(config, "expected_value", null);
String addField = ConfigurationUtils.readStringProperty(config, "add_field", null); String addField = ConfigurationUtils.readStringProperty(config, "add_field", null);

14
plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/geoip/GeoProcessorFactoryTests.java → plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/geoip/GeoIpProcessorFactoryTests.java
View File

@ -23,16 +23,16 @@ import org.elasticsearch.test.ESTestCase;
import org.elasticsearch.test.StreamsUtils; import org.elasticsearch.test.StreamsUtils;
import org.junit.Before; import org.junit.Before;
import static org.hamcrest.Matchers.*;
import java.io.ByteArrayInputStream; import java.io.ByteArrayInputStream;
import java.nio.file.Files; import java.nio.file.Files;
import java.nio.file.Path; import java.nio.file.Path;
import java.util.Collections;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; 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; private Path configDir;
@ -52,7 +52,7 @@ public class GeoProcessorFactoryTests extends ESTestCase {
Map<String, Object> config = new HashMap<>(); Map<String, Object> config = new HashMap<>();
config.put("ip_field", "_field"); config.put("ip_field", "_field");
GeoIpProcessor processor = (GeoIpProcessor) factory.create(config); GeoIpProcessor processor = factory.create(config);
assertThat(processor.getIpField(), equalTo("_field")); assertThat(processor.getIpField(), equalTo("_field"));
assertThat(processor.getTargetField(), equalTo("geoip")); assertThat(processor.getTargetField(), equalTo("geoip"));
assertThat(processor.getDbReader().getMetadata().getDatabaseType(), equalTo("GeoLite2-City")); assertThat(processor.getDbReader().getMetadata().getDatabaseType(), equalTo("GeoLite2-City"));
@ -64,7 +64,7 @@ public class GeoProcessorFactoryTests extends ESTestCase {
Map<String, Object> config = new HashMap<>(); Map<String, Object> config = new HashMap<>();
config.put("ip_field", "_field"); config.put("ip_field", "_field");
config.put("target_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.getIpField(), equalTo("_field"));
assertThat(processor.getTargetField(), equalTo("_field")); assertThat(processor.getTargetField(), equalTo("_field"));
} }
@ -75,7 +75,7 @@ public class GeoProcessorFactoryTests extends ESTestCase {
Map<String, Object> config = new HashMap<>(); Map<String, Object> config = new HashMap<>();
config.put("ip_field", "_field"); config.put("ip_field", "_field");
config.put("database_file", "GeoLite2-Country.mmdb"); 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.getIpField(), equalTo("_field"));
assertThat(processor.getTargetField(), equalTo("geoip")); assertThat(processor.getTargetField(), equalTo("geoip"));
assertThat(processor.getDbReader().getMetadata().getDatabaseType(), equalTo("GeoLite2-Country")); assertThat(processor.getDbReader().getMetadata().getDatabaseType(), equalTo("GeoLite2-Country"));

2
plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/geoip/GeoProcessorTests.java → plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/geoip/GeoIpProcessorTests.java
View File

@ -29,7 +29,7 @@ import java.util.Map;
import static org.hamcrest.Matchers.equalTo; import static org.hamcrest.Matchers.equalTo;
public class GeoProcessorTests extends ESTestCase { public class GeoIpProcessorTests extends ESTestCase {
public void testCity() throws Exception { public void testCity() throws Exception {
InputStream database = GeoIpProcessor.class.getResourceAsStream("/GeoLite2-City.mmdb"); InputStream database = GeoIpProcessor.class.getResourceAsStream("/GeoLite2-City.mmdb");

2
plugins/ingest/src/test/java/org/elasticsearch/ingest/processor/grok/GrokProcessorFactoryTests.java
View File

@ -49,7 +49,7 @@ public class GrokProcessorFactoryTests extends ESTestCase {
Map<String, Object> config = new HashMap<>(); Map<String, Object> config = new HashMap<>();
config.put("field", "_field"); config.put("field", "_field");
config.put("pattern", "(?<foo>\\w+)"); config.put("pattern", "(?<foo>\\w+)");
GrokProcessor processor = (GrokProcessor) factory.create(config); GrokProcessor processor = factory.create(config);
assertThat(processor.getMatchField(), equalTo("_field")); assertThat(processor.getMatchField(), equalTo("_field"));
assertThat(processor.getGrok(), notNullValue()); assertThat(processor.getGrok(), notNullValue());
} }