diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Entity.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Entity.java index e9e5c3611d..4410fb0649 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Entity.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Entity.java @@ -147,7 +147,9 @@ public class Entity extends EntityType { @Override public boolean equals(Object o) { - if (!super.equals(o)) + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) return false; Entity that = Entity.class.cast(o); return super.equals(that); diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/EntityType.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/EntityType.java index c14f0cf31d..16d17fcc0c 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/EntityType.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/EntityType.java @@ -224,7 +224,9 @@ public class EntityType> extends ResourceType { @Override public boolean equals(Object o) { - if (!super.equals(o)) + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) return false; EntityType that = EntityType.class.cast(o); return super.equals(that) && diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Error.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Error.java index 4820cd3471..0a337b7a67 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Error.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Error.java @@ -18,9 +18,14 @@ */ package org.jclouds.vcloud.director.v1_5.domain; -import static com.google.common.base.Objects.equal; -import static com.google.common.base.Preconditions.checkNotNull; -import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.NS; +import static com.google.common.base.Objects.*; +import static com.google.common.base.Preconditions.*; +import static org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType.*; + +import java.io.File; +import java.io.FileWriter; +import java.io.IOException; +import java.io.PrintWriter; import javax.xml.bind.annotation.XmlAccessType; import javax.xml.bind.annotation.XmlAccessorType; @@ -107,17 +112,17 @@ public class Error { public Builder fromError(Error in) { return message(in.getMessage()) - .majorErrorCode(in.getMajorErrorCode()) - .minorErrorCode(in.getMinorErrorCode()) - .vendorSpecificErrorCode(in.getVendorSpecificErrorCode()) - .stackTrace(in.getStackTrace()); + .majorErrorCode(in.getMajorErrorCode()) + .minorErrorCode(in.getMinorErrorCode()) + .vendorSpecificErrorCode(in.getVendorSpecificErrorCode()) + .stackTrace(in.getStackTrace()); } } @XmlAttribute private String message; @XmlAttribute - private int majorErrorCode; + private Integer majorErrorCode; @XmlAttribute private String minorErrorCode; @XmlAttribute @@ -125,9 +130,9 @@ public class Error { @XmlAttribute private String stackTrace; - private Error(String message, int majorErrorCode, String minorErrorCode) { + private Error(String message, Integer majorErrorCode, String minorErrorCode) { this.message = checkNotNull(message, "message"); - this.majorErrorCode = majorErrorCode; + this.majorErrorCode = checkNotNull(majorErrorCode, "majorErrorCode"); this.minorErrorCode = checkNotNull(minorErrorCode, "minorErrorCode"); } @@ -145,7 +150,7 @@ public class Error { /** * The class of the error. Matches the HTTP status code. */ - public int getMajorErrorCode() { + public Integer getMajorErrorCode() { return majorErrorCode; } @@ -182,10 +187,11 @@ public class Error { this.stackTrace = stackTrace; } - -@Override + @Override public boolean equals(Object o) { - if (!super.equals(o)) + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) return false; Error that = (Error) o; return equal(this.message, that.message) && @@ -197,15 +203,14 @@ public class Error { @Override public int hashCode() { - return super.hashCode() + Objects.hashCode(message, majorErrorCode, minorErrorCode, vendorSpecificErrorCode, stackTrace); + return Objects.hashCode(message, majorErrorCode, minorErrorCode, vendorSpecificErrorCode, stackTrace); } @Override public String toString() { return Objects.toStringHelper("") - .add("message", message) - .add("majorErrorCode", majorErrorCode) - .add("minorErrorCode", minorErrorCode) + .add("message", message).add("majorErrorCode", majorErrorCode).add("minorErrorCode", minorErrorCode) + .add("vendorSpecificErrorCode", vendorSpecificErrorCode).add("stackTrace", stackTrace) .toString(); } } \ No newline at end of file diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Link.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Link.java index 274545149f..cbbfbf5a5a 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Link.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Link.java @@ -159,7 +159,9 @@ public class Link extends ReferenceType { @Override public boolean equals(Object o) { - if (!super.equals(o)) + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) return false; Link that = (Link) o; return super.equals(that) && equal(this.rel, that.rel); diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Metadata.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Metadata.java index 26936df2f0..f8b9213852 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Metadata.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Metadata.java @@ -50,6 +50,7 @@ public class Metadata extends ResourceType{ return new Builder(); } + @Override public Builder toBuilder() { return new Builder().fromMetadataList(this); } @@ -74,6 +75,7 @@ public class Metadata extends ResourceType{ return this; } + @Override public Metadata build() { Metadata metadata = new Metadata(href, metadataEntries); metadata.setType(type); @@ -140,7 +142,9 @@ public class Metadata extends ResourceType{ @Override public boolean equals(Object o) { - if (!super.equals(o)) + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) return false; Metadata that = Metadata.class.cast(o); return super.equals(that) && equal(metadata, that.metadata); diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/MetadataEntry.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/MetadataEntry.java index ce4cf0aeb3..3353b207d4 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/MetadataEntry.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/MetadataEntry.java @@ -49,6 +49,7 @@ public class MetadataEntry extends ResourceType { return new Builder(); } + @Override public Builder toBuilder() { return new Builder().fromMetadata(this); } @@ -73,6 +74,7 @@ public class MetadataEntry extends ResourceType { return this; } + @Override public MetadataEntry build() { MetadataEntry metadataEntry = new MetadataEntry(href, key, value); metadataEntry.setType(type); @@ -132,13 +134,12 @@ public class MetadataEntry extends ResourceType { this.value = checkNotNull(value, "value"); } - @XmlElement(namespace = NS, name = "K") + @XmlElement(namespace = NS, name = "Key") private String key; @XmlElement(namespace = NS, name = "Value") private String value; /** - * * @return key of the entry */ public String getKey() { @@ -146,17 +147,17 @@ public class MetadataEntry extends ResourceType { } /** - * * @return value of the entry */ public String getValue() { return value; } - @Override public boolean equals(Object o) { - if (!super.equals(o)) + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) return false; MetadataEntry that = MetadataEntry.class.cast(o); return super.equals(that) && equal(key, that.key); diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Org.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Org.java index 2e7f63568c..97dd7c0c41 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Org.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Org.java @@ -183,7 +183,9 @@ public class Org extends EntityType { @Override public boolean equals(Object o) { - if (!super.equals(o)) + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) return false; Org that = Org.class.cast(o); return super.equals(that) && equal(fullName, that.fullName); diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Task.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Task.java index 8e3ebce260..9c880ce9aa 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Task.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Task.java @@ -461,10 +461,13 @@ public class Task extends EntityType { @Override public boolean equals(Object o) { - if (!super.equals(o)) + if (this == o) + return true; + if (o == null || getClass() != o.getClass()) return false; Task that = Task.class.cast(o); - return super.equals(that) && equal(this.error, that.error) && equal(this.org, that.org) && + return super.equals(that) && + equal(this.error, that.error) && equal(this.org, that.org) && equal(this.progress, that.progress) && equal(this.status, that.status) && equal(this.operation, that.operation) && equal(this.operationName, that.operationName) && equal(this.startTime, that.startTime) && equal(this.endTime, that.endTime) && diff --git a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/TasksList.java b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/TasksList.java index 8fe0ef32aa..c9e13f17df 100644 --- a/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/TasksList.java +++ b/labs/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/TasksList.java @@ -28,9 +28,8 @@ import java.util.Set; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; -import org.jclouds.vcloud.director.v1_5.domain.Org.Builder; - import com.google.common.base.Objects; +import com.google.common.base.Objects.ToStringHelper; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets;