Repository: jclouds-labs Updated Branches: refs/heads/master 9404ffa1a -> 4df85169e
Address FindBugs warnings Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/4df85169 Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/4df85169 Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/4df85169 Branch: refs/heads/master Commit: 4df85169ea00bc170a35ca5a7476cb6b481ede90 Parents: 9404ffa Author: Andrew Gaul <[email protected]> Authored: Sun Aug 31 21:39:09 2014 -0700 Committer: Andrew Gaul <[email protected]> Committed: Mon Sep 1 01:06:41 2014 -0700 ---------------------------------------------------------------------- .../strategy/AbiquoComputeServiceAdapter.java | 4 ++-- .../cdmi/v1/options/ListContainersOptions.java | 2 +- .../domain/DrivesListRequestFieldsGroup.java | 16 +++----------- .../domain/ServerAvailabilityGroup.java | 16 +++----------- .../extensions/DigitalOceanImageExtension.java | 2 +- .../DigitalOceanComputeServiceAdapter.java | 12 +++++----- .../org/jclouds/digitalocean/ssh/DSAKeys.java | 3 ++- .../org/jclouds/docker/domain/Container.java | 3 ++- .../jclouds/blobstore/representations/Blob.java | 11 +++++++--- .../blobstore/representations/BlobMetadata.java | 19 +++++++++++++--- .../representations/ContentMetadata.java | 17 ++++++++++++--- .../representations/StorageMetadata.java | 17 ++++++++++++--- .../compute/representations/ExecResponse.java | 12 +++++++--- .../compute/representations/Hardware.java | 16 +++++++++++--- .../jclouds/compute/representations/Image.java | 17 ++++++++++++--- .../representations/LoginCredentials.java | 14 +++++++++--- .../compute/representations/NodeMetadata.java | 21 +++++++++++++++--- .../representations/OperatingSystem.java | 15 ++++++++++--- .../compute/representations/Processor.java | 11 +++++++--- .../jclouds/compute/representations/Volume.java | 15 ++++++++++--- .../jclouds/representations/ApiMetadata.java | 23 +++++++++++++++++--- .../org/jclouds/representations/Context.java | 12 +++++++--- .../org/jclouds/representations/Location.java | 14 +++++++++--- .../representations/ProviderMetadata.java | 23 +++++++++++++++++--- .../representations/Representations.java | 4 +--- .../functions/CreateAndInstallVm.java | 3 +++ 26 files changed, 233 insertions(+), 89 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/4df85169/abiquo/src/main/java/org/jclouds/abiquo/compute/strategy/AbiquoComputeServiceAdapter.java ---------------------------------------------------------------------- diff --git a/abiquo/src/main/java/org/jclouds/abiquo/compute/strategy/AbiquoComputeServiceAdapter.java b/abiquo/src/main/java/org/jclouds/abiquo/compute/strategy/AbiquoComputeServiceAdapter.java index 69efd36..616eaee 100644 --- a/abiquo/src/main/java/org/jclouds/abiquo/compute/strategy/AbiquoComputeServiceAdapter.java +++ b/abiquo/src/main/java/org/jclouds/abiquo/compute/strategy/AbiquoComputeServiceAdapter.java @@ -189,7 +189,7 @@ public class AbiquoComputeServiceAdapter return find(listImages(), new Predicate<VirtualMachineTemplate>() { @Override public boolean apply(VirtualMachineTemplate input) { - return input.getId().equals(id); + return input.getId().toString().equals(id); } }, null); } @@ -285,7 +285,7 @@ public class AbiquoComputeServiceAdapter network = find(externalNetworks, new Predicate<Network<?>>() { @Override public boolean apply(final Network<?> input) { - return Integer.valueOf(id).equals(input.getId()); + return id.equals(input.getId()); } }, null); } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/4df85169/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/options/ListContainersOptions.java ---------------------------------------------------------------------- diff --git a/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/options/ListContainersOptions.java b/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/options/ListContainersOptions.java index fe08f9f..d8c88a3 100644 --- a/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/options/ListContainersOptions.java +++ b/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/options/ListContainersOptions.java @@ -51,7 +51,7 @@ public class ListContainersOptions extends BaseHttpRequestOptions { public int getLimit() { String val = getFirstQueryOrNull("limit"); - return val != null ? Integer.valueOf(val) : 10000; + return val != null ? Integer.parseInt(val) : 10000; } public static class Builder { http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/4df85169/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/DrivesListRequestFieldsGroup.java ---------------------------------------------------------------------- diff --git a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/DrivesListRequestFieldsGroup.java b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/DrivesListRequestFieldsGroup.java index 9d1e113..ea18020 100644 --- a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/DrivesListRequestFieldsGroup.java +++ b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/DrivesListRequestFieldsGroup.java @@ -18,6 +18,8 @@ package org.jclouds.cloudsigma2.domain; import java.util.Iterator; +import com.google.common.base.Joiner; + public class DrivesListRequestFieldsGroup { private final Iterable<String> fields; @@ -31,18 +33,6 @@ public class DrivesListRequestFieldsGroup { @Override public String toString() { - String returnString = ""; - - Iterator<String> iterator = fields.iterator(); - - while (iterator.hasNext()) { - returnString += iterator.next(); - - if (iterator.hasNext()) { - returnString += ","; - } - } - - return returnString; + return Joiner.on(',').join(fields); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/4df85169/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/ServerAvailabilityGroup.java ---------------------------------------------------------------------- diff --git a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/ServerAvailabilityGroup.java b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/ServerAvailabilityGroup.java index 23697d2..a36f4e1 100644 --- a/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/ServerAvailabilityGroup.java +++ b/cloudsigma2/src/main/java/org/jclouds/cloudsigma2/domain/ServerAvailabilityGroup.java @@ -19,6 +19,8 @@ package org.jclouds.cloudsigma2.domain; import java.util.Iterator; import java.util.List; +import com.google.common.base.Joiner; + public class ServerAvailabilityGroup { private final List<String> uuids; @@ -50,18 +52,6 @@ public class ServerAvailabilityGroup { @Override public String toString() { - String returnString = ""; - - Iterator<String> iterator = uuids.iterator(); - - while (iterator.hasNext()) { - returnString += iterator.next(); - - if (iterator.hasNext()) { - returnString += ","; - } - } - - return returnString; + return Joiner.on(',').join(uuids); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/4df85169/digitalocean/src/main/java/org/jclouds/digitalocean/compute/extensions/DigitalOceanImageExtension.java ---------------------------------------------------------------------- diff --git a/digitalocean/src/main/java/org/jclouds/digitalocean/compute/extensions/DigitalOceanImageExtension.java b/digitalocean/src/main/java/org/jclouds/digitalocean/compute/extensions/DigitalOceanImageExtension.java index 78b618b..e45523c 100644 --- a/digitalocean/src/main/java/org/jclouds/digitalocean/compute/extensions/DigitalOceanImageExtension.java +++ b/digitalocean/src/main/java/org/jclouds/digitalocean/compute/extensions/DigitalOceanImageExtension.java @@ -74,7 +74,7 @@ public class DigitalOceanImageExtension implements ImageExtension { @Override public ImageTemplate buildImageTemplateFromNode(String name, String id) { - Droplet droplet = api.getDropletApi().get(Integer.valueOf(id)); + Droplet droplet = api.getDropletApi().get(Integer.parseInt(id)); if (droplet == null) { throw new NoSuchElementException("Cannot find droplet with id: " + id); http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/4df85169/digitalocean/src/main/java/org/jclouds/digitalocean/compute/strategy/DigitalOceanComputeServiceAdapter.java ---------------------------------------------------------------------- diff --git a/digitalocean/src/main/java/org/jclouds/digitalocean/compute/strategy/DigitalOceanComputeServiceAdapter.java b/digitalocean/src/main/java/org/jclouds/digitalocean/compute/strategy/DigitalOceanComputeServiceAdapter.java index c4b58c0..e036108 100644 --- a/digitalocean/src/main/java/org/jclouds/digitalocean/compute/strategy/DigitalOceanComputeServiceAdapter.java +++ b/digitalocean/src/main/java/org/jclouds/digitalocean/compute/strategy/DigitalOceanComputeServiceAdapter.java @@ -169,17 +169,17 @@ public class DigitalOceanComputeServiceAdapter implements ComputeServiceAdapter< @Override public Droplet getNode(String id) { - return api.getDropletApi().get(Integer.valueOf(id)); + return api.getDropletApi().get(Integer.parseInt(id)); } @Override public void destroyNode(String id) { - Droplet droplet = api.getDropletApi().get(Integer.valueOf(id)); + Droplet droplet = api.getDropletApi().get(Integer.parseInt(id)); final String nodeName = droplet.getName(); // We have to wait here, as the api does not properly populate the state // but fails if there is a pending event - int event = api.getDropletApi().destroy(Integer.valueOf(id), true); + int event = api.getDropletApi().destroy(Integer.parseInt(id), true); nodeTerminatedPredicate.apply(event); // Destroy the keypairs created for the node @@ -204,7 +204,7 @@ public class DigitalOceanComputeServiceAdapter implements ComputeServiceAdapter< public void rebootNode(String id) { // We have to wait here, as the api does not properly populate the state // but fails if there is a pending event - int event = api.getDropletApi().reboot(Integer.valueOf(id)); + int event = api.getDropletApi().reboot(Integer.parseInt(id)); nodeRunningPredicate.apply(event); } @@ -212,7 +212,7 @@ public class DigitalOceanComputeServiceAdapter implements ComputeServiceAdapter< public void resumeNode(String id) { // We have to wait here, as the api does not properly populate the state // but fails if there is a pending event - int event = api.getDropletApi().powerOn(Integer.valueOf(id)); + int event = api.getDropletApi().powerOn(Integer.parseInt(id)); nodeRunningPredicate.apply(event); } @@ -220,7 +220,7 @@ public class DigitalOceanComputeServiceAdapter implements ComputeServiceAdapter< public void suspendNode(String id) { // We have to wait here, as the api does not properly populate the state // but fails if there is a pending event - int event = api.getDropletApi().powerOff(Integer.valueOf(id)); + int event = api.getDropletApi().powerOff(Integer.parseInt(id)); nodeStoppedPredicate.apply(event); } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/4df85169/digitalocean/src/main/java/org/jclouds/digitalocean/ssh/DSAKeys.java ---------------------------------------------------------------------- diff --git a/digitalocean/src/main/java/org/jclouds/digitalocean/ssh/DSAKeys.java b/digitalocean/src/main/java/org/jclouds/digitalocean/ssh/DSAKeys.java index 95fba80..c13750c 100644 --- a/digitalocean/src/main/java/org/jclouds/digitalocean/ssh/DSAKeys.java +++ b/digitalocean/src/main/java/org/jclouds/digitalocean/ssh/DSAKeys.java @@ -40,6 +40,7 @@ import com.google.common.base.Splitter; import com.google.common.hash.HashCode; import com.google.common.hash.Hashing; import com.google.common.io.ByteSource; +import com.google.common.io.ByteStreams; /** * Utility methods to work with DSA SSH keys. @@ -149,7 +150,7 @@ public class DSAKeys { int byte4 = in.read(); int length = (byte1 << 24) + (byte2 << 16) + (byte3 << 8) + (byte4 << 0); byte[] val = new byte[length]; - in.read(val, 0, length); + ByteStreams.readFully(in, val); return val; } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/4df85169/docker/src/main/java/org/jclouds/docker/domain/Container.java ---------------------------------------------------------------------- diff --git a/docker/src/main/java/org/jclouds/docker/domain/Container.java b/docker/src/main/java/org/jclouds/docker/domain/Container.java index 0f0c727..4e7c059 100644 --- a/docker/src/main/java/org/jclouds/docker/domain/Container.java +++ b/docker/src/main/java/org/jclouds/docker/domain/Container.java @@ -24,6 +24,7 @@ import com.google.gson.annotations.SerializedName; import org.jclouds.javax.annotation.Nullable; import java.beans.ConstructorProperties; +import java.util.Arrays; import java.util.List; import java.util.Map; @@ -186,7 +187,7 @@ public class Container { Objects.equal(this.name, that.name) && Objects.equal(this.created, that.created) && Objects.equal(this.path, that.path) && - Objects.equal(this.args, that.args) && + Arrays.equals(this.args, that.args) && Objects.equal(this.containerConfig, that.containerConfig) && Objects.equal(this.state, that.state) && Objects.equal(this.image, that.image) && http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/4df85169/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/Blob.java ---------------------------------------------------------------------- diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/Blob.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/Blob.java index 1575caa..df50f55 100644 --- a/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/Blob.java +++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/Blob.java @@ -71,10 +71,15 @@ public class Blob implements Serializable { } @Override - public boolean equals(Object that) { - if (that == null) + public boolean equals(Object obj) { + if (obj == null) return false; - return Objects.equal(this.toString(), that.toString()); + if (!(obj instanceof Blob)) { + return false; + } + Blob that = (Blob) obj; + return Objects.equal(this.allHeaders, that.allHeaders) && + Objects.equal(this.blobMetadata, that.blobMetadata); } @Override http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/4df85169/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/BlobMetadata.java ---------------------------------------------------------------------- diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/BlobMetadata.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/BlobMetadata.java index 7b459ff..7e65d5e 100644 --- a/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/BlobMetadata.java +++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/BlobMetadata.java @@ -200,10 +200,23 @@ public class BlobMetadata implements Serializable { } @Override - public boolean equals(Object that) { - if (that == null) + public boolean equals(Object obj) { + if (obj == null) return false; - return Objects.equal(this.toString(), that.toString()); + if (!(obj instanceof BlobMetadata)) { + return false; + } + BlobMetadata that = (BlobMetadata) obj; + return Objects.equal(this.type, that.type) && + Objects.equal(this.providerId, that.providerId) && + Objects.equal(this.name, that.name) && + Objects.equal(this.uri, that.uri) && + Objects.equal(this.userMetadata, that.userMetadata) && + Objects.equal(this.eTag, that.eTag) && + Objects.equal(this.creationDate, that.creationDate) && + Objects.equal(this.lastModifiedDate, that.lastModifiedDate) && + Objects.equal(this.publicUri, that.publicUri) && + Objects.equal(this.contentMetadata, that.contentMetadata); } @Override http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/4df85169/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/ContentMetadata.java ---------------------------------------------------------------------- diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/ContentMetadata.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/ContentMetadata.java index 12628f3..86c695b 100644 --- a/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/ContentMetadata.java +++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/ContentMetadata.java @@ -20,6 +20,7 @@ import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import java.io.Serializable; +import java.util.Arrays; import java.util.Date; import static org.jclouds.representations.Representations.dateFormat; @@ -138,10 +139,20 @@ public class ContentMetadata implements Serializable { } @Override - public boolean equals(Object that) { - if (that == null) + public boolean equals(Object obj) { + if (obj == null) return false; - return Objects.equal(this.toString(), that.toString()); + if (!(obj instanceof ContentMetadata)) { + return false; + } + ContentMetadata that = (ContentMetadata) obj; + return Objects.equal(this.length, that.length) && + Objects.equal(this.disposition, that.disposition) && + Objects.equal(this.encoding, that.encoding) && + Objects.equal(this.type, that.type) && + Arrays.equals(this.md5, that.md5) && + Objects.equal(this.language, that.language) && + Objects.equal(this.expires, that.expires); } @Override http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/4df85169/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/StorageMetadata.java ---------------------------------------------------------------------- diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/StorageMetadata.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/StorageMetadata.java index 44595f3..b1bf21f 100644 --- a/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/StorageMetadata.java +++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/StorageMetadata.java @@ -166,10 +166,21 @@ public class StorageMetadata implements Serializable { } @Override - public boolean equals(Object that) { - if (that == null) + public boolean equals(Object obj) { + if (obj == null) return false; - return Objects.equal(this.toString(), that.toString()); + if (!(obj instanceof StorageMetadata)) { + return false; + } + StorageMetadata that = (StorageMetadata) obj; + return Objects.equal(this.type, that.type) && + Objects.equal(this.providerId, that.providerId) && + Objects.equal(this.name, that.name) && + Objects.equal(this.uri, that.uri) && + Objects.equal(this.userMetadata, that.userMetadata) && + Objects.equal(this.eTag, that.eTag) && + Objects.equal(this.creationDate, that.creationDate) && + Objects.equal(this.lastModifiedDate, that.lastModifiedDate); } @Override http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/4df85169/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/ExecResponse.java ---------------------------------------------------------------------- diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/ExecResponse.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/ExecResponse.java index c9c2694..ab43600 100644 --- a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/ExecResponse.java +++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/ExecResponse.java @@ -82,10 +82,16 @@ public class ExecResponse implements Serializable { } @Override - public boolean equals(Object that) { - if (that == null) + public boolean equals(Object obj) { + if (obj == null) return false; - return Objects.equal(this.toString(), that.toString()); + if (!(obj instanceof ExecResponse)) { + return false; + } + ExecResponse that = (ExecResponse) obj; + return Objects.equal(this.output, that.output) && + Objects.equal(this.error, that.error) && + Objects.equal(this.exitStatus, that.exitStatus); } @Override http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/4df85169/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Hardware.java ---------------------------------------------------------------------- diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Hardware.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Hardware.java index 0d80408..3a32160 100644 --- a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Hardware.java +++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Hardware.java @@ -136,10 +136,20 @@ public class Hardware implements Serializable { } @Override - public boolean equals(Object that) { - if (that == null) + public boolean equals(Object obj) { + if (obj == null) return false; - return Objects.equal(this.toString(), that.toString()); + if (!(obj instanceof Hardware)) { + return false; + } + Hardware that = (Hardware) obj; + return Objects.equal(this.id, that.id) && + Objects.equal(this.name, that.name) && + Objects.equal(this.tags, that.tags) && + Objects.equal(this.processors, that.processors) && + Objects.equal(this.ram, that.ram) && + Objects.equal(this.volumes, that.volumes) && + Objects.equal(this.hypervisor, that.hypervisor); } @Override http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/4df85169/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Image.java ---------------------------------------------------------------------- diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Image.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Image.java index 524a522..74600a1 100644 --- a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Image.java +++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Image.java @@ -145,10 +145,21 @@ public class Image implements Serializable { } @Override - public boolean equals(Object that) { - if (that == null) + public boolean equals(Object obj) { + if (obj == null) return false; - return Objects.equal(this.toString(), that.toString()); + if (!(obj instanceof Image)) { + return false; + } + Image that = (Image) obj; + return Objects.equal(this.id, that.id) && + Objects.equal(this.name, that.name) && + Objects.equal(this.version, that.version) && + Objects.equal(this.description, that.description) && + Objects.equal(this.status, that.status) && + Objects.equal(this.operatingSystem, that.operatingSystem) && + Objects.equal(this.defaultCredentials, that.defaultCredentials) && + Objects.equal(this.tags, that.tags); } @Override http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/4df85169/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/LoginCredentials.java ---------------------------------------------------------------------- diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/LoginCredentials.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/LoginCredentials.java index a07fe51..87f6ead 100644 --- a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/LoginCredentials.java +++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/LoginCredentials.java @@ -112,10 +112,18 @@ public class LoginCredentials implements Serializable { } @Override - public boolean equals(Object that) { - if (that == null) + public boolean equals(Object obj) { + if (obj == null) return false; - return Objects.equal(this.toString(), that.toString()); + if (!(obj instanceof LoginCredentials)) { + return false; + } + LoginCredentials that = (LoginCredentials) obj; + return Objects.equal(this.username, that.username) && + Objects.equal(this.password, that.password) && + Objects.equal(this.privateKey, that.privateKey) && + Objects.equal(this.credentialUrl, that.credentialUrl) && + Objects.equal(this.authenticateSudo, that.authenticateSudo); } @Override http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/4df85169/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/NodeMetadata.java ---------------------------------------------------------------------- diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/NodeMetadata.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/NodeMetadata.java index ee4d2a7..41a23bf 100644 --- a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/NodeMetadata.java +++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/NodeMetadata.java @@ -206,10 +206,25 @@ public class NodeMetadata implements Serializable { } @Override - public boolean equals(Object that) { - if (that == null) + public boolean equals(Object obj) { + if (obj == null) return false; - return Objects.equal(this.toString(), that.toString()); + if (!(obj instanceof NodeMetadata)) { + return false; + } + NodeMetadata that = (NodeMetadata) obj; + return Objects.equal(this.id, that.id) && + Objects.equal(this.name, that.name) && + Objects.equal(this.description, that.description) && + Objects.equal(this.status, that.status) && + Objects.equal(this.hostname, that.hostname) && + Objects.equal(this.locationId, that.locationId) && + Objects.equal(this.imageId, that.imageId) && + Objects.equal(this.loginPort, that.loginPort) && + Objects.equal(this.group, that.group) && + Objects.equal(this.tags, that.tags) && + Objects.equal(this.metadata, that.metadata) && + Objects.equal(this.defaultCredentials, that.defaultCredentials); } @Override http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/4df85169/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/OperatingSystem.java ---------------------------------------------------------------------- diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/OperatingSystem.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/OperatingSystem.java index 4b1054e..c23c7fd 100644 --- a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/OperatingSystem.java +++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/OperatingSystem.java @@ -119,10 +119,19 @@ public class OperatingSystem implements Serializable { } @Override - public boolean equals(Object that) { - if (that == null) + public boolean equals(Object obj) { + if (obj == null) return false; - return Objects.equal(this.toString(), that.toString()); + if (!(obj instanceof OperatingSystem)) { + return false; + } + OperatingSystem that = (OperatingSystem) obj; + return Objects.equal(this.family, that.family) && + Objects.equal(this.name, that.name) && + Objects.equal(this.arch, that.arch) && + Objects.equal(this.version, that.version) && + Objects.equal(this.description, that.description) && + this.is64Bit == that.is64Bit; } @Override http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/4df85169/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Processor.java ---------------------------------------------------------------------- diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Processor.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Processor.java index 98e3384..592b877 100644 --- a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Processor.java +++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Processor.java @@ -71,10 +71,15 @@ public class Processor implements Serializable { } @Override - public boolean equals(Object that) { - if (that == null) + public boolean equals(Object obj) { + if (obj == null) return false; - return Objects.equal(this.toString(), that.toString()); + if (!(obj instanceof Processor)) { + return false; + } + Processor that = (Processor) obj; + return this.cores == that.cores && + this.speed == that.speed; } @Override http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/4df85169/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Volume.java ---------------------------------------------------------------------- diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Volume.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Volume.java index 8b626b0..687c68c 100644 --- a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Volume.java +++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Volume.java @@ -120,10 +120,19 @@ public class Volume implements Serializable { } @Override - public boolean equals(Object that) { - if (that == null) + public boolean equals(Object obj) { + if (obj == null) return false; - return Objects.equal(this.toString(), that.toString()); + if (!(obj instanceof Volume)) { + return false; + } + Volume that = (Volume) obj; + return Objects.equal(this.id, that.id) && + Objects.equal(this.type, that.type) && + Objects.equal(this.size, that.size) && + Objects.equal(this.device, that.device) && + this.durable == that.durable && + this.bootDevice == that.bootDevice; } @Override http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/4df85169/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/ApiMetadata.java ---------------------------------------------------------------------- diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/ApiMetadata.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/ApiMetadata.java index e2ff923..63f0b1f 100644 --- a/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/ApiMetadata.java +++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/ApiMetadata.java @@ -240,10 +240,27 @@ public class ApiMetadata implements Serializable { } @Override - public boolean equals(Object that) { - if (that == null) + public boolean equals(Object obj) { + if (obj == null) return false; - return Objects.equal(this.toString(), that.toString()); + if (!(obj instanceof ApiMetadata)) { + return false; + } + ApiMetadata that = (ApiMetadata) obj; + return Objects.equal(this.id, that.id) && + Objects.equal(this.name, that.name) && + Objects.equal(this.endpointName, that.endpointName) && + Objects.equal(this.identityName, that.identityName) && + Objects.equal(this.credentialName, that.credentialName) && + Objects.equal(this.version, that.version) && + Objects.equal(this.defaultEndpoint, that.defaultEndpoint) && + Objects.equal(this.defaultIdentity, that.defaultIdentity) && + Objects.equal(this.defaultCredential, that.defaultCredential) && + Objects.equal(this.defaultProperties, that.defaultProperties) && + Objects.equal(this.defaultModules, that.defaultModules) && + Objects.equal(this.documentation, that.documentation) && + Objects.equal(this.context, that.context) && + Objects.equal(this.views, that.views); } @Override http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/4df85169/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/Context.java ---------------------------------------------------------------------- diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/Context.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/Context.java index 0e18409..faac681 100644 --- a/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/Context.java +++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/Context.java @@ -83,10 +83,16 @@ public class Context implements Serializable { } @Override - public boolean equals(Object that) { - if (that == null) + public boolean equals(Object obj) { + if (obj == null) return false; - return Objects.equal(this.toString(), that.toString()); + if (!(obj instanceof Context)) { + return false; + } + Context that = (Context) obj; + return Objects.equal(this.name, that.name) && + Objects.equal(this.providerId, that.providerId) && + Objects.equal(this.identity, that.identity); } @Override http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/4df85169/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/Location.java ---------------------------------------------------------------------- diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/Location.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/Location.java index 6800e8a..218cd34 100644 --- a/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/Location.java +++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/Location.java @@ -110,10 +110,18 @@ public class Location implements Serializable { } @Override - public boolean equals(Object that) { - if (that == null) + public boolean equals(Object obj) { + if (obj == null) return false; - return Objects.equal(this.toString(), that.toString()); + if (!(obj instanceof Location)) { + return false; + } + Location that = (Location) obj; + return Objects.equal(this.id, that.id) && + Objects.equal(this.scope, that.scope) && + Objects.equal(this.description, that.description) && + Objects.equal(this.parentId, that.parentId) && + Objects.equal(this.iso3166Codes, that.iso3166Codes); } @Override http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/4df85169/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/ProviderMetadata.java ---------------------------------------------------------------------- diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/ProviderMetadata.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/ProviderMetadata.java index 56f5f77..ee02a94 100644 --- a/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/ProviderMetadata.java +++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/ProviderMetadata.java @@ -245,10 +245,27 @@ public class ProviderMetadata implements Serializable { } @Override - public boolean equals(Object that) { - if (that == null) + public boolean equals(Object obj) { + if (obj == null) return false; - return Objects.equal(this.toString(), that.toString()); + if (!(obj instanceof ProviderMetadata)) { + return false; + } + ProviderMetadata that = (ProviderMetadata) obj; + return Objects.equal(this.id, that.id) && + Objects.equal(this.name, that.name) && + Objects.equal(this.documentation, that.documentation) && + Objects.equal(this.endpointName, that.endpointName) && + Objects.equal(this.identityName, that.identityName) && + Objects.equal(this.credentialName, that.credentialName) && + Objects.equal(this.defaultModules, that.defaultModules) && + Objects.equal(this.views, that.views) && + Objects.equal(this.endpoint, that.endpoint) && + Objects.equal(this.defaultProperties, that.defaultProperties) && + Objects.equal(this.console, that.console) && + Objects.equal(this.homePage, that.homePage) && + Objects.equal(this.linkedServices, that.linkedServices) && + Objects.equal(this.iso3166Codes, that.iso3166Codes); } @Override http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/4df85169/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/Representations.java ---------------------------------------------------------------------- diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/Representations.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/Representations.java index 6e281cc..eeb90b2 100644 --- a/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/Representations.java +++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/Representations.java @@ -26,9 +26,7 @@ public final class Representations { //Utility Class } - public static final DateFormat DATE_FORMAT = new SimpleDateFormat("dd/MM/yyyy HH:mm:ss zzz"); - public static String dateFormat(Date date) { - return date != null ? DATE_FORMAT.format(date) : ""; + return date != null ? new SimpleDateFormat("dd/MM/yyyy HH:mm:ss zzz").format(date) : ""; } } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/4df85169/virtualbox/src/main/java/org/jclouds/virtualbox/functions/CreateAndInstallVm.java ---------------------------------------------------------------------- diff --git a/virtualbox/src/main/java/org/jclouds/virtualbox/functions/CreateAndInstallVm.java b/virtualbox/src/main/java/org/jclouds/virtualbox/functions/CreateAndInstallVm.java index dc84ceb..2d1a03e 100644 --- a/virtualbox/src/main/java/org/jclouds/virtualbox/functions/CreateAndInstallVm.java +++ b/virtualbox/src/main/java/org/jclouds/virtualbox/functions/CreateAndInstallVm.java @@ -122,6 +122,9 @@ public class CreateAndInstallVm implements Function<MasterSpec, IMachine> { logger.debug(">> awaiting installation of guest additions on vm: %s", masterName); ListenableFuture<ExecResponse> execInstallGA = machineUtils.runScriptOnNode(nodeMetadata, new InstallGuestAdditions(vmSpec, version), RunScriptOptions.NONE); + ExecResponse execInstallGAResponse = Futures.getUnchecked(execInstallGA); + checkState(execInstallGAResponse.getExitStatus() == 0, "exec installation of guest additions on vm(%s) " + + "failed", masterName); logger.debug(">> check installation of guest additions on vm: %s", masterName); ListenableFuture<ExecResponse> checkGAinstallation = machineUtils.runScriptOnNode(nodeMetadata,
