Repository: jclouds Updated Branches: refs/heads/master a918550e5 -> 1f6ec343c
Upgrade to SpotBugs 3.1.3 This replaces FindBugs. Also address a few violations. Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/1f6ec343 Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/1f6ec343 Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/1f6ec343 Branch: refs/heads/master Commit: 1f6ec343c0f1a07b8516265b084381da2e7dfcd9 Parents: a918550 Author: Andrew Gaul <[email protected]> Authored: Mon May 21 21:23:41 2018 -0700 Committer: Andrew Gaul <[email protected]> Committed: Mon May 21 22:06:27 2018 -0700 ---------------------------------------------------------------------- .../jclouds/compute/util/AutomaticHardwareIdSpec.java | 2 +- .../main/java/org/jclouds/util/PasswordGenerator.java | 2 +- project/pom.xml | 11 ++++++----- providers/azurecompute-arm/pom.xml | 6 ++++++ .../domain/ResourceGroupAndNameAndIngressRules.java | 1 + .../arm/handlers/AzureRateLimitRetryHandler.java | 2 +- 6 files changed, 16 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds/blob/1f6ec343/compute/src/main/java/org/jclouds/compute/util/AutomaticHardwareIdSpec.java ---------------------------------------------------------------------- diff --git a/compute/src/main/java/org/jclouds/compute/util/AutomaticHardwareIdSpec.java b/compute/src/main/java/org/jclouds/compute/util/AutomaticHardwareIdSpec.java index 986f24b..8d82ca6 100644 --- a/compute/src/main/java/org/jclouds/compute/util/AutomaticHardwareIdSpec.java +++ b/compute/src/main/java/org/jclouds/compute/util/AutomaticHardwareIdSpec.java @@ -75,7 +75,7 @@ public class AutomaticHardwareIdSpec { @Override public String toString() { if (disk.isPresent()) { - return String.format("automatic:cores=%s;ram=%s;disk=%.0f", cores, ram, disk.get().floatValue()); + return String.format("automatic:cores=%s;ram=%s;disk=%.0f", cores, ram, disk.get()); } else { return String.format("automatic:cores=%s;ram=%s", cores, ram); http://git-wip-us.apache.org/repos/asf/jclouds/blob/1f6ec343/core/src/main/java/org/jclouds/util/PasswordGenerator.java ---------------------------------------------------------------------- diff --git a/core/src/main/java/org/jclouds/util/PasswordGenerator.java b/core/src/main/java/org/jclouds/util/PasswordGenerator.java index e0d14ad..bc683cd 100644 --- a/core/src/main/java/org/jclouds/util/PasswordGenerator.java +++ b/core/src/main/java/org/jclouds/util/PasswordGenerator.java @@ -180,7 +180,7 @@ public class PasswordGenerator { if (exclusions == null || exclusions.length == 0) { this.characters = characters.toCharArray(); } else { - this.characters = new String(characters).replaceAll("[" + new String(exclusions) + "]", "").toCharArray(); + this.characters = characters.replaceAll("[" + new String(exclusions) + "]", "").toCharArray(); } } http://git-wip-us.apache.org/repos/asf/jclouds/blob/1f6ec343/project/pom.xml ---------------------------------------------------------------------- diff --git a/project/pom.xml b/project/pom.xml index d4be3d8..9b83246 100644 --- a/project/pom.xml +++ b/project/pom.xml @@ -1052,8 +1052,8 @@ </configuration> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> + <groupId>com.github.spotbugs</groupId> + <artifactId>spotbugs-maven-plugin</artifactId> <configuration> <xmlOutput>true</xmlOutput> </configuration> @@ -1079,12 +1079,13 @@ <version>0.12</version> </plugin> <plugin> - <groupId>org.codehaus.mojo</groupId> - <artifactId>findbugs-maven-plugin</artifactId> - <version>3.0.3</version> + <groupId>com.github.spotbugs</groupId> + <artifactId>spotbugs-maven-plugin</artifactId> + <version>3.1.3</version> <configuration> <omitVisitors> CloneIdiom, + ComparatorIdiom, DefaultEncodingDetector, EqualsOperandShouldHaveClassCompatibleWithThis, FindBadCast2, http://git-wip-us.apache.org/repos/asf/jclouds/blob/1f6ec343/providers/azurecompute-arm/pom.xml ---------------------------------------------------------------------- diff --git a/providers/azurecompute-arm/pom.xml b/providers/azurecompute-arm/pom.xml index b99ee59..ffd9aa0 100644 --- a/providers/azurecompute-arm/pom.xml +++ b/providers/azurecompute-arm/pom.xml @@ -127,6 +127,12 @@ </exclusion> </exclusions> </dependency> + <dependency> + <groupId>com.github.spotbugs</groupId> + <artifactId>spotbugs-annotations</artifactId> + <version>3.1.3</version> + <scope>provided</scope> + </dependency> </dependencies> <profiles> http://git-wip-us.apache.org/repos/asf/jclouds/blob/1f6ec343/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/domain/ResourceGroupAndNameAndIngressRules.java ---------------------------------------------------------------------- diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/domain/ResourceGroupAndNameAndIngressRules.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/domain/ResourceGroupAndNameAndIngressRules.java index 7c11642..25708cb 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/domain/ResourceGroupAndNameAndIngressRules.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/compute/domain/ResourceGroupAndNameAndIngressRules.java @@ -59,6 +59,7 @@ public abstract class ResourceGroupAndNameAndIngressRules { return Objects.hashCode(resourceGroup(), name()); } + @edu.umd.cs.findbugs.annotations.SuppressFBWarnings(value = "EQ_UNUSUAL") @Override public boolean equals(Object obj) { if (obj == this) { http://git-wip-us.apache.org/repos/asf/jclouds/blob/1f6ec343/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/handlers/AzureRateLimitRetryHandler.java ---------------------------------------------------------------------- diff --git a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/handlers/AzureRateLimitRetryHandler.java b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/handlers/AzureRateLimitRetryHandler.java index e2c6270..bbe7908 100644 --- a/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/handlers/AzureRateLimitRetryHandler.java +++ b/providers/azurecompute-arm/src/main/java/org/jclouds/azurecompute/arm/handlers/AzureRateLimitRetryHandler.java @@ -57,7 +57,7 @@ public class AzureRateLimitRetryHandler extends RateLimitRetryHandler { @Override protected Optional<Long> millisToNextAvailableRequest(HttpCommand command, HttpResponse response) { String secondsToNextAvailableRequest = response.getFirstHeaderOrNull(HttpHeaders.RETRY_AFTER); - return secondsToNextAvailableRequest != null ? Optional.of(Long.valueOf(secondsToNextAvailableRequest) * 1000) + return secondsToNextAvailableRequest != null ? Optional.of(Long.parseLong(secondsToNextAvailableRequest) * 1000) : Optional.<Long> absent(); }
