From 54a9fdffa9e9c14166bf7e3ebddb2afa66d6513a Mon Sep 17 00:00:00 2001 From: Henning Baldersheim Date: Fri, 5 Apr 2024 16:15:15 +0200 Subject: - Use default compilerArgs where we turn on linting and enable warnings as errors. - Add explicit suppress annotations where needed. --- zkfacade/pom.xml | 7 ------- .../src/main/java/com/yahoo/vespa/curator/NodeCacheWrapper.java | 2 ++ .../java/com/yahoo/vespa/curator/PathChildrenCacheWrapper.java | 3 +++ .../src/main/java/com/yahoo/vespa/curator/SingletonManager.java | 2 +- .../java/com/yahoo/vespa/curator/mock/MockCuratorFramework.java | 3 +++ .../yahoo/vespa/curator/transaction/CuratorCreateOperation.java | 1 + .../yahoo/vespa/curator/transaction/CuratorDeleteOperation.java | 1 + .../java/com/yahoo/vespa/curator/transaction/CuratorOperation.java | 1 + .../yahoo/vespa/curator/transaction/CuratorSetDataOperation.java | 1 + .../com/yahoo/vespa/curator/transaction/CuratorTransaction.java | 1 + 10 files changed, 14 insertions(+), 8 deletions(-) (limited to 'zkfacade') 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 @@ org.apache.maven.plugins maven-compiler-plugin - - - -Xlint:all - -Xlint:-serial - -Xlint:-try - - org.apache.maven.plugins 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) -- cgit v1.2.3