You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ga...@apache.org on 2015/12/12 01:56:43 UTC
[1/3] jclouds git commit: Make inner classes static when possible
Repository: jclouds
Updated Branches:
refs/heads/master 75e2c6999 -> b47c50b7a
Make inner classes static when possible
Found via error-prone.
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/28d09013
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/28d09013
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/28d09013
Branch: refs/heads/master
Commit: 28d090139d6d96c7af7abedcbb789f47a1f243c5
Parents: 06e379d
Author: Andrew Gaul <ga...@apache.org>
Authored: Sat Dec 12 08:11:46 2015 +0800
Committer: Andrew Gaul <ga...@apache.org>
Committed: Sat Dec 12 08:53:07 2015 +0800
----------------------------------------------------------------------
project/pom.xml | 1 +
.../java/org/jclouds/softlayer/domain/internal/BlockDevice.java | 2 +-
2 files changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/28d09013/project/pom.xml
----------------------------------------------------------------------
diff --git a/project/pom.xml b/project/pom.xml
index 013ebfc..802d1fd 100644
--- a/project/pom.xml
+++ b/project/pom.xml
@@ -746,6 +746,7 @@
<compilerArg>-Xlint:-rawtypes</compilerArg>
<compilerArg>-Xlint:-serial</compilerArg>
<compilerArg>-Xlint:-unchecked</compilerArg>
+ <compilerArg>-Xep:ClassCanBeStatic:ERROR</compilerArg>
<compilerArg>-Xep:GuiceAssistedInjectScoping:OFF</compilerArg>
<compilerArg>-Xep:LongLiteralLowerCaseSuffix:OFF</compilerArg>
<compilerArg>-Xep:NonAtomicVolatileUpdate:OFF</compilerArg>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/28d09013/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/internal/BlockDevice.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/internal/BlockDevice.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/internal/BlockDevice.java
index 9d1868f..7d646a5 100644
--- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/internal/BlockDevice.java
+++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/internal/BlockDevice.java
@@ -33,7 +33,7 @@ public class BlockDevice {
this.diskImage = new DiskImage(diskImageCapacity);
}
- private class DiskImage {
+ private static class DiskImage {
private float capacity;
public DiskImage(float capacity) {
[2/3] jclouds git commit: Remove @Nullable from methods returning
primitives
Posted by ga...@apache.org.
Remove @Nullable from methods returning primitives
Found via error-prone.
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/06e379d7
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/06e379d7
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/06e379d7
Branch: refs/heads/master
Commit: 06e379d7a5f70f1ead9bb3eed49e245a7f717982
Parents: 75e2c69
Author: Andrew Gaul <ga...@apache.org>
Authored: Sat Dec 12 08:07:34 2015 +0800
Committer: Andrew Gaul <ga...@apache.org>
Committed: Sat Dec 12 08:53:07 2015 +0800
----------------------------------------------------------------------
.../java/org/jclouds/cloudwatch/domain/StatisticValues.java | 6 ------
project/pom.xml | 1 +
.../org/jclouds/googlecomputeengine/domain/BackendService.java | 4 ++--
.../java/org/jclouds/googlecomputeengine/domain/Instance.java | 2 +-
.../src/main/java/org/jclouds/softlayer/domain/Address.java | 3 ---
.../main/java/org/jclouds/softlayer/domain/VirtualGuest.java | 1 -
6 files changed, 4 insertions(+), 13 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/06e379d7/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/StatisticValues.java
----------------------------------------------------------------------
diff --git a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/StatisticValues.java b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/StatisticValues.java
index ee23b52..80bb0c4 100644
--- a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/StatisticValues.java
+++ b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/StatisticValues.java
@@ -16,8 +16,6 @@
*/
package org.jclouds.cloudwatch.domain;
-import org.jclouds.javax.annotation.Nullable;
-
/**
* @see <a href="http://docs.amazonwebservices.com/AmazonCloudWatch/latest/APIReference/API_StatisticSet.html" />
*/
@@ -38,7 +36,6 @@ public class StatisticValues {
/**
* return the maximum value of the sample set
*/
- @Nullable
public double getMaximum() {
return maximum;
}
@@ -46,7 +43,6 @@ public class StatisticValues {
/**
* return the minimum value of the sample set
*/
- @Nullable
public double getMinimum() {
return minimum;
}
@@ -54,7 +50,6 @@ public class StatisticValues {
/**
* return the number of samples used for the statistic set
*/
- @Nullable
public double getSampleCount() {
return sampleCount;
}
@@ -62,7 +57,6 @@ public class StatisticValues {
/**
* return the sum of values for the sample set
*/
- @Nullable
public double getSum() {
return sum;
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/06e379d7/project/pom.xml
----------------------------------------------------------------------
diff --git a/project/pom.xml b/project/pom.xml
index 77d4083..013ebfc 100644
--- a/project/pom.xml
+++ b/project/pom.xml
@@ -749,6 +749,7 @@
<compilerArg>-Xep:GuiceAssistedInjectScoping:OFF</compilerArg>
<compilerArg>-Xep:LongLiteralLowerCaseSuffix:OFF</compilerArg>
<compilerArg>-Xep:NonAtomicVolatileUpdate:OFF</compilerArg>
+ <compilerArg>-Xep:NullablePrimitive:ERROR</compilerArg>
<compilerArg>-Xep:StringEquality:ERROR</compilerArg>
<compilerArg>-Xep:TypeParameterUnusedInFormals:OFF</compilerArg>
</compilerArgs>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/06e379d7/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/BackendService.java
----------------------------------------------------------------------
diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/BackendService.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/BackendService.java
index f4b15c2..f6e5c7f 100644
--- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/BackendService.java
+++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/BackendService.java
@@ -72,8 +72,8 @@ public abstract class BackendService {
@Nullable public abstract String description();
@Nullable public abstract List<Backend> backends();
@Nullable public abstract List<URI> healthChecks();
- @Nullable public abstract int timeoutSec();
- @Nullable public abstract int port();
+ public abstract int timeoutSec();
+ public abstract int port();
@Nullable public abstract String protocol();
@Nullable public abstract String fingerprint();
@Nullable public abstract String portName();
http://git-wip-us.apache.org/repos/asf/jclouds/blob/06e379d7/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Instance.java
----------------------------------------------------------------------
diff --git a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Instance.java b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Instance.java
index 5ae8f53..957f5dc 100644
--- a/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Instance.java
+++ b/providers/google-compute-engine/src/main/java/org/jclouds/googlecomputeengine/domain/Instance.java
@@ -46,7 +46,7 @@ public abstract class Instance {
}
/** A zero-based index to assign to this disk, where 0 is reserved for the boot disk. */
- @Nullable public abstract int index();
+ public abstract int index();
public abstract Type type();
http://git-wip-us.apache.org/repos/asf/jclouds/blob/06e379d7/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Address.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Address.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Address.java
index b3effea..57471b9 100644
--- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Address.java
+++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Address.java
@@ -238,7 +238,6 @@ public class Address {
/**
* @return The id of the account.
*/
- @Nullable
public int getAccountId() {
return accountId;
}
@@ -270,7 +269,6 @@ public class Address {
/**
* @return The name of the contact.
*/
- @Nullable
public int isActive() {
return isActive;
}
@@ -278,7 +276,6 @@ public class Address {
/**
* @return The id of the location.
*/
- @Nullable
public int getLocationId() {
return locationId;
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/06e379d7/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuest.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuest.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuest.java
index 9b2e596..66f99a6 100644
--- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuest.java
+++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuest.java
@@ -789,7 +789,6 @@ public class VirtualGuest {
return this.powerState;
}
- @Nullable
public int getActiveTransactionCount() {
return activeTransactionCount;
}
[3/3] jclouds git commit: Correct malformed format strings
Posted by ga...@apache.org.
Correct malformed format strings
Found via error-prone.
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/b47c50b7
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/b47c50b7
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/b47c50b7
Branch: refs/heads/master
Commit: b47c50b7a578362e3517fd8200ae3e587fb91cfb
Parents: 28d0901
Author: Andrew Gaul <ga...@apache.org>
Authored: Sat Dec 12 08:12:38 2015 +0800
Committer: Andrew Gaul <ga...@apache.org>
Committed: Sat Dec 12 08:53:08 2015 +0800
----------------------------------------------------------------------
.../java/org/jclouds/elasticstack/ElasticStackMockTest.java | 6 ++----
apis/s3/src/test/java/org/jclouds/s3/xml/S3ParserTest.java | 2 +-
project/pom.xml | 1 +
.../compute/GoogleComputeEngineServiceLiveTest.java | 2 +-
4 files changed, 5 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/b47c50b7/apis/elasticstack/src/test/java/org/jclouds/elasticstack/ElasticStackMockTest.java
----------------------------------------------------------------------
diff --git a/apis/elasticstack/src/test/java/org/jclouds/elasticstack/ElasticStackMockTest.java b/apis/elasticstack/src/test/java/org/jclouds/elasticstack/ElasticStackMockTest.java
index 5cb09ae..e74ca85 100644
--- a/apis/elasticstack/src/test/java/org/jclouds/elasticstack/ElasticStackMockTest.java
+++ b/apis/elasticstack/src/test/java/org/jclouds/elasticstack/ElasticStackMockTest.java
@@ -56,8 +56,7 @@ public class ElasticStackMockTest extends BaseMockWebServerTest {
RecordedRequest request = server.takeRequest();
assertAuthentication(request);
- assertEquals(request.getRequestLine(),
- String.format("GET /drives/list/standard HTTP/1.1", server.getUrl("/").toString()));
+ assertEquals(request.getRequestLine(), "GET /drives/list/standard HTTP/1.1");
} finally {
api.close();
server.shutdown();
@@ -74,8 +73,7 @@ public class ElasticStackMockTest extends BaseMockWebServerTest {
RecordedRequest request = server.takeRequest();
assertAuthentication(request);
- assertEquals(request.getRequestLine(),
- String.format("GET /drives/info/standard HTTP/1.1", server.getUrl("/").toString()));
+ assertEquals(request.getRequestLine(), "GET /drives/info/standard HTTP/1.1");
} finally {
api.close();
server.shutdown();
http://git-wip-us.apache.org/repos/asf/jclouds/blob/b47c50b7/apis/s3/src/test/java/org/jclouds/s3/xml/S3ParserTest.java
----------------------------------------------------------------------
diff --git a/apis/s3/src/test/java/org/jclouds/s3/xml/S3ParserTest.java b/apis/s3/src/test/java/org/jclouds/s3/xml/S3ParserTest.java
index 3776cbe..b5d2bd9 100644
--- a/apis/s3/src/test/java/org/jclouds/s3/xml/S3ParserTest.java
+++ b/apis/s3/src/test/java/org/jclouds/s3/xml/S3ParserTest.java
@@ -124,7 +124,7 @@ public class S3ParserTest extends PerformanceTest {
ObjectMetadata object = container.iterator().next();
assert object.getKey().equals("3366");
Date expected = new SimpleDateFormatDateService().iso8601DateParse("2009-03-12T02:00:13.000Z");
- assert object.getLastModified().equals(expected) : String.format("expected %1$s, but got %1$s", expected, object
+ assert object.getLastModified().equals(expected) : String.format("expected %1$s, but got %2$s", expected, object
.getLastModified());
assertEquals(object.getETag(), "\"9d7bb64e8e18ee34eec06dd2cf37b766\"");
assert object.getContentMetadata().getContentLength() == 136;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/b47c50b7/project/pom.xml
----------------------------------------------------------------------
diff --git a/project/pom.xml b/project/pom.xml
index 802d1fd..814b888 100644
--- a/project/pom.xml
+++ b/project/pom.xml
@@ -749,6 +749,7 @@
<compilerArg>-Xep:ClassCanBeStatic:ERROR</compilerArg>
<compilerArg>-Xep:GuiceAssistedInjectScoping:OFF</compilerArg>
<compilerArg>-Xep:LongLiteralLowerCaseSuffix:OFF</compilerArg>
+ <compilerArg>-Xep:MalformedFormatString:ERROR</compilerArg>
<compilerArg>-Xep:NonAtomicVolatileUpdate:OFF</compilerArg>
<compilerArg>-Xep:NullablePrimitive:ERROR</compilerArg>
<compilerArg>-Xep:StringEquality:ERROR</compilerArg>
http://git-wip-us.apache.org/repos/asf/jclouds/blob/b47c50b7/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceLiveTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceLiveTest.java
index 67cf15e..ca381db 100644
--- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceLiveTest.java
+++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineServiceLiveTest.java
@@ -138,7 +138,7 @@ public class GoogleComputeEngineServiceLiveTest extends BaseComputeServiceLiveTe
protected void checkTagsInNodeEquals(NodeMetadata node, ImmutableSet<String> tags) {
Set<String> nodeTags = node.getTags();
for (String tag : tags){
- assert nodeTags.contains(tag) : String.format("node tags did not match %s %s node:", tags, nodeTags, node);
+ assert nodeTags.contains(tag) : String.format("node tags did not match %s %s node %s:", tags, nodeTags, node);
}
}