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:49 UTC
[1/3] Revert "JCLOUDS-653: Address Guava 18 deprecations"
Repository: jclouds-labs
Updated Branches:
refs/heads/master 5d23c2be0 -> 53d85b62a
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/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 f275976..f0ba634 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,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;
/**
* Defines how a group is imported from LDAP.
@@ -250,7 +249,7 @@ public class OrgLdapGroupAttributes {
}
public ToStringHelper string() {
- return MoreObjects.toStringHelper("")
+ return Objects.toStringHelper("")
.add("objectClass", objectClass)
.add("objectIdentifier", objectIdentifier)
.add("groupName", groupName)
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/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 a32d2e9..a994658 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.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/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 462215f..cba4df5 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,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;
/**
* Defines how LDAP attributes are used when importing a user.
@@ -363,7 +362,7 @@ public class OrgLdapUserAttributes {
}
public ToStringHelper string() {
- return MoreObjects.toStringHelper("")
+ return Objects.toStringHelper("")
.add("objectClass", objectClass)
.add("objectIdentifier", objectIdentifier)
.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/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 c86cc26..9e14d02 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.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Defines default lease durations and policies for 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/OrgNetwork.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgNetwork.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgNetwork.java
index 3fe0283..77aa8bf 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgNetwork.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgNetwork.java
@@ -26,7 +26,7 @@ import org.jclouds.vcloud.director.v1_5.domain.network.IpAddresses;
import org.jclouds.vcloud.director.v1_5.domain.network.Network;
import com.google.common.base.Objects;
-import com.google.common.base.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
@XmlRootElement(name = "OrgNetwork")
public class OrgNetwork 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/org/OrgPasswordPolicySettings.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgPasswordPolicySettings.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgPasswordPolicySettings.java
index 0415eb5..78f957b 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgPasswordPolicySettings.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgPasswordPolicySettings.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 = "OrgPasswordPolicySettings")
@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/org/OrgSettings.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgSettings.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgSettings.java
index 9084ae1..dd1a7e1 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgSettings.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgSettings.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;
/**
* Describes various settings for some organization.
* This type establishes quotas and policies for the 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/OrgVAppTemplateLeaseSettings.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgVAppTemplateLeaseSettings.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgVAppTemplateLeaseSettings.java
index 730ddb2..b60b5f5 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgVAppTemplateLeaseSettings.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgVAppTemplateLeaseSettings.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;
/**
* Expiration and storage policy for vApp templates in 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/params/CaptureVAppParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/CaptureVAppParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/CaptureVAppParams.java
index 93e515d..603b5d4 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/CaptureVAppParams.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/CaptureVAppParams.java
@@ -44,7 +44,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;
@@ -213,7 +212,7 @@ public class CaptureVAppParams extends ParamsType {
@Override
public String toString() {
- return MoreObjects.toStringHelper("")
+ return Objects.toStringHelper("")
.add("source", source)
.add("sections", sections).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/params/CloneMediaParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/CloneMediaParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/CloneMediaParams.java
index df6c9b1..1baa54a 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/CloneMediaParams.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/CloneMediaParams.java
@@ -24,9 +24,9 @@ import javax.xml.bind.annotation.XmlType;
import org.jclouds.vcloud.director.v1_5.domain.Reference;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
+
/**
* Represents parameters for copying a media resource and optionally
* deleting the source.
@@ -137,7 +137,7 @@ public class CloneMediaParams extends ParamsType {
@Override
public String toString() {
- return MoreObjects.toStringHelper("")
+ return Objects.toStringHelper("")
.add("source", source)
.add("isSourceDelete", isSourceDelete).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/params/CloneVAppTemplateParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/CloneVAppTemplateParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/CloneVAppTemplateParams.java
index 9effc1d..8912fb5 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/CloneVAppTemplateParams.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/CloneVAppTemplateParams.java
@@ -27,7 +27,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;
/**
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/ComposeVAppParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/ComposeVAppParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/ComposeVAppParams.java
index 60a8681..f201974 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/ComposeVAppParams.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/ComposeVAppParams.java
@@ -26,8 +26,8 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-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.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/params/ControlAccessParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/ControlAccessParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/ControlAccessParams.java
index c12357a..7e109f1 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/ControlAccessParams.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/ControlAccessParams.java
@@ -29,7 +29,6 @@ import javax.xml.bind.annotation.XmlType;
import org.jclouds.vcloud.director.v1_5.domain.AccessSetting;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Iterables;
@@ -179,6 +178,6 @@ public class ControlAccessParams {
@Override
public String toString() {
- return MoreObjects.toStringHelper("").add("sharedToEveryone", sharedToEveryone).add("everyoneAccessLevel", everyoneAccessLevel).add("accessSettings", accessSettings).toString();
+ return Objects.toStringHelper("").add("sharedToEveryone", sharedToEveryone).add("everyoneAccessLevel", everyoneAccessLevel).add("accessSettings", accessSettings).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/params/DeployVAppParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/DeployVAppParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/DeployVAppParams.java
index 2d0a63f..b50c930 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/DeployVAppParams.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/DeployVAppParams.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;
/**
@@ -175,7 +174,7 @@ public class DeployVAppParams {
@Override
public String toString() {
- return MoreObjects.toStringHelper("").add("powerOn", powerOn).add("deploymentLeaseSeconds", deploymentLeaseSeconds).add("forceCustomization", forceCustomization).toString();
+ return Objects.toStringHelper("").add("powerOn", powerOn).add("deploymentLeaseSeconds", deploymentLeaseSeconds).add("forceCustomization", forceCustomization).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/params/InstantiateVAppParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiateVAppParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiateVAppParams.java
index 78b9ad2..b0b52d7 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiateVAppParams.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiateVAppParams.java
@@ -29,7 +29,7 @@ import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
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;
@XmlRootElement(name = "InstantiateVAppParams")
@XmlType(name = "InstantiateVAppParamsType")
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiateVAppTemplateParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiateVAppTemplateParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiateVAppTemplateParams.java
index 9813b2f..b67a5f1 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiateVAppTemplateParams.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiateVAppTemplateParams.java
@@ -22,7 +22,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;
@XmlRootElement(name = "InstantiateVAppTemplateParams")
public class InstantiateVAppTemplateParams extends InstantiateVAppParams {
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiationParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiationParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiationParams.java
index 950c197..913cc9a 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiationParams.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiationParams.java
@@ -41,7 +41,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;
@@ -161,7 +160,7 @@ public class InstantiationParams {
@Override
public String toString() {
- return MoreObjects.toStringHelper("").add("sections", sections).toString();
+ return Objects.toStringHelper("").add("sections", sections).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/params/MediaInsertOrEjectParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/MediaInsertOrEjectParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/MediaInsertOrEjectParams.java
index 49a7a92..cd1e7d4 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/MediaInsertOrEjectParams.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/MediaInsertOrEjectParams.java
@@ -24,7 +24,6 @@ import javax.xml.bind.annotation.XmlType;
import org.jclouds.vcloud.director.v1_5.domain.Reference;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
@XmlRootElement(name = "MediaInsertOrEjectParams")
@@ -96,6 +95,6 @@ public class MediaInsertOrEjectParams {
@Override
public String toString() {
- return MoreObjects.toStringHelper("").add("media", media).toString();
+ return Objects.toStringHelper("").add("media", media).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/params/ParamsType.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/ParamsType.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/ParamsType.java
index adfab4f..50d9d32 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/ParamsType.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/ParamsType.java
@@ -22,9 +22,8 @@ import javax.xml.bind.annotation.XmlAttribute;
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;
/**
* A basic type used to specify parameters for operations.
@@ -129,6 +128,6 @@ public class ParamsType {
}
public ToStringHelper string() {
- return MoreObjects.toStringHelper("").add("description", description).add("name", name);
+ return Objects.toStringHelper("").add("description", description).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/params/PublishCatalogParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/PublishCatalogParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/PublishCatalogParams.java
index b0fae85..e6da358 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/PublishCatalogParams.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/PublishCatalogParams.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 = "PublishCatalogParams")
@@ -98,7 +97,7 @@ public class PublishCatalogParams {
@Override
public String toString() {
- return MoreObjects.toStringHelper("")
+ return Objects.toStringHelper("")
.add("isPublished", isPublished).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/params/RecomposeVAppParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/RecomposeVAppParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/RecomposeVAppParams.java
index aa8bc4d..f42a385 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/RecomposeVAppParams.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/RecomposeVAppParams.java
@@ -28,7 +28,7 @@ import org.jclouds.vcloud.director.v1_5.domain.Reference;
import org.jclouds.vcloud.director.v1_5.domain.Vm;
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.Lists;
@XmlRootElement(name = "RecomposeVAppParams")
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/RelocateParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/RelocateParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/RelocateParams.java
index 343d3a0..19462c4 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/RelocateParams.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/RelocateParams.java
@@ -25,7 +25,6 @@ import javax.xml.bind.annotation.XmlType;
import org.jclouds.vcloud.director.v1_5.domain.Reference;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
@XmlRootElement(name = "RelocateParams")
@@ -88,7 +87,7 @@ public class RelocateParams {
@Override
public String toString() {
- return MoreObjects.toStringHelper("")
+ return Objects.toStringHelper("")
.add("datastore", datastore).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/params/SourcedCompositionItemParam.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/SourcedCompositionItemParam.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/SourcedCompositionItemParam.java
index 186fc2d..f53fedc 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/SourcedCompositionItemParam.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/SourcedCompositionItemParam.java
@@ -29,7 +29,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.NetworkAssignment;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
@@ -207,7 +206,7 @@ public class SourcedCompositionItemParam {
@Override
public String toString() {
- return MoreObjects.toStringHelper("")
+ return Objects.toStringHelper("")
.add("source", source)
.add("vAppScopedLocalId", vAppScopedLocalId)
.add("instantiationParams", instantiationParams)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/UndeployVAppParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/UndeployVAppParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/UndeployVAppParams.java
index 8045d59..e8ddb01 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/UndeployVAppParams.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/UndeployVAppParams.java
@@ -31,7 +31,6 @@ 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;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
@@ -160,7 +159,7 @@ public class UndeployVAppParams {
@Override
public String toString() {
- return MoreObjects.toStringHelper("").add("undeployPowerAction", undeployPowerAction).toString();
+ return Objects.toStringHelper("").add("undeployPowerAction", undeployPowerAction).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/params/UploadVAppTemplateParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/UploadVAppTemplateParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/UploadVAppTemplateParams.java
index 6e4e861..0dd54e7 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/UploadVAppTemplateParams.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/UploadVAppTemplateParams.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 = "UploadVAppTemplateParams")
@@ -129,7 +128,7 @@ public class UploadVAppTemplateParams extends ParamsType {
@Override
public String toString() {
- return MoreObjects.toStringHelper("")
+ return Objects.toStringHelper("")
.add("transferFormat", transferFormat)
.add("manifestRequired", manifestRequired).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/params/VAppCreationParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/VAppCreationParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/VAppCreationParams.java
index 0c8b0ed..221caa4 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/VAppCreationParams.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/VAppCreationParams.java
@@ -25,9 +25,8 @@ import javax.xml.bind.annotation.XmlType;
import org.jclouds.vcloud.director.v1_5.domain.Reference;
-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 = "VAppCreationParams")
@XmlType(name = "VAppCreationParamsType")
@@ -193,7 +192,7 @@ public class VAppCreationParams extends ParamsType {
@Override
public ToStringHelper string() {
- return MoreObjects.toStringHelper("")
+ return Objects.toStringHelper("")
.add("vAppParent", vAppParent)
.add("instantiationParams", instantiationParams)
.add("deploy", deploy)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/Container.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/Container.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/Container.java
index 7519117..67cb49f 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/Container.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/Container.java
@@ -23,7 +23,7 @@ import javax.xml.bind.annotation.XmlAttribute;
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;
/**
* Container for query result 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/query/QueryList.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryList.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryList.java
index 7ab723a..7f7ef92 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryList.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryList.java
@@ -18,7 +18,7 @@ package org.jclouds.vcloud.director.v1_5.domain.query;
import javax.xml.bind.annotation.XmlType;
-import com.google.common.base.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Container for the list of typed queries available to the
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultAdminGroupRecord.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultAdminGroupRecord.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultAdminGroupRecord.java
index ba1315b..67f37d5 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultAdminGroupRecord.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultAdminGroupRecord.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 = "GroupRecord")
@XmlType(name = "QueryResultAdminGroupRecordType")
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultAdminUserRecord.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultAdminUserRecord.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultAdminUserRecord.java
index 5b24511..d17ed0b 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultAdminUserRecord.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultAdminUserRecord.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 = "UserRecord")
@XmlType(name = "QueryResultAdminUserRecordType")
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultAdminVdcRecord.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultAdminVdcRecord.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultAdminVdcRecord.java
index 7a341e6..ab2a0c5 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultAdminVdcRecord.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultAdminVdcRecord.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 = "VdcRecord")
@XmlType(name = "QueryResultAdminVdcRecordType")
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultCatalogRecord.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultCatalogRecord.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultCatalogRecord.java
index 54256e7..1ce5ede 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultCatalogRecord.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultCatalogRecord.java
@@ -27,7 +27,7 @@ import javax.xml.bind.annotation.XmlSchemaType;
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 = "CatalogRecord")
@XmlType(name = "QueryResultCatalogRecordType")
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultDatastoreRecord.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultDatastoreRecord.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultDatastoreRecord.java
index 1b65102..0e136a7 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultDatastoreRecord.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultDatastoreRecord.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 = "DatastoreRecord")
@XmlType(name = "QueryResultDatastoreRecordType")
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultMediaRecord.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultMediaRecord.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultMediaRecord.java
index c759154..d701b0e 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultMediaRecord.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultMediaRecord.java
@@ -23,7 +23,7 @@ import java.util.Date;
import javax.xml.bind.annotation.XmlAttribute;
import com.google.common.base.Objects;
-import com.google.common.base.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
public class QueryResultMediaRecord extends QueryResultRecord {
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultNetworkRecord.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultNetworkRecord.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultNetworkRecord.java
index c17b2c3..9f5684f 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultNetworkRecord.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultNetworkRecord.java
@@ -22,9 +22,8 @@ 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.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
@XmlRootElement(name = "OrgNetworkRecord")
@XmlType(name = "QueryResultNetworkRecordType")
@@ -254,7 +253,7 @@ public class QueryResultNetworkRecord extends QueryResultRecord {
@Override
public ToStringHelper string() {
- return MoreObjects.toStringHelper(this).add("name", name).add("ipScopeId", ipScopeId).add("gateway", gateway).add("netmask", netmask).add("dns1", dns1).add("dns2", dns2).add("dnsSuffix", dnsSuffix).add("isBusy",
+ return Objects.toStringHelper(this).add("name", name).add("ipScopeId", ipScopeId).add("gateway", gateway).add("netmask", netmask).add("dns1", dns1).add("dns2", dns2).add("dnsSuffix", dnsSuffix).add("isBusy",
isBusy);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultRecord.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultRecord.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultRecord.java
index c427d0b..08c21a2 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultRecord.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultRecord.java
@@ -28,9 +28,8 @@ import javax.xml.bind.annotation.XmlSeeAlso;
import org.jclouds.vcloud.director.v1_5.domain.Link;
-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.Sets;
@XmlSeeAlso({
@@ -212,7 +211,7 @@ public class QueryResultRecord {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper("").add("href", href).add("id", id)
+ return Objects.toStringHelper("").add("href", href).add("id", id)
.add("type", type).add("links", links);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultRecords.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultRecords.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultRecords.java
index b405dfa..eb239f0 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultRecords.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultRecords.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.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/query/QueryResultReferences.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultReferences.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultReferences.java
index aefb1f5..893dccd 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultReferences.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultReferences.java
@@ -27,7 +27,7 @@ import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
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/query/QueryResultRightRecord.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultRightRecord.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultRightRecord.java
index cc3d71b..921043e 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultRightRecord.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultRightRecord.java
@@ -21,7 +21,7 @@ import static com.google.common.base.Objects.equal;
import javax.xml.bind.annotation.XmlAttribute;
import com.google.common.base.Objects;
-import com.google.common.base.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
public class QueryResultRightRecord extends QueryResultRecord {
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultRoleRecord.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultRoleRecord.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultRoleRecord.java
index a596728..b833d7a 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultRoleRecord.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultRoleRecord.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 = "RoleRecord")
@XmlType(name = "QueryResultRoleRecordType")
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultStrandedUserRecord.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultStrandedUserRecord.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultStrandedUserRecord.java
index 142efe8..535e65f 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultStrandedUserRecord.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultStrandedUserRecord.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 = "StrandedUserRecord")
@XmlType(name = "QueryResultStrandedUserRecordType")
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultVAppRecord.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultVAppRecord.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultVAppRecord.java
index 4d3768b..22194a1 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultVAppRecord.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultVAppRecord.java
@@ -26,7 +26,7 @@ import javax.xml.bind.annotation.XmlSchemaType;
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 = "VAppRecord")
@XmlType(name = "QueryResultVAppRecordType")
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultVAppTemplateRecord.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultVAppTemplateRecord.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultVAppTemplateRecord.java
index 3ca74f9..0c419fb 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultVAppTemplateRecord.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultVAppTemplateRecord.java
@@ -25,7 +25,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 = "VAppTemplateRecord")
@XmlType(name = "QueryResultVAppTemplateRecordType")
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultVMRecord.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultVMRecord.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultVMRecord.java
index deb6567..3ed3da2 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultVMRecord.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultVMRecord.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 = "VMRecord")
@XmlType(name = "QueryResultVMRecordType")
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/CustomizationSection.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/CustomizationSection.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/CustomizationSection.java
index 20a69fe..355798e 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/CustomizationSection.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/CustomizationSection.java
@@ -31,7 +31,6 @@ import javax.xml.bind.annotation.XmlSchemaType;
import org.jclouds.dmtf.ovf.SectionType;
import org.jclouds.vcloud.director.v1_5.domain.Link;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
@@ -178,7 +177,7 @@ public class CustomizationSection extends SectionType {
}
@Override
- public MoreObjects.ToStringHelper string() {
+ public Objects.ToStringHelper string() {
return super.string()
.add("customizeOnInstantiate", customizeOnInstantiate)
.add("links", links)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/GuestCustomizationSection.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/GuestCustomizationSection.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/GuestCustomizationSection.java
index 626adc4..33d3409 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/GuestCustomizationSection.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/GuestCustomizationSection.java
@@ -32,7 +32,6 @@ import javax.xml.bind.annotation.XmlType;
import org.jclouds.dmtf.ovf.SectionType;
import org.jclouds.vcloud.director.v1_5.domain.Link;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
@@ -530,7 +529,7 @@ public class GuestCustomizationSection extends SectionType {
}
@Override
- public MoreObjects.ToStringHelper string() {
+ public Objects.ToStringHelper string() {
return super.string()
.add("enabled", enabled)
.add("changeSid", changeSid)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/LeaseSettingsSection.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/LeaseSettingsSection.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/LeaseSettingsSection.java
index a7fad4c..af4d335 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/LeaseSettingsSection.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/LeaseSettingsSection.java
@@ -33,7 +33,6 @@ import javax.xml.bind.annotation.XmlType;
import org.jclouds.dmtf.ovf.SectionType;
import org.jclouds.vcloud.director.v1_5.domain.Link;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
@@ -247,7 +246,7 @@ public class LeaseSettingsSection extends SectionType {
}
@Override
- public MoreObjects.ToStringHelper string() {
+ public Objects.ToStringHelper string() {
return super.string()
.add("links", links)
.add("deploymentLeaseInSeconds", deploymentLeaseInSeconds)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/NetworkConfigSection.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/NetworkConfigSection.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/NetworkConfigSection.java
index 3b9527a..2dbce4e 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/NetworkConfigSection.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/NetworkConfigSection.java
@@ -33,7 +33,6 @@ import org.jclouds.dmtf.ovf.SectionType;
import org.jclouds.vcloud.director.v1_5.domain.Link;
import org.jclouds.vcloud.director.v1_5.domain.network.VAppNetworkConfiguration;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
@@ -173,7 +172,7 @@ public class NetworkConfigSection extends SectionType {
}
@Override
- public MoreObjects.ToStringHelper string() {
+ public Objects.ToStringHelper string() {
return super.string().add("links", links).add("networkConfigs", networkConfigs).add("href", href).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/section/NetworkConnectionSection.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/NetworkConnectionSection.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/NetworkConnectionSection.java
index b956820..0ef7e78 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/NetworkConnectionSection.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/NetworkConnectionSection.java
@@ -32,7 +32,6 @@ import org.jclouds.dmtf.ovf.SectionType;
import org.jclouds.vcloud.director.v1_5.domain.Link;
import org.jclouds.vcloud.director.v1_5.domain.network.NetworkConnection;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
@@ -219,7 +218,7 @@ public class NetworkConnectionSection extends SectionType {
}
@Override
- public MoreObjects.ToStringHelper string() {
+ public Objects.ToStringHelper string() {
return super.string().add("primaryNetworkConnectionIndex", primaryNetworkConnectionIndex).add("networkConnection", networkConnections).add("links", links).add("href", href).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/section/OperatingSystemSection.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/OperatingSystemSection.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/OperatingSystemSection.java
index 9889250..e50c6d3 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/OperatingSystemSection.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/OperatingSystemSection.java
@@ -34,7 +34,7 @@ import javax.xml.bind.annotation.XmlType;
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/section/RuntimeInfoSection.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/RuntimeInfoSection.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/RuntimeInfoSection.java
index 9e0f428..f0a2cce 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/RuntimeInfoSection.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/RuntimeInfoSection.java
@@ -29,7 +29,7 @@ import org.jclouds.dmtf.ovf.SectionType;
import org.jclouds.vcloud.director.v1_5.domain.VMWareTools;
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.Lists;
@XmlRootElement(name = "RuntimeInfoSection")
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/VirtualHardwareSection.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/VirtualHardwareSection.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/VirtualHardwareSection.java
index 49168f4..d6a0591 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/VirtualHardwareSection.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/section/VirtualHardwareSection.java
@@ -34,7 +34,7 @@ import javax.xml.bind.annotation.XmlType;
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/predicates/LinkPredicates.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/predicates/LinkPredicates.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/predicates/LinkPredicates.java
index d33a4ea..0eb0024 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/predicates/LinkPredicates.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/predicates/LinkPredicates.java
@@ -46,7 +46,7 @@ public class LinkPredicates {
/** @see #relEquals(String) */
public static Predicate<Link> relEquals(final Link.Rel rel) {
- return LINK_REL_SELECTORS.getUnchecked(checkNotNull(rel, "rel must be defined"));
+ return LINK_REL_SELECTORS.apply(checkNotNull(rel, "rel must be defined"));
}
private static final LoadingCache<Link.Rel, Predicate<Link>> LINK_REL_SELECTORS = CacheBuilder.newBuilder()
@@ -72,7 +72,7 @@ public class LinkPredicates {
* @see ReferenceTypePredicates#nameEquals
*/
public static Predicate<Link> nameEquals(String name) {
- return MEDIA_NAME_SELECTORS.getUnchecked(name);
+ return MEDIA_NAME_SELECTORS.apply(name);
}
private static final LoadingCache<String, Predicate<Link>> MEDIA_NAME_SELECTORS = CacheBuilder.newBuilder()
@@ -88,7 +88,7 @@ public class LinkPredicates {
* @see ReferenceTypePredicates#typeEquals
*/
public static Predicate<Link> typeEquals(String type) {
- return MEDIA_TYPE_SELECTORS.getUnchecked(type);
+ return MEDIA_TYPE_SELECTORS.apply(type);
}
private static final LoadingCache<String, Predicate<Link>> MEDIA_TYPE_SELECTORS = CacheBuilder.newBuilder()
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/internal/BaseVCloudDirectorApiLiveTest.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/internal/BaseVCloudDirectorApiLiveTest.java b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/internal/BaseVCloudDirectorApiLiveTest.java
index 72b064b..e4f0bbe 100644
--- a/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/internal/BaseVCloudDirectorApiLiveTest.java
+++ b/vcloud-director/src/test/java/org/jclouds/vcloud/director/v1_5/internal/BaseVCloudDirectorApiLiveTest.java
@@ -99,7 +99,7 @@ import org.testng.annotations.Listeners;
import org.testng.annotations.Test;
import com.google.common.base.Function;
-import com.google.common.base.MoreObjects;
+import com.google.common.base.Objects;
import com.google.common.base.Optional;
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
@@ -280,7 +280,7 @@ public abstract class BaseVCloudDirectorApiLiveTest extends BaseContextLiveTest<
@Override
public String apply(VAppTemplate input) {
- return MoreObjects.toStringHelper("").omitNullValues().add("name", input.getName()).add("id", input.getId())
+ return Objects.toStringHelper("").omitNullValues().add("name", input.getName()).add("id", input.getId())
.add("owner", input.getOwner()).toString();
}
@@ -320,7 +320,7 @@ public abstract class BaseVCloudDirectorApiLiveTest extends BaseContextLiveTest<
@Override
public String apply(Vm input) {
- return MoreObjects.toStringHelper("").omitNullValues().add("name", input.getName()).add("id", input.getId()).toString();
+ return Objects.toStringHelper("").omitNullValues().add("name", input.getName()).add("id", input.getId()).toString();
}
};
@@ -358,7 +358,7 @@ public abstract class BaseVCloudDirectorApiLiveTest extends BaseContextLiveTest<
@Override
public String apply(Catalog input) {
- return MoreObjects.toStringHelper("").omitNullValues().add("name", input.getName()).add("id", input.getId())
+ return Objects.toStringHelper("").omitNullValues().add("name", input.getName()).add("id", input.getId())
.add("owner", input.getOwner()).add("isPublished", input.isPublished()).toString();
}
@@ -397,7 +397,7 @@ public abstract class BaseVCloudDirectorApiLiveTest extends BaseContextLiveTest<
@Override
public String apply(Network input) {
- return MoreObjects.toStringHelper("").omitNullValues().add("name", input.getName()).add("id", input.getId())
+ return Objects.toStringHelper("").omitNullValues().add("name", input.getName()).add("id", input.getId())
.add("fenceMode", input.getConfiguration().getFenceMode())
.add("taskCount", input.getTasks().size() > 0 ? input.getTasks().size() : null).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/virtualbox/src/main/java/org/jclouds/virtualbox/util/MachineNameOrIdAndNicSlot.java
----------------------------------------------------------------------
diff --git a/virtualbox/src/main/java/org/jclouds/virtualbox/util/MachineNameOrIdAndNicSlot.java b/virtualbox/src/main/java/org/jclouds/virtualbox/util/MachineNameOrIdAndNicSlot.java
index 4071dda..04a6abe 100644
--- a/virtualbox/src/main/java/org/jclouds/virtualbox/util/MachineNameOrIdAndNicSlot.java
+++ b/virtualbox/src/main/java/org/jclouds/virtualbox/util/MachineNameOrIdAndNicSlot.java
@@ -20,7 +20,7 @@ import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
-import com.google.common.base.MoreObjects;
+
import com.google.common.base.Objects;
import com.google.common.base.Splitter;
import com.google.common.base.Strings;
@@ -119,7 +119,7 @@ public final class MachineNameOrIdAndNicSlot {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("machineNameOrId", machineNameOrId)
.add("nicSlot", slot)
.toString();
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/virtualbox/src/test/java/org/jclouds/virtualbox/BaseVirtualBoxClientLiveTest.java
----------------------------------------------------------------------
diff --git a/virtualbox/src/test/java/org/jclouds/virtualbox/BaseVirtualBoxClientLiveTest.java b/virtualbox/src/test/java/org/jclouds/virtualbox/BaseVirtualBoxClientLiveTest.java
index 3f4a27a..362b985 100644
--- a/virtualbox/src/test/java/org/jclouds/virtualbox/BaseVirtualBoxClientLiveTest.java
+++ b/virtualbox/src/test/java/org/jclouds/virtualbox/BaseVirtualBoxClientLiveTest.java
@@ -17,7 +17,7 @@
package org.jclouds.virtualbox;
import static com.google.common.base.Preconditions.checkNotNull;
-import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService;
+import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor;
import static org.jclouds.virtualbox.config.VirtualBoxConstants.VIRTUALBOX_IMAGE_PREFIX;
import java.io.File;
@@ -119,7 +119,7 @@ public class BaseVirtualBoxClientLiveTest extends BaseComputeServiceContextLiveT
@Override
protected Iterable<Module> setupModules() {
return ImmutableSet.<Module> of(getLoggingModule(), credentialStoreModule, getSshModule(), new ExecutorServiceModule(
- newDirectExecutorService(), newDirectExecutorService()));
+ sameThreadExecutor(), sameThreadExecutor()));
}
@Override
[3/3] git commit: Revert "JCLOUDS-653: Address Guava 18 deprecations"
Posted by ad...@apache.org.
Revert "JCLOUDS-653: Address Guava 18 deprecations"
This reverts commit b851f0ac3a6fd23720d67dbfad6954b2153bbc4b.
The above change made the floor guava version of jclouds latest guava. This is disasterous for compatibility.
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/53d85b62
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/53d85b62
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/53d85b62
Branch: refs/heads/master
Commit: 53d85b62a7ad0b48bca0001c3e903d44480b83dc
Parents: 5d23c2b
Author: Adrian Cole <ac...@twitter.com>
Authored: Thu Oct 23 10:32:47 2014 -0700
Committer: Adrian Cole <ad...@apache.org>
Committed: Fri Oct 24 11:44:40 2014 -0700
----------------------------------------------------------------------
.../internal/BaseAzureComputeApiMockTest.java | 4 ++--
.../java/org/jclouds/snia/cdmi/v1/domain/CDMIObject.java | 5 ++---
.../java/org/jclouds/snia/cdmi/v1/domain/Container.java | 2 +-
.../java/org/jclouds/snia/cdmi/v1/domain/DataObject.java | 2 +-
.../compute/options/DigitalOceanTemplateOptions.java | 2 +-
.../digitalocean/internal/BaseDigitalOceanMockTest.java | 6 +++---
.../digitalocean/strategy/ListSshKeysLiveTest.java | 2 +-
.../main/java/org/jclouds/docker/domain/Container.java | 3 +--
.../main/java/org/jclouds/docker/domain/ExposedPorts.java | 3 +--
.../main/java/org/jclouds/docker/domain/HostConfig.java | 3 +--
docker/src/main/java/org/jclouds/docker/domain/Image.java | 3 +--
.../java/org/jclouds/docker/domain/NetworkSettings.java | 3 +--
docker/src/main/java/org/jclouds/docker/domain/Port.java | 3 +--
docker/src/main/java/org/jclouds/docker/domain/State.java | 3 +--
.../src/main/java/org/jclouds/docker/domain/Version.java | 3 +--
.../org/jclouds/docker/internal/BaseDockerMockTest.java | 6 +++---
.../java/org/jclouds/blobstore/representations/Blob.java | 3 +--
.../jclouds/blobstore/representations/BlobMetadata.java | 3 +--
.../blobstore/representations/ContentMetadata.java | 3 +--
.../blobstore/representations/StorageMetadata.java | 3 +--
.../org/jclouds/compute/representations/ExecResponse.java | 3 +--
.../org/jclouds/compute/representations/Hardware.java | 3 +--
.../java/org/jclouds/compute/representations/Image.java | 4 ++--
.../jclouds/compute/representations/LoginCredentials.java | 3 +--
.../org/jclouds/compute/representations/NodeMetadata.java | 3 +--
.../jclouds/compute/representations/OperatingSystem.java | 3 +--
.../org/jclouds/compute/representations/Processor.java | 3 +--
.../java/org/jclouds/compute/representations/Volume.java | 3 +--
.../java/org/jclouds/representations/ApiMetadata.java | 3 +--
.../main/java/org/jclouds/representations/Context.java | 3 +--
.../main/java/org/jclouds/representations/Location.java | 3 +--
.../org/jclouds/representations/ProviderMetadata.java | 3 +--
.../v6_5/compute/options/JoyentCloudTemplateOptions.java | 2 +-
.../org/jclouds/joyent/cloudapi/v6_5/domain/Dataset.java | 3 +--
.../java/org/jclouds/joyent/cloudapi/v6_5/domain/Key.java | 3 +--
.../org/jclouds/joyent/cloudapi/v6_5/domain/Machine.java | 3 +--
.../org/jclouds/joyent/cloudapi/v6_5/domain/Package.java | 3 +--
.../v6_5/domain/datacenterscoped/DatacenterAndName.java | 5 ++---
.../cloudapi/v6_5/options/CreateMachineOptions.java | 5 ++---
.../src/main/java/org/jclouds/dmtf/cim/CimString.java | 3 +--
.../jclouds/dmtf/cim/ResourceAllocationSettingData.java | 5 ++---
.../org/jclouds/dmtf/cim/VirtualSystemSettingData.java | 3 +--
.../src/main/java/org/jclouds/dmtf/ovf/Configuration.java | 5 ++---
.../org/jclouds/dmtf/ovf/DeploymentOptionSection.java | 3 +--
.../src/main/java/org/jclouds/dmtf/ovf/DiskSection.java | 3 +--
.../src/main/java/org/jclouds/dmtf/ovf/Item.java | 3 +--
.../src/main/java/org/jclouds/dmtf/ovf/MsgType.java | 3 +--
.../main/java/org/jclouds/dmtf/ovf/NetworkSection.java | 3 +--
.../java/org/jclouds/dmtf/ovf/OperatingSystemSection.java | 3 +--
.../main/java/org/jclouds/dmtf/ovf/ProductSection.java | 3 +--
.../src/main/java/org/jclouds/dmtf/ovf/Property.java | 3 +--
.../src/main/java/org/jclouds/dmtf/ovf/SectionType.java | 5 ++---
.../main/java/org/jclouds/dmtf/ovf/StartupSection.java | 2 +-
.../java/org/jclouds/dmtf/ovf/VirtualHardwareSection.java | 3 +--
.../jclouds/dmtf/ovf/environment/PlatformSectionType.java | 3 +--
.../jclouds/dmtf/ovf/environment/PropertySectionType.java | 3 +--
.../org/jclouds/dmtf/ovf/environment/SectionType.java | 5 ++---
.../java/org/jclouds/dmtf/ovf/internal/BaseEnvelope.java | 5 ++---
.../org/jclouds/dmtf/ovf/internal/BaseVirtualSystem.java | 3 +--
.../jclouds/vcloud/director/v1_5/domain/AbstractVApp.java | 2 +-
.../vcloud/director/v1_5/domain/AccessSetting.java | 3 +--
.../org/jclouds/vcloud/director/v1_5/domain/AdminVdc.java | 2 +-
.../jclouds/vcloud/director/v1_5/domain/Capabilities.java | 3 +--
.../org/jclouds/vcloud/director/v1_5/domain/Capacity.java | 4 ++--
.../vcloud/director/v1_5/domain/CapacityWithUsage.java | 4 ++--
.../org/jclouds/vcloud/director/v1_5/domain/Catalog.java | 2 +-
.../vcloud/director/v1_5/domain/ComputeCapacity.java | 3 +--
.../org/jclouds/vcloud/director/v1_5/domain/Entity.java | 2 +-
.../org/jclouds/vcloud/director/v1_5/domain/Error.java | 3 +--
.../org/jclouds/vcloud/director/v1_5/domain/File.java | 2 +-
.../org/jclouds/vcloud/director/v1_5/domain/Link.java | 2 +-
.../org/jclouds/vcloud/director/v1_5/domain/Media.java | 2 +-
.../org/jclouds/vcloud/director/v1_5/domain/Metadata.java | 2 +-
.../vcloud/director/v1_5/domain/MetadataEntry.java | 2 +-
.../org/jclouds/vcloud/director/v1_5/domain/Owner.java | 2 +-
.../vcloud/director/v1_5/domain/ProductSectionList.java | 2 +-
.../vcloud/director/v1_5/domain/RasdItemsList.java | 2 +-
.../jclouds/vcloud/director/v1_5/domain/Reference.java | 5 ++---
.../jclouds/vcloud/director/v1_5/domain/References.java | 2 +-
.../org/jclouds/vcloud/director/v1_5/domain/Resource.java | 5 ++---
.../vcloud/director/v1_5/domain/ResourceEntity.java | 2 +-
.../jclouds/vcloud/director/v1_5/domain/ScreenTicket.java | 3 +--
.../org/jclouds/vcloud/director/v1_5/domain/Session.java | 3 +--
.../vcloud/director/v1_5/domain/SessionWithToken.java | 3 +--
.../org/jclouds/vcloud/director/v1_5/domain/Task.java | 2 +-
.../jclouds/vcloud/director/v1_5/domain/TasksList.java | 2 +-
.../org/jclouds/vcloud/director/v1_5/domain/User.java | 3 +--
.../org/jclouds/vcloud/director/v1_5/domain/VApp.java | 2 +-
.../jclouds/vcloud/director/v1_5/domain/VAppChildren.java | 3 +--
.../jclouds/vcloud/director/v1_5/domain/VAppTemplate.java | 3 +--
.../jclouds/vcloud/director/v1_5/domain/VMWareTools.java | 3 +--
.../java/org/jclouds/vcloud/director/v1_5/domain/Vdc.java | 2 +-
.../java/org/jclouds/vcloud/director/v1_5/domain/Vm.java | 2 +-
.../vcloud/director/v1_5/domain/VmPendingQuestion.java | 2 +-
.../vcloud/director/v1_5/domain/VmQuestionAnswer.java | 3 +--
.../director/v1_5/domain/VmQuestionAnswerChoice.java | 3 +--
.../vcloud/director/v1_5/domain/dmtf/RasdItem.java | 2 +-
.../vcloud/director/v1_5/domain/dmtf/VirtualSystem.java | 3 +--
.../vcloud/director/v1_5/domain/network/DhcpService.java | 3 +--
.../director/v1_5/domain/network/ExternalNetwork.java | 2 +-
.../vcloud/director/v1_5/domain/network/FirewallRule.java | 3 +--
.../v1_5/domain/network/FirewallRuleProtocols.java | 3 +--
.../director/v1_5/domain/network/FirewallService.java | 3 +--
.../vcloud/director/v1_5/domain/network/IpAddresses.java | 3 +--
.../vcloud/director/v1_5/domain/network/IpRange.java | 3 +--
.../vcloud/director/v1_5/domain/network/IpRanges.java | 3 +--
.../vcloud/director/v1_5/domain/network/IpScope.java | 3 +--
.../director/v1_5/domain/network/IpsecVpnManagedPeer.java | 5 ++---
.../director/v1_5/domain/network/IpsecVpnRemotePeer.java | 3 +--
.../director/v1_5/domain/network/IpsecVpnService.java | 3 +--
.../director/v1_5/domain/network/IpsecVpnTunnel.java | 3 +--
.../v1_5/domain/network/NatOneToOneBasicRule.java | 4 ++--
.../director/v1_5/domain/network/NatOneToOneVmRule.java | 4 ++--
.../v1_5/domain/network/NatPortForwardingRule.java | 4 ++--
.../vcloud/director/v1_5/domain/network/NatRule.java | 3 +--
.../vcloud/director/v1_5/domain/network/NatService.java | 3 +--
.../vcloud/director/v1_5/domain/network/NatVmRule.java | 4 ++--
.../vcloud/director/v1_5/domain/network/Network.java | 2 +-
.../director/v1_5/domain/network/NetworkAssignment.java | 4 ++--
.../v1_5/domain/network/NetworkConfiguration.java | 3 +--
.../director/v1_5/domain/network/NetworkConnection.java | 3 +--
.../director/v1_5/domain/network/NetworkFeatures.java | 3 +--
.../director/v1_5/domain/network/NetworkService.java | 5 ++---
.../vcloud/director/v1_5/domain/network/RouterInfo.java | 3 +--
.../director/v1_5/domain/network/SmtpServerSettings.java | 5 ++---
.../vcloud/director/v1_5/domain/network/StaticRoute.java | 3 +--
.../v1_5/domain/network/StaticRoutingService.java | 3 +--
.../v1_5/domain/network/SyslogServerSettings.java | 3 +--
.../vcloud/director/v1_5/domain/network/VAppNetwork.java | 2 +-
.../v1_5/domain/network/VAppNetworkConfiguration.java | 5 ++---
.../jclouds/vcloud/director/v1_5/domain/org/AdminOrg.java | 2 +-
.../director/v1_5/domain/org/CustomOrgLdapSettings.java | 5 ++---
.../org/jclouds/vcloud/director/v1_5/domain/org/Org.java | 2 +-
.../vcloud/director/v1_5/domain/org/OrgEmailSettings.java | 2 +-
.../director/v1_5/domain/org/OrgGeneralSettings.java | 2 +-
.../director/v1_5/domain/org/OrgLdapGroupAttributes.java | 5 ++---
.../vcloud/director/v1_5/domain/org/OrgLdapSettings.java | 2 +-
.../director/v1_5/domain/org/OrgLdapUserAttributes.java | 5 ++---
.../vcloud/director/v1_5/domain/org/OrgLeaseSettings.java | 2 +-
.../vcloud/director/v1_5/domain/org/OrgNetwork.java | 2 +-
.../v1_5/domain/org/OrgPasswordPolicySettings.java | 2 +-
.../vcloud/director/v1_5/domain/org/OrgSettings.java | 2 +-
.../v1_5/domain/org/OrgVAppTemplateLeaseSettings.java | 2 +-
.../director/v1_5/domain/params/CaptureVAppParams.java | 3 +--
.../director/v1_5/domain/params/CloneMediaParams.java | 4 ++--
.../v1_5/domain/params/CloneVAppTemplateParams.java | 2 +-
.../director/v1_5/domain/params/ComposeVAppParams.java | 2 +-
.../director/v1_5/domain/params/ControlAccessParams.java | 3 +--
.../director/v1_5/domain/params/DeployVAppParams.java | 3 +--
.../v1_5/domain/params/InstantiateVAppParams.java | 2 +-
.../v1_5/domain/params/InstantiateVAppTemplateParams.java | 2 +-
.../director/v1_5/domain/params/InstantiationParams.java | 3 +--
.../v1_5/domain/params/MediaInsertOrEjectParams.java | 3 +--
.../vcloud/director/v1_5/domain/params/ParamsType.java | 5 ++---
.../director/v1_5/domain/params/PublishCatalogParams.java | 3 +--
.../director/v1_5/domain/params/RecomposeVAppParams.java | 2 +-
.../director/v1_5/domain/params/RelocateParams.java | 3 +--
.../v1_5/domain/params/SourcedCompositionItemParam.java | 3 +--
.../director/v1_5/domain/params/UndeployVAppParams.java | 3 +--
.../v1_5/domain/params/UploadVAppTemplateParams.java | 3 +--
.../director/v1_5/domain/params/VAppCreationParams.java | 5 ++---
.../vcloud/director/v1_5/domain/query/Container.java | 2 +-
.../vcloud/director/v1_5/domain/query/QueryList.java | 2 +-
.../v1_5/domain/query/QueryResultAdminGroupRecord.java | 2 +-
.../v1_5/domain/query/QueryResultAdminUserRecord.java | 2 +-
.../v1_5/domain/query/QueryResultAdminVdcRecord.java | 2 +-
.../v1_5/domain/query/QueryResultCatalogRecord.java | 2 +-
.../v1_5/domain/query/QueryResultDatastoreRecord.java | 2 +-
.../v1_5/domain/query/QueryResultMediaRecord.java | 2 +-
.../v1_5/domain/query/QueryResultNetworkRecord.java | 5 ++---
.../director/v1_5/domain/query/QueryResultRecord.java | 5 ++---
.../director/v1_5/domain/query/QueryResultRecords.java | 2 +-
.../director/v1_5/domain/query/QueryResultReferences.java | 2 +-
.../v1_5/domain/query/QueryResultRightRecord.java | 2 +-
.../director/v1_5/domain/query/QueryResultRoleRecord.java | 2 +-
.../v1_5/domain/query/QueryResultStrandedUserRecord.java | 2 +-
.../director/v1_5/domain/query/QueryResultVAppRecord.java | 2 +-
.../v1_5/domain/query/QueryResultVAppTemplateRecord.java | 2 +-
.../director/v1_5/domain/query/QueryResultVMRecord.java | 2 +-
.../v1_5/domain/section/CustomizationSection.java | 3 +--
.../v1_5/domain/section/GuestCustomizationSection.java | 3 +--
.../v1_5/domain/section/LeaseSettingsSection.java | 3 +--
.../v1_5/domain/section/NetworkConfigSection.java | 3 +--
.../v1_5/domain/section/NetworkConnectionSection.java | 3 +--
.../v1_5/domain/section/OperatingSystemSection.java | 2 +-
.../director/v1_5/domain/section/RuntimeInfoSection.java | 2 +-
.../v1_5/domain/section/VirtualHardwareSection.java | 2 +-
.../vcloud/director/v1_5/predicates/LinkPredicates.java | 6 +++---
.../v1_5/internal/BaseVCloudDirectorApiLiveTest.java | 10 +++++-----
.../virtualbox/util/MachineNameOrIdAndNicSlot.java | 4 ++--
.../jclouds/virtualbox/BaseVirtualBoxClientLiveTest.java | 4 ++--
191 files changed, 234 insertions(+), 345 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/azurecompute/src/test/java/org/jclouds/azurecompute/internal/BaseAzureComputeApiMockTest.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/test/java/org/jclouds/azurecompute/internal/BaseAzureComputeApiMockTest.java b/azurecompute/src/test/java/org/jclouds/azurecompute/internal/BaseAzureComputeApiMockTest.java
index e991331..ddd82a8 100644
--- a/azurecompute/src/test/java/org/jclouds/azurecompute/internal/BaseAzureComputeApiMockTest.java
+++ b/azurecompute/src/test/java/org/jclouds/azurecompute/internal/BaseAzureComputeApiMockTest.java
@@ -17,7 +17,7 @@
package org.jclouds.azurecompute.internal;
import static com.google.common.base.Charsets.UTF_8;
-import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService;
+import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor;
import static org.assertj.core.api.Assertions.assertThat;
import java.io.IOException;
@@ -38,7 +38,7 @@ import com.squareup.okhttp.mockwebserver.RecordedRequest;
public class BaseAzureComputeApiMockTest {
private final Set<Module> modules = ImmutableSet
- .<Module>of(new ExecutorServiceModule(newDirectExecutorService(), newDirectExecutorService()));
+ .<Module>of(new ExecutorServiceModule(sameThreadExecutor()));
protected String provider;
private final String identity;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/CDMIObject.java
----------------------------------------------------------------------
diff --git a/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/CDMIObject.java b/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/CDMIObject.java
index 91ee99f..dffd298 100644
--- a/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/CDMIObject.java
+++ b/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/CDMIObject.java
@@ -25,9 +25,8 @@ import java.util.Map;
import org.jclouds.domain.JsonBall;
import org.jclouds.javax.annotation.Nullable;
-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.ImmutableMap;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
@@ -279,7 +278,7 @@ public class CDMIObject {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper("").add("objectID", objectID).add("objectName", objectName)
+ return Objects.toStringHelper("").add("objectID", objectID).add("objectName", objectName)
.add("objectType", objectType).add("parentURI", parentURI).add("metadata", metadata);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/Container.java
----------------------------------------------------------------------
diff --git a/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/Container.java b/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/Container.java
index 4bce943..d8ccaf0 100644
--- a/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/Container.java
+++ b/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/Container.java
@@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Set;
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;
public class Container extends CDMIObject {
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/DataObject.java
----------------------------------------------------------------------
diff --git a/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/DataObject.java b/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/DataObject.java
index 43f2b51..4314705 100644
--- a/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/DataObject.java
+++ b/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/DataObject.java
@@ -25,7 +25,7 @@ import java.nio.charset.Charset;
import com.google.common.base.Charsets;
import com.google.common.base.Objects;
-import com.google.common.base.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.io.ByteSource;
import com.google.common.io.Files;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/digitalocean/src/main/java/org/jclouds/digitalocean/compute/options/DigitalOceanTemplateOptions.java
----------------------------------------------------------------------
diff --git a/digitalocean/src/main/java/org/jclouds/digitalocean/compute/options/DigitalOceanTemplateOptions.java b/digitalocean/src/main/java/org/jclouds/digitalocean/compute/options/DigitalOceanTemplateOptions.java
index ffaba7d..6aa541c 100644
--- a/digitalocean/src/main/java/org/jclouds/digitalocean/compute/options/DigitalOceanTemplateOptions.java
+++ b/digitalocean/src/main/java/org/jclouds/digitalocean/compute/options/DigitalOceanTemplateOptions.java
@@ -23,8 +23,8 @@ import java.util.Set;
import org.jclouds.compute.options.TemplateOptions;
-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;
/**
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/digitalocean/src/test/java/org/jclouds/digitalocean/internal/BaseDigitalOceanMockTest.java
----------------------------------------------------------------------
diff --git a/digitalocean/src/test/java/org/jclouds/digitalocean/internal/BaseDigitalOceanMockTest.java b/digitalocean/src/test/java/org/jclouds/digitalocean/internal/BaseDigitalOceanMockTest.java
index cc25cdc..02022ae 100644
--- a/digitalocean/src/test/java/org/jclouds/digitalocean/internal/BaseDigitalOceanMockTest.java
+++ b/digitalocean/src/test/java/org/jclouds/digitalocean/internal/BaseDigitalOceanMockTest.java
@@ -16,7 +16,7 @@
*/
package org.jclouds.digitalocean.internal;
-import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService;
+import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor;
import static org.jclouds.digitalocean.http.filters.AuthenticationFilter.CREDENTIAL_PARAM;
import static org.jclouds.digitalocean.http.filters.AuthenticationFilter.IDENTITY_PARAM;
import static org.jclouds.http.utils.Queries.encodeQueryLine;
@@ -48,8 +48,8 @@ import com.squareup.okhttp.mockwebserver.RecordedRequest;
* Base class for all DigitalOcean mock tests.
*/
public class BaseDigitalOceanMockTest {
- private final Set<Module> modules = ImmutableSet.<Module> of(new ExecutorServiceModule(newDirectExecutorService(),
- newDirectExecutorService()));
+ private final Set<Module> modules = ImmutableSet.<Module> of(new ExecutorServiceModule(sameThreadExecutor(),
+ sameThreadExecutor()));
protected String provider;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/digitalocean/src/test/java/org/jclouds/digitalocean/strategy/ListSshKeysLiveTest.java
----------------------------------------------------------------------
diff --git a/digitalocean/src/test/java/org/jclouds/digitalocean/strategy/ListSshKeysLiveTest.java b/digitalocean/src/test/java/org/jclouds/digitalocean/strategy/ListSshKeysLiveTest.java
index 336a166..5969377 100644
--- a/digitalocean/src/test/java/org/jclouds/digitalocean/strategy/ListSshKeysLiveTest.java
+++ b/digitalocean/src/test/java/org/jclouds/digitalocean/strategy/ListSshKeysLiveTest.java
@@ -47,7 +47,7 @@ public class ListSshKeysLiveTest extends BaseDigitalOceanLiveTest {
@Override
protected void initialize() {
super.initialize();
- strategy = new ListSshKeys(api, MoreExecutors.newDirectExecutorService());
+ strategy = new ListSshKeys(api, MoreExecutors.sameThreadExecutor());
}
@BeforeClass
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/docker/src/main/java/org/jclouds/docker/domain/Container.java
----------------------------------------------------------------------
diff --git a/docker/src/main/java/org/jclouds/docker/domain/Container.java b/docker/src/main/java/org/jclouds/docker/domain/Container.java
index 4e7c059..efaf5b5 100644
--- a/docker/src/main/java/org/jclouds/docker/domain/Container.java
+++ b/docker/src/main/java/org/jclouds/docker/domain/Container.java
@@ -16,7 +16,6 @@
*/
package org.jclouds.docker.domain;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
@@ -212,7 +211,7 @@ public class Container {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id)
.add("name", name)
.add("created", created)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/docker/src/main/java/org/jclouds/docker/domain/ExposedPorts.java
----------------------------------------------------------------------
diff --git a/docker/src/main/java/org/jclouds/docker/domain/ExposedPorts.java b/docker/src/main/java/org/jclouds/docker/domain/ExposedPorts.java
index 347ad3a..b7a831a 100644
--- a/docker/src/main/java/org/jclouds/docker/domain/ExposedPorts.java
+++ b/docker/src/main/java/org/jclouds/docker/domain/ExposedPorts.java
@@ -22,7 +22,6 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.gson.annotations.SerializedName;
@@ -66,7 +65,7 @@ public class ExposedPorts {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("portAndProtocol", portAndProtocol)
.add("hostPorts", hostPorts)
.toString();
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/docker/src/main/java/org/jclouds/docker/domain/HostConfig.java
----------------------------------------------------------------------
diff --git a/docker/src/main/java/org/jclouds/docker/domain/HostConfig.java b/docker/src/main/java/org/jclouds/docker/domain/HostConfig.java
index 94155c3..275961f 100644
--- a/docker/src/main/java/org/jclouds/docker/domain/HostConfig.java
+++ b/docker/src/main/java/org/jclouds/docker/domain/HostConfig.java
@@ -23,7 +23,6 @@ import java.util.Map;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
@@ -136,7 +135,7 @@ public class HostConfig {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("containerIDFile", containerIDFile)
.add("binds", binds)
.add("lxcConf", lxcConf)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/docker/src/main/java/org/jclouds/docker/domain/Image.java
----------------------------------------------------------------------
diff --git a/docker/src/main/java/org/jclouds/docker/domain/Image.java b/docker/src/main/java/org/jclouds/docker/domain/Image.java
index 80d6f68..186ece3 100644
--- a/docker/src/main/java/org/jclouds/docker/domain/Image.java
+++ b/docker/src/main/java/org/jclouds/docker/domain/Image.java
@@ -16,7 +16,6 @@
*/
package org.jclouds.docker.domain;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableList;
import com.google.gson.annotations.SerializedName;
@@ -133,7 +132,7 @@ public class Image {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id)
.add("parent", parent)
.add("created", created)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/docker/src/main/java/org/jclouds/docker/domain/NetworkSettings.java
----------------------------------------------------------------------
diff --git a/docker/src/main/java/org/jclouds/docker/domain/NetworkSettings.java b/docker/src/main/java/org/jclouds/docker/domain/NetworkSettings.java
index 0c60719..23f3fbe 100644
--- a/docker/src/main/java/org/jclouds/docker/domain/NetworkSettings.java
+++ b/docker/src/main/java/org/jclouds/docker/domain/NetworkSettings.java
@@ -16,7 +16,6 @@
*/
package org.jclouds.docker.domain;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableMap;
import com.google.gson.annotations.SerializedName;
@@ -100,7 +99,7 @@ public class NetworkSettings {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("ipAddress", ipAddress)
.add("ipPrefixLen", ipPrefixLen)
.add("gateway", gateway)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/docker/src/main/java/org/jclouds/docker/domain/Port.java
----------------------------------------------------------------------
diff --git a/docker/src/main/java/org/jclouds/docker/domain/Port.java b/docker/src/main/java/org/jclouds/docker/domain/Port.java
index 3a43ec5..b49dfa6 100644
--- a/docker/src/main/java/org/jclouds/docker/domain/Port.java
+++ b/docker/src/main/java/org/jclouds/docker/domain/Port.java
@@ -16,7 +16,6 @@
*/
package org.jclouds.docker.domain;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.gson.annotations.SerializedName;
@@ -79,7 +78,7 @@ public class Port {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("privatePort", privatePort)
.add("publicPort", publicPort)
.add("type", type)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/docker/src/main/java/org/jclouds/docker/domain/State.java
----------------------------------------------------------------------
diff --git a/docker/src/main/java/org/jclouds/docker/domain/State.java b/docker/src/main/java/org/jclouds/docker/domain/State.java
index cc665c8..ac1ba85 100644
--- a/docker/src/main/java/org/jclouds/docker/domain/State.java
+++ b/docker/src/main/java/org/jclouds/docker/domain/State.java
@@ -19,7 +19,6 @@ package org.jclouds.docker.domain;
import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.gson.annotations.SerializedName;
@@ -93,7 +92,7 @@ public class State {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("pid", pid)
.add("running", running)
.add("exitCode", exitCode)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/docker/src/main/java/org/jclouds/docker/domain/Version.java
----------------------------------------------------------------------
diff --git a/docker/src/main/java/org/jclouds/docker/domain/Version.java b/docker/src/main/java/org/jclouds/docker/domain/Version.java
index f6dbb49..445a225 100644
--- a/docker/src/main/java/org/jclouds/docker/domain/Version.java
+++ b/docker/src/main/java/org/jclouds/docker/domain/Version.java
@@ -19,7 +19,6 @@ package org.jclouds.docker.domain;
import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.gson.annotations.SerializedName;
@@ -93,7 +92,7 @@ public class Version {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("arch", arch)
.add("gitCommit", gitCommit)
.add("goVersion", goVersion)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/docker/src/test/java/org/jclouds/docker/internal/BaseDockerMockTest.java
----------------------------------------------------------------------
diff --git a/docker/src/test/java/org/jclouds/docker/internal/BaseDockerMockTest.java b/docker/src/test/java/org/jclouds/docker/internal/BaseDockerMockTest.java
index 04020b6..146b2a0 100644
--- a/docker/src/test/java/org/jclouds/docker/internal/BaseDockerMockTest.java
+++ b/docker/src/test/java/org/jclouds/docker/internal/BaseDockerMockTest.java
@@ -16,7 +16,7 @@
*/
package org.jclouds.docker.internal;
-import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService;
+import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor;
import static org.jclouds.http.utils.Queries.encodeQueryLine;
import static org.jclouds.util.Strings2.toStringAndClose;
import static org.testng.Assert.assertEquals;
@@ -45,8 +45,8 @@ import com.squareup.okhttp.mockwebserver.RecordedRequest;
* Base class for all Docker mock tests.
*/
public class BaseDockerMockTest {
- private final Set<Module> modules = ImmutableSet.<Module> of(new ExecutorServiceModule(newDirectExecutorService(),
- newDirectExecutorService()));
+ private final Set<Module> modules = ImmutableSet.<Module> of(new ExecutorServiceModule(sameThreadExecutor(),
+ sameThreadExecutor()));
protected String provider;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/Blob.java
----------------------------------------------------------------------
diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/Blob.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/Blob.java
index df50f55..d916652 100644
--- a/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/Blob.java
+++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/Blob.java
@@ -16,7 +16,6 @@
*/
package org.jclouds.blobstore.representations;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import java.io.Serializable;
@@ -84,7 +83,7 @@ public class Blob implements Serializable {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).add("blobMetadata", blobMetadata).add("allHeaders", allHeaders)
+ return Objects.toStringHelper(this).add("blobMetadata", blobMetadata).add("allHeaders", allHeaders)
.toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/BlobMetadata.java
----------------------------------------------------------------------
diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/BlobMetadata.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/BlobMetadata.java
index 7e65d5e..6e22b8d 100644
--- a/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/BlobMetadata.java
+++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/BlobMetadata.java
@@ -16,7 +16,6 @@
*/
package org.jclouds.blobstore.representations;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableMap;
@@ -221,7 +220,7 @@ public class BlobMetadata implements Serializable {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).add("type", type).add("providerId", providerId).add("name", name)
+ return Objects.toStringHelper(this).add("type", type).add("providerId", providerId).add("name", name)
.add("userMetadata", userMetadata).add("eTag", eTag).add("creationDate", creationDate)
.add("lastModifiedDate", lastModifiedDate).add("publicUri", publicUri).add("contentMetadata", contentMetadata)
.toString();
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/ContentMetadata.java
----------------------------------------------------------------------
diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/ContentMetadata.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/ContentMetadata.java
index 86c695b..c6da5aa 100644
--- a/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/ContentMetadata.java
+++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/ContentMetadata.java
@@ -16,7 +16,6 @@
*/
package org.jclouds.blobstore.representations;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import java.io.Serializable;
@@ -157,7 +156,7 @@ public class ContentMetadata implements Serializable {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).add("length", language).add("disposition", disposition).add("encoding", encoding)
+ return Objects.toStringHelper(this).add("length", language).add("disposition", disposition).add("encoding", encoding)
.add("type", type).add("md5", md5).add("language", language)
.add("expires", expires).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/StorageMetadata.java
----------------------------------------------------------------------
diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/StorageMetadata.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/StorageMetadata.java
index b1bf21f..e2cf49e 100644
--- a/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/StorageMetadata.java
+++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/StorageMetadata.java
@@ -16,7 +16,6 @@
*/
package org.jclouds.blobstore.representations;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableMap;
@@ -185,7 +184,7 @@ public class StorageMetadata implements Serializable {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).add("type", type).add("providerId", providerId).add("name", name)
+ return Objects.toStringHelper(this).add("type", type).add("providerId", providerId).add("name", name)
.add("userMetadata", userMetadata).add("eTag", eTag).add("creationDate", creationDate)
.add("lastModifiedDate", lastModifiedDate).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/ExecResponse.java
----------------------------------------------------------------------
diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/ExecResponse.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/ExecResponse.java
index ab43600..001486b 100644
--- a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/ExecResponse.java
+++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/ExecResponse.java
@@ -16,7 +16,6 @@
*/
package org.jclouds.compute.representations;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import java.io.Serializable;
@@ -96,6 +95,6 @@ public class ExecResponse implements Serializable {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).add("out", output).add("error", error).add("exitStatus", exitStatus).toString();
+ return Objects.toStringHelper(this).add("out", output).add("error", error).add("exitStatus", exitStatus).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Hardware.java
----------------------------------------------------------------------
diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Hardware.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Hardware.java
index 3a32160..95bb5d4 100644
--- a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Hardware.java
+++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Hardware.java
@@ -16,7 +16,6 @@
*/
package org.jclouds.compute.representations;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
@@ -154,7 +153,7 @@ public class Hardware implements Serializable {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).add("id", id).add("name", name)
+ return Objects.toStringHelper(this).add("id", id).add("name", name)
.add("processors", processors).add("ram", ram).add("volums", volumes).add("hypervisor", hypervisor)
.toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Image.java
----------------------------------------------------------------------
diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Image.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Image.java
index 74600a1..f421af1 100644
--- a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Image.java
+++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Image.java
@@ -16,7 +16,7 @@
*/
package org.jclouds.compute.representations;
-import com.google.common.base.MoreObjects;
+
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
@@ -164,7 +164,7 @@ public class Image implements Serializable {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).add("id", id).add("name", name).add("status", status)
+ return Objects.toStringHelper(this).add("id", id).add("name", name).add("status", status)
.add("description", description)
.add("tags", tags).add("os", operatingSystem).add("version", version)
.add("defaultCredentials", defaultCredentials).toString();
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/LoginCredentials.java
----------------------------------------------------------------------
diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/LoginCredentials.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/LoginCredentials.java
index 87f6ead..b609966 100644
--- a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/LoginCredentials.java
+++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/LoginCredentials.java
@@ -16,7 +16,6 @@
*/
package org.jclouds.compute.representations;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import java.io.Serializable;
@@ -128,7 +127,7 @@ public class LoginCredentials implements Serializable {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("username", username)
.add("hasPassword", password != null || credentialUrl != null)
.add("hasPrivateKey", privateKey != null)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/NodeMetadata.java
----------------------------------------------------------------------
diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/NodeMetadata.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/NodeMetadata.java
index 41a23bf..b785636 100644
--- a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/NodeMetadata.java
+++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/NodeMetadata.java
@@ -16,7 +16,6 @@
*/
package org.jclouds.compute.representations;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
@@ -229,7 +228,7 @@ public class NodeMetadata implements Serializable {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).add("id", id).add("name", name).add("description", description).add("status", status)
+ return Objects.toStringHelper(this).add("id", id).add("name", name).add("description", description).add("status", status)
.add("locationId", locationId).add("imageId", imageId).add("hostname", hostname)
.add("group", group).add("loginPort", loginPort).add("tags", tags).add("metadata", metadata)
.add("defaultCredentials", defaultCredentials).toString();
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/OperatingSystem.java
----------------------------------------------------------------------
diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/OperatingSystem.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/OperatingSystem.java
index c23c7fd..c36c11e 100644
--- a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/OperatingSystem.java
+++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/OperatingSystem.java
@@ -16,7 +16,6 @@
*/
package org.jclouds.compute.representations;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import java.io.Serializable;
@@ -136,7 +135,7 @@ public class OperatingSystem implements Serializable {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).add("family", family).add("name", name).add("arch", arch)
+ return Objects.toStringHelper(this).add("family", family).add("name", name).add("arch", arch)
.add("version", version).add("description", description).add("is64bit", is64Bit).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Processor.java
----------------------------------------------------------------------
diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Processor.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Processor.java
index 592b877..67acb82 100644
--- a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Processor.java
+++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Processor.java
@@ -16,7 +16,6 @@
*/
package org.jclouds.compute.representations;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import java.io.Serializable;
@@ -84,6 +83,6 @@ public class Processor implements Serializable {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).add("cores", cores).add("spped", speed).toString();
+ return Objects.toStringHelper(this).add("cores", cores).add("spped", speed).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Volume.java
----------------------------------------------------------------------
diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Volume.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Volume.java
index 687c68c..ff6f1bc 100644
--- a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Volume.java
+++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Volume.java
@@ -16,7 +16,6 @@
*/
package org.jclouds.compute.representations;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import java.io.Serializable;
@@ -137,7 +136,7 @@ public class Volume implements Serializable {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).add("id", id).add("type", type).add("size", size)
+ return Objects.toStringHelper(this).add("id", id).add("type", type).add("size", size)
.add("device", device).add("isDurable", durable).add("bootDevice", bootDevice).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/ApiMetadata.java
----------------------------------------------------------------------
diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/ApiMetadata.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/ApiMetadata.java
index 63f0b1f..2c119c3 100644
--- a/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/ApiMetadata.java
+++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/ApiMetadata.java
@@ -16,7 +16,6 @@
*/
package org.jclouds.representations;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
@@ -265,7 +264,7 @@ public class ApiMetadata implements Serializable {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).add("id", id).add("name", name).add("endpointName", endpointName)
+ return Objects.toStringHelper(this).add("id", id).add("name", name).add("endpointName", endpointName)
.add("identityName", identityName).add("credentialName", credentialName).add("version", version)
.add("defaultEndpoint", defaultEndpoint).add("defaultIdentity", defaultIdentity)
.add("defaultCredential", defaultCredential).add("defaultProperties", defaultProperties).add("defaultModules", defaultModules)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/Context.java
----------------------------------------------------------------------
diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/Context.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/Context.java
index faac681..f1b61e0 100644
--- a/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/Context.java
+++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/Context.java
@@ -16,7 +16,6 @@
*/
package org.jclouds.representations;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import java.io.Serializable;
@@ -97,6 +96,6 @@ public class Context implements Serializable {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).add("name", name).add("providerId", providerId).add("identity", identity).toString();
+ return Objects.toStringHelper(this).add("name", name).add("providerId", providerId).add("identity", identity).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/Location.java
----------------------------------------------------------------------
diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/Location.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/Location.java
index 218cd34..e2cdc3a 100644
--- a/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/Location.java
+++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/Location.java
@@ -16,7 +16,6 @@
*/
package org.jclouds.representations;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
@@ -126,7 +125,7 @@ public class Location implements Serializable {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).add("id", id).add("scope", scope).add("description", description)
+ return Objects.toStringHelper(this).add("id", id).add("scope", scope).add("description", description)
.add("perentId", parentId).add("iso3166Codes", iso3166Codes).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/ProviderMetadata.java
----------------------------------------------------------------------
diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/ProviderMetadata.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/ProviderMetadata.java
index ee02a94..c8f7b7f 100644
--- a/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/ProviderMetadata.java
+++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/ProviderMetadata.java
@@ -16,7 +16,6 @@
*/
package org.jclouds.representations;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
@@ -270,7 +269,7 @@ public class ProviderMetadata implements Serializable {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).add("id", id).add("name", name).add("endpointName", endpointName)
+ return Objects.toStringHelper(this).add("id", id).add("name", name).add("endpointName", endpointName)
.add("identityName", identityName).add("credentialName", credentialName).add("defaultModules", defaultModules)
.add("documentation", documentation).add("views", views)
.add("endpoint", endpoint).add("defaultProperties", defaultProperties).add("console", console)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/compute/options/JoyentCloudTemplateOptions.java
----------------------------------------------------------------------
diff --git a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/compute/options/JoyentCloudTemplateOptions.java b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/compute/options/JoyentCloudTemplateOptions.java
index da65c0c..b1e401b 100644
--- a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/compute/options/JoyentCloudTemplateOptions.java
+++ b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/compute/options/JoyentCloudTemplateOptions.java
@@ -25,7 +25,7 @@ import org.jclouds.domain.LoginCredentials;
import org.jclouds.scriptbuilder.domain.Statement;
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;
/**
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Dataset.java
----------------------------------------------------------------------
diff --git a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Dataset.java b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Dataset.java
index d476904..0655f52 100644
--- a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Dataset.java
+++ b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Dataset.java
@@ -30,7 +30,6 @@ import org.jclouds.joyent.cloudapi.v6_5.domain.Machine.Type;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Function;
import com.google.common.base.Functions;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ComparisonChain;
import com.google.common.collect.ImmutableMap;
@@ -314,7 +313,7 @@ public class Dataset implements Comparable<Dataset> {
@Override
public String toString() {
- return MoreObjects.toStringHelper("").omitNullValues()
+ return Objects.toStringHelper("").omitNullValues()
.add("id", id)
.add("urn", urn)
.add("name", name)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Key.java
----------------------------------------------------------------------
diff --git a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Key.java b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Key.java
index 84a3f2a..e2ec1ff 100644
--- a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Key.java
+++ b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Key.java
@@ -21,7 +21,6 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
import java.util.Date;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ComparisonChain;
@@ -132,7 +131,7 @@ public class Key implements Comparable<Key> {
@Override
public String toString() {
- return MoreObjects.toStringHelper("").omitNullValues()
+ return Objects.toStringHelper("").omitNullValues()
.add("name", name)
.add("key", key)
.add("created", created).toString();
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Machine.java
----------------------------------------------------------------------
diff --git a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Machine.java b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Machine.java
index f33935e..7867fda 100644
--- a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Machine.java
+++ b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Machine.java
@@ -31,7 +31,6 @@ import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.CaseFormat;
import com.google.common.base.Function;
import com.google.common.base.Functions;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ComparisonChain;
import com.google.common.collect.ImmutableMap;
@@ -387,7 +386,7 @@ public class Machine implements Comparable<Machine> {
@Override
public String toString() {
- return MoreObjects.toStringHelper("").omitNullValues()
+ return Objects.toStringHelper("").omitNullValues()
.add("id", id)
.add("name", name)
.add("type", type)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Package.java
----------------------------------------------------------------------
diff --git a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Package.java b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Package.java
index a9c20a1..17953b8 100644
--- a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Package.java
+++ b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Package.java
@@ -22,7 +22,6 @@ import java.beans.ConstructorProperties;
import javax.inject.Named;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ComparisonChain;
@@ -174,7 +173,7 @@ public class Package implements Comparable<Package> {
@Override
public String toString() {
- return MoreObjects.toStringHelper("").omitNullValues()
+ return Objects.toStringHelper("").omitNullValues()
.add("name", name)
.add("memorySizeMb", memorySizeMb)
.add("diskSizeGb", diskSizeGb)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/datacenterscoped/DatacenterAndName.java
----------------------------------------------------------------------
diff --git a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/datacenterscoped/DatacenterAndName.java b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/datacenterscoped/DatacenterAndName.java
index 11e067d..cb10222 100644
--- a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/datacenterscoped/DatacenterAndName.java
+++ b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/datacenterscoped/DatacenterAndName.java
@@ -21,10 +21,9 @@ import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import com.google.common.base.Function;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Splitter;
-import com.google.common.base.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.Iterables;
/**
@@ -105,6 +104,6 @@ public class DatacenterAndName {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper("").add("datacenterId", datacenterId).add("name", name);
+ return Objects.toStringHelper("").add("datacenterId", datacenterId).add("name", name);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/options/CreateMachineOptions.java
----------------------------------------------------------------------
diff --git a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/options/CreateMachineOptions.java b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/options/CreateMachineOptions.java
index 23ba16f..34730fa 100644
--- a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/options/CreateMachineOptions.java
+++ b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/options/CreateMachineOptions.java
@@ -25,9 +25,8 @@ import org.jclouds.http.options.BaseHttpRequestOptions;
import org.jclouds.util.Maps2;
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.ImmutableMap;
import com.google.common.collect.Multimap;
import com.google.common.collect.Multimaps;
@@ -57,7 +56,7 @@ public class CreateMachineOptions extends BaseHttpRequestOptions {
@Override
public String toString() {
- ToStringHelper toString = MoreObjects.toStringHelper("").omitNullValues();
+ ToStringHelper toString = Objects.toStringHelper("").omitNullValues();
toString.add("name", name).add("package", name);
if (metadata.size() > 0)
toString.add("metadata", metadata);
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimString.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimString.java b/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimString.java
index 8f8b18d..676dc22 100644
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimString.java
+++ b/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimString.java
@@ -25,7 +25,6 @@ import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlValue;
import javax.xml.namespace.QName;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.Maps;
@@ -89,7 +88,7 @@ public class CimString {
@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/dmtf/cim/ResourceAllocationSettingData.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/cim/ResourceAllocationSettingData.java b/vcloud-director/src/main/java/org/jclouds/dmtf/cim/ResourceAllocationSettingData.java
index 8b76485..6ef6631 100644
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/cim/ResourceAllocationSettingData.java
+++ b/vcloud-director/src/main/java/org/jclouds/dmtf/cim/ResourceAllocationSettingData.java
@@ -31,9 +31,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.ImmutableSet;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
@@ -830,7 +829,7 @@ public class ResourceAllocationSettingData {
}
public ToStringHelper string() {
- return MoreObjects.toStringHelper("")
+ return Objects.toStringHelper("")
.add("elementName", elementName)
.add("instanceID", instanceID)
.add("caption", caption)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/dmtf/cim/VirtualSystemSettingData.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/cim/VirtualSystemSettingData.java b/vcloud-director/src/main/java/org/jclouds/dmtf/cim/VirtualSystemSettingData.java
index 7e7ee35..7039b92 100644
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/cim/VirtualSystemSettingData.java
+++ b/vcloud-director/src/main/java/org/jclouds/dmtf/cim/VirtualSystemSettingData.java
@@ -31,7 +31,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.ImmutableSet;
import com.google.common.collect.Maps;
@@ -693,7 +692,7 @@ public class VirtualSystemSettingData {
@Override
public String toString() {
- return MoreObjects.toStringHelper("")
+ return Objects.toStringHelper("")
.add("elementName", elementName)
.add("instanceID", instanceID)
.add("caption", caption)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Configuration.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Configuration.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Configuration.java
index 0669a32..3dc2474 100644
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Configuration.java
+++ b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Configuration.java
@@ -22,7 +22,6 @@ import javax.xml.bind.annotation.XmlAttribute;
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 = "Configuration", namespace = OVF_NS, propOrder = {
@@ -125,8 +124,8 @@ public class Configuration {
return string().toString();
}
- protected MoreObjects.ToStringHelper string() {
- return MoreObjects.toStringHelper("").add("id", id).add("default", isDefault).add("label", label).add("description", description);
+ protected Objects.ToStringHelper string() {
+ return Objects.toStringHelper("").add("id", id).add("default", isDefault).add("label", label).add("description", description);
}
public String getId() {
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/DeploymentOptionSection.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/DeploymentOptionSection.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/DeploymentOptionSection.java
index 253bc0b..198556b 100644
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/DeploymentOptionSection.java
+++ b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/DeploymentOptionSection.java
@@ -25,7 +25,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;
@@ -116,7 +115,7 @@ public class DeploymentOptionSection extends SectionType {
}
@Override
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return super.string().add("configurations", configurations);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/DiskSection.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/DiskSection.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/DiskSection.java
index 7c19370..5d17fc0 100644
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/DiskSection.java
+++ b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/DiskSection.java
@@ -24,7 +24,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;
@@ -121,7 +120,7 @@ public class DiskSection extends SectionType {
}
@Override
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return super.string().add("disks", disks);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Item.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Item.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Item.java
index 7c9e07f..8901a0d 100644
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Item.java
+++ b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Item.java
@@ -27,7 +27,6 @@ import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.bind.annotation.XmlType;
import javax.xml.namespace.QName;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.Maps;
@@ -180,7 +179,7 @@ public class Item {
@Override
public String toString() {
- return MoreObjects.toStringHelper("")
+ return Objects.toStringHelper("")
.add("id", id)
.add("order", order)
.add("startDelay", startDelay)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/MsgType.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/MsgType.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/MsgType.java
index 069d42a..ef6b29b 100644
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/MsgType.java
+++ b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/MsgType.java
@@ -22,7 +22,6 @@ import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlValue;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
@@ -136,7 +135,7 @@ public class MsgType {
@Override
public String toString() {
- return MoreObjects.toStringHelper("")
+ return Objects.toStringHelper("")
.add("value", value).add("msgid", msgid).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/NetworkSection.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/NetworkSection.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/NetworkSection.java
index e40f177..a9df5d0 100644
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/NetworkSection.java
+++ b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/NetworkSection.java
@@ -23,7 +23,6 @@ import java.util.Set;
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;
@@ -116,7 +115,7 @@ public class NetworkSection extends SectionType {
}
@Override
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return super.string()
.add("networks", networks);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/OperatingSystemSection.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/OperatingSystemSection.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/OperatingSystemSection.java
index b01bed7..dde69ce 100644
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/OperatingSystemSection.java
+++ b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/OperatingSystemSection.java
@@ -22,7 +22,6 @@ import static org.jclouds.dmtf.DMTFConstants.OVF_NS;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -147,7 +146,7 @@ public class OperatingSystemSection extends SectionType {
}
@Override
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return super.string()
.add("id", id)
.add("version", version)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/ProductSection.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/ProductSection.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/ProductSection.java
index ac3bb26..8b4c5d6 100644
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/ProductSection.java
+++ b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/ProductSection.java
@@ -28,7 +28,6 @@ import javax.xml.bind.annotation.XmlType;
import org.jclouds.dmtf.cim.CimString;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
@@ -285,7 +284,7 @@ public class ProductSection extends SectionType {
}
@Override
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return super.string()
.add("product", product)
.add("vendor", vendor)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Property.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Property.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Property.java
index eb19fef..c404694 100644
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Property.java
+++ b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Property.java
@@ -27,7 +27,6 @@ import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.bind.annotation.XmlType;
import com.google.common.base.Joiner;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.Sets;
@@ -294,7 +293,7 @@ public class Property {
@Override
public String toString() {
- return MoreObjects.toStringHelper("")
+ return Objects.toStringHelper("")
.add("key", key).add("values", values).add("label", label).add("description", description)
.add("type", type).add("qualifiers", qualifiers).add("userConfigurable", userConfigurable).add("defaultValue", defaultValue)
.toString();
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/SectionType.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/SectionType.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/SectionType.java
index aadaf96..cc532a7 100644
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/SectionType.java
+++ b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/SectionType.java
@@ -23,7 +23,6 @@ import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -135,8 +134,8 @@ public abstract class SectionType {
return string().toString();
}
- protected MoreObjects.ToStringHelper string() {
- return MoreObjects.toStringHelper("").add("info", info).add("required", required);
+ protected Objects.ToStringHelper string() {
+ return Objects.toStringHelper("").add("info", info).add("required", required);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/StartupSection.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/StartupSection.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/StartupSection.java
index 3acf05a..fecdfa3 100644
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/StartupSection.java
+++ b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/StartupSection.java
@@ -26,7 +26,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/dmtf/ovf/VirtualHardwareSection.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/VirtualHardwareSection.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/VirtualHardwareSection.java
index 0d4d0f9..864d153 100644
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/VirtualHardwareSection.java
+++ b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/VirtualHardwareSection.java
@@ -28,7 +28,6 @@ import org.jclouds.dmtf.cim.ResourceAllocationSettingData;
import org.jclouds.dmtf.cim.VirtualSystemSettingData;
import com.google.common.base.Joiner;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
@@ -190,7 +189,7 @@ public class VirtualHardwareSection extends SectionType {
}
@Override
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return super.string()
.add("transport", transport)
.add("virtualSystem", virtualSystem)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/PlatformSectionType.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/PlatformSectionType.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/PlatformSectionType.java
index 0a766de..fd56577 100644
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/PlatformSectionType.java
+++ b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/PlatformSectionType.java
@@ -25,7 +25,6 @@ import javax.xml.bind.annotation.XmlType;
import org.jclouds.dmtf.cim.CimString;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.Sets;
@@ -133,7 +132,7 @@ public class PlatformSectionType extends SectionType<PlatformSectionType> {
}
@Override
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return super.string()
.add("version", version).add("vendor", vendor).add("timezone", timezone)
.add("locale", locale).add("kind", kind).add("any", any);
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/PropertySectionType.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/PropertySectionType.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/PropertySectionType.java
index cb1229f..1d88afd 100644
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/PropertySectionType.java
+++ b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/PropertySectionType.java
@@ -23,7 +23,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.Sets;
@@ -97,7 +96,7 @@ public class PropertySectionType extends SectionType<PropertySectionType> {
}
@Override
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return super.string()
.add("properties", properties).add("any", any);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/SectionType.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/SectionType.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/SectionType.java
index 6f8e653..0345933 100644
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/SectionType.java
+++ b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/SectionType.java
@@ -23,7 +23,6 @@ import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.bind.annotation.XmlType;
import javax.xml.namespace.QName;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.Maps;
@@ -84,8 +83,8 @@ public abstract class SectionType<T extends SectionType<T>> {
return string().toString();
}
- protected MoreObjects.ToStringHelper string() {
- return MoreObjects.toStringHelper("").add("otherAttributes", otherAttributes);
+ protected Objects.ToStringHelper string() {
+ return Objects.toStringHelper("").add("otherAttributes", otherAttributes);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/internal/BaseEnvelope.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/internal/BaseEnvelope.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/internal/BaseEnvelope.java
index f105f78..d0bbea7 100644
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/internal/BaseEnvelope.java
+++ b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/internal/BaseEnvelope.java
@@ -24,7 +24,6 @@ import org.jclouds.dmtf.ovf.DiskSection;
import org.jclouds.dmtf.ovf.NetworkSection;
import org.jclouds.dmtf.ovf.SectionType;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
@@ -167,8 +166,8 @@ public abstract class BaseEnvelope<V extends BaseVirtualSystem, E extends BaseEn
return string().toString();
}
- protected MoreObjects.ToStringHelper string() {
- return MoreObjects.toStringHelper("")
+ protected Objects.ToStringHelper string() {
+ return Objects.toStringHelper("")
.add("diskSections", diskSections)
.add("networkSections", networkSections)
.add("additionalSections", additionalSections)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/internal/BaseVirtualSystem.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/internal/BaseVirtualSystem.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/internal/BaseVirtualSystem.java
index 4a82f74..951ff98 100644
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/internal/BaseVirtualSystem.java
+++ b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/internal/BaseVirtualSystem.java
@@ -29,7 +29,6 @@ import javax.xml.bind.annotation.XmlElementRef;
import org.jclouds.dmtf.ovf.ProductSection;
import org.jclouds.dmtf.ovf.SectionType;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
@@ -161,7 +160,7 @@ public abstract class BaseVirtualSystem extends SectionType {
}
@Override
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return super.string()
.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/AbstractVApp.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AbstractVApp.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AbstractVApp.java
index db7c2c5..6b6af2a 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AbstractVApp.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AbstractVApp.java
@@ -42,8 +42,8 @@ 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.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;
[2/3] Revert "JCLOUDS-653: Address Guava 18 deprecations"
Posted by ad...@apache.org.
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 = {