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/03/31 04:04:17 UTC

jclouds-labs-aws git commit: Address Google error-prone warnings

Repository: jclouds-labs-aws
Updated Branches:
  refs/heads/master 31e99b5c6 -> f8794fbfe


Address Google error-prone warnings


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/f8794fbf
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/tree/f8794fbf
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/diff/f8794fbf

Branch: refs/heads/master
Commit: f8794fbfe8a19dcd19b4695d862060bac7c9aeb7
Parents: 31e99b5
Author: Andrew Gaul <ga...@apache.org>
Authored: Mon Mar 30 19:03:39 2015 -0700
Committer: Andrew Gaul <ga...@apache.org>
Committed: Mon Mar 30 19:04:10 2015 -0700

----------------------------------------------------------------------
 .../glacier/blobstore/strategy/internal/BaseSlicingStrategy.java   | 2 +-
 glacier/src/main/java/org/jclouds/glacier/domain/JobMetadata.java  | 2 +-
 .../glacier/predicates/validators/DescriptionValidator.java        | 2 +-
 .../jclouds/glacier/predicates/validators/PayloadValidator.java    | 2 +-
 .../jclouds/glacier/predicates/validators/VaultNameValidator.java  | 2 +-
 rds/src/main/java/org/jclouds/rds/domain/InstanceRequest.java      | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/blob/f8794fbf/glacier/src/main/java/org/jclouds/glacier/blobstore/strategy/internal/BaseSlicingStrategy.java
----------------------------------------------------------------------
diff --git a/glacier/src/main/java/org/jclouds/glacier/blobstore/strategy/internal/BaseSlicingStrategy.java b/glacier/src/main/java/org/jclouds/glacier/blobstore/strategy/internal/BaseSlicingStrategy.java
index 181110c..0200842 100644
--- a/glacier/src/main/java/org/jclouds/glacier/blobstore/strategy/internal/BaseSlicingStrategy.java
+++ b/glacier/src/main/java/org/jclouds/glacier/blobstore/strategy/internal/BaseSlicingStrategy.java
@@ -59,7 +59,7 @@ public class BaseSlicingStrategy implements SlicingStrategy {
    }
 
    protected long calculatePartSize(long length) {
-      long lengthInMB = (long) (length / (1L << 20)) + 1;
+      long lengthInMB = (length / (1L << 20)) + 1;
       double fpPartSizeInMB = sqrt(ratio * lengthInMB); //Get the part size which matches the given ratio
       long partSizeInMB = Long.highestOneBit((long) fpPartSizeInMB - 1) << 1;
       if (partSizeInMB < 1) return 1;

http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/blob/f8794fbf/glacier/src/main/java/org/jclouds/glacier/domain/JobMetadata.java
----------------------------------------------------------------------
diff --git a/glacier/src/main/java/org/jclouds/glacier/domain/JobMetadata.java b/glacier/src/main/java/org/jclouds/glacier/domain/JobMetadata.java
index 1e67df8..52fea6b 100644
--- a/glacier/src/main/java/org/jclouds/glacier/domain/JobMetadata.java
+++ b/glacier/src/main/java/org/jclouds/glacier/domain/JobMetadata.java
@@ -77,7 +77,7 @@ public class JobMetadata {
       this.archiveId = archiveId;
       this.archiveSizeInBytes = archiveSizeInBytes;
       this.archiveSHA256TreeHash = archiveSHA256TreeHash;
-      this.completed = checkNotNull(completed, "completed");
+      this.completed = completed;
       this.completionDate = completionDate == null ? null : (Date) completionDate.clone();
       this.creationDate = (Date) checkNotNull(creationDate, "creationDate").clone();
       this.inventorySizeInBytes = inventorySizeInBytes;

http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/blob/f8794fbf/glacier/src/main/java/org/jclouds/glacier/predicates/validators/DescriptionValidator.java
----------------------------------------------------------------------
diff --git a/glacier/src/main/java/org/jclouds/glacier/predicates/validators/DescriptionValidator.java b/glacier/src/main/java/org/jclouds/glacier/predicates/validators/DescriptionValidator.java
index 5dd9f16..bfd381f 100644
--- a/glacier/src/main/java/org/jclouds/glacier/predicates/validators/DescriptionValidator.java
+++ b/glacier/src/main/java/org/jclouds/glacier/predicates/validators/DescriptionValidator.java
@@ -39,7 +39,7 @@ public final class DescriptionValidator extends Validator<String> {
       if (isNullOrEmpty(description))
          return;
       checkArgument(description.length() <= MAX_DESC_LENGTH,
-            "Description can't be longer than %d characters but was %d",
+            "Description can't be longer than %s characters but was %s",
             MAX_DESC_LENGTH, description.length());
       checkArgument(DESCRIPTION_ACCEPTABLE_RANGE.matchesAllOf(description),
             "Description should have ASCII values between 32 and 126.");

http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/blob/f8794fbf/glacier/src/main/java/org/jclouds/glacier/predicates/validators/PayloadValidator.java
----------------------------------------------------------------------
diff --git a/glacier/src/main/java/org/jclouds/glacier/predicates/validators/PayloadValidator.java b/glacier/src/main/java/org/jclouds/glacier/predicates/validators/PayloadValidator.java
index dcb2900..93eb42d 100644
--- a/glacier/src/main/java/org/jclouds/glacier/predicates/validators/PayloadValidator.java
+++ b/glacier/src/main/java/org/jclouds/glacier/predicates/validators/PayloadValidator.java
@@ -37,6 +37,6 @@ public final class PayloadValidator extends Validator<Payload> {
       checkNotNull(payload, "Archive must have a payload.");
       checkNotNull(payload.getContentMetadata().getContentLength(), "Content length must be set.");
       checkArgument(payload.getContentMetadata().getContentLength() <= MAX_CONTENT_SIZE,
-            "Max content size is 4gb but was %d", payload.getContentMetadata().getContentLength());
+            "Max content size is 4gb but was %s", payload.getContentMetadata().getContentLength());
    }
 }

http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/blob/f8794fbf/glacier/src/main/java/org/jclouds/glacier/predicates/validators/VaultNameValidator.java
----------------------------------------------------------------------
diff --git a/glacier/src/main/java/org/jclouds/glacier/predicates/validators/VaultNameValidator.java b/glacier/src/main/java/org/jclouds/glacier/predicates/validators/VaultNameValidator.java
index fd99e02..257b9b7 100644
--- a/glacier/src/main/java/org/jclouds/glacier/predicates/validators/VaultNameValidator.java
+++ b/glacier/src/main/java/org/jclouds/glacier/predicates/validators/VaultNameValidator.java
@@ -43,7 +43,7 @@ public final class VaultNameValidator extends Validator<String> {
    @Override
    public void validate(String vaultName) {
       checkArgument(!isNullOrEmpty(vaultName) && vaultName.length() <= MAX_LENGTH,
-            "Can't be null or empty. Length must be %d to %d symbols.", MIN_LENGTH, MAX_LENGTH);
+            "Can't be null or empty. Length must be %s to %s symbols.", MIN_LENGTH, MAX_LENGTH);
       checkArgument(VAULT_NAME_ACCEPTABLE_RANGE.matchesAllOf(vaultName),
             "Should contain only ASCII letters and numbers, underscores, hyphens, or periods.");
    }

http://git-wip-us.apache.org/repos/asf/jclouds-labs-aws/blob/f8794fbf/rds/src/main/java/org/jclouds/rds/domain/InstanceRequest.java
----------------------------------------------------------------------
diff --git a/rds/src/main/java/org/jclouds/rds/domain/InstanceRequest.java b/rds/src/main/java/org/jclouds/rds/domain/InstanceRequest.java
index 13267e5..da9513d 100644
--- a/rds/src/main/java/org/jclouds/rds/domain/InstanceRequest.java
+++ b/rds/src/main/java/org/jclouds/rds/domain/InstanceRequest.java
@@ -200,7 +200,7 @@ public class InstanceRequest extends BaseInstance {
       this.autoMinorVersionUpgrade = autoMinorVersionUpgrade;
       this.port = checkNotNull(port, "port");
       this.characterSet = checkNotNull(characterSet, "characterSet");
-      this.backupRetentionPeriod = checkNotNull(backupRetentionPeriod, "backupRetentionPeriod");
+      this.backupRetentionPeriod = backupRetentionPeriod;
       this.subnetGroup = checkNotNull(subnetGroup, "subnetGroup");
       this.securityGroups = ImmutableSet.copyOf(checkNotNull(securityGroups, "securityGroups"));
       this.masterPassword = checkNotNull(masterPassword, "masterPassword");