You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ad...@apache.org on 2014/10/24 19:50:22 UTC
[6/8] Revert "JCLOUDS-653: Address Guava 18 deprecations"
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Pod.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Pod.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Pod.java
index 4186812..0019c6d 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Pod.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Pod.java
@@ -22,9 +22,8 @@ import java.beans.ConstructorProperties;
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;
/**
* Represents a Pod in CloudStack.
@@ -267,7 +266,7 @@ public class Pod implements Comparable<Pod> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("name", name).add("zoneId", zoneId).add("zoneName", zoneName).add("gateway", gateway).add("netmask", netmask).add("startIp", startIp).add("endIp", endIp).add("allocationState", allocationState);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/PortForwardingRule.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/PortForwardingRule.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/PortForwardingRule.java
index b98123f..b246c7d 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/PortForwardingRule.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/PortForwardingRule.java
@@ -24,9 +24,8 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
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;
import com.google.common.collect.ImmutableSet;
/**
@@ -438,7 +437,7 @@ public class PortForwardingRule implements Comparable<PortForwardingRule> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("IPAddress", IPAddress).add("IPAddressId", IPAddressId).add("privatePort", privatePort)
.add("protocol", protocol).add("publicPort", publicPort).add("state", state).add("virtualMachineDisplayName", virtualMachineDisplayName)
.add("virtualMachineId", virtualMachineId).add("virtualMachineName", virtualMachineName).add("CIDRs", CIDRs)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Project.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Project.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Project.java
index cecc372..7744f74 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Project.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Project.java
@@ -25,9 +25,8 @@ import com.google.common.collect.ImmutableSet;
import org.jclouds.javax.annotation.Nullable;
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;
/**
* Representation of the API project response
@@ -249,7 +248,7 @@ public class Project implements Comparable<Project> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).omitNullValues()
+ return Objects.toStringHelper(this).omitNullValues()
.add("id", id).add("account", account).add("displayText", displayText)
.add("domain", domain).add("domainId", domainId).add("name", name).add("state", state)
.add("tags", tags);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/PublicIPAddress.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/PublicIPAddress.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/PublicIPAddress.java
index d6211df..666d80f 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/PublicIPAddress.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/PublicIPAddress.java
@@ -26,9 +26,8 @@ import com.google.common.collect.ImmutableSet;
import org.jclouds.javax.annotation.Nullable;
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;
/**
* Class PublicIPAddress
@@ -577,7 +576,7 @@ public class PublicIPAddress {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("account", account).add("allocated", allocated).add("associatedNetworkId", associatedNetworkId)
.add("domain", domain).add("domainId", domainId).add("usesVirtualNetwork", usesVirtualNetwork).add("IPAddress", IPAddress)
.add("isSourceNAT", isSourceNAT).add("isStaticNAT", isStaticNAT).add("networkId", networkId).add("state", state)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ResourceLimit.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ResourceLimit.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ResourceLimit.java
index 9d59faf..3e1b2ec 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ResourceLimit.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ResourceLimit.java
@@ -24,9 +24,8 @@ import java.util.Map;
import org.jclouds.javax.annotation.Nullable;
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;
@@ -259,7 +258,7 @@ public class ResourceLimit {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("account", account).add("domain", domain).add("domainId", domainId).add("max", max).add("resourceType", resourceType);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SecurityGroup.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SecurityGroup.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SecurityGroup.java
index b261965..04ba26c 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SecurityGroup.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SecurityGroup.java
@@ -23,9 +23,8 @@ import java.util.Set;
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.ImmutableSet;
import com.google.common.collect.ImmutableSortedSet;
@@ -297,7 +296,7 @@ public class SecurityGroup implements Comparable<SecurityGroup> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).add("id", id).add("account", account).add("name", name).add("description", description)
+ return Objects.toStringHelper(this).add("id", id).add("account", account).add("name", name).add("description", description)
.add("domain", domain).add("domainId", domainId).add("jobId", jobId).add("jobStatus", jobStatus).add("ingressRules", ingressRules)
.add("tags", tags);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ServiceOffering.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ServiceOffering.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ServiceOffering.java
index d17ccca..4979f2c 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ServiceOffering.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ServiceOffering.java
@@ -24,9 +24,8 @@ import java.util.Set;
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.ImmutableSet;
/**
@@ -436,7 +435,7 @@ public class ServiceOffering implements Comparable<ServiceOffering> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("name", name).add("displayText", displayText).add("created", created).add("domain", domain)
.add("domainId", domainId).add("cpuNumber", cpuNumber).add("cpuSpeed", cpuSpeed).add("memory", memory)
.add("haSupport", haSupport).add("storageType", storageType).add("tags", getTags()).add("defaultUse", defaultUse)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Snapshot.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Snapshot.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Snapshot.java
index 86636d0..1bc9795 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Snapshot.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Snapshot.java
@@ -26,9 +26,8 @@ import com.google.common.collect.ImmutableSet;
import org.jclouds.javax.annotation.Nullable;
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;
/**
* Class Snapshot
@@ -454,7 +453,7 @@ public class Snapshot {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("account", account).add("created", created).add("domain", domain).add("domainId", domainId)
.add("interval", interval).add("jobId", jobId).add("jobStatus", jobStatus).add("name", name).add("snapshotType", snapshotType)
.add("state", state).add("volumeId", volumeId).add("volumeName", volumeName).add("volumeType", volumeType)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SnapshotPolicy.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SnapshotPolicy.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SnapshotPolicy.java
index a460247..cab2592 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SnapshotPolicy.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SnapshotPolicy.java
@@ -22,9 +22,8 @@ import java.beans.ConstructorProperties;
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;
/**
* Class SnapshotPolicy
@@ -204,7 +203,7 @@ public class SnapshotPolicy {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("interval", interval).add("numberToRetain", numberToRetain).add("schedule", schedule).add("timezone", timezone)
.add("volumeId", volumeId);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SnapshotPolicySchedule.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SnapshotPolicySchedule.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SnapshotPolicySchedule.java
index 888eaf6..1c7c7e4 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SnapshotPolicySchedule.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SnapshotPolicySchedule.java
@@ -20,9 +20,8 @@ import java.beans.ConstructorProperties;
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;
/**
* Describes the schedule of a snapshot policy.
@@ -115,7 +114,7 @@ public class SnapshotPolicySchedule {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("interval", interval).add("time", time);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SshKeyPair.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SshKeyPair.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SshKeyPair.java
index 9eaaac9..e02d13e 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SshKeyPair.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SshKeyPair.java
@@ -22,9 +22,8 @@ import java.beans.ConstructorProperties;
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;
/**
* Class SshKeyPair
@@ -132,7 +131,7 @@ public class SshKeyPair {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("fingerprint", fingerprint).add("name", name).add("privateKey", privateKey);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/StoragePool.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/StoragePool.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/StoragePool.java
index c134e70..35d33dc 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/StoragePool.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/StoragePool.java
@@ -25,9 +25,8 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
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;
import com.google.common.collect.ImmutableSet;
/**
@@ -467,7 +466,7 @@ public class StoragePool implements Comparable<StoragePool> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("name", name).add("path", path).add("tags", tags).add("state", state).add("type", type).add("zoneId", zoneId).add("zoneName", zoneName).add("podId", podId).add("podName", podName).add("clusterId", clusterId).add("clusterName", clusterName).add("created", created).add("diskSizeAllocated", diskSizeAllocated).add("diskSizeTotal", diskSizeTotal).add("ipAddress", ipAddress).add("jobId", jobId).add("jobStatus", jobStatus);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Tag.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Tag.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Tag.java
index 1868c51..b046251 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Tag.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Tag.java
@@ -21,13 +21,13 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
import java.util.Map;
+import org.jclouds.javax.annotation.Nullable;
+
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 org.jclouds.javax.annotation.Nullable;
/**
* Class Tag
@@ -331,7 +331,7 @@ public class Tag {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("account", account)
.add("customer", customer)
.add("domain", domain)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Template.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Template.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Template.java
index 76dce48..26ba3e3 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Template.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Template.java
@@ -22,12 +22,12 @@ import java.beans.ConstructorProperties;
import java.util.Date;
import java.util.Set;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
+import org.jclouds.javax.annotation.Nullable;
+
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableSet;
-import org.jclouds.javax.annotation.Nullable;
public class Template implements Comparable<Template> {
public enum Status {
@@ -878,7 +878,7 @@ public class Template implements Comparable<Template> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("displayText", displayText).add("domain", domain).add("domainId", domainId).add("account", account).add("accountId", accountId).add("zone", zone).add("zoneId", zoneId).add("OSType", OSType).add("OSTypeId", OSTypeId).add("name", name).add("type", type).add("status", status).add("format", format).add("hypervisor", hypervisor).add("size", size).add("created", created).add("removed", removed).add("crossZones", crossZones).add("bootable", bootable).add("extractable", extractable).add("featured", featured).add("ispublic", ispublic).add("ready", ready).add("passwordEnabled", passwordEnabled).add("jobId", jobId).add("jobStatus", jobStatus).add("checksum", checksum).add("hostId", hostId).add("hostName", hostName).add("sourceTemplateId", sourceTemplateId).add("templateTag", templateTag).add("tags", tags);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplateExtraction.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplateExtraction.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplateExtraction.java
index 4a603fa..2b3554a 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplateExtraction.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplateExtraction.java
@@ -23,9 +23,8 @@ import java.util.Date;
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;
public class TemplateExtraction implements Comparable<TemplateExtraction> {
@@ -351,7 +350,7 @@ public class TemplateExtraction implements Comparable<TemplateExtraction> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("accountId", accountId).add("created", created).add("extractId", extractId).add("extractMode", extractMode).add("name", name).add("state", state).add("status", status).add("storageType", storageType).add("uploadPercentage", uploadPercentage).add("url", url).add("zoneId", zoneId).add("zoneName", zoneName);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplateMetadata.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplateMetadata.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplateMetadata.java
index 17b845c..447b2bf 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplateMetadata.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplateMetadata.java
@@ -22,9 +22,8 @@ import java.beans.ConstructorProperties;
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;
/**
* Class TemplateMetadata
@@ -223,7 +222,7 @@ public class TemplateMetadata {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("name", name).add("osTypeId", osTypeId).add("displayText", displayText).add("snapshotId", snapshotId)
.add("volumeId", volumeId).add("virtualMachineId", virtualMachineId).add("passwordEnabled", passwordEnabled);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplatePermission.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplatePermission.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplatePermission.java
index a4584db..1005e35 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplatePermission.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplatePermission.java
@@ -22,9 +22,8 @@ import java.beans.ConstructorProperties;
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;
public class TemplatePermission {
@@ -166,7 +165,7 @@ public class TemplatePermission {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("account", account).add("domainId", domainId).add("isPublic", isPublic);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/UsageRecord.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/UsageRecord.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/UsageRecord.java
index 5d413da..fe54b70 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/UsageRecord.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/UsageRecord.java
@@ -25,9 +25,8 @@ import java.util.Map;
import org.jclouds.javax.annotation.Nullable;
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;
@@ -498,7 +497,7 @@ public class UsageRecord {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("description", description).add("accountId", accountId).add("accountName", accountName)
.add("domainId", domainId).add("startDate", startDate).add("endDate", endDate).add("assignDate", assignDate)
.add("releaseDate", releaseDate).add("zoneId", zoneId).add("virtualMachineId", virtualMachineId)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/User.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/User.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/User.java
index 8c3d71c..4fa6337 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/User.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/User.java
@@ -23,9 +23,8 @@ import java.util.Date;
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;
/**
* Class User
@@ -398,7 +397,7 @@ public class User {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("name", name).add("firstName", firstName).add("lastName", lastName).add("email", email)
.add("created", created).add("state", state).add("account", account).add("accountType", accountType).add("domain", domain)
.add("domainId", domainId).add("timeZone", timeZone).add("apiKey", apiKey).add("secretKey", secretKey);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VMGroup.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VMGroup.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VMGroup.java
index b3e5215..6f5ae60 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VMGroup.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VMGroup.java
@@ -23,9 +23,8 @@ import java.util.Date;
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;
/**
* Class VMGroup
@@ -205,7 +204,7 @@ public class VMGroup {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("account", account).add("created", created).add("domain", domain).add("domainId", domainId).add("name", name);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VirtualMachine.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VirtualMachine.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VirtualMachine.java
index 920914c..cd7e255 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VirtualMachine.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VirtualMachine.java
@@ -25,9 +25,8 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
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;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableSet;
@@ -1051,7 +1050,7 @@ public class VirtualMachine {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("account", account).add("cpuCount", cpuCount).add("cpuSpeed", cpuSpeed).add("cpuUsed", cpuUsed)
.add("displayName", displayName).add("created", created).add("domain", domain).add("domainId", domainId)
.add("usesVirtualNetwork", usesVirtualNetwork).add("group", group).add("groupId", groupId).add("guestOSId", guestOSId)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VlanIPRange.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VlanIPRange.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VlanIPRange.java
index 49c7d18..e9625f67 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VlanIPRange.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VlanIPRange.java
@@ -22,9 +22,8 @@ import java.beans.ConstructorProperties;
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;
/**
* Represents the data object used in CloudStack's "Vlan" API.
@@ -352,7 +351,7 @@ public class VlanIPRange implements Comparable<VlanIPRange> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("description", description).add("forVirtualNetwork", forVirtualNetwork).add("zoneId", zoneId)
.add("vlan", vlan).add("account", account).add("domainId", domainId).add("domain", domain).add("podId", podId)
.add("podName", podName).add("gateway", gateway).add("netmask", netmask).add("startIP", startIP).add("endIP", endIP)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Volume.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Volume.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Volume.java
index 30e3a4f..47dd9a1 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Volume.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Volume.java
@@ -27,9 +27,8 @@ import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.CaseFormat;
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;
@@ -745,7 +744,7 @@ public class Volume {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("account", account).add("attached", attached).add("created", created).add("destroyed", destroyed)
.add("deviceId", deviceId).add("diskOfferingDisplayText", diskOfferingDisplayText).add("diskOfferingId", diskOfferingId)
.add("diskOfferingName", diskOfferingName).add("domain", domain).add("domainId", domainId).add("hypervisor", hypervisor)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Zone.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Zone.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Zone.java
index 1548507..b710710 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Zone.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Zone.java
@@ -25,9 +25,8 @@ import java.util.Set;
import com.google.common.collect.ImmutableSet;
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.ImmutableList;
public class Zone implements Comparable<Zone> {
@@ -441,7 +440,7 @@ public class Zone implements Comparable<Zone> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("description", description).add("displayText", displayText).add("DNS1", DNS1).add("DNS2", DNS2)
.add("domain", domain).add("domainId", domainId).add("guestCIDRAddress", guestCIDRAddress).add("internalDNS1", internalDNS1)
.add("internalDNS2", internalDNS2).add("name", name).add("networkType", networkType).add("VLAN", VLAN)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ZoneAndName.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ZoneAndName.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ZoneAndName.java
index b6e7d2f..0154051 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ZoneAndName.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ZoneAndName.java
@@ -20,9 +20,8 @@ import static com.google.common.base.Objects.equal;
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.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Helpful when looking for resources by zone and name
@@ -88,6 +87,6 @@ public class ZoneAndName {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper("").add("zoneId", zoneId).add("name", name);
+ return Objects.toStringHelper("").add("zoneId", zoneId).add("name", name);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ZoneSecurityGroupNamePortsCidrs.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ZoneSecurityGroupNamePortsCidrs.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ZoneSecurityGroupNamePortsCidrs.java
index 8d75264..a269391 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ZoneSecurityGroupNamePortsCidrs.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ZoneSecurityGroupNamePortsCidrs.java
@@ -21,9 +21,8 @@ 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;
public class ZoneSecurityGroupNamePortsCidrs extends ZoneAndName {
@@ -147,7 +146,7 @@ public class ZoneSecurityGroupNamePortsCidrs extends ZoneAndName {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("zoneId", zoneId).add("name", name).add("ports", ports).add("cidrs", cidrs);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Alarm.java
----------------------------------------------------------------------
diff --git a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Alarm.java b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Alarm.java
index 8209b3d..4ea6cec 100644
--- a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Alarm.java
+++ b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Alarm.java
@@ -17,7 +17,7 @@
package org.jclouds.cloudwatch.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/AlarmHistoryItem.java
----------------------------------------------------------------------
diff --git a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/AlarmHistoryItem.java b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/AlarmHistoryItem.java
index 7e1fc70..b9e05d2 100644
--- a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/AlarmHistoryItem.java
+++ b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/AlarmHistoryItem.java
@@ -17,7 +17,7 @@
package org.jclouds.cloudwatch.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Date;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Datapoint.java
----------------------------------------------------------------------
diff --git a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Datapoint.java b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Datapoint.java
index 9cb2a17..2dffd0e 100644
--- a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Datapoint.java
+++ b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Datapoint.java
@@ -16,7 +16,6 @@
*/
package org.jclouds.cloudwatch.domain;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import org.jclouds.javax.annotation.Nullable;
@@ -140,7 +139,7 @@ public class Datapoint {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("timestamp", timestamp)
.add("customUnit", customUnit)
.add("maximum", maximum)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Dimension.java
----------------------------------------------------------------------
diff --git a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Dimension.java b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Dimension.java
index 85437f6..bd89f64 100644
--- a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Dimension.java
+++ b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Dimension.java
@@ -16,7 +16,6 @@
*/
package org.jclouds.cloudwatch.domain;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -75,7 +74,7 @@ public class Dimension {
*/
@Override
public String toString() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("name", name)
.add("value", value).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/GetMetricStatisticsResponse.java
----------------------------------------------------------------------
diff --git a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/GetMetricStatisticsResponse.java b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/GetMetricStatisticsResponse.java
index 8a87396..5639f6a 100644
--- a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/GetMetricStatisticsResponse.java
+++ b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/GetMetricStatisticsResponse.java
@@ -20,7 +20,6 @@ import java.util.Iterator;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.FluentIterable;
import com.google.common.collect.ImmutableSet;
@@ -81,7 +80,7 @@ public class GetMetricStatisticsResponse extends FluentIterable<Datapoint> {
*/
@Override
public String toString() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("label", label)
.add("datapoints", datapoints).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/ListMetricsResponse.java
----------------------------------------------------------------------
diff --git a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/ListMetricsResponse.java b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/ListMetricsResponse.java
index 5257ec6..3d6279c 100644
--- a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/ListMetricsResponse.java
+++ b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/ListMetricsResponse.java
@@ -20,7 +20,6 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ForwardingSet;
import com.google.common.collect.ImmutableSet;
@@ -81,7 +80,7 @@ public class ListMetricsResponse extends ForwardingSet<Metric> {
*/
@Override
public String toString() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("metrics", metrics)
.add("nextToken", nextToken).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Metric.java
----------------------------------------------------------------------
diff --git a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Metric.java b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Metric.java
index c0329cb..18a4f33 100644
--- a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Metric.java
+++ b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Metric.java
@@ -16,7 +16,6 @@
*/
package org.jclouds.cloudwatch.domain;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.Sets;
import org.jclouds.javax.annotation.Nullable;
@@ -96,7 +95,7 @@ public class Metric {
*/
@Override
public String toString() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("namespace", namespace)
.add("metricName", metricName)
.add("dimension", dimensions).toString();
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/MetricDatum.java
----------------------------------------------------------------------
diff --git a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/MetricDatum.java b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/MetricDatum.java
index 512be1d..73e1ecc 100644
--- a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/MetricDatum.java
+++ b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/MetricDatum.java
@@ -22,9 +22,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Date;
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.base.Optional;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
@@ -247,7 +246,7 @@ public class MetricDatum {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper("").omitNullValues().add("dimensions", dimensions).add("metricName", metricName)
+ return Objects.toStringHelper("").omitNullValues().add("dimensions", dimensions).add("metricName", metricName)
.add("statisticValues", statisticValues.orNull()).add("timestamp", timestamp.orNull()).add("unit", unit)
.add("value", value.orNull());
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/ec2/src/main/java/org/jclouds/ec2/compute/domain/PasswordDataAndPrivateKey.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/domain/PasswordDataAndPrivateKey.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/domain/PasswordDataAndPrivateKey.java
index 05c3bf5..b3d9100 100644
--- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/domain/PasswordDataAndPrivateKey.java
+++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/domain/PasswordDataAndPrivateKey.java
@@ -18,7 +18,6 @@ package org.jclouds.ec2.compute.domain;
import org.jclouds.ec2.domain.PasswordData;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -70,6 +69,6 @@ public class PasswordDataAndPrivateKey {
*/
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("passwordData", passwordData).toString();
+ return Objects.toStringHelper(this).omitNullValues().add("passwordData", passwordData).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/ec2/src/main/java/org/jclouds/ec2/compute/domain/RegionAndName.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/domain/RegionAndName.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/domain/RegionAndName.java
index 3de363c..cf38056 100644
--- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/domain/RegionAndName.java
+++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/domain/RegionAndName.java
@@ -19,9 +19,8 @@ package org.jclouds.ec2.compute.domain;
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.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
public class RegionAndName {
@@ -68,7 +67,7 @@ public class RegionAndName {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper("").add("region", region).add("name", name);
+ return Objects.toStringHelper("").add("region", region).add("name", name);
}
private static enum RegionFunction implements Function<RegionAndName, String> {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/ec2/src/main/java/org/jclouds/ec2/compute/options/EC2TemplateOptions.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/options/EC2TemplateOptions.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/options/EC2TemplateOptions.java
index 3e5f34c..a56d640 100644
--- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/options/EC2TemplateOptions.java
+++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/options/EC2TemplateOptions.java
@@ -27,7 +27,7 @@ import java.util.Map;
import java.util.Set;
import com.google.common.base.Objects;
-import com.google.common.base.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
import com.google.common.hash.Hashing;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/ec2/src/main/java/org/jclouds/ec2/domain/PasswordData.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/domain/PasswordData.java b/apis/ec2/src/main/java/org/jclouds/ec2/domain/PasswordData.java
index bc65dfe..4103286 100644
--- a/apis/ec2/src/main/java/org/jclouds/ec2/domain/PasswordData.java
+++ b/apis/ec2/src/main/java/org/jclouds/ec2/domain/PasswordData.java
@@ -20,7 +20,6 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Date;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -145,7 +144,7 @@ public class PasswordData {
*/
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("instanceId", instanceId).add("timestamp", timestamp)
+ return Objects.toStringHelper(this).omitNullValues().add("instanceId", instanceId).add("timestamp", timestamp)
.add("passwordData", passwordData).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/ec2/src/main/java/org/jclouds/ec2/domain/Reservation.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/domain/Reservation.java b/apis/ec2/src/main/java/org/jclouds/ec2/domain/Reservation.java
index 336d623..4fb7e22 100644
--- a/apis/ec2/src/main/java/org/jclouds/ec2/domain/Reservation.java
+++ b/apis/ec2/src/main/java/org/jclouds/ec2/domain/Reservation.java
@@ -22,7 +22,6 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ComparisonChain;
import com.google.common.collect.ForwardingSet;
@@ -215,7 +214,7 @@ public class Reservation<T extends RunningInstance> extends ForwardingSet<T> imp
*/
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("region", region).add("reservationId", reservationId)
+ return Objects.toStringHelper(this).omitNullValues().add("region", region).add("reservationId", reservationId)
.add("requesterId", requesterId).add("instances", instances).add("groupNames", groupNames).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/ec2/src/main/java/org/jclouds/ec2/domain/RunningInstance.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/domain/RunningInstance.java b/apis/ec2/src/main/java/org/jclouds/ec2/domain/RunningInstance.java
index d0f1ab6..00ab3e2 100644
--- a/apis/ec2/src/main/java/org/jclouds/ec2/domain/RunningInstance.java
+++ b/apis/ec2/src/main/java/org/jclouds/ec2/domain/RunningInstance.java
@@ -24,9 +24,8 @@ import java.util.Set;
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.base.Strings;
import com.google.common.collect.ComparisonChain;
import com.google.common.collect.ImmutableMap;
@@ -507,7 +506,7 @@ public class RunningInstance implements Comparable<RunningInstance> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("region", region)
+ return Objects.toStringHelper(this).omitNullValues().add("region", region)
.add("availabilityZone", availabilityZone).add("id", instanceId).add("state", rawState)
.add("type", instanceType).add("virtualizationType", virtualizationType).add("imageId", imageId)
.add("ipAddress", ipAddress).add("dnsName", dnsName).add("privateIpAddress", privateIpAddress)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/ec2/src/main/java/org/jclouds/ec2/domain/SecurityGroup.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/domain/SecurityGroup.java b/apis/ec2/src/main/java/org/jclouds/ec2/domain/SecurityGroup.java
index a45a16f..b497790 100644
--- a/apis/ec2/src/main/java/org/jclouds/ec2/domain/SecurityGroup.java
+++ b/apis/ec2/src/main/java/org/jclouds/ec2/domain/SecurityGroup.java
@@ -23,9 +23,8 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
import org.jclouds.net.domain.IpPermission;
-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.ForwardingSet;
import com.google.common.collect.ImmutableSet;
@@ -212,7 +211,7 @@ public class SecurityGroup extends ForwardingSet<IpPermission> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("region", region).add("id", id).add("name", name)
+ return Objects.toStringHelper(this).omitNullValues().add("region", region).add("id", id).add("name", name)
.add("ownerId", ownerId).add("description", description)
.add("ipPermissions", ipPermissions.isEmpty() ? null : ipPermissions);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/ec2/src/main/java/org/jclouds/ec2/domain/Subnet.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/domain/Subnet.java b/apis/ec2/src/main/java/org/jclouds/ec2/domain/Subnet.java
index 87be905..eecc169 100644
--- a/apis/ec2/src/main/java/org/jclouds/ec2/domain/Subnet.java
+++ b/apis/ec2/src/main/java/org/jclouds/ec2/domain/Subnet.java
@@ -20,9 +20,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Map;
-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;
/**
@@ -144,7 +143,7 @@ public final class Subnet {
}
private ToStringHelper string() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("subnetId", subnetId).add("subnetState", subnetState)
+ return Objects.toStringHelper(this).omitNullValues().add("subnetId", subnetId).add("subnetState", subnetState)
.add("vpcId", vpcId).add("cidrBlock", cidrBlock).add("availableIpAddressCount", availableIpAddressCount)
.add("availabilityZone", availabilityZone).add("tags", tags);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/ec2/src/main/java/org/jclouds/ec2/domain/Tag.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/domain/Tag.java b/apis/ec2/src/main/java/org/jclouds/ec2/domain/Tag.java
index 88e5069..e83b7da 100644
--- a/apis/ec2/src/main/java/org/jclouds/ec2/domain/Tag.java
+++ b/apis/ec2/src/main/java/org/jclouds/ec2/domain/Tag.java
@@ -18,9 +18,8 @@ package org.jclouds.ec2.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;
/**
@@ -192,7 +191,7 @@ public class Tag {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("resourceId", resourceId)
+ return Objects.toStringHelper(this).omitNullValues().add("resourceId", resourceId)
.add("resourceType", resourceType).add("key", key).add("value", value.orNull());
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/WellKnownImage.java
----------------------------------------------------------------------
diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/WellKnownImage.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/WellKnownImage.java
index 41b2683..22ce5d4 100644
--- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/WellKnownImage.java
+++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/WellKnownImage.java
@@ -16,13 +16,12 @@
*/
package org.jclouds.elasticstack.domain;
-import static com.google.common.base.MoreObjects.firstNonNull;
+import static com.google.common.base.Objects.firstNonNull;
import static com.google.common.base.Preconditions.checkNotNull;
import org.jclouds.compute.domain.OsFamily;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
public class WellKnownImage {
@@ -153,7 +152,7 @@ public class WellKnownImage {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("uuid", uuid).add("description", description)
+ return Objects.toStringHelper(this).omitNullValues().add("uuid", uuid).add("description", description)
.add("osFamily", osFamily).add("osVersion", osVersion).add("size", size).add("is64bit", is64bit)
.add("loginUser", loginUser).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Snapshot.java
----------------------------------------------------------------------
diff --git a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Snapshot.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Snapshot.java
index 8387eb0..e5e2e48 100644
--- a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Snapshot.java
+++ b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Snapshot.java
@@ -25,9 +25,8 @@ import javax.inject.Named;
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;
/**
* An Openstack Cinder Volume Snapshot.
@@ -229,7 +228,7 @@ public class Snapshot {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("volumeId", volumeId).add("status", status).add("size", size).add("created", created).add("name", name).add("description", description);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Volume.java
----------------------------------------------------------------------
diff --git a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Volume.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Volume.java
index 20a29ba..eed17f8 100644
--- a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Volume.java
+++ b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Volume.java
@@ -28,9 +28,8 @@ import javax.inject.Named;
import org.jclouds.javax.annotation.Nullable;
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;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
@@ -350,7 +349,7 @@ public class Volume {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("status", status).add("size", size).add("zone", zone).add("created", created).add("attachments", attachments).add("volumeType", volumeType).add("snapshotId", snapshotId).add("name", name).add("description", description).add("metadata", metadata);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeAttachment.java
----------------------------------------------------------------------
diff --git a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeAttachment.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeAttachment.java
index 19e9743..d86f23b 100644
--- a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeAttachment.java
+++ b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeAttachment.java
@@ -24,9 +24,8 @@ import javax.inject.Named;
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;
/**
* An OpenStack Cinder Volume Attachment (describes how Volumes are attached to Servers).
@@ -165,7 +164,7 @@ public class VolumeAttachment {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("volumeId", volumeId).add("serverId", serverId).add("device", device);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeQuota.java
----------------------------------------------------------------------
diff --git a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeQuota.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeQuota.java
index ae150e8..78b5936 100644
--- a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeQuota.java
+++ b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeQuota.java
@@ -16,7 +16,6 @@
*/
package org.jclouds.openstack.cinder.v1.domain;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import static com.google.common.base.Preconditions.checkNotNull;
@@ -80,8 +79,8 @@ public class VolumeQuota {
&& Objects.equal(this.snapshots, that.snapshots);
}
- protected MoreObjects.ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ protected Objects.ToStringHelper string() {
+ return Objects.toStringHelper(this)
.add("id", id).add("volumes", volumes).add("gigabytes", gigabytes).add("snapshots", snapshots);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeType.java
----------------------------------------------------------------------
diff --git a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeType.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeType.java
index c82168f..596b984 100644
--- a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeType.java
+++ b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeType.java
@@ -26,9 +26,8 @@ import javax.inject.Named;
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.base.Optional;
import com.google.common.collect.ImmutableMap;
@@ -179,7 +178,7 @@ public class VolumeType {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("name", name).add("created", created).add("updated", updated).add("extraSpecs", extraSpecs);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateSnapshotOptions.java
----------------------------------------------------------------------
diff --git a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateSnapshotOptions.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateSnapshotOptions.java
index f549b2f..5ce3fe0 100644
--- a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateSnapshotOptions.java
+++ b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateSnapshotOptions.java
@@ -17,7 +17,7 @@
package org.jclouds.openstack.cinder.v1.options;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.toStringHelper;
import java.util.Map;
@@ -28,7 +28,7 @@ import org.jclouds.rest.MapBinder;
import org.jclouds.rest.binders.BindToJsonPayload;
import com.google.common.base.Objects;
-import com.google.common.base.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateVolumeOptions.java
----------------------------------------------------------------------
diff --git a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateVolumeOptions.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateVolumeOptions.java
index 1b986a1..6c5681b 100644
--- a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateVolumeOptions.java
+++ b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateVolumeOptions.java
@@ -17,7 +17,7 @@
package org.jclouds.openstack.cinder.v1.options;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
@@ -31,7 +31,7 @@ import org.jclouds.rest.MapBinder;
import org.jclouds.rest.binders.BindToJsonPayload;
import com.google.common.base.Objects;
-import com.google.common.base.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Access.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Access.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Access.java
index 93d31f9..e121745 100644
--- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Access.java
+++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Access.java
@@ -23,9 +23,8 @@ import java.util.Set;
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.ForwardingSet;
import com.google.common.collect.ImmutableSet;
@@ -143,7 +142,7 @@ public class Access extends ForwardingSet<Service> implements Comparable<Access>
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("token", token).add("user", user)
+ return Objects.toStringHelper(this).omitNullValues().add("token", token).add("user", user)
.add("serviceCatalog", serviceCatalog);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/ApiAccessKeyCredentials.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/ApiAccessKeyCredentials.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/ApiAccessKeyCredentials.java
index 4e4d6dc..f926083 100644
--- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/ApiAccessKeyCredentials.java
+++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/ApiAccessKeyCredentials.java
@@ -23,9 +23,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.openstack.keystone.v2_0.config.CredentialType;
import org.jclouds.openstack.keystone.v2_0.config.CredentialTypes;
-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;
/**
* Api AccessKey Credentials
@@ -128,7 +127,7 @@ public class ApiAccessKeyCredentials {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("accessKey", accessKey).add("secretKey", secretKey);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/ApiMetadata.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/ApiMetadata.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/ApiMetadata.java
index fa354b8..ad20938 100644
--- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/ApiMetadata.java
+++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/ApiMetadata.java
@@ -29,7 +29,7 @@ import org.jclouds.openstack.v2_0.domain.Link;
import org.jclouds.openstack.v2_0.domain.Resource;
import com.google.common.base.Objects;
-import com.google.common.base.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Endpoint.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Endpoint.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Endpoint.java
index 0080b2e..4a71b1f 100644
--- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Endpoint.java
+++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Endpoint.java
@@ -21,9 +21,8 @@ import java.net.URI;
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;
/**
* An network-accessible address, usually described by URL, where a service may
@@ -332,7 +331,7 @@ public class Endpoint {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("id", id).add("versionId", versionId)
+ return Objects.toStringHelper(this).omitNullValues().add("id", id).add("versionId", versionId)
.add("region", region).add("publicURL", publicURL).add("internalURL", internalURL)
.add("adminURL", adminURL).add("versionInfo", versionInfo).add("versionList", versionList)
.add("tenantId", tenantId);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/MediaType.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/MediaType.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/MediaType.java
index da04359..796eed5 100644
--- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/MediaType.java
+++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/MediaType.java
@@ -20,9 +20,8 @@ import java.beans.ConstructorProperties;
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;
/**
* Class MediaType
@@ -113,7 +112,7 @@ public class MediaType {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("base", base).add("type", type);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/PasswordCredentials.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/PasswordCredentials.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/PasswordCredentials.java
index aa0dcbb..73443f1 100644
--- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/PasswordCredentials.java
+++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/PasswordCredentials.java
@@ -22,9 +22,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.openstack.keystone.v2_0.config.CredentialType;
-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;
/**
* Password Credentials
@@ -127,7 +126,7 @@ public class PasswordCredentials {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("username", username).add("password", password);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Role.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Role.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Role.java
index c1ec687..be3c544 100644
--- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Role.java
+++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Role.java
@@ -22,9 +22,8 @@ import java.beans.ConstructorProperties;
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;
/**
* A personality that a user assumes when performing a specific set of operations. A role includes a
@@ -193,7 +192,7 @@ public class Role {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).omitNullValues()
+ return Objects.toStringHelper(this).omitNullValues()
.add("id", id).add("name", name).add("description", description).add("serviceId", serviceId).add("tenantId", tenantId);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Service.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Service.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Service.java
index 4642d5e..9d71a78 100644
--- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Service.java
+++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Service.java
@@ -23,9 +23,8 @@ import java.util.Set;
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.ForwardingSet;
import com.google.common.collect.ImmutableSet;
@@ -192,7 +191,7 @@ public class Service extends ForwardingSet<Endpoint> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).omitNullValues()
+ return Objects.toStringHelper(this).omitNullValues()
.add("id", id).add("type", type).add("name", name)
.add("description", description).add("endpoints", endpoints);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Tenant.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Tenant.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Tenant.java
index c4e3cf9..adb71c4 100644
--- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Tenant.java
+++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Tenant.java
@@ -22,9 +22,8 @@ import java.beans.ConstructorProperties;
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;
/**
* A container used to group or isolate resources and/or identity objects.
@@ -163,7 +162,7 @@ public class Tenant {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("id", id).add("name", name)
+ return Objects.toStringHelper(this).omitNullValues().add("id", id).add("name", name)
.add("description", description).add("enabled", enabled);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Token.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Token.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Token.java
index bd2ba76..52a5e0f 100644
--- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Token.java
+++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Token.java
@@ -23,9 +23,8 @@ import java.util.Date;
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.base.Optional;
/**
@@ -152,7 +151,7 @@ public class Token implements Comparable<Token> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).omitNullValues()
+ return Objects.toStringHelper(this).omitNullValues()
.add("id", id).add("expires", expires).add("tenant", tenant.orNull());
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/User.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/User.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/User.java
index 6e20818..8d4d90d 100644
--- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/User.java
+++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/User.java
@@ -23,9 +23,8 @@ import java.util.Set;
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.ForwardingSet;
import com.google.common.collect.ImmutableSet;
@@ -208,7 +207,7 @@ public class User extends ForwardingSet<Role> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("id", id).add("name", name).add("email", email)
+ return Objects.toStringHelper(this).omitNullValues().add("id", id).add("name", name).add("email", email)
.add("enabled", enabled).add("roles", roles).add("tenanId", tenantId);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/CreateTenantOptions.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/CreateTenantOptions.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/CreateTenantOptions.java
index e654d9b..24b0523 100644
--- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/CreateTenantOptions.java
+++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/CreateTenantOptions.java
@@ -27,9 +27,8 @@ import org.jclouds.http.HttpRequest;
import org.jclouds.rest.MapBinder;
import org.jclouds.rest.binders.BindToJsonPayload;
-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;
public class CreateTenantOptions implements MapBinder {
@@ -58,7 +57,7 @@ public class CreateTenantOptions implements MapBinder {
}
protected ToStringHelper string() {
- ToStringHelper toString = MoreObjects.toStringHelper("").omitNullValues();
+ ToStringHelper toString = Objects.toStringHelper("").omitNullValues();
toString.add("description", description);
toString.add("enabled", Boolean.valueOf(enabled));
return toString;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/CreateUserOptions.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/CreateUserOptions.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/CreateUserOptions.java
index 7411536..1e1b843 100644
--- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/CreateUserOptions.java
+++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/CreateUserOptions.java
@@ -27,9 +27,8 @@ import org.jclouds.http.HttpRequest;
import org.jclouds.rest.MapBinder;
import org.jclouds.rest.binders.BindToJsonPayload;
-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;
public class CreateUserOptions implements MapBinder{
@@ -61,7 +60,7 @@ public class CreateUserOptions implements MapBinder{
}
protected ToStringHelper string() {
- ToStringHelper toString = MoreObjects.toStringHelper("").omitNullValues();
+ ToStringHelper toString = Objects.toStringHelper("").omitNullValues();
toString.add("tenant", tenant);
toString.add("password", password);
toString.add("email", email);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/UpdateTenantOptions.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/UpdateTenantOptions.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/UpdateTenantOptions.java
index d7af8d2..bfc2caa 100644
--- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/UpdateTenantOptions.java
+++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/UpdateTenantOptions.java
@@ -26,9 +26,8 @@ import org.jclouds.http.HttpRequest;
import org.jclouds.rest.MapBinder;
import org.jclouds.rest.binders.BindToJsonPayload;
-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;
public class UpdateTenantOptions implements MapBinder {
@@ -58,7 +57,7 @@ public class UpdateTenantOptions implements MapBinder {
}
protected ToStringHelper string() {
- ToStringHelper toString = MoreObjects.toStringHelper("").omitNullValues();
+ ToStringHelper toString = Objects.toStringHelper("").omitNullValues();
toString.add("name", name);
toString.add("description", description);
toString.add("enabled", Boolean.valueOf(enabled));