diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2024-04-05 16:36:00 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2024-04-05 16:36:00 +0200 |
commit | c4994e735b699ecd37629ecc0262272fa21f3473 (patch) | |
tree | 084c7c2610c55140d0459f1c308779ad0297406f | |
parent | ce57de993161044ce2580140c5299d35400b3522 (diff) | |
parent | 54a9fdffa9e9c14166bf7e3ebddb2afa66d6513a (diff) |
Merge pull request #30836 from vespa-engine/balder/gc-void-compilerArgs-overrides
- Use default compilerArgs where we turn on linting and enable warnin…
16 files changed, 31 insertions, 30 deletions
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/pom.xml b/zookeeper-server/pom.xml index b0e320047db..4b7f4be7a7f 100644 --- a/zookeeper-server/pom.xml +++ b/zookeeper-server/pom.xml @@ -35,12 +35,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <compilerArgs> - <arg>-Xlint:all</arg> - <arg>-Werror</arg> - </compilerArgs> - </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/zookeeper-server/zookeeper-server-3.9.2/pom.xml b/zookeeper-server/zookeeper-server-3.9.2/pom.xml index 25d9cd9432b..c7bb5428b17 100644 --- a/zookeeper-server/zookeeper-server-3.9.2/pom.xml +++ b/zookeeper-server/zookeeper-server-3.9.2/pom.xml @@ -66,17 +66,18 @@ <artifactId>snappy-java</artifactId> <scope>compile</scope> </dependency> + <dependency> + <!-- Included to suppress warning on missing annotation 'edu.umd.cs.findbugs.annotations.SuppressFBWarnings' at compile time --> + <groupId>com.github.spotbugs</groupId> + <artifactId>spotbugs-annotations</artifactId> + <scope>compile</scope> + </dependency> </dependencies> <build> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <compilerArgs> - <arg>-Xlint:all</arg> - </compilerArgs> - </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> 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-common/pom.xml b/zookeeper-server/zookeeper-server-common/pom.xml index 2238f6ad086..7e53866afb9 100644 --- a/zookeeper-server/zookeeper-server-common/pom.xml +++ b/zookeeper-server/zookeeper-server-common/pom.xml @@ -29,12 +29,6 @@ <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <compilerArgs> - <arg>-Xlint:all</arg> - <arg>-Werror</arg> - </compilerArgs> - </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> diff --git a/zookeeper-server/zookeeper-server/pom.xml b/zookeeper-server/zookeeper-server/pom.xml index bb4a819b5ac..267a43e62be 100644 --- a/zookeeper-server/zookeeper-server/pom.xml +++ b/zookeeper-server/zookeeper-server/pom.xml @@ -66,17 +66,18 @@ <artifactId>snappy-java</artifactId> <scope>compile</scope> </dependency> + <dependency> + <!-- Included to suppress warning on missing annotation 'edu.umd.cs.findbugs.annotations.SuppressFBWarnings' at compile time --> + <groupId>com.github.spotbugs</groupId> + <artifactId>spotbugs-annotations</artifactId> + <scope>compile</scope> + </dependency> </dependencies> <build> <plugins> <plugin> <groupId>org.apache.maven.plugins</groupId> <artifactId>maven-compiler-plugin</artifactId> - <configuration> - <compilerArgs> - <arg>-Xlint:all</arg> - </compilerArgs> - </configuration> </plugin> <plugin> <groupId>org.apache.maven.plugins</groupId> 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))) { |