http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CapacityWithUsage.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CapacityWithUsage.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CapacityWithUsage.java index 2e847d9..86dbd46 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CapacityWithUsage.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CapacityWithUsage.java @@ -21,9 +21,9 @@ import static com.google.common.base.Objects.equal; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; - /** * Represents a capacity and usage of a given resource. * <p/> @@ -184,7 +184,7 @@ public class CapacityWithUsage extends CapacityType<CapacityWithUsage> @Override public String toString() { - return Objects.toStringHelper("") + return MoreObjects.toStringHelper("") .add("used", used) .add("overhead", overhead).toString(); }
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Catalog.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Catalog.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Catalog.java index 7e9704b..37d7b61 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Catalog.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Catalog.java @@ -28,7 +28,7 @@ import javax.xml.bind.annotation.XmlSeeAlso; import javax.xml.bind.annotation.XmlType; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ComputeCapacity.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ComputeCapacity.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ComputeCapacity.java index 692b501..3b7b970 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ComputeCapacity.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ComputeCapacity.java @@ -21,6 +21,7 @@ import static com.google.common.base.Objects.equal; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; @@ -144,7 +145,7 @@ public class ComputeCapacity { @Override public String toString() { - return Objects.toStringHelper("") + return MoreObjects.toStringHelper("") .add("cpu", cpu) .add("memory", memory).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Entity.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Entity.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Entity.java index 2228d7b..44607a7 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Entity.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Entity.java @@ -28,7 +28,7 @@ import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Error.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Error.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Error.java index 574ab89..34c7142 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Error.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Error.java @@ -31,6 +31,7 @@ import javax.xml.bind.annotation.XmlType; import org.jclouds.logging.Logger; import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.base.Optional; import com.google.common.base.Predicate; @@ -247,7 +248,7 @@ public class Error { @Override public String toString() { - return Objects.toStringHelper("") + return MoreObjects.toStringHelper("") .add("message", message).add("majorErrorCode", majorErrorCode).add("minorErrorCode", minorErrorCode) .add("vendorSpecificErrorCode", vendorSpecificErrorCode).add("stackTrace", stackTrace) .toString(); http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/File.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/File.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/File.java index 7f1a406..8d88dbd 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/File.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/File.java @@ -25,7 +25,7 @@ import javax.xml.bind.annotation.adapters.NormalizedStringAdapter; import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Link.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Link.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Link.java index fc0e6f8..e30c6d0 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Link.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Link.java @@ -30,7 +30,7 @@ import javax.xml.bind.annotation.XmlType; import com.google.common.base.Function; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Media.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Media.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Media.java index 9d9be02..ba4d21c 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Media.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Media.java @@ -31,7 +31,7 @@ import javax.xml.bind.annotation.XmlType; import com.google.common.base.Function; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Metadata.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Metadata.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Metadata.java index 9da3f6f..b1cfd96 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Metadata.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Metadata.java @@ -29,7 +29,7 @@ import javax.xml.bind.annotation.XmlRootElement; import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/MetadataEntry.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/MetadataEntry.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/MetadataEntry.java index 4e03a4d..65c711c 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/MetadataEntry.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/MetadataEntry.java @@ -28,7 +28,7 @@ import javax.xml.bind.annotation.XmlRootElement; import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.Sets; /** http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Owner.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Owner.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Owner.java index 170ab9e..d15382c 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Owner.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Owner.java @@ -23,7 +23,7 @@ import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Represents the owner of this entity. http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ProductSectionList.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ProductSectionList.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ProductSectionList.java index 3bb8964..717fbcc 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ProductSectionList.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ProductSectionList.java @@ -31,7 +31,7 @@ import org.jclouds.dmtf.DMTFConstants; import org.jclouds.dmtf.ovf.ProductSection; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RasdItemsList.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RasdItemsList.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RasdItemsList.java index 41b716c..f965850 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RasdItemsList.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RasdItemsList.java @@ -30,7 +30,7 @@ import javax.xml.bind.annotation.XmlType; import org.jclouds.vcloud.director.v1_5.domain.dmtf.RasdItem; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.Sets; /** http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Reference.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Reference.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Reference.java index a1a3659..e2bc31d 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Reference.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Reference.java @@ -28,8 +28,9 @@ import javax.xml.bind.annotation.XmlType; import org.jclouds.logging.Logger; +import com.google.common.base.MoreObjects; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; /** * A reference to a resource. @@ -197,7 +198,7 @@ public class Reference { } protected ToStringHelper string() { - return Objects.toStringHelper("").add("href", href).add("name", name).add("type", type); + return MoreObjects.toStringHelper("").add("href", href).add("name", name).add("type", type); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/References.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/References.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/References.java index 15adf2a..e5030f1 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/References.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/References.java @@ -27,7 +27,7 @@ import javax.xml.bind.annotation.XmlType; import org.jclouds.vcloud.director.v1_5.domain.query.ContainerType; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.Sets; /** http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Resource.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Resource.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Resource.java index 8a36ba9..5f262c0 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Resource.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Resource.java @@ -30,8 +30,9 @@ import javax.xml.bind.annotation.XmlType; import org.jclouds.logging.Logger; +import com.google.common.base.MoreObjects; +import com.google.common.base.MoreObjects.ToStringHelper; 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; @@ -201,6 +202,6 @@ public class Resource { } protected ToStringHelper string() { - return Objects.toStringHelper("").add("href", href).add("links", links).add("type", type); + return MoreObjects.toStringHelper("").add("href", href).add("links", links).add("type", type); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ResourceEntity.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ResourceEntity.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ResourceEntity.java index f1175bb..b025475 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ResourceEntity.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ResourceEntity.java @@ -29,7 +29,7 @@ import javax.xml.bind.annotation.XmlEnumValue; import javax.xml.bind.annotation.XmlType; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Optional; import com.google.common.base.Predicate; import com.google.common.collect.Iterables; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ScreenTicket.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ScreenTicket.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ScreenTicket.java index 3ccc405..e6624cd 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ScreenTicket.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ScreenTicket.java @@ -22,6 +22,7 @@ import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; import javax.xml.bind.annotation.XmlValue; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -98,6 +99,6 @@ public class ScreenTicket { @Override public String toString() { - return Objects.toStringHelper("").add("value", value).toString(); + return MoreObjects.toStringHelper("").add("value", value).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Session.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Session.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Session.java index dbc8d9d..8b68d58 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Session.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Session.java @@ -29,6 +29,7 @@ import javax.xml.bind.annotation.XmlRootElement; import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; @@ -168,7 +169,7 @@ public class Session { @Override public String toString() { - return Objects.toStringHelper("").add("user", user).add("org", org).add("href", href).add("links", links) + return MoreObjects.toStringHelper("").add("user", user).add("org", org).add("href", href).add("links", links) .toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/SessionWithToken.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/SessionWithToken.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/SessionWithToken.java index 815dd76..7a233cd 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/SessionWithToken.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/SessionWithToken.java @@ -18,6 +18,7 @@ package org.jclouds.vcloud.director.v1_5.domain; import static com.google.common.base.Objects.equal; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -115,6 +116,6 @@ public class SessionWithToken { @Override public String toString() { - return Objects.toStringHelper("").add("session", session).add("token", token).toString(); + return MoreObjects.toStringHelper("").add("session", session).add("token", token).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Task.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Task.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Task.java index 89717cd..d14ee79 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Task.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Task.java @@ -34,7 +34,7 @@ import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; import com.google.common.base.Function; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/TasksList.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/TasksList.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/TasksList.java index 0cca47d..8d25878 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/TasksList.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/TasksList.java @@ -29,7 +29,7 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/User.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/User.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/User.java index 48ccf46..391106e 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/User.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/User.java @@ -26,6 +26,7 @@ import javax.xml.bind.annotation.XmlElementWrapper; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; @@ -606,7 +607,7 @@ public class User extends Entity { @Override public String toString() { - return Objects.toStringHelper("") + return MoreObjects.toStringHelper("") .add("fullName", fullName) .add("emailAddress", emailAddress) .add("telephone", telephone) http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VApp.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VApp.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VApp.java index bf71f6e..18a1cee 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VApp.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VApp.java @@ -24,7 +24,7 @@ import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Represents a vApp. http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppChildren.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppChildren.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppChildren.java index 5340113..f0a17d2 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppChildren.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppChildren.java @@ -24,6 +24,7 @@ import java.util.List; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.Lists; @@ -139,6 +140,6 @@ public class VAppChildren { @Override public String toString() { - return Objects.toStringHelper("").add("vApps", vApps).add("vms", vms).toString(); + return MoreObjects.toStringHelper("").add("vApps", vApps).add("vms", vms).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppTemplate.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppTemplate.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppTemplate.java index d91ee7c..e1fe0cc 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppTemplate.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppTemplate.java @@ -43,6 +43,7 @@ import org.jclouds.vcloud.director.v1_5.domain.section.OperatingSystemSection; import org.jclouds.vcloud.director.v1_5.domain.section.RuntimeInfoSection; import org.jclouds.vcloud.director.v1_5.domain.section.VirtualHardwareSection; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; @@ -283,7 +284,7 @@ public class VAppTemplate extends ResourceEntity { @Override public String toString() { - return Objects.toStringHelper(super.toString()) + return MoreObjects.toStringHelper(super.toString()) .add("owner", owner) .add("children", children) .add("sections", sections) http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VMWareTools.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VMWareTools.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VMWareTools.java index a237c33..97f48de 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VMWareTools.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VMWareTools.java @@ -22,6 +22,7 @@ import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; @XmlRootElement(name = "VMWareTools") @@ -94,6 +95,6 @@ public class VMWareTools { @Override public String toString() { - return Objects.toStringHelper("").add("version", version).toString(); + return MoreObjects.toStringHelper("").add("version", version).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Vdc.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Vdc.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Vdc.java index a737272..f6cea03 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Vdc.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Vdc.java @@ -29,7 +29,7 @@ import javax.xml.bind.annotation.XmlSeeAlso; import javax.xml.bind.annotation.XmlType; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Vm.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Vm.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Vm.java index ecb50fc..7cd1591 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Vm.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Vm.java @@ -26,7 +26,7 @@ import javax.xml.bind.annotation.XmlType; import org.jclouds.dmtf.ovf.environment.EnvironmentType; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Represents a virtual machine. http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VmPendingQuestion.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VmPendingQuestion.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VmPendingQuestion.java index 156ec3d..168be59 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VmPendingQuestion.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VmPendingQuestion.java @@ -24,7 +24,7 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Represents a question which vSphere issued for a VM in a stuck state(WAITING_FOR_INPUT). It has a question element, a question ID http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VmQuestionAnswer.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VmQuestionAnswer.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VmQuestionAnswer.java index 82d2b22..c8a6344 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VmQuestionAnswer.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VmQuestionAnswer.java @@ -21,6 +21,7 @@ import static com.google.common.base.Objects.equal; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -134,6 +135,6 @@ public class VmQuestionAnswer { @Override public String toString() { - return Objects.toStringHelper("").add("choiceId", choiceId).add("questionId", questionId).toString(); + return MoreObjects.toStringHelper("").add("choiceId", choiceId).add("questionId", questionId).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VmQuestionAnswerChoice.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VmQuestionAnswerChoice.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VmQuestionAnswerChoice.java index ffd5781..ea16b82 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VmQuestionAnswerChoice.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VmQuestionAnswerChoice.java @@ -21,6 +21,7 @@ import static com.google.common.base.Objects.equal; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -134,6 +135,6 @@ public class VmQuestionAnswerChoice { @Override public String toString() { - return Objects.toStringHelper("").add("id", id).add("text", text).toString(); + return MoreObjects.toStringHelper("").add("id", id).add("text", text).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/RasdItem.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/RasdItem.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/RasdItem.java index 5c83ebf..b9044a8 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/RasdItem.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/RasdItem.java @@ -32,7 +32,7 @@ import org.jclouds.dmtf.cim.ResourceAllocationSettingData; import org.jclouds.vcloud.director.v1_5.domain.Link; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/VirtualSystem.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/VirtualSystem.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/VirtualSystem.java index 3c42188..53ff32a 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/VirtualSystem.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/VirtualSystem.java @@ -29,6 +29,7 @@ import org.jclouds.dmtf.ovf.internal.BaseVirtualSystem; import org.jclouds.vcloud.director.v1_5.domain.section.OperatingSystemSection; import org.jclouds.vcloud.director.v1_5.domain.section.VirtualHardwareSection; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; @@ -137,7 +138,7 @@ public class VirtualSystem extends BaseVirtualSystem { } @Override - protected Objects.ToStringHelper string() { + protected MoreObjects.ToStringHelper string() { return super.string() .add("operatingSystem", operatingSystem) .add("virtualHardwareSections", virtualHardwareSections); http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/DhcpService.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/DhcpService.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/DhcpService.java index 1c149dc..6335f93 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/DhcpService.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/DhcpService.java @@ -22,6 +22,7 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -162,7 +163,7 @@ public class DhcpService extends NetworkServiceType<DhcpService> { } @Override - protected Objects.ToStringHelper string() { + protected MoreObjects.ToStringHelper string() { return super.string().add("defaultLeastTime", defaultLeaseTime).add("maxLeaseTime", maxLeaseTime).add("ipRange", ipRange); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/ExternalNetwork.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/ExternalNetwork.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/ExternalNetwork.java index 6828358..1da71ee 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/ExternalNetwork.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/ExternalNetwork.java @@ -23,7 +23,7 @@ import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Admin representation of external network. * http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallRule.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallRule.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallRule.java index a9fcb84..ed9f486 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallRule.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallRule.java @@ -21,9 +21,9 @@ import static com.google.common.base.Objects.equal; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; - /** * Represents a firewall rule. * <p/> @@ -371,7 +371,7 @@ public class FirewallRule { @Override public String toString() { - return Objects.toStringHelper("") + return MoreObjects.toStringHelper("") .add("isEnabled", isEnabled) .add("description", description) .add("policy", policy) http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallRuleProtocols.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallRuleProtocols.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallRuleProtocols.java index de5480f..da18380 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallRuleProtocols.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallRuleProtocols.java @@ -21,9 +21,9 @@ import static com.google.common.base.Objects.equal; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; - /** * <p>Java class for anonymous complex type. * <p/> @@ -177,7 +177,7 @@ public class FirewallRuleProtocols { @Override public String toString() { - return Objects.toStringHelper("") + return MoreObjects.toStringHelper("") .add("tcp", tcp) .add("udp", udp) .add("icmp", icmp) http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallService.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallService.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallService.java index af29e17..68a7ba6 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallService.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallService.java @@ -26,11 +26,11 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; - /** * Represents a network firewall service. * <p/> @@ -191,7 +191,7 @@ public class FirewallService extends NetworkServiceType<FirewallService> { @Override public String toString() { - return Objects.toStringHelper("") + return MoreObjects.toStringHelper("") .add("defaultAction", defaultAction) .add("logDefaultAction", logDefaultAction) .add("firewallRules", firewallRules).toString(); http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpAddresses.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpAddresses.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpAddresses.java index d2f8871..2b796a1 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpAddresses.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpAddresses.java @@ -25,6 +25,7 @@ import java.util.Set; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; @@ -103,6 +104,6 @@ public class IpAddresses { @Override public String toString() { - return Objects.toStringHelper("").add("ipAddresses", ipAddresses).toString(); + return MoreObjects.toStringHelper("").add("ipAddresses", ipAddresses).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpRange.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpRange.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpRange.java index f51b931..ed6df30 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpRange.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpRange.java @@ -21,6 +21,7 @@ import static com.google.common.base.Objects.equal; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -112,7 +113,7 @@ public class IpRange { @Override public String toString() { - return Objects.toStringHelper("").add("startAddress", startAddress) + return MoreObjects.toStringHelper("").add("startAddress", startAddress) .add("endAddress", endAddress).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpRanges.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpRanges.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpRanges.java index 09288c6..db98b02 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpRanges.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpRanges.java @@ -25,6 +25,7 @@ import java.util.Set; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; @@ -103,6 +104,6 @@ public class IpRanges { @Override public String toString() { - return Objects.toStringHelper("").add("ipRanges", ipRanges).toString(); + return MoreObjects.toStringHelper("").add("ipRanges", ipRanges).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpScope.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpScope.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpScope.java index ac53b38..e589a44 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpScope.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpScope.java @@ -21,6 +21,7 @@ import static com.google.common.base.Objects.equal; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -241,7 +242,7 @@ public class IpScope { @Override public String toString() { - return Objects.toStringHelper("").add("isInherited", isInherited) + return MoreObjects.toStringHelper("").add("isInherited", isInherited) .add("gateway", gateway) .add("netmask", netmask) .add("dns1", dns1) http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnManagedPeerType.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnManagedPeerType.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnManagedPeerType.java index 0a31ba5..d7ec443 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnManagedPeerType.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnManagedPeerType.java @@ -21,6 +21,7 @@ import static com.google.common.base.Objects.equal; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlSeeAlso; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; @XmlSeeAlso( @@ -102,7 +103,7 @@ public abstract class IpsecVpnManagedPeerType<T extends IpsecVpnManagedPeerType< return string().toString(); } - protected Objects.ToStringHelper string() { - return Objects.toStringHelper("").add("id", id).add("name", name); + protected MoreObjects.ToStringHelper string() { + return MoreObjects.toStringHelper("").add("id", id).add("name", name); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnRemotePeer.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnRemotePeer.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnRemotePeer.java index fb5c608..c7ece6f 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnRemotePeer.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnRemotePeer.java @@ -22,9 +22,9 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; - /** * Gives more details of remote peer end point. * <p/> @@ -192,7 +192,7 @@ public class IpsecVpnRemotePeer extends IpsecVpnManagedPeerType<IpsecVpnRemotePe } @Override - protected Objects.ToStringHelper string() { + protected MoreObjects.ToStringHelper string() { return super.string() .add("vcdUrl", vcdUrl) .add("vcdOrganization", vcdOrganization) http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnService.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnService.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnService.java index fa337aa..dad5edc 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnService.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnService.java @@ -26,6 +26,7 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; @@ -193,7 +194,7 @@ public class IpsecVpnService extends NetworkServiceType<IpsecVpnService> { } @Override - protected Objects.ToStringHelper string() { + protected MoreObjects.ToStringHelper string() { return super.string() .add("externalIpAddress", externalIpAddress) .add("publicIpAddress", publicIpAddress) http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnTunnel.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnTunnel.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnTunnel.java index 1d70444..4cbaf5e 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnTunnel.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnTunnel.java @@ -22,9 +22,9 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlElementRef; import javax.xml.bind.annotation.XmlType; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; - /** * Represents details of an IPSec-VPN tunnel. * <p/> @@ -381,7 +381,7 @@ public class IpsecVpnTunnel { @Override public String toString() { - return Objects.toStringHelper("") + return MoreObjects.toStringHelper("") .add("name", name) .add("description", description) .add("peerIpAddress", peerIpAddress) http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatOneToOneBasicRule.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatOneToOneBasicRule.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatOneToOneBasicRule.java index 3123633..33c108f 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatOneToOneBasicRule.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatOneToOneBasicRule.java @@ -21,9 +21,9 @@ import static com.google.common.base.Objects.equal; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; - /** * Represents the NAT basic rule for one to one mapping of internal * and external IP addresses from a network. @@ -173,7 +173,7 @@ public class NatOneToOneBasicRule { @Override public String toString() { - return Objects.toStringHelper("") + return MoreObjects.toStringHelper("") .add("mappingMode", mappingMode) .add("externalIpAddress", externalIpAddress) .add("internalIpAddress", internalIpAddress).toString(); http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatOneToOneVmRule.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatOneToOneVmRule.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatOneToOneVmRule.java index 562ba1c..74b9d6a 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatOneToOneVmRule.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatOneToOneVmRule.java @@ -21,9 +21,9 @@ import static com.google.common.base.Objects.equal; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; - /** * Represents the NAT rule for one to one mapping of VM NIC and * external IP addresses from a network. @@ -196,7 +196,7 @@ public class NatOneToOneVmRule { @Override public String toString() { - return Objects.toStringHelper("") + return MoreObjects.toStringHelper("") .add("mappingMode", mappingMode) .add("externalIpAddress", externalIpAddress) .add("vAppScopedVmId", vAppScopedVmId) http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatPortForwardingRule.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatPortForwardingRule.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatPortForwardingRule.java index bf0b08d..fc16d8e 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatPortForwardingRule.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatPortForwardingRule.java @@ -21,9 +21,9 @@ import static com.google.common.base.Objects.equal; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; - /** * Represents the NAT rule for port forwarding between internal * IP/port and external IP/port. @@ -220,7 +220,7 @@ public class NatPortForwardingRule { @Override public String toString() { - return Objects.toStringHelper("") + return MoreObjects.toStringHelper("") .add("externalIpAddress", externalIpAddress) .add("externalPort", externalPort) .add("internalIpAddress", internalIpAddress) http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatRule.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatRule.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatRule.java index 00d4940..3587459 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatRule.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatRule.java @@ -21,9 +21,9 @@ import static com.google.common.base.Objects.equal; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; - /** * Represents a NAT rule. * <p/> @@ -228,7 +228,7 @@ public class NatRule { @Override public String toString() { - return Objects.toStringHelper("") + return MoreObjects.toStringHelper("") .add("description", description) .add("oneToOneBasicRule", oneToOneBasicRule) .add("oneToOneVmRule", oneToOneVmRule) http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatService.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatService.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatService.java index 3a761d7..a436ec8 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatService.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatService.java @@ -26,6 +26,7 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; @@ -169,7 +170,7 @@ public class NatService extends NetworkServiceType<NatService> { } @Override - protected Objects.ToStringHelper string() { + protected MoreObjects.ToStringHelper string() { return super.string().add("natType", natType).add("natRules", natRules).add("policy", policy); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatVmRule.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatVmRule.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatVmRule.java index 5203de4..432cdd7 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatVmRule.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatVmRule.java @@ -21,9 +21,9 @@ import static com.google.common.base.Objects.equal; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; - /** * Represents the NAT rule for port forwarding between VM NIC/port * and external IP/port. @@ -247,7 +247,7 @@ public class NatVmRule { @Override public String toString() { - return Objects.toStringHelper("") + return MoreObjects.toStringHelper("") .add("externalIpAddress", externalIpAddress) .add("externalPort", externalPort) .add("vAppScopedVmId", vAppScopedVmId) http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/Network.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/Network.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/Network.java index c703618..bc684e8 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/Network.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/Network.java @@ -33,7 +33,7 @@ import org.jclouds.vcloud.director.v1_5.domain.org.OrgNetwork; import com.google.common.base.Function; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkAssignment.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkAssignment.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkAssignment.java index 1ad30df..9f95bfc 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkAssignment.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkAssignment.java @@ -21,9 +21,9 @@ import static com.google.common.base.Objects.equal; import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlType; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; - /** * Represents mapping between a VM and vApp network. * <p/> @@ -142,7 +142,7 @@ public class NetworkAssignment @Override public String toString() { - return Objects.toStringHelper("") + return MoreObjects.toStringHelper("") .add("innerNetwork", innerNetwork) .add("containerNetwork", containerNetwork).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkConfiguration.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkConfiguration.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkConfiguration.java index 6c881cc..f58110a 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkConfiguration.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkConfiguration.java @@ -26,6 +26,7 @@ import javax.xml.bind.annotation.XmlType; import org.jclouds.vcloud.director.v1_5.domain.Reference; import org.jclouds.vcloud.director.v1_5.domain.network.Network.FenceMode; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -230,7 +231,7 @@ public class NetworkConfiguration { @Override public String toString() { - return Objects.toStringHelper("").add("ipScope", ipScope).add("parentNetwork", parentNetwork) + return MoreObjects.toStringHelper("").add("ipScope", ipScope).add("parentNetwork", parentNetwork) .add("fenceMode", fenceMode) .add("retainNetInfoAcrossDeployments", retainNetInfoAcrossDeployments) .add("features", features) http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkConnection.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkConnection.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkConnection.java index cf18542..1237617 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkConnection.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkConnection.java @@ -29,6 +29,7 @@ import javax.xml.bind.annotation.XmlEnumValue; import javax.xml.bind.annotation.XmlType; import com.google.common.base.Function; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; @@ -351,7 +352,7 @@ public class NetworkConnection { @Override public String toString() { - return Objects.toStringHelper("") + return MoreObjects.toStringHelper("") .add("networkConnectionIndex", networkConnectionIndex) .add("ipAddress", ipAddress) .add("externalIpAddress", externalIpAddress) http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkFeatures.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkFeatures.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkFeatures.java index 3b5d172..40fcb3e 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkFeatures.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkFeatures.java @@ -25,6 +25,7 @@ import java.util.Set; import javax.xml.bind.annotation.XmlElementRef; import javax.xml.bind.annotation.XmlRootElement; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; @@ -108,6 +109,6 @@ public class NetworkFeatures { @Override public String toString() { - return Objects.toStringHelper("").add("services", services).toString(); + return MoreObjects.toStringHelper("").add("services", services).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkServiceType.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkServiceType.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkServiceType.java index 9e00e73..e661e31 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkServiceType.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkServiceType.java @@ -21,6 +21,7 @@ import static com.google.common.base.Objects.equal; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlSeeAlso; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -93,7 +94,7 @@ public abstract class NetworkServiceType<T extends NetworkServiceType<T>> { return string().toString(); } - protected Objects.ToStringHelper string() { - return Objects.toStringHelper("").add("isEnabled", isEnabled); + protected MoreObjects.ToStringHelper string() { + return MoreObjects.toStringHelper("").add("isEnabled", isEnabled); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/RouterInfo.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/RouterInfo.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/RouterInfo.java index 2a16012..a50d4cf 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/RouterInfo.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/RouterInfo.java @@ -21,6 +21,7 @@ import static com.google.common.base.Objects.equal; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -93,7 +94,7 @@ public class RouterInfo { @Override public String toString() { - return Objects.toStringHelper("").add("externalIp", externalIp).toString(); + return MoreObjects.toStringHelper("").add("externalIp", externalIp).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/SmtpServerSettings.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/SmtpServerSettings.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/SmtpServerSettings.java index b4fa38e..f366159 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/SmtpServerSettings.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/SmtpServerSettings.java @@ -21,8 +21,9 @@ import static com.google.common.base.Objects.equal; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; +import com.google.common.base.MoreObjects; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; /** * Specifies connection details for the organization s SMTP server. @@ -205,7 +206,7 @@ public class SmtpServerSettings { } public ToStringHelper string() { - return Objects.toStringHelper("") + return MoreObjects.toStringHelper("") .add("isUseAuthentication", useAuthentication) .add("host", host) .add("username", username) http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/StaticRoute.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/StaticRoute.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/StaticRoute.java index d747eea..6fecd6e 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/StaticRoute.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/StaticRoute.java @@ -22,6 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -193,7 +194,7 @@ public class StaticRoute { @Override public String toString() { - return Objects.toStringHelper("") + return MoreObjects.toStringHelper("") .add("name", name) .add("network", network) .add("nextHopIp", nextHopIp) http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/StaticRoutingService.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/StaticRoutingService.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/StaticRoutingService.java index cec53c0..346d43d 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/StaticRoutingService.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/StaticRoutingService.java @@ -26,6 +26,7 @@ import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; import javax.xml.bind.annotation.XmlType; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableList; import com.google.common.collect.Lists; @@ -139,7 +140,7 @@ public class StaticRoutingService extends NetworkServiceType<StaticRoutingServic @Override public String toString() { - return Objects.toStringHelper("") + return MoreObjects.toStringHelper("") .add("staticRoutes", staticRoutes).toString(); } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/SyslogServerSettings.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/SyslogServerSettings.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/SyslogServerSettings.java index c437938..eefad12 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/SyslogServerSettings.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/SyslogServerSettings.java @@ -21,6 +21,7 @@ import static com.google.common.base.Objects.equal; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; /** @@ -111,7 +112,7 @@ public class SyslogServerSettings { @Override public String toString() { - return Objects.toStringHelper("").add("syslogServerIp1", syslogServerIp1) + return MoreObjects.toStringHelper("").add("syslogServerIp1", syslogServerIp1) .add("syslogServerIp1", syslogServerIp2).toString(); } } http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/VAppNetwork.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/VAppNetwork.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/VAppNetwork.java index b34bfdf..371f286 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/VAppNetwork.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/VAppNetwork.java @@ -22,7 +22,7 @@ import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlType; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Represents a vApp network. http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/VAppNetworkConfiguration.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/VAppNetworkConfiguration.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/VAppNetworkConfiguration.java index 73e5867..5136573 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/VAppNetworkConfiguration.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/VAppNetworkConfiguration.java @@ -25,8 +25,9 @@ import javax.xml.bind.annotation.XmlType; import org.jclouds.vcloud.director.v1_5.domain.Resource; +import com.google.common.base.MoreObjects; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; /** * Represents a VApp network configuration. @@ -174,7 +175,7 @@ public class VAppNetworkConfiguration extends Resource { @Override public ToStringHelper string() { - return Objects.toStringHelper("") + return MoreObjects.toStringHelper("") .add("description", description) .add("configuration", configuration) .add("deployed", deployed) http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/AdminOrg.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/AdminOrg.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/AdminOrg.java index 4c2dd0d..008c1ef 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/AdminOrg.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/AdminOrg.java @@ -29,7 +29,7 @@ import javax.xml.bind.annotation.XmlType; import org.jclouds.vcloud.director.v1_5.domain.Reference; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Sets; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/CustomOrgLdapSettings.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/CustomOrgLdapSettings.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/CustomOrgLdapSettings.java index 6426359..7ea1357 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/CustomOrgLdapSettings.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/CustomOrgLdapSettings.java @@ -28,8 +28,9 @@ import javax.xml.bind.annotation.XmlEnumValue; import javax.xml.bind.annotation.XmlType; import com.google.common.base.Function; +import com.google.common.base.MoreObjects; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; @@ -582,7 +583,7 @@ public class CustomOrgLdapSettings { } protected ToStringHelper string() { - return Objects.toStringHelper("") + return MoreObjects.toStringHelper("") .add("hostName", hostName) .add("port", port) .add("isSsl", isSsl) http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/Org.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/Org.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/Org.java index 0abf926..9cd7323 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/Org.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/Org.java @@ -26,7 +26,7 @@ import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType; import org.jclouds.vcloud.director.v1_5.domain.Entity; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Represents an organization. http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgEmailSettings.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgEmailSettings.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgEmailSettings.java index 6345a88..275edf2 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgEmailSettings.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgEmailSettings.java @@ -29,7 +29,7 @@ import org.jclouds.vcloud.director.v1_5.domain.Resource; import org.jclouds.vcloud.director.v1_5.domain.network.SmtpServerSettings; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableList; /** http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgGeneralSettings.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgGeneralSettings.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgGeneralSettings.java index b5556ea..0838796 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgGeneralSettings.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgGeneralSettings.java @@ -25,7 +25,7 @@ import javax.xml.bind.annotation.XmlType; import org.jclouds.vcloud.director.v1_5.domain.Resource; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Defines general org settings. http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapGroupAttributes.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapGroupAttributes.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapGroupAttributes.java index e352327..038a721 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapGroupAttributes.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapGroupAttributes.java @@ -21,8 +21,9 @@ import static com.google.common.base.Objects.equal; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; +import com.google.common.base.MoreObjects; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; /** * Defines how a group is imported from LDAP. @@ -267,7 +268,7 @@ public class OrgLdapGroupAttributes { } public ToStringHelper string() { - return Objects.toStringHelper("") + return MoreObjects.toStringHelper("") .add("objectClass", objectClass) .add("objectIdentifier", objectIdentifier) .add("groupName", groupName) http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapSettings.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapSettings.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapSettings.java index a994658..a32d2e9 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapSettings.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapSettings.java @@ -32,7 +32,7 @@ import org.jclouds.vcloud.director.v1_5.domain.Resource; import com.google.common.base.Function; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapUserAttributes.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapUserAttributes.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapUserAttributes.java index 783488e..6aef611 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapUserAttributes.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapUserAttributes.java @@ -21,8 +21,9 @@ import static com.google.common.base.Objects.equal; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlType; +import com.google.common.base.MoreObjects; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; /** * Defines how LDAP attributes are used when importing a user. @@ -384,7 +385,7 @@ public class OrgLdapUserAttributes { } public ToStringHelper string() { - return Objects.toStringHelper("") + return MoreObjects.toStringHelper("") .add("objectClass", objectClass) .add("objectIdentifier", objectIdentifier) .add("userName", userName) http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLeaseSettings.java ---------------------------------------------------------------------- diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLeaseSettings.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLeaseSettings.java index 4fcfa11..1f9ba9b 100644 --- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLeaseSettings.java +++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLeaseSettings.java @@ -25,7 +25,7 @@ import javax.xml.bind.annotation.XmlType; import org.jclouds.vcloud.director.v1_5.domain.Resource; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Defines default lease durations and policies for an organization.
