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 2019/02/23 07:53:34 UTC
[jclouds] 01/02: Correct uses of checkNotNull
This is an automated email from the ASF dual-hosted git repository.
gaul pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/jclouds.git
commit 53c47aa0bdeaffabae3fba3b252a15c042e4d85b
Author: Andrew Gaul <ga...@apache.org>
AuthorDate: Sat Feb 23 16:32:51 2019 +0900
Correct uses of checkNotNull
These should provide a descriptive second argument, not the same as
the first argument which is null in the failure case. This also found
a logic error in CreateVolumeResponseHandler.
---
.../main/java/org/jclouds/ec2/xml/CreateVolumeResponseHandler.java | 2 +-
.../src/main/java/org/jclouds/openstack/v2_0/domain/Limit.java | 2 +-
.../java/org/jclouds/openstack/swift/v1/domain/SwiftObject.java | 2 +-
.../src/main/java/org/jclouds/route53/domain/HostedZone.java | 2 +-
.../src/main/java/org/jclouds/route53/domain/ResourceRecordSet.java | 2 +-
core/src/test/java/org/jclouds/http/internal/WireLiveTest.java | 6 +++---
.../main/java/org/jclouds/dynect/v3/domain/CreatePrimaryZone.java | 2 +-
.../dynect/src/main/java/org/jclouds/dynect/v3/domain/Zone.java | 2 +-
.../ultradns/ws/domain/TrafficControllerPoolRecordDetail.java | 2 +-
.../src/main/java/org/jclouds/ultradns/ws/domain/Zone.java | 2 +-
10 files changed, 12 insertions(+), 12 deletions(-)
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 bd08902..908e5c6 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, "zone %s not in %s", zone, regionToZones);
+ checkNotNull(region, "zone %s not in %s", zone, regionToZones);
} else {
region = defaultRegion.get();
}
diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Limit.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Limit.java
index 969f16a..9f948ae 100644
--- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Limit.java
+++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Limit.java
@@ -42,7 +42,7 @@ public final class Limit {
@ConstructorProperties({ "verb", "unit", "value", "remaining", "next-available" })
private Limit(String verb, String unit, int value, @Nullable Integer remaining, @Nullable Date nextAvailable) {
this.verb = checkNotNull(verb, "verb");
- this.unit = checkNotNull(unit, "unit", unit);
+ this.unit = checkNotNull(unit, "unit");
this.value = value;
this.remaining = Optional.fromNullable(remaining);
this.nextAvailable = Optional.fromNullable(nextAvailable);
diff --git a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/SwiftObject.java b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/SwiftObject.java
index d5b4cdf..b538816 100644
--- a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/SwiftObject.java
+++ b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/SwiftObject.java
@@ -52,7 +52,7 @@ public class SwiftObject implements Comparable<SwiftObject> {
protected SwiftObject(String name, URI uri, String etag, Date lastModified,
Multimap<String, String> headers, Map<String, String> metadata, Payload payload) {
this.name = checkNotNull(name, "name");
- this.uri = checkNotNull(uri, "uri of %s", uri);
+ this.uri = checkNotNull(uri, "uri of %s", name);
this.etag = etag != null ? etag.replace("\"", "") : null;
this.lastModified = checkNotNull(lastModified, "lastModified of %s", name);
this.headers = headers == null ? ImmutableMultimap.<String, String> of() : checkNotNull(headers, "headers of %s", name);
diff --git a/apis/route53/src/main/java/org/jclouds/route53/domain/HostedZone.java b/apis/route53/src/main/java/org/jclouds/route53/domain/HostedZone.java
index 32ee7a1..36f7900 100644
--- a/apis/route53/src/main/java/org/jclouds/route53/domain/HostedZone.java
+++ b/apis/route53/src/main/java/org/jclouds/route53/domain/HostedZone.java
@@ -36,7 +36,7 @@ public final class HostedZone {
this.name = checkNotNull(name, "name");
this.callerReference = checkNotNull(callerReference, "callerReference for %s", name);
this.resourceRecordSetCount = resourceRecordSetCount;
- this.comment = checkNotNull(comment, "comment for %s", comment);
+ this.comment = checkNotNull(comment, "comment for %s", name);
}
/**
diff --git a/apis/route53/src/main/java/org/jclouds/route53/domain/ResourceRecordSet.java b/apis/route53/src/main/java/org/jclouds/route53/domain/ResourceRecordSet.java
index 9b67d59..8d138b3 100644
--- a/apis/route53/src/main/java/org/jclouds/route53/domain/ResourceRecordSet.java
+++ b/apis/route53/src/main/java/org/jclouds/route53/domain/ResourceRecordSet.java
@@ -183,7 +183,7 @@ public class ResourceRecordSet {
this.ttl = checkNotNull(ttl, "ttl for %s", name);
checkArgument(ttl.or(0) >= 0, "ttl of %s must be unsigned", name);
this.values = checkNotNull(values, "values for %s", name);
- this.aliasTarget = checkNotNull(aliasTarget, "aliasTarget for %s", aliasTarget);
+ this.aliasTarget = checkNotNull(aliasTarget, "aliasTarget for %s", name);
}
/**
diff --git a/core/src/test/java/org/jclouds/http/internal/WireLiveTest.java b/core/src/test/java/org/jclouds/http/internal/WireLiveTest.java
index 95e000e..fd24226 100644
--- a/core/src/test/java/org/jclouds/http/internal/WireLiveTest.java
+++ b/core/src/test/java/org/jclouds/http/internal/WireLiveTest.java
@@ -54,7 +54,7 @@ public class WireLiveTest {
InputStream in = wire.input(fromServer);
byte[] compare = md5().hashBytes(ByteStreams.toByteArray(in)).asBytes();
Thread.sleep(100);
- assertEquals(base16().lowerCase().encode(compare), checkNotNull(sysHttpStreamMd5, sysHttpStreamMd5));
+ assertEquals(base16().lowerCase().encode(compare), checkNotNull(sysHttpStreamMd5, "sysHttpStreamMd5"));
assertEquals(((BufferLogger) wire.getWireLog()).buff.toString().getBytes().length, 3331484);
return null;
}
@@ -134,7 +134,7 @@ public class WireLiveTest {
InputStream in = wire.input(connection.getInputStream());
byte[] compare = ByteStreams2.hashAndClose(in, md5()).asBytes();
Thread.sleep(100);
- assertEquals(base16().lowerCase().encode(compare), checkNotNull(sysHttpStreamMd5, sysHttpStreamMd5));
+ assertEquals(base16().lowerCase().encode(compare), checkNotNull(sysHttpStreamMd5, "sysHttpStreamMd5"));
assertEquals(((BufferLogger) wire.getWireLog()).buff.toString().getBytes().length, 3331484);
} catch (UnknownHostException e) {
// probably in offline mode
@@ -159,7 +159,7 @@ public class WireLiveTest {
InputStream in = wire.input(connection.getInputStream());
byte[] compare = ByteStreams2.hashAndClose(in, md5()).asBytes();
Thread.sleep(100);
- assertEquals(base16().lowerCase().encode(compare), checkNotNull(sysHttpStreamMd5, sysHttpStreamMd5));
+ assertEquals(base16().lowerCase().encode(compare), checkNotNull(sysHttpStreamMd5, "sysHttpStreamMd5"));
assertEquals(((BufferLogger) wire.getWireLog()).buff.toString().getBytes().length, 3331484);
} catch (UnknownHostException e) {
// probably in offline mode
diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/CreatePrimaryZone.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/CreatePrimaryZone.java
index ff3a43b..9deecc6 100644
--- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/CreatePrimaryZone.java
+++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/CreatePrimaryZone.java
@@ -41,7 +41,7 @@ public final class CreatePrimaryZone {
this.fqdn = checkNotNull(fqdn, "fqdn");
this.contact = checkNotNull(contact, "contact for %s", fqdn);
this.defaultTTL = defaultTTL;
- this.serialStyle = checkNotNull(serialStyle, "serialStyle for %s", serialStyle);
+ this.serialStyle = checkNotNull(serialStyle, "serialStyle for %s", fqdn);
}
/**
diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Zone.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Zone.java
index 287bb5c..eb714e7 100644
--- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Zone.java
+++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Zone.java
@@ -91,7 +91,7 @@ public final class Zone {
this.fqdn = checkNotNull(fqdn, "fqdn");
this.type = checkNotNull(type, "type for %s", fqdn);
this.serial = serial;
- this.serialStyle = checkNotNull(serialStyle, "serialStyle for %s", serialStyle);
+ this.serialStyle = checkNotNull(serialStyle, "serialStyle for %s", fqdn);
}
/**
diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/TrafficControllerPoolRecordDetail.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/TrafficControllerPoolRecordDetail.java
index ae0a3d2..4ea5c78 100644
--- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/TrafficControllerPoolRecordDetail.java
+++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/TrafficControllerPoolRecordDetail.java
@@ -48,7 +48,7 @@ public final class TrafficControllerPoolRecordDetail {
this.probingEnabled = probingEnabled;
this.status = checkNotNull(status, "status for %s", poolId);
this.serving = serving;
- this.description = checkNotNull(description, "description for %s", description);
+ this.description = checkNotNull(description, "description for %s", poolId);
}
/**
diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/Zone.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/Zone.java
index 1aaeb78..ac8f076 100644
--- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/Zone.java
+++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/Zone.java
@@ -44,7 +44,7 @@ public final class Zone {
this.accountId = checkNotNull(accountId, "accountId for %s", name);
this.ownerId = checkNotNull(ownerId, "ownerId for %s", name);
this.dnssecStatus = checkNotNull(dnssecStatus, "dnssecStatus for %s", name);
- this.primarySrc = checkNotNull(primarySrc, "primarySrc for %s", primarySrc);
+ this.primarySrc = checkNotNull(primarySrc, "primarySrc for %s", name);
}
/**