diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2024-04-07 20:23:16 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2024-04-07 20:23:16 +0200 |
commit | b91a282d166d9a51f0df5ea2e7bef1ed48ba312b (patch) | |
tree | 804a7e80fa9440381f527660b55be066c6139bf4 | |
parent | 51903f88fda468f66d942df8ba12bb0fc12e6e5b (diff) |
Cancel unintented changes
-rw-r--r-- | document/pom.xml | 9 | ||||
-rw-r--r-- | document/src/main/java/com/yahoo/document/datatypes/Array.java | 16 |
2 files changed, 17 insertions, 8 deletions
diff --git a/document/pom.xml b/document/pom.xml index 4c2cb595419..3f7e9be7dce 100644 --- a/document/pom.xml +++ b/document/pom.xml @@ -100,6 +100,15 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <compilerArgs> + <arg>-Xlint:all</arg> + <arg>-Xlint:-serial</arg> + <arg>-Xlint:-rawtypes</arg> + <arg>-Xlint:-unchecked</arg> + <arg>-Werror</arg> + </compilerArgs> + </configuration> </plugin> <plugin> <groupId>com.yahoo.vespa</groupId> diff --git a/document/src/main/java/com/yahoo/document/datatypes/Array.java b/document/src/main/java/com/yahoo/document/datatypes/Array.java index f9877fd23ed..98a682bb14b 100644 --- a/document/src/main/java/com/yahoo/document/datatypes/Array.java +++ b/document/src/main/java/com/yahoo/document/datatypes/Array.java @@ -141,7 +141,7 @@ public final class Array<T extends FieldValue> extends CollectionFieldValue<T> i @Override public boolean equals(Object o) { if (this == o) return true; - if (!(o instanceof Array<? extends FieldValue> a)) return false; + if (!(o instanceof Array a)) return false; if (!super.equals(o)) return false; if (values.size() != a.values.size()) return false; if (values instanceof ListWrapper && !(a.values instanceof ListWrapper)) { @@ -348,13 +348,13 @@ public final class Array<T extends FieldValue> extends CollectionFieldValue<T> i * TODO: Remove this class and only allow instance of Array to be added. */ class ListWrapper<E> implements List<E>, RandomAccess { - private final List<E> myvalues; + private final List myvalues; private Object unwrap(Object o) { - return (o instanceof FieldValue fv) ? fv.getWrappedValue() : o; + return (o instanceof FieldValue ? ((FieldValue) o).getWrappedValue() : o); } - public ListWrapper(List<E> wrapped) { + public ListWrapper(List wrapped) { myvalues = wrapped; } @@ -467,7 +467,7 @@ public final class Array<T extends FieldValue> extends CollectionFieldValue<T> i public ListIterator<E> listIterator(final int index) { return new ListIterator<E>() { - ListIterator<E> it = myvalues.listIterator(index); + ListIterator it = myvalues.listIterator(index); public boolean hasNext() { return it.hasNext(); @@ -516,9 +516,9 @@ public final class Array<T extends FieldValue> extends CollectionFieldValue<T> i } @Override - @SuppressWarnings("unchecked") + @SuppressWarnings("deprecation, unchecked") public boolean equals(Object o) { - return this == o || o instanceof ListWrapper<E> list && myvalues.equals(list.myvalues); + return this == o || o instanceof ListWrapper && myvalues.equals(((ListWrapper) o).myvalues); } @Override @@ -546,7 +546,7 @@ public final class Array<T extends FieldValue> extends CollectionFieldValue<T> i } //types are equal, this must be of this type - Array<T> otherValue = (Array<T>) fieldValue; + Array otherValue = (Array) fieldValue; return CollectionComparator.compare(values, otherValue.values); } } |