summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenning Baldersheim <balder@yahoo-inc.com>2024-04-07 16:38:25 +0200
committerHenning Baldersheim <balder@yahoo-inc.com>2024-04-07 16:42:09 +0200
commit51903f88fda468f66d942df8ba12bb0fc12e6e5b (patch)
treef248ec62fa3989a4767289321acad674798c46d7
parent59cbad455146da8ff5e10760354395959ad8adb0 (diff)
Enable full linting with errors. Use SuppressWarning explicit where needed
-rw-r--r--document/pom.xml9
-rw-r--r--document/src/main/java/com/yahoo/document/datatypes/Array.java16
-rw-r--r--zkfacade/pom.xml7
-rw-r--r--zkfacade/src/main/java/com/yahoo/vespa/curator/NodeCacheWrapper.java2
-rw-r--r--zkfacade/src/main/java/com/yahoo/vespa/curator/PathChildrenCacheWrapper.java3
-rw-r--r--zkfacade/src/main/java/com/yahoo/vespa/curator/SingletonManager.java2
-rw-r--r--zkfacade/src/main/java/com/yahoo/vespa/curator/mock/MockCuratorFramework.java3
-rw-r--r--zkfacade/src/main/java/com/yahoo/vespa/curator/transaction/CuratorCreateOperation.java1
-rw-r--r--zkfacade/src/main/java/com/yahoo/vespa/curator/transaction/CuratorDeleteOperation.java1
-rw-r--r--zkfacade/src/main/java/com/yahoo/vespa/curator/transaction/CuratorOperation.java1
-rw-r--r--zkfacade/src/main/java/com/yahoo/vespa/curator/transaction/CuratorSetDataOperation.java1
-rw-r--r--zkfacade/src/main/java/com/yahoo/vespa/curator/transaction/CuratorTransaction.java1
-rw-r--r--zookeeper-server/zookeeper-server-3.9.2/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperAdminImpl.java3
-rw-r--r--zookeeper-server/zookeeper-server/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperAdminImpl.java2
14 files changed, 27 insertions, 25 deletions
diff --git a/document/pom.xml b/document/pom.xml
index 3f7e9be7dce..4c2cb595419 100644
--- a/document/pom.xml
+++ b/document/pom.xml
@@ -100,15 +100,6 @@
<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 98a682bb14b..f9877fd23ed 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 a)) return false;
+ if (!(o instanceof Array<? extends FieldValue> 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 myvalues;
+ private final List<E> myvalues;
private Object unwrap(Object o) {
- return (o instanceof FieldValue ? ((FieldValue) o).getWrappedValue() : o);
+ return (o instanceof FieldValue fv) ? fv.getWrappedValue() : o;
}
- public ListWrapper(List wrapped) {
+ public ListWrapper(List<E> 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 it = myvalues.listIterator(index);
+ ListIterator<E> 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("deprecation, unchecked")
+ @SuppressWarnings("unchecked")
public boolean equals(Object o) {
- return this == o || o instanceof ListWrapper && myvalues.equals(((ListWrapper) o).myvalues);
+ return this == o || o instanceof ListWrapper<E> list && myvalues.equals(list.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 otherValue = (Array) fieldValue;
+ Array<T> otherValue = (Array<T>) fieldValue;
return CollectionComparator.compare(values, otherValue.values);
}
}
diff --git a/zkfacade/pom.xml b/zkfacade/pom.xml
index 02be1006bc3..76a1fda2ded 100644
--- a/zkfacade/pom.xml
+++ b/zkfacade/pom.xml
@@ -74,13 +74,6 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <configuration>
- <compilerArgs>
- <arg>-Xlint:all</arg>
- <arg>-Xlint:-serial</arg>
- <arg>-Xlint:-try</arg>
- </compilerArgs>
- </configuration>
</plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
diff --git a/zkfacade/src/main/java/com/yahoo/vespa/curator/NodeCacheWrapper.java b/zkfacade/src/main/java/com/yahoo/vespa/curator/NodeCacheWrapper.java
index d69ddb2f1c8..3be55af601d 100644
--- a/zkfacade/src/main/java/com/yahoo/vespa/curator/NodeCacheWrapper.java
+++ b/zkfacade/src/main/java/com/yahoo/vespa/curator/NodeCacheWrapper.java
@@ -15,8 +15,10 @@ import java.io.IOException;
*/
class NodeCacheWrapper implements Curator.FileCache {
+ @SuppressWarnings("deprecation")
private final NodeCache wrapped;
+ @SuppressWarnings("deprecation")
public NodeCacheWrapper(CuratorFramework curatorFramework, String path, boolean dataIsCompressed) {
wrapped = new NodeCache(curatorFramework, path, dataIsCompressed);
}
diff --git a/zkfacade/src/main/java/com/yahoo/vespa/curator/PathChildrenCacheWrapper.java b/zkfacade/src/main/java/com/yahoo/vespa/curator/PathChildrenCacheWrapper.java
index 644334a6fe0..9de672ee64d 100644
--- a/zkfacade/src/main/java/com/yahoo/vespa/curator/PathChildrenCacheWrapper.java
+++ b/zkfacade/src/main/java/com/yahoo/vespa/curator/PathChildrenCacheWrapper.java
@@ -18,12 +18,15 @@ import java.util.concurrent.ExecutorService;
*/
class PathChildrenCacheWrapper implements Curator.DirectoryCache {
+ @SuppressWarnings("deprecation")
private final PathChildrenCache wrapped;
+ @SuppressWarnings("deprecation")
public PathChildrenCacheWrapper(CuratorFramework curatorFramework, String path, boolean cacheData, boolean dataIsCompressed, ExecutorService executorService) {
wrapped = new PathChildrenCache(curatorFramework, path, cacheData, dataIsCompressed, executorService);
}
+ @SuppressWarnings("deprecation")
@Override
public void start() {
try {
diff --git a/zkfacade/src/main/java/com/yahoo/vespa/curator/SingletonManager.java b/zkfacade/src/main/java/com/yahoo/vespa/curator/SingletonManager.java
index 35fc9f06eec..f1ba9c54514 100644
--- a/zkfacade/src/main/java/com/yahoo/vespa/curator/SingletonManager.java
+++ b/zkfacade/src/main/java/com/yahoo/vespa/curator/SingletonManager.java
@@ -100,7 +100,7 @@ class SingletonManager {
}
public synchronized CompletableFuture<?> shutdown() {
- CompletableFuture<?>[] futures = new CompletableFuture[registrations.size()];
+ CompletableFuture<?>[] futures = new CompletableFuture<?>[registrations.size()];
int i = 0;
for (SingletonWorker singleton : List.copyOf(registrations.keySet())) {
String id = registrations.get(singleton);
diff --git a/zkfacade/src/main/java/com/yahoo/vespa/curator/mock/MockCuratorFramework.java b/zkfacade/src/main/java/com/yahoo/vespa/curator/mock/MockCuratorFramework.java
index b04cf5840de..4732016e428 100644
--- a/zkfacade/src/main/java/com/yahoo/vespa/curator/mock/MockCuratorFramework.java
+++ b/zkfacade/src/main/java/com/yahoo/vespa/curator/mock/MockCuratorFramework.java
@@ -210,6 +210,7 @@ public class MockCuratorFramework implements CuratorFramework {
@Override
public GetConfigBuilder getConfig() { throw new UnsupportedOperationException("Not implemented in MockCurator"); }
+ @Deprecated
@Override
public CuratorTransaction inTransaction() {
return new MockCuratorTransactionFinal();
@@ -221,6 +222,7 @@ public class MockCuratorFramework implements CuratorFramework {
@Override
public TransactionOp transactionOp() { throw new UnsupportedOperationException("Not implemented in MockCurator"); }
+ @Deprecated
@Override
public RemoveWatchesBuilder watches() { throw new UnsupportedOperationException("Not implemented in MockCurator"); }
@@ -309,6 +311,7 @@ public class MockCuratorFramework implements CuratorFramework {
return new EnsurePath(path);
}
+ @Deprecated
@Override
public void clearWatcherReferences(Watcher watcher) {
throw new UnsupportedOperationException("Not implemented in MockCurator");
diff --git a/zkfacade/src/main/java/com/yahoo/vespa/curator/transaction/CuratorCreateOperation.java b/zkfacade/src/main/java/com/yahoo/vespa/curator/transaction/CuratorCreateOperation.java
index 633fd9a7a20..99669007d06 100644
--- a/zkfacade/src/main/java/com/yahoo/vespa/curator/transaction/CuratorCreateOperation.java
+++ b/zkfacade/src/main/java/com/yahoo/vespa/curator/transaction/CuratorCreateOperation.java
@@ -34,6 +34,7 @@ class CuratorCreateOperation implements CuratorOperation {
}
@Override
+ @SuppressWarnings("deprecation")
public CuratorTransaction and(CuratorTransaction transaction) throws Exception {
if (data.isPresent()) {
return transaction.create().forPath(path, data.get()).and();
diff --git a/zkfacade/src/main/java/com/yahoo/vespa/curator/transaction/CuratorDeleteOperation.java b/zkfacade/src/main/java/com/yahoo/vespa/curator/transaction/CuratorDeleteOperation.java
index aa1bffd4174..f4e1d909e21 100644
--- a/zkfacade/src/main/java/com/yahoo/vespa/curator/transaction/CuratorDeleteOperation.java
+++ b/zkfacade/src/main/java/com/yahoo/vespa/curator/transaction/CuratorDeleteOperation.java
@@ -33,6 +33,7 @@ class CuratorDeleteOperation implements CuratorOperation {
return false;
}
+ @SuppressWarnings("deprecation")
@Override
public CuratorTransaction and(CuratorTransaction transaction) throws Exception {
return transaction.delete().forPath(path).and();
diff --git a/zkfacade/src/main/java/com/yahoo/vespa/curator/transaction/CuratorOperation.java b/zkfacade/src/main/java/com/yahoo/vespa/curator/transaction/CuratorOperation.java
index 7c332f4675c..17d09bcbcde 100644
--- a/zkfacade/src/main/java/com/yahoo/vespa/curator/transaction/CuratorOperation.java
+++ b/zkfacade/src/main/java/com/yahoo/vespa/curator/transaction/CuratorOperation.java
@@ -20,6 +20,7 @@ public interface CuratorOperation extends Transaction.Operation {
* @return the transaction, for chaining.
* @throws Exception if unable to create transaction for this operation.
*/
+ @SuppressWarnings("deprecation")
CuratorTransaction and(CuratorTransaction transaction) throws Exception;
/**
diff --git a/zkfacade/src/main/java/com/yahoo/vespa/curator/transaction/CuratorSetDataOperation.java b/zkfacade/src/main/java/com/yahoo/vespa/curator/transaction/CuratorSetDataOperation.java
index 116daf1e359..b8cfa54623e 100644
--- a/zkfacade/src/main/java/com/yahoo/vespa/curator/transaction/CuratorSetDataOperation.java
+++ b/zkfacade/src/main/java/com/yahoo/vespa/curator/transaction/CuratorSetDataOperation.java
@@ -28,6 +28,7 @@ class CuratorSetDataOperation implements CuratorOperation {
}
@Override
+ @SuppressWarnings("deprecation")
public CuratorTransaction and(CuratorTransaction transaction) throws Exception {
return transaction.setData().forPath(path, data).and();
}
diff --git a/zkfacade/src/main/java/com/yahoo/vespa/curator/transaction/CuratorTransaction.java b/zkfacade/src/main/java/com/yahoo/vespa/curator/transaction/CuratorTransaction.java
index 3026a90cea7..21a2071900d 100644
--- a/zkfacade/src/main/java/com/yahoo/vespa/curator/transaction/CuratorTransaction.java
+++ b/zkfacade/src/main/java/com/yahoo/vespa/curator/transaction/CuratorTransaction.java
@@ -52,6 +52,7 @@ public class CuratorTransaction extends AbstractTransaction {
/** Commits this transaction. If it is not already prepared this will prepare it first */
@Override
+ @SuppressWarnings("deprecation")
public void commit() {
try {
if ( ! prepared)
diff --git a/zookeeper-server/zookeeper-server-3.9.2/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperAdminImpl.java b/zookeeper-server/zookeeper-server-3.9.2/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperAdminImpl.java
index 1f15c758583..c74a020bcf4 100644
--- a/zookeeper-server/zookeeper-server-3.9.2/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperAdminImpl.java
+++ b/zookeeper-server/zookeeper-server-3.9.2/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperAdminImpl.java
@@ -26,6 +26,8 @@ public class VespaZooKeeperAdminImpl implements VespaZooKeeperAdmin {
private static final Logger log = java.util.logging.Logger.getLogger(VespaZooKeeperAdminImpl.class.getName());
+
+ @SuppressWarnings("try")
@Override
public void reconfigure(String connectionSpec, String servers) throws ReconfigException {
try (ZooKeeperAdmin zooKeeperAdmin = createAdmin(connectionSpec)) {
@@ -58,6 +60,7 @@ public class VespaZooKeeperAdminImpl implements VespaZooKeeperAdmin {
}
/** Creates a node in zookeeper, with hostname as part of node name, this ensures that server is up and working before returning */
+ @SuppressWarnings("try")
void createDummyNode(ZookeeperServerConfig zookeeperServerConfig) {
int sleepTime = 2_000;
try (ZooKeeperAdmin zooKeeperAdmin = createAdmin(localConnectionSpec(zookeeperServerConfig))) {
diff --git a/zookeeper-server/zookeeper-server/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperAdminImpl.java b/zookeeper-server/zookeeper-server/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperAdminImpl.java
index 1f15c758583..891a35582b3 100644
--- a/zookeeper-server/zookeeper-server/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperAdminImpl.java
+++ b/zookeeper-server/zookeeper-server/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperAdminImpl.java
@@ -26,6 +26,7 @@ public class VespaZooKeeperAdminImpl implements VespaZooKeeperAdmin {
private static final Logger log = java.util.logging.Logger.getLogger(VespaZooKeeperAdminImpl.class.getName());
+ @SuppressWarnings("try")
@Override
public void reconfigure(String connectionSpec, String servers) throws ReconfigException {
try (ZooKeeperAdmin zooKeeperAdmin = createAdmin(connectionSpec)) {
@@ -58,6 +59,7 @@ public class VespaZooKeeperAdminImpl implements VespaZooKeeperAdmin {
}
/** Creates a node in zookeeper, with hostname as part of node name, this ensures that server is up and working before returning */
+ @SuppressWarnings("try")
void createDummyNode(ZookeeperServerConfig zookeeperServerConfig) {
int sleepTime = 2_000;
try (ZooKeeperAdmin zooKeeperAdmin = createAdmin(localConnectionSpec(zookeeperServerConfig))) {