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 2016/04/25 08:31:40 UTC
[1/2] jclouds git commit: Correct equals with incompatible types
Repository: jclouds
Updated Branches:
refs/heads/master e5f65a479 -> 6446627aa
Correct equals with incompatible types
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/6446627a
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/6446627a
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/6446627a
Branch: refs/heads/master
Commit: 6446627aad599aac15bb94011a5fb01fcf6e20c0
Parents: 66cda12
Author: Andrew Gaul <ga...@apache.org>
Authored: Sun Apr 24 23:27:57 2016 -0700
Committer: Andrew Gaul <ga...@apache.org>
Committed: Sun Apr 24 23:28:55 2016 -0700
----------------------------------------------------------------------
apis/ec2/src/test/java/org/jclouds/ec2/EBSBootEC2ApiLiveTest.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/6446627a/apis/ec2/src/test/java/org/jclouds/ec2/EBSBootEC2ApiLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/EBSBootEC2ApiLiveTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/EBSBootEC2ApiLiveTest.java
index 4879005..6bc0b02 100644
--- a/apis/ec2/src/test/java/org/jclouds/ec2/EBSBootEC2ApiLiveTest.java
+++ b/apis/ec2/src/test/java/org/jclouds/ec2/EBSBootEC2ApiLiveTest.java
@@ -357,7 +357,7 @@ public class EBSBootEC2ApiLiveTest extends BaseComputeServiceContextLiveTest {
imageIds(amiId)));
} catch (AWSResponseException e) {
// TODO add a retry handler for this HTTP code 400 and the below error
- if (e.getError().getClass().equals("InvalidAMIID.NotFound"))
+ if (e.getError().getCode().equals("InvalidAMIID.NotFound"))
ebsImage = Iterables.getOnlyElement(client.getAMIApi().get().describeImagesInRegion(snapshot.getRegion(),
imageIds(amiId)));
else
[2/2] jclouds git commit: Avoid eager evaluation of Preconditions
messages
Posted by ga...@apache.org.
Avoid eager evaluation of Preconditions messages
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/66cda12b
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/66cda12b
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/66cda12b
Branch: refs/heads/master
Commit: 66cda12b5026a88eb4d945e816741c7da758d273
Parents: e5f65a4
Author: Andrew Gaul <ga...@apache.org>
Authored: Sun Apr 24 23:27:01 2016 -0700
Committer: Andrew Gaul <ga...@apache.org>
Committed: Sun Apr 24 23:28:55 2016 -0700
----------------------------------------------------------------------
.../src/main/java/org/jclouds/ec2/domain/BlockDeviceMapping.java | 2 +-
.../java/org/jclouds/ec2/xml/CreateVolumeResponseHandler.java | 2 +-
.../oauth/src/test/java/org/jclouds/oauth/v2/OAuthTestUtils.java | 4 ++--
.../java/org/jclouds/googlecloud/internal/TestProperties.java | 3 +--
core/src/main/java/org/jclouds/http/HttpRequest.java | 2 +-
core/src/main/java/org/jclouds/http/functions/ParseSax.java | 2 +-
.../java/org/jclouds/rest/internal/RestAnnotationProcessor.java | 2 +-
.../jsch/src/main/java/org/jclouds/ssh/jsch/JschSshClient.java | 4 ++--
drivers/sshj/src/main/java/org/jclouds/sshj/SshjSshClient.java | 4 ++--
.../java/org/jclouds/aws/ec2/compute/AWSEC2ComputeService.java | 4 ++--
.../jclouds/aws/ec2/functions/CreatePlacementGroupIfNeeded.java | 4 ++--
11 files changed, 16 insertions(+), 17 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/66cda12b/apis/ec2/src/main/java/org/jclouds/ec2/domain/BlockDeviceMapping.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/domain/BlockDeviceMapping.java b/apis/ec2/src/main/java/org/jclouds/ec2/domain/BlockDeviceMapping.java
index b270c3f..b058337 100644
--- a/apis/ec2/src/main/java/org/jclouds/ec2/domain/BlockDeviceMapping.java
+++ b/apis/ec2/src/main/java/org/jclouds/ec2/domain/BlockDeviceMapping.java
@@ -125,7 +125,7 @@ public class BlockDeviceMapping implements Comparable<BlockDeviceMapping> {
if (sizeInGib != null) {
checkArgument(sizeInGib >= VOLUME_SIZE_MIN_VALUE && sizeInGib <= VOLUME_SIZE_MAX_VALUE,
- String.format("Size in Gib must be between %s and %s GB", VOLUME_SIZE_MIN_VALUE, VOLUME_SIZE_MAX_VALUE));
+ "Size in Gib must be between %s and %s GB", VOLUME_SIZE_MIN_VALUE, VOLUME_SIZE_MAX_VALUE);
}
this.deviceName = deviceName;
this.virtualName = virtualName;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/66cda12b/apis/ec2/src/main/java/org/jclouds/ec2/xml/CreateVolumeResponseHandler.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/xml/CreateVolumeResponseHandler.java b/apis/ec2/src/main/java/org/jclouds/ec2/xml/CreateVolumeResponseHandler.java
index 49bd805e..a0c5675 100644
--- a/apis/ec2/src/main/java/org/jclouds/ec2/xml/CreateVolumeResponseHandler.java
+++ b/apis/ec2/src/main/java/org/jclouds/ec2/xml/CreateVolumeResponseHandler.java
@@ -186,7 +186,7 @@ public class CreateVolumeResponseHandler extends ParseSax.HandlerForGeneratedReq
}
}
- checkNotNull(regionToZones, String.format("zone %s not in %s", zone, regionToZones));
+ checkNotNull(regionToZones, "zone %s not in %s", zone, regionToZones);
} else {
region = defaultRegion.get();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/66cda12b/apis/oauth/src/test/java/org/jclouds/oauth/v2/OAuthTestUtils.java
----------------------------------------------------------------------
diff --git a/apis/oauth/src/test/java/org/jclouds/oauth/v2/OAuthTestUtils.java b/apis/oauth/src/test/java/org/jclouds/oauth/v2/OAuthTestUtils.java
index e2ac660..d15f8b0 100644
--- a/apis/oauth/src/test/java/org/jclouds/oauth/v2/OAuthTestUtils.java
+++ b/apis/oauth/src/test/java/org/jclouds/oauth/v2/OAuthTestUtils.java
@@ -67,7 +67,7 @@ public class OAuthTestUtils {
if (System.getProperties().containsKey(testKey)) {
val = System.getProperty(testKey);
}
- checkNotNull(val, String.format("the property %s must be set (pem private key file path or private key as a string)", testKey));
+ checkNotNull(val, "the property %s must be set (pem private key file path or private key as a string)", testKey);
if (val.startsWith("-----BEGIN")) {
return val;
@@ -86,7 +86,7 @@ public class OAuthTestUtils {
checkNotNull(properties);
checkNotNull(key);
String value = properties.getProperty(key);
- return checkNotNull(value, String.format("mandatory property %s or test.%s was not present", key, key));
+ return checkNotNull(value, "mandatory property %s or test.%s was not present", key, key);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/66cda12b/common/googlecloud/src/test/java/org/jclouds/googlecloud/internal/TestProperties.java
----------------------------------------------------------------------
diff --git a/common/googlecloud/src/test/java/org/jclouds/googlecloud/internal/TestProperties.java b/common/googlecloud/src/test/java/org/jclouds/googlecloud/internal/TestProperties.java
index 91b2f48..4eb835a 100644
--- a/common/googlecloud/src/test/java/org/jclouds/googlecloud/internal/TestProperties.java
+++ b/common/googlecloud/src/test/java/org/jclouds/googlecloud/internal/TestProperties.java
@@ -67,8 +67,7 @@ public final class TestProperties {
val = System.getProperty(testKey);
}
checkNotNull(val,
- String.format("the property %s must be set (pem private key file path or private key as a string)",
- testKey));
+ "the property %s must be set (pem private key file path or private key as a string)", testKey);
if (val.startsWith("-----BEGIN")) {
return val;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/66cda12b/core/src/main/java/org/jclouds/http/HttpRequest.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/http/HttpRequest.java b/core/src/main/java/org/jclouds/http/HttpRequest.java
index 80b235e..bb84161 100644
--- a/core/src/main/java/org/jclouds/http/HttpRequest.java
+++ b/core/src/main/java/org/jclouds/http/HttpRequest.java
@@ -242,7 +242,7 @@ public class HttpRequest extends HttpMessage {
super(headers, payload);
this.method = checkNotNull(method, "method");
this.endpoint = checkNotNull(endpoint, "endpoint");
- checkArgument(endpoint.getHost() != null, String.format("endpoint.getHost() is null for %s", endpoint));
+ checkArgument(endpoint.getHost() != null, "endpoint.getHost() is null for %s", endpoint);
this.filters = ImmutableList.<HttpRequestFilter> copyOf(checkNotNull(filters, "filters"));
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/66cda12b/core/src/main/java/org/jclouds/http/functions/ParseSax.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/http/functions/ParseSax.java b/core/src/main/java/org/jclouds/http/functions/ParseSax.java
index 3650344..1564db5 100644
--- a/core/src/main/java/org/jclouds/http/functions/ParseSax.java
+++ b/core/src/main/java/org/jclouds/http/functions/ParseSax.java
@@ -113,7 +113,7 @@ public class ParseSax<T> implements Function<HttpResponse, T>, InvocationContext
private void validateXml(String from) {
checkNotNull(from, "xml string");
- checkArgument(from.indexOf('<') >= 0, String.format("not an xml document [%s] ", from));
+ checkArgument(from.indexOf('<') >= 0, "not an xml document [%s] ", from);
}
public T parse(InputStream from) {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/66cda12b/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java b/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java
index 6e0f047..6027fcf 100644
--- a/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java
+++ b/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java
@@ -511,7 +511,7 @@ public class RestAnnotationProcessor implements Function<Invocation, HttpRequest
try {
URI returnVal = parser.apply(invocation.getArgs().get(position));
checkArgument(returnVal != null,
- format("endpoint for [%s] not configured for %s", position, invocation.getInvokable()));
+ "endpoint for [%s] not configured for %s", position, invocation.getInvokable());
return returnVal;
} catch (NullPointerException e) {
throw new IllegalArgumentException(format("argument at index %d on invocation.getInvoked() %s was null",
http://git-wip-us.apache.org/repos/asf/jclouds/blob/66cda12b/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/JschSshClient.java
----------------------------------------------------------------------
diff --git a/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/JschSshClient.java b/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/JschSshClient.java
index 2413b9f..d80bc31 100644
--- a/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/JschSshClient.java
+++ b/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/JschSshClient.java
@@ -154,8 +154,8 @@ public class JschSshClient implements SshClient {
}
private void checkConnected() {
- checkState(sessionConnection.getSession() != null && sessionConnection.getSession().isConnected(), String.format(
- "(%s) Session not connected!", toString()));
+ checkState(sessionConnection.getSession() != null && sessionConnection.getSession().isConnected(),
+ "(%s) Session not connected!", this);
}
public interface Connection<T> {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/66cda12b/drivers/sshj/src/main/java/org/jclouds/sshj/SshjSshClient.java
----------------------------------------------------------------------
diff --git a/drivers/sshj/src/main/java/org/jclouds/sshj/SshjSshClient.java b/drivers/sshj/src/main/java/org/jclouds/sshj/SshjSshClient.java
index 32632ac..9f47fc9 100644
--- a/drivers/sshj/src/main/java/org/jclouds/sshj/SshjSshClient.java
+++ b/drivers/sshj/src/main/java/org/jclouds/sshj/SshjSshClient.java
@@ -172,8 +172,8 @@ public class SshjSshClient implements SshClient {
}
private void checkConnected() {
- checkState(sshClientConnection.ssh != null && sshClientConnection.ssh.isConnected(), String
- .format("(%s) ssh not connected!", toString()));
+ checkState(sshClientConnection.ssh != null && sshClientConnection.ssh.isConnected(),
+ "(%s) ssh not connected!", this);
}
public interface Connection<T> {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/66cda12b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/AWSEC2ComputeService.java
----------------------------------------------------------------------
diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/AWSEC2ComputeService.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/AWSEC2ComputeService.java
index 86b1ff0..ce8c51f 100644
--- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/AWSEC2ComputeService.java
+++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/AWSEC2ComputeService.java
@@ -127,8 +127,8 @@ public class AWSEC2ComputeService extends EC2ComputeService {
try {
client.getPlacementGroupApi().get().deletePlacementGroupInRegion(region, placementGroup);
checkState(placementGroupDeleted.apply(new PlacementGroup(region, placementGroup, "cluster",
- State.PENDING)), String.format("placementGroup region(%s) name(%s) failed to delete", region,
- placementGroup));
+ State.PENDING)), "placementGroup region(%s) name(%s) failed to delete", region,
+ placementGroup);
placementGroupMap.invalidate(new RegionAndName(region, placementGroup));
logger.debug("<< deleted placementGroup(%s)", placementGroup);
} catch (IllegalStateException e) {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/66cda12b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/functions/CreatePlacementGroupIfNeeded.java
----------------------------------------------------------------------
diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/functions/CreatePlacementGroupIfNeeded.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/functions/CreatePlacementGroupIfNeeded.java
index 80d7054..dc627ae 100644
--- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/functions/CreatePlacementGroupIfNeeded.java
+++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/functions/CreatePlacementGroupIfNeeded.java
@@ -63,8 +63,8 @@ public class CreatePlacementGroupIfNeeded extends CacheLoader<RegionAndName, Str
try {
ec2Api.getPlacementGroupApi().get().createPlacementGroupInRegion(region, name);
logger.debug("<< created placementGroup(%s)", name);
- checkState(placementGroupAvailable.apply(new PlacementGroup(region, name, "cluster", State.PENDING)), String
- .format("placementGroup region(%s) name(%s) failed to become available", region, name));
+ checkState(placementGroupAvailable.apply(new PlacementGroup(region, name, "cluster", State.PENDING)),
+ "placementGroup region(%s) name(%s) failed to become available", region, name);
} catch (AWSResponseException e) {
if (e.getError().getCode().equals("InvalidPlacementGroup.Duplicate")) {
logger.debug("<< reused placementGroup(%s)", name);