You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ga...@apache.org on 2014/08/08 20:17:55 UTC
[1/4] JCLOUDS-653: Address Guava 18 deprecations
Repository: jclouds-labs
Updated Branches:
refs/heads/master 925097cc9 -> b851f0ac3
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/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 77aa8bf..3fe0283 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.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
@XmlRootElement(name = "OrgNetwork")
public class OrgNetwork extends Network {
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/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 7cc61de..042f45f 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.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Java class for OrgPasswordPolicySettings complex type.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/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 7d72d70..8b096c0 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.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.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/b851f0ac/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 f239cc9..6f1627d 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.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Defines default lease policies for vAppTemplate on organization level.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/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 2913a8d..0033dea 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,6 +44,7 @@ import org.jclouds.vcloud.director.v1_5.domain.section.OperatingSystemSection;
import org.jclouds.vcloud.director.v1_5.domain.section.RuntimeInfoSection;
import org.jclouds.vcloud.director.v1_5.domain.section.VirtualHardwareSection;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
@@ -226,7 +227,7 @@ public class CaptureVAppParams extends ParamsType {
@Override
public String toString() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("source", source)
.add("sections", sections).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/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 715473b..d0dbe16 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.
@@ -156,7 +156,7 @@ public class CloneMediaParams extends ParamsType {
@Override
public String toString() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("source", source)
.add("isSourceDelete", isSourceDelete).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/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 532122f..9b25ad9 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.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/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 1375fbc..4d53545 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
@@ -27,7 +27,7 @@ import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/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 f5843b0..eee4af2 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,6 +29,7 @@ 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;
@@ -187,6 +188,6 @@ public class ControlAccessParams {
@Override
public String toString() {
- return Objects.toStringHelper("").add("sharedToEveryone", sharedToEveryone).add("everyoneAccessLevel", everyoneAccessLevel).add("accessSettings", accessSettings).toString();
+ return MoreObjects.toStringHelper("").add("sharedToEveryone", sharedToEveryone).add("everyoneAccessLevel", everyoneAccessLevel).add("accessSettings", accessSettings).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/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 b390502..d85b719 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,6 +22,7 @@ import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -180,7 +181,7 @@ public class DeployVAppParams {
@Override
public String toString() {
- return Objects.toStringHelper("").add("powerOn", powerOn).add("deploymentLeaseSeconds", deploymentLeaseSeconds).add("forceCustomization", forceCustomization).toString();
+ return MoreObjects.toStringHelper("").add("powerOn", powerOn).add("deploymentLeaseSeconds", deploymentLeaseSeconds).add("forceCustomization", forceCustomization).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiateOvfParams.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiateOvfParams.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiateOvfParams.java
index 48742f9..b884fed 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiateOvfParams.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/params/InstantiateOvfParams.java
@@ -23,7 +23,7 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Represents vApp instantiation from OVF parameters
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/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 53ca5a8..39a4fcc 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.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Represents vApp instantiation parameters.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/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 f84af7c..142da40 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.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Represents vApp template instantiation parameters.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/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 9c9bffc..152825f 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,6 +41,7 @@ import org.jclouds.vcloud.director.v1_5.domain.section.OperatingSystemSection;
import org.jclouds.vcloud.director.v1_5.domain.section.RuntimeInfoSection;
import org.jclouds.vcloud.director.v1_5.domain.section.VirtualHardwareSection;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
@@ -167,7 +168,7 @@ public class InstantiationParams {
@Override
public String toString() {
- return Objects.toStringHelper("").add("sections", sections).toString();
+ return MoreObjects.toStringHelper("").add("sections", sections).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/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 3a11a75..a99747a 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,6 +24,7 @@ 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;
/**
@@ -102,6 +103,6 @@ public class MediaInsertOrEjectParams {
@Override
public String toString() {
- return Objects.toStringHelper("").add("media", media).toString();
+ return MoreObjects.toStringHelper("").add("media", media).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/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 3d9fa06..abc0aef 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,8 +22,9 @@ 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.
@@ -132,6 +133,6 @@ public class ParamsType {
}
public ToStringHelper string() {
- return Objects.toStringHelper("").add("description", description).add("name", name);
+ return MoreObjects.toStringHelper("").add("description", description).add("name", name);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/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 247d8ca..48b0b45 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,6 +22,7 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -113,7 +114,7 @@ public class PublishCatalogParams {
@Override
public String toString() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("isPublished", isPublished).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/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 f0f1b00..f335765 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.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.Lists;
/**
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/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 6e5ab11..83a459c 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,6 +25,7 @@ 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;
@@ -108,7 +109,7 @@ public class RelocateParams {
@Override
public String toString() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("datastore", datastore).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/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 af9a781..7728512 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,6 +29,7 @@ import javax.xml.bind.annotation.XmlType;
import org.jclouds.vcloud.director.v1_5.domain.Reference;
import org.jclouds.vcloud.director.v1_5.domain.network.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;
@@ -232,7 +233,7 @@ public class SourcedCompositionItemParam {
@Override
public String toString() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("source", source)
.add("vAppScopedLocalId", vAppScopedLocalId)
.add("instantiationParams", instantiationParams)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/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 e0e63c3..72e2997 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,6 +31,7 @@ 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;
@@ -166,7 +167,7 @@ public class UndeployVAppParams {
@Override
public String toString() {
- return Objects.toStringHelper("").add("undeployPowerAction", undeployPowerAction).toString();
+ return MoreObjects.toStringHelper("").add("undeployPowerAction", undeployPowerAction).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/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 5e854a5..73d6bd5 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,6 +22,7 @@ import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -137,7 +138,7 @@ public class UploadVAppTemplateParams extends ParamsType {
@Override
public String toString() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("transferFormat", transferFormat)
.add("manifestRequired", manifestRequired).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/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 673de93..6a517a1 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,8 +25,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.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
/**
* Represents vApp creation parameters.
@@ -199,7 +200,7 @@ public class VAppCreationParams extends ParamsType {
@Override
public ToStringHelper string() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("vAppParent", vAppParent)
.add("instantiationParams", instantiationParams)
.add("deploy", deploy)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/ContainerType.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/ContainerType.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/ContainerType.java
index aa67fc6..60c3f5c 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/ContainerType.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/ContainerType.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.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Container for query result sets.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/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 18e11ff..90c3062 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.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Container for the list of typed queries available to the
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/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 2de8c34..27ea2d7 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.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Represents the results from a AdminGroup vCloud query as a record.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/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 86caeea..8f32c23 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.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Represents the results from a AdminUser vCloud query as a record.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/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 be3f9b9..ef096a2 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.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Represents the results from a AdminVdc vCloud query as a record.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/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 dee71e2..f91b9ca 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.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Represents the results from a Catalog vCloud query as a record.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/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 e33b3cb..e9f2974 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.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Represents the results from a Datastore vCloud query as a record.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/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 d3eeebc..c5764d5 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.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Represents the results from a Media vCloud query as a record.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/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 a7a8102..8b5170e 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,8 +22,9 @@ 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;
/**
* Represents the results from a Network vCloud query as a record.
@@ -260,7 +261,7 @@ public class QueryResultNetworkRecord extends QueryResultRecordType {
@Override
public ToStringHelper string() {
- 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",
+ 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",
isBusy);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultRecordType.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultRecordType.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultRecordType.java
index fd3f2db..cf964f7 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultRecordType.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/query/QueryResultRecordType.java
@@ -28,8 +28,9 @@ 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;
/**
@@ -218,7 +219,7 @@ public class QueryResultRecordType {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("").add("href", href).add("id", id)
+ return MoreObjects.toStringHelper("").add("href", href).add("id", id)
.add("type", type).add("links", links);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/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 008f609..7997931 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.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/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 a47d36e..49c8db1 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.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/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 8bc1a73..2b5df3c 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.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Represents the results from a Right vCloud query as a record.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/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 a7713d3..a6e97c2 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.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Represents the results from a Role vCloud query as a record.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/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 d575e61..db0b9a2 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.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Represents the results from a StrandedUser vCloud query as a record.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/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 5360972..945a635 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.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Represents the results from a VApp vCloud query as a record.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/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 b20d799..3652548 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.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Represents the results from a VAppTemplate vCloud query as a record.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/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 cc04255..3273797 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.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Represents the results from a VM vCloud query as a record.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/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 f9df5ee..3e7ec45 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,6 +31,7 @@ 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;
@@ -197,7 +198,7 @@ public class CustomizationSection extends SectionType {
}
@Override
- public Objects.ToStringHelper string() {
+ public MoreObjects.ToStringHelper string() {
return super.string()
.add("customizeOnInstantiate", customizeOnInstantiate)
.add("links", links)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/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 f8129b0..71765cb 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,6 +32,7 @@ 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;
@@ -562,7 +563,7 @@ public class GuestCustomizationSection extends SectionType {
}
@Override
- public Objects.ToStringHelper string() {
+ public MoreObjects.ToStringHelper string() {
return super.string()
.add("enabled", enabled)
.add("changeSid", changeSid)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/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 fa79c90..bfe7e85 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,6 +33,7 @@ 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;
@@ -269,7 +270,7 @@ public class LeaseSettingsSection extends SectionType {
}
@Override
- public Objects.ToStringHelper string() {
+ public MoreObjects.ToStringHelper string() {
return super.string()
.add("links", links)
.add("deploymentLeaseInSeconds", deploymentLeaseInSeconds)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/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 1368ae6..b8e4c7d 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,6 +33,7 @@ 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;
@@ -179,7 +180,7 @@ public class NetworkConfigSection extends SectionType {
}
@Override
- public Objects.ToStringHelper string() {
+ public MoreObjects.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/b851f0ac/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 f1e31f0..9cdedef 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,6 +32,7 @@ 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;
@@ -222,7 +223,7 @@ public class NetworkConnectionSection extends SectionType {
}
@Override
- public Objects.ToStringHelper string() {
+ public MoreObjects.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/b851f0ac/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 6c93ac9..cd57d07 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.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/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 5761e80..425e82a 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.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.Lists;
/**
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/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 6bf4ba4..7b23267 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.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/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 0eb0024..d33a4ea 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.apply(checkNotNull(rel, "rel must be defined"));
+ return LINK_REL_SELECTORS.getUnchecked(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.apply(name);
+ return MEDIA_NAME_SELECTORS.getUnchecked(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.apply(type);
+ return MEDIA_TYPE_SELECTORS.getUnchecked(type);
}
private static final LoadingCache<String, Predicate<Link>> MEDIA_TYPE_SELECTORS = CacheBuilder.newBuilder()
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/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 0e25675..d9d886e 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.Objects;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Optional;
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
@@ -284,7 +284,7 @@ public abstract class BaseVCloudDirectorApiLiveTest extends BaseContextLiveTest<
@Override
public String apply(VAppTemplate input) {
- return Objects.toStringHelper("").omitNullValues().add("name", input.getName()).add("id", input.getId())
+ return MoreObjects.toStringHelper("").omitNullValues().add("name", input.getName()).add("id", input.getId())
.add("owner", input.getOwner()).toString();
}
@@ -324,7 +324,7 @@ public abstract class BaseVCloudDirectorApiLiveTest extends BaseContextLiveTest<
@Override
public String apply(Vm input) {
- return Objects.toStringHelper("").omitNullValues().add("name", input.getName()).add("id", input.getId()).toString();
+ return MoreObjects.toStringHelper("").omitNullValues().add("name", input.getName()).add("id", input.getId()).toString();
}
};
@@ -362,7 +362,7 @@ public abstract class BaseVCloudDirectorApiLiveTest extends BaseContextLiveTest<
@Override
public String apply(Catalog input) {
- return Objects.toStringHelper("").omitNullValues().add("name", input.getName()).add("id", input.getId())
+ return MoreObjects.toStringHelper("").omitNullValues().add("name", input.getName()).add("id", input.getId())
.add("owner", input.getOwner()).add("isPublished", input.isPublished()).toString();
}
@@ -401,7 +401,7 @@ public abstract class BaseVCloudDirectorApiLiveTest extends BaseContextLiveTest<
@Override
public String apply(Network input) {
- return Objects.toStringHelper("").omitNullValues().add("name", input.getName()).add("id", input.getId())
+ return MoreObjects.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/b851f0ac/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 04a6abe..4071dda 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 Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("machineNameOrId", machineNameOrId)
.add("nicSlot", slot)
.toString();
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/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 362b985..3f4a27a 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.sameThreadExecutor;
+import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService;
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(
- sameThreadExecutor(), sameThreadExecutor()));
+ newDirectExecutorService(), newDirectExecutorService()));
}
@Override
[4/4] git commit: JCLOUDS-653: Address Guava 18 deprecations
Posted by ga...@apache.org.
JCLOUDS-653: Address Guava 18 deprecations
Mostly renaming Objects.toStringHelper to MoreObjects.toStringHelper.
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/b851f0ac
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/b851f0ac
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/b851f0ac
Branch: refs/heads/master
Commit: b851f0ac3a6fd23720d67dbfad6954b2153bbc4b
Parents: 925097c
Author: Andrew Gaul <ga...@apache.org>
Authored: Wed Aug 6 16:28:57 2014 -0700
Committer: Andrew Gaul <ga...@apache.org>
Committed: Fri Aug 8 11:14:10 2014 -0700
----------------------------------------------------------------------
.../jclouds/azure/management/domain/DeploymentParams.java | 5 +++--
.../domain/DetailedHostedServiceProperties.java | 2 +-
.../java/org/jclouds/azure/management/domain/Disk.java | 7 ++++---
.../java/org/jclouds/azure/management/domain/Error.java | 3 ++-
.../jclouds/azure/management/domain/HostedService.java | 5 +++--
.../azure/management/domain/HostedServiceProperties.java | 5 +++--
.../org/jclouds/azure/management/domain/Location.java | 3 ++-
.../java/org/jclouds/azure/management/domain/OSImage.java | 5 +++--
.../jclouds/azure/management/domain/OSImageParams.java | 5 +++--
.../org/jclouds/azure/management/domain/Operation.java | 3 ++-
.../management/options/CreateHostedServiceOptions.java | 3 ++-
.../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 +++---
dmtf/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 ++-
dmtf/src/main/java/org/jclouds/dmtf/ovf/DiskSection.java | 3 ++-
dmtf/src/main/java/org/jclouds/dmtf/ovf/Item.java | 3 ++-
dmtf/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 ++-
dmtf/src/main/java/org/jclouds/dmtf/ovf/Property.java | 3 ++-
dmtf/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 ++-
.../docker/compute/options/DockerTemplateOptions.java | 3 ++-
.../src/main/java/org/jclouds/docker/domain/Config.java | 3 ++-
.../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/fujitsu/fgcp/FGCPCredentials.java | 3 ++-
.../jclouds/fujitsu/fgcp/domain/BuiltinServerBackup.java | 3 ++-
.../main/java/org/jclouds/fujitsu/fgcp/domain/CPU.java | 3 ++-
.../java/org/jclouds/fujitsu/fgcp/domain/Direction.java | 3 ++-
.../java/org/jclouds/fujitsu/fgcp/domain/DiskImage.java | 3 ++-
.../java/org/jclouds/fujitsu/fgcp/domain/EventLog.java | 3 ++-
.../main/java/org/jclouds/fujitsu/fgcp/domain/Group.java | 3 ++-
.../main/java/org/jclouds/fujitsu/fgcp/domain/Image.java | 3 ++-
.../java/org/jclouds/fujitsu/fgcp/domain/Information.java | 3 ++-
.../jclouds/fujitsu/fgcp/domain/IntermediateCACert.java | 3 ++-
.../org/jclouds/fujitsu/fgcp/domain/LoadStatistics.java | 3 ++-
.../main/java/org/jclouds/fujitsu/fgcp/domain/Memory.java | 3 ++-
.../main/java/org/jclouds/fujitsu/fgcp/domain/NAT.java | 3 ++-
.../org/jclouds/fujitsu/fgcp/domain/PerformanceInfo.java | 3 ++-
.../main/java/org/jclouds/fujitsu/fgcp/domain/Policy.java | 3 ++-
.../java/org/jclouds/fujitsu/fgcp/domain/Product.java | 3 ++-
.../java/org/jclouds/fujitsu/fgcp/domain/PublicIP.java | 3 ++-
.../main/java/org/jclouds/fujitsu/fgcp/domain/Rule.java | 3 ++-
.../java/org/jclouds/fujitsu/fgcp/domain/ServerCert.java | 3 ++-
.../java/org/jclouds/fujitsu/fgcp/domain/ServerType.java | 3 ++-
.../java/org/jclouds/fujitsu/fgcp/domain/Software.java | 3 ++-
.../main/java/org/jclouds/fujitsu/fgcp/domain/Target.java | 3 ++-
.../java/org/jclouds/fujitsu/fgcp/domain/UsageInfo.java | 3 ++-
.../main/java/org/jclouds/fujitsu/fgcp/domain/VDisk.java | 3 ++-
.../main/java/org/jclouds/fujitsu/fgcp/domain/VNIC.java | 3 ++-
.../main/java/org/jclouds/fujitsu/fgcp/domain/VNet.java | 3 ++-
.../java/org/jclouds/fujitsu/fgcp/domain/VServer.java | 3 ++-
.../jclouds/fujitsu/fgcp/domain/VServerWithDetails.java | 4 ++--
.../org/jclouds/fujitsu/fgcp/domain/VServerWithVNICs.java | 4 ++--
.../java/org/jclouds/fujitsu/fgcp/domain/VSystem.java | 3 ++-
.../jclouds/fujitsu/fgcp/domain/VSystemWithDetails.java | 4 ++--
.../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 ++-
.../main/java/org/jclouds/jenkins/v1/domain/Computer.java | 3 ++-
.../java/org/jclouds/jenkins/v1/domain/ComputerView.java | 3 ++-
.../src/main/java/org/jclouds/jenkins/v1/domain/Job.java | 5 +++--
.../java/org/jclouds/jenkins/v1/domain/JobDetails.java | 2 +-
.../java/org/jclouds/jenkins/v1/domain/LastBuild.java | 5 +++--
.../src/main/java/org/jclouds/jenkins/v1/domain/Node.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 +++--
.../java/org/jclouds/opsource/servers/domain/Account.java | 3 ++-
.../org/jclouds/opsource/servers/domain/BaseServer.java | 3 ++-
.../org/jclouds/opsource/servers/domain/DataCenter.java | 3 ++-
.../jclouds/opsource/servers/domain/DataCentersList.java | 3 ++-
.../jclouds/opsource/servers/domain/DeployedServer.java | 3 ++-
.../opsource/servers/domain/DeployedServersList.java | 3 ++-
.../opsource/servers/domain/MachineSpecification.java | 3 ++-
.../jclouds/opsource/servers/domain/OperatingSystem.java | 3 ++-
.../opsource/servers/domain/PendingDeployServer.java | 3 ++-
.../opsource/servers/domain/PendingDeployServersList.java | 3 ++-
.../org/jclouds/opsource/servers/domain/ServerImage.java | 3 ++-
.../jclouds/opsource/servers/domain/ServerImagesList.java | 3 ++-
.../java/org/jclouds/opsource/servers/domain/Status.java | 3 ++-
.../java/org/jclouds/opsource/servers/domain/Step.java | 3 ++-
.../jclouds/savvis/vpdc/config/VPDCRestClientModule.java | 3 ++-
.../java/org/jclouds/smartos/compute/domain/DataSet.java | 3 ++-
.../main/java/org/jclouds/smartos/compute/domain/VM.java | 3 ++-
.../java/org/jclouds/smartos/compute/domain/VmNIC.java | 3 ++-
.../jclouds/smartos/compute/domain/VmSpecification.java | 3 ++-
.../vcloud/director/v1_5/domain/AbstractVAppType.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 ++-
.../jclouds/vcloud/director/v1_5/domain/CapacityType.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 | 4 ++--
.../v1_5/domain/network/FirewallRuleProtocols.java | 4 ++--
.../director/v1_5/domain/network/FirewallService.java | 4 ++--
.../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 ++-
.../v1_5/domain/network/IpsecVpnManagedPeerType.java | 5 +++--
.../director/v1_5/domain/network/IpsecVpnRemotePeer.java | 4 ++--
.../director/v1_5/domain/network/IpsecVpnService.java | 3 ++-
.../director/v1_5/domain/network/IpsecVpnTunnel.java | 4 ++--
.../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 | 4 ++--
.../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/NetworkServiceType.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 ++-
.../director/v1_5/domain/params/InstantiateOvfParams.java | 2 +-
.../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/ContainerType.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/QueryResultRecordType.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 ++--
259 files changed, 488 insertions(+), 319 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/azure-management/src/main/java/org/jclouds/azure/management/domain/DeploymentParams.java
----------------------------------------------------------------------
diff --git a/azure-management/src/main/java/org/jclouds/azure/management/domain/DeploymentParams.java b/azure-management/src/main/java/org/jclouds/azure/management/domain/DeploymentParams.java
index 0d62eab..dc51c38 100644
--- a/azure-management/src/main/java/org/jclouds/azure/management/domain/DeploymentParams.java
+++ b/azure-management/src/main/java/org/jclouds/azure/management/domain/DeploymentParams.java
@@ -18,8 +18,9 @@ package org.jclouds.azure.management.domain;
import java.util.List;
+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.Lists;
/**
@@ -215,7 +216,7 @@ public class DeploymentParams {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this).add("name", name)
+ return MoreObjects.toStringHelper(this).add("name", name)
.add("sourceImageName", sourceImageName).add("size", size);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/azure-management/src/main/java/org/jclouds/azure/management/domain/DetailedHostedServiceProperties.java
----------------------------------------------------------------------
diff --git a/azure-management/src/main/java/org/jclouds/azure/management/domain/DetailedHostedServiceProperties.java b/azure-management/src/main/java/org/jclouds/azure/management/domain/DetailedHostedServiceProperties.java
index e87ed05..6cbb60f 100644
--- a/azure-management/src/main/java/org/jclouds/azure/management/domain/DetailedHostedServiceProperties.java
+++ b/azure-management/src/main/java/org/jclouds/azure/management/domain/DetailedHostedServiceProperties.java
@@ -23,7 +23,7 @@ import java.util.Map;
import org.jclouds.azure.management.domain.HostedService.Status;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableMap;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/azure-management/src/main/java/org/jclouds/azure/management/domain/Disk.java
----------------------------------------------------------------------
diff --git a/azure-management/src/main/java/org/jclouds/azure/management/domain/Disk.java b/azure-management/src/main/java/org/jclouds/azure/management/domain/Disk.java
index f58f98b..a8df087 100644
--- a/azure-management/src/main/java/org/jclouds/azure/management/domain/Disk.java
+++ b/azure-management/src/main/java/org/jclouds/azure/management/domain/Disk.java
@@ -20,8 +20,9 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.net.URI;
+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.base.Optional;
/**
@@ -139,7 +140,7 @@ public class Disk {
*/
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("deployment", hostedService).add("role", role)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("deployment", hostedService).add("role", role)
.toString();
}
@@ -451,7 +452,7 @@ public class Disk {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this).omitNullValues().add("os", os).add("name", name)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("os", os).add("name", name)
.add("attachedTo", attachedTo.orNull()).add("logicalSizeInGB", logicalSizeInGB.orNull())
.add("description", description).add("location", location.orNull())
.add("affinityGroup", affinityGroup.orNull()).add("mediaLink", mediaLink.orNull())
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/azure-management/src/main/java/org/jclouds/azure/management/domain/Error.java
----------------------------------------------------------------------
diff --git a/azure-management/src/main/java/org/jclouds/azure/management/domain/Error.java b/azure-management/src/main/java/org/jclouds/azure/management/domain/Error.java
index 82ffbd2..45106a5 100644
--- a/azure-management/src/main/java/org/jclouds/azure/management/domain/Error.java
+++ b/azure-management/src/main/java/org/jclouds/azure/management/domain/Error.java
@@ -19,6 +19,7 @@ package org.jclouds.azure.management.domain;
import static com.google.common.base.Preconditions.checkNotNull;
import com.google.common.base.CaseFormat;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -243,7 +244,7 @@ public class Error {
*/
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("code", rawCode).add("message", message).toString();
+ return MoreObjects.toStringHelper(this).omitNullValues().add("code", rawCode).add("message", message).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/azure-management/src/main/java/org/jclouds/azure/management/domain/HostedService.java
----------------------------------------------------------------------
diff --git a/azure-management/src/main/java/org/jclouds/azure/management/domain/HostedService.java b/azure-management/src/main/java/org/jclouds/azure/management/domain/HostedService.java
index 14dba4f..982266c 100644
--- a/azure-management/src/main/java/org/jclouds/azure/management/domain/HostedService.java
+++ b/azure-management/src/main/java/org/jclouds/azure/management/domain/HostedService.java
@@ -21,8 +21,9 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.net.URI;
import com.google.common.base.CaseFormat;
+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;
/**
* System properties for the specified hosted service
@@ -187,7 +188,7 @@ public class HostedService {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this).omitNullValues().add("url", url).add("name", name)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("url", url).add("name", name)
.add("properties", properties);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/azure-management/src/main/java/org/jclouds/azure/management/domain/HostedServiceProperties.java
----------------------------------------------------------------------
diff --git a/azure-management/src/main/java/org/jclouds/azure/management/domain/HostedServiceProperties.java b/azure-management/src/main/java/org/jclouds/azure/management/domain/HostedServiceProperties.java
index 5de9657..d97f20b 100644
--- a/azure-management/src/main/java/org/jclouds/azure/management/domain/HostedServiceProperties.java
+++ b/azure-management/src/main/java/org/jclouds/azure/management/domain/HostedServiceProperties.java
@@ -18,8 +18,9 @@ package org.jclouds.azure.management.domain;
import static com.google.common.base.Preconditions.checkNotNull;
+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.base.Optional;
/**
@@ -172,7 +173,7 @@ public class HostedServiceProperties {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this).omitNullValues().add("description", description.orNull())
+ return MoreObjects.toStringHelper(this).omitNullValues().add("description", description.orNull())
.add("location", location.orNull()).add("affinityGroup", affinityGroup.orNull()).add("label", label);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/azure-management/src/main/java/org/jclouds/azure/management/domain/Location.java
----------------------------------------------------------------------
diff --git a/azure-management/src/main/java/org/jclouds/azure/management/domain/Location.java b/azure-management/src/main/java/org/jclouds/azure/management/domain/Location.java
index 1d422c3..3bae9c1 100644
--- a/azure-management/src/main/java/org/jclouds/azure/management/domain/Location.java
+++ b/azure-management/src/main/java/org/jclouds/azure/management/domain/Location.java
@@ -20,6 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Set;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
@@ -153,7 +154,7 @@ public class Location {
*/
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("name", name).add("displayName", displayName)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("name", name).add("displayName", displayName)
.add("availableServices", availableServices).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/azure-management/src/main/java/org/jclouds/azure/management/domain/OSImage.java
----------------------------------------------------------------------
diff --git a/azure-management/src/main/java/org/jclouds/azure/management/domain/OSImage.java b/azure-management/src/main/java/org/jclouds/azure/management/domain/OSImage.java
index 304230a..dc6cb3e 100644
--- a/azure-management/src/main/java/org/jclouds/azure/management/domain/OSImage.java
+++ b/azure-management/src/main/java/org/jclouds/azure/management/domain/OSImage.java
@@ -20,8 +20,9 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.net.URI;
+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.base.Optional;
/**
@@ -295,7 +296,7 @@ public class OSImage {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this).omitNullValues().add("os", os).add("name", name)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("os", os).add("name", name)
.add("logicalSizeInGB", logicalSizeInGB.orNull()).add("description", description)
.add("category", category.orNull()).add("location", location.orNull())
.add("affinityGroup", affinityGroup.orNull()).add("mediaLink", mediaLink.orNull())
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/azure-management/src/main/java/org/jclouds/azure/management/domain/OSImageParams.java
----------------------------------------------------------------------
diff --git a/azure-management/src/main/java/org/jclouds/azure/management/domain/OSImageParams.java b/azure-management/src/main/java/org/jclouds/azure/management/domain/OSImageParams.java
index ceea920..4a9fce5 100644
--- a/azure-management/src/main/java/org/jclouds/azure/management/domain/OSImageParams.java
+++ b/azure-management/src/main/java/org/jclouds/azure/management/domain/OSImageParams.java
@@ -20,8 +20,9 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.net.URI;
+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;
/**
* The Add OS Image operation adds an OS image that is currently stored in a storage account in your
@@ -169,7 +170,7 @@ public class OSImageParams {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this).add("label", label).add("mediaLink", mediaLink).add("name", name)
+ return MoreObjects.toStringHelper(this).add("label", label).add("mediaLink", mediaLink).add("name", name)
.add("os", os);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/azure-management/src/main/java/org/jclouds/azure/management/domain/Operation.java
----------------------------------------------------------------------
diff --git a/azure-management/src/main/java/org/jclouds/azure/management/domain/Operation.java b/azure-management/src/main/java/org/jclouds/azure/management/domain/Operation.java
index 9d6b40e..f925288 100644
--- a/azure-management/src/main/java/org/jclouds/azure/management/domain/Operation.java
+++ b/azure-management/src/main/java/org/jclouds/azure/management/domain/Operation.java
@@ -19,6 +19,7 @@ package org.jclouds.azure.management.domain;
import static com.google.common.base.Preconditions.checkNotNull;
import com.google.common.base.CaseFormat;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Optional;
@@ -202,7 +203,7 @@ public class Operation {
*/
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("id", id).add("status", rawStatus)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("id", id).add("status", rawStatus)
.add("httpStatusCode", httpStatusCode).add("error", error.orNull()).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/azure-management/src/main/java/org/jclouds/azure/management/options/CreateHostedServiceOptions.java
----------------------------------------------------------------------
diff --git a/azure-management/src/main/java/org/jclouds/azure/management/options/CreateHostedServiceOptions.java b/azure-management/src/main/java/org/jclouds/azure/management/options/CreateHostedServiceOptions.java
index 2722dd5..f33308a 100644
--- a/azure-management/src/main/java/org/jclouds/azure/management/options/CreateHostedServiceOptions.java
+++ b/azure-management/src/main/java/org/jclouds/azure/management/options/CreateHostedServiceOptions.java
@@ -18,6 +18,7 @@ package org.jclouds.azure.management.options;
import java.util.Map;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Optional;
@@ -119,7 +120,7 @@ public class CreateHostedServiceOptions implements Cloneable {
*/
@Override
public String toString() {
- return Objects.toStringHelper("").omitNullValues().add("description", description.orNull())
+ return MoreObjects.toStringHelper("").omitNullValues().add("description", description.orNull())
.add("extendedProperties", extendedProperties.orNull()).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/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 dffd298..91ee99f 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,8 +25,9 @@ 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;
@@ -278,7 +279,7 @@ public class CDMIObject {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("").add("objectID", objectID).add("objectName", objectName)
+ return MoreObjects.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/b851f0ac/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 d8ccaf0..4bce943 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.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
public class Container extends CDMIObject {
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/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 4314705..43f2b51 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.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.io.ByteSource;
import com.google.common.io.Files;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/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 4d1b2bb..3a25388 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
@@ -22,7 +22,7 @@ import java.util.Set;
import org.jclouds.compute.options.TemplateOptions;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/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 02022ae..cc25cdc 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.sameThreadExecutor;
+import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService;
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(sameThreadExecutor(),
- sameThreadExecutor()));
+ private final Set<Module> modules = ImmutableSet.<Module> of(new ExecutorServiceModule(newDirectExecutorService(),
+ newDirectExecutorService()));
protected String provider;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/dmtf/src/main/java/org/jclouds/dmtf/cim/CimString.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/cim/CimString.java b/dmtf/src/main/java/org/jclouds/dmtf/cim/CimString.java
index 676dc22..8f8b18d 100644
--- a/dmtf/src/main/java/org/jclouds/dmtf/cim/CimString.java
+++ b/dmtf/src/main/java/org/jclouds/dmtf/cim/CimString.java
@@ -25,6 +25,7 @@ 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;
@@ -88,7 +89,7 @@ public class CimString {
@Override
public String toString() {
- return Objects.toStringHelper("").add("value", value).toString();
+ return MoreObjects.toStringHelper("").add("value", value).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/dmtf/src/main/java/org/jclouds/dmtf/cim/ResourceAllocationSettingData.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/cim/ResourceAllocationSettingData.java b/dmtf/src/main/java/org/jclouds/dmtf/cim/ResourceAllocationSettingData.java
index 6ef6631..8b76485 100644
--- a/dmtf/src/main/java/org/jclouds/dmtf/cim/ResourceAllocationSettingData.java
+++ b/dmtf/src/main/java/org/jclouds/dmtf/cim/ResourceAllocationSettingData.java
@@ -31,8 +31,9 @@ import javax.xml.bind.annotation.XmlEnumValue;
import javax.xml.bind.annotation.XmlType;
import com.google.common.base.Function;
+import com.google.common.base.MoreObjects;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
@@ -829,7 +830,7 @@ public class ResourceAllocationSettingData {
}
public ToStringHelper string() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("elementName", elementName)
.add("instanceID", instanceID)
.add("caption", caption)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/dmtf/src/main/java/org/jclouds/dmtf/cim/VirtualSystemSettingData.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/cim/VirtualSystemSettingData.java b/dmtf/src/main/java/org/jclouds/dmtf/cim/VirtualSystemSettingData.java
index 7039b92..7e7ee35 100644
--- a/dmtf/src/main/java/org/jclouds/dmtf/cim/VirtualSystemSettingData.java
+++ b/dmtf/src/main/java/org/jclouds/dmtf/cim/VirtualSystemSettingData.java
@@ -31,6 +31,7 @@ import javax.xml.bind.annotation.XmlEnumValue;
import javax.xml.bind.annotation.XmlType;
import com.google.common.base.Function;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
@@ -692,7 +693,7 @@ public class VirtualSystemSettingData {
@Override
public String toString() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("elementName", elementName)
.add("instanceID", instanceID)
.add("caption", caption)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/dmtf/src/main/java/org/jclouds/dmtf/ovf/Configuration.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/ovf/Configuration.java b/dmtf/src/main/java/org/jclouds/dmtf/ovf/Configuration.java
index 3dc2474..0669a32 100644
--- a/dmtf/src/main/java/org/jclouds/dmtf/ovf/Configuration.java
+++ b/dmtf/src/main/java/org/jclouds/dmtf/ovf/Configuration.java
@@ -22,6 +22,7 @@ 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 = {
@@ -124,8 +125,8 @@ public class Configuration {
return string().toString();
}
- protected Objects.ToStringHelper string() {
- return Objects.toStringHelper("").add("id", id).add("default", isDefault).add("label", label).add("description", description);
+ protected MoreObjects.ToStringHelper string() {
+ return MoreObjects.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/b851f0ac/dmtf/src/main/java/org/jclouds/dmtf/ovf/DeploymentOptionSection.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/ovf/DeploymentOptionSection.java b/dmtf/src/main/java/org/jclouds/dmtf/ovf/DeploymentOptionSection.java
index 198556b..253bc0b 100644
--- a/dmtf/src/main/java/org/jclouds/dmtf/ovf/DeploymentOptionSection.java
+++ b/dmtf/src/main/java/org/jclouds/dmtf/ovf/DeploymentOptionSection.java
@@ -25,6 +25,7 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
@@ -115,7 +116,7 @@ public class DeploymentOptionSection extends SectionType {
}
@Override
- protected Objects.ToStringHelper string() {
+ protected MoreObjects.ToStringHelper string() {
return super.string().add("configurations", configurations);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/dmtf/src/main/java/org/jclouds/dmtf/ovf/DiskSection.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/ovf/DiskSection.java b/dmtf/src/main/java/org/jclouds/dmtf/ovf/DiskSection.java
index 5d17fc0..7c19370 100644
--- a/dmtf/src/main/java/org/jclouds/dmtf/ovf/DiskSection.java
+++ b/dmtf/src/main/java/org/jclouds/dmtf/ovf/DiskSection.java
@@ -24,6 +24,7 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
@@ -120,7 +121,7 @@ public class DiskSection extends SectionType {
}
@Override
- protected Objects.ToStringHelper string() {
+ protected MoreObjects.ToStringHelper string() {
return super.string().add("disks", disks);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/dmtf/src/main/java/org/jclouds/dmtf/ovf/Item.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/ovf/Item.java b/dmtf/src/main/java/org/jclouds/dmtf/ovf/Item.java
index 8901a0d..7c9e07f 100644
--- a/dmtf/src/main/java/org/jclouds/dmtf/ovf/Item.java
+++ b/dmtf/src/main/java/org/jclouds/dmtf/ovf/Item.java
@@ -27,6 +27,7 @@ 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;
@@ -179,7 +180,7 @@ public class Item {
@Override
public String toString() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("id", id)
.add("order", order)
.add("startDelay", startDelay)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/dmtf/src/main/java/org/jclouds/dmtf/ovf/MsgType.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/ovf/MsgType.java b/dmtf/src/main/java/org/jclouds/dmtf/ovf/MsgType.java
index ef6b29b..069d42a 100644
--- a/dmtf/src/main/java/org/jclouds/dmtf/ovf/MsgType.java
+++ b/dmtf/src/main/java/org/jclouds/dmtf/ovf/MsgType.java
@@ -22,6 +22,7 @@ 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;
@@ -135,7 +136,7 @@ public class MsgType {
@Override
public String toString() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("value", value).add("msgid", msgid).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/dmtf/src/main/java/org/jclouds/dmtf/ovf/NetworkSection.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/ovf/NetworkSection.java b/dmtf/src/main/java/org/jclouds/dmtf/ovf/NetworkSection.java
index a9df5d0..e40f177 100644
--- a/dmtf/src/main/java/org/jclouds/dmtf/ovf/NetworkSection.java
+++ b/dmtf/src/main/java/org/jclouds/dmtf/ovf/NetworkSection.java
@@ -23,6 +23,7 @@ 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;
@@ -115,7 +116,7 @@ public class NetworkSection extends SectionType {
}
@Override
- protected Objects.ToStringHelper string() {
+ protected MoreObjects.ToStringHelper string() {
return super.string()
.add("networks", networks);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/dmtf/src/main/java/org/jclouds/dmtf/ovf/OperatingSystemSection.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/ovf/OperatingSystemSection.java b/dmtf/src/main/java/org/jclouds/dmtf/ovf/OperatingSystemSection.java
index dde69ce..b01bed7 100644
--- a/dmtf/src/main/java/org/jclouds/dmtf/ovf/OperatingSystemSection.java
+++ b/dmtf/src/main/java/org/jclouds/dmtf/ovf/OperatingSystemSection.java
@@ -22,6 +22,7 @@ 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;
/**
@@ -146,7 +147,7 @@ public class OperatingSystemSection extends SectionType {
}
@Override
- protected Objects.ToStringHelper string() {
+ protected MoreObjects.ToStringHelper string() {
return super.string()
.add("id", id)
.add("version", version)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/dmtf/src/main/java/org/jclouds/dmtf/ovf/ProductSection.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/ovf/ProductSection.java b/dmtf/src/main/java/org/jclouds/dmtf/ovf/ProductSection.java
index 8b4c5d6..ac3bb26 100644
--- a/dmtf/src/main/java/org/jclouds/dmtf/ovf/ProductSection.java
+++ b/dmtf/src/main/java/org/jclouds/dmtf/ovf/ProductSection.java
@@ -28,6 +28,7 @@ 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;
@@ -284,7 +285,7 @@ public class ProductSection extends SectionType {
}
@Override
- protected Objects.ToStringHelper string() {
+ protected MoreObjects.ToStringHelper string() {
return super.string()
.add("product", product)
.add("vendor", vendor)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/dmtf/src/main/java/org/jclouds/dmtf/ovf/Property.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/ovf/Property.java b/dmtf/src/main/java/org/jclouds/dmtf/ovf/Property.java
index c404694..eb19fef 100644
--- a/dmtf/src/main/java/org/jclouds/dmtf/ovf/Property.java
+++ b/dmtf/src/main/java/org/jclouds/dmtf/ovf/Property.java
@@ -27,6 +27,7 @@ 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;
@@ -293,7 +294,7 @@ public class Property {
@Override
public String toString() {
- return Objects.toStringHelper("")
+ return MoreObjects.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/b851f0ac/dmtf/src/main/java/org/jclouds/dmtf/ovf/SectionType.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/ovf/SectionType.java b/dmtf/src/main/java/org/jclouds/dmtf/ovf/SectionType.java
index cc532a7..aadaf96 100644
--- a/dmtf/src/main/java/org/jclouds/dmtf/ovf/SectionType.java
+++ b/dmtf/src/main/java/org/jclouds/dmtf/ovf/SectionType.java
@@ -23,6 +23,7 @@ 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;
/**
@@ -134,8 +135,8 @@ public abstract class SectionType {
return string().toString();
}
- protected Objects.ToStringHelper string() {
- return Objects.toStringHelper("").add("info", info).add("required", required);
+ protected MoreObjects.ToStringHelper string() {
+ return MoreObjects.toStringHelper("").add("info", info).add("required", required);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/dmtf/src/main/java/org/jclouds/dmtf/ovf/StartupSection.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/ovf/StartupSection.java b/dmtf/src/main/java/org/jclouds/dmtf/ovf/StartupSection.java
index fecdfa3..3acf05a 100644
--- a/dmtf/src/main/java/org/jclouds/dmtf/ovf/StartupSection.java
+++ b/dmtf/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.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/dmtf/src/main/java/org/jclouds/dmtf/ovf/VirtualHardwareSection.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/ovf/VirtualHardwareSection.java b/dmtf/src/main/java/org/jclouds/dmtf/ovf/VirtualHardwareSection.java
index 864d153..0d4d0f9 100644
--- a/dmtf/src/main/java/org/jclouds/dmtf/ovf/VirtualHardwareSection.java
+++ b/dmtf/src/main/java/org/jclouds/dmtf/ovf/VirtualHardwareSection.java
@@ -28,6 +28,7 @@ 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;
@@ -189,7 +190,7 @@ public class VirtualHardwareSection extends SectionType {
}
@Override
- protected Objects.ToStringHelper string() {
+ protected MoreObjects.ToStringHelper string() {
return super.string()
.add("transport", transport)
.add("virtualSystem", virtualSystem)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/dmtf/src/main/java/org/jclouds/dmtf/ovf/environment/PlatformSectionType.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/ovf/environment/PlatformSectionType.java b/dmtf/src/main/java/org/jclouds/dmtf/ovf/environment/PlatformSectionType.java
index fd56577..0a766de 100644
--- a/dmtf/src/main/java/org/jclouds/dmtf/ovf/environment/PlatformSectionType.java
+++ b/dmtf/src/main/java/org/jclouds/dmtf/ovf/environment/PlatformSectionType.java
@@ -25,6 +25,7 @@ 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;
@@ -132,7 +133,7 @@ public class PlatformSectionType extends SectionType<PlatformSectionType> {
}
@Override
- protected Objects.ToStringHelper string() {
+ protected MoreObjects.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/b851f0ac/dmtf/src/main/java/org/jclouds/dmtf/ovf/environment/PropertySectionType.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/ovf/environment/PropertySectionType.java b/dmtf/src/main/java/org/jclouds/dmtf/ovf/environment/PropertySectionType.java
index 1d88afd..cb1229f 100644
--- a/dmtf/src/main/java/org/jclouds/dmtf/ovf/environment/PropertySectionType.java
+++ b/dmtf/src/main/java/org/jclouds/dmtf/ovf/environment/PropertySectionType.java
@@ -23,6 +23,7 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.Sets;
@@ -96,7 +97,7 @@ public class PropertySectionType extends SectionType<PropertySectionType> {
}
@Override
- protected Objects.ToStringHelper string() {
+ protected MoreObjects.ToStringHelper string() {
return super.string()
.add("properties", properties).add("any", any);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/dmtf/src/main/java/org/jclouds/dmtf/ovf/environment/SectionType.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/ovf/environment/SectionType.java b/dmtf/src/main/java/org/jclouds/dmtf/ovf/environment/SectionType.java
index 0345933..6f8e653 100644
--- a/dmtf/src/main/java/org/jclouds/dmtf/ovf/environment/SectionType.java
+++ b/dmtf/src/main/java/org/jclouds/dmtf/ovf/environment/SectionType.java
@@ -23,6 +23,7 @@ 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;
@@ -83,8 +84,8 @@ public abstract class SectionType<T extends SectionType<T>> {
return string().toString();
}
- protected Objects.ToStringHelper string() {
- return Objects.toStringHelper("").add("otherAttributes", otherAttributes);
+ protected MoreObjects.ToStringHelper string() {
+ return MoreObjects.toStringHelper("").add("otherAttributes", otherAttributes);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/dmtf/src/main/java/org/jclouds/dmtf/ovf/internal/BaseEnvelope.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/ovf/internal/BaseEnvelope.java b/dmtf/src/main/java/org/jclouds/dmtf/ovf/internal/BaseEnvelope.java
index d0bbea7..f105f78 100644
--- a/dmtf/src/main/java/org/jclouds/dmtf/ovf/internal/BaseEnvelope.java
+++ b/dmtf/src/main/java/org/jclouds/dmtf/ovf/internal/BaseEnvelope.java
@@ -24,6 +24,7 @@ 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;
@@ -166,8 +167,8 @@ public abstract class BaseEnvelope<V extends BaseVirtualSystem, E extends BaseEn
return string().toString();
}
- protected Objects.ToStringHelper string() {
- return Objects.toStringHelper("")
+ protected MoreObjects.ToStringHelper string() {
+ return MoreObjects.toStringHelper("")
.add("diskSections", diskSections)
.add("networkSections", networkSections)
.add("additionalSections", additionalSections)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/dmtf/src/main/java/org/jclouds/dmtf/ovf/internal/BaseVirtualSystem.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/ovf/internal/BaseVirtualSystem.java b/dmtf/src/main/java/org/jclouds/dmtf/ovf/internal/BaseVirtualSystem.java
index 951ff98..4a82f74 100644
--- a/dmtf/src/main/java/org/jclouds/dmtf/ovf/internal/BaseVirtualSystem.java
+++ b/dmtf/src/main/java/org/jclouds/dmtf/ovf/internal/BaseVirtualSystem.java
@@ -29,6 +29,7 @@ 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;
@@ -160,7 +161,7 @@ public abstract class BaseVirtualSystem extends SectionType {
}
@Override
- protected Objects.ToStringHelper string() {
+ protected MoreObjects.ToStringHelper string() {
return super.string()
.add("id", id)
.add("name", name)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/docker/src/main/java/org/jclouds/docker/compute/options/DockerTemplateOptions.java
----------------------------------------------------------------------
diff --git a/docker/src/main/java/org/jclouds/docker/compute/options/DockerTemplateOptions.java b/docker/src/main/java/org/jclouds/docker/compute/options/DockerTemplateOptions.java
index 5e4669b..36029da 100644
--- a/docker/src/main/java/org/jclouds/docker/compute/options/DockerTemplateOptions.java
+++ b/docker/src/main/java/org/jclouds/docker/compute/options/DockerTemplateOptions.java
@@ -16,6 +16,7 @@
*/
package org.jclouds.docker.compute.options;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableList;
@@ -109,7 +110,7 @@ public class DockerTemplateOptions extends TemplateOptions implements Cloneable
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("dns", dns)
.add("hostname", hostname)
.add("memory", memory)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/docker/src/main/java/org/jclouds/docker/domain/Config.java
----------------------------------------------------------------------
diff --git a/docker/src/main/java/org/jclouds/docker/domain/Config.java b/docker/src/main/java/org/jclouds/docker/domain/Config.java
index 9c80472..3674d6d 100644
--- a/docker/src/main/java/org/jclouds/docker/domain/Config.java
+++ b/docker/src/main/java/org/jclouds/docker/domain/Config.java
@@ -16,6 +16,7 @@
*/
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;
@@ -245,7 +246,7 @@ public class Config {
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("hostname", hostname)
.add("domainName", domainName)
.add("user", user)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/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 2752529..0f0c727 100644
--- a/docker/src/main/java/org/jclouds/docker/domain/Container.java
+++ b/docker/src/main/java/org/jclouds/docker/domain/Container.java
@@ -16,6 +16,7 @@
*/
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;
@@ -210,7 +211,7 @@ public class Container {
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id)
.add("name", name)
.add("created", created)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/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 b7a831a..347ad3a 100644
--- a/docker/src/main/java/org/jclouds/docker/domain/ExposedPorts.java
+++ b/docker/src/main/java/org/jclouds/docker/domain/ExposedPorts.java
@@ -22,6 +22,7 @@ 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;
@@ -65,7 +66,7 @@ public class ExposedPorts {
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("portAndProtocol", portAndProtocol)
.add("hostPorts", hostPorts)
.toString();
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/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 275961f..94155c3 100644
--- a/docker/src/main/java/org/jclouds/docker/domain/HostConfig.java
+++ b/docker/src/main/java/org/jclouds/docker/domain/HostConfig.java
@@ -23,6 +23,7 @@ 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;
@@ -135,7 +136,7 @@ public class HostConfig {
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("containerIDFile", containerIDFile)
.add("binds", binds)
.add("lxcConf", lxcConf)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/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 186ece3..80d6f68 100644
--- a/docker/src/main/java/org/jclouds/docker/domain/Image.java
+++ b/docker/src/main/java/org/jclouds/docker/domain/Image.java
@@ -16,6 +16,7 @@
*/
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;
@@ -132,7 +133,7 @@ public class Image {
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id)
.add("parent", parent)
.add("created", created)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/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 23f3fbe..0c60719 100644
--- a/docker/src/main/java/org/jclouds/docker/domain/NetworkSettings.java
+++ b/docker/src/main/java/org/jclouds/docker/domain/NetworkSettings.java
@@ -16,6 +16,7 @@
*/
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;
@@ -99,7 +100,7 @@ public class NetworkSettings {
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("ipAddress", ipAddress)
.add("ipPrefixLen", ipPrefixLen)
.add("gateway", gateway)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/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 b49dfa6..3a43ec5 100644
--- a/docker/src/main/java/org/jclouds/docker/domain/Port.java
+++ b/docker/src/main/java/org/jclouds/docker/domain/Port.java
@@ -16,6 +16,7 @@
*/
package org.jclouds.docker.domain;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.gson.annotations.SerializedName;
@@ -78,7 +79,7 @@ public class Port {
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("privatePort", privatePort)
.add("publicPort", publicPort)
.add("type", type)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/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 ac1ba85..cc665c8 100644
--- a/docker/src/main/java/org/jclouds/docker/domain/State.java
+++ b/docker/src/main/java/org/jclouds/docker/domain/State.java
@@ -19,6 +19,7 @@ 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;
@@ -92,7 +93,7 @@ public class State {
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("pid", pid)
.add("running", running)
.add("exitCode", exitCode)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/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 445a225..f6dbb49 100644
--- a/docker/src/main/java/org/jclouds/docker/domain/Version.java
+++ b/docker/src/main/java/org/jclouds/docker/domain/Version.java
@@ -19,6 +19,7 @@ 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;
@@ -92,7 +93,7 @@ public class Version {
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("arch", arch)
.add("gitCommit", gitCommit)
.add("goVersion", goVersion)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/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 146b2a0..04020b6 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.sameThreadExecutor;
+import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService;
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(sameThreadExecutor(),
- sameThreadExecutor()));
+ private final Set<Module> modules = ImmutableSet.<Module> of(new ExecutorServiceModule(newDirectExecutorService(),
+ newDirectExecutorService()));
protected String provider;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/FGCPCredentials.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/FGCPCredentials.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/FGCPCredentials.java
index b74a925..70fe72b 100644
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/FGCPCredentials.java
+++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/FGCPCredentials.java
@@ -22,6 +22,7 @@ import java.util.Collection;
import org.jclouds.domain.Credentials;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Preconditions;
@@ -100,7 +101,7 @@ public class FGCPCredentials extends Credentials {
}
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("identity", identity)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("identity", identity)
.add("credential", credential == null ? null : ((Object) (Integer.valueOf(credential.hashCode()))))
.add("privateKey", privateKey.hashCode()).add("certificates", certificates.hashCode()).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/BuiltinServerBackup.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/BuiltinServerBackup.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/BuiltinServerBackup.java
index 7a90a0f..5bae70d 100644
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/BuiltinServerBackup.java
+++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/BuiltinServerBackup.java
@@ -19,6 +19,7 @@ package org.jclouds.fujitsu.fgcp.domain;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -65,7 +66,7 @@ public class BuiltinServerBackup {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("id", id)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("id", id)
.add("time", time).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/CPU.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/CPU.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/CPU.java
index abab543..33f3931 100644
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/CPU.java
+++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/CPU.java
@@ -19,6 +19,7 @@ package org.jclouds.fujitsu.fgcp.domain;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -66,7 +67,7 @@ public class CPU {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues()
+ return MoreObjects.toStringHelper(this).omitNullValues()
.add("cores", cores).add("speedPerCore", speedPerCore)
.add("arch", arch).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Direction.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Direction.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Direction.java
index 303885a..b3ac788 100644
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Direction.java
+++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Direction.java
@@ -18,6 +18,7 @@ package org.jclouds.fujitsu.fgcp.domain;
import java.util.Set;
+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,7 +102,7 @@ public class Direction {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("from", from)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("from", from)
.add("to", to).add("prefix", prefix).add("policies", policies)
.add("maxPolicyNum", maxPolicyNum)
.add("acceptable", acceptable).toString();
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/DiskImage.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/DiskImage.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/DiskImage.java
index ad7ed5e..3d2c0c0 100644
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/DiskImage.java
+++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/DiskImage.java
@@ -22,6 +22,7 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementWrapper;
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;
@@ -186,7 +187,7 @@ public class DiskImage {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("id", id)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("id", id)
.add("name", name).add("osName", osName).add("osType", osType)
.add("size", size).add("creatorName", creatorName)
.add("description", description)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/EventLog.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/EventLog.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/EventLog.java
index 98138c6..a5578c8 100644
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/EventLog.java
+++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/EventLog.java
@@ -18,6 +18,7 @@ package org.jclouds.fujitsu.fgcp.domain;
import javax.xml.bind.annotation.XmlRootElement;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -87,7 +88,7 @@ public class EventLog {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues()
+ return MoreObjects.toStringHelper(this).omitNullValues()
.add("entryDate", entryDate).add("title", title)
.add("message", message).add("startDate", startDate)
.add("expiry", expiry).toString();
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Group.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Group.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Group.java
index 917f7cd..a71994e 100644
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Group.java
+++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Group.java
@@ -20,6 +20,7 @@ import java.util.Set;
import javax.xml.bind.annotation.XmlEnumValue;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
@@ -208,7 +209,7 @@ public class Group {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("id", id)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("id", id)
.add("protocol", protocol).add("port1", port1)
.add("port2", port2).add("balanceType", balanceType)
.add("uniqueType", uniqueType).add("monitorType", monitorType)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Image.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Image.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Image.java
index 20004bc..1122e45 100644
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Image.java
+++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Image.java
@@ -21,6 +21,7 @@ import java.util.Set;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementWrapper;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
@@ -100,7 +101,7 @@ public class Image {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("id", id)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("id", id)
.add("serverCategory", serverCategory)
.add("serverApplication", serverApplication)
.add("cpuBit", cpuBit).add("sysvolSize", sysvolSize)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Information.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Information.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Information.java
index 9b6c5d3..62c1531 100644
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Information.java
+++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Information.java
@@ -16,6 +16,7 @@
*/
package org.jclouds.fujitsu.fgcp.domain;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -93,7 +94,7 @@ public class Information {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues()
+ return MoreObjects.toStringHelper(this).omitNullValues()
.add("seqno", seqno).add("entryDate", entryDate)
.add("title", title).add("message", message)
.add("startDate", startDate).add("expiry", expiry).toString();
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/IntermediateCACert.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/IntermediateCACert.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/IntermediateCACert.java
index 66be9f4..9a261c2 100644
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/IntermediateCACert.java
+++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/IntermediateCACert.java
@@ -18,6 +18,7 @@ package org.jclouds.fujitsu.fgcp.domain;
import javax.xml.bind.annotation.XmlRootElement;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -101,7 +102,7 @@ public class IntermediateCACert implements Comparable<IntermediateCACert> {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues()
+ return MoreObjects.toStringHelper(this).omitNullValues()
.add("ccacertNum", ccacertNum).add("issuer", issuer)
.add("subject", subject).add("validity", validity)
.add("description", description).add("detail", detail)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/LoadStatistics.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/LoadStatistics.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/LoadStatistics.java
index fc1143e..499d701 100644
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/LoadStatistics.java
+++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/LoadStatistics.java
@@ -20,6 +20,7 @@ import java.util.Set;
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;
@@ -58,7 +59,7 @@ public class LoadStatistics {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues()
+ return MoreObjects.toStringHelper(this).omitNullValues()
.add("groups", groups).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Memory.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Memory.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Memory.java
index c3009a3..379bdd0 100644
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Memory.java
+++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Memory.java
@@ -18,6 +18,7 @@ package org.jclouds.fujitsu.fgcp.domain;
import javax.xml.bind.annotation.XmlElement;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -50,7 +51,7 @@ public class Memory implements Comparable<Memory> {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("size", size)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("size", size)
.toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/NAT.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/NAT.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/NAT.java
index 104e257..70f3d4c 100644
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/NAT.java
+++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/NAT.java
@@ -18,6 +18,7 @@ package org.jclouds.fujitsu.fgcp.domain;
import java.util.Set;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
@@ -55,7 +56,7 @@ public class NAT {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues()
+ return MoreObjects.toStringHelper(this).omitNullValues()
.add("rules", rules).toString();
}
}
[2/4] JCLOUDS-653: Address Guava 18 deprecations
Posted by ga...@apache.org.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CapacityWithUsage.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CapacityWithUsage.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CapacityWithUsage.java
index 2e847d9..86dbd46 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CapacityWithUsage.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CapacityWithUsage.java
@@ -21,9 +21,9 @@ import static com.google.common.base.Objects.equal;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-
/**
* Represents a capacity and usage of a given resource.
* <p/>
@@ -184,7 +184,7 @@ public class CapacityWithUsage extends CapacityType<CapacityWithUsage>
@Override
public String toString() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("used", used)
.add("overhead", overhead).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Catalog.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Catalog.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Catalog.java
index 7e9704b..37d7b61 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Catalog.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Catalog.java
@@ -28,7 +28,7 @@ import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.bind.annotation.XmlType;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ComputeCapacity.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ComputeCapacity.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ComputeCapacity.java
index 692b501..3b7b970 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ComputeCapacity.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ComputeCapacity.java
@@ -21,6 +21,7 @@ import static com.google.common.base.Objects.equal;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
@@ -144,7 +145,7 @@ public class ComputeCapacity {
@Override
public String toString() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("cpu", cpu)
.add("memory", memory).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Entity.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Entity.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Entity.java
index 2228d7b..44607a7 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Entity.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Entity.java
@@ -28,7 +28,7 @@ import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Error.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Error.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Error.java
index 574ab89..34c7142 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Error.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Error.java
@@ -31,6 +31,7 @@ import javax.xml.bind.annotation.XmlType;
import org.jclouds.logging.Logger;
import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Optional;
import com.google.common.base.Predicate;
@@ -247,7 +248,7 @@ public class Error {
@Override
public String toString() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("message", message).add("majorErrorCode", majorErrorCode).add("minorErrorCode", minorErrorCode)
.add("vendorSpecificErrorCode", vendorSpecificErrorCode).add("stackTrace", stackTrace)
.toString();
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/File.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/File.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/File.java
index 7f1a406..8d88dbd 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/File.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/File.java
@@ -25,7 +25,7 @@ import javax.xml.bind.annotation.adapters.NormalizedStringAdapter;
import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Link.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Link.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Link.java
index fc0e6f8..e30c6d0 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Link.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Link.java
@@ -30,7 +30,7 @@ import javax.xml.bind.annotation.XmlType;
import com.google.common.base.Function;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Media.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Media.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Media.java
index 9d9be02..ba4d21c 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Media.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Media.java
@@ -31,7 +31,7 @@ import javax.xml.bind.annotation.XmlType;
import com.google.common.base.Function;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Metadata.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Metadata.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Metadata.java
index 9da3f6f..b1cfd96 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Metadata.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Metadata.java
@@ -29,7 +29,7 @@ import javax.xml.bind.annotation.XmlRootElement;
import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/MetadataEntry.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/MetadataEntry.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/MetadataEntry.java
index 4e03a4d..65c711c 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/MetadataEntry.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/MetadataEntry.java
@@ -28,7 +28,7 @@ import javax.xml.bind.annotation.XmlRootElement;
import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.Sets;
/**
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Owner.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Owner.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Owner.java
index 170ab9e..d15382c 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Owner.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Owner.java
@@ -23,7 +23,7 @@ import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Represents the owner of this entity.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ProductSectionList.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ProductSectionList.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ProductSectionList.java
index 3bb8964..717fbcc 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ProductSectionList.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ProductSectionList.java
@@ -31,7 +31,7 @@ import org.jclouds.dmtf.DMTFConstants;
import org.jclouds.dmtf.ovf.ProductSection;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RasdItemsList.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RasdItemsList.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RasdItemsList.java
index 41b716c..f965850 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RasdItemsList.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/RasdItemsList.java
@@ -30,7 +30,7 @@ import javax.xml.bind.annotation.XmlType;
import org.jclouds.vcloud.director.v1_5.domain.dmtf.RasdItem;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.Sets;
/**
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Reference.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Reference.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Reference.java
index a1a3659..e2bc31d 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Reference.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Reference.java
@@ -28,8 +28,9 @@ import javax.xml.bind.annotation.XmlType;
import org.jclouds.logging.Logger;
+import com.google.common.base.MoreObjects;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
/**
* A reference to a resource.
@@ -197,7 +198,7 @@ public class Reference {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("").add("href", href).add("name", name).add("type", type);
+ return MoreObjects.toStringHelper("").add("href", href).add("name", name).add("type", type);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/References.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/References.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/References.java
index 15adf2a..e5030f1 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/References.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/References.java
@@ -27,7 +27,7 @@ import javax.xml.bind.annotation.XmlType;
import org.jclouds.vcloud.director.v1_5.domain.query.ContainerType;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.Sets;
/**
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Resource.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Resource.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Resource.java
index 8a36ba9..5f262c0 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Resource.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Resource.java
@@ -30,8 +30,9 @@ import javax.xml.bind.annotation.XmlType;
import org.jclouds.logging.Logger;
+import com.google.common.base.MoreObjects;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
@@ -201,6 +202,6 @@ public class Resource {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("").add("href", href).add("links", links).add("type", type);
+ return MoreObjects.toStringHelper("").add("href", href).add("links", links).add("type", type);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ResourceEntity.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ResourceEntity.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ResourceEntity.java
index f1175bb..b025475 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ResourceEntity.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ResourceEntity.java
@@ -29,7 +29,7 @@ import javax.xml.bind.annotation.XmlEnumValue;
import javax.xml.bind.annotation.XmlType;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Optional;
import com.google.common.base.Predicate;
import com.google.common.collect.Iterables;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ScreenTicket.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ScreenTicket.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ScreenTicket.java
index 3ccc405..e6624cd 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ScreenTicket.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/ScreenTicket.java
@@ -22,6 +22,7 @@ import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlValue;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -98,6 +99,6 @@ public class ScreenTicket {
@Override
public String toString() {
- return Objects.toStringHelper("").add("value", value).toString();
+ return MoreObjects.toStringHelper("").add("value", value).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Session.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Session.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Session.java
index dbc8d9d..8b68d58 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Session.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Session.java
@@ -29,6 +29,7 @@ import javax.xml.bind.annotation.XmlRootElement;
import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
@@ -168,7 +169,7 @@ public class Session {
@Override
public String toString() {
- return Objects.toStringHelper("").add("user", user).add("org", org).add("href", href).add("links", links)
+ return MoreObjects.toStringHelper("").add("user", user).add("org", org).add("href", href).add("links", links)
.toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/SessionWithToken.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/SessionWithToken.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/SessionWithToken.java
index 815dd76..7a233cd 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/SessionWithToken.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/SessionWithToken.java
@@ -18,6 +18,7 @@ package org.jclouds.vcloud.director.v1_5.domain;
import static com.google.common.base.Objects.equal;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -115,6 +116,6 @@ public class SessionWithToken {
@Override
public String toString() {
- return Objects.toStringHelper("").add("session", session).add("token", token).toString();
+ return MoreObjects.toStringHelper("").add("session", session).add("token", token).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Task.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Task.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Task.java
index 89717cd..d14ee79 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Task.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Task.java
@@ -34,7 +34,7 @@ import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
import com.google.common.base.Function;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/TasksList.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/TasksList.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/TasksList.java
index 0cca47d..8d25878 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/TasksList.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/TasksList.java
@@ -29,7 +29,7 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/User.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/User.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/User.java
index 48ccf46..391106e 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/User.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/User.java
@@ -26,6 +26,7 @@ import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
@@ -606,7 +607,7 @@ public class User extends Entity {
@Override
public String toString() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("fullName", fullName)
.add("emailAddress", emailAddress)
.add("telephone", telephone)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VApp.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VApp.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VApp.java
index bf71f6e..18a1cee 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VApp.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VApp.java
@@ -24,7 +24,7 @@ import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Represents a vApp.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppChildren.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppChildren.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppChildren.java
index 5340113..f0a17d2 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppChildren.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppChildren.java
@@ -24,6 +24,7 @@ import java.util.List;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.Lists;
@@ -139,6 +140,6 @@ public class VAppChildren {
@Override
public String toString() {
- return Objects.toStringHelper("").add("vApps", vApps).add("vms", vms).toString();
+ return MoreObjects.toStringHelper("").add("vApps", vApps).add("vms", vms).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppTemplate.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppTemplate.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppTemplate.java
index d91ee7c..e1fe0cc 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppTemplate.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VAppTemplate.java
@@ -43,6 +43,7 @@ import org.jclouds.vcloud.director.v1_5.domain.section.OperatingSystemSection;
import org.jclouds.vcloud.director.v1_5.domain.section.RuntimeInfoSection;
import org.jclouds.vcloud.director.v1_5.domain.section.VirtualHardwareSection;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
@@ -283,7 +284,7 @@ public class VAppTemplate extends ResourceEntity {
@Override
public String toString() {
- return Objects.toStringHelper(super.toString())
+ return MoreObjects.toStringHelper(super.toString())
.add("owner", owner)
.add("children", children)
.add("sections", sections)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VMWareTools.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VMWareTools.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VMWareTools.java
index a237c33..97f48de 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VMWareTools.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VMWareTools.java
@@ -22,6 +22,7 @@ import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
@XmlRootElement(name = "VMWareTools")
@@ -94,6 +95,6 @@ public class VMWareTools {
@Override
public String toString() {
- return Objects.toStringHelper("").add("version", version).toString();
+ return MoreObjects.toStringHelper("").add("version", version).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Vdc.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Vdc.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Vdc.java
index a737272..f6cea03 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Vdc.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Vdc.java
@@ -29,7 +29,7 @@ import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.bind.annotation.XmlType;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Vm.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Vm.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Vm.java
index ecb50fc..7cd1591 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Vm.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/Vm.java
@@ -26,7 +26,7 @@ import javax.xml.bind.annotation.XmlType;
import org.jclouds.dmtf.ovf.environment.EnvironmentType;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Represents a virtual machine.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VmPendingQuestion.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VmPendingQuestion.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VmPendingQuestion.java
index 156ec3d..168be59 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VmPendingQuestion.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VmPendingQuestion.java
@@ -24,7 +24,7 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Represents a question which vSphere issued for a VM in a stuck state(WAITING_FOR_INPUT). It has a question element, a question ID
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VmQuestionAnswer.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VmQuestionAnswer.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VmQuestionAnswer.java
index 82d2b22..c8a6344 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VmQuestionAnswer.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VmQuestionAnswer.java
@@ -21,6 +21,7 @@ import static com.google.common.base.Objects.equal;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -134,6 +135,6 @@ public class VmQuestionAnswer {
@Override
public String toString() {
- return Objects.toStringHelper("").add("choiceId", choiceId).add("questionId", questionId).toString();
+ return MoreObjects.toStringHelper("").add("choiceId", choiceId).add("questionId", questionId).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VmQuestionAnswerChoice.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VmQuestionAnswerChoice.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VmQuestionAnswerChoice.java
index ffd5781..ea16b82 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VmQuestionAnswerChoice.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/VmQuestionAnswerChoice.java
@@ -21,6 +21,7 @@ import static com.google.common.base.Objects.equal;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -134,6 +135,6 @@ public class VmQuestionAnswerChoice {
@Override
public String toString() {
- return Objects.toStringHelper("").add("id", id).add("text", text).toString();
+ return MoreObjects.toStringHelper("").add("id", id).add("text", text).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/RasdItem.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/RasdItem.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/RasdItem.java
index 5c83ebf..b9044a8 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/RasdItem.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/RasdItem.java
@@ -32,7 +32,7 @@ import org.jclouds.dmtf.cim.ResourceAllocationSettingData;
import org.jclouds.vcloud.director.v1_5.domain.Link;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/VirtualSystem.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/VirtualSystem.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/VirtualSystem.java
index 3c42188..53ff32a 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/VirtualSystem.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/dmtf/VirtualSystem.java
@@ -29,6 +29,7 @@ import org.jclouds.dmtf.ovf.internal.BaseVirtualSystem;
import org.jclouds.vcloud.director.v1_5.domain.section.OperatingSystemSection;
import org.jclouds.vcloud.director.v1_5.domain.section.VirtualHardwareSection;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
@@ -137,7 +138,7 @@ public class VirtualSystem extends BaseVirtualSystem {
}
@Override
- protected Objects.ToStringHelper string() {
+ protected MoreObjects.ToStringHelper string() {
return super.string()
.add("operatingSystem", operatingSystem)
.add("virtualHardwareSections", virtualHardwareSections);
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/DhcpService.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/DhcpService.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/DhcpService.java
index 1c149dc..6335f93 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/DhcpService.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/DhcpService.java
@@ -22,6 +22,7 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -162,7 +163,7 @@ public class DhcpService extends NetworkServiceType<DhcpService> {
}
@Override
- protected Objects.ToStringHelper string() {
+ protected MoreObjects.ToStringHelper string() {
return super.string().add("defaultLeastTime", defaultLeaseTime).add("maxLeaseTime", maxLeaseTime).add("ipRange", ipRange);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/ExternalNetwork.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/ExternalNetwork.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/ExternalNetwork.java
index 6828358..1da71ee 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/ExternalNetwork.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/ExternalNetwork.java
@@ -23,7 +23,7 @@ import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Admin representation of external network.
*
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallRule.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallRule.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallRule.java
index a9fcb84..ed9f486 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallRule.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallRule.java
@@ -21,9 +21,9 @@ import static com.google.common.base.Objects.equal;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-
/**
* Represents a firewall rule.
* <p/>
@@ -371,7 +371,7 @@ public class FirewallRule {
@Override
public String toString() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("isEnabled", isEnabled)
.add("description", description)
.add("policy", policy)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallRuleProtocols.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallRuleProtocols.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallRuleProtocols.java
index de5480f..da18380 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallRuleProtocols.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallRuleProtocols.java
@@ -21,9 +21,9 @@ import static com.google.common.base.Objects.equal;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-
/**
* <p>Java class for anonymous complex type.
* <p/>
@@ -177,7 +177,7 @@ public class FirewallRuleProtocols {
@Override
public String toString() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("tcp", tcp)
.add("udp", udp)
.add("icmp", icmp)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallService.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallService.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallService.java
index af29e17..68a7ba6 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallService.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/FirewallService.java
@@ -26,11 +26,11 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
-
/**
* Represents a network firewall service.
* <p/>
@@ -191,7 +191,7 @@ public class FirewallService extends NetworkServiceType<FirewallService> {
@Override
public String toString() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("defaultAction", defaultAction)
.add("logDefaultAction", logDefaultAction)
.add("firewallRules", firewallRules).toString();
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpAddresses.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpAddresses.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpAddresses.java
index d2f8871..2b796a1 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpAddresses.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpAddresses.java
@@ -25,6 +25,7 @@ import java.util.Set;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
@@ -103,6 +104,6 @@ public class IpAddresses {
@Override
public String toString() {
- return Objects.toStringHelper("").add("ipAddresses", ipAddresses).toString();
+ return MoreObjects.toStringHelper("").add("ipAddresses", ipAddresses).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpRange.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpRange.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpRange.java
index f51b931..ed6df30 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpRange.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpRange.java
@@ -21,6 +21,7 @@ import static com.google.common.base.Objects.equal;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -112,7 +113,7 @@ public class IpRange {
@Override
public String toString() {
- return Objects.toStringHelper("").add("startAddress", startAddress)
+ return MoreObjects.toStringHelper("").add("startAddress", startAddress)
.add("endAddress", endAddress).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpRanges.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpRanges.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpRanges.java
index 09288c6..db98b02 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpRanges.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpRanges.java
@@ -25,6 +25,7 @@ import java.util.Set;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
@@ -103,6 +104,6 @@ public class IpRanges {
@Override
public String toString() {
- return Objects.toStringHelper("").add("ipRanges", ipRanges).toString();
+ return MoreObjects.toStringHelper("").add("ipRanges", ipRanges).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpScope.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpScope.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpScope.java
index ac53b38..e589a44 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpScope.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpScope.java
@@ -21,6 +21,7 @@ import static com.google.common.base.Objects.equal;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -241,7 +242,7 @@ public class IpScope {
@Override
public String toString() {
- return Objects.toStringHelper("").add("isInherited", isInherited)
+ return MoreObjects.toStringHelper("").add("isInherited", isInherited)
.add("gateway", gateway)
.add("netmask", netmask)
.add("dns1", dns1)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnManagedPeerType.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnManagedPeerType.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnManagedPeerType.java
index 0a31ba5..d7ec443 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnManagedPeerType.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnManagedPeerType.java
@@ -21,6 +21,7 @@ import static com.google.common.base.Objects.equal;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlSeeAlso;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
@XmlSeeAlso(
@@ -102,7 +103,7 @@ public abstract class IpsecVpnManagedPeerType<T extends IpsecVpnManagedPeerType<
return string().toString();
}
- protected Objects.ToStringHelper string() {
- return Objects.toStringHelper("").add("id", id).add("name", name);
+ protected MoreObjects.ToStringHelper string() {
+ return MoreObjects.toStringHelper("").add("id", id).add("name", name);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnRemotePeer.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnRemotePeer.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnRemotePeer.java
index fb5c608..c7ece6f 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnRemotePeer.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnRemotePeer.java
@@ -22,9 +22,9 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-
/**
* Gives more details of remote peer end point.
* <p/>
@@ -192,7 +192,7 @@ public class IpsecVpnRemotePeer extends IpsecVpnManagedPeerType<IpsecVpnRemotePe
}
@Override
- protected Objects.ToStringHelper string() {
+ protected MoreObjects.ToStringHelper string() {
return super.string()
.add("vcdUrl", vcdUrl)
.add("vcdOrganization", vcdOrganization)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnService.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnService.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnService.java
index fa337aa..dad5edc 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnService.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnService.java
@@ -26,6 +26,7 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
@@ -193,7 +194,7 @@ public class IpsecVpnService extends NetworkServiceType<IpsecVpnService> {
}
@Override
- protected Objects.ToStringHelper string() {
+ protected MoreObjects.ToStringHelper string() {
return super.string()
.add("externalIpAddress", externalIpAddress)
.add("publicIpAddress", publicIpAddress)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnTunnel.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnTunnel.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnTunnel.java
index 1d70444..4cbaf5e 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnTunnel.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/IpsecVpnTunnel.java
@@ -22,9 +22,9 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementRef;
import javax.xml.bind.annotation.XmlType;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-
/**
* Represents details of an IPSec-VPN tunnel.
* <p/>
@@ -381,7 +381,7 @@ public class IpsecVpnTunnel {
@Override
public String toString() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("name", name)
.add("description", description)
.add("peerIpAddress", peerIpAddress)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatOneToOneBasicRule.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatOneToOneBasicRule.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatOneToOneBasicRule.java
index 3123633..33c108f 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatOneToOneBasicRule.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatOneToOneBasicRule.java
@@ -21,9 +21,9 @@ import static com.google.common.base.Objects.equal;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-
/**
* Represents the NAT basic rule for one to one mapping of internal
* and external IP addresses from a network.
@@ -173,7 +173,7 @@ public class NatOneToOneBasicRule {
@Override
public String toString() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("mappingMode", mappingMode)
.add("externalIpAddress", externalIpAddress)
.add("internalIpAddress", internalIpAddress).toString();
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatOneToOneVmRule.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatOneToOneVmRule.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatOneToOneVmRule.java
index 562ba1c..74b9d6a 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatOneToOneVmRule.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatOneToOneVmRule.java
@@ -21,9 +21,9 @@ import static com.google.common.base.Objects.equal;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-
/**
* Represents the NAT rule for one to one mapping of VM NIC and
* external IP addresses from a network.
@@ -196,7 +196,7 @@ public class NatOneToOneVmRule {
@Override
public String toString() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("mappingMode", mappingMode)
.add("externalIpAddress", externalIpAddress)
.add("vAppScopedVmId", vAppScopedVmId)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatPortForwardingRule.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatPortForwardingRule.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatPortForwardingRule.java
index bf0b08d..fc16d8e 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatPortForwardingRule.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatPortForwardingRule.java
@@ -21,9 +21,9 @@ import static com.google.common.base.Objects.equal;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-
/**
* Represents the NAT rule for port forwarding between internal
* IP/port and external IP/port.
@@ -220,7 +220,7 @@ public class NatPortForwardingRule {
@Override
public String toString() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("externalIpAddress", externalIpAddress)
.add("externalPort", externalPort)
.add("internalIpAddress", internalIpAddress)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatRule.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatRule.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatRule.java
index 00d4940..3587459 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatRule.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatRule.java
@@ -21,9 +21,9 @@ import static com.google.common.base.Objects.equal;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-
/**
* Represents a NAT rule.
* <p/>
@@ -228,7 +228,7 @@ public class NatRule {
@Override
public String toString() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("description", description)
.add("oneToOneBasicRule", oneToOneBasicRule)
.add("oneToOneVmRule", oneToOneVmRule)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatService.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatService.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatService.java
index 3a761d7..a436ec8 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatService.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatService.java
@@ -26,6 +26,7 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
@@ -169,7 +170,7 @@ public class NatService extends NetworkServiceType<NatService> {
}
@Override
- protected Objects.ToStringHelper string() {
+ protected MoreObjects.ToStringHelper string() {
return super.string().add("natType", natType).add("natRules", natRules).add("policy", policy);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatVmRule.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatVmRule.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatVmRule.java
index 5203de4..432cdd7 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatVmRule.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NatVmRule.java
@@ -21,9 +21,9 @@ import static com.google.common.base.Objects.equal;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-
/**
* Represents the NAT rule for port forwarding between VM NIC/port
* and external IP/port.
@@ -247,7 +247,7 @@ public class NatVmRule {
@Override
public String toString() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("externalIpAddress", externalIpAddress)
.add("externalPort", externalPort)
.add("vAppScopedVmId", vAppScopedVmId)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/Network.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/Network.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/Network.java
index c703618..bc684e8 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/Network.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/Network.java
@@ -33,7 +33,7 @@ import org.jclouds.vcloud.director.v1_5.domain.org.OrgNetwork;
import com.google.common.base.Function;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkAssignment.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkAssignment.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkAssignment.java
index 1ad30df..9f95bfc 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkAssignment.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkAssignment.java
@@ -21,9 +21,9 @@ import static com.google.common.base.Objects.equal;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlType;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-
/**
* Represents mapping between a VM and vApp network.
* <p/>
@@ -142,7 +142,7 @@ public class NetworkAssignment
@Override
public String toString() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("innerNetwork", innerNetwork)
.add("containerNetwork", containerNetwork).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkConfiguration.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkConfiguration.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkConfiguration.java
index 6c881cc..f58110a 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkConfiguration.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkConfiguration.java
@@ -26,6 +26,7 @@ import javax.xml.bind.annotation.XmlType;
import org.jclouds.vcloud.director.v1_5.domain.Reference;
import org.jclouds.vcloud.director.v1_5.domain.network.Network.FenceMode;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -230,7 +231,7 @@ public class NetworkConfiguration {
@Override
public String toString() {
- return Objects.toStringHelper("").add("ipScope", ipScope).add("parentNetwork", parentNetwork)
+ return MoreObjects.toStringHelper("").add("ipScope", ipScope).add("parentNetwork", parentNetwork)
.add("fenceMode", fenceMode)
.add("retainNetInfoAcrossDeployments", retainNetInfoAcrossDeployments)
.add("features", features)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkConnection.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkConnection.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkConnection.java
index cf18542..1237617 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkConnection.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkConnection.java
@@ -29,6 +29,7 @@ import javax.xml.bind.annotation.XmlEnumValue;
import javax.xml.bind.annotation.XmlType;
import com.google.common.base.Function;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
@@ -351,7 +352,7 @@ public class NetworkConnection {
@Override
public String toString() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("networkConnectionIndex", networkConnectionIndex)
.add("ipAddress", ipAddress)
.add("externalIpAddress", externalIpAddress)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkFeatures.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkFeatures.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkFeatures.java
index 3b5d172..40fcb3e 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkFeatures.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkFeatures.java
@@ -25,6 +25,7 @@ import java.util.Set;
import javax.xml.bind.annotation.XmlElementRef;
import javax.xml.bind.annotation.XmlRootElement;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
@@ -108,6 +109,6 @@ public class NetworkFeatures {
@Override
public String toString() {
- return Objects.toStringHelper("").add("services", services).toString();
+ return MoreObjects.toStringHelper("").add("services", services).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkServiceType.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkServiceType.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkServiceType.java
index 9e00e73..e661e31 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkServiceType.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/NetworkServiceType.java
@@ -21,6 +21,7 @@ import static com.google.common.base.Objects.equal;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlSeeAlso;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -93,7 +94,7 @@ public abstract class NetworkServiceType<T extends NetworkServiceType<T>> {
return string().toString();
}
- protected Objects.ToStringHelper string() {
- return Objects.toStringHelper("").add("isEnabled", isEnabled);
+ protected MoreObjects.ToStringHelper string() {
+ return MoreObjects.toStringHelper("").add("isEnabled", isEnabled);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/RouterInfo.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/RouterInfo.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/RouterInfo.java
index 2a16012..a50d4cf 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/RouterInfo.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/RouterInfo.java
@@ -21,6 +21,7 @@ import static com.google.common.base.Objects.equal;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -93,7 +94,7 @@ public class RouterInfo {
@Override
public String toString() {
- return Objects.toStringHelper("").add("externalIp", externalIp).toString();
+ return MoreObjects.toStringHelper("").add("externalIp", externalIp).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/SmtpServerSettings.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/SmtpServerSettings.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/SmtpServerSettings.java
index b4fa38e..f366159 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/SmtpServerSettings.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/SmtpServerSettings.java
@@ -21,8 +21,9 @@ import static com.google.common.base.Objects.equal;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
+import com.google.common.base.MoreObjects;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
/**
* Specifies connection details for the organization s SMTP server.
@@ -205,7 +206,7 @@ public class SmtpServerSettings {
}
public ToStringHelper string() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("isUseAuthentication", useAuthentication)
.add("host", host)
.add("username", username)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/StaticRoute.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/StaticRoute.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/StaticRoute.java
index d747eea..6fecd6e 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/StaticRoute.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/StaticRoute.java
@@ -22,6 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -193,7 +194,7 @@ public class StaticRoute {
@Override
public String toString() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("name", name)
.add("network", network)
.add("nextHopIp", nextHopIp)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/StaticRoutingService.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/StaticRoutingService.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/StaticRoutingService.java
index cec53c0..346d43d 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/StaticRoutingService.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/StaticRoutingService.java
@@ -26,6 +26,7 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
@@ -139,7 +140,7 @@ public class StaticRoutingService extends NetworkServiceType<StaticRoutingServic
@Override
public String toString() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("staticRoutes", staticRoutes).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/SyslogServerSettings.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/SyslogServerSettings.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/SyslogServerSettings.java
index c437938..eefad12 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/SyslogServerSettings.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/SyslogServerSettings.java
@@ -21,6 +21,7 @@ import static com.google.common.base.Objects.equal;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -111,7 +112,7 @@ public class SyslogServerSettings {
@Override
public String toString() {
- return Objects.toStringHelper("").add("syslogServerIp1", syslogServerIp1)
+ return MoreObjects.toStringHelper("").add("syslogServerIp1", syslogServerIp1)
.add("syslogServerIp1", syslogServerIp2).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/VAppNetwork.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/VAppNetwork.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/VAppNetwork.java
index b34bfdf..371f286 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/VAppNetwork.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/VAppNetwork.java
@@ -22,7 +22,7 @@ import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlType;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Represents a vApp network.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/VAppNetworkConfiguration.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/VAppNetworkConfiguration.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/VAppNetworkConfiguration.java
index 73e5867..5136573 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/VAppNetworkConfiguration.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/network/VAppNetworkConfiguration.java
@@ -25,8 +25,9 @@ import javax.xml.bind.annotation.XmlType;
import org.jclouds.vcloud.director.v1_5.domain.Resource;
+import com.google.common.base.MoreObjects;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
/**
* Represents a VApp network configuration.
@@ -174,7 +175,7 @@ public class VAppNetworkConfiguration extends Resource {
@Override
public ToStringHelper string() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("description", description)
.add("configuration", configuration)
.add("deployed", deployed)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/AdminOrg.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/AdminOrg.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/AdminOrg.java
index 4c2dd0d..008c1ef 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/AdminOrg.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/AdminOrg.java
@@ -29,7 +29,7 @@ import javax.xml.bind.annotation.XmlType;
import org.jclouds.vcloud.director.v1_5.domain.Reference;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/CustomOrgLdapSettings.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/CustomOrgLdapSettings.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/CustomOrgLdapSettings.java
index 6426359..7ea1357 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/CustomOrgLdapSettings.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/CustomOrgLdapSettings.java
@@ -28,8 +28,9 @@ import javax.xml.bind.annotation.XmlEnumValue;
import javax.xml.bind.annotation.XmlType;
import com.google.common.base.Function;
+import com.google.common.base.MoreObjects;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
@@ -582,7 +583,7 @@ public class CustomOrgLdapSettings {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("hostName", hostName)
.add("port", port)
.add("isSsl", isSsl)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/Org.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/Org.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/Org.java
index 0abf926..9cd7323 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/Org.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/Org.java
@@ -26,7 +26,7 @@ import org.jclouds.vcloud.director.v1_5.VCloudDirectorMediaType;
import org.jclouds.vcloud.director.v1_5.domain.Entity;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Represents an organization.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgEmailSettings.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgEmailSettings.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgEmailSettings.java
index 6345a88..275edf2 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgEmailSettings.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgEmailSettings.java
@@ -29,7 +29,7 @@ import org.jclouds.vcloud.director.v1_5.domain.Resource;
import org.jclouds.vcloud.director.v1_5.domain.network.SmtpServerSettings;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableList;
/**
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgGeneralSettings.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgGeneralSettings.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgGeneralSettings.java
index b5556ea..0838796 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgGeneralSettings.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgGeneralSettings.java
@@ -25,7 +25,7 @@ import javax.xml.bind.annotation.XmlType;
import org.jclouds.vcloud.director.v1_5.domain.Resource;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Defines general org settings.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapGroupAttributes.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapGroupAttributes.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapGroupAttributes.java
index e352327..038a721 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapGroupAttributes.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapGroupAttributes.java
@@ -21,8 +21,9 @@ import static com.google.common.base.Objects.equal;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
+import com.google.common.base.MoreObjects;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
/**
* Defines how a group is imported from LDAP.
@@ -267,7 +268,7 @@ public class OrgLdapGroupAttributes {
}
public ToStringHelper string() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("objectClass", objectClass)
.add("objectIdentifier", objectIdentifier)
.add("groupName", groupName)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapSettings.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapSettings.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapSettings.java
index a994658..a32d2e9 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapSettings.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapSettings.java
@@ -32,7 +32,7 @@ import org.jclouds.vcloud.director.v1_5.domain.Resource;
import com.google.common.base.Function;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapUserAttributes.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapUserAttributes.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapUserAttributes.java
index 783488e..6aef611 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapUserAttributes.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLdapUserAttributes.java
@@ -21,8 +21,9 @@ import static com.google.common.base.Objects.equal;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
+import com.google.common.base.MoreObjects;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
/**
* Defines how LDAP attributes are used when importing a user.
@@ -384,7 +385,7 @@ public class OrgLdapUserAttributes {
}
public ToStringHelper string() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("objectClass", objectClass)
.add("objectIdentifier", objectIdentifier)
.add("userName", userName)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLeaseSettings.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLeaseSettings.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLeaseSettings.java
index 4fcfa11..1f9ba9b 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLeaseSettings.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/org/OrgLeaseSettings.java
@@ -25,7 +25,7 @@ import javax.xml.bind.annotation.XmlType;
import org.jclouds.vcloud.director.v1_5.domain.Resource;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Defines default lease durations and policies for an organization.
[3/4] JCLOUDS-653: Address Guava 18 deprecations
Posted by ga...@apache.org.
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/PerformanceInfo.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/PerformanceInfo.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/PerformanceInfo.java
index c33dee6..42da7a2 100644
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/PerformanceInfo.java
+++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/PerformanceInfo.java
@@ -18,6 +18,7 @@ package org.jclouds.fujitsu.fgcp.domain;
import javax.xml.bind.annotation.XmlRootElement;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -125,7 +126,7 @@ public class PerformanceInfo implements Comparable<PerformanceInfo> {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues()
+ return MoreObjects.toStringHelper(this).omitNullValues()
.add("recordTime", recordTime)
.add("cpuUtilization", cpuUtilization)
.add("diskReadRequestCount", diskReadRequestCount)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Policy.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Policy.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Policy.java
index 2a7f311..e92c479 100644
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Policy.java
+++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Policy.java
@@ -18,6 +18,7 @@ package org.jclouds.fujitsu.fgcp.domain;
import javax.xml.bind.annotation.XmlEnumValue;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -170,7 +171,7 @@ public class Policy implements Comparable<Policy> {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues()
+ return MoreObjects.toStringHelper(this).omitNullValues()
.add("id", id)
.add("src", src)
.add("srcType", srcType)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Product.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Product.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Product.java
index 590883d..b48364a 100644
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Product.java
+++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Product.java
@@ -18,6 +18,7 @@ package org.jclouds.fujitsu.fgcp.domain;
import javax.xml.bind.annotation.XmlElement;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -73,7 +74,7 @@ public class Product {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("name", name)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("name", name)
.add("unitName", unitName).add("usedPoints", usedPoints)
.toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/PublicIP.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/PublicIP.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/PublicIP.java
index ef9478e..d9d47da 100644
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/PublicIP.java
+++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/PublicIP.java
@@ -21,6 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
import javax.xml.bind.annotation.XmlElement;
import com.google.common.base.CaseFormat;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -84,7 +85,7 @@ public class PublicIP {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues()
+ return MoreObjects.toStringHelper(this).omitNullValues()
.add("address", address).add("version", version).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Rule.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Rule.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Rule.java
index f39a54b..d06cf01 100644
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Rule.java
+++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Rule.java
@@ -16,6 +16,7 @@
*/
package org.jclouds.fujitsu.fgcp.domain;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -73,7 +74,7 @@ public class Rule {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues()
+ return MoreObjects.toStringHelper(this).omitNullValues()
.add("privateIp", privateIp).add("publicIp", publicIp)
.add("snapt", snapt).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/ServerCert.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/ServerCert.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/ServerCert.java
index 5107fdb..7fdef2a 100644
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/ServerCert.java
+++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/ServerCert.java
@@ -18,6 +18,7 @@ package org.jclouds.fujitsu.fgcp.domain;
import javax.xml.bind.annotation.XmlRootElement;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -102,7 +103,7 @@ public class ServerCert implements Comparable<ServerCert> {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues()
+ return MoreObjects.toStringHelper(this).omitNullValues()
.add("certNum", certNum).add("issuer", issuer)
.add("subject", subject).add("validity", validity)
.add("groupId", groupId).add("detail", detail).toString();
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/ServerType.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/ServerType.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/ServerType.java
index b5d2c8a..dd61424 100644
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/ServerType.java
+++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/ServerType.java
@@ -22,6 +22,7 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementWrapper;
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;
@@ -125,7 +126,7 @@ public class ServerType implements Comparable<ServerType> {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("id", id)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("id", id)
.add("name", name).add("label", label).add("comment", comment)
.add("productId", productId).add("productName", productName)
.add("price", price).add("chargeType", chargeType)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Software.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Software.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Software.java
index 2df1f7e..b9fa1a3 100644
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Software.java
+++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Software.java
@@ -16,6 +16,7 @@
*/
package org.jclouds.fujitsu.fgcp.domain;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -89,7 +90,7 @@ public class Software {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("id", id)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("id", id)
.add("name", name).add("category", category)
.add("version", version)
.add("officialVersion", officialVersion)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Target.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Target.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Target.java
index 5a8521c..2f043a7 100644
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Target.java
+++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Target.java
@@ -16,6 +16,7 @@
*/
package org.jclouds.fujitsu.fgcp.domain;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -113,7 +114,7 @@ public class Target {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues()
+ return MoreObjects.toStringHelper(this).omitNullValues()
.add("serverId", serverId).add("serverName", serverName)
.add("ipAddress", ipAddress).add("port1", port1)
.add("port2", port2).add("status", status).add("now", now)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/UsageInfo.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/UsageInfo.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/UsageInfo.java
index 56730ee..afb40f2 100644
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/UsageInfo.java
+++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/UsageInfo.java
@@ -22,6 +22,7 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementWrapper;
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;
@@ -83,7 +84,7 @@ public class UsageInfo {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues()
+ return MoreObjects.toStringHelper(this).omitNullValues()
.add("systemId", systemId).add("systemName", systemName)
.add("products", products).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VDisk.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VDisk.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VDisk.java
index bb5a780..c5cf4e3 100644
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VDisk.java
+++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VDisk.java
@@ -19,6 +19,7 @@ package org.jclouds.fujitsu.fgcp.domain;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -74,7 +75,7 @@ public class VDisk {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("id", id)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("id", id)
.add("name", name).add("attachedServer", attachedServer)
.add("creator", creator).add("size", size).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VNIC.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VNIC.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VNIC.java
index 8274cd9..9c10056 100644
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VNIC.java
+++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VNIC.java
@@ -18,6 +18,7 @@ package org.jclouds.fujitsu.fgcp.domain;
import javax.xml.bind.annotation.XmlRootElement;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -62,7 +63,7 @@ public class VNIC {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues()
+ return MoreObjects.toStringHelper(this).omitNullValues()
.add("networkId", networkId).add("privateIp", privateIp)
.add("nicNo", nicNo).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VNet.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VNet.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VNet.java
index 6151464..b20285a 100644
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VNet.java
+++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VNet.java
@@ -18,6 +18,7 @@ package org.jclouds.fujitsu.fgcp.domain;
import javax.xml.bind.annotation.XmlRootElement;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -51,7 +52,7 @@ public class VNet {
@Override
public String toString() {
- return Objects.toStringHelper(this).add("networkId", networkId)
+ return MoreObjects.toStringHelper(this).add("networkId", networkId)
.toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VServer.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VServer.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VServer.java
index 292e72f..1c0b049 100644
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VServer.java
+++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VServer.java
@@ -18,6 +18,7 @@ package org.jclouds.fujitsu.fgcp.domain;
import javax.xml.bind.annotation.XmlElement;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -72,7 +73,7 @@ public class VServer {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("id", id)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("id", id)
.add("name", name).add("type", type).add("creator", creator)
.add("diskimageId", diskimageId).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VServerWithDetails.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VServerWithDetails.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VServerWithDetails.java
index 081c30c..234eb3c 100644
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VServerWithDetails.java
+++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VServerWithDetails.java
@@ -22,7 +22,7 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlRootElement;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
@@ -47,7 +47,7 @@ public class VServerWithDetails extends VServerWithVNICs {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("id", id)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("id", id)
.add("name", name).add("type", type).add("creator", creator)
.add("diskimageId", diskimageId).add("vdisks", vdisks)
.add("vnics", vnics).add("image", image).toString();
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VServerWithVNICs.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VServerWithVNICs.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VServerWithVNICs.java
index 4f57624..7e120c9 100644
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VServerWithVNICs.java
+++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VServerWithVNICs.java
@@ -21,7 +21,7 @@ import java.util.Set;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementWrapper;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
@@ -38,7 +38,7 @@ public class VServerWithVNICs extends VServer {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("id", id)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("id", id)
.add("name", name).add("type", type).add("creator", creator)
.add("diskimageId", diskimageId).add("vnics", vnics).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VSystem.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VSystem.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VSystem.java
index 2ad2e29..c313a55 100644
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VSystem.java
+++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VSystem.java
@@ -18,6 +18,7 @@ package org.jclouds.fujitsu.fgcp.domain;
import javax.xml.bind.annotation.XmlElement;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -72,7 +73,7 @@ public class VSystem {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("id", id)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("id", id)
.add("name", name).add("creator", creator)
.add("template", template).add("description", description)
.toString();
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VSystemWithDetails.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VSystemWithDetails.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VSystemWithDetails.java
index 1509f2c..0efb873 100644
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VSystemWithDetails.java
+++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/VSystemWithDetails.java
@@ -22,7 +22,7 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlRootElement;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
@@ -67,7 +67,7 @@ public class VSystemWithDetails extends VSystem {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("id", id)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("id", id)
.add("name", name).add("creator", creator)
.add("template", template).add("description", description)
.add("disks", disks).add("networks", networks)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/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 2926263..1575caa 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,6 +16,7 @@
*/
package org.jclouds.blobstore.representations;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import java.io.Serializable;
@@ -78,7 +79,7 @@ public class Blob implements Serializable {
@Override
public String toString() {
- return Objects.toStringHelper(this).add("blobMetadata", blobMetadata).add("allHeaders", allHeaders)
+ return MoreObjects.toStringHelper(this).add("blobMetadata", blobMetadata).add("allHeaders", allHeaders)
.toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/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 f110833..7b459ff 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,6 +16,7 @@
*/
package org.jclouds.blobstore.representations;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableMap;
@@ -207,7 +208,7 @@ public class BlobMetadata implements Serializable {
@Override
public String toString() {
- return Objects.toStringHelper(this).add("type", type).add("providerId", providerId).add("name", name)
+ return MoreObjects.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/b851f0ac/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 46d3438..12628f3 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,6 +16,7 @@
*/
package org.jclouds.blobstore.representations;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import java.io.Serializable;
@@ -145,7 +146,7 @@ public class ContentMetadata implements Serializable {
@Override
public String toString() {
- return Objects.toStringHelper(this).add("length", language).add("disposition", disposition).add("encoding", encoding)
+ return MoreObjects.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/b851f0ac/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 aa5c45e..44595f3 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,6 +16,7 @@
*/
package org.jclouds.blobstore.representations;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableMap;
@@ -173,7 +174,7 @@ public class StorageMetadata implements Serializable {
@Override
public String toString() {
- return Objects.toStringHelper(this).add("type", type).add("providerId", providerId).add("name", name)
+ return MoreObjects.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/b851f0ac/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 5464aee..c9c2694 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,6 +16,7 @@
*/
package org.jclouds.compute.representations;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import java.io.Serializable;
@@ -89,6 +90,6 @@ public class ExecResponse implements Serializable {
@Override
public String toString() {
- return Objects.toStringHelper(this).add("out", output).add("error", error).add("exitStatus", exitStatus).toString();
+ return MoreObjects.toStringHelper(this).add("out", output).add("error", error).add("exitStatus", exitStatus).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/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 ec07985..0d80408 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,6 +16,7 @@
*/
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;
@@ -143,7 +144,7 @@ public class Hardware implements Serializable {
@Override
public String toString() {
- return Objects.toStringHelper(this).add("id", id).add("name", name)
+ return MoreObjects.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/b851f0ac/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 1d361d0..524a522 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;
@@ -153,7 +153,7 @@ public class Image implements Serializable {
@Override
public String toString() {
- return Objects.toStringHelper(this).add("id", id).add("name", name).add("status", status)
+ return MoreObjects.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/b851f0ac/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 2a43343..a07fe51 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,6 +16,7 @@
*/
package org.jclouds.compute.representations;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import java.io.Serializable;
@@ -119,7 +120,7 @@ public class LoginCredentials implements Serializable {
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.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/b851f0ac/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 8bc877e..ee4d2a7 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,6 +16,7 @@
*/
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;
@@ -213,7 +214,7 @@ public class NodeMetadata implements Serializable {
@Override
public String toString() {
- return Objects.toStringHelper(this).add("id", id).add("name", name).add("description", description).add("status", status)
+ return MoreObjects.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/b851f0ac/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 0e3026d..4b1054e 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,6 +16,7 @@
*/
package org.jclouds.compute.representations;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import java.io.Serializable;
@@ -126,7 +127,7 @@ public class OperatingSystem implements Serializable {
@Override
public String toString() {
- return Objects.toStringHelper(this).add("family", family).add("name", name).add("arch", arch)
+ return MoreObjects.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/b851f0ac/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 e19a2c9..98e3384 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,6 +16,7 @@
*/
package org.jclouds.compute.representations;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import java.io.Serializable;
@@ -78,6 +79,6 @@ public class Processor implements Serializable {
@Override
public String toString() {
- return Objects.toStringHelper(this).add("cores", cores).add("spped", speed).toString();
+ return MoreObjects.toStringHelper(this).add("cores", cores).add("spped", speed).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/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 31750a0..8b626b0 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,6 +16,7 @@
*/
package org.jclouds.compute.representations;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import java.io.Serializable;
@@ -127,7 +128,7 @@ public class Volume implements Serializable {
@Override
public String toString() {
- return Objects.toStringHelper(this).add("id", id).add("type", type).add("size", size)
+ return MoreObjects.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/b851f0ac/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 0699ab1..e2ff923 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,6 +16,7 @@
*/
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;
@@ -247,7 +248,7 @@ public class ApiMetadata implements Serializable {
@Override
public String toString() {
- return Objects.toStringHelper(this).add("id", id).add("name", name).add("endpointName", endpointName)
+ return MoreObjects.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/b851f0ac/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 e1d8156..0e18409 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,6 +16,7 @@
*/
package org.jclouds.representations;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import java.io.Serializable;
@@ -90,6 +91,6 @@ public class Context implements Serializable {
@Override
public String toString() {
- return Objects.toStringHelper(this).add("name", name).add("providerId", providerId).add("identity", identity).toString();
+ return MoreObjects.toStringHelper(this).add("name", name).add("providerId", providerId).add("identity", identity).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/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 eaa0585..6800e8a 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,6 +16,7 @@
*/
package org.jclouds.representations;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
@@ -117,7 +118,7 @@ public class Location implements Serializable {
@Override
public String toString() {
- return Objects.toStringHelper(this).add("id", id).add("scope", scope).add("description", description)
+ return MoreObjects.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/b851f0ac/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 7fbf1ae..56f5f77 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,6 +16,7 @@
*/
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;
@@ -252,7 +253,7 @@ public class ProviderMetadata implements Serializable {
@Override
public String toString() {
- return Objects.toStringHelper(this).add("id", id).add("name", name).add("endpointName", endpointName)
+ return MoreObjects.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/b851f0ac/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/Computer.java
----------------------------------------------------------------------
diff --git a/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/Computer.java b/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/Computer.java
index e43a24d..66dd922 100644
--- a/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/Computer.java
+++ b/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/Computer.java
@@ -20,8 +20,9 @@ import static com.google.common.base.Objects.equal;
import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
+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;
/**
* @see <a
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/ComputerView.java
----------------------------------------------------------------------
diff --git a/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/ComputerView.java b/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/ComputerView.java
index adebe45..81ff411 100644
--- a/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/ComputerView.java
+++ b/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/ComputerView.java
@@ -22,8 +22,9 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Set;
+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.gson.annotations.SerializedName;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/Job.java
----------------------------------------------------------------------
diff --git a/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/Job.java b/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/Job.java
index 257cf6d..d7ef342 100644
--- a/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/Job.java
+++ b/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/Job.java
@@ -21,8 +21,9 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.net.URI;
+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;
/**
* Minimal info about a Job
@@ -147,7 +148,7 @@ public class Job {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("").add("name", name).add("url", url).add("color",
+ return MoreObjects.toStringHelper("").add("name", name).add("url", url).add("color",
color);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/JobDetails.java
----------------------------------------------------------------------
diff --git a/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/JobDetails.java b/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/JobDetails.java
index 0d48a68..54a1bf4 100644
--- a/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/JobDetails.java
+++ b/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/JobDetails.java
@@ -16,7 +16,7 @@
*/
package org.jclouds.jenkins.v1.domain;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
public class JobDetails extends Job {
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/LastBuild.java
----------------------------------------------------------------------
diff --git a/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/LastBuild.java b/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/LastBuild.java
index c105b66..f97af6c 100644
--- a/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/LastBuild.java
+++ b/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/LastBuild.java
@@ -21,8 +21,9 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.net.URI;
+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;
/**
* Minimal info about a LastBuild
@@ -272,7 +273,7 @@ public class LastBuild {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("id", id)
.add("url", url)
.add("description", description)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/Node.java
----------------------------------------------------------------------
diff --git a/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/Node.java b/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/Node.java
index c066426..dbb0504 100644
--- a/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/Node.java
+++ b/jenkins/src/main/java/org/jclouds/jenkins/v1/domain/Node.java
@@ -22,8 +22,9 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Set;
+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.gson.annotations.SerializedName;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/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 b1e401b..da65c0c 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.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Optional;
/**
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/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 0655f52..d476904 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,6 +30,7 @@ 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;
@@ -313,7 +314,7 @@ public class Dataset implements Comparable<Dataset> {
@Override
public String toString() {
- return Objects.toStringHelper("").omitNullValues()
+ return MoreObjects.toStringHelper("").omitNullValues()
.add("id", id)
.add("urn", urn)
.add("name", name)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/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 e2ec1ff..84a3f2a 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,6 +21,7 @@ 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;
@@ -131,7 +132,7 @@ public class Key implements Comparable<Key> {
@Override
public String toString() {
- return Objects.toStringHelper("").omitNullValues()
+ return MoreObjects.toStringHelper("").omitNullValues()
.add("name", name)
.add("key", key)
.add("created", created).toString();
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/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 7867fda..f33935e 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,6 +31,7 @@ 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;
@@ -386,7 +387,7 @@ public class Machine implements Comparable<Machine> {
@Override
public String toString() {
- return Objects.toStringHelper("").omitNullValues()
+ return MoreObjects.toStringHelper("").omitNullValues()
.add("id", id)
.add("name", name)
.add("type", type)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/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 17953b8..a9c20a1 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,6 +22,7 @@ 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;
@@ -173,7 +174,7 @@ public class Package implements Comparable<Package> {
@Override
public String toString() {
- return Objects.toStringHelper("").omitNullValues()
+ return MoreObjects.toStringHelper("").omitNullValues()
.add("name", name)
.add("memorySizeMb", memorySizeMb)
.add("diskSizeGb", diskSizeGb)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/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 cb10222..11e067d 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,9 +21,10 @@ 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.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.Iterables;
/**
@@ -104,6 +105,6 @@ public class DatacenterAndName {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("").add("datacenterId", datacenterId).add("name", name);
+ return MoreObjects.toStringHelper("").add("datacenterId", datacenterId).add("name", name);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/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 34730fa..23ba16f 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,8 +25,9 @@ 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;
@@ -56,7 +57,7 @@ public class CreateMachineOptions extends BaseHttpRequestOptions {
@Override
public String toString() {
- ToStringHelper toString = Objects.toStringHelper("").omitNullValues();
+ ToStringHelper toString = MoreObjects.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/b851f0ac/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/Account.java
----------------------------------------------------------------------
diff --git a/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/Account.java b/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/Account.java
index fe470b9..0cb7f0f 100644
--- a/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/Account.java
+++ b/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/Account.java
@@ -22,6 +22,7 @@ import static org.jclouds.opsource.servers.OpSourceNameSpaces.DIRECTORY;
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 = "Account", namespace = DIRECTORY)
@@ -93,7 +94,7 @@ public class Account {
@Override
public String toString() {
- return Objects.toStringHelper("").add("orgId", orgId).toString();
+ return MoreObjects.toStringHelper("").add("orgId", orgId).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/BaseServer.java
----------------------------------------------------------------------
diff --git a/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/BaseServer.java b/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/BaseServer.java
index 6729152..4bfae1f 100644
--- a/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/BaseServer.java
+++ b/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/BaseServer.java
@@ -18,6 +18,7 @@ package org.jclouds.opsource.servers.domain;
import static com.google.common.base.Objects.equal;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
public abstract class BaseServer {
@@ -65,7 +66,7 @@ public abstract class BaseServer {
@Override
public String toString() {
- return Objects.toStringHelper("").toString();
+ return MoreObjects.toStringHelper("").toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/DataCenter.java
----------------------------------------------------------------------
diff --git a/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/DataCenter.java b/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/DataCenter.java
index 6678aba..27a64e8 100644
--- a/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/DataCenter.java
+++ b/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/DataCenter.java
@@ -22,6 +22,7 @@ import static org.jclouds.opsource.servers.OpSourceNameSpaces.DATACENTER;
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(namespace = DATACENTER, name = "datacenterWithLimits")
@@ -209,7 +210,7 @@ public class DataCenter {
@Override
public String toString() {
- return Objects.toStringHelper("").add("location", location).add("displayName", displayName).add("city", city).
+ return MoreObjects.toStringHelper("").add("location", location).add("displayName", displayName).add("city", city).
add("state", state).add("country", country).add("vpnUrl", vpnUrl).add("isDefault", isDefault).
add("maxCpu", maxCpu).add("maxRamMb", maxRamMb).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/DataCentersList.java
----------------------------------------------------------------------
diff --git a/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/DataCentersList.java b/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/DataCentersList.java
index 8664920..ba7ab3e 100644
--- a/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/DataCentersList.java
+++ b/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/DataCentersList.java
@@ -25,6 +25,7 @@ import java.util.Set;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
@@ -94,7 +95,7 @@ public class DataCentersList {
@Override
public String toString() {
- return Objects.toStringHelper("").add("dataCenters", dataCenters).toString();
+ return MoreObjects.toStringHelper("").add("dataCenters", dataCenters).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/DeployedServer.java
----------------------------------------------------------------------
diff --git a/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/DeployedServer.java b/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/DeployedServer.java
index 738fe35..715c16d 100644
--- a/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/DeployedServer.java
+++ b/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/DeployedServer.java
@@ -21,6 +21,7 @@ import static org.jclouds.opsource.servers.OpSourceNameSpaces.SERVER;
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(namespace = SERVER, name = "DeployedServer")
@@ -212,7 +213,7 @@ public class DeployedServer extends BaseServer{
@Override
public String toString() {
- return Objects.toStringHelper("").add("id", id).add("name", name).add("description", description).
+ return MoreObjects.toStringHelper("").add("id", id).add("name", name).add("description", description).
add("machineSpecification", machineSpecification).add("sourceImageId", sourceImageId).add("networkId", networkId).
add("privateIpAddress", privateIpAddress).add("publicIpAddress", publicIpAddress).add("machineName", machineName).
add("isStarted", isStarted).add("deployedTime", deployedTime).add("status", status).toString();
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/DeployedServersList.java
----------------------------------------------------------------------
diff --git a/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/DeployedServersList.java b/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/DeployedServersList.java
index 689e9a8..e6efa4e 100644
--- a/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/DeployedServersList.java
+++ b/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/DeployedServersList.java
@@ -25,6 +25,7 @@ import java.util.Set;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
@@ -94,7 +95,7 @@ public class DeployedServersList {
@Override
public String toString() {
- return Objects.toStringHelper("").add("deployedServers", deployedServers).toString();
+ return MoreObjects.toStringHelper("").add("deployedServers", deployedServers).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/MachineSpecification.java
----------------------------------------------------------------------
diff --git a/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/MachineSpecification.java b/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/MachineSpecification.java
index 21a2e37..67236d4 100644
--- a/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/MachineSpecification.java
+++ b/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/MachineSpecification.java
@@ -22,6 +22,7 @@ import static org.jclouds.opsource.servers.OpSourceNameSpaces.SERVER;
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 = "machineSpecification", namespace = SERVER)
@@ -137,7 +138,7 @@ public class MachineSpecification {
@Override
public String toString() {
- return Objects.toStringHelper("").add("cpuCount", cpuCount).add("memoryMb", memoryMb).add("osStorageGb", osStorageGb)
+ return MoreObjects.toStringHelper("").add("cpuCount", cpuCount).add("memoryMb", memoryMb).add("osStorageGb", osStorageGb)
.add("additionalLocalStorageGb", additionalLocalStorageGb).add("operatingSystem", operatingSystem).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/OperatingSystem.java
----------------------------------------------------------------------
diff --git a/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/OperatingSystem.java b/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/OperatingSystem.java
index a0d0400..2894763 100644
--- a/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/OperatingSystem.java
+++ b/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/OperatingSystem.java
@@ -22,6 +22,7 @@ import static org.jclouds.opsource.servers.OpSourceNameSpaces.SERVER;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -100,7 +101,7 @@ public class OperatingSystem {
@Override
public String toString() {
- return Objects.toStringHelper("").add("osType", osType).add("displayName", displayName).toString();
+ return MoreObjects.toStringHelper("").add("osType", osType).add("displayName", displayName).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/PendingDeployServer.java
----------------------------------------------------------------------
diff --git a/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/PendingDeployServer.java b/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/PendingDeployServer.java
index 15098a6..3d362cc 100644
--- a/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/PendingDeployServer.java
+++ b/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/PendingDeployServer.java
@@ -21,6 +21,7 @@ import static org.jclouds.opsource.servers.OpSourceNameSpaces.SERVER;
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(namespace = SERVER, name = "PendingDeployServer")
@@ -159,7 +160,7 @@ public class PendingDeployServer extends BaseServer{
@Override
public String toString() {
- return Objects.toStringHelper("").add("id", id).add("name", name).add("description", description).
+ return MoreObjects.toStringHelper("").add("id", id).add("name", name).add("description", description).
add("machineSpecification", machineSpecification).add("sourceImageId", sourceImageId).add("networkId", networkId).
add("privateIpAddress", privateIpAddress).add("status", status).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/PendingDeployServersList.java
----------------------------------------------------------------------
diff --git a/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/PendingDeployServersList.java b/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/PendingDeployServersList.java
index a2894ee..f5abed4 100644
--- a/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/PendingDeployServersList.java
+++ b/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/PendingDeployServersList.java
@@ -25,6 +25,7 @@ import java.util.Set;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
@@ -94,7 +95,7 @@ public class PendingDeployServersList {
@Override
public String toString() {
- return Objects.toStringHelper("").add("pendingDeployServers", pendingDeployServers).toString();
+ return MoreObjects.toStringHelper("").add("pendingDeployServers", pendingDeployServers).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/ServerImage.java
----------------------------------------------------------------------
diff --git a/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/ServerImage.java b/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/ServerImage.java
index 59e6a26..0b6163d 100644
--- a/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/ServerImage.java
+++ b/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/ServerImage.java
@@ -22,6 +22,7 @@ import static org.jclouds.opsource.servers.OpSourceNameSpaces.SERVER;
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(namespace = SERVER, name = "ServerImage")
@@ -206,7 +207,7 @@ public class ServerImage {
@Override
public String toString() {
- return Objects.toStringHelper("").add("id", id).add("resourcePath", resourcePath).add("name", name).
+ return MoreObjects.toStringHelper("").add("id", id).add("resourcePath", resourcePath).add("name", name).
add("description", description).add("operatingSystem", operatingSystem).add("location", location).
add("cpuCount", cpuCount).add("memory", memory).add("osStorage", osStorage).
add("additionalLocalStorage", additionalLocalStorage).toString();
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/ServerImagesList.java
----------------------------------------------------------------------
diff --git a/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/ServerImagesList.java b/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/ServerImagesList.java
index fd9329c..8f5fe4e 100644
--- a/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/ServerImagesList.java
+++ b/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/ServerImagesList.java
@@ -25,6 +25,7 @@ import java.util.Set;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
@@ -94,7 +95,7 @@ public class ServerImagesList {
@Override
public String toString() {
- return Objects.toStringHelper("").add("serverImages", serverImages).toString();
+ return MoreObjects.toStringHelper("").add("serverImages", serverImages).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/Status.java
----------------------------------------------------------------------
diff --git a/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/Status.java b/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/Status.java
index bdd8cea..e1ddb81 100644
--- a/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/Status.java
+++ b/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/Status.java
@@ -22,6 +22,7 @@ import static org.jclouds.opsource.servers.OpSourceNameSpaces.SERVER;
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(namespace = SERVER, name = "status")
@@ -164,7 +165,7 @@ public class Status {
@Override
public String toString() {
- return Objects.toStringHelper("").add("action", action).add("requestTime", requestTime).add("userName", userName).
+ return MoreObjects.toStringHelper("").add("action", action).add("requestTime", requestTime).add("userName", userName).
add("numberOfSteps", numberOfSteps).add("updateTime", updateTime).add("step", step).add("failureReason", failureReason).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/Step.java
----------------------------------------------------------------------
diff --git a/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/Step.java b/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/Step.java
index 684c4cc..a727fd7 100644
--- a/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/Step.java
+++ b/opsource-servers/src/main/java/org/jclouds/opsource/servers/domain/Step.java
@@ -22,6 +22,7 @@ import static org.jclouds.opsource.servers.OpSourceNameSpaces.SERVER;
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(namespace = SERVER, name = "step")
@@ -110,7 +111,7 @@ public class Step {
@Override
public String toString() {
- return Objects.toStringHelper("").add("name", name).add("number", number).add("percentComplete", percentComplete).toString();
+ return MoreObjects.toStringHelper("").add("name", name).add("number", number).add("percentComplete", percentComplete).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/config/VPDCRestClientModule.java
----------------------------------------------------------------------
diff --git a/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/config/VPDCRestClientModule.java b/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/config/VPDCRestClientModule.java
index 955941f..9d8a444 100644
--- a/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/config/VPDCRestClientModule.java
+++ b/savvis-symphonyvpdc/src/main/java/org/jclouds/savvis/vpdc/config/VPDCRestClientModule.java
@@ -63,6 +63,7 @@ import org.jclouds.savvis.vpdc.predicates.TaskSuccess;
import org.jclouds.util.Strings2;
import com.google.common.base.Function;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Predicate;
import com.google.common.base.Supplier;
@@ -167,7 +168,7 @@ public class VPDCRestClientModule extends RestClientModule<VPDCApi, VPDCAsyncApi
}
@Override
public String toString() {
- return Objects.toStringHelper(login).add("method", "login").toString();
+ return MoreObjects.toStringHelper(login).add("method", "login").toString();
}
}, seconds, TimeUnit.SECONDS);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/smartos-ssh/src/main/java/org/jclouds/smartos/compute/domain/DataSet.java
----------------------------------------------------------------------
diff --git a/smartos-ssh/src/main/java/org/jclouds/smartos/compute/domain/DataSet.java b/smartos-ssh/src/main/java/org/jclouds/smartos/compute/domain/DataSet.java
index 335aff6..e3a9c65 100644
--- a/smartos-ssh/src/main/java/org/jclouds/smartos/compute/domain/DataSet.java
+++ b/smartos-ssh/src/main/java/org/jclouds/smartos/compute/domain/DataSet.java
@@ -18,6 +18,7 @@ package org.jclouds.smartos.compute.domain;
import java.util.UUID;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -141,7 +142,7 @@ public class DataSet {
*/
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("uuid", uuid).add("os", os).add("published", published)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("uuid", uuid).add("os", os).add("published", published)
.add("urn", urn).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/smartos-ssh/src/main/java/org/jclouds/smartos/compute/domain/VM.java
----------------------------------------------------------------------
diff --git a/smartos-ssh/src/main/java/org/jclouds/smartos/compute/domain/VM.java b/smartos-ssh/src/main/java/org/jclouds/smartos/compute/domain/VM.java
index 1af15be..d81127f 100644
--- a/smartos-ssh/src/main/java/org/jclouds/smartos/compute/domain/VM.java
+++ b/smartos-ssh/src/main/java/org/jclouds/smartos/compute/domain/VM.java
@@ -18,6 +18,7 @@ package org.jclouds.smartos.compute.domain;
import java.util.UUID;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Optional;
@@ -180,7 +181,7 @@ public class VM {
*/
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("uuid", uuid).add("type", type).add("ram", ram)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("uuid", uuid).add("type", type).add("ram", ram)
.add("alias", alias).add("publicAddress", publicAddress.orNull()).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/smartos-ssh/src/main/java/org/jclouds/smartos/compute/domain/VmNIC.java
----------------------------------------------------------------------
diff --git a/smartos-ssh/src/main/java/org/jclouds/smartos/compute/domain/VmNIC.java b/smartos-ssh/src/main/java/org/jclouds/smartos/compute/domain/VmNIC.java
index 9c595b5..285b4c0 100644
--- a/smartos-ssh/src/main/java/org/jclouds/smartos/compute/domain/VmNIC.java
+++ b/smartos-ssh/src/main/java/org/jclouds/smartos/compute/domain/VmNIC.java
@@ -20,6 +20,7 @@ import java.beans.ConstructorProperties;
import javax.inject.Named;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -128,7 +129,7 @@ public class VmNIC {
*/
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("tag", tag).add("ip", ip).add("netmask", netmask)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("tag", tag).add("ip", ip).add("netmask", netmask)
.add("gateway", gateway).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/smartos-ssh/src/main/java/org/jclouds/smartos/compute/domain/VmSpecification.java
----------------------------------------------------------------------
diff --git a/smartos-ssh/src/main/java/org/jclouds/smartos/compute/domain/VmSpecification.java b/smartos-ssh/src/main/java/org/jclouds/smartos/compute/domain/VmSpecification.java
index b328245..0aaf52c 100644
--- a/smartos-ssh/src/main/java/org/jclouds/smartos/compute/domain/VmSpecification.java
+++ b/smartos-ssh/src/main/java/org/jclouds/smartos/compute/domain/VmSpecification.java
@@ -21,6 +21,7 @@ import java.util.List;
import javax.inject.Named;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableList;
@@ -226,7 +227,7 @@ public class VmSpecification {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("alias", alias).add("brand", brand)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("alias", alias).add("brand", brand)
.add("dataset_uuid", dataset != null ? dataset.getUuid() : null).add("dns_domain", dnsDomain)
.add("quota", quota).add("max_physical_memory", maxPhysicalMemory)
.add("max_locked_memory", maxLockedMemory).add("max_swap", maxSwap).add("tmpfs", tmpFs)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AbstractVAppType.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AbstractVAppType.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AbstractVAppType.java
index a02453b..810eaaa 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AbstractVAppType.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AbstractVAppType.java
@@ -43,7 +43,7 @@ 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.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/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 5ee318a..a73b6b0 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,6 +22,7 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -121,6 +122,6 @@ public class AccessSetting {
@Override
public String toString() {
- return Objects.toStringHelper("").add("subject", subject).add("accessLevel", accessLevel).toString();
+ return MoreObjects.toStringHelper("").add("subject", subject).add("accessLevel", accessLevel).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/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 82b77bf..eeadb66 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.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Provides an administrative view of a vDC. Includes all members
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/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 77a8ec2..a252234 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,6 +25,7 @@ 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;
@@ -131,7 +132,7 @@ public class Capabilities {
@Override
public String toString() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("supportedHardwareVersions", supportedHardwareVersions).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CapacityType.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CapacityType.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CapacityType.java
index 630d072..59a4f06 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CapacityType.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/CapacityType.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.
* <p/>
@@ -174,7 +174,7 @@ public class CapacityType<T extends CapacityType<T>> {
@Override
public String toString() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("units", units)
.add("allocated", allocated)
.add("limit", limit).toString();