Remove -Xlint exclusions in the ingest-common module. (#40505)

martijnvg · martijnvg · commit 89837eb9188c · 2019-03-29T09:43:36.000+01:00
Fix the generics in processors extending AbstractStringProcessor and its factory. Relates to #40366
diff --git a/modules/ingest-common/build.gradle b/modules/ingest-common/build.gradle
@@ -29,9 +29,6 @@ dependencies {
     compile project(':libs:dissect')
 }
 
-compileJava.options.compilerArgs << "-Xlint:-unchecked,-rawtypes"
-compileTestJava.options.compilerArgs << "-Xlint:-unchecked,-rawtypes"
-
 integTestCluster {
     module project(':modules:lang-painless')
 }
diff --git a/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/AbstractStringProcessor.java b/modules/ingest-common/src/main/java/org/elasticsearch/ingest/common/AbstractStringProcessor.java
@@ -80,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/modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/AbstractStringProcessorFactoryTestCase.java b/modules/ingest-common/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/modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/AbstractStringProcessorTestCase.java b/modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/AbstractStringProcessorTestCase.java
@@ -33,16 +33,16 @@
 
 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 T expectedResult(String input);
 
-    protected Class<T> expectedResultType(){
-        return (Class<T>) String.class;  // most results types are Strings
+    protected Class<?> expectedResultType(){
+        return String.class;  // most results types are Strings
     }
 
     public void testProcessor() throws Exception {
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/modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/GsubProcessorFactoryTests.java b/modules/ingest-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/modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/LowercaseProcessorTests.java b/modules/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/modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/URLDecodeProcessorTests.java b/modules/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/modules/ingest-common/src/test/java/org/elasticsearch/ingest/common/UppercaseProcessorTests.java b/modules/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);
     }
 

Original file line number	Diff line number	Diff line change
`@@ -29,9 +29,6 @@ dependencies {`
`29`	`29`	`compile project(':libs:dissect')`
`30`	`30`	`}`
`31`	`31`
`32`		`-compileJava.options.compilerArgs << "-Xlint:-unchecked,-rawtypes"`
`33`		`-compileTestJava.options.compilerArgs << "-Xlint:-unchecked,-rawtypes"`
`34`		`-`
`35`	`32`	`integTestCluster {`
`36`	`33`	`module project(':modules:lang-painless')`
`37`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -80,16 +80,16 @@ protected Factory(String processorType) {`
`80`	`80`	`}`
`81`	`81`
`82`	`82`	`@Override`
`83`		`- public AbstractStringProcessor create(Map<String, Processor.Factory> registry, String tag,`
`84`		`- Map<String, Object> config) throws Exception {`
	`83`	`+ public AbstractStringProcessor<?> create(Map<String, Processor.Factory> registry, String tag,`
	`84`	`+ Map<String, Object> config) throws Exception {`
`85`	`85`	`String field = ConfigurationUtils.readStringProperty(processorType, tag, config, "field");`
`86`	`86`	`boolean ignoreMissing = ConfigurationUtils.readBooleanProperty(processorType, tag, config, "ignore_missing", false);`
`87`	`87`	`String targetField = ConfigurationUtils.readStringProperty(processorType, tag, config, "target_field", field);`
`88`	`88`
`89`	`89`	`return newProcessor(tag, config, field, ignoreMissing, targetField);`
`90`	`90`	`}`
`91`	`91`
`92`		`- protected abstract AbstractStringProcessor newProcessor(String processorTag, Map<String, Object> config, String field,`
`93`		`- boolean ignoreMissing, String targetField);`
	`92`	`+ protected abstract AbstractStringProcessor<?> newProcessor(String processorTag, Map<String, Object> config, String field,`
	`93`	`+ boolean ignoreMissing, String targetField);`
`94`	`94`	`}`
`95`	`95`	`}`
Original file line number	Diff line number	Diff line change
`@@ -33,16 +33,16 @@`
`33`	`33`
`34`	`34`	`public abstract class AbstractStringProcessorTestCase<T> extends ESTestCase {`
`35`	`35`
`36`		`- protected abstract AbstractStringProcessor newProcessor(String field, boolean ignoreMissing, String targetField);`
	`36`	`+ protected abstract AbstractStringProcessor<T> newProcessor(String field, boolean ignoreMissing, String targetField);`
`37`	`37`
`38`	`38`	`protected String modifyInput(String input) {`
`39`	`39`	`return input;`
`40`	`40`	`}`
`41`	`41`
`42`	`42`	`protected abstract T expectedResult(String input);`
`43`	`43`
`44`		`- protected Class<T> expectedResultType(){`
`45`		`- return (Class<T>) String.class; // most results types are Strings`
	`44`	`+ protected Class<?> expectedResultType(){`
	`45`	`+ return String.class; // most results types are Strings`
`46`	`46`	`}`
`47`	`47`
`48`	`48`	`public void testProcessor() throws Exception {`
Original file line number	Diff line number	Diff line change
`@@ -42,7 +42,7 @@ protected Map<String, Object> modifyConfig(Map<String, Object> config) {`
`42`	`42`	`}`
`43`	`43`
`44`	`44`	`@Override`
`45`		`- protected void assertProcessor(AbstractStringProcessor processor) {`
	`45`	`+ protected void assertProcessor(AbstractStringProcessor<?> processor) {`
`46`	`46`	`GsubProcessor gsubProcessor = (GsubProcessor) processor;`
`47`	`47`	`assertThat(gsubProcessor.getPattern().toString(), equalTo("\\."));`
`48`	`48`	`assertThat(gsubProcessor.getReplacement(), equalTo("-"));`
Original file line number	Diff line number	Diff line change
`@@ -21,10 +21,10 @@`
`21`	`21`
`22`	`22`	`import java.util.regex.Pattern;`
`23`	`23`
`24`		`-public class GsubProcessorTests extends AbstractStringProcessorTestCase {`
	`24`	`+public class GsubProcessorTests extends AbstractStringProcessorTestCase<String> {`
`25`	`25`
`26`	`26`	`@Override`
`27`		`- protected AbstractStringProcessor newProcessor(String field, boolean ignoreMissing, String targetField) {`
	`27`	`+ protected AbstractStringProcessor<String> newProcessor(String field, boolean ignoreMissing, String targetField) {`
`28`	`28`	`return new GsubProcessor(randomAlphaOfLength(10), field, Pattern.compile("\\."), "-", ignoreMissing, targetField);`
`29`	`29`	`}`
`30`	`30`
Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,9 @@`
`21`	`21`
`22`	`22`	`import java.util.Locale;`
`23`	`23`
`24`		`-public class LowercaseProcessorTests extends AbstractStringProcessorTestCase {`
	`24`	`+public class LowercaseProcessorTests extends AbstractStringProcessorTestCase<String> {`
`25`	`25`	`@Override`
`26`		`- protected AbstractStringProcessor newProcessor(String field, boolean ignoreMissing, String targetField) {`
	`26`	`+ protected AbstractStringProcessor<String> newProcessor(String field, boolean ignoreMissing, String targetField) {`
`27`	`27`	`return new LowercaseProcessor(randomAlphaOfLength(10), field, ignoreMissing, targetField);`
`28`	`28`	`}`
`29`	`29`
Original file line number	Diff line number	Diff line change
`@@ -19,10 +19,10 @@`
`19`	`19`
`20`	`20`	`package org.elasticsearch.ingest.common;`
`21`	`21`
`22`		`-public class TrimProcessorTests extends AbstractStringProcessorTestCase {`
	`22`	`+public class TrimProcessorTests extends AbstractStringProcessorTestCase<String> {`
`23`	`23`
`24`	`24`	`@Override`
`25`		`- protected AbstractStringProcessor newProcessor(String field, boolean ignoreMissing, String targetField) {`
	`25`	`+ protected AbstractStringProcessor<String> newProcessor(String field, boolean ignoreMissing, String targetField) {`
`26`	`26`	`return new TrimProcessor(randomAlphaOfLength(10), field, ignoreMissing, targetField);`
`27`	`27`	`}`
`28`	`28`
Original file line number	Diff line number	Diff line change
`@@ -22,14 +22,14 @@`
`22`	`22`	`import java.io.UnsupportedEncodingException;`
`23`	`23`	`import java.net.URLDecoder;`
`24`	`24`
`25`		`-public class URLDecodeProcessorTests extends AbstractStringProcessorTestCase {`
	`25`	`+public class URLDecodeProcessorTests extends AbstractStringProcessorTestCase<String> {`
`26`	`26`	`@Override`
`27`	`27`	`protected String modifyInput(String input) {`
`28`	`28`	`return "Hello%20G%C3%BCnter" + input;`
`29`	`29`	`}`
`30`	`30`
`31`	`31`	`@Override`
`32`		`- protected AbstractStringProcessor newProcessor(String field, boolean ignoreMissing, String targetField) {`
	`32`	`+ protected AbstractStringProcessor<String> newProcessor(String field, boolean ignoreMissing, String targetField) {`
`33`	`33`	`return new URLDecodeProcessor(randomAlphaOfLength(10), field, ignoreMissing, targetField);`
`34`	`34`	`}`
`35`	`35`