commit ac5e48f6614f4dd62fdfc80cc17320db0560e32f
author Roman C. Coedo <romancoedo@gmail.com> Fri Jun 27 09:35:03 2014 +0200
committer Andrew Gaul <gaul@apache.org> Fri Jun 27 15:45:22 2014 -0700
tree e3dcbe9e88e5688646db889ed5a48947dcc0240c
parent 5cf26f6f7a418c83b93ea1ee2c8495101cdb3a26

JCLOUDS-457: Cleanup for binder classes

The binder classes were making unnecessary checks. They have
been cleaned up.

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 @@
    @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()

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 @@
    @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();

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 @@
    @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);

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 @@
 
    @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));

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 @@
    @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");

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 @@
    @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()