diff options
25 files changed, 29 insertions, 12 deletions
diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/FieldPathUpdateAdapter.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/FieldPathUpdateAdapter.java index 5d3fcd24727..3a10cc76460 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/FieldPathUpdateAdapter.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/FieldPathUpdateAdapter.java @@ -66,7 +66,7 @@ public class FieldPathUpdateAdapter implements UpdateAdapter { return adapter.setOutputValue(exp, fieldName, fieldValue); } - @SuppressWarnings({ "unchecked" }) + @SuppressWarnings({ "unchecked", "rawtypes" }) private void createUpdatesAt(List<FieldPathEntry> path, FieldValue value, int idx, DocumentUpdate out) { FieldPath updatePath = update.getFieldPath(); if (idx < updatePath.size()) { diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/FieldUpdateAdapter.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/FieldUpdateAdapter.java index cf88dc74ed0..b235dc01971 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/FieldUpdateAdapter.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/FieldUpdateAdapter.java @@ -12,6 +12,7 @@ import java.util.*; /** * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ +@SuppressWarnings("rawtypes") public class FieldUpdateAdapter implements UpdateAdapter { private final DocumentAdapter adapter; diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/FieldUpdateHelper.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/FieldUpdateHelper.java index 7412b7171d1..e9b75d165a0 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/FieldUpdateHelper.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/FieldUpdateHelper.java @@ -8,6 +8,7 @@ import com.yahoo.document.update.*; /** * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ +@SuppressWarnings("rawtypes") public abstract class FieldUpdateHelper { public static boolean isComplete(Field field, ValueUpdate update) { diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/FieldValueConverter.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/FieldValueConverter.java index 59d5de4a965..8b7130f540b 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/FieldValueConverter.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/FieldValueConverter.java @@ -35,7 +35,7 @@ public abstract class FieldValueConverter { return value; } - @SuppressWarnings({ "unchecked" }) + @SuppressWarnings({ "unchecked", "rawtypes" }) private FieldValue convertArray(Array val) { List<FieldValue> next = new LinkedList<FieldValue>(); DataType nextType = null; @@ -63,7 +63,7 @@ public abstract class FieldValueConverter { return ret; } - @SuppressWarnings({ "unchecked" }) + @SuppressWarnings({ "unchecked", "rawtypes" }) private FieldValue convertMap(MapFieldValue<FieldValue, FieldValue> val) { Map<FieldValue, FieldValue> next = new LinkedHashMap<FieldValue, FieldValue>(); DataType nextKeyType = null, nextValType = null; @@ -102,7 +102,7 @@ public abstract class FieldValueConverter { return ret; } - @SuppressWarnings({ "unchecked" }) + @SuppressWarnings({ "unchecked", "rawtypes" }) private FieldValue convertWset(WeightedSet val) { Map<FieldValue, Integer> next = new LinkedHashMap<FieldValue, Integer>(); DataType nextType = null; @@ -164,4 +164,4 @@ public abstract class FieldValueConverter { * @return The value to replace the old. */ protected abstract FieldValue doConvert(FieldValue value); -}
\ No newline at end of file +} diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/SimpleAdapterFactory.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/SimpleAdapterFactory.java index 2a00161080e..8173686b2ec 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/SimpleAdapterFactory.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/SimpleAdapterFactory.java @@ -13,6 +13,7 @@ import java.util.List; /** * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ +@SuppressWarnings("rawtypes") public class SimpleAdapterFactory implements AdapterFactory { public static class SelectExpression { public Expression selectExpression(DocumentType documentType, String fieldName) { diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/CatExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/CatExpression.java index 79576563504..2e44db78387 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/CatExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/CatExpression.java @@ -137,7 +137,7 @@ public class CatExpression extends ExpressionList<Expression> { } } - @SuppressWarnings({ "unchecked" }) + @SuppressWarnings({ "unchecked", "rawtypes" }) private static FieldValue asArray(ArrayDataType arrType, List<FieldValue> values) { Array out = arrType.createFieldValue(); for (FieldValue val : values) { @@ -149,7 +149,7 @@ public class CatExpression extends ExpressionList<Expression> { return out; } - @SuppressWarnings({ "unchecked" }) + @SuppressWarnings({ "unchecked", "rawtypes" }) private static FieldValue asWset(WeightedSetDataType wsetType, List<FieldValue> values) { WeightedSet out = wsetType.createFieldValue(); for (FieldValue val : values) { diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/Expression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/Expression.java index 2ed288760e7..0bd28ca5c9f 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/Expression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/Expression.java @@ -205,7 +205,7 @@ public abstract class Expression extends Selectable { return expression.execute(new SimpleAdapterFactory(), doc); } public static final DocumentUpdate execute(Expression expression, DocumentUpdate update) { - return expression.execute(expression, new SimpleAdapterFactory(), update); + return execute(expression, new SimpleAdapterFactory(), update); } public final FieldValue execute() { return execute(new ExecutionContext()); diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ExpressionList.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ExpressionList.java index aec0b2ada28..393fe80eac9 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ExpressionList.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ExpressionList.java @@ -49,6 +49,7 @@ public abstract class ExpressionList<T extends Expression> extends CompositeExpr } @Override + @SuppressWarnings("rawtypes") public boolean equals(Object obj) { if (!(obj instanceof ExpressionList)) { return false; diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToArrayExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToArrayExpression.java index 4f072b9c820..1ecb97bab81 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToArrayExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToArrayExpression.java @@ -12,7 +12,7 @@ import com.yahoo.document.datatypes.FieldValue; */ public class ToArrayExpression extends Expression { - @SuppressWarnings({ "unchecked" }) + @SuppressWarnings({ "unchecked", "rawtypes" }) @Override protected void doExecute(ExecutionContext ctx) { FieldValue input = ctx.getValue(); diff --git a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToWsetExpression.java b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToWsetExpression.java index 8dcb5336dc7..a03c65f1791 100644 --- a/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToWsetExpression.java +++ b/indexinglanguage/src/main/java/com/yahoo/vespa/indexinglanguage/expressions/ToWsetExpression.java @@ -28,7 +28,7 @@ public class ToWsetExpression extends Expression { return removeIfZero; } - @SuppressWarnings({ "unchecked" }) + @SuppressWarnings({ "unchecked", "rawtypes" }) @Override protected void doExecute(ExecutionContext ctx) { FieldValue input = ctx.getValue(); diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/DocumentTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/DocumentTestCase.java index 188dfb3f8f5..b1f5e725072 100644 --- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/DocumentTestCase.java +++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/DocumentTestCase.java @@ -12,7 +12,7 @@ import static org.junit.Assert.*; /** * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ -@SuppressWarnings({ "unchecked" }) +@SuppressWarnings({ "unchecked", "rawtypes" }) public class DocumentTestCase { @Test diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/DocumentToValueUpdateTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/DocumentToValueUpdateTestCase.java index ecf43080b4b..a7f1966b671 100644 --- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/DocumentToValueUpdateTestCase.java +++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/DocumentToValueUpdateTestCase.java @@ -11,7 +11,7 @@ import static org.junit.Assert.*; /** * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ -@SuppressWarnings({ "unchecked" }) +@SuppressWarnings({ "unchecked", "rawtypes" }) public class DocumentToValueUpdateTestCase { @Test diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/DocumentUpdateTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/DocumentUpdateTestCase.java index aec8d0332c2..3b4bba84b87 100644 --- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/DocumentUpdateTestCase.java +++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/DocumentUpdateTestCase.java @@ -18,6 +18,7 @@ import static org.junit.Assert.assertEquals; /** * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ +@SuppressWarnings({ "rawtypes" }) public class DocumentUpdateTestCase { @Test diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/ExpressionSearcherTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/ExpressionSearcherTestCase.java index 2e47ccb7ea3..439e0765e9d 100644 --- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/ExpressionSearcherTestCase.java +++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/ExpressionSearcherTestCase.java @@ -26,6 +26,7 @@ import static org.junit.Assert.assertTrue; /** * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ +@SuppressWarnings({ "rawtypes" }) public class ExpressionSearcherTestCase { private static final ExpressionSearcher searcher = new ExpressionSearcher<>(IndexExpression.class); diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/FieldValueConverterTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/FieldValueConverterTestCase.java index 96140be7500..4385f4daa76 100644 --- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/FieldValueConverterTestCase.java +++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/FieldValueConverterTestCase.java @@ -17,6 +17,7 @@ import static org.junit.Assert.*; /** * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ +@SuppressWarnings({ "rawtypes" }) public class FieldValueConverterTestCase { @Test diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/PathUpdateToDocumentTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/PathUpdateToDocumentTestCase.java index 3472920dcdf..f58769b2d67 100644 --- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/PathUpdateToDocumentTestCase.java +++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/PathUpdateToDocumentTestCase.java @@ -14,6 +14,7 @@ import static org.junit.Assert.*; /** * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ +@SuppressWarnings({ "rawtypes" }) public class PathUpdateToDocumentTestCase { @Test diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/ValueUpdateToDocumentTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/ValueUpdateToDocumentTestCase.java index 333c07b9e2d..80a7b7a9126 100644 --- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/ValueUpdateToDocumentTestCase.java +++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/ValueUpdateToDocumentTestCase.java @@ -11,6 +11,7 @@ import static org.junit.Assert.*; /** * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ +@SuppressWarnings({ "rawtypes" }) public class ValueUpdateToDocumentTestCase { @Test diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/CatTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/CatTestCase.java index 89b8c89a48f..b89dabc91ab 100644 --- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/CatTestCase.java +++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/CatTestCase.java @@ -14,6 +14,7 @@ import static org.junit.Assert.*; /** * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ +@SuppressWarnings({ "rawtypes" }) public class CatTestCase { @Test diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ForEachTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ForEachTestCase.java index a13cc2125e5..d59e0931f1b 100644 --- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ForEachTestCase.java +++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ForEachTestCase.java @@ -19,6 +19,7 @@ import static org.junit.Assert.*; /** * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ +@SuppressWarnings({ "rawtypes" }) public class ForEachTestCase { @Test diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/GuardTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/GuardTestCase.java index b6e7b1c7b41..3366527aa37 100644 --- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/GuardTestCase.java +++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/GuardTestCase.java @@ -22,6 +22,7 @@ import static org.junit.Assert.*; /** * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ +@SuppressWarnings({ "rawtypes" }) public class GuardTestCase { @Test diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SplitTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SplitTestCase.java index 4abab5c7c7d..e96b93ac253 100644 --- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SplitTestCase.java +++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/SplitTestCase.java @@ -15,6 +15,7 @@ import static org.junit.Assert.*; /** * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ +@SuppressWarnings({ "rawtypes" }) public class SplitTestCase { @Test diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ToArrayTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ToArrayTestCase.java index 193b8748d49..e09d72e48e7 100644 --- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ToArrayTestCase.java +++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ToArrayTestCase.java @@ -17,6 +17,7 @@ import static org.junit.Assert.assertFalse; /** * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ +@SuppressWarnings({ "rawtypes" }) public class ToArrayTestCase { @Test diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ToWsetTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ToWsetTestCase.java index e761e4332dc..d839ebfa61d 100644 --- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ToWsetTestCase.java +++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/expressions/ToWsetTestCase.java @@ -16,6 +16,7 @@ import static org.junit.Assert.assertFalse; /** * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ +@SuppressWarnings({ "rawtypes" }) public class ToWsetTestCase { @Test diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/parser/ExpressionTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/parser/ExpressionTestCase.java index a70de62c1a7..9010e8e3788 100644 --- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/parser/ExpressionTestCase.java +++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/parser/ExpressionTestCase.java @@ -11,6 +11,7 @@ import static org.junit.Assert.assertEquals; /** * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ +@SuppressWarnings({ "rawtypes" }) public class ExpressionTestCase { @Test diff --git a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/parser/ScriptTestCase.java b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/parser/ScriptTestCase.java index ff2def03c09..fa61570ff83 100644 --- a/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/parser/ScriptTestCase.java +++ b/indexinglanguage/src/test/java/com/yahoo/vespa/indexinglanguage/parser/ScriptTestCase.java @@ -12,6 +12,7 @@ import static org.junit.Assert.assertNotNull; /** * @author <a href="mailto:simon@yahoo-inc.com">Simon Thoresen</a> */ +@SuppressWarnings({ "rawtypes" }) public class ScriptTestCase { @Test |