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 2014/06/28 00:47:42 UTC
git commit: JCLOUDS-457: Cleanup for binder classes
Repository: jclouds-labs-aws
Updated Branches:
refs/heads/master 5cf26f6f7 -> ac5e48f66
JCLOUDS-457: Cleanup for binder classes
The binder classes were making unnecessary checks. They have
been cleaned up.
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/commit/ac5e48f6
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/tree/ac5e48f6
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/diff/ac5e48f6
Branch: refs/heads/master
Commit: ac5e48f6614f4dd62fdfc80cc17320db0560e32f
Parents: 5cf26f6
Author: Roman C. Coedo <ro...@gmail.com>
Authored: Fri Jun 27 09:35:03 2014 +0200
Committer: Andrew Gaul <ga...@apache.org>
Committed: Fri Jun 27 15:45:22 2014 -0700
----------------------------------------------------------------------
.../java/org/jclouds/glacier/binders/BindArchiveSizeToHeaders.java | 2 +-
.../org/jclouds/glacier/binders/BindContentRangeToHeaders.java | 2 +-
.../main/java/org/jclouds/glacier/binders/BindHashesToHeaders.java | 2 +-
.../org/jclouds/glacier/binders/BindJobRequestToJsonPayload.java | 2 +-
.../jclouds/glacier/binders/BindMultipartTreeHashToHeaders.java | 2 +-
.../java/org/jclouds/glacier/binders/BindPartSizeToHeaders.java | 2 +-
6 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/blob/ac5e48f6/glacier/src/main/java/org/jclouds/glacier/binders/BindArchiveSizeToHeaders.java
----------------------------------------------------------------------
diff --git a/glacier/src/main/java/org/jclouds/glacier/binders/BindArchiveSizeToHeaders.java b/glacier/src/main/java/org/jclouds/glacier/binders/BindArchiveSizeToHeaders.java
index 97c500c..38d5f87 100644
--- a/glacier/src/main/java/org/jclouds/glacier/binders/BindArchiveSizeToHeaders.java
+++ b/glacier/src/main/java/org/jclouds/glacier/binders/BindArchiveSizeToHeaders.java
@@ -30,7 +30,7 @@ public class BindArchiveSizeToHeaders implements Binder {
@SuppressWarnings("unchecked")
@Override
public <R extends HttpRequest> R bindToRequest(R request, Object input) {
- checkArgument(checkNotNull(input, "input") instanceof Long, "This binder is only valid for long");
+ checkArgument(input instanceof Long, "This binder is only valid for long");
checkNotNull(request, "request");
Long archiveSizeInMB = Long.class.cast(input);
return (R) request.toBuilder()
http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/blob/ac5e48f6/glacier/src/main/java/org/jclouds/glacier/binders/BindContentRangeToHeaders.java
----------------------------------------------------------------------
diff --git a/glacier/src/main/java/org/jclouds/glacier/binders/BindContentRangeToHeaders.java b/glacier/src/main/java/org/jclouds/glacier/binders/BindContentRangeToHeaders.java
index 6ce7e21..6c8bb71 100644
--- a/glacier/src/main/java/org/jclouds/glacier/binders/BindContentRangeToHeaders.java
+++ b/glacier/src/main/java/org/jclouds/glacier/binders/BindContentRangeToHeaders.java
@@ -32,7 +32,7 @@ public class BindContentRangeToHeaders implements Binder {
@SuppressWarnings("unchecked")
@Override
public <R extends HttpRequest> R bindToRequest(R request, Object input) {
- checkArgument(checkNotNull(input, "input") instanceof ContentRange, "This binder is only valid for Payload");
+ checkArgument(input instanceof ContentRange, "This binder is only valid for Payload");
checkNotNull(request, "request");
ContentRange range = ContentRange.class.cast(input);
return (R) request.toBuilder().addHeader(HttpHeaders.CONTENT_RANGE, range.buildHeader()).build();
http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/blob/ac5e48f6/glacier/src/main/java/org/jclouds/glacier/binders/BindHashesToHeaders.java
----------------------------------------------------------------------
diff --git a/glacier/src/main/java/org/jclouds/glacier/binders/BindHashesToHeaders.java b/glacier/src/main/java/org/jclouds/glacier/binders/BindHashesToHeaders.java
index 3aa5fa6..9c875c2 100644
--- a/glacier/src/main/java/org/jclouds/glacier/binders/BindHashesToHeaders.java
+++ b/glacier/src/main/java/org/jclouds/glacier/binders/BindHashesToHeaders.java
@@ -49,7 +49,7 @@ public class BindHashesToHeaders implements Binder {
@SuppressWarnings("unchecked")
@Override
public <R extends HttpRequest> R bindToRequest(R request, Object input) {
- checkArgument(checkNotNull(input, "input") instanceof Payload, "This binder is only valid for Payload");
+ checkArgument(input instanceof Payload, "This binder is only valid for Payload");
checkNotNull(request, "request");
Payload payload = Payload.class.cast(input);
return (R) addChecksumHeaders(request, payload);
http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/blob/ac5e48f6/glacier/src/main/java/org/jclouds/glacier/binders/BindJobRequestToJsonPayload.java
----------------------------------------------------------------------
diff --git a/glacier/src/main/java/org/jclouds/glacier/binders/BindJobRequestToJsonPayload.java b/glacier/src/main/java/org/jclouds/glacier/binders/BindJobRequestToJsonPayload.java
index 0526244..52e7aad 100644
--- a/glacier/src/main/java/org/jclouds/glacier/binders/BindJobRequestToJsonPayload.java
+++ b/glacier/src/main/java/org/jclouds/glacier/binders/BindJobRequestToJsonPayload.java
@@ -32,7 +32,7 @@ public class BindJobRequestToJsonPayload implements Binder {
@Override
public <R extends HttpRequest> R bindToRequest(R request, Object input) {
- checkArgument(checkNotNull(input, "input") instanceof JobRequest,
+ checkArgument(input instanceof JobRequest,
"This binder is only valid for JobRequest");
checkNotNull(request, "request");
request.setPayload(json.toJson(input));
http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/blob/ac5e48f6/glacier/src/main/java/org/jclouds/glacier/binders/BindMultipartTreeHashToHeaders.java
----------------------------------------------------------------------
diff --git a/glacier/src/main/java/org/jclouds/glacier/binders/BindMultipartTreeHashToHeaders.java b/glacier/src/main/java/org/jclouds/glacier/binders/BindMultipartTreeHashToHeaders.java
index 2c5f819..f1e9c42 100644
--- a/glacier/src/main/java/org/jclouds/glacier/binders/BindMultipartTreeHashToHeaders.java
+++ b/glacier/src/main/java/org/jclouds/glacier/binders/BindMultipartTreeHashToHeaders.java
@@ -35,7 +35,7 @@ public class BindMultipartTreeHashToHeaders implements Binder {
@SuppressWarnings("unchecked")
@Override
public <R extends HttpRequest> R bindToRequest(R request, Object input) {
- checkArgument(checkNotNull(input, "input") instanceof Map, "This binder is only valid for Map");
+ checkArgument(input instanceof Map, "This binder is only valid for Map");
checkNotNull(request, "request");
Map<Integer, HashCode> map = Map.class.cast(input);
checkArgument(map.size() != 0, "The map cannot be empty");
http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/blob/ac5e48f6/glacier/src/main/java/org/jclouds/glacier/binders/BindPartSizeToHeaders.java
----------------------------------------------------------------------
diff --git a/glacier/src/main/java/org/jclouds/glacier/binders/BindPartSizeToHeaders.java b/glacier/src/main/java/org/jclouds/glacier/binders/BindPartSizeToHeaders.java
index 58f2083..234278a 100644
--- a/glacier/src/main/java/org/jclouds/glacier/binders/BindPartSizeToHeaders.java
+++ b/glacier/src/main/java/org/jclouds/glacier/binders/BindPartSizeToHeaders.java
@@ -30,7 +30,7 @@ public class BindPartSizeToHeaders implements Binder {
@SuppressWarnings("unchecked")
@Override
public <R extends HttpRequest> R bindToRequest(R request, Object input) {
- checkArgument(checkNotNull(input, "input") instanceof Long, "This binder is only valid for long");
+ checkArgument(input instanceof Long, "This binder is only valid for long");
checkNotNull(request, "request");
Long partSizeInMB = Long.class.cast(input);
return (R) request.toBuilder()