diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2024-04-05 16:15:15 +0200 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2024-04-05 16:15:15 +0200 |
commit | 54a9fdffa9e9c14166bf7e3ebddb2afa66d6513a (patch) | |
tree | 18c0d14e308cb078467ec82f403059ca33a6c4eb /zookeeper-server | |
parent | cdb93e44b185d322ce8b01049072175e77d66b62 (diff) |
- Use default compilerArgs where we turn on linting and enable warnings as errors.
- Add explicit suppress annotations where needed.
Diffstat (limited to 'zookeeper-server')
6 files changed, 17 insertions, 22 deletions
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))) { |