You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ad...@apache.org on 2014/10/24 20:46:50 UTC
[2/3] Revert "JCLOUDS-653: Address Guava 18 deprecations"
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AccessSetting.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AccessSetting.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AccessSetting.java
index 4f20593..bdb19b4 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AccessSetting.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AccessSetting.java
@@ -22,7 +22,6 @@ 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;
/**
@@ -116,6 +115,6 @@ public class AccessSetting {
@Override
public String toString() {
- return MoreObjects.toStringHelper("").add("subject", subject).add("accessLevel", accessLevel).toString();
+ return Objects.toStringHelper("").add("subject", subject).add("accessLevel", accessLevel).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AdminVdc.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AdminVdc.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AdminVdc.java
index 0b15d55..a317d64 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AdminVdc.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AdminVdc.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.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Provides an administrative view of a vDC. Includes all members
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Capabilities.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Capabilities.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Capabilities.java
index 301e6ec..543c4d0 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Capabilities.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Capabilities.java
@@ -25,7 +25,6 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementWrapper;
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;
@@ -114,7 +113,7 @@ public class Capabilities {
@Override
public String toString() {
- return MoreObjects.toStringHelper("")
+ return Objects.toStringHelper("")
.add("supportedHardwareVersions", supportedHardwareVersions).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Capacity.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Capacity.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Capacity.java
index 907b797..b466f7b 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Capacity.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Capacity.java
@@ -22,9 +22,9 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.bind.annotation.XmlType;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
+
/**
* Represents a capacity of a given resource.
*/
@@ -154,7 +154,7 @@ public class Capacity<T extends Capacity<T>> {
@Override
public String toString() {
- return MoreObjects.toStringHelper("")
+ return Objects.toStringHelper("")
.add("units", units)
.add("allocated", allocated)
.add("limit", limit).toString();
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 0f8df74..ea29b1d 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.
*/
@@ -164,7 +164,7 @@ public class CapacityWithUsage extends Capacity<CapacityWithUsage> {
@Override
public String toString() {
- return MoreObjects.toStringHelper("")
+ return Objects.toStringHelper("")
.add("used", used)
.add("overhead", overhead).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 c696435..d5c2ab9 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.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 fcb273c..9b85e77 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,7 +21,6 @@ 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;
@@ -126,7 +125,7 @@ public class ComputeCapacity {
@Override
public String toString() {
- return MoreObjects.toStringHelper("")
+ return Objects.toStringHelper("")
.add("cpu", cpu)
.add("memory", memory).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 82cfd97..956dcb2 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.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 c0f077f..13722ef 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,7 +31,6 @@ 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;
@@ -244,7 +243,7 @@ public class Error {
@Override
public String toString() {
- return MoreObjects.toStringHelper("")
+ return Objects.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/53d85b62/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 10d3685..1dbb52a 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.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
/**
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 0d8508a..ac86bc1 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
@@ -29,8 +29,8 @@ import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
import com.google.common.base.Function;
-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;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 0d6ba0e..9d72e4d 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.MoreObjects.ToStringHelper;
+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;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 7860c64..3185b76 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.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.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/53d85b62/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 945974c..11cef70 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.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.Sets;
//TODO: this is a ridiculously complicated way of representing Map<String, String>
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 b826cb3..0035046 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.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Represents the owner of an entity.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 e301c05..8cb0aa4 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.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 376a81d..7837ffc 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.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.Sets;
@XmlRootElement(name = "RasdItemsList")
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 906e8d5..7322b60 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,9 +28,8 @@ 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.
@@ -193,7 +192,7 @@ public class Reference {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper("").add("href", href).add("name", name).add("type", type);
+ return Objects.toStringHelper("").add("href", href).add("name", name).add("type", type);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 cf34731..b5b52e6 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.Container;
import com.google.common.base.Objects;
-import com.google.common.base.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.Sets;
@XmlRootElement(name = "References")
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 32c3f10..bc2c373 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,9 +30,8 @@ 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;
@@ -195,6 +194,6 @@ public class Resource {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper("").add("href", href).add("links", links).add("type", type);
+ return Objects.toStringHelper("").add("href", href).add("links", links).add("type", type);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 bf9614a..415e6df 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.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.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/53d85b62/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 6f46aca..e720894 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,7 +22,6 @@ 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;
/**
@@ -102,6 +101,6 @@ public class ScreenTicket {
@Override
public String toString() {
- return MoreObjects.toStringHelper("").add("value", value).toString();
+ return Objects.toStringHelper("").add("value", value).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 8b68d58..dbc8d9d 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,7 +29,6 @@ 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;
@@ -169,7 +168,7 @@ public class Session {
@Override
public String toString() {
- return MoreObjects.toStringHelper("").add("user", user).add("org", org).add("href", href).add("links", links)
+ return Objects.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/53d85b62/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 cb142fc..1276c71 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,7 +18,6 @@ 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;
public class SessionWithToken {
@@ -113,6 +112,6 @@ public class SessionWithToken {
@Override
public String toString() {
- return MoreObjects.toStringHelper("").add("session", session).add("token", token).toString();
+ return Objects.toStringHelper("").add("session", session).add("token", token).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 0e1afba..61ae8ff 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
@@ -33,8 +33,8 @@ import javax.xml.bind.annotation.XmlType;
import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
import com.google.common.base.Function;
-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;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 aa593cb..034ba0d 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.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 e84204c..67f7084 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,7 +26,6 @@ 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;
@@ -569,7 +568,7 @@ public class User extends Entity {
@Override
public String toString() {
- return MoreObjects.toStringHelper("")
+ return Objects.toStringHelper("")
.add("fullName", fullName)
.add("emailAddress", emailAddress)
.add("telephone", telephone)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 11b0036..46ebdbd 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.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
/**
* A vApp can be in one of these states:
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 4c377bd..ec6f2a7 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,7 +24,6 @@ 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;
@@ -133,6 +132,6 @@ public class VAppChildren {
@Override
public String toString() {
- return MoreObjects.toStringHelper("").add("vApps", vApps).add("vms", vms).toString();
+ return Objects.toStringHelper("").add("vApps", vApps).add("vms", vms).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 ec45f49..9e786d1 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,7 +43,6 @@ 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;
@@ -299,7 +298,7 @@ public class VAppTemplate extends ResourceEntity {
@Override
public String toString() {
- return MoreObjects.toStringHelper(super.toString())
+ return Objects.toStringHelper(super.toString())
.add("owner", owner)
.add("children", children)
.add("sections", sections)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 97f48de..a237c33 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,7 +22,6 @@ 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")
@@ -95,6 +94,6 @@ public class VMWareTools {
@Override
public String toString() {
- return MoreObjects.toStringHelper("").add("version", version).toString();
+ return Objects.toStringHelper("").add("version", version).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 7e64dc9..65b1ff8 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.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 f022f25..db100e4 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.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Represents a virtual machine.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 5b51aaf..109592d 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.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.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/53d85b62/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 149578a..48a8488 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,7 +21,6 @@ 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;
/**
@@ -122,6 +121,6 @@ public class VmQuestionAnswer {
@Override
public String toString() {
- return MoreObjects.toStringHelper("").add("choiceId", choiceId).add("questionId", questionId).toString();
+ return Objects.toStringHelper("").add("choiceId", choiceId).add("questionId", questionId).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 7bd8855..dd95c97 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,7 +21,6 @@ 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;
/**
@@ -122,6 +121,6 @@ public class VmQuestionAnswerChoice {
@Override
public String toString() {
- return MoreObjects.toStringHelper("").add("id", id).add("text", text).toString();
+ return Objects.toStringHelper("").add("id", id).add("text", text).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 b9044a8..5c83ebf 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.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 53ff32a..3c42188 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,7 +29,6 @@ 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;
@@ -138,7 +137,7 @@ public class VirtualSystem extends BaseVirtualSystem {
}
@Override
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return super.string()
.add("operatingSystem", operatingSystem)
.add("virtualHardwareSections", virtualHardwareSections);
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 4f77f78..7314721 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,7 +22,6 @@ 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;
@XmlRootElement(name = "DhcpService")
@@ -141,7 +140,7 @@ public class DhcpService extends NetworkService<DhcpService> {
}
@Override
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.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/53d85b62/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 4034b35..9800a03 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.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
@XmlRootElement(name = "ExternalNetwork")
@XmlType(propOrder = {
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 1accdb5..13b2e7c 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,7 +21,6 @@ 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;
@XmlType(name = "FirewallRule", propOrder = {
@@ -326,7 +325,7 @@ public class FirewallRule {
@Override
public String toString() {
- return MoreObjects.toStringHelper("")
+ return Objects.toStringHelper("")
.add("isEnabled", isEnabled)
.add("description", description)
.add("policy", policy)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 2de53fe..ade1e18 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,7 +21,6 @@ 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;
@XmlType(propOrder = {
@@ -155,7 +154,7 @@ public class FirewallRuleProtocols {
@Override
public String toString() {
- return MoreObjects.toStringHelper("")
+ return Objects.toStringHelper("")
.add("tcp", tcp)
.add("udp", udp)
.add("icmp", icmp)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 8d62747..7a93659 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,7 +26,6 @@ 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;
@@ -168,7 +167,7 @@ public class FirewallService extends NetworkService<FirewallService> {
@Override
public String toString() {
- return MoreObjects.toStringHelper("")
+ return Objects.toStringHelper("")
.add("defaultAction", defaultAction)
.add("logDefaultAction", logDefaultAction)
.add("firewallRules", firewallRules).toString();
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 e198fa8..3f4bf0e 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,7 +25,6 @@ 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;
@@ -101,6 +100,6 @@ public class IpAddresses {
@Override
public String toString() {
- return MoreObjects.toStringHelper("").add("ipAddresses", ipAddresses).toString();
+ return Objects.toStringHelper("").add("ipAddresses", ipAddresses).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 ed6df30..f51b931 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,7 +21,6 @@ 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;
/**
@@ -113,7 +112,7 @@ public class IpRange {
@Override
public String toString() {
- return MoreObjects.toStringHelper("").add("startAddress", startAddress)
+ return Objects.toStringHelper("").add("startAddress", startAddress)
.add("endAddress", endAddress).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 7ac4f2f..f20f7b8 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,7 +25,6 @@ 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;
@@ -101,6 +100,6 @@ public class IpRanges {
@Override
public String toString() {
- return MoreObjects.toStringHelper("").add("ipRanges", ipRanges).toString();
+ return Objects.toStringHelper("").add("ipRanges", ipRanges).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 e589a44..ac53b38 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,7 +21,6 @@ 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;
/**
@@ -242,7 +241,7 @@ public class IpScope {
@Override
public String toString() {
- return MoreObjects.toStringHelper("").add("isInherited", isInherited)
+ return Objects.toStringHelper("").add("isInherited", isInherited)
.add("gateway", gateway)
.add("netmask", netmask)
.add("dns1", dns1)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnManagedPeer.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnManagedPeer.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnManagedPeer.java
index d55c9db..733fc1a 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnManagedPeer.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnManagedPeer.java
@@ -21,7 +21,6 @@ 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(
@@ -103,7 +102,7 @@ public abstract class IpsecVpnManagedPeer<T extends IpsecVpnManagedPeer<T>> exte
return string().toString();
}
- protected MoreObjects.ToStringHelper string() {
- return MoreObjects.toStringHelper("").add("id", id).add("name", name);
+ protected Objects.ToStringHelper string() {
+ return Objects.toStringHelper("").add("id", id).add("name", name);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 e699443..6642114 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,7 +22,6 @@ 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;
@XmlRootElement(name = "IpsecVpnRemotePeer")
@@ -169,7 +168,7 @@ public class IpsecVpnRemotePeer extends IpsecVpnManagedPeer<IpsecVpnRemotePeer>
}
@Override
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return super.string()
.add("vcdUrl", vcdUrl)
.add("vcdOrganization", vcdOrganization)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 27c9ba7..277ff23 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,7 +26,6 @@ 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;
@@ -170,7 +169,7 @@ public class IpsecVpnService extends NetworkService<IpsecVpnService> {
}
@Override
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return super.string()
.add("externalIpAddress", externalIpAddress)
.add("publicIpAddress", publicIpAddress)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 b919aa9..c30e9f2 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,7 +22,6 @@ 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;
@XmlType(name = "IpsecVpnTunnel", propOrder = {
@@ -349,7 +348,7 @@ public class IpsecVpnTunnel {
@Override
public String toString() {
- return MoreObjects.toStringHelper("")
+ return Objects.toStringHelper("")
.add("name", name)
.add("description", description)
.add("peerIpAddress", peerIpAddress)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 4158d80..bd65b0e 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.
@@ -153,7 +153,7 @@ public class NatOneToOneBasicRule {
@Override
public String toString() {
- return MoreObjects.toStringHelper("")
+ return Objects.toStringHelper("")
.add("mappingMode", mappingMode)
.add("externalIpAddress", externalIpAddress)
.add("internalIpAddress", internalIpAddress).toString();
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 fcae927..f64a361 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.
@@ -175,7 +175,7 @@ public class NatOneToOneVmRule {
@Override
public String toString() {
- return MoreObjects.toStringHelper("")
+ return Objects.toStringHelper("")
.add("mappingMode", mappingMode)
.add("externalIpAddress", externalIpAddress)
.add("vAppScopedVmId", vAppScopedVmId)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 3466b18..11d2fdc 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.
@@ -198,7 +198,7 @@ public class NatPortForwardingRule {
@Override
public String toString() {
- return MoreObjects.toStringHelper("")
+ return Objects.toStringHelper("")
.add("externalIpAddress", externalIpAddress)
.add("externalPort", externalPort)
.add("internalIpAddress", internalIpAddress)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 f6df4b6..489c0b5 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,7 +21,6 @@ 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;
@XmlType(name = "NatRule", propOrder = {
@@ -201,7 +200,7 @@ public class NatRule {
@Override
public String toString() {
- return MoreObjects.toStringHelper("")
+ return Objects.toStringHelper("")
.add("description", description)
.add("oneToOneBasicRule", oneToOneBasicRule)
.add("oneToOneVmRule", oneToOneVmRule)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 17fd287..4deb42d 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,7 +26,6 @@ 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;
@@ -147,7 +146,7 @@ public class NatService extends NetworkService<NatService> {
}
@Override
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.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/53d85b62/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 e2a08b0..823da3f 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.
@@ -224,7 +224,7 @@ public class NatVmRule {
@Override
public String toString() {
- return MoreObjects.toStringHelper("")
+ return Objects.toStringHelper("")
.add("externalIpAddress", externalIpAddress)
.add("externalPort", externalPort)
.add("vAppScopedVmId", vAppScopedVmId)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 bc684e8..c703618 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.MoreObjects.ToStringHelper;
+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;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 c272c28..340e4f1 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.
*/
@@ -125,7 +125,7 @@ public class NetworkAssignment
@Override
public String toString() {
- return MoreObjects.toStringHelper("")
+ return Objects.toStringHelper("")
.add("innerNetwork", innerNetwork)
.add("containerNetwork", containerNetwork).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 a499e3e..9fe80df 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,7 +26,6 @@ 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;
@XmlType(name = "NetworkConfiguration")
@@ -228,7 +227,7 @@ public class NetworkConfiguration {
@Override
public String toString() {
- return MoreObjects.toStringHelper("").add("ipScope", ipScope).add("parentNetwork", parentNetwork)
+ return Objects.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/53d85b62/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 bf24eec..caa22aa 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,7 +29,6 @@ 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;
@@ -329,7 +328,7 @@ public class NetworkConnection {
@Override
public String toString() {
- return MoreObjects.toStringHelper("")
+ return Objects.toStringHelper("")
.add("networkConnectionIndex", networkConnectionIndex)
.add("ipAddress", ipAddress)
.add("externalIpAddress", externalIpAddress)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 9067170..a909576 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,7 +25,6 @@ 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;
@@ -105,6 +104,6 @@ public class NetworkFeatures {
@Override
public String toString() {
- return MoreObjects.toStringHelper("").add("services", services).toString();
+ return Objects.toStringHelper("").add("services", services).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkService.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkService.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkService.java
index dabd9d3..e704d9c 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkService.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkService.java
@@ -21,7 +21,6 @@ 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({
@@ -91,7 +90,7 @@ public abstract class NetworkService<T extends NetworkService<T>> {
return string().toString();
}
- protected MoreObjects.ToStringHelper string() {
- return MoreObjects.toStringHelper("").add("isEnabled", isEnabled);
+ protected Objects.ToStringHelper string() {
+ return Objects.toStringHelper("").add("isEnabled", isEnabled);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 4677064..4a45535 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,7 +21,6 @@ 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;
@XmlRootElement(name = "RouterInfo")
@@ -91,7 +90,7 @@ public class RouterInfo {
@Override
public String toString() {
- return MoreObjects.toStringHelper("").add("externalIp", externalIp).toString();
+ return Objects.toStringHelper("").add("externalIp", externalIp).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 9c29ae5..c21262e 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,9 +21,8 @@ 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.
@@ -190,7 +189,7 @@ public class SmtpServerSettings {
}
public ToStringHelper string() {
- return MoreObjects.toStringHelper("")
+ return Objects.toStringHelper("")
.add("isUseAuthentication", useAuthentication)
.add("host", host)
.add("username", username)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 8172c38..ee14aab 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,7 +22,6 @@ 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;
@XmlType(name = "StaticRoute", propOrder = {
@@ -175,7 +174,7 @@ public class StaticRoute {
@Override
public String toString() {
- return MoreObjects.toStringHelper("")
+ return Objects.toStringHelper("")
.add("name", name)
.add("network", network)
.add("nextHopIp", nextHopIp)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 955e21c..b8ff5f9 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,7 +26,6 @@ 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;
@@ -118,7 +117,7 @@ public class StaticRoutingService extends NetworkService<StaticRoutingService> {
@Override
public String toString() {
- return MoreObjects.toStringHelper("")
+ return Objects.toStringHelper("")
.add("staticRoutes", staticRoutes).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 eefad12..c437938 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,7 +21,6 @@ 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 +111,7 @@ public class SyslogServerSettings {
@Override
public String toString() {
- return MoreObjects.toStringHelper("").add("syslogServerIp1", syslogServerIp1)
+ return Objects.toStringHelper("").add("syslogServerIp1", syslogServerIp1)
.add("syslogServerIp1", syslogServerIp2).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 cc9d083..377fc6f 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.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
@XmlType(name = "VAppNetwork")
public class VAppNetwork extends Network {
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 3f89a58..30744ef 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,9 +25,8 @@ 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;
@XmlRootElement(name = "NetworkConfiguration")
@XmlType(name = "VAppNetworkConfiguration")
@@ -168,7 +167,7 @@ public class VAppNetworkConfiguration extends Resource {
@Override
public ToStringHelper string() {
- return MoreObjects.toStringHelper("")
+ return Objects.toStringHelper("")
.add("description", description)
.add("configuration", configuration)
.add("deployed", deployed)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 bc48c59..3a6f397 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.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 ba19768..39fff36 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,9 +28,8 @@ 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;
@@ -557,7 +556,7 @@ public class CustomOrgLdapSettings {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper("")
+ return Objects.toStringHelper("")
.add("hostName", hostName)
.add("port", port)
.add("isSsl", isSsl)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 f2238f2..2932495 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.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Represents an organization.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 96aa5ee..d310a63 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.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableList;
@XmlRootElement(name = "OrgEmailSettings")
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/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 ebf2ced..fc04897 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.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
@XmlRootElement(name = "GeneralOrgSettings")
@XmlType(propOrder = {