Keep the generics

elastic · Mar 28, 2019 · c3746d8 · c3746d8
1 parent d8d9ab6
commit c3746d8
Show file tree

Hide file tree

Showing 16 changed files with 36 additions and 34 deletions.
diff --git a/.../ingest-common/src/main/java/org/elasticsearch/ingest/common/AbstractStringProcessor.java b/.../ingest-common/src/main/java/org/elasticsearch/ingest/common/AbstractStringProcessor.java
@@ -29,8 +29,10 @@
 /**
  * Base class for processors that manipulate source strings and require a single "fields" array config value, which
  * holds a list of field names in string format.
+ *
+ * @param <T> The resultant type for the target field
  */
-abstract class AbstractStringProcessor extends AbstractProcessor {
+abstract class AbstractStringProcessor<T> extends AbstractProcessor {
     private final String field;
     private final boolean ignoreMissing;
     private final String targetField;
@@ -68,7 +70,7 @@ public final IngestDocument execute(IngestDocument document) {
         return document;
     }
 
-    protected abstract Object process(String value);
+    protected abstract T process(String value);
 
     abstract static class Factory implements Processor.Factory {
         final String processorType;
@@ -78,16 +80,16 @@ protected Factory(String processorType) {
         }
 
         @Override
-        public AbstractStringProcessor create(Map<String, Processor.Factory> registry, String tag,
-                                              Map<String, Object> config) throws Exception {
+        public AbstractStringProcessor<?> create(Map<String, Processor.Factory> registry, String tag,
+                                                 Map<String, Object> config) throws Exception {
             String field = ConfigurationUtils.readStringProperty(processorType, tag, config, "field");
             boolean ignoreMissing = ConfigurationUtils.readBooleanProperty(processorType, tag, config, "ignore_missing", false);
             String targetField = ConfigurationUtils.readStringProperty(processorType, tag, config, "target_field", field);
 
             return newProcessor(tag, config, field, ignoreMissing, targetField);
         }
 
-        protected abstract AbstractStringProcessor newProcessor(String processorTag, Map<String, Object> config, String field,
-                                                                boolean ignoreMissing, String targetField);
+        protected abstract AbstractStringProcessor<?> newProcessor(String processorTag, Map<String, Object> config, String field,
+                                                                   boolean ignoreMissing, String targetField);
     }
 }
diff --git a/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/BytesProcessor.java b/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/BytesProcessor.java
@@ -27,7 +27,7 @@
  * Processor that converts the content of string fields to the byte value.
  * Throws exception is the field is not of type string or can not convert to the numeric byte value
  */
-public final class BytesProcessor extends AbstractStringProcessor {
+public final class BytesProcessor extends AbstractStringProcessor<Long> {
 
     public static final String TYPE = "bytes";
 

diff --git a/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/GsubProcessor.java b/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/GsubProcessor.java
@@ -29,7 +29,7 @@
  * Processor that allows to search for patterns in field content and replace them with corresponding string replacement.
  * Support fields of string type only, throws exception if a field is of a different type.
  */
-public final class GsubProcessor extends AbstractStringProcessor {
+public final class GsubProcessor extends AbstractStringProcessor<String> {
 
     public static final String TYPE = "gsub";
 
@@ -67,8 +67,8 @@ public Factory() {
         }
 
         @Override
-        protected AbstractStringProcessor newProcessor(String processorTag, Map<String, Object> config, String field,
-                                                       boolean ignoreMissing, String targetField) {
+        protected GsubProcessor newProcessor(String processorTag, Map<String, Object> config, String field,
+                                             boolean ignoreMissing, String targetField) {
             String pattern = readStringProperty(TYPE, processorTag, config, "pattern");
             String replacement = readStringProperty(TYPE, processorTag, config, "replacement");
             Pattern searchPattern;

diff --git a/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/LowercaseProcessor.java b/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/LowercaseProcessor.java
@@ -27,7 +27,7 @@
  * Throws exception is the field is not of type string.
  */
 
-public final class LowercaseProcessor extends AbstractStringProcessor {
+public final class LowercaseProcessor extends AbstractStringProcessor<String> {
 
     public static final String TYPE = "lowercase";
 

diff --git a/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/TrimProcessor.java b/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/TrimProcessor.java
@@ -25,7 +25,7 @@
  * Processor that trims the content of string fields.
  * Throws exception is the field is not of type string.
  */
-public final class TrimProcessor extends AbstractStringProcessor {
+public final class TrimProcessor extends AbstractStringProcessor<String> {
 
     public static final String TYPE = "trim";
 

diff --git a/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/URLDecodeProcessor.java b/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/URLDecodeProcessor.java
@@ -26,7 +26,7 @@
 /**
  * Processor that URL-decodes a string
  */
-public final class URLDecodeProcessor extends AbstractStringProcessor {
+public final class URLDecodeProcessor extends AbstractStringProcessor<String> {
 
     public static final String TYPE = "urldecode";
 

diff --git a/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/UppercaseProcessor.java b/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/UppercaseProcessor.java
@@ -26,7 +26,7 @@
  * Processor that converts the content of string fields to uppercase.
  * Throws exception is the field is not of type string.
  */
-public final class UppercaseProcessor extends AbstractStringProcessor {
+public final class UppercaseProcessor extends AbstractStringProcessor<String> {
 
     public static final String TYPE = "uppercase";
 

diff --git a/...src/test/java/org/elasticsearch/ingest/common/AbstractStringProcessorFactoryTestCase.java b/...src/test/java/org/elasticsearch/ingest/common/AbstractStringProcessorFactoryTestCase.java
@@ -37,7 +37,7 @@ protected Map<String, Object> modifyConfig(Map<String, Object> config) {
         return config;
     }
 
-    protected void assertProcessor(AbstractStringProcessor processor) {}
+    protected void assertProcessor(AbstractStringProcessor<?> processor) {}
 
     public void testCreate() throws Exception {
         AbstractStringProcessor.Factory factory = newFactory();
@@ -47,7 +47,7 @@ public void testCreate() throws Exception {
         Map<String, Object> config = new HashMap<>();
         config.put("field", fieldName);
 
-        AbstractStringProcessor processor = factory.create(null, processorTag, modifyConfig(config));
+        AbstractStringProcessor<?> processor = factory.create(null, processorTag, modifyConfig(config));
         assertThat(processor.getTag(), equalTo(processorTag));
         assertThat(processor.getField(), equalTo(fieldName));
         assertThat(processor.isIgnoreMissing(), is(false));
@@ -64,7 +64,7 @@ public void testCreateWithIgnoreMissing() throws Exception {
         config.put("field", fieldName);
         config.put("ignore_missing", true);
 
-        AbstractStringProcessor processor = factory.create(null, processorTag, modifyConfig(config));
+        AbstractStringProcessor<?> processor = factory.create(null, processorTag, modifyConfig(config));
         assertThat(processor.getTag(), equalTo(processorTag));
         assertThat(processor.getField(), equalTo(fieldName));
         assertThat(processor.isIgnoreMissing(), is(true));
@@ -82,7 +82,7 @@ public void testCreateWithTargetField() throws Exception {
         config.put("field", fieldName);
         config.put("target_field", targetFieldName);
 
-        AbstractStringProcessor processor = factory.create(null, processorTag, modifyConfig(config));
+        AbstractStringProcessor<?> processor = factory.create(null, processorTag, modifyConfig(config));
         assertThat(processor.getTag(), equalTo(processorTag));
         assertThat(processor.getField(), equalTo(fieldName));
         assertThat(processor.isIgnoreMissing(), is(false));

diff --git a/...common/src/test/java/org/elasticsearch/ingest/common/AbstractStringProcessorTestCase.java b/...common/src/test/java/org/elasticsearch/ingest/common/AbstractStringProcessorTestCase.java
@@ -31,15 +31,15 @@
 import static org.hamcrest.Matchers.containsString;
 import static org.hamcrest.Matchers.equalTo;
 
-public abstract class AbstractStringProcessorTestCase extends ESTestCase {
+public abstract class AbstractStringProcessorTestCase<T> extends ESTestCase {
 
-    protected abstract AbstractStringProcessor newProcessor(String field, boolean ignoreMissing, String targetField);
+    protected abstract AbstractStringProcessor<T> newProcessor(String field, boolean ignoreMissing, String targetField);
 
     protected String modifyInput(String input) {
         return input;
     }
 
-    protected abstract Object expectedResult(String input);
+    protected abstract T expectedResult(String input);
 
     protected Class<?> expectedResultType(){
         return String.class;  // most results types are Strings

diff --git a/modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/BytesProcessorTests.java b/modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/BytesProcessorTests.java
@@ -29,12 +29,12 @@
 
 import static org.hamcrest.Matchers.equalTo;
 
-public class BytesProcessorTests extends AbstractStringProcessorTestCase {
+public class BytesProcessorTests extends AbstractStringProcessorTestCase<Long> {
 
     private String modifiedInput;
 
     @Override
-    protected AbstractStringProcessor newProcessor(String field, boolean ignoreMissing, String targetField) {
+    protected AbstractStringProcessor<Long> newProcessor(String field, boolean ignoreMissing, String targetField) {
         return new BytesProcessor(randomAlphaOfLength(10), field, ignoreMissing, targetField);
     }
 

diff --git a/...ngest-common/src/test/java/org/elasticsearch/ingest/common/GsubProcessorFactoryTests.java b/...ngest-common/src/test/java/org/elasticsearch/ingest/common/GsubProcessorFactoryTests.java
@@ -42,7 +42,7 @@ protected Map<String, Object> modifyConfig(Map<String, Object> config) {
     }
 
     @Override
-    protected void assertProcessor(AbstractStringProcessor processor) {
+    protected void assertProcessor(AbstractStringProcessor<?> processor) {
         GsubProcessor gsubProcessor = (GsubProcessor) processor;
         assertThat(gsubProcessor.getPattern().toString(), equalTo("\\."));
         assertThat(gsubProcessor.getReplacement(), equalTo("-"));

diff --git a/modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/GsubProcessorTests.java b/modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/GsubProcessorTests.java
@@ -21,10 +21,10 @@
 
 import java.util.regex.Pattern;
 
-public class GsubProcessorTests extends AbstractStringProcessorTestCase {
+public class GsubProcessorTests extends AbstractStringProcessorTestCase<String> {
 
     @Override
-    protected AbstractStringProcessor newProcessor(String field, boolean ignoreMissing, String targetField) {
+    protected AbstractStringProcessor<String> newProcessor(String field, boolean ignoreMissing, String targetField) {
         return new GsubProcessor(randomAlphaOfLength(10), field, Pattern.compile("\\."), "-", ignoreMissing, targetField);
     }
 

diff --git a/.../ingest-common/src/test/java/org/elasticsearch/ingest/common/LowercaseProcessorTests.java b/.../ingest-common/src/test/java/org/elasticsearch/ingest/common/LowercaseProcessorTests.java
@@ -21,9 +21,9 @@
 
 import java.util.Locale;
 
-public class LowercaseProcessorTests extends AbstractStringProcessorTestCase {
+public class LowercaseProcessorTests extends AbstractStringProcessorTestCase<String> {
     @Override
-    protected AbstractStringProcessor newProcessor(String field, boolean ignoreMissing, String targetField) {
+    protected AbstractStringProcessor<String> newProcessor(String field, boolean ignoreMissing, String targetField) {
         return new LowercaseProcessor(randomAlphaOfLength(10), field, ignoreMissing, targetField);
     }
 

diff --git a/modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/TrimProcessorTests.java b/modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/TrimProcessorTests.java
@@ -19,10 +19,10 @@
 
 package org.elasticsearch.ingest.common;
 
-public class TrimProcessorTests extends AbstractStringProcessorTestCase {
+public class TrimProcessorTests extends AbstractStringProcessorTestCase<String> {
 
     @Override
-    protected AbstractStringProcessor newProcessor(String field, boolean ignoreMissing, String targetField) {
+    protected AbstractStringProcessor<String> newProcessor(String field, boolean ignoreMissing, String targetField) {
         return new TrimProcessor(randomAlphaOfLength(10), field, ignoreMissing, targetField);
     }
 

diff --git a/.../ingest-common/src/test/java/org/elasticsearch/ingest/common/URLDecodeProcessorTests.java b/.../ingest-common/src/test/java/org/elasticsearch/ingest/common/URLDecodeProcessorTests.java
@@ -22,14 +22,14 @@
 import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 
-public class URLDecodeProcessorTests extends AbstractStringProcessorTestCase {
+public class URLDecodeProcessorTests extends AbstractStringProcessorTestCase<String> {
     @Override
     protected String modifyInput(String input) {
         return "Hello%20G%C3%BCnter" + input;
     }
 
     @Override
-    protected AbstractStringProcessor newProcessor(String field, boolean ignoreMissing, String targetField) {
+    protected AbstractStringProcessor<String> newProcessor(String field, boolean ignoreMissing, String targetField) {
         return new URLDecodeProcessor(randomAlphaOfLength(10), field, ignoreMissing, targetField);
     }
 

diff --git a/.../ingest-common/src/test/java/org/elasticsearch/ingest/common/UppercaseProcessorTests.java b/.../ingest-common/src/test/java/org/elasticsearch/ingest/common/UppercaseProcessorTests.java
@@ -21,10 +21,10 @@
 
 import java.util.Locale;
 
-public class UppercaseProcessorTests extends AbstractStringProcessorTestCase {
+public class UppercaseProcessorTests extends AbstractStringProcessorTestCase<String> {
 
     @Override
-    protected AbstractStringProcessor newProcessor(String field, boolean ignoreMissing, String targetField) {
+    protected AbstractStringProcessor<String> newProcessor(String field, boolean ignoreMissing, String targetField) {
         return new UppercaseProcessor(randomAlphaOfLength(10), field, ignoreMissing, targetField);
     }