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 2017/08/25 01:11:34 UTC
[1/9] jclouds git commit: JCLOUDS-1225: Address Guava 18 Objects
changes
Repository: jclouds
Updated Branches:
refs/heads/master e331a000d -> 04a3f6fd8
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/ResourceRecordDetail.java
----------------------------------------------------------------------
diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/ResourceRecordDetail.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/ResourceRecordDetail.java
index a29e103..fc80706 100644
--- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/ResourceRecordDetail.java
+++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/ResourceRecordDetail.java
@@ -17,7 +17,7 @@
package org.jclouds.ultradns.ws.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Date;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/RoundRobinPool.java
----------------------------------------------------------------------
diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/RoundRobinPool.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/RoundRobinPool.java
index 2ae13c1..cefb52f 100644
--- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/RoundRobinPool.java
+++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/RoundRobinPool.java
@@ -18,6 +18,7 @@ package org.jclouds.ultradns.ws.domain;
import static com.google.common.base.Preconditions.checkNotNull;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
public final class RoundRobinPool {
@@ -106,7 +107,7 @@ public final class RoundRobinPool {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("zoneId", zoneId).add("id", id).add("name", name)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("zoneId", zoneId).add("id", id).add("name", name)
.add("dname", dname).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/Task.java
----------------------------------------------------------------------
diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/Task.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/Task.java
index 6fc26b2..86af600 100644
--- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/Task.java
+++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/Task.java
@@ -20,6 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.net.URI;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Optional;
@@ -82,7 +83,7 @@ public final class Task {
@Override
public String toString() {
- return Objects.toStringHelper(this).add("guid", guid).add("statusCode", statusCode).add("message", message)
+ return MoreObjects.toStringHelper(this).add("guid", guid).add("statusCode", statusCode).add("message", message)
.add("resultUrl", resultUrl).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/TrafficControllerPool.java
----------------------------------------------------------------------
diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/TrafficControllerPool.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/TrafficControllerPool.java
index 6e69a3d..a80c127 100644
--- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/TrafficControllerPool.java
+++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/TrafficControllerPool.java
@@ -18,6 +18,7 @@ package org.jclouds.ultradns.ws.domain;
import static com.google.common.base.Preconditions.checkNotNull;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -143,7 +144,7 @@ public final class TrafficControllerPool {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("zoneId", zoneId).add("id", id).add("name", name)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("zoneId", zoneId).add("id", id).add("name", name)
.add("dname", dname).add("status", statusCode).add("failOverEnabled", failOverEnabled)
.add("probingEnabled", probingEnabled).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/TrafficControllerPoolRecord.java
----------------------------------------------------------------------
diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/TrafficControllerPoolRecord.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/TrafficControllerPoolRecord.java
index 4c30008..0f7952e 100644
--- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/TrafficControllerPoolRecord.java
+++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/TrafficControllerPoolRecord.java
@@ -17,7 +17,7 @@
package org.jclouds.ultradns.ws.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import com.google.common.base.Objects;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/TrafficControllerPoolRecordDetail.java
----------------------------------------------------------------------
diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/TrafficControllerPoolRecordDetail.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/TrafficControllerPoolRecordDetail.java
index bda5ffc..ae0a3d2 100644
--- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/TrafficControllerPoolRecordDetail.java
+++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/TrafficControllerPoolRecordDetail.java
@@ -19,6 +19,7 @@ package org.jclouds.ultradns.ws.domain;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
public final class TrafficControllerPoolRecordDetail {
@@ -145,7 +146,7 @@ public final class TrafficControllerPoolRecordDetail {
@Override
public String toString() {
- return Objects.toStringHelper(this).add("id", id).add("poolId", poolId).add("record", record)
+ return MoreObjects.toStringHelper(this).add("id", id).add("poolId", poolId).add("record", record)
.add("weight", weight).add("priority", priority).add("forceAnswer", forceAnswer)
.add("probingEnabled", probingEnabled).add("status", status).add("serving", serving)
.add("description", description).toString();
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/UpdatePoolRecord.java
----------------------------------------------------------------------
diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/UpdatePoolRecord.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/UpdatePoolRecord.java
index 80b0c79..04f163b 100644
--- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/UpdatePoolRecord.java
+++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/UpdatePoolRecord.java
@@ -17,7 +17,7 @@
package org.jclouds.ultradns.ws.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.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/a493e2ca/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/Zone.java
----------------------------------------------------------------------
diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/Zone.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/Zone.java
index 50349bf..1aaeb78 100644
--- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/Zone.java
+++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/Zone.java
@@ -19,6 +19,7 @@ package org.jclouds.ultradns.ws.domain;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Optional;
@@ -122,7 +123,7 @@ public final class Zone {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("id", id).add("name", name).add("type", type)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("id", id).add("name", name).add("type", type)
.add("accountId", accountId).add("ownerId", ownerId).add("dnssecStatus", dnssecStatus)
.add("primarySrc", primarySrc.orNull()).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/ZoneProperties.java
----------------------------------------------------------------------
diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/ZoneProperties.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/ZoneProperties.java
index 972b42d..2061c12 100644
--- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/ZoneProperties.java
+++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/ZoneProperties.java
@@ -23,6 +23,7 @@ import java.util.Date;
import org.jclouds.ultradns.ws.domain.Zone.Type;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
public final class ZoneProperties {
@@ -94,7 +95,7 @@ public final class ZoneProperties {
@Override
public String toString() {
- return Objects.toStringHelper(this).add("name", name).add("type", type)
+ return MoreObjects.toStringHelper(this).add("name", name).add("type", type)
.add("modified", modified).add("resourceRecordCount", resourceRecordCount).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/InitScript.java
----------------------------------------------------------------------
diff --git a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/InitScript.java b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/InitScript.java
index a684d02..a7fd425 100644
--- a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/InitScript.java
+++ b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/InitScript.java
@@ -17,7 +17,7 @@
package org.jclouds.scriptbuilder;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.collect.Iterables.concat;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/GitRepoAndRef.java
----------------------------------------------------------------------
diff --git a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/GitRepoAndRef.java b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/GitRepoAndRef.java
index 5df47c6..b5bf0f2 100644
--- a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/GitRepoAndRef.java
+++ b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/GitRepoAndRef.java
@@ -20,6 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.net.URI;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Optional;
@@ -145,7 +146,7 @@ public class GitRepoAndRef {
*/
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("repository", repository).add("branch", branch.orNull())
+ return MoreObjects.toStringHelper(this).omitNullValues().add("repository", repository).add("branch", branch.orNull())
.add("tag", tag.orNull()).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/chef/DataBag.java
----------------------------------------------------------------------
diff --git a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/chef/DataBag.java b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/chef/DataBag.java
index dd3d264..be13c0d 100644
--- a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/chef/DataBag.java
+++ b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/chef/DataBag.java
@@ -20,6 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Map;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ForwardingMap;
import com.google.common.collect.ImmutableMap;
@@ -104,7 +105,7 @@ public class DataBag extends ForwardingMap<String, String> {
@Override
public String toString() {
- return Objects.toStringHelper(this).add("name", name).toString();
+ return MoreObjects.toStringHelper(this).add("name", name).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/chef/Role.java
----------------------------------------------------------------------
diff --git a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/chef/Role.java b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/chef/Role.java
index 5adad79..7b383df 100644
--- a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/chef/Role.java
+++ b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/chef/Role.java
@@ -18,6 +18,7 @@ package org.jclouds.scriptbuilder.domain.chef;
import static com.google.common.base.Preconditions.checkNotNull;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Optional;
@@ -139,7 +140,7 @@ public class Role {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("name", name).add("description", description.orNull())
+ return MoreObjects.toStringHelper(this).omitNullValues().add("name", name).add("description", description.orNull())
.toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/git/CloneGitRepo.java
----------------------------------------------------------------------
diff --git a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/git/CloneGitRepo.java b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/git/CloneGitRepo.java
index 1300fca..4793f7a 100644
--- a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/git/CloneGitRepo.java
+++ b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/git/CloneGitRepo.java
@@ -25,6 +25,7 @@ import org.jclouds.scriptbuilder.domain.OsFamily;
import org.jclouds.scriptbuilder.domain.Statement;
import org.jclouds.scriptbuilder.domain.Statements;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Optional;
import com.google.common.base.Splitter;
@@ -190,7 +191,7 @@ public class CloneGitRepo implements Statement {
*/
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("gitRepoAndRef", gitRepoAndRef)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("gitRepoAndRef", gitRepoAndRef)
.add("directory", directory.orNull()).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/AdminAccessBuilderSpec.java
----------------------------------------------------------------------
diff --git a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/AdminAccessBuilderSpec.java b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/AdminAccessBuilderSpec.java
index 5f4aeeb..250727a 100644
--- a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/AdminAccessBuilderSpec.java
+++ b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/AdminAccessBuilderSpec.java
@@ -17,7 +17,7 @@
package org.jclouds.scriptbuilder.statements.login;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkArgument;
import java.io.File;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/UserAdd.java
----------------------------------------------------------------------
diff --git a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/UserAdd.java b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/UserAdd.java
index 4d12b86..f5ccc5e 100644
--- a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/UserAdd.java
+++ b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/UserAdd.java
@@ -31,6 +31,7 @@ import org.jclouds.scriptbuilder.statements.ssh.InstallRSAPrivateKey;
import com.google.common.base.Function;
import com.google.common.base.Joiner;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Strings;
import com.google.common.base.Throwables;
@@ -256,6 +257,6 @@ public class UserAdd implements Statement {
@Override
public String toString() {
- return Objects.toStringHelper("").add("login", login).toString();
+ return MoreObjects.toStringHelper("").add("login", login).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Datacenter.java
----------------------------------------------------------------------
diff --git a/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Datacenter.java b/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Datacenter.java
index bbed39a..92feb7b 100644
--- a/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Datacenter.java
+++ b/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Datacenter.java
@@ -16,6 +16,7 @@
*/
package org.jclouds.servermanager;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -50,7 +51,7 @@ public class Datacenter {
@Override
public String toString() {
- return Objects.toStringHelper(this).add("id", id).add("name", name).toString();
+ return MoreObjects.toStringHelper(this).add("id", id).add("name", name).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Hardware.java
----------------------------------------------------------------------
diff --git a/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Hardware.java b/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Hardware.java
index f17cace..f0068bd 100644
--- a/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Hardware.java
+++ b/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Hardware.java
@@ -16,6 +16,7 @@
*/
package org.jclouds.servermanager;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -59,7 +60,7 @@ public class Hardware {
@Override
public String toString() {
- return Objects.toStringHelper(this).add("id", id).add("name", name).add("cores", cores).add("ram", ram)
+ return MoreObjects.toStringHelper(this).add("id", id).add("name", name).add("cores", cores).add("ram", ram)
.add("disk", disk).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Image.java
----------------------------------------------------------------------
diff --git a/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Image.java b/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Image.java
index dc192cd..e187a03 100644
--- a/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Image.java
+++ b/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Image.java
@@ -16,6 +16,7 @@
*/
package org.jclouds.servermanager;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -50,7 +51,7 @@ public class Image {
@Override
public String toString() {
- return Objects.toStringHelper(this).add("id", id).add("name", name).toString();
+ return MoreObjects.toStringHelper(this).add("id", id).add("name", name).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Server.java
----------------------------------------------------------------------
diff --git a/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Server.java b/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Server.java
index ea8eac4..3c2a8dd 100644
--- a/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Server.java
+++ b/skeletons/standalone-compute/src/main/java/org/jclouds/servermanager/Server.java
@@ -16,6 +16,7 @@
*/
package org.jclouds.servermanager;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -66,7 +67,7 @@ public class Server {
@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("datacenter", datacenter).add("imageId", imageId).add("hardwareId", hardwareId)
.add("publicAddress", publicAddress).add("privateAddress", privateAddress).add("loginUser", loginUser)
.toString();
[5/9] jclouds git commit: JCLOUDS-1225: Address Guava 18 Objects
changes
Posted by ga...@apache.org.
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceAdapter.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceAdapter.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceAdapter.java
index 1149e94..38e4232 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceAdapter.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/NovaComputeServiceAdapter.java
@@ -58,7 +58,7 @@ import org.jclouds.openstack.nova.v2_0.options.CreateServerOptions;
import org.jclouds.openstack.nova.v2_0.predicates.ImagePredicates;
import com.google.common.base.Function;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Predicate;
import com.google.common.base.Splitter;
import com.google.common.base.Supplier;
@@ -193,7 +193,7 @@ public class NovaComputeServiceAdapter implements
@Override
public String apply(Image input) {
- return Objects.toStringHelper("").add("id", input.getId()).add("status", input.getStatus())
+ return MoreObjects.toStringHelper("").add("id", input.getId()).add("status", input.getStatus())
.toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/AllocateAndAddFloatingIpToNode.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/AllocateAndAddFloatingIpToNode.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/AllocateAndAddFloatingIpToNode.java
index ec7aaf8..ed41190 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/AllocateAndAddFloatingIpToNode.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/AllocateAndAddFloatingIpToNode.java
@@ -42,7 +42,7 @@ import org.jclouds.rest.InsufficientResourcesException;
import org.jclouds.rest.ResourceNotFoundException;
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.cache.LoadingCache;
@@ -158,6 +158,6 @@ public class AllocateAndAddFloatingIpToNode implements
@Override
public String toString() {
- return Objects.toStringHelper("AllocateAndAddFloatingIpToNode").toString();
+ return MoreObjects.toStringHelper("AllocateAndAddFloatingIpToNode").toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/ImageInRegionToImage.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/ImageInRegionToImage.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/ImageInRegionToImage.java
index 4617f06..35a6787 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/ImageInRegionToImage.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/ImageInRegionToImage.java
@@ -31,7 +31,7 @@ import org.jclouds.openstack.nova.v2_0.domain.Image.Status;
import org.jclouds.openstack.nova.v2_0.domain.regionscoped.ImageInRegion;
import com.google.common.base.Function;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Supplier;
/**
@@ -63,6 +63,6 @@ public class ImageInRegionToImage implements Function<ImageInRegion, Image> {
@Override
public String toString() {
- return Objects.toStringHelper(this).toString();
+ return MoreObjects.toStringHelper(this).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/ImageToOperatingSystem.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/ImageToOperatingSystem.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/ImageToOperatingSystem.java
index 59a0786..9008ca3 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/ImageToOperatingSystem.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/ImageToOperatingSystem.java
@@ -41,7 +41,7 @@ import org.jclouds.openstack.nova.v2_0.domain.Image;
import com.google.common.base.CharMatcher;
import com.google.common.base.Function;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Predicate;
import com.google.common.base.Splitter;
@@ -68,7 +68,7 @@ public class ImageToOperatingSystem implements Function<Image, OperatingSystem>
OsFamily osFamily = null;
String osVersion = null;
- String imageName = Objects.firstNonNull(from.getName(), "unspecified");
+ String imageName = MoreObjects.firstNonNull(from.getName(), "unspecified");
boolean is64Bit = true;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/RemoveFloatingIpFromNodeAndDeallocate.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/RemoveFloatingIpFromNodeAndDeallocate.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/RemoveFloatingIpFromNodeAndDeallocate.java
index dbf2836..94309c8 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/RemoveFloatingIpFromNodeAndDeallocate.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/functions/RemoveFloatingIpFromNodeAndDeallocate.java
@@ -30,7 +30,7 @@ import org.jclouds.openstack.nova.v2_0.domain.regionscoped.RegionAndId;
import org.jclouds.openstack.nova.v2_0.extensions.FloatingIPApi;
import com.google.common.base.Function;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
import com.google.common.cache.LoadingCache;
/**
@@ -67,6 +67,6 @@ public class RemoveFloatingIpFromNodeAndDeallocate implements Function<RegionAnd
@Override
public String toString() {
- return Objects.toStringHelper("RemoveFloatingIpFromNodeAndDecreate").toString();
+ return MoreObjects.toStringHelper("RemoveFloatingIpFromNodeAndDecreate").toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/options/NovaTemplateOptions.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/options/NovaTemplateOptions.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/options/NovaTemplateOptions.java
index 2811e05..51b6bb2 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/options/NovaTemplateOptions.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/compute/options/NovaTemplateOptions.java
@@ -33,7 +33,7 @@ import org.jclouds.openstack.nova.v2_0.options.CreateServerOptions;
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;
import com.google.common.collect.ImmutableSet;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Address.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Address.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Address.java
index 1de3d93..79b10ea 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Address.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Address.java
@@ -20,8 +20,9 @@ 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.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Optional;
import org.jclouds.javax.annotation.Nullable;
@@ -160,7 +161,7 @@ public class Address {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("addr", addr).add("version", version).add("macAddr", macAddr.or("")).add("type", type.or(""));
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/BlockDeviceMapping.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/BlockDeviceMapping.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/BlockDeviceMapping.java
index 7e05614..9938b7c 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/BlockDeviceMapping.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/BlockDeviceMapping.java
@@ -22,8 +22,9 @@ import javax.inject.Named;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* A representation of a block device that can be used to boot a Nova instance.
@@ -185,7 +186,7 @@ public class BlockDeviceMapping {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("uuid", uuid)
.add("deviceName", deviceName)
.add("deviceType", deviceType)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Console.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Console.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Console.java
index b0963ec..b0fc8ad 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Console.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Console.java
@@ -16,14 +16,14 @@
*/
package org.jclouds.openstack.nova.v2_0.domain;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
import java.net.URI;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Represents an Openstack Console.
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/FixedIP.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/FixedIP.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/FixedIP.java
index 046b42b..43dc288 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/FixedIP.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/FixedIP.java
@@ -16,8 +16,9 @@
*/
package org.jclouds.openstack.nova.v2_0.domain;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import org.jclouds.javax.annotation.Nullable;
import javax.inject.Named;
@@ -71,7 +72,7 @@ public class FixedIP {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this).add("ipAddress", ipAddress).add("subnetId", subnetId);
+ return MoreObjects.toStringHelper(this).add("ipAddress", ipAddress).add("subnetId", subnetId);
}
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Flavor.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Flavor.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Flavor.java
index ce40d51..c33ffda 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Flavor.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Flavor.java
@@ -28,7 +28,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.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Optional;
/**
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/FloatingIP.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/FloatingIP.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/FloatingIP.java
index 76e1c26..c3481bb 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/FloatingIP.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/FloatingIP.java
@@ -24,8 +24,9 @@ import javax.inject.Named;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* A Floating IP is an IP address that can be created and associated with a
@@ -172,7 +173,7 @@ public class FloatingIP implements Comparable<FloatingIP> {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id).add("ip", ip).add("fixedIp", fixedIp).add("instanceId", instanceId).add("pool", pool);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/FloatingIPPool.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/FloatingIPPool.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/FloatingIPPool.java
index 4e3b919..4f9b3dd 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/FloatingIPPool.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/FloatingIPPool.java
@@ -18,6 +18,7 @@ package org.jclouds.openstack.nova.v2_0.domain;
import java.beans.ConstructorProperties;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -83,8 +84,8 @@ public class FloatingIPPool implements Comparable<FloatingIPPool> {
return Objects.equal(this.name, that.name);
}
- protected Objects.ToStringHelper string() {
- return Objects.toStringHelper(this)
+ protected MoreObjects.ToStringHelper string() {
+ return MoreObjects.toStringHelper(this)
.add("name", name);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Host.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Host.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Host.java
index 2c690f4..e40a9ea 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Host.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Host.java
@@ -22,8 +22,9 @@ import javax.inject.Named;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Class Host
@@ -132,7 +133,7 @@ public class Host {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("name", name).add("service", service).add("zone", zone);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/HostAggregate.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/HostAggregate.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/HostAggregate.java
index f79245a..610efce 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/HostAggregate.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/HostAggregate.java
@@ -27,8 +27,9 @@ import javax.inject.Named;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
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.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
@@ -236,7 +237,7 @@ public class HostAggregate {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id).add("name", name).add("availabilityZone", availabilityZone).add("hosts", hosts).add("state", state).add("created", created).add("updated", updated).add("metadata", metadata);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/HostResourceUsage.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/HostResourceUsage.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/HostResourceUsage.java
index 186fb33..cf72bbc 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/HostResourceUsage.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/HostResourceUsage.java
@@ -24,8 +24,9 @@ import javax.inject.Named;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Class HostResourceUsage
@@ -168,7 +169,7 @@ public class HostResourceUsage {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("host", host).add("project", project).add("memoryMb", memoryMb).add("cpu", cpu).add("diskGb", diskGb);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Image.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Image.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Image.java
index b7c47c8..a28d80a 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Image.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Image.java
@@ -31,7 +31,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.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableMap;
/**
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Ingress.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Ingress.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Ingress.java
index 38f4e90..ae12919 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Ingress.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Ingress.java
@@ -24,8 +24,9 @@ import org.jclouds.javax.annotation.Nullable;
import org.jclouds.net.domain.IpProtocol;
import com.google.common.annotations.Beta;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Ingress access to a destination protocol on particular ports
@@ -147,7 +148,7 @@ public class Ingress {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("ipProtocol", ipProtocol).add("fromPort", fromPort).add("toPort", toPort);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/InterfaceAttachment.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/InterfaceAttachment.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/InterfaceAttachment.java
index 0301b5a..4c1d6ed 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/InterfaceAttachment.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/InterfaceAttachment.java
@@ -17,13 +17,14 @@
package org.jclouds.openstack.nova.v2_0.domain;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
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.ImmutableSet;
@@ -161,7 +162,7 @@ public class InterfaceAttachment {
&& Objects.equal(this.fixedIps, that.fixedIps);
}
- protected Objects.ToStringHelper string() {
+ protected MoreObjects.ToStringHelper string() {
return toStringHelper(this).add("networkId", networkId).add("portId", portId).add("portState", portState)
.add("macAddress", macAddress).add("fixedIps", fixedIps);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/KeyPair.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/KeyPair.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/KeyPair.java
index aded550..f91ba5c 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/KeyPair.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/KeyPair.java
@@ -24,8 +24,9 @@ import javax.inject.Named;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Class KeyPair
@@ -172,7 +173,7 @@ public class KeyPair {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.omitNullValues()
.add("public_key", publicKey)
.add("private_key", privateKey)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Network.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Network.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Network.java
index 49a3194..ee7af6f 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Network.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Network.java
@@ -20,8 +20,9 @@ import static com.google.common.base.Preconditions.checkArgument;
import java.beans.ConstructorProperties;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Nova (or Neutron) network definition
@@ -81,7 +82,7 @@ public class Network implements Comparable<Network> {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("networkUuid", networkUuid)
.add("portUuid", portUuid)
.add("fixedIp", fixedIp);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Quota.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Quota.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Quota.java
index c16693e..d6b8f57 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Quota.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Quota.java
@@ -22,8 +22,9 @@ import java.beans.ConstructorProperties;
import javax.inject.Named;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Represents the set of limits (quotas) returned by the Quota Extension
@@ -344,7 +345,7 @@ public class Quota {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id).add("metadataItems", metadataItems).add("injectedFileContentBytes", injectedFileContentBytes).add("volumes", volumes).add("gigabytes", gigabytes).add("ram", ram).add("floatingIps", floatingIps).add("instances", instances).add("injectedFiles", injectedFiles).add("cores", cores).add("securityGroups", securityGroups).add("securityGroupRules", securityGroupRules).add("keyPairs", keyPairs);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SecurityGroup.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SecurityGroup.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SecurityGroup.java
index 0e47fcd..5c9de23 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SecurityGroup.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SecurityGroup.java
@@ -25,8 +25,9 @@ import javax.inject.Named;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
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;
/**
@@ -176,7 +177,7 @@ public class SecurityGroup {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id).add("tenantId", tenantId).add("name", name).add("description", description).add("rules", rules);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SecurityGroupRule.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SecurityGroupRule.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SecurityGroupRule.java
index 92d58f7..15df347 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SecurityGroupRule.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SecurityGroupRule.java
@@ -26,7 +26,7 @@ import org.jclouds.javax.annotation.Nullable;
import org.jclouds.net.domain.IpProtocol;
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.ForwardingObject;
/**
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Server.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Server.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Server.java
index 0e4f4b6..5aff1ac 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Server.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Server.java
@@ -28,7 +28,7 @@ import org.jclouds.javax.annotation.Nullable;
import org.jclouds.openstack.v2_0.domain.Link;
import org.jclouds.openstack.v2_0.domain.Resource;
-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.Strings;
import com.google.common.collect.ImmutableMap;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/ServerCreated.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/ServerCreated.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/ServerCreated.java
index 8b13ec8..6db9f5f 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/ServerCreated.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/ServerCreated.java
@@ -24,7 +24,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.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Optional;
/**
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/ServerExtendedAttributes.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/ServerExtendedAttributes.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/ServerExtendedAttributes.java
index 3332607..ac0d573 100755
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/ServerExtendedAttributes.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/ServerExtendedAttributes.java
@@ -22,8 +22,9 @@ import javax.inject.Named;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Additional attributes delivered by Extended Server Attributes extension (alias "OS-EXT-SRV-ATTR")
@@ -142,7 +143,7 @@ public class ServerExtendedAttributes {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("instanceName", instanceName).add("hostName", hostName).add("hypervisorHostName", hypervisorHostName);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/ServerExtendedStatus.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/ServerExtendedStatus.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/ServerExtendedStatus.java
index 944e057..44ed882 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/ServerExtendedStatus.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/ServerExtendedStatus.java
@@ -22,8 +22,9 @@ import javax.inject.Named;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Additional attributes delivered by Extended Server Status extension (alias "OS-EXT-STS")
@@ -140,7 +141,7 @@ public class ServerExtendedStatus {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("taskState", taskState).add("vmState", vmState).add("powerState", powerState);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/ServerWithSecurityGroups.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/ServerWithSecurityGroups.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/ServerWithSecurityGroups.java
index 4289193..ebe6c05 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/ServerWithSecurityGroups.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/ServerWithSecurityGroups.java
@@ -30,7 +30,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.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Multimap;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SimpleServerUsage.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SimpleServerUsage.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SimpleServerUsage.java
index f790d67..89830fb 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SimpleServerUsage.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SimpleServerUsage.java
@@ -25,8 +25,9 @@ import javax.inject.Named;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Information the SimpleTenantUsage extension return data about each Server
@@ -299,7 +300,7 @@ public class SimpleServerUsage {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("instanceName", instanceName).add("hours", hours).add("flavorMemoryMb", flavorMemoryMb).add("flavorLocalGb", flavorLocalGb).add("flavorVcpus", flavorVcpus).add("tenantId", tenantId).add("flavorName", flavorName).add("instanceCreated", instanceCreated).add("instanceTerminated", instanceTerminated).add("instanceStatus", instanceStatus).add("uptime", uptime);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SimpleTenantUsage.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SimpleTenantUsage.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SimpleTenantUsage.java
index 4b12743..af64978 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SimpleTenantUsage.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/SimpleTenantUsage.java
@@ -26,8 +26,9 @@ import javax.inject.Named;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
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;
/**
@@ -232,7 +233,7 @@ public class SimpleTenantUsage {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("tenantId", tenantId).add("totalLocalGbUsage", totalLocalGbUsage).add("totalVcpusUsage", totalVcpusUsage).add("totalMemoryMbUsage", totalMemoryMbUsage).add("totalHours", totalHours).add("start", start).add("stop", stop).add("serverUsages", serverUsages);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/TenantIdAndName.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/TenantIdAndName.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/TenantIdAndName.java
index b0b2164..cd9c8c6 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/TenantIdAndName.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/TenantIdAndName.java
@@ -22,8 +22,9 @@ import java.beans.ConstructorProperties;
import javax.inject.Named;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Class TenantIdAndName
@@ -114,7 +115,7 @@ public class TenantIdAndName {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("tenantId", tenantId).add("name", name);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/VirtualInterface.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/VirtualInterface.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/VirtualInterface.java
index 42b2fba..7da0f76 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/VirtualInterface.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/VirtualInterface.java
@@ -22,8 +22,9 @@ import java.beans.ConstructorProperties;
import javax.inject.Named;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Represents a Virtual Interface (VIF)
@@ -115,7 +116,7 @@ public class VirtualInterface {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id).add("macAddress", macAddress);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Volume.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Volume.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Volume.java
index 7fecfb2..0cb1b6f 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Volume.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/Volume.java
@@ -28,8 +28,9 @@ 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.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;
@@ -334,7 +335,7 @@ public class Volume {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.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/a493e2ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/VolumeAttachment.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/VolumeAttachment.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/VolumeAttachment.java
index 894f85b..c5286af 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/VolumeAttachment.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/VolumeAttachment.java
@@ -22,8 +22,9 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* An OpenStack Nova Volume Attachment (describes how Volumes are attached to Servers)
@@ -160,7 +161,7 @@ public class VolumeAttachment {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id).add("volumeId", volumeId).add("serverId", serverId).add("device", device);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/VolumeSnapshot.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/VolumeSnapshot.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/VolumeSnapshot.java
index bbd45a4..f5e3050 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/VolumeSnapshot.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/VolumeSnapshot.java
@@ -25,8 +25,9 @@ import javax.inject.Named;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* An OpenStack Nova Volume Snapshot
@@ -227,7 +228,7 @@ public class VolumeSnapshot {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.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/a493e2ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/VolumeType.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/VolumeType.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/VolumeType.java
index 43a0aba..ff0ae8f 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/VolumeType.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/VolumeType.java
@@ -26,8 +26,9 @@ import javax.inject.Named;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
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.collect.ImmutableMap;
@@ -180,7 +181,7 @@ public class VolumeType {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.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/a493e2ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/AvailabilityZone.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/AvailabilityZone.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/AvailabilityZone.java
index f1957c3..b2b70f9 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/AvailabilityZone.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/AvailabilityZone.java
@@ -16,6 +16,7 @@
*/
package org.jclouds.openstack.nova.v2_0.domain.regionscoped;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.gson.annotations.SerializedName;
@@ -58,8 +59,8 @@ public class AvailabilityZone {
return Objects.equal(this.name, that.name) && Objects.equal(this.state, that.state);
}
- protected Objects.ToStringHelper string() {
- return Objects.toStringHelper(this)
+ protected MoreObjects.ToStringHelper string() {
+ return MoreObjects.toStringHelper(this)
.add("name", name)
.add("state", state);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/AvailabilityZoneDetails.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/AvailabilityZoneDetails.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/AvailabilityZoneDetails.java
index e226b40..f98c074 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/AvailabilityZoneDetails.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/AvailabilityZoneDetails.java
@@ -16,6 +16,7 @@
*/
package org.jclouds.openstack.nova.v2_0.domain.regionscoped;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableMap;
import com.google.gson.annotations.SerializedName;
@@ -51,8 +52,8 @@ public class AvailabilityZoneDetails {
public Date getUpdated() { return updated; }
- protected Objects.ToStringHelper string() {
- return Objects.toStringHelper(this)
+ protected MoreObjects.ToStringHelper string() {
+ return MoreObjects.toStringHelper(this)
.add("available", available)
.add("active", active)
.add("updated", updated);
@@ -106,8 +107,8 @@ public class AvailabilityZoneDetails {
that.hosts);
}
- protected Objects.ToStringHelper string() {
- return Objects.toStringHelper(this)
+ protected MoreObjects.ToStringHelper string() {
+ return MoreObjects.toStringHelper(this)
.add("name", name)
.add("state", state)
.add("Hosts", hosts);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/FlavorInRegion.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/FlavorInRegion.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/FlavorInRegion.java
index 6f8737b..5754bba 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/FlavorInRegion.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/FlavorInRegion.java
@@ -20,7 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
import org.jclouds.openstack.nova.v2_0.domain.Flavor;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
public class FlavorInRegion extends RegionAndId {
protected final Flavor flavor;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/ImageInRegion.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/ImageInRegion.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/ImageInRegion.java
index b9f0f53..9fd9829 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/ImageInRegion.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/ImageInRegion.java
@@ -20,7 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
import org.jclouds.openstack.nova.v2_0.domain.Image;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
public class ImageInRegion extends RegionAndId {
protected final Image image;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/RegionAndId.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/RegionAndId.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/RegionAndId.java
index 0a31634..fad50e2 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/RegionAndId.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/RegionAndId.java
@@ -19,8 +19,9 @@ package org.jclouds.openstack.nova.v2_0.domain.regionscoped;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
+import com.google.common.base.MoreObjects;
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.Splitter;
import com.google.common.collect.Iterables;
@@ -78,7 +79,7 @@ public class RegionAndId {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this).add("regionId", regionId).add("id", id);
+ return MoreObjects.toStringHelper(this).add("regionId", regionId).add("id", id);
}
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/RegionAndName.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/RegionAndName.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/RegionAndName.java
index 25d7d25..910b075 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/RegionAndName.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/RegionAndName.java
@@ -21,8 +21,9 @@ import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import com.google.common.base.Function;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Splitter;
import com.google.common.collect.Iterables;
@@ -95,7 +96,7 @@ public class RegionAndName {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this).add("regionId", regionId).add("name", name);
+ return MoreObjects.toStringHelper(this).add("regionId", regionId).add("name", name);
}
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/RegionSecurityGroupNameAndPorts.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/RegionSecurityGroupNameAndPorts.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/RegionSecurityGroupNameAndPorts.java
index 5ee360b..fb94122 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/RegionSecurityGroupNameAndPorts.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/RegionSecurityGroupNameAndPorts.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 RegionSecurityGroupNameAndPorts extends RegionAndName {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/SecurityGroupInRegion.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/SecurityGroupInRegion.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/SecurityGroupInRegion.java
index 41466c4..4eebea3 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/SecurityGroupInRegion.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/SecurityGroupInRegion.java
@@ -24,7 +24,7 @@ import java.util.Map;
import org.jclouds.openstack.nova.v2_0.domain.SecurityGroup;
import org.jclouds.openstack.nova.v2_0.domain.TenantIdAndName;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.HashMultimap;
import com.google.common.collect.Multimap;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/ServerInRegion.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/ServerInRegion.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/ServerInRegion.java
index be80937..18c3071 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/ServerInRegion.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/ServerInRegion.java
@@ -20,7 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
import org.jclouds.openstack.nova.v2_0.domain.Server;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
public class ServerInRegion extends RegionAndId {
protected final Server server;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/ZoneState.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/ZoneState.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/ZoneState.java
index e8eaef9..7f8f0c0 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/ZoneState.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/regionscoped/ZoneState.java
@@ -16,6 +16,7 @@
*/
package org.jclouds.openstack.nova.v2_0.domain.regionscoped;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
public class ZoneState {
@@ -39,8 +40,8 @@ public class ZoneState {
return Objects.equal(this.available, that.available);
}
- protected Objects.ToStringHelper string() {
- return Objects.toStringHelper(this)
+ protected MoreObjects.ToStringHelper string() {
+ return MoreObjects.toStringHelper(this)
.add("available", available);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/AvailabilityZone.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/AvailabilityZone.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/AvailabilityZone.java
index 49eeb1c..cae07ea 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/AvailabilityZone.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/AvailabilityZone.java
@@ -18,6 +18,7 @@ package org.jclouds.openstack.nova.v2_0.domain.zonescoped;
import java.beans.ConstructorProperties;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.gson.annotations.SerializedName;
@@ -60,8 +61,8 @@ public class AvailabilityZone {
return Objects.equal(this.name, that.name) && Objects.equal(this.state, that.state);
}
- protected Objects.ToStringHelper string() {
- return Objects.toStringHelper(this)
+ protected MoreObjects.ToStringHelper string() {
+ return MoreObjects.toStringHelper(this)
.add("name", name)
.add("state", state);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/RegionAndName.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/RegionAndName.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/RegionAndName.java
index cdf79c9..9b7a85a 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/RegionAndName.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/RegionAndName.java
@@ -21,8 +21,9 @@ import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import com.google.common.base.Function;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Splitter;
import com.google.common.collect.Iterables;
@@ -109,6 +110,6 @@ public class RegionAndName {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("").add("regionId", regionId).add("name", name);
+ return MoreObjects.toStringHelper("").add("regionId", regionId).add("name", name);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/RegionSecurityGroupNameAndPorts.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/RegionSecurityGroupNameAndPorts.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/RegionSecurityGroupNameAndPorts.java
index 86202c3..ee3ff6b 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/RegionSecurityGroupNameAndPorts.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/RegionSecurityGroupNameAndPorts.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;
/**
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/ZoneState.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/ZoneState.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/ZoneState.java
index 18173be..cd41269 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/ZoneState.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/domain/zonescoped/ZoneState.java
@@ -16,6 +16,7 @@
*/
package org.jclouds.openstack.nova.v2_0.domain.zonescoped;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -49,8 +50,8 @@ public class ZoneState {
return Objects.equal(this.available, that.available);
}
- protected Objects.ToStringHelper string() {
- return Objects.toStringHelper(this)
+ protected MoreObjects.ToStringHelper string() {
+ return MoreObjects.toStringHelper(this)
.add("available", available);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateBackupOfServerOptions.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateBackupOfServerOptions.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateBackupOfServerOptions.java
index c2d3809..1b1fbd7 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateBackupOfServerOptions.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateBackupOfServerOptions.java
@@ -17,7 +17,7 @@
package org.jclouds.openstack.nova.v2_0.options;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.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.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateServerOptions.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateServerOptions.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateServerOptions.java
index 7dd3472..86b2a45 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateServerOptions.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateServerOptions.java
@@ -17,7 +17,7 @@
package org.jclouds.openstack.nova.v2_0.options;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Strings.emptyToNull;
@@ -37,8 +37,9 @@ import org.jclouds.openstack.nova.v2_0.domain.Network;
import org.jclouds.rest.MapBinder;
import org.jclouds.rest.binders.BindToJsonPayload;
+import com.google.common.base.MoreObjects;
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.ForwardingObject;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableList;
@@ -143,7 +144,7 @@ public class CreateServerOptions implements MapBinder {
}
protected ToStringHelper string() {
- ToStringHelper toString = Objects.toStringHelper(this);
+ ToStringHelper toString = MoreObjects.toStringHelper(this);
toString.add("keyName", keyName);
if (!securityGroupNames.isEmpty())
toString.add("securityGroupNames", securityGroupNames);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateVolumeOptions.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateVolumeOptions.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateVolumeOptions.java
index df9a879..7741c19 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateVolumeOptions.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateVolumeOptions.java
@@ -17,7 +17,7 @@
package org.jclouds.openstack.nova.v2_0.options;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.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.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateVolumeSnapshotOptions.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateVolumeSnapshotOptions.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateVolumeSnapshotOptions.java
index c8a2fdd..3772434 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateVolumeSnapshotOptions.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateVolumeSnapshotOptions.java
@@ -17,7 +17,7 @@
package org.jclouds.openstack.nova.v2_0.options;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.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.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateVolumeTypeOptions.java
----------------------------------------------------------------------
diff --git a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateVolumeTypeOptions.java b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateVolumeTypeOptions.java
index a5b72e4..aeb870e 100644
--- a/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateVolumeTypeOptions.java
+++ b/apis/openstack-nova/src/main/java/org/jclouds/openstack/nova/v2_0/options/CreateVolumeTypeOptions.java
@@ -17,7 +17,7 @@
package org.jclouds.openstack.nova.v2_0.options;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.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.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Account.java
----------------------------------------------------------------------
diff --git a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Account.java b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Account.java
index 496087e..8611bc7 100644
--- a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Account.java
+++ b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Account.java
@@ -17,14 +17,14 @@
package org.jclouds.openstack.swift.v1.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Map;
import java.util.Map.Entry;
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.collect.ImmutableMap;
import com.google.common.collect.ImmutableMultimap;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/BulkDeleteResponse.java
----------------------------------------------------------------------
diff --git a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/BulkDeleteResponse.java b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/BulkDeleteResponse.java
index 9933a1c..e4bdb51 100644
--- a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/BulkDeleteResponse.java
+++ b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/BulkDeleteResponse.java
@@ -17,13 +17,13 @@
package org.jclouds.openstack.swift.v1.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Map;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Represents a response from a Bulk Delete request.
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Container.java
----------------------------------------------------------------------
diff --git a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Container.java b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Container.java
index 8fa0653..12b2172 100644
--- a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Container.java
+++ b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Container.java
@@ -17,7 +17,7 @@
package org.jclouds.openstack.swift.v1.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
@@ -25,7 +25,7 @@ import java.util.Map;
import java.util.Map.Entry;
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.collect.ImmutableMap;
import com.google.common.collect.ImmutableMultimap;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/ExtractArchiveResponse.java
----------------------------------------------------------------------
diff --git a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/ExtractArchiveResponse.java b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/ExtractArchiveResponse.java
index e569cf4..959aef6 100644
--- a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/ExtractArchiveResponse.java
+++ b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/ExtractArchiveResponse.java
@@ -17,13 +17,13 @@
package org.jclouds.openstack.swift.v1.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Map;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Represents a response from an Extract Archive request.
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Segment.java
----------------------------------------------------------------------
diff --git a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Segment.java b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Segment.java
index 663cff3..1da53a4 100644
--- a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Segment.java
+++ b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/Segment.java
@@ -17,13 +17,13 @@
package org.jclouds.openstack.swift.v1.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import javax.inject.Named;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Represents a single segment of a multi-part upload.
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/SwiftObject.java
----------------------------------------------------------------------
diff --git a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/SwiftObject.java b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/SwiftObject.java
index deace8a..d5b4cdf 100644
--- a/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/SwiftObject.java
+++ b/apis/openstack-swift/src/main/java/org/jclouds/openstack/swift/v1/domain/SwiftObject.java
@@ -17,7 +17,7 @@
package org.jclouds.openstack.swift.v1.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.net.URI;
@@ -28,7 +28,7 @@ import java.util.Map.Entry;
import org.jclouds.io.Payload;
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.ImmutableMultimap;
import com.google.common.collect.Multimap;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/domain/Flavor.java
----------------------------------------------------------------------
diff --git a/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/domain/Flavor.java b/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/domain/Flavor.java
index b81867b..78b53e1 100644
--- a/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/domain/Flavor.java
+++ b/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/domain/Flavor.java
@@ -21,8 +21,9 @@ import java.util.List;
import org.jclouds.openstack.v2_0.domain.Link;
+import com.google.common.base.MoreObjects;
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.collect.ImmutableList;
@@ -88,7 +89,7 @@ public class Flavor implements Comparable<Flavor>{
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id).add("name", name).add("ram", ram);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/domain/Instance.java
----------------------------------------------------------------------
diff --git a/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/domain/Instance.java b/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/domain/Instance.java
index d5afb53..92bb64c 100644
--- a/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/domain/Instance.java
+++ b/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/domain/Instance.java
@@ -23,8 +23,9 @@ import java.util.List;
import org.jclouds.openstack.trove.v1.internal.Volume;
import org.jclouds.openstack.v2_0.domain.Link;
+import com.google.common.base.MoreObjects;
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;
/**
@@ -175,7 +176,7 @@ public class Instance implements Comparable<Instance>{
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id).add("name", name).add("flavor", flavor).add("volume size", volume.getSize()).add("links", links).add("hostname", hostname);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/domain/User.java
----------------------------------------------------------------------
diff --git a/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/domain/User.java b/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/domain/User.java
index 1012c74..237fd85 100644
--- a/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/domain/User.java
+++ b/apis/openstack-trove/src/main/java/org/jclouds/openstack/trove/v1/domain/User.java
@@ -21,8 +21,9 @@ import java.beans.ConstructorProperties;
import java.util.List;
import java.util.Map;
import java.util.Set;
+import com.google.common.base.MoreObjects;
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.Lists;
@@ -138,7 +139,7 @@ public class User implements Comparable<User>{
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("name", name)
.add("password", password)
.add("host", host)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/CreateDomain.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/CreateDomain.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/CreateDomain.java
index 6425111..b45fb8b 100644
--- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/CreateDomain.java
+++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/CreateDomain.java
@@ -18,8 +18,9 @@ package org.jclouds.rackspace.clouddns.v1.domain;
import static com.google.common.base.Preconditions.checkNotNull;
+import com.google.common.base.MoreObjects;
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.collect.ImmutableMap;
@@ -106,7 +107,7 @@ public class CreateDomain {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this).omitNullValues().add("name", name).add("email", emailAddress)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("name", name).add("email", emailAddress)
.add("ttl", ttl.orNull()).add("comment", comment.orNull()).add("subdomains", subdomains)
.add("records", recordsList);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/CreateSubdomain.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/CreateSubdomain.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/CreateSubdomain.java
index d620bfa..03597e8 100644
--- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/CreateSubdomain.java
+++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/CreateSubdomain.java
@@ -18,8 +18,9 @@ package org.jclouds.rackspace.clouddns.v1.domain;
import static com.google.common.base.Preconditions.checkNotNull;
+import com.google.common.base.MoreObjects;
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;
public class CreateSubdomain {
@@ -80,7 +81,7 @@ public class CreateSubdomain {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this).omitNullValues().add("name", name).add("email", emailAddress)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("name", name).add("email", emailAddress)
.add("ttl", ttl.orNull()).add("comment", comment.orNull());
}
[2/9] jclouds git commit: JCLOUDS-1225: Address Guava 18 Objects
changes
Posted by ga...@apache.org.
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/glesys/src/main/java/org/jclouds/glesys/domain/Console.java
----------------------------------------------------------------------
diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/Console.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/Console.java
index aee64a7..f9f9377 100644
--- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/Console.java
+++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/Console.java
@@ -20,8 +20,9 @@ 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.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Connection information to connect to a server with VNC.
@@ -153,7 +154,7 @@ public class Console {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("").add("host", host).add("port", port).add("protocol", protocol)
+ return MoreObjects.toStringHelper("").add("host", host).add("port", port).add("protocol", protocol)
.add("password", password);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/glesys/src/main/java/org/jclouds/glesys/domain/Cost.java
----------------------------------------------------------------------
diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/Cost.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/Cost.java
index 160758a..26afb9d 100644
--- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/Cost.java
+++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/Cost.java
@@ -20,8 +20,9 @@ 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.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* The Cost class contains information about the cost of a server
@@ -135,7 +136,7 @@ public class Cost {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("amount", amount).add("currency", currency).add("timePeriod", timePeriod);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/glesys/src/main/java/org/jclouds/glesys/domain/Domain.java
----------------------------------------------------------------------
diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/Domain.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/Domain.java
index 9633165..af38c6f 100644
--- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/Domain.java
+++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/Domain.java
@@ -23,8 +23,9 @@ import java.util.Date;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Domain data for a Glesys account.
@@ -294,7 +295,7 @@ public class Domain {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("domainName", domainName).add("createTime", createTime).add("recordCount", recordCount).add("useGlesysNameServer", useGlesysNameServer);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/glesys/src/main/java/org/jclouds/glesys/domain/DomainRecord.java
----------------------------------------------------------------------
diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/DomainRecord.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/DomainRecord.java
index 9a3dd6b..c04d073 100644
--- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/DomainRecord.java
+++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/DomainRecord.java
@@ -22,8 +22,9 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* DNS record data.
@@ -196,7 +197,7 @@ public class DomainRecord {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("id", id).add("domainname", domainname).add("host", host).add("type", type).add("data", data)
.add("ttl", ttl);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailAccount.java
----------------------------------------------------------------------
diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailAccount.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailAccount.java
index b564cc4..968ee5e 100644
--- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailAccount.java
+++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailAccount.java
@@ -23,8 +23,9 @@ import java.util.Date;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Detailed information on an Email Account
@@ -255,7 +256,7 @@ public class EmailAccount {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("account", account).add("quota", quota).add("antispamLevel", antispamLevel).add("antiVirus", antiVirus).add("autoRespond", autoRespond).add("autoRespondMessage", autoRespondMessage).add("autoRespondSaveEmail", autoRespondSaveEmail).add("created", created).add("modified", modified);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailAlias.java
----------------------------------------------------------------------
diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailAlias.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailAlias.java
index 426e942..f349822 100644
--- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailAlias.java
+++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailAlias.java
@@ -20,8 +20,9 @@ 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.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Detailed information on an Email Account
@@ -115,7 +116,7 @@ public class EmailAlias {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("alias", alias).add("forwardTo", forwardTo);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverview.java
----------------------------------------------------------------------
diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverview.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverview.java
index 32353ab..ee2fcc2 100644
--- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverview.java
+++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverview.java
@@ -22,8 +22,9 @@ import java.beans.ConstructorProperties;
import java.util.Set;
import com.google.common.annotations.Beta;
+import com.google.common.base.MoreObjects;
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;
/**
@@ -125,7 +126,7 @@ public class EmailOverview {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("summary", summary).add("domains", domains);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverviewDomain.java
----------------------------------------------------------------------
diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverviewDomain.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverviewDomain.java
index 8376721..b201c8a 100644
--- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverviewDomain.java
+++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverviewDomain.java
@@ -21,8 +21,9 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
import com.google.common.annotations.Beta;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Detailed information about e-mail settings for a single domain
@@ -129,7 +130,7 @@ public class EmailOverviewDomain {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("").add("domain", domain).add("accounts", accounts).add("aliases", aliases);
+ return MoreObjects.toStringHelper("").add("domain", domain).add("accounts", accounts).add("aliases", aliases);
}
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverviewSummary.java
----------------------------------------------------------------------
diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverviewSummary.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverviewSummary.java
index f99b233..8d1f35e 100644
--- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverviewSummary.java
+++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailOverviewSummary.java
@@ -19,8 +19,9 @@ package org.jclouds.glesys.domain;
import java.beans.ConstructorProperties;
import com.google.common.annotations.Beta;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Summary information of e-mail settings and limits for a GleSYS account
@@ -158,7 +159,7 @@ public class EmailOverviewSummary {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("accounts", accounts).add("maxAccounts", maxAccounts).add("aliases", aliases).add("maxAliases", maxAliases);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailQuota.java
----------------------------------------------------------------------
diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailQuota.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailQuota.java
index 96686f5..4eb548f 100644
--- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailQuota.java
+++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/EmailQuota.java
@@ -20,8 +20,9 @@ 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.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Information on an Email Account Quota size
@@ -116,7 +117,7 @@ public class EmailQuota {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("").add("max", max).add("unit", unit);
+ return MoreObjects.toStringHelper("").add("max", max).add("unit", unit);
}
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/glesys/src/main/java/org/jclouds/glesys/domain/Ip.java
----------------------------------------------------------------------
diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/Ip.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/Ip.java
index 401929d..296ba63 100644
--- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/Ip.java
+++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/Ip.java
@@ -20,8 +20,9 @@ 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.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Represents an ip address used by a server.
@@ -171,7 +172,7 @@ public class Ip {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("ip", ip).add("version", version).add("cost", cost).add("currency", currency);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/glesys/src/main/java/org/jclouds/glesys/domain/IpDetails.java
----------------------------------------------------------------------
diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/IpDetails.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/IpDetails.java
index c7b12b6..19e7f81 100644
--- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/IpDetails.java
+++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/IpDetails.java
@@ -23,8 +23,9 @@ import java.util.List;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
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;
/**
@@ -310,7 +311,7 @@ public class IpDetails {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("datacenter", datacenter).add("ipversion", version).add("ptr", ptr).add("platform", platform)
.add("address", address).add("netmask", netmask).add("broadcast", broadcast).add("gateway", gateway)
.add("nameServers", nameServers).add("serverId", serverId).add("cost", cost).add("reserved", reserved);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/glesys/src/main/java/org/jclouds/glesys/domain/OSTemplate.java
----------------------------------------------------------------------
diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/OSTemplate.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/OSTemplate.java
index f11a691..c0c4f18 100644
--- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/OSTemplate.java
+++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/OSTemplate.java
@@ -20,8 +20,9 @@ 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.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Operating system template
@@ -175,7 +176,7 @@ public class OSTemplate {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("name", name).add("minDiskSize", minDiskSize).add("minMemSize", minMemSize).add("os", os).add("platform", platform);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceStatus.java
----------------------------------------------------------------------
diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceStatus.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceStatus.java
index fafc6ec..e79aa2d 100644
--- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceStatus.java
+++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceStatus.java
@@ -20,8 +20,9 @@ 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.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Detailed information on usage
@@ -135,7 +136,7 @@ public class ResourceStatus {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("").add("usage", usage).add("max", max).add("unit", unit);
+ return MoreObjects.toStringHelper("").add("usage", usage).add("max", max).add("unit", unit);
}
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceUsage.java
----------------------------------------------------------------------
diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceUsage.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceUsage.java
index 989bd83..e637ef8 100644
--- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceUsage.java
+++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceUsage.java
@@ -21,8 +21,9 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
import java.util.Set;
+import com.google.common.base.MoreObjects;
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;
/**
@@ -122,7 +123,7 @@ public class ResourceUsage {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("info", info).add("values", values);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceUsageInfo.java
----------------------------------------------------------------------
diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceUsageInfo.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceUsageInfo.java
index c4517bc..f2c51df 100644
--- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceUsageInfo.java
+++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceUsageInfo.java
@@ -20,8 +20,9 @@ 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.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Detailed information on usage
@@ -129,7 +130,7 @@ public class ResourceUsageInfo {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("resource", resource).add("resolution", resolution).add("unit", unit);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceUsageValue.java
----------------------------------------------------------------------
diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceUsageValue.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceUsageValue.java
index e49a0cb..5ed4e73 100644
--- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceUsageValue.java
+++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ResourceUsageValue.java
@@ -21,8 +21,9 @@ 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.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Detailed information on usage
@@ -114,7 +115,7 @@ public class ResourceUsageValue {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("").add("value", value).add("timestamp", timestamp);
+ return MoreObjects.toStringHelper("").add("value", value).add("timestamp", timestamp);
}
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/glesys/src/main/java/org/jclouds/glesys/domain/Server.java
----------------------------------------------------------------------
diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/Server.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/Server.java
index 7d700d4..d31b1d3 100644
--- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/Server.java
+++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/Server.java
@@ -21,8 +21,9 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
import com.google.common.base.CaseFormat;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Listing of a server.
@@ -176,7 +177,7 @@ public class Server {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("").add("id", id).add("hostname", hostname).add("datacenter", datacenter)
+ return MoreObjects.toStringHelper("").add("id", id).add("hostname", hostname).add("datacenter", datacenter)
.add("platform", platform);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerDetails.java
----------------------------------------------------------------------
diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerDetails.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerDetails.java
index cb35e99..781443f 100644
--- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerDetails.java
+++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerDetails.java
@@ -23,7 +23,7 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
-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/blob/a493e2ca/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerLimit.java
----------------------------------------------------------------------
diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerLimit.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerLimit.java
index 8c6b112..477e584 100644
--- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerLimit.java
+++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerLimit.java
@@ -18,8 +18,9 @@ package org.jclouds.glesys.domain;
import java.beans.ConstructorProperties;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Detailed information about an OpenVZ server's limits
@@ -160,7 +161,7 @@ public class ServerLimit {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("").add("held", held).add("maxHeld", maxHeld).add("barrier", barrier)
+ return MoreObjects.toStringHelper("").add("held", held).add("maxHeld", maxHeld).add("barrier", barrier)
.add("limit", limit).add("failCount", failCount);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerSpec.java
----------------------------------------------------------------------
diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerSpec.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerSpec.java
index 5ca4cb1..74b841d 100644
--- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerSpec.java
+++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerSpec.java
@@ -20,8 +20,9 @@ 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.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Class ServerSpec
@@ -215,7 +216,7 @@ public class ServerSpec {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("").add("platform", platform).add("datacenter", datacenter)
+ return MoreObjects.toStringHelper("").add("platform", platform).add("datacenter", datacenter)
.add("memorySizeMB", memorySizeMB).add("diskSizeGB", diskSizeGB).add("templateName", templateName)
.add("cpuCores", cpuCores).add("transferGB", transferGB);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerStatus.java
----------------------------------------------------------------------
diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerStatus.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerStatus.java
index 912a7f6..b146b82 100644
--- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerStatus.java
+++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerStatus.java
@@ -22,8 +22,9 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Detailed information server status including hardware usage (cpu, memory and disk), bandwidth and up-time.
@@ -181,7 +182,7 @@ public class ServerStatus {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("state", state).add("cpu", cpu).add("memory", memory).add("disk", disk).add("uptime", uptime);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerUptime.java
----------------------------------------------------------------------
diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerUptime.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerUptime.java
index 8eac4ae..4bd6272 100644
--- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerUptime.java
+++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ServerUptime.java
@@ -20,8 +20,9 @@ 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.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Represents an 'uptime' duration of server in a Glesys cloud
@@ -115,7 +116,7 @@ public class ServerUptime {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("").add("current", current).add("unit", unit);
+ return MoreObjects.toStringHelper("").add("current", current).add("unit", unit);
}
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/glesys/src/main/java/org/jclouds/glesys/options/CreateServerOptions.java
----------------------------------------------------------------------
diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/options/CreateServerOptions.java b/providers/glesys/src/main/java/org/jclouds/glesys/options/CreateServerOptions.java
index c956860..05af302 100644
--- a/providers/glesys/src/main/java/org/jclouds/glesys/options/CreateServerOptions.java
+++ b/providers/glesys/src/main/java/org/jclouds/glesys/options/CreateServerOptions.java
@@ -17,7 +17,7 @@
package org.jclouds.glesys.options;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Predicates.instanceOf;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/BillingToken.java
----------------------------------------------------------------------
diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/BillingToken.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/BillingToken.java
index 84e0248..e2b3fcf 100644
--- a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/BillingToken.java
+++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/BillingToken.java
@@ -20,8 +20,9 @@ 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.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.primitives.Longs;
/**
@@ -129,7 +130,7 @@ public class BillingToken implements Comparable<BillingToken> {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id).add("name", name).add("price", price);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Customer.java
----------------------------------------------------------------------
diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Customer.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Customer.java
index 98274de..a82218c 100644
--- a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Customer.java
+++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Customer.java
@@ -20,8 +20,9 @@ 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.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Class Customer
@@ -111,7 +112,7 @@ public class Customer {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id).add("name", name);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Ip.java
----------------------------------------------------------------------
diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Ip.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Ip.java
index bbbeeeb..4581428 100644
--- a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Ip.java
+++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Ip.java
@@ -22,8 +22,9 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.primitives.Longs;
/**
@@ -184,7 +185,7 @@ public class Ip implements Comparable<Ip> {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id).add("ip", ip).add("subnet", subnet).add("isPublic", isPublic).add("state", state).add("datacenter", datacenter);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/IpPortPair.java
----------------------------------------------------------------------
diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/IpPortPair.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/IpPortPair.java
index ca90764..2e74b74 100644
--- a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/IpPortPair.java
+++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/IpPortPair.java
@@ -20,8 +20,9 @@ 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.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.primitives.Ints;
import com.google.common.primitives.Longs;
@@ -113,7 +114,7 @@ public class IpPortPair implements Comparable<IpPortPair> {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("ip", ip).add("port", port);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Job.java
----------------------------------------------------------------------
diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Job.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Job.java
index 3639b8d..e30750c 100644
--- a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Job.java
+++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Job.java
@@ -25,8 +25,9 @@ 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.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.primitives.Longs;
@@ -264,7 +265,7 @@ public class Job implements Comparable<Job> {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id).add("command", command).add("objectType", objectType).add("createdOn", createdOn).add("lastUpdatedOn", lastUpdatedOn).add("currentState", currentState).add("attempts", attempts).add("owner", owner).add("history", history).add("details", details);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/JobProperties.java
----------------------------------------------------------------------
diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/JobProperties.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/JobProperties.java
index 897b73e..42bbdcf 100644
--- a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/JobProperties.java
+++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/JobProperties.java
@@ -23,8 +23,9 @@ import java.util.Date;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.primitives.Longs;
/**
@@ -151,7 +152,7 @@ public class JobProperties implements Comparable<JobProperties> {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id).add("updatedOn", updatedOn).add("state", state).add("note", note);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/LoadBalancer.java
----------------------------------------------------------------------
diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/LoadBalancer.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/LoadBalancer.java
index 9fcb8b8..866a2aa 100644
--- a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/LoadBalancer.java
+++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/LoadBalancer.java
@@ -23,8 +23,9 @@ 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.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
import com.google.common.primitives.Longs;
@@ -257,7 +258,7 @@ public class LoadBalancer implements Comparable<LoadBalancer> {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id).add("name", name).add("description", description).add("virtualIp", virtualIp).add("realIpList", realIpList).add("type", type).add("persistence", persistence).add("os", os).add("state", state).add("datacenter", datacenter);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Option.java
----------------------------------------------------------------------
diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Option.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Option.java
index a65acfa..da98cf7 100644
--- a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Option.java
+++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Option.java
@@ -22,8 +22,9 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.primitives.Longs;
/**
@@ -136,7 +137,7 @@ public class Option implements Comparable<Option> {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id).add("name", name).add("description", description);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Server.java
----------------------------------------------------------------------
diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Server.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Server.java
index 2c85fab..3f4222e 100644
--- a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Server.java
+++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/Server.java
@@ -22,8 +22,9 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.primitives.Longs;
/**
@@ -270,7 +271,7 @@ public class Server implements Comparable<Server> {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id).add("isSandbox", isSandbox).add("name", name).add("description", description).add("state", state).add("datacenter", datacenter).add("type", type).add("ram", ram).add("os", os).add("ip", ip).add("image", image);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/ServerImage.java
----------------------------------------------------------------------
diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/ServerImage.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/ServerImage.java
index b8a7966..f6442a1 100644
--- a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/ServerImage.java
+++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/ServerImage.java
@@ -24,8 +24,9 @@ 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.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableSet;
import com.google.common.primitives.Longs;
@@ -365,7 +366,7 @@ public class ServerImage implements Comparable<ServerImage> {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id).add("name", name).add("friendlyName", friendlyName).add("description", description).add("os", os).add("architecture", architecture).add("type", type).add("state", state).add("price", price).add("location", location).add("isActive", isActive).add("isPublic", isPublic).add("createdTime", createdTime).add("updatedTime", updatedTime).add("billingTokens", billingTokens).add("owner", owner);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/internal/ErrorResponse.java
----------------------------------------------------------------------
diff --git a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/internal/ErrorResponse.java b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/internal/ErrorResponse.java
index 6a3e639..34be975 100644
--- a/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/internal/ErrorResponse.java
+++ b/providers/gogrid/src/main/java/org/jclouds/gogrid/domain/internal/ErrorResponse.java
@@ -20,8 +20,9 @@ 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.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ComparisonChain;
/**
@@ -119,7 +120,7 @@ public class ErrorResponse implements Comparable<ErrorResponse> {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("message", message).add("errorCode", errorCode);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/templates/ObjectTemplate.java
----------------------------------------------------------------------
diff --git a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/templates/ObjectTemplate.java b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/templates/ObjectTemplate.java
index 1cd5aaf..e3737af 100644
--- a/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/templates/ObjectTemplate.java
+++ b/providers/google-cloud-storage/src/main/java/org/jclouds/googlecloudstorage/domain/templates/ObjectTemplate.java
@@ -22,7 +22,7 @@ import java.util.Map;
import org.jclouds.googlecloudstorage.domain.ObjectAccessControls;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
import com.google.common.net.MediaType;
@@ -161,7 +161,7 @@ public class ObjectTemplate {
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("name", name)
.add("size", size)
.add("cacheControl", cacheControl)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineTemplateBuilderLiveTest.java
----------------------------------------------------------------------
diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineTemplateBuilderLiveTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineTemplateBuilderLiveTest.java
index a954e21..c644c40 100644
--- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineTemplateBuilderLiveTest.java
+++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/compute/GoogleComputeEngineTemplateBuilderLiveTest.java
@@ -16,7 +16,7 @@
*/
package org.jclouds.googlecomputeengine.compute;
-import static com.google.common.base.Objects.firstNonNull;
+import static com.google.common.base.MoreObjects.firstNonNull;
import static org.assertj.core.api.Assertions.assertThat;
import static org.jclouds.compute.domain.OsFamily.COREOS;
import static org.jclouds.compute.domain.OsFamily.DEBIAN;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/packet/src/main/java/org/jclouds/packet/compute/options/PacketTemplateOptions.java
----------------------------------------------------------------------
diff --git a/providers/packet/src/main/java/org/jclouds/packet/compute/options/PacketTemplateOptions.java b/providers/packet/src/main/java/org/jclouds/packet/compute/options/PacketTemplateOptions.java
index 30cef45..4d7c2da 100644
--- a/providers/packet/src/main/java/org/jclouds/packet/compute/options/PacketTemplateOptions.java
+++ b/providers/packet/src/main/java/org/jclouds/packet/compute/options/PacketTemplateOptions.java
@@ -21,7 +21,7 @@ import java.util.Map;
import org.jclouds.compute.options.TemplateOptions;
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 static com.google.common.base.Objects.equal;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/config/SoftLayerComputeServiceContextModule.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/config/SoftLayerComputeServiceContextModule.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/config/SoftLayerComputeServiceContextModule.java
index c69376e..23e026d 100644
--- a/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/config/SoftLayerComputeServiceContextModule.java
+++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/compute/config/SoftLayerComputeServiceContextModule.java
@@ -46,7 +46,7 @@ import org.jclouds.softlayer.domain.OperatingSystem;
import org.jclouds.softlayer.domain.VirtualGuest;
import com.google.common.base.Function;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Supplier;
import com.google.inject.Provides;
import com.google.inject.TypeLiteral;
@@ -91,7 +91,7 @@ public class SoftLayerComputeServiceContextModule extends
@Override
public String toString() {
- return Objects.toStringHelper(api)
+ return MoreObjects.toStringHelper(api)
.add("method", "virtualGuestApi.getCreateObjectOptions")
.toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Address.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Address.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Address.java
index 57471b9..a1caa78 100644
--- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Address.java
+++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Address.java
@@ -22,6 +22,7 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.inject.name.Named;
@@ -303,7 +304,7 @@ public class Address {
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id)
.add("country", country)
.add("state", state)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ContainerVirtualGuestConfiguration.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ContainerVirtualGuestConfiguration.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ContainerVirtualGuestConfiguration.java
index 09bb0de..5bbc1a8 100644
--- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ContainerVirtualGuestConfiguration.java
+++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ContainerVirtualGuestConfiguration.java
@@ -17,6 +17,7 @@
package org.jclouds.softlayer.domain;
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.Predicates;
@@ -264,7 +265,7 @@ public class ContainerVirtualGuestConfiguration {
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("blockDevices", blockDevices)
.add("datacenters", datacenters)
.add("memory", memory)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ContainerVirtualGuestConfigurationOption.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ContainerVirtualGuestConfigurationOption.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ContainerVirtualGuestConfigurationOption.java
index c2201d3..28e9673 100644
--- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ContainerVirtualGuestConfigurationOption.java
+++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ContainerVirtualGuestConfigurationOption.java
@@ -21,6 +21,7 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.inject.name.Named;
@@ -101,7 +102,7 @@ public class ContainerVirtualGuestConfigurationOption {
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("productItemPrice", productItemPrice)
.add("template", template)
.toString();
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Datacenter.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Datacenter.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Datacenter.java
index 5180ab6..9e02856 100644
--- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Datacenter.java
+++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Datacenter.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;
@@ -196,7 +197,7 @@ public class Datacenter {
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id)
.add("name", name)
.add("longName", longName)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/NetworkVlan.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/NetworkVlan.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/NetworkVlan.java
index bf9018e..b7bd352 100644
--- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/NetworkVlan.java
+++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/NetworkVlan.java
@@ -20,6 +20,7 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
public class NetworkVlan {
@@ -98,7 +99,7 @@ public class NetworkVlan {
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id)
.add("accountId", accountId)
.add("name", name)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/OperatingSystem.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/OperatingSystem.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/OperatingSystem.java
index 053a91a..1132cee 100644
--- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/OperatingSystem.java
+++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/OperatingSystem.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;
@@ -151,7 +152,7 @@ public class OperatingSystem {
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id)
.add("softwareLicense", softwareLicense)
.add("operatingSystemReferenceCode", operatingSystemReferenceCode)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Password.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Password.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Password.java
index 49ff2cd..29af98c 100644
--- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Password.java
+++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Password.java
@@ -22,6 +22,7 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -139,7 +140,7 @@ public class Password {
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id)
.add("username", username)
.add("password", password)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/PowerState.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/PowerState.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/PowerState.java
index 81e8af2..248a67c 100644
--- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/PowerState.java
+++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/PowerState.java
@@ -22,8 +22,9 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* The power state class provides a common set of values for which a guest's power state will be presented in the SoftLayer API.
@@ -102,7 +103,7 @@ public class PowerState {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("keyName", keyName);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductItem.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductItem.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductItem.java
index 79c8d5b..221d2fa 100644
--- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductItem.java
+++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductItem.java
@@ -20,6 +20,7 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -78,7 +79,7 @@ public class ProductItem {
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id)
.add("description", description)
.add("softwareDescriptionId", softwareDescriptionId)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductItemPrice.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductItemPrice.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductItemPrice.java
index 8bfc0ec..295e288 100644
--- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductItemPrice.java
+++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/ProductItemPrice.java
@@ -19,6 +19,7 @@ package org.jclouds.softlayer.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;
/**
@@ -76,7 +77,7 @@ public class ProductItemPrice {
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id)
.add("hourlyRecurringFee", hourlyRecurringFee)
.add("recurringFee", recurringFee)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Region.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Region.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Region.java
index fa91e82..fca375c 100644
--- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Region.java
+++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Region.java
@@ -22,6 +22,7 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -114,7 +115,7 @@ public class Region implements Comparable<Region> {
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("sortOrder", sortOrder)
.add("keyname", keyname)
.add("description", description)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/SecuritySshKey.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/SecuritySshKey.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/SecuritySshKey.java
index 0947975..10e1035 100644
--- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/SecuritySshKey.java
+++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/SecuritySshKey.java
@@ -20,6 +20,7 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
public class SecuritySshKey {
@@ -187,7 +188,7 @@ public class SecuritySshKey {
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id)
.add("key", key)
.add("label", label)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/SoftwareDescription.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/SoftwareDescription.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/SoftwareDescription.java
index 11adef6..5aa74ee 100644
--- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/SoftwareDescription.java
+++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/SoftwareDescription.java
@@ -20,6 +20,7 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
public class SoftwareDescription {
@@ -282,7 +283,7 @@ public class SoftwareDescription {
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id)
.add("longDescription", longDescription)
.add("manufacturer", manufacturer)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/SoftwareLicense.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/SoftwareLicense.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/SoftwareLicense.java
index 78f8431..20b9085 100644
--- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/SoftwareLicense.java
+++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/SoftwareLicense.java
@@ -16,6 +16,7 @@
*/
package org.jclouds.softlayer.domain;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import org.jclouds.javax.annotation.Nullable;
@@ -71,7 +72,7 @@ public class SoftwareLicense {
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id)
.add("softwareDescription", softwareDescription)
.add("softwareDescriptionId", softwareDescriptionId)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Tag.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Tag.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Tag.java
index 719f110..252c3e3 100644
--- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Tag.java
+++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/Tag.java
@@ -19,6 +19,7 @@ package org.jclouds.softlayer.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;
public class Tag {
@@ -71,7 +72,7 @@ public class Tag {
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("accountId", accountId)
.add("id", id)
.add("internal", internal)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/TagReference.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/TagReference.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/TagReference.java
index 924e5bc..ef9edff 100644
--- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/TagReference.java
+++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/TagReference.java
@@ -20,6 +20,7 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -105,7 +106,7 @@ public class TagReference {
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id)
.add("usrRecordId", usrRecordId)
.add("tagTypeId", tagTypeId)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/TagType.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/TagType.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/TagType.java
index 8fbe417..ac250a6 100644
--- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/TagType.java
+++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/TagType.java
@@ -16,6 +16,7 @@
*/
package org.jclouds.softlayer.domain;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import org.jclouds.javax.annotation.Nullable;
@@ -57,7 +58,7 @@ public class TagType {
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("keyName", keyName)
.add("description", description)
.toString();
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualDiskImage.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualDiskImage.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualDiskImage.java
index 3315b4b..2ca3bbf 100644
--- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualDiskImage.java
+++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualDiskImage.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;
@@ -234,7 +235,7 @@ public class VirtualDiskImage {
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id)
.add("uuid", uuid)
.add("capacity", capacity)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualDiskImageSoftware.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualDiskImageSoftware.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualDiskImageSoftware.java
index 3378d75..e85690d 100644
--- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualDiskImageSoftware.java
+++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualDiskImageSoftware.java
@@ -20,6 +20,7 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
public class VirtualDiskImageSoftware {
@@ -117,7 +118,7 @@ public class VirtualDiskImageSoftware {
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id)
.add("softwareDescriptionId", softwareDescriptionId)
.add("softwareDescription", softwareDescription)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuest.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuest.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuest.java
index 66f99a6..6a2afce 100644
--- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuest.java
+++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuest.java
@@ -25,6 +25,7 @@ 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.Objects;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
@@ -909,7 +910,7 @@ public class VirtualGuest {
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("accountId", accountId)
.add("createDate", createDate)
.add("domain", domain)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestAttribute.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestAttribute.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestAttribute.java
index 374b5ef..4a922b8 100644
--- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestAttribute.java
+++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestAttribute.java
@@ -19,6 +19,7 @@ package org.jclouds.softlayer.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;
public class VirtualGuestAttribute {
@@ -50,7 +51,7 @@ public class VirtualGuestAttribute {
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("value", value)
.toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestBlockDevice.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestBlockDevice.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestBlockDevice.java
index 9216634..f4f57b5 100644
--- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestBlockDevice.java
+++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestBlockDevice.java
@@ -21,6 +21,7 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -226,7 +227,7 @@ public class VirtualGuestBlockDevice {
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id)
.add("uuid", uuid)
.add("statusId", statusId)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestBlockDeviceTemplate.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestBlockDeviceTemplate.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestBlockDeviceTemplate.java
index aa4aed5..fbe08a7 100644
--- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestBlockDeviceTemplate.java
+++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestBlockDeviceTemplate.java
@@ -19,6 +19,7 @@ package org.jclouds.softlayer.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;
/**
@@ -189,7 +190,7 @@ public class VirtualGuestBlockDeviceTemplate {
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id)
.add("device", device)
.add("diskImageId", diskImageId)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestBlockDeviceTemplateGroup.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestBlockDeviceTemplateGroup.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestBlockDeviceTemplateGroup.java
index 09587a6..d1b2b33 100644
--- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestBlockDeviceTemplateGroup.java
+++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestBlockDeviceTemplateGroup.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;
@@ -241,7 +242,7 @@ public class VirtualGuestBlockDeviceTemplateGroup {
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id)
.add("name", name)
.add("globalIdentifier", globalIdentifier)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestNetworkComponent.java
----------------------------------------------------------------------
diff --git a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestNetworkComponent.java b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestNetworkComponent.java
index 82a28e5..843b044 100644
--- a/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestNetworkComponent.java
+++ b/providers/softlayer/src/main/java/org/jclouds/softlayer/domain/VirtualGuestNetworkComponent.java
@@ -20,6 +20,7 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -247,7 +248,7 @@ public class VirtualGuestNetworkComponent {
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id)
.add("uuid", uuid)
.add("guestId", guestId)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/AccountLevelGroup.java
----------------------------------------------------------------------
diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/AccountLevelGroup.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/AccountLevelGroup.java
index d23c78a..8e89f56 100644
--- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/AccountLevelGroup.java
+++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/AccountLevelGroup.java
@@ -21,6 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
import org.jclouds.ultradns.ws.domain.DirectionalPool.Type;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
public final class AccountLevelGroup {
@@ -74,7 +75,7 @@ public final class AccountLevelGroup {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("id", id).add("name", name).add("type", type)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("id", id).add("name", name).add("type", type)
.add("recordCount", recordCount).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/DirectionalGroup.java
----------------------------------------------------------------------
diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/DirectionalGroup.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/DirectionalGroup.java
index fea2f45..a6864d7 100644
--- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/DirectionalGroup.java
+++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/DirectionalGroup.java
@@ -17,7 +17,7 @@
package org.jclouds.ultradns.ws.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import com.google.common.base.Objects;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/DirectionalGroupCoordinates.java
----------------------------------------------------------------------
diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/DirectionalGroupCoordinates.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/DirectionalGroupCoordinates.java
index 320ca8a..3527721 100644
--- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/DirectionalGroupCoordinates.java
+++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/DirectionalGroupCoordinates.java
@@ -17,7 +17,7 @@
package org.jclouds.ultradns.ws.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.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/a493e2ca/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/DirectionalPool.java
----------------------------------------------------------------------
diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/DirectionalPool.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/DirectionalPool.java
index 7db64d9..6e41c5e 100644
--- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/DirectionalPool.java
+++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/DirectionalPool.java
@@ -18,6 +18,7 @@ package org.jclouds.ultradns.ws.domain;
import static com.google.common.base.Preconditions.checkNotNull;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Optional;
@@ -147,7 +148,7 @@ public final class DirectionalPool {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("zoneId", zoneId).add("id", id).add("dname", dname)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("zoneId", zoneId).add("id", id).add("dname", dname)
.add("name", name.orNull()).add("type", type).add("tieBreak", tieBreak).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/DirectionalPoolRecord.java
----------------------------------------------------------------------
diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/DirectionalPoolRecord.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/DirectionalPoolRecord.java
index 1db37f0..9f3c77d 100644
--- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/DirectionalPoolRecord.java
+++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/DirectionalPoolRecord.java
@@ -18,7 +18,7 @@ package org.jclouds.ultradns.ws.domain;
import static com.google.common.base.Functions.toStringFunction;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.collect.Iterables.transform;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/DirectionalPoolRecordDetail.java
----------------------------------------------------------------------
diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/DirectionalPoolRecordDetail.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/DirectionalPoolRecordDetail.java
index a7dc449..ee30287 100644
--- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/DirectionalPoolRecordDetail.java
+++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/DirectionalPoolRecordDetail.java
@@ -17,7 +17,7 @@
package org.jclouds.ultradns.ws.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import com.google.common.base.Objects;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/IdAndName.java
----------------------------------------------------------------------
diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/IdAndName.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/IdAndName.java
index 972a3d3..21c181f 100644
--- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/IdAndName.java
+++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/IdAndName.java
@@ -21,6 +21,7 @@ import static com.google.common.base.Predicates.compose;
import static com.google.common.base.Predicates.equalTo;
import com.google.common.base.Function;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Predicate;
@@ -71,7 +72,7 @@ public final class IdAndName {
@Override
public String toString() {
- return Objects.toStringHelper("").add("id", id).add("name", name).toString();
+ return MoreObjects.toStringHelper("").add("id", id).add("name", name).toString();
}
/**
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/PoolRecordSpec.java
----------------------------------------------------------------------
diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/PoolRecordSpec.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/PoolRecordSpec.java
index d6e4b0b..b0c29f1 100644
--- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/PoolRecordSpec.java
+++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/PoolRecordSpec.java
@@ -17,7 +17,7 @@
package org.jclouds.ultradns.ws.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.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/a493e2ca/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/ResourceRecord.java
----------------------------------------------------------------------
diff --git a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/ResourceRecord.java b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/ResourceRecord.java
index fcb85ab..07dfbda 100644
--- a/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/ResourceRecord.java
+++ b/providers/ultradns-ws/src/main/java/org/jclouds/ultradns/ws/domain/ResourceRecord.java
@@ -18,7 +18,7 @@ package org.jclouds.ultradns.ws.domain;
import static com.google.common.base.Functions.toStringFunction;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.collect.Iterables.transform;
[6/9] jclouds git commit: JCLOUDS-1225: Address Guava 18 Objects
changes
Posted by ga...@apache.org.
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/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 1c7c7e4..56e297f 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,8 +20,9 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Describes the schedule of a snapshot policy.
@@ -114,7 +115,7 @@ public class SnapshotPolicySchedule {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("interval", interval).add("time", time);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/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 e02d13e..5c10a6af 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,8 +22,9 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Class SshKeyPair
@@ -131,7 +132,7 @@ public class SshKeyPair {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("fingerprint", fingerprint).add("name", name).add("privateKey", privateKey);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/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 35d33dc..3b1cbe7 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,8 +25,9 @@ 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.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
@@ -466,7 +467,7 @@ public class StoragePool implements Comparable<StoragePool> {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.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/a493e2ca/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 b046251..af05e9b 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
@@ -24,8 +24,9 @@ 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.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.Maps;
@@ -331,7 +332,7 @@ public class Tag {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("account", account)
.add("customer", customer)
.add("domain", domain)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/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 26ba3e3..56a7131 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
@@ -24,8 +24,9 @@ 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.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableSet;
@@ -878,7 +879,7 @@ public class Template implements Comparable<Template> {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.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/a493e2ca/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 2b3554a..60138f4 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,8 +23,9 @@ import java.util.Date;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
public class TemplateExtraction implements Comparable<TemplateExtraction> {
@@ -350,7 +351,7 @@ public class TemplateExtraction implements Comparable<TemplateExtraction> {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.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/a493e2ca/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 447b2bf..629c141 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,8 +22,9 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Class TemplateMetadata
@@ -222,7 +223,7 @@ public class TemplateMetadata {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.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/a493e2ca/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 1005e35..6917e16 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,8 +22,9 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
public class TemplatePermission {
@@ -165,7 +166,7 @@ public class TemplatePermission {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id).add("account", account).add("domainId", domainId).add("isPublic", isPublic);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/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 30039c1..55adab9 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,8 +25,9 @@ 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.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.Maps;
@@ -550,7 +551,7 @@ public class UsageRecord {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.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/a493e2ca/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 4fa6337..43511c2 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,8 +23,9 @@ import java.util.Date;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Class User
@@ -397,7 +398,7 @@ public class User {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.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/a493e2ca/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 6f5ae60..873e68d 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,8 +23,9 @@ import java.util.Date;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Class VMGroup
@@ -204,7 +205,7 @@ public class VMGroup {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.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/a493e2ca/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 cd7e255..43d41e9 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,8 +25,9 @@ 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.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableSet;
@@ -1050,7 +1051,7 @@ public class VirtualMachine {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.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/a493e2ca/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 e9625f67..fc7dadc 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,8 +22,9 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Represents the data object used in CloudStack's "Vlan" API.
@@ -351,7 +352,7 @@ public class VlanIPRange implements Comparable<VlanIPRange> {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.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/a493e2ca/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 47dd9a1..32e9af7 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,8 +27,9 @@ 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.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.Maps;
@@ -744,7 +745,7 @@ public class Volume {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.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/a493e2ca/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 ba99e0a..a47bb0b 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,8 +25,9 @@ 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.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableList;
public class Zone implements Comparable<Zone> {
@@ -440,7 +441,7 @@ public class Zone implements Comparable<Zone> {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.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/a493e2ca/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 0154051..9a6c472 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,8 +20,9 @@ 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.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Helpful when looking for resources by zone and name
@@ -87,6 +88,6 @@ public class ZoneAndName {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("").add("zoneId", zoneId).add("name", name);
+ return MoreObjects.toStringHelper("").add("zoneId", zoneId).add("name", name);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/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 a269391..7e8fbc0 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,8 +21,9 @@ 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.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
public class ZoneSecurityGroupNamePortsCidrs extends ZoneAndName {
@@ -146,7 +147,7 @@ public class ZoneSecurityGroupNamePortsCidrs extends ZoneAndName {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("zoneId", zoneId).add("name", name).add("ports", ports).add("cidrs", cidrs);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/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 1717d89..f723635 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.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.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/a493e2ca/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 b9e05d2..7e1fc70 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.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Date;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/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 2dffd0e..9cb2a17 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,6 +16,7 @@
*/
package org.jclouds.cloudwatch.domain;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import org.jclouds.javax.annotation.Nullable;
@@ -139,7 +140,7 @@ public class Datapoint {
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("timestamp", timestamp)
.add("customUnit", customUnit)
.add("maximum", maximum)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/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 bd89f64..85437f6 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,6 +16,7 @@
*/
package org.jclouds.cloudwatch.domain;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -74,7 +75,7 @@ public class Dimension {
*/
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("name", name)
.add("value", value).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/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 5639f6a..8a87396 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,6 +20,7 @@ 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;
@@ -80,7 +81,7 @@ public class GetMetricStatisticsResponse extends FluentIterable<Datapoint> {
*/
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("label", label)
.add("datapoints", datapoints).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/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 3d6279c..5257ec6 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,6 +20,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.ForwardingSet;
import com.google.common.collect.ImmutableSet;
@@ -80,7 +81,7 @@ public class ListMetricsResponse extends ForwardingSet<Metric> {
*/
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("metrics", metrics)
.add("nextToken", nextToken).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/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 18a4f33..c0329cb 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,6 +16,7 @@
*/
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;
@@ -95,7 +96,7 @@ public class Metric {
*/
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("namespace", namespace)
.add("metricName", metricName)
.add("dimension", dimensions).toString();
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/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 73e1ecc..e2b86a8 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,8 +22,9 @@ 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.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.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
@@ -246,7 +247,7 @@ public class MetricDatum {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("").omitNullValues().add("dimensions", dimensions).add("metricName", metricName)
+ return MoreObjects.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/a493e2ca/apis/docker/src/main/java/org/jclouds/docker/compute/options/DockerTemplateOptions.java
----------------------------------------------------------------------
diff --git a/apis/docker/src/main/java/org/jclouds/docker/compute/options/DockerTemplateOptions.java b/apis/docker/src/main/java/org/jclouds/docker/compute/options/DockerTemplateOptions.java
index 109d469..b223caa 100644
--- a/apis/docker/src/main/java/org/jclouds/docker/compute/options/DockerTemplateOptions.java
+++ b/apis/docker/src/main/java/org/jclouds/docker/compute/options/DockerTemplateOptions.java
@@ -21,6 +21,7 @@ import static com.google.common.base.Objects.equal;
import java.util.List;
import java.util.Map;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
@@ -169,7 +170,7 @@ public class DockerTemplateOptions extends TemplateOptions implements Cloneable
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("volumes", volumes)
.add("hostname", hostname)
.add("dns", dns)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/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 b3d9100..05c3bf5 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,6 +18,7 @@ package org.jclouds.ec2.compute.domain;
import org.jclouds.ec2.domain.PasswordData;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -69,6 +70,6 @@ public class PasswordDataAndPrivateKey {
*/
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("passwordData", passwordData).toString();
+ return MoreObjects.toStringHelper(this).omitNullValues().add("passwordData", passwordData).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/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 cf38056..14970b5 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,8 +19,9 @@ 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.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
public class RegionAndName {
@@ -67,7 +68,7 @@ public class RegionAndName {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("").add("region", region).add("name", name);
+ return MoreObjects.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/a493e2ca/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 2a46b1a..734aaea 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.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.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/a493e2ca/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 4103286..bc65dfe 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,6 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Date;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -144,7 +145,7 @@ public class PasswordData {
*/
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("instanceId", instanceId).add("timestamp", timestamp)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("instanceId", instanceId).add("timestamp", timestamp)
.add("passwordData", passwordData).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/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 4fb7e22..336d623 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,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.ComparisonChain;
import com.google.common.collect.ForwardingSet;
@@ -214,7 +215,7 @@ public class Reservation<T extends RunningInstance> extends ForwardingSet<T> imp
*/
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("region", region).add("reservationId", reservationId)
+ return MoreObjects.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/a493e2ca/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 00ab3e2..ca9b1e7 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,8 +24,9 @@ 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.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Strings;
import com.google.common.collect.ComparisonChain;
import com.google.common.collect.ImmutableMap;
@@ -506,7 +507,7 @@ public class RunningInstance implements Comparable<RunningInstance> {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this).omitNullValues().add("region", region)
+ return MoreObjects.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/a493e2ca/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 b497790..7b20559 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,8 +23,9 @@ 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.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ForwardingSet;
import com.google.common.collect.ImmutableSet;
@@ -211,7 +212,7 @@ public class SecurityGroup extends ForwardingSet<IpPermission> {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this).omitNullValues().add("region", region).add("id", id).add("name", name)
+ return MoreObjects.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/a493e2ca/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 eecc169..a7c8974 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,8 +20,9 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Map;
+import com.google.common.base.MoreObjects;
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;
/**
@@ -143,7 +144,7 @@ public final class Subnet {
}
private ToStringHelper string() {
- return Objects.toStringHelper(this).omitNullValues().add("subnetId", subnetId).add("subnetState", subnetState)
+ return MoreObjects.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/a493e2ca/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 e83b7da..7f6d13e 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,8 +18,9 @@ package org.jclouds.ec2.domain;
import static com.google.common.base.Preconditions.checkNotNull;
+import com.google.common.base.MoreObjects;
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;
/**
@@ -191,7 +192,7 @@ public class Tag {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this).omitNullValues().add("resourceId", resourceId)
+ return MoreObjects.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/a493e2ca/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 22ce5d4..41b2683 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,12 +16,13 @@
*/
package org.jclouds.elasticstack.domain;
-import static com.google.common.base.Objects.firstNonNull;
+import static com.google.common.base.MoreObjects.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 {
@@ -152,7 +153,7 @@ public class WellKnownImage {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("uuid", uuid).add("description", description)
+ return MoreObjects.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/a493e2ca/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/AvailabilityZone.java
----------------------------------------------------------------------
diff --git a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/AvailabilityZone.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/AvailabilityZone.java
index d7d1bfb..ccd0e19 100644
--- a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/AvailabilityZone.java
+++ b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/AvailabilityZone.java
@@ -16,6 +16,7 @@
*/
package org.jclouds.openstack.cinder.v1.domain;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import java.beans.ConstructorProperties;
@@ -97,8 +98,8 @@ public class AvailabilityZone {
return Objects.equal(this.name, that.name) && Objects.equal(this.state, that.state);
}
- protected Objects.ToStringHelper string() {
- return Objects.toStringHelper(this)
+ protected MoreObjects.ToStringHelper string() {
+ return MoreObjects.toStringHelper(this)
.add("name", name)
.add("state", state);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/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 e601214..ab24788 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
@@ -26,8 +26,9 @@ import javax.inject.Named;
import com.google.common.base.Optional;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* An Openstack Cinder Volume Snapshot.
@@ -246,7 +247,7 @@ public class Snapshot {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id).add("volumeId", volumeId).add("status", status).add("size", size).add("created", created).add("name", name).add("description", description).add("extendedAttributes", extendedAttributes);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/SnapshotExtendedAttributes.java
----------------------------------------------------------------------
diff --git a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/SnapshotExtendedAttributes.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/SnapshotExtendedAttributes.java
index e6a4103..aec25dc 100644
--- a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/SnapshotExtendedAttributes.java
+++ b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/SnapshotExtendedAttributes.java
@@ -17,6 +17,7 @@
package org.jclouds.openstack.cinder.v1.domain;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import org.jclouds.javax.annotation.Nullable;
@@ -112,8 +113,8 @@ public class SnapshotExtendedAttributes {
&& Objects.equal(this.progress, that.progress);
}
- protected Objects.ToStringHelper string() {
- return Objects.toStringHelper(this)
+ protected MoreObjects.ToStringHelper string() {
+ return MoreObjects.toStringHelper(this)
.add("projectId", projectId).add("progress", progress);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/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 e75ab06..edae69e 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,8 +28,9 @@ 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.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;
@@ -366,7 +367,7 @@ public class Volume {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.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).add("extendedAttributes", tenantId);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/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 d86f23b..92008f3 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,8 +24,9 @@ import javax.inject.Named;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* An OpenStack Cinder Volume Attachment (describes how Volumes are attached to Servers).
@@ -164,7 +165,7 @@ public class VolumeAttachment {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id).add("volumeId", volumeId).add("serverId", serverId).add("device", device);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/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 78b5936..ae150e8 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,6 +16,7 @@
*/
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;
@@ -79,8 +80,8 @@ public class VolumeQuota {
&& Objects.equal(this.snapshots, that.snapshots);
}
- protected Objects.ToStringHelper string() {
- return Objects.toStringHelper(this)
+ protected MoreObjects.ToStringHelper string() {
+ return MoreObjects.toStringHelper(this)
.add("id", id).add("volumes", volumes).add("gigabytes", gigabytes).add("snapshots", snapshots);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/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 6990381..d045bad 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
@@ -16,8 +16,9 @@
*/
package org.jclouds.openstack.cinder.v1.domain;
+import com.google.common.base.MoreObjects;
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.collect.ImmutableMap;
import org.jclouds.javax.annotation.Nullable;
@@ -182,7 +183,7 @@ public class VolumeType {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.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/a493e2ca/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/ZoneState.java
----------------------------------------------------------------------
diff --git a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/ZoneState.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/ZoneState.java
index 0db5797..899a5dc 100644
--- a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/ZoneState.java
+++ b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/ZoneState.java
@@ -16,6 +16,7 @@
*/
package org.jclouds.openstack.cinder.v1.domain;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import java.beans.ConstructorProperties;
@@ -79,8 +80,8 @@ public class ZoneState {
return Objects.equal(this.available, that.available);
}
- protected Objects.ToStringHelper string() {
- return Objects.toStringHelper(this)
+ protected MoreObjects.ToStringHelper string() {
+ return MoreObjects.toStringHelper(this)
.add("available", available);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/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 5ce3fe0..f549b2f 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.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.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.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/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 6c5681b..1b986a1 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.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.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.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/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 e121745..eb63a31 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,8 +23,9 @@ 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.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ForwardingSet;
import com.google.common.collect.ImmutableSet;
@@ -142,7 +143,7 @@ public class Access extends ForwardingSet<Service> implements Comparable<Access>
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this).omitNullValues().add("token", token).add("user", user)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("token", token).add("user", user)
.add("serviceCatalog", serviceCatalog);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/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 f926083..b189a2f 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,8 +23,9 @@ 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.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Api AccessKey Credentials
@@ -127,7 +128,7 @@ public class ApiAccessKeyCredentials {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("accessKey", accessKey).add("secretKey", secretKey);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/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 ad20938..fa354b8 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.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/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 4a71b1f..f5424bd 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,8 +21,9 @@ import java.net.URI;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* An network-accessible address, usually described by URL, where a service may
@@ -331,7 +332,7 @@ public class Endpoint {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this).omitNullValues().add("id", id).add("versionId", versionId)
+ return MoreObjects.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/a493e2ca/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 796eed5..46ca359 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,8 +20,9 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Class MediaType
@@ -112,7 +113,7 @@ public class MediaType {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("base", base).add("type", type);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/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 71381f0..68b5f99 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,8 +22,9 @@ import java.beans.ConstructorProperties;
import org.jclouds.openstack.keystone.v2_0.config.CredentialType;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Password Credentials
@@ -126,7 +127,7 @@ public class PasswordCredentials {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("username", username)
.add("password", password == null ? null : "*****");
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/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 be3c544..322bff9 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,8 +22,9 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* A personality that a user assumes when performing a specific set of operations. A role includes a
@@ -192,7 +193,7 @@ public class Role {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this).omitNullValues()
+ return MoreObjects.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/a493e2ca/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 9d71a78..9453dd8 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,8 +23,9 @@ 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.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ForwardingSet;
import com.google.common.collect.ImmutableSet;
@@ -191,7 +192,7 @@ public class Service extends ForwardingSet<Endpoint> {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this).omitNullValues()
+ return MoreObjects.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/a493e2ca/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 adb71c4..5277a5d 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,8 +22,9 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* A container used to group or isolate resources and/or identity objects.
@@ -162,7 +163,7 @@ public class Tenant {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this).omitNullValues().add("id", id).add("name", name)
+ return MoreObjects.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/a493e2ca/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 52a5e0f..9b6d9c4 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,8 +23,9 @@ import java.util.Date;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
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;
/**
@@ -151,7 +152,7 @@ public class Token implements Comparable<Token> {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this).omitNullValues()
+ return MoreObjects.toStringHelper(this).omitNullValues()
.add("id", id).add("expires", expires).add("tenant", tenant.orNull());
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/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 8d4d90d..f1c8a29 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,8 +23,9 @@ 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.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ForwardingSet;
import com.google.common.collect.ImmutableSet;
@@ -207,7 +208,7 @@ public class User extends ForwardingSet<Role> {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this).omitNullValues().add("id", id).add("name", name).add("email", email)
+ return MoreObjects.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/a493e2ca/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 24b0523..398865f 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,8 +27,9 @@ 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.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableMap;
public class CreateTenantOptions implements MapBinder {
@@ -57,7 +58,7 @@ public class CreateTenantOptions implements MapBinder {
}
protected ToStringHelper string() {
- ToStringHelper toString = Objects.toStringHelper("").omitNullValues();
+ ToStringHelper toString = MoreObjects.toStringHelper("").omitNullValues();
toString.add("description", description);
toString.add("enabled", Boolean.valueOf(enabled));
return toString;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/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 a9f5887..e2faf07 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,8 +27,9 @@ 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.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableMap;
public class CreateUserOptions implements MapBinder{
@@ -60,7 +61,7 @@ public class CreateUserOptions implements MapBinder{
}
protected ToStringHelper string() {
- ToStringHelper toString = Objects.toStringHelper("").omitNullValues();
+ ToStringHelper toString = MoreObjects.toStringHelper("").omitNullValues();
toString.add("tenant", tenant);
toString.add("password", password);
toString.add("email", email);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/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 bfc2caa..7e57dec 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,8 +26,9 @@ 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.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableMap;
public class UpdateTenantOptions implements MapBinder {
@@ -57,7 +58,7 @@ public class UpdateTenantOptions implements MapBinder {
}
protected ToStringHelper string() {
- ToStringHelper toString = Objects.toStringHelper("").omitNullValues();
+ ToStringHelper toString = MoreObjects.toStringHelper("").omitNullValues();
toString.add("name", name);
toString.add("description", description);
toString.add("enabled", Boolean.valueOf(enabled));
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/UpdateUserOptions.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/UpdateUserOptions.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/UpdateUserOptions.java
index be9b561..dbc232c 100644
--- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/UpdateUserOptions.java
+++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/UpdateUserOptions.java
@@ -26,8 +26,9 @@ 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.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableMap;
public class UpdateUserOptions implements MapBinder{
@@ -59,7 +60,7 @@ public class UpdateUserOptions implements MapBinder{
}
protected ToStringHelper string() {
- ToStringHelper toString = Objects.toStringHelper("").omitNullValues();
+ ToStringHelper toString = MoreObjects.toStringHelper("").omitNullValues();
toString.add("name", name);
toString.add("email", email);
toString.add("password", password);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Extension.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Extension.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Extension.java
index f2c5a3a..cfac867 100644
--- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Extension.java
+++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Extension.java
@@ -26,7 +26,7 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* The OpenStack Compute API is extensible. Extensions serve two purposes: They
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Limit.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Limit.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Limit.java
index 10893d9..969f16a 100644
--- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Limit.java
+++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Limit.java
@@ -17,7 +17,7 @@
package org.jclouds.openstack.v2_0.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Limits.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Limits.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Limits.java
index 8899896..d7fa692 100644
--- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Limits.java
+++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Limits.java
@@ -17,7 +17,7 @@
package org.jclouds.openstack.v2_0.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Link.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Link.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Link.java
index 46f5466..0136b82 100644
--- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Link.java
+++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Link.java
@@ -23,8 +23,9 @@ import java.net.URI;
import javax.inject.Named;
+import com.google.common.base.MoreObjects;
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;
/**
@@ -196,7 +197,7 @@ public class Link {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this).omitNullValues().add("relation", relation).add("type", type.orNull())
+ return MoreObjects.toStringHelper(this).omitNullValues().add("relation", relation).add("type", type.orNull())
.add("href", href);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/RateLimit.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/RateLimit.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/RateLimit.java
index 9c4e72c..62918e8 100644
--- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/RateLimit.java
+++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/RateLimit.java
@@ -17,7 +17,7 @@
package org.jclouds.openstack.v2_0.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Resource.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Resource.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Resource.java
index df5231a..b2a0bbc 100644
--- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Resource.java
+++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/v2_0/domain/Resource.java
@@ -23,8 +23,9 @@ 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.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
@@ -153,7 +154,7 @@ public class Resource implements Comparable<Resource> {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id).add("name", name).add("links", links);
}
[4/9] jclouds git commit: JCLOUDS-1225: Address Guava 18 Objects
changes
Posted by ga...@apache.org.
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/Domain.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/Domain.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/Domain.java
index 382924a..a13d6c7 100644
--- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/Domain.java
+++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/Domain.java
@@ -24,8 +24,9 @@ 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.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableSet;
@@ -125,7 +126,7 @@ public class Domain {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this).omitNullValues().add("id", id).add("name", name).add("email", email)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("id", id).add("name", name).add("email", email)
.add("comment", comment.orNull()).add("created", created).add("updated", updated)
.add("accountId", accountId).add("ttl", ttl).add("nameservers", nameservers)
.add("subdomains", subdomains).add("records", records);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/DomainChange.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/DomainChange.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/DomainChange.java
index 02972ad..6bc930d 100644
--- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/DomainChange.java
+++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/DomainChange.java
@@ -22,6 +22,7 @@ import java.beans.ConstructorProperties;
import java.util.Date;
import java.util.List;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
public class DomainChange {
@@ -65,7 +66,7 @@ public class DomainChange {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("from", from).add("to", to).add("changes", changes)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("from", from).add("to", to).add("changes", changes)
.toString();
}
@@ -131,7 +132,7 @@ public class DomainChange {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("domain", domain).add("action", action)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("domain", domain).add("action", action)
.add("targetType", targetType).add("accountId", accountId).add("targetId", targetId)
.add("changeDetails", changeDetails).toString();
}
@@ -179,7 +180,7 @@ public class DomainChange {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("field", field).add("originalValue", originalValue)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("field", field).add("originalValue", originalValue)
.add("newValue", newValue).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/Job.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/Job.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/Job.java
index a0a0b48..aea4bd2 100644
--- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/Job.java
+++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/Job.java
@@ -16,7 +16,7 @@
*/
package org.jclouds.rackspace.clouddns.v1.domain;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/Record.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/Record.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/Record.java
index 1d768bc..60b133a 100644
--- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/Record.java
+++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/Record.java
@@ -17,12 +17,12 @@
package org.jclouds.rackspace.clouddns.v1.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static 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.MoreObjects.ToStringHelper;
import com.google.common.base.Optional;
public class Record {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/RecordDetail.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/RecordDetail.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/RecordDetail.java
index 8548550..ad588a0 100644
--- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/RecordDetail.java
+++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/RecordDetail.java
@@ -17,13 +17,13 @@
package org.jclouds.rackspace.clouddns.v1.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Date;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
public class RecordDetail {
private final String id;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/Subdomain.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/Subdomain.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/Subdomain.java
index 13cf7b4..53f7591 100644
--- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/Subdomain.java
+++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/Subdomain.java
@@ -21,6 +21,7 @@ import java.util.Date;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Optional;
@@ -88,7 +89,7 @@ public class Subdomain {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("id", id).add("name", name).add("email", emailAddress)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("id", id).add("name", name).add("email", emailAddress)
.add("comment", comment.orNull()).add("created", created).add("updated", updated).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/UpdateDomain.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/UpdateDomain.java b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/UpdateDomain.java
index ce62c42..c7c904f 100644
--- a/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/UpdateDomain.java
+++ b/apis/rackspace-clouddns/src/main/java/org/jclouds/rackspace/clouddns/v1/domain/UpdateDomain.java
@@ -16,8 +16,9 @@
*/
package org.jclouds.rackspace.clouddns.v1.domain;
+import com.google.common.base.MoreObjects;
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;
/**
@@ -64,7 +65,7 @@ public class UpdateDomain {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this).omitNullValues().add("email", emailAddress.orNull()).add("ttl", ttl.orNull())
+ return MoreObjects.toStringHelper(this).omitNullValues().add("email", emailAddress.orNull()).add("ttl", ttl.orNull())
.add("comment", comment.orNull());
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/domain/CDNContainer.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/domain/CDNContainer.java b/apis/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/domain/CDNContainer.java
index d987f88..7d18eef 100644
--- a/apis/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/domain/CDNContainer.java
+++ b/apis/rackspace-cloudfiles/src/main/java/org/jclouds/rackspace/cloudfiles/v1/domain/CDNContainer.java
@@ -16,7 +16,7 @@
*/
package org.jclouds.rackspace.cloudfiles.v1.domain;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
@@ -25,7 +25,7 @@ import java.net.URI;
import javax.inject.Named;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Represents a CDN Container in Rackspace Cloud Files.
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/domain/ApiKeyCredentials.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/domain/ApiKeyCredentials.java b/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/domain/ApiKeyCredentials.java
index 0583856..4976ec2 100644
--- a/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/domain/ApiKeyCredentials.java
+++ b/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v2_0/domain/ApiKeyCredentials.java
@@ -17,7 +17,7 @@
package org.jclouds.rackspace.cloudidentity.v2_0.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import org.jclouds.openstack.keystone.v2_0.config.CredentialType;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/AccessRule.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/AccessRule.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/AccessRule.java
index 2398c43..6a35976 100644
--- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/AccessRule.java
+++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/AccessRule.java
@@ -18,8 +18,9 @@ package org.jclouds.rackspace.cloudloadbalancers.v1.domain;
import static com.google.common.base.Preconditions.checkNotNull;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* The access rule management feature allows fine-grained network access controls to be applied to the load balancer's
@@ -75,7 +76,7 @@ public class AccessRule {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this).omitNullValues()
+ return MoreObjects.toStringHelper(this).omitNullValues()
.add("address", address).add("type", type);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/AccessRuleWithId.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/AccessRuleWithId.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/AccessRuleWithId.java
index 78cff08..d875407 100644
--- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/AccessRuleWithId.java
+++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/AccessRuleWithId.java
@@ -16,8 +16,9 @@
*/
package org.jclouds.rackspace.cloudloadbalancers.v1.domain;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* The same as {@link AccessRule} but this will have an id as assigned by the Cloud Load Balancers service.
@@ -50,7 +51,7 @@ public class AccessRuleWithId extends AccessRule {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this).omitNullValues()
+ return MoreObjects.toStringHelper(this).omitNullValues()
.add("id", id).add("address", getAddress()).add("type", getType());
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/AccountUsage.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/AccountUsage.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/AccountUsage.java
index 89e506c..1839cb2 100644
--- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/AccountUsage.java
+++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/AccountUsage.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.base.Optional;
@@ -82,7 +83,7 @@ public final class AccountUsage {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("numPublicVIPs", numPublicVIPs)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("numPublicVIPs", numPublicVIPs)
.add("numServiceNetVIPs", numServiceNetVIPs).add("numLoadBalancers", numLoadBalancers)
.add("startTime", startTime).add("endTime", endTime.orNull()).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/AddNode.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/AddNode.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/AddNode.java
index ff84867..a72c71a 100644
--- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/AddNode.java
+++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/AddNode.java
@@ -18,8 +18,9 @@ package org.jclouds.rackspace.cloudloadbalancers.v1.domain;
import org.jclouds.rackspace.cloudloadbalancers.v1.domain.internal.BaseNode;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* The nodes defined by the load balancer are responsible for servicing the requests received
@@ -56,7 +57,7 @@ public class AddNode extends BaseNode<AddNode> {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this).omitNullValues()
+ return MoreObjects.toStringHelper(this).omitNullValues()
.add("address", address).add("port", port).add("condition", condition).add("type", type).add("weight", weight);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/ConnectionThrottle.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/ConnectionThrottle.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/ConnectionThrottle.java
index cbdb847..185de00 100644
--- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/ConnectionThrottle.java
+++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/ConnectionThrottle.java
@@ -20,8 +20,9 @@ import static com.google.common.base.Preconditions.checkArgument;
import java.beans.ConstructorProperties;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* The connection throttling feature imposes limits on the number of connections per IP address to help mitigate
@@ -87,7 +88,7 @@ public class ConnectionThrottle {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this).add("maxConnections", maxConnections).add("minConnections", minConnections)
+ return MoreObjects.toStringHelper(this).add("maxConnections", maxConnections).add("minConnections", minConnections)
.add("maxConnectionRate", maxConnectionRate).add("rateInterval", rateInterval);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/CreateLoadBalancer.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/CreateLoadBalancer.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/CreateLoadBalancer.java
index d3153f7..fd3be7a 100644
--- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/CreateLoadBalancer.java
+++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/CreateLoadBalancer.java
@@ -25,8 +25,8 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
import org.jclouds.rackspace.cloudloadbalancers.v1.domain.internal.BaseLoadBalancer;
-import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
@@ -83,7 +83,7 @@ public class CreateLoadBalancer extends BaseLoadBalancer<AddNode, CreateLoadBala
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this).omitNullValues().add("name", name).add("protocol", protocol)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("name", name).add("protocol", protocol)
.add("port", port).add("nodes", nodes).add("timeout", timeout).add("algorithm", algorithm)
.add("timeout", timeout).add("sessionPersistenceType", getSessionPersistenceType())
.add("connectionLogging", isConnectionLogging()).add("connectionThrottle", connectionThrottle)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/HealthMonitor.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/HealthMonitor.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/HealthMonitor.java
index 8970c34..71194d4 100644
--- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/HealthMonitor.java
+++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/HealthMonitor.java
@@ -22,8 +22,9 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
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;
/**
@@ -139,7 +140,7 @@ public class HealthMonitor {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this).omitNullValues().add("type", type).add("delay", delay)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("type", type).add("delay", delay)
.add("timeout", timeout).add("attemptsBeforeDeactivation", attemptsBeforeDeactivation)
.add("bodyRegex", bodyRegex.orNull()).add("statusRegex", statusRegex.orNull()).add("path", path.orNull())
.add("hostHeader", hostHeader.orNull());
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/HistoricalUsage.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/HistoricalUsage.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/HistoricalUsage.java
index 64b7e6f..332c2cb 100644
--- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/HistoricalUsage.java
+++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/HistoricalUsage.java
@@ -21,6 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
import java.util.Map;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.Iterables;
@@ -67,7 +68,7 @@ public final class HistoricalUsage {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("accountId", accountId)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("accountId", accountId)
.add("accountUsage", getAccountUsage()).add("loadBalancerInfo", loadBalancerUsages).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancer.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancer.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancer.java
index 74c6bcf..ef1bab4 100644
--- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancer.java
+++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancer.java
@@ -27,8 +27,9 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
import org.jclouds.rackspace.cloudloadbalancers.v1.domain.internal.BaseLoadBalancer;
+import com.google.common.base.MoreObjects;
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 LoadBalancer extends BaseLoadBalancer<Node, LoadBalancer> {
@@ -170,7 +171,7 @@ public class LoadBalancer extends BaseLoadBalancer<Node, LoadBalancer> {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this).omitNullValues().add("id", id).add("region", region).add("status", status)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("id", id).add("region", region).add("status", status)
.add("name", name).add("protocol", protocol).add("port", port).add("nodeCount", getNodeCount())
.add("nodes", nodes).add("timeout", timeout).add("algorithm", algorithm).add("halfClosed", halfClosed)
.add("clusterName", clusterName).add("created", created).add("updated", updated)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancerInfo.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancerInfo.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancerInfo.java
index 0c2372f..bf9b3a2 100644
--- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancerInfo.java
+++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancerInfo.java
@@ -20,6 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
public final class LoadBalancerInfo {
@@ -64,7 +65,7 @@ public final class LoadBalancerInfo {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("loadBalancerId", loadBalancerId)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("loadBalancerId", loadBalancerId)
.add("loadBalancerName", loadBalancerName).add("loadBalancerUsage", loadBalancerUsageRecords).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancerStats.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancerStats.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancerStats.java
index b73992a..822edb2 100644
--- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancerStats.java
+++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancerStats.java
@@ -18,7 +18,7 @@ package org.jclouds.rackspace.cloudloadbalancers.v1.domain;
import java.beans.ConstructorProperties;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
public final class LoadBalancerStats {
private final int connectTimeOut;
@@ -84,7 +84,7 @@ public final class LoadBalancerStats {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("connectTimeOut", connectTimeOut)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("connectTimeOut", connectTimeOut)
.add("connectError", connectError).add("connectFailure", connectFailure).add("dataTimedOut", dataTimedOut)
.add("keepAliveTimedOut", keepAliveTimedOut).add("maxConn", maxConn).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancerUsage.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancerUsage.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancerUsage.java
index 0137002..1b6b61c 100644
--- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancerUsage.java
+++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/LoadBalancerUsage.java
@@ -23,6 +23,7 @@ import java.util.Date;
import org.jclouds.rackspace.cloudloadbalancers.v1.domain.VirtualIP.Type;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Optional;
@@ -139,7 +140,7 @@ public final class LoadBalancerUsage {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues()
+ return MoreObjects.toStringHelper(this).omitNullValues()
.add("averageNumConnections", averageNumConnections)
.add("averageNumConnectionsSsl", averageNumConnectionsSsl)
.add("incomingTransferInBytes", incomingTransferInBytes)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/Node.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/Node.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/Node.java
index 5088e24..b925971 100644
--- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/Node.java
+++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/Node.java
@@ -21,8 +21,9 @@ import static com.google.common.base.Preconditions.checkNotNull;
import org.jclouds.rackspace.cloudloadbalancers.v1.domain.internal.BaseNode;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* The nodes defined by the load balancer are responsible for servicing the requests received
@@ -79,7 +80,7 @@ public class Node extends BaseNode<Node> {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this).omitNullValues()
+ return MoreObjects.toStringHelper(this).omitNullValues()
.add("id", id).add("address", address).add("port", port).add("condition", condition)
.add("type", type).add("weight", weight).add("status", status).add("metadata", metadata);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/Protocol.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/Protocol.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/Protocol.java
index 9a80126..b823aae 100644
--- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/Protocol.java
+++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/Protocol.java
@@ -20,6 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
public final class Protocol {
@@ -58,6 +59,6 @@ public final class Protocol {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("name", name).add("port", port).toString();
+ return MoreObjects.toStringHelper(this).omitNullValues().add("name", name).add("port", port).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/SSLTermination.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/SSLTermination.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/SSLTermination.java
index 0fead4d..d42ade4 100644
--- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/SSLTermination.java
+++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/SSLTermination.java
@@ -20,8 +20,9 @@ import java.beans.ConstructorProperties;
import javax.inject.Named;
+import com.google.common.base.MoreObjects;
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;
/**
@@ -186,7 +187,7 @@ public class SSLTermination {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this).omitNullValues().add("enabled", enabled)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("enabled", enabled)
.add("secureTrafficOnly", secureTrafficOnly).add("securePort", securePort)
.add("certificate", certificate.orNull()).add("privateKey", privateKey.orNull())
.add("intermediateCertificate", intermediateCertificate.orNull());
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/SourceAddresses.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/SourceAddresses.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/SourceAddresses.java
index a968c04..d08c931 100644
--- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/SourceAddresses.java
+++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/SourceAddresses.java
@@ -16,8 +16,9 @@
*/
package org.jclouds.rackspace.cloudloadbalancers.v1.domain;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* The load balancer source IP addresses are useful for customers who are automating the deployment of infrastructure
@@ -65,7 +66,7 @@ public class SourceAddresses {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this).add("ipv6Public", ipv6Public).add("ipv4Public", ipv4Public)
+ return MoreObjects.toStringHelper(this).add("ipv6Public", ipv6Public).add("ipv4Public", ipv4Public)
.add("ipv4Servicenet", ipv4Servicenet);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/UpdateLoadBalancer.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/UpdateLoadBalancer.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/UpdateLoadBalancer.java
index c09976e..8f8a753 100644
--- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/UpdateLoadBalancer.java
+++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/UpdateLoadBalancer.java
@@ -19,8 +19,9 @@ package org.jclouds.rackspace.cloudloadbalancers.v1.domain;
import org.jclouds.javax.annotation.Nullable;
import org.jclouds.rackspace.cloudloadbalancers.v1.domain.internal.BaseLoadBalancer.Algorithm;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Used to update Load Balancers.
@@ -68,7 +69,7 @@ public class UpdateLoadBalancer {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this).omitNullValues().add("name", name).add("algorithm", algorithm)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("name", name).add("algorithm", algorithm)
.add("port", port).add("protocol", protocol).add("timeout", timeout).add("halfClosed", halfClosed);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/UpdateNode.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/UpdateNode.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/UpdateNode.java
index e38561e..a6a5df5 100644
--- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/UpdateNode.java
+++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/UpdateNode.java
@@ -20,8 +20,9 @@ import org.jclouds.javax.annotation.Nullable;
import org.jclouds.rackspace.cloudloadbalancers.v1.domain.internal.BaseNode.Condition;
import org.jclouds.rackspace.cloudloadbalancers.v1.domain.internal.BaseNode.Type;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Used to update Nodes.
@@ -50,7 +51,7 @@ public class UpdateNode {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this).omitNullValues()
+ return MoreObjects.toStringHelper(this).omitNullValues()
.add("condition", condition).add("type", type).add("weight", weight);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/VirtualIP.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/VirtualIP.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/VirtualIP.java
index 6506071..b3c84ee 100644
--- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/VirtualIP.java
+++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/VirtualIP.java
@@ -18,8 +18,9 @@ package org.jclouds.rackspace.cloudloadbalancers.v1.domain;
import static com.google.common.base.Preconditions.checkNotNull;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* A virtual IP (VIP) makes a load balancer accessible by clients. The load balancing service
@@ -52,7 +53,7 @@ public class VirtualIP {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this).omitNullValues()
+ return MoreObjects.toStringHelper(this).omitNullValues()
.add("ipVersion", ipVersion).add("type", type);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/VirtualIPWithId.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/VirtualIPWithId.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/VirtualIPWithId.java
index 372d1ff..a6d1260 100644
--- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/VirtualIPWithId.java
+++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/VirtualIPWithId.java
@@ -18,8 +18,9 @@ package org.jclouds.rackspace.cloudloadbalancers.v1.domain;
import static com.google.common.base.Preconditions.checkNotNull;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* @see VirtualIP
@@ -44,7 +45,7 @@ public class VirtualIPWithId extends VirtualIP {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this).omitNullValues()
+ return MoreObjects.toStringHelper(this).omitNullValues()
.add("id", id).add("address", address).add("ipVersion", getIpVersion()).add("type", getType());
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/internal/BaseLoadBalancer.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/internal/BaseLoadBalancer.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/internal/BaseLoadBalancer.java
index 4cb6154..7f6c0fe 100644
--- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/internal/BaseLoadBalancer.java
+++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/internal/BaseLoadBalancer.java
@@ -29,8 +29,9 @@ import org.jclouds.rackspace.cloudloadbalancers.v1.domain.HealthMonitor;
import org.jclouds.rackspace.cloudloadbalancers.v1.domain.LoadBalancer;
import org.jclouds.rackspace.cloudloadbalancers.v1.domain.SessionPersistence;
+import com.google.common.base.MoreObjects;
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.ImmutableSortedSet;
import com.google.common.collect.Maps;
@@ -161,7 +162,7 @@ public class BaseLoadBalancer<N extends BaseNode<N>, T extends BaseLoadBalancer<
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this).omitNullValues().add("name", name).add("protocol", protocol)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("name", name).add("protocol", protocol)
.add("port", port).add("nodes", nodes).add("timeout", timeout).add("algorithm", algorithm)
.add("timeout", timeout).add("sessionPersistenceType", getSessionPersistenceType())
.add("connectionLogging", connectionLogging).add("connectionThrottle", connectionThrottle)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/internal/BaseNode.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/internal/BaseNode.java b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/internal/BaseNode.java
index 926ca89..c28e44f 100644
--- a/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/internal/BaseNode.java
+++ b/apis/rackspace-cloudloadbalancers/src/main/java/org/jclouds/rackspace/cloudloadbalancers/v1/domain/internal/BaseNode.java
@@ -20,8 +20,9 @@ import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* The nodes defined by the load balancer are responsible for servicing the requests received
@@ -97,7 +98,7 @@ public class BaseNode<T extends BaseNode<T>> implements Comparable<BaseNode<T>>
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this).omitNullValues().add("address", address).add("port", port)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("address", address).add("port", port)
.add("condition", condition).add("type", type).add("weight", weight);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/route53/src/main/java/org/jclouds/route53/domain/Change.java
----------------------------------------------------------------------
diff --git a/apis/route53/src/main/java/org/jclouds/route53/domain/Change.java b/apis/route53/src/main/java/org/jclouds/route53/domain/Change.java
index 470a6f2..1f16993 100644
--- a/apis/route53/src/main/java/org/jclouds/route53/domain/Change.java
+++ b/apis/route53/src/main/java/org/jclouds/route53/domain/Change.java
@@ -17,7 +17,7 @@
package org.jclouds.route53.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Date;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/route53/src/main/java/org/jclouds/route53/domain/ChangeBatch.java
----------------------------------------------------------------------
diff --git a/apis/route53/src/main/java/org/jclouds/route53/domain/ChangeBatch.java b/apis/route53/src/main/java/org/jclouds/route53/domain/ChangeBatch.java
index 184c525..4865b13 100644
--- a/apis/route53/src/main/java/org/jclouds/route53/domain/ChangeBatch.java
+++ b/apis/route53/src/main/java/org/jclouds/route53/domain/ChangeBatch.java
@@ -17,7 +17,7 @@
package org.jclouds.route53.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.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/a493e2ca/apis/route53/src/main/java/org/jclouds/route53/domain/HostedZone.java
----------------------------------------------------------------------
diff --git a/apis/route53/src/main/java/org/jclouds/route53/domain/HostedZone.java b/apis/route53/src/main/java/org/jclouds/route53/domain/HostedZone.java
index db6c8e7..32ee7a1 100644
--- a/apis/route53/src/main/java/org/jclouds/route53/domain/HostedZone.java
+++ b/apis/route53/src/main/java/org/jclouds/route53/domain/HostedZone.java
@@ -17,7 +17,7 @@
package org.jclouds.route53.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import com.google.common.base.Objects;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/route53/src/main/java/org/jclouds/route53/domain/HostedZoneAndNameServers.java
----------------------------------------------------------------------
diff --git a/apis/route53/src/main/java/org/jclouds/route53/domain/HostedZoneAndNameServers.java b/apis/route53/src/main/java/org/jclouds/route53/domain/HostedZoneAndNameServers.java
index f8c3eda..f339b32 100644
--- a/apis/route53/src/main/java/org/jclouds/route53/domain/HostedZoneAndNameServers.java
+++ b/apis/route53/src/main/java/org/jclouds/route53/domain/HostedZoneAndNameServers.java
@@ -17,7 +17,7 @@
package org.jclouds.route53.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import com.google.common.base.Objects;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/route53/src/main/java/org/jclouds/route53/domain/NewHostedZone.java
----------------------------------------------------------------------
diff --git a/apis/route53/src/main/java/org/jclouds/route53/domain/NewHostedZone.java b/apis/route53/src/main/java/org/jclouds/route53/domain/NewHostedZone.java
index 5d978b1..20722a0 100644
--- a/apis/route53/src/main/java/org/jclouds/route53/domain/NewHostedZone.java
+++ b/apis/route53/src/main/java/org/jclouds/route53/domain/NewHostedZone.java
@@ -17,7 +17,7 @@
package org.jclouds.route53.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import com.google.common.base.Objects;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/route53/src/main/java/org/jclouds/route53/domain/ResourceRecordSet.java
----------------------------------------------------------------------
diff --git a/apis/route53/src/main/java/org/jclouds/route53/domain/ResourceRecordSet.java b/apis/route53/src/main/java/org/jclouds/route53/domain/ResourceRecordSet.java
index 20e225f..9b67d59 100644
--- a/apis/route53/src/main/java/org/jclouds/route53/domain/ResourceRecordSet.java
+++ b/apis/route53/src/main/java/org/jclouds/route53/domain/ResourceRecordSet.java
@@ -17,7 +17,7 @@
package org.jclouds.route53.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
@@ -27,7 +27,7 @@ import org.jclouds.route53.domain.ResourceRecordSet.RecordSubset.Latency;
import org.jclouds.route53.domain.ResourceRecordSet.RecordSubset.Weighted;
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.collect.ImmutableList;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/route53/src/main/java/org/jclouds/route53/domain/ResourceRecordSetIterable.java
----------------------------------------------------------------------
diff --git a/apis/route53/src/main/java/org/jclouds/route53/domain/ResourceRecordSetIterable.java b/apis/route53/src/main/java/org/jclouds/route53/domain/ResourceRecordSetIterable.java
index 87670ce..a94e45e 100644
--- a/apis/route53/src/main/java/org/jclouds/route53/domain/ResourceRecordSetIterable.java
+++ b/apis/route53/src/main/java/org/jclouds/route53/domain/ResourceRecordSetIterable.java
@@ -17,7 +17,7 @@
package org.jclouds.route53.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Iterator;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/s3/src/main/java/org/jclouds/s3/domain/DeleteResult.java
----------------------------------------------------------------------
diff --git a/apis/s3/src/main/java/org/jclouds/s3/domain/DeleteResult.java b/apis/s3/src/main/java/org/jclouds/s3/domain/DeleteResult.java
index cfc6503..896168b 100644
--- a/apis/s3/src/main/java/org/jclouds/s3/domain/DeleteResult.java
+++ b/apis/s3/src/main/java/org/jclouds/s3/domain/DeleteResult.java
@@ -21,6 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Map;
import java.util.Set;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ForwardingSet;
import com.google.common.collect.ImmutableMap;
@@ -69,7 +70,7 @@ public class DeleteResult extends ForwardingSet<String> {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues()
+ return MoreObjects.toStringHelper(this).omitNullValues()
.add("code", code).add("message", message).toString();
}
}
@@ -181,7 +182,7 @@ public class DeleteResult extends ForwardingSet<String> {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues()
+ return MoreObjects.toStringHelper(this).omitNullValues()
.add("deleted", deleted).add("errors", errors).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/sqs/src/main/java/org/jclouds/sqs/SQS.java
----------------------------------------------------------------------
diff --git a/apis/sqs/src/main/java/org/jclouds/sqs/SQS.java b/apis/sqs/src/main/java/org/jclouds/sqs/SQS.java
index a51db4c..1689bfe 100644
--- a/apis/sqs/src/main/java/org/jclouds/sqs/SQS.java
+++ b/apis/sqs/src/main/java/org/jclouds/sqs/SQS.java
@@ -26,7 +26,7 @@ import org.jclouds.sqs.features.MessageApi;
import org.jclouds.sqs.options.ReceiveMessageOptions;
import com.google.common.annotations.Beta;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Supplier;
import com.google.common.collect.FluentIterable;
@@ -68,7 +68,7 @@ public class SQS {
this.api = checkNotNull(api, "message api");
checkArgument(max > 0, "max messages per request must be a positive number");
this.max = max;
- this.options = Objects.firstNonNull(options, NO_OPTIONS);
+ this.options = MoreObjects.firstNonNull(options, NO_OPTIONS);
}
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/sqs/src/main/java/org/jclouds/sqs/domain/BatchError.java
----------------------------------------------------------------------
diff --git a/apis/sqs/src/main/java/org/jclouds/sqs/domain/BatchError.java b/apis/sqs/src/main/java/org/jclouds/sqs/domain/BatchError.java
index 7e2c09c..c3bef1f 100644
--- a/apis/sqs/src/main/java/org/jclouds/sqs/domain/BatchError.java
+++ b/apis/sqs/src/main/java/org/jclouds/sqs/domain/BatchError.java
@@ -18,6 +18,7 @@ package org.jclouds.sqs.domain;
import static com.google.common.base.Preconditions.checkNotNull;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -144,7 +145,7 @@ public class BatchError {
*/
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("id", id).add("senderFault", senderFault)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("id", id).add("senderFault", senderFault)
.add("message", message).add("code", code).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/sqs/src/main/java/org/jclouds/sqs/domain/BatchResult.java
----------------------------------------------------------------------
diff --git a/apis/sqs/src/main/java/org/jclouds/sqs/domain/BatchResult.java b/apis/sqs/src/main/java/org/jclouds/sqs/domain/BatchResult.java
index 58aa80a..ca60327 100644
--- a/apis/sqs/src/main/java/org/jclouds/sqs/domain/BatchResult.java
+++ b/apis/sqs/src/main/java/org/jclouds/sqs/domain/BatchResult.java
@@ -21,6 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Map;
import com.google.common.base.Function;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ForwardingMap;
import com.google.common.collect.ImmutableMap;
@@ -136,7 +137,7 @@ public class BatchResult<V> extends ForwardingMap<String, V> {
*/
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("results", results).add("errors", errors).toString();
+ return MoreObjects.toStringHelper(this).omitNullValues().add("results", results).add("errors", errors).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/sqs/src/main/java/org/jclouds/sqs/domain/Message.java
----------------------------------------------------------------------
diff --git a/apis/sqs/src/main/java/org/jclouds/sqs/domain/Message.java b/apis/sqs/src/main/java/org/jclouds/sqs/domain/Message.java
index 5566e50..0c43f7d 100644
--- a/apis/sqs/src/main/java/org/jclouds/sqs/domain/Message.java
+++ b/apis/sqs/src/main/java/org/jclouds/sqs/domain/Message.java
@@ -20,6 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Map;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableMap;
import com.google.common.hash.HashCode;
@@ -175,7 +176,7 @@ public class Message {
*/
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("id", id).add("body", body).add("md5", md5)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("id", id).add("body", body).add("md5", md5)
.add("receiptHandle", receiptHandle).add("attributes", attributes).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/sqs/src/main/java/org/jclouds/sqs/domain/MessageIdAndMD5.java
----------------------------------------------------------------------
diff --git a/apis/sqs/src/main/java/org/jclouds/sqs/domain/MessageIdAndMD5.java b/apis/sqs/src/main/java/org/jclouds/sqs/domain/MessageIdAndMD5.java
index 934f13d..26e2f9c 100644
--- a/apis/sqs/src/main/java/org/jclouds/sqs/domain/MessageIdAndMD5.java
+++ b/apis/sqs/src/main/java/org/jclouds/sqs/domain/MessageIdAndMD5.java
@@ -18,6 +18,7 @@ package org.jclouds.sqs.domain;
import static com.google.common.base.Preconditions.checkNotNull;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.hash.HashCode;
@@ -109,7 +110,7 @@ public class MessageIdAndMD5 {
*/
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("id", id).add("md5", md5).toString();
+ return MoreObjects.toStringHelper(this).omitNullValues().add("id", id).add("md5", md5).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/sqs/src/main/java/org/jclouds/sqs/domain/QueueAttributes.java
----------------------------------------------------------------------
diff --git a/apis/sqs/src/main/java/org/jclouds/sqs/domain/QueueAttributes.java b/apis/sqs/src/main/java/org/jclouds/sqs/domain/QueueAttributes.java
index d12a20b..82f7126 100644
--- a/apis/sqs/src/main/java/org/jclouds/sqs/domain/QueueAttributes.java
+++ b/apis/sqs/src/main/java/org/jclouds/sqs/domain/QueueAttributes.java
@@ -20,6 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Date;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Optional;
@@ -298,7 +299,7 @@ public class QueueAttributes {
*/
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("queueArn", queueArn)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("queueArn", queueArn)
.add("approximateNumberOfMessages", approximateNumberOfMessages)
.add("approximateNumberOfMessagesNotVisible", approximateNumberOfMessagesNotVisible)
.add("approximateNumberOfMessagesDelayed", approximateNumberOfMessagesDelayed)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/sqs/src/main/java/org/jclouds/sqs/options/CreateQueueOptions.java
----------------------------------------------------------------------
diff --git a/apis/sqs/src/main/java/org/jclouds/sqs/options/CreateQueueOptions.java b/apis/sqs/src/main/java/org/jclouds/sqs/options/CreateQueueOptions.java
index d8f70b3..d02b49f 100644
--- a/apis/sqs/src/main/java/org/jclouds/sqs/options/CreateQueueOptions.java
+++ b/apis/sqs/src/main/java/org/jclouds/sqs/options/CreateQueueOptions.java
@@ -21,6 +21,7 @@ import java.util.Map.Entry;
import org.jclouds.http.options.BaseHttpRequestOptions;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Multimap;
@@ -138,7 +139,7 @@ public class CreateQueueOptions extends BaseHttpRequestOptions implements Clonea
@Override
public String toString() {
ImmutableMap<String, String> attributes = this.attributes.build();
- return Objects.toStringHelper(this).omitNullValues().add("attributes", !attributes.isEmpty() ? attributes : null)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("attributes", !attributes.isEmpty() ? attributes : null)
.toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/sqs/src/main/java/org/jclouds/sqs/options/ReceiveMessageOptions.java
----------------------------------------------------------------------
diff --git a/apis/sqs/src/main/java/org/jclouds/sqs/options/ReceiveMessageOptions.java b/apis/sqs/src/main/java/org/jclouds/sqs/options/ReceiveMessageOptions.java
index 279e1b5..a626d56 100644
--- a/apis/sqs/src/main/java/org/jclouds/sqs/options/ReceiveMessageOptions.java
+++ b/apis/sqs/src/main/java/org/jclouds/sqs/options/ReceiveMessageOptions.java
@@ -18,6 +18,7 @@ package org.jclouds.sqs.options;
import org.jclouds.http.options.BaseHttpRequestOptions;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Multimap;
@@ -154,7 +155,7 @@ public class ReceiveMessageOptions extends BaseHttpRequestOptions implements Clo
@Override
public String toString() {
ImmutableSet<String> attributes = this.attributes.build();
- return Objects.toStringHelper(this).omitNullValues().add("visibilityTimeout", visibilityTimeout)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("visibilityTimeout", visibilityTimeout)
.add("attributes", !attributes.isEmpty() ? attributes : null).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/sqs/src/main/java/org/jclouds/sqs/options/SendMessageOptions.java
----------------------------------------------------------------------
diff --git a/apis/sqs/src/main/java/org/jclouds/sqs/options/SendMessageOptions.java b/apis/sqs/src/main/java/org/jclouds/sqs/options/SendMessageOptions.java
index eee4e7d..a491bcb 100644
--- a/apis/sqs/src/main/java/org/jclouds/sqs/options/SendMessageOptions.java
+++ b/apis/sqs/src/main/java/org/jclouds/sqs/options/SendMessageOptions.java
@@ -18,6 +18,7 @@ package org.jclouds.sqs.options;
import org.jclouds.http.options.BaseHttpRequestOptions;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.Multimap;
@@ -99,6 +100,6 @@ public class SendMessageOptions extends BaseHttpRequestOptions implements Clonea
*/
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("delaySeconds", delaySeconds).toString();
+ return MoreObjects.toStringHelper(this).omitNullValues().add("delaySeconds", delaySeconds).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/sts/src/main/java/org/jclouds/aws/domain/SessionCredentials.java
----------------------------------------------------------------------
diff --git a/apis/sts/src/main/java/org/jclouds/aws/domain/SessionCredentials.java b/apis/sts/src/main/java/org/jclouds/aws/domain/SessionCredentials.java
index 2adcaea..0ca4ece 100644
--- a/apis/sts/src/main/java/org/jclouds/aws/domain/SessionCredentials.java
+++ b/apis/sts/src/main/java/org/jclouds/aws/domain/SessionCredentials.java
@@ -22,6 +22,7 @@ import java.util.Date;
import org.jclouds.domain.Credentials;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Optional;
@@ -93,7 +94,7 @@ public final class SessionCredentials extends Credentials {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("accessKeyId", identity)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("accessKeyId", identity)
.add("sessionToken", sessionToken).add("expiration", expiration.orNull()).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/sts/src/main/java/org/jclouds/sts/domain/User.java
----------------------------------------------------------------------
diff --git a/apis/sts/src/main/java/org/jclouds/sts/domain/User.java b/apis/sts/src/main/java/org/jclouds/sts/domain/User.java
index f98cebe..2bcf5aa 100644
--- a/apis/sts/src/main/java/org/jclouds/sts/domain/User.java
+++ b/apis/sts/src/main/java/org/jclouds/sts/domain/User.java
@@ -18,6 +18,7 @@ package org.jclouds.sts.domain;
import static com.google.common.base.Preconditions.checkNotNull;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
public final class User {
@@ -70,6 +71,6 @@ public final class User {
@Override
public String toString() {
- return Objects.toStringHelper(this).add("id", id).add("arn", arn).toString();
+ return MoreObjects.toStringHelper(this).add("id", id).add("arn", arn).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/sts/src/main/java/org/jclouds/sts/domain/UserAndSessionCredentials.java
----------------------------------------------------------------------
diff --git a/apis/sts/src/main/java/org/jclouds/sts/domain/UserAndSessionCredentials.java b/apis/sts/src/main/java/org/jclouds/sts/domain/UserAndSessionCredentials.java
index fa9839b..df72240 100644
--- a/apis/sts/src/main/java/org/jclouds/sts/domain/UserAndSessionCredentials.java
+++ b/apis/sts/src/main/java/org/jclouds/sts/domain/UserAndSessionCredentials.java
@@ -20,6 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
import org.jclouds.aws.domain.SessionCredentials;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
public final class UserAndSessionCredentials {
@@ -121,7 +122,7 @@ public final class UserAndSessionCredentials {
@Override
public String toString() {
- return Objects.toStringHelper(this).add("user", user).add("credentials", credentials)
+ return MoreObjects.toStringHelper(this).add("user", user).add("credentials", credentials)
.add("packedPolicySize", packedPolicySize).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/sts/src/main/java/org/jclouds/sts/options/AssumeRoleOptions.java
----------------------------------------------------------------------
diff --git a/apis/sts/src/main/java/org/jclouds/sts/options/AssumeRoleOptions.java b/apis/sts/src/main/java/org/jclouds/sts/options/AssumeRoleOptions.java
index feab718..77fda0c 100644
--- a/apis/sts/src/main/java/org/jclouds/sts/options/AssumeRoleOptions.java
+++ b/apis/sts/src/main/java/org/jclouds/sts/options/AssumeRoleOptions.java
@@ -18,6 +18,7 @@ package org.jclouds.sts.options;
import org.jclouds.http.options.BaseHttpRequestOptions;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.Multimap;
@@ -130,7 +131,7 @@ public class AssumeRoleOptions extends BaseHttpRequestOptions implements Cloneab
*/
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("externalId", externalId)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("externalId", externalId)
.add("durationSeconds", durationSeconds).add("policy", policy).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/sts/src/main/java/org/jclouds/sts/options/FederatedUserOptions.java
----------------------------------------------------------------------
diff --git a/apis/sts/src/main/java/org/jclouds/sts/options/FederatedUserOptions.java b/apis/sts/src/main/java/org/jclouds/sts/options/FederatedUserOptions.java
index d8c950d..b2b3a88 100644
--- a/apis/sts/src/main/java/org/jclouds/sts/options/FederatedUserOptions.java
+++ b/apis/sts/src/main/java/org/jclouds/sts/options/FederatedUserOptions.java
@@ -18,6 +18,7 @@ package org.jclouds.sts.options;
import org.jclouds.http.options.BaseHttpRequestOptions;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.Multimap;
@@ -110,7 +111,7 @@ public class FederatedUserOptions extends BaseHttpRequestOptions implements Clon
*/
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("durationSeconds", durationSeconds)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("durationSeconds", durationSeconds)
.add("policy", policy).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/sts/src/main/java/org/jclouds/sts/options/SessionCredentialsOptions.java
----------------------------------------------------------------------
diff --git a/apis/sts/src/main/java/org/jclouds/sts/options/SessionCredentialsOptions.java b/apis/sts/src/main/java/org/jclouds/sts/options/SessionCredentialsOptions.java
index 2f40684..6a75e6d 100644
--- a/apis/sts/src/main/java/org/jclouds/sts/options/SessionCredentialsOptions.java
+++ b/apis/sts/src/main/java/org/jclouds/sts/options/SessionCredentialsOptions.java
@@ -18,6 +18,7 @@ package org.jclouds.sts.options;
import org.jclouds.http.options.BaseHttpRequestOptions;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.Multimap;
@@ -132,7 +133,7 @@ public class SessionCredentialsOptions extends BaseHttpRequestOptions implements
*/
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("serialNumber", serialNumber)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("serialNumber", serialNumber)
.add("durationSeconds", durationSeconds).add("tokenCode", tokenCode).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/BlobMetadataImpl.java
----------------------------------------------------------------------
diff --git a/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/BlobMetadataImpl.java b/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/BlobMetadataImpl.java
index a339b06..5e7d2f9 100644
--- a/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/BlobMetadataImpl.java
+++ b/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/BlobMetadataImpl.java
@@ -23,7 +23,7 @@ import java.util.Date;
import java.util.Map;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import org.jclouds.blobstore.domain.BlobMetadata;
import org.jclouds.blobstore.domain.StorageType;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/MutableBlobMetadataImpl.java
----------------------------------------------------------------------
diff --git a/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/MutableBlobMetadataImpl.java b/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/MutableBlobMetadataImpl.java
index 0cae35a..5320be5 100644
--- a/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/MutableBlobMetadataImpl.java
+++ b/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/MutableBlobMetadataImpl.java
@@ -19,7 +19,7 @@ package org.jclouds.blobstore.domain.internal;
import java.net.URI;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import org.jclouds.blobstore.domain.BlobMetadata;
import org.jclouds.blobstore.domain.MutableBlobMetadata;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/MutableStorageMetadataImpl.java
----------------------------------------------------------------------
diff --git a/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/MutableStorageMetadataImpl.java b/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/MutableStorageMetadataImpl.java
index 677d470..d3676c1 100644
--- a/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/MutableStorageMetadataImpl.java
+++ b/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/MutableStorageMetadataImpl.java
@@ -19,7 +19,7 @@ package org.jclouds.blobstore.domain.internal;
import java.util.Date;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import org.jclouds.blobstore.domain.MutableStorageMetadata;
import org.jclouds.blobstore.domain.StorageMetadata;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/StorageMetadataImpl.java
----------------------------------------------------------------------
diff --git a/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/StorageMetadataImpl.java b/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/StorageMetadataImpl.java
index 6ff32bd..69e650e 100644
--- a/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/StorageMetadataImpl.java
+++ b/blobstore/src/main/java/org/jclouds/blobstore/domain/internal/StorageMetadataImpl.java
@@ -23,7 +23,7 @@ import java.util.Date;
import java.util.Map;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import org.jclouds.blobstore.domain.StorageMetadata;
import org.jclouds.blobstore.domain.StorageType;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/common/openstack/src/main/java/org/jclouds/openstack/domain/AuthenticationResponse.java
----------------------------------------------------------------------
diff --git a/common/openstack/src/main/java/org/jclouds/openstack/domain/AuthenticationResponse.java b/common/openstack/src/main/java/org/jclouds/openstack/domain/AuthenticationResponse.java
index 79829ec..d86673f 100644
--- a/common/openstack/src/main/java/org/jclouds/openstack/domain/AuthenticationResponse.java
+++ b/common/openstack/src/main/java/org/jclouds/openstack/domain/AuthenticationResponse.java
@@ -21,6 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.net.URI;
import java.util.Map;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableMap;
@@ -60,7 +61,7 @@ public class AuthenticationResponse {
@Override
public String toString() {
- return Objects.toStringHelper(this).add("authToken", authToken).add("services", services).toString();
+ return MoreObjects.toStringHelper(this).add("authToken", authToken).add("services", services).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/common/openstack/src/main/java/org/jclouds/openstack/domain/Link.java
----------------------------------------------------------------------
diff --git a/common/openstack/src/main/java/org/jclouds/openstack/domain/Link.java b/common/openstack/src/main/java/org/jclouds/openstack/domain/Link.java
index a8f00a9..04828dd 100644
--- a/common/openstack/src/main/java/org/jclouds/openstack/domain/Link.java
+++ b/common/openstack/src/main/java/org/jclouds/openstack/domain/Link.java
@@ -17,7 +17,7 @@
package org.jclouds.openstack.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/common/openstack/src/main/java/org/jclouds/openstack/domain/Resource.java
----------------------------------------------------------------------
diff --git a/common/openstack/src/main/java/org/jclouds/openstack/domain/Resource.java b/common/openstack/src/main/java/org/jclouds/openstack/domain/Resource.java
index 2cc629e..8bab068 100644
--- a/common/openstack/src/main/java/org/jclouds/openstack/domain/Resource.java
+++ b/common/openstack/src/main/java/org/jclouds/openstack/domain/Resource.java
@@ -23,8 +23,9 @@ 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.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
@@ -149,7 +150,7 @@ public class Resource implements Comparable<Resource> {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("id", getId())
.add("name", name)
.add("links", links);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/domain/Auth.java
----------------------------------------------------------------------
diff --git a/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/domain/Auth.java b/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/domain/Auth.java
index 2f94619..3580738 100644
--- a/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/domain/Auth.java
+++ b/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/domain/Auth.java
@@ -17,7 +17,7 @@
package org.jclouds.openstack.keystone.v1_1.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import com.google.common.base.Objects;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/domain/Endpoint.java
----------------------------------------------------------------------
diff --git a/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/domain/Endpoint.java b/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/domain/Endpoint.java
index 79a25d2..18115be 100644
--- a/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/domain/Endpoint.java
+++ b/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/domain/Endpoint.java
@@ -17,7 +17,7 @@
package org.jclouds.openstack.keystone.v1_1.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.net.URI;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/domain/Token.java
----------------------------------------------------------------------
diff --git a/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/domain/Token.java b/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/domain/Token.java
index 0e4edff..4fac522 100644
--- a/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/domain/Token.java
+++ b/common/openstack/src/main/java/org/jclouds/openstack/keystone/v1_1/domain/Token.java
@@ -17,7 +17,7 @@
package org.jclouds.openstack.keystone.v1_1.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Date;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/compute/src/main/java/org/jclouds/compute/callables/BlockUntilInitScriptStatusIsZeroThenReturnOutput.java
----------------------------------------------------------------------
diff --git a/compute/src/main/java/org/jclouds/compute/callables/BlockUntilInitScriptStatusIsZeroThenReturnOutput.java b/compute/src/main/java/org/jclouds/compute/callables/BlockUntilInitScriptStatusIsZeroThenReturnOutput.java
index 2a15f4b..9c5f9b9 100644
--- a/compute/src/main/java/org/jclouds/compute/callables/BlockUntilInitScriptStatusIsZeroThenReturnOutput.java
+++ b/compute/src/main/java/org/jclouds/compute/callables/BlockUntilInitScriptStatusIsZeroThenReturnOutput.java
@@ -35,6 +35,7 @@ import org.jclouds.compute.reference.ComputeServiceConstants;
import org.jclouds.logging.Logger;
import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
@@ -166,7 +167,7 @@ public class BlockUntilInitScriptStatusIsZeroThenReturnOutput extends AbstractFu
@Override
public String toString() {
- return Objects.toStringHelper(this).add("commandRunner", commandRunner).toString();
+ return MoreObjects.toStringHelper(this).add("commandRunner", commandRunner).toString();
}
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/compute/src/main/java/org/jclouds/compute/callables/RunScriptOnNodeUsingSsh.java
----------------------------------------------------------------------
diff --git a/compute/src/main/java/org/jclouds/compute/callables/RunScriptOnNodeUsingSsh.java b/compute/src/main/java/org/jclouds/compute/callables/RunScriptOnNodeUsingSsh.java
index 419109d..2d72e3a 100644
--- a/compute/src/main/java/org/jclouds/compute/callables/RunScriptOnNodeUsingSsh.java
+++ b/compute/src/main/java/org/jclouds/compute/callables/RunScriptOnNodeUsingSsh.java
@@ -36,7 +36,7 @@ import org.jclouds.ssh.SshClient;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Function;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Throwables;
import com.google.common.eventbus.EventBus;
import com.google.inject.assistedinject.Assisted;
@@ -129,7 +129,7 @@ public class RunScriptOnNodeUsingSsh implements RunScriptOnNode {
@Override
public String toString() {
- return Objects.toStringHelper(this).add("node", node).add("name", statement).add("runAsRoot", runAsRoot)
+ return MoreObjects.toStringHelper(this).add("node", node).add("name", statement).add("runAsRoot", runAsRoot)
.toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/compute/src/main/java/org/jclouds/compute/callables/SudoAwareInitManager.java
----------------------------------------------------------------------
diff --git a/compute/src/main/java/org/jclouds/compute/callables/SudoAwareInitManager.java b/compute/src/main/java/org/jclouds/compute/callables/SudoAwareInitManager.java
index 472a214..07f7687 100644
--- a/compute/src/main/java/org/jclouds/compute/callables/SudoAwareInitManager.java
+++ b/compute/src/main/java/org/jclouds/compute/callables/SudoAwareInitManager.java
@@ -31,7 +31,7 @@ import org.jclouds.ssh.SshClient;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Function;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Predicates;
import com.google.common.collect.ImmutableSet;
@@ -133,7 +133,7 @@ public class SudoAwareInitManager {
@Override
public String toString() {
- return Objects.toStringHelper(this).add("node", node.getId()).add("name", init.getInstanceName())
+ return MoreObjects.toStringHelper(this).add("node", node.getId()).add("name", init.getInstanceName())
.add("runAsRoot", runAsRoot).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/compute/src/main/java/org/jclouds/compute/config/ComputeServiceAdapterContextModule.java
----------------------------------------------------------------------
diff --git a/compute/src/main/java/org/jclouds/compute/config/ComputeServiceAdapterContextModule.java b/compute/src/main/java/org/jclouds/compute/config/ComputeServiceAdapterContextModule.java
index a6f0f4d..f79757d 100644
--- a/compute/src/main/java/org/jclouds/compute/config/ComputeServiceAdapterContextModule.java
+++ b/compute/src/main/java/org/jclouds/compute/config/ComputeServiceAdapterContextModule.java
@@ -17,7 +17,7 @@
package org.jclouds.compute.config;
import static com.google.common.base.Functions.compose;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Predicates.notNull;
import java.util.Set;
[8/9] jclouds git commit: JCLOUDS-1225: Address Guava 18
MoreExecutors changes
Posted by ga...@apache.org.
JCLOUDS-1225: Address Guava 18 MoreExecutors changes
Fixed with:
find -name \*.java | xargs sed -i 's/sameThreadExecutor/newDirectExecutorService/g'
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/517323fb
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/517323fb
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/517323fb
Branch: refs/heads/master
Commit: 517323fbd5fca8fe12e48656f827007bdc0e260e
Parents: a493e2c
Author: Andrew Gaul <ga...@apache.org>
Authored: Mon Aug 21 14:02:08 2017 -0700
Committer: Andrew Gaul <ga...@apache.org>
Committed: Tue Aug 22 17:14:22 2017 -0700
----------------------------------------------------------------------
.../java/org/jclouds/ec2/internal/BaseEC2ApiMockTest.java | 4 ++--
.../compute/ElasticStackComputeServiceAdapterTest.java | 2 +-
.../java/org/jclouds/oauth/v2/AuthorizationApiMockTest.java | 4 ++--
.../openstack/v2_0/internal/BaseOpenStackMockTest.java | 4 ++--
.../org/jclouds/openstack/swift/v1/TempAuthMockTest.java | 4 ++--
apis/s3/src/test/java/org/jclouds/s3/S3ClientMockTest.java | 4 ++--
.../s3/blobstore/functions/BucketsToStorageMetadataTest.java | 4 ++--
.../java/org/jclouds/sqs/features/PermissionApiLiveTest.java | 4 ++--
.../main/java/org/jclouds/blobstore/options/PutOptions.java | 2 +-
...BlockUntilInitScriptStatusIsZeroThenReturnOutputTest.java | 8 ++++----
...tOnNodeAsInitScriptUsingSshAndBlockUntilCompleteTest.java | 4 ++--
core/src/main/java/org/jclouds/ContextBuilder.java | 4 ++--
.../java/org/jclouds/lifecycle/config/LifeCycleModule.java | 4 ++--
.../java/org/jclouds/concurrent/FutureIterablesTest.java | 6 +++---
.../org/jclouds/rest/internal/BaseRestApiExpectTest.java | 4 ++--
.../test/java/org/jclouds/rest/internal/BaseRestApiTest.java | 4 ++--
.../gae/config/GoogleAppEngineConfigurationModule.java | 4 ++--
.../org/jclouds/aws/ec2/internal/BaseAWSEC2ApiMockTest.java | 4 ++--
.../src/test/java/org/jclouds/b2/features/B2TestUtils.java | 2 +-
.../digitalocean2/internal/BaseDigitalOcean2ApiMockTest.java | 4 ++--
.../test/java/org/jclouds/dynect/v3/DynectApiMockTest.java | 4 ++--
.../internal/BaseGoogleCloudStorageApiMockTest.java | 4 ++--
.../internal/BaseGoogleComputeEngineApiMockTest.java | 4 ++--
.../packet/compute/internal/BasePacketApiMockTest.java | 4 ++--
24 files changed, 48 insertions(+), 48 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/517323fb/apis/ec2/src/test/java/org/jclouds/ec2/internal/BaseEC2ApiMockTest.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/test/java/org/jclouds/ec2/internal/BaseEC2ApiMockTest.java b/apis/ec2/src/test/java/org/jclouds/ec2/internal/BaseEC2ApiMockTest.java
index 900d217..c89a9f3 100644
--- a/apis/ec2/src/test/java/org/jclouds/ec2/internal/BaseEC2ApiMockTest.java
+++ b/apis/ec2/src/test/java/org/jclouds/ec2/internal/BaseEC2ApiMockTest.java
@@ -18,7 +18,7 @@ package org.jclouds.ec2.internal;
import static com.google.common.base.Throwables.propagate;
import static com.google.common.net.HttpHeaders.CONTENT_TYPE;
-import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor;
+import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService;
import static javax.ws.rs.core.MediaType.APPLICATION_XML;
import static org.jclouds.util.Strings2.toStringAndClose;
import static org.testng.Assert.assertEquals;
@@ -71,7 +71,7 @@ public class BaseEC2ApiMockTest {
.modules(modules);
}
- private final Set<Module> modules = ImmutableSet.<Module>of(new ExecutorServiceModule(sameThreadExecutor()));
+ private final Set<Module> modules = ImmutableSet.<Module>of(new ExecutorServiceModule(newDirectExecutorService()));
@BeforeMethod
public void start() throws IOException {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/517323fb/apis/elasticstack/src/test/java/org/jclouds/elasticstack/compute/ElasticStackComputeServiceAdapterTest.java
----------------------------------------------------------------------
diff --git a/apis/elasticstack/src/test/java/org/jclouds/elasticstack/compute/ElasticStackComputeServiceAdapterTest.java b/apis/elasticstack/src/test/java/org/jclouds/elasticstack/compute/ElasticStackComputeServiceAdapterTest.java
index 70ce180..d922aca 100644
--- a/apis/elasticstack/src/test/java/org/jclouds/elasticstack/compute/ElasticStackComputeServiceAdapterTest.java
+++ b/apis/elasticstack/src/test/java/org/jclouds/elasticstack/compute/ElasticStackComputeServiceAdapterTest.java
@@ -102,7 +102,7 @@ public class ElasticStackComputeServiceAdapterTest {
replay(api);
ElasticStackComputeServiceAdapter adapter = new ElasticStackComputeServiceAdapter(api, driveNotClaimed,
- preInstalledImageSupplier, driveCache, "12345678", MoreExecutors.sameThreadExecutor());
+ preInstalledImageSupplier, driveCache, "12345678", MoreExecutors.newDirectExecutorService());
try {
adapter.createNodeWithGroupEncodedIntoName("mock-group", "mock-name", template);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/517323fb/apis/oauth/src/test/java/org/jclouds/oauth/v2/AuthorizationApiMockTest.java
----------------------------------------------------------------------
diff --git a/apis/oauth/src/test/java/org/jclouds/oauth/v2/AuthorizationApiMockTest.java b/apis/oauth/src/test/java/org/jclouds/oauth/v2/AuthorizationApiMockTest.java
index 89fe953..792f8bb 100644
--- a/apis/oauth/src/test/java/org/jclouds/oauth/v2/AuthorizationApiMockTest.java
+++ b/apis/oauth/src/test/java/org/jclouds/oauth/v2/AuthorizationApiMockTest.java
@@ -18,7 +18,7 @@ package org.jclouds.oauth.v2;
import static com.google.common.base.Charsets.UTF_8;
import static com.google.common.io.BaseEncoding.base64Url;
-import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor;
+import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService;
import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
import static org.jclouds.Constants.PROPERTY_MAX_RETRIES;
import static org.jclouds.oauth.v2.config.CredentialType.P12_PRIVATE_KEY_CREDENTIALS;
@@ -235,7 +235,7 @@ public class AuthorizationApiMockTest {
.credentials("foo", toStringAndClose(OAuthTestUtils.class.getResourceAsStream("/testpk.pem")))
.endpoint(url.toString())
.overrides(overrides)
- .modules(ImmutableSet.of(new ExecutorServiceModule(sameThreadExecutor()), new OAuthModule(), new Module() {
+ .modules(ImmutableSet.of(new ExecutorServiceModule(newDirectExecutorService()), new OAuthModule(), new Module() {
@Override public void configure(Binder binder) {
binder.bind(OAuthScopes.class).toInstance(SingleScope.create(SCOPE));
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/517323fb/apis/openstack-keystone/src/test/java/org/jclouds/openstack/v2_0/internal/BaseOpenStackMockTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/v2_0/internal/BaseOpenStackMockTest.java b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/v2_0/internal/BaseOpenStackMockTest.java
index a7cc79d..a67a038 100644
--- a/apis/openstack-keystone/src/test/java/org/jclouds/openstack/v2_0/internal/BaseOpenStackMockTest.java
+++ b/apis/openstack-keystone/src/test/java/org/jclouds/openstack/v2_0/internal/BaseOpenStackMockTest.java
@@ -16,7 +16,7 @@
*/
package org.jclouds.openstack.v2_0.internal;
-import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor;
+import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService;
import static org.jclouds.Constants.PROPERTY_MAX_RETRIES;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.assertTrue;
@@ -58,7 +58,7 @@ public class BaseOpenStackMockTest<A extends Closeable> {
public static final String accessRackspace = "{\"access\":{\"token\":{\"id\":\"b84f4a37-5126-4603-9521-ccd0665fbde1\",\"expires\":\"2013-04-13T16:49:57.000-05:00\",\"tenant\":{\"id\":\"123123\",\"name\":\"123123\"}},\"serviceCatalog\":[{\"endpoints\":[{\"tenantId\":\"123123\",\"publicURL\":\"URL/v1.0/123123\"}],\"name\":\"cloudMonitoring\",\"type\":\"rax:monitor\"},{\"endpoints\":[{\"region\":\"DFW\",\"tenantId\":\"MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9\",\"publicURL\":\"URL/v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9\"},{\"region\":\"ORD\",\"tenantId\":\"MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9\",\"publicURL\":\"URL/v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9\"}],\"name\":\"cloudFilesCDN\",\"type\":\"rax:object-cdn\"},{\"endpoints\":[{\"region\":\"ORD\",\"tenantId\":\"123123\",\"publicURL\":\"URL/v1.0/123123\"},{\"region\":\"DFW\",\"tenantId\":\"123123\",\"publicURL\":\"URL/v1.0/123123\"}],\"name\":\"cloudLoadBalancers\",\"type\":\"rax:load-
balancer\"},{\"endpoints\":[{\"region\":\"DFW\",\"tenantId\":\"123123\",\"publicURL\":\"URL/v1.0/123123\"},{\"region\":\"ORD\",\"tenantId\":\"123123\",\"publicURL\":\"URL/v1.0/123123\"}],\"name\":\"cloudDatabases\",\"type\":\"rax:database\"},{\"endpoints\":[{\"region\":\"DFW\",\"tenantId\":\"MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9\",\"publicURL\":\"URL/v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9\",\"internalURL\":\"URL/v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9\"},{\"region\":\"ORD\",\"tenantId\":\"MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9\",\"publicURL\":\"URL/v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9\",\"internalURL\":\"URL/v1/MossoCloudFS_5bcf396e-39dd-45ff-93a1-712b9aba90a9\"}],\"name\":\"cloudFiles\",\"type\":\"object-store\"},{\"endpoints\":[{\"tenantId\":\"123123\",\"publicURL\":\"URL/v1.0/123123\",\"versionInfo\":\"URL/v1.0\",\"versionList\":\"URL/\",\"versionId\":\"1.0\"}],\"name\":\"cloudServers\",\"type\":\"compute\"},{\"end
points\":[{\"region\":\"DFW\",\"tenantId\":\"123123\",\"publicURL\":\"URL/v2/123123\",\"versionInfo\":\"URL/v2\",\"versionList\":\"URL/\",\"versionId\":\"2\"},{\"region\":\"ORD\",\"tenantId\":\"123123\",\"publicURL\":\"URL/v2/123123\",\"versionInfo\":\"URL/v2\",\"versionList\":\"URL/\",\"versionId\":\"2\"}],\"name\":\"cloudServersOpenStack\",\"type\":\"compute\"},{\"endpoints\":[{\"tenantId\":\"123123\",\"publicURL\":\"URL/v1.0/123123\"}],\"name\":\"cloudDNS\",\"type\":\"rax:dns\"},{\"endpoints\":[{\"tenantId\":\"123123\",\"publicURL\":\"URL/v1.0/123123\"}],\"name\":\"cloudBackup\",\"type\":\"rax:backup\"},{\"endpoints\":[{\"region\":\"DFW\",\"tenantId\":\"123123\",\"publicURL\":\"URL/v1/123123\"},{\"region\":\"ORD\",\"tenantId\":\"123123\",\"publicURL\":\"URL/v1/123123\"}],\"name\":\"cloudBlockStorage\",\"type\":\"volume\"},{\"endpoints\":[{\"region\":\"DFW\",\"tenantId\":\"123123\",\"publicURL\":\"URL/v1/123123\",\"internalURL\":\"URL/v1/123123\"},{\"region\":\"ORD\",\"tenantId\":
\"123123\",\"publicURL\":\"URL/v1/123123\",\"internalURL\":\"URL/v1/123123\"}],\"name\":\"zaqar\",\"type\":\"messaging\"},{\"endpoints\":[{\"region\":\"DFW\",\"tenantId\":\"123123\",\"publicURL\":\"URL/v1/123123\",\"internalURL\":\"URL/v1/123123\"},{\"region\":\"ORD\",\"tenantId\":\"123123\",\"publicURL\":\"URL/v1/123123\",\"internalURL\":\"URL/v1/123123\"}],\"name\":\"autoscale\",\"type\":\"rax:autoscale\"}],\"user\":{\"id\":\"1234\",\"roles\":[{\"id\":\"3\",\"description\":\"User Admin Role.\",\"name\":\"identity:user-admin\"}],\"name\":\"jclouds-joe\",\"RAX-AUTH:defaultRegion\":\"DFW\"}}}";
private final Set<Module> modules = ImmutableSet.<Module> of(
- new ExecutorServiceModule(sameThreadExecutor()));
+ new ExecutorServiceModule(newDirectExecutorService()));
/**
* Pattern for replacing the URL token with the correct local address.
http://git-wip-us.apache.org/repos/asf/jclouds/blob/517323fb/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/TempAuthMockTest.java
----------------------------------------------------------------------
diff --git a/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/TempAuthMockTest.java b/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/TempAuthMockTest.java
index dd440d9..685a232 100644
--- a/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/TempAuthMockTest.java
+++ b/apis/openstack-swift/src/test/java/org/jclouds/openstack/swift/v1/TempAuthMockTest.java
@@ -16,7 +16,7 @@
*/
package org.jclouds.openstack.swift.v1;
-import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor;
+import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService;
import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
import static org.assertj.core.api.Assertions.assertThat;
import static org.jclouds.openstack.keystone.v2_0.config.KeystoneProperties.CREDENTIAL_TYPE;
@@ -93,7 +93,7 @@ public class TempAuthMockTest {
.credentials("user", "password")
.endpoint(authUrl)
.overrides(overrides)
- .modules(ImmutableSet.of(new ExecutorServiceModule(sameThreadExecutor())))
+ .modules(ImmutableSet.of(new ExecutorServiceModule(newDirectExecutorService())))
.buildApi(SwiftApi.class);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/517323fb/apis/s3/src/test/java/org/jclouds/s3/S3ClientMockTest.java
----------------------------------------------------------------------
diff --git a/apis/s3/src/test/java/org/jclouds/s3/S3ClientMockTest.java b/apis/s3/src/test/java/org/jclouds/s3/S3ClientMockTest.java
index cf31df3..8374253 100644
--- a/apis/s3/src/test/java/org/jclouds/s3/S3ClientMockTest.java
+++ b/apis/s3/src/test/java/org/jclouds/s3/S3ClientMockTest.java
@@ -19,7 +19,7 @@ package org.jclouds.s3;
import static com.google.common.net.HttpHeaders.CONTENT_LENGTH;
import static com.google.common.net.HttpHeaders.ETAG;
import static com.google.common.net.HttpHeaders.EXPECT;
-import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor;
+import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService;
import static org.assertj.core.api.Assertions.assertThat;
import static org.jclouds.Constants.PROPERTY_MAX_RETRIES;
import static org.testng.Assert.assertEquals;
@@ -46,7 +46,7 @@ import com.squareup.okhttp.mockwebserver.RecordedRequest;
public class S3ClientMockTest {
private static final Set<Module> modules = ImmutableSet.<Module> of(new OkHttpCommandExecutorServiceModule(),
- new ExecutorServiceModule(sameThreadExecutor()));
+ new ExecutorServiceModule(newDirectExecutorService()));
static S3Client getS3Client(URL server) {
Properties overrides = new Properties();
http://git-wip-us.apache.org/repos/asf/jclouds/blob/517323fb/apis/s3/src/test/java/org/jclouds/s3/blobstore/functions/BucketsToStorageMetadataTest.java
----------------------------------------------------------------------
diff --git a/apis/s3/src/test/java/org/jclouds/s3/blobstore/functions/BucketsToStorageMetadataTest.java b/apis/s3/src/test/java/org/jclouds/s3/blobstore/functions/BucketsToStorageMetadataTest.java
index 3d638db..46fa6b5 100644
--- a/apis/s3/src/test/java/org/jclouds/s3/blobstore/functions/BucketsToStorageMetadataTest.java
+++ b/apis/s3/src/test/java/org/jclouds/s3/blobstore/functions/BucketsToStorageMetadataTest.java
@@ -16,7 +16,7 @@
*/
package org.jclouds.s3.blobstore.functions;
-import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor;
+import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService;
import static org.testng.Assert.assertEquals;
import org.jclouds.blobstore.domain.MutableStorageMetadata;
@@ -49,7 +49,7 @@ public class BucketsToStorageMetadataTest {
public void test() {
BucketsToStorageMetadata fn = new BucketsToStorageMetadata(
- sameThreadExecutor(),
+ newDirectExecutorService(),
new BucketToResourceMetadata(Functions.forMap(ImmutableMap.<String, Location> of("mycontainer", region))));
MutableStorageMetadata expected = new MutableStorageMetadataImpl();
http://git-wip-us.apache.org/repos/asf/jclouds/blob/517323fb/apis/sqs/src/test/java/org/jclouds/sqs/features/PermissionApiLiveTest.java
----------------------------------------------------------------------
diff --git a/apis/sqs/src/test/java/org/jclouds/sqs/features/PermissionApiLiveTest.java b/apis/sqs/src/test/java/org/jclouds/sqs/features/PermissionApiLiveTest.java
index 7a04b9b..b8a7f31 100644
--- a/apis/sqs/src/test/java/org/jclouds/sqs/features/PermissionApiLiveTest.java
+++ b/apis/sqs/src/test/java/org/jclouds/sqs/features/PermissionApiLiveTest.java
@@ -16,7 +16,7 @@
*/
package org.jclouds.sqs.features;
-import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor;
+import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService;
import static org.jclouds.providers.AnonymousProviderMetadata.forApiOnEndpoint;
import static org.jclouds.sqs.reference.SQSParameters.ACTION;
import static org.testng.Assert.assertEquals;
@@ -91,7 +91,7 @@ public class PermissionApiLiveTest extends BaseSQSApiLiveTest {
private AnonymousAttributesApi getAnonymousAttributesApi(URI queue) {
return ContextBuilder.newBuilder(forApiOnEndpoint(AnonymousAttributesApi.class, queue.toASCIIString()))
- .modules(ImmutableSet.<Module> of(new ExecutorServiceModule(sameThreadExecutor())))
+ .modules(ImmutableSet.<Module> of(new ExecutorServiceModule(newDirectExecutorService())))
.buildApi(AnonymousAttributesApi.class);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/517323fb/blobstore/src/main/java/org/jclouds/blobstore/options/PutOptions.java
----------------------------------------------------------------------
diff --git a/blobstore/src/main/java/org/jclouds/blobstore/options/PutOptions.java b/blobstore/src/main/java/org/jclouds/blobstore/options/PutOptions.java
index d80ab86..983355c 100644
--- a/blobstore/src/main/java/org/jclouds/blobstore/options/PutOptions.java
+++ b/blobstore/src/main/java/org/jclouds/blobstore/options/PutOptions.java
@@ -43,7 +43,7 @@ public class PutOptions implements Cloneable {
private boolean useCustomExecutor = false;
// TODO: This exposes ListeningExecutorService to the user, instead of a regular ExecutorService
- private ListeningExecutorService customExecutor = MoreExecutors.sameThreadExecutor();
+ private ListeningExecutorService customExecutor = MoreExecutors.newDirectExecutorService();
public PutOptions() {
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/517323fb/compute/src/test/java/org/jclouds/compute/callables/BlockUntilInitScriptStatusIsZeroThenReturnOutputTest.java
----------------------------------------------------------------------
diff --git a/compute/src/test/java/org/jclouds/compute/callables/BlockUntilInitScriptStatusIsZeroThenReturnOutputTest.java b/compute/src/test/java/org/jclouds/compute/callables/BlockUntilInitScriptStatusIsZeroThenReturnOutputTest.java
index 7d71e4c..fe3803d 100644
--- a/compute/src/test/java/org/jclouds/compute/callables/BlockUntilInitScriptStatusIsZeroThenReturnOutputTest.java
+++ b/compute/src/test/java/org/jclouds/compute/callables/BlockUntilInitScriptStatusIsZeroThenReturnOutputTest.java
@@ -132,7 +132,7 @@ public class BlockUntilInitScriptStatusIsZeroThenReturnOutputTest {
EventBus eventBus = new EventBus();
public void testExitStatusZeroReturnsExecResponse() throws InterruptedException, ExecutionException {
- ListeningExecutorService userExecutor = MoreExecutors.sameThreadExecutor();
+ ListeningExecutorService userExecutor = MoreExecutors.newDirectExecutorService();
Predicate<String> notRunningAnymore = Predicates.alwaysTrue();
SudoAwareInitManager commandRunner = createMockBuilder(SudoAwareInitManager.class).addMockedMethod("runAction")
.addMockedMethod("getStatement").addMockedMethod("getNode").addMockedMethod("toString")
@@ -160,7 +160,7 @@ public class BlockUntilInitScriptStatusIsZeroThenReturnOutputTest {
public void testFirstExitStatusOneButSecondExitStatusZeroReturnsExecResponse() throws InterruptedException,
ExecutionException {
- ListeningExecutorService userExecutor = MoreExecutors.sameThreadExecutor();
+ ListeningExecutorService userExecutor = MoreExecutors.newDirectExecutorService();
Predicate<String> notRunningAnymore = Predicates.alwaysTrue();
SudoAwareInitManager commandRunner = createMockBuilder(SudoAwareInitManager.class).addMockedMethod("runAction")
@@ -194,7 +194,7 @@ public class BlockUntilInitScriptStatusIsZeroThenReturnOutputTest {
}
public void testCancelInterruptStopsCommand() throws InterruptedException, ExecutionException {
- ListeningExecutorService userExecutor = MoreExecutors.sameThreadExecutor();
+ ListeningExecutorService userExecutor = MoreExecutors.newDirectExecutorService();
Predicate<String> notRunningAnymore = Predicates.alwaysTrue();
SudoAwareInitManager commandRunner = createMockBuilder(SudoAwareInitManager.class).addMockedMethod(
"refreshAndRunAction").addMockedMethod("runAction").addMockedMethod("getStatement").addMockedMethod(
@@ -239,7 +239,7 @@ public class BlockUntilInitScriptStatusIsZeroThenReturnOutputTest {
public void testCancelDontInterruptLeavesCommandRunningAndReturnsLastStatus() throws InterruptedException,
ExecutionException {
- ListeningExecutorService userExecutor = MoreExecutors.sameThreadExecutor();
+ ListeningExecutorService userExecutor = MoreExecutors.newDirectExecutorService();
Predicate<String> notRunningAnymore = Predicates.alwaysTrue();
SudoAwareInitManager commandRunner = createMockBuilder(SudoAwareInitManager.class).addMockedMethod("runAction")
.addMockedMethod("getStatement").addMockedMethod("getNode").addMockedMethod("toString")
http://git-wip-us.apache.org/repos/asf/jclouds/blob/517323fb/compute/src/test/java/org/jclouds/compute/callables/RunScriptOnNodeAsInitScriptUsingSshAndBlockUntilCompleteTest.java
----------------------------------------------------------------------
diff --git a/compute/src/test/java/org/jclouds/compute/callables/RunScriptOnNodeAsInitScriptUsingSshAndBlockUntilCompleteTest.java b/compute/src/test/java/org/jclouds/compute/callables/RunScriptOnNodeAsInitScriptUsingSshAndBlockUntilCompleteTest.java
index 5b57db4..bd3a299 100644
--- a/compute/src/test/java/org/jclouds/compute/callables/RunScriptOnNodeAsInitScriptUsingSshAndBlockUntilCompleteTest.java
+++ b/compute/src/test/java/org/jclouds/compute/callables/RunScriptOnNodeAsInitScriptUsingSshAndBlockUntilCompleteTest.java
@@ -16,7 +16,7 @@
*/
package org.jclouds.compute.callables;
-import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor;
+import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService;
import static com.google.inject.name.Names.named;
import static org.easymock.EasyMock.createMock;
import static org.easymock.EasyMock.expect;
@@ -51,7 +51,7 @@ import com.google.inject.assistedinject.FactoryModuleBuilder;
@Test(groups = "unit", singleThreaded = true, testName = "RunScriptOnNodeAsInitScriptUsingSshAndBlockUntilCompleteTest")
public class RunScriptOnNodeAsInitScriptUsingSshAndBlockUntilCompleteTest {
- Injector injector = Guice.createInjector(new ExecutorServiceModule(sameThreadExecutor()),
+ Injector injector = Guice.createInjector(new ExecutorServiceModule(newDirectExecutorService()),
new AbstractModule() {
protected void configure() {
bindConstant().annotatedWith(named(PROPERTY_USER_THREADS)).to(1);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/517323fb/core/src/main/java/org/jclouds/ContextBuilder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/ContextBuilder.java b/core/src/main/java/org/jclouds/ContextBuilder.java
index a547599..7c6cbc5 100644
--- a/core/src/main/java/org/jclouds/ContextBuilder.java
+++ b/core/src/main/java/org/jclouds/ContextBuilder.java
@@ -31,7 +31,7 @@ import static com.google.common.collect.Iterables.transform;
import static com.google.common.collect.Lists.newArrayList;
import static com.google.common.collect.Lists.newArrayListWithCapacity;
import static com.google.common.collect.Maps.filterKeys;
-import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor;
+import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService;
import static org.jclouds.Constants.PROPERTY_API;
import static org.jclouds.Constants.PROPERTY_API_VERSION;
import static org.jclouds.Constants.PROPERTY_BUILD_VERSION;
@@ -547,7 +547,7 @@ public class ContextBuilder {
return input.getClass().isAnnotationPresent(SingleThreaded.class);
}
})) {
- modules.add(new ExecutorServiceModule(sameThreadExecutor()));
+ modules.add(new ExecutorServiceModule(newDirectExecutorService()));
} else {
modules.add(new ExecutorServiceModule());
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/517323fb/core/src/main/java/org/jclouds/lifecycle/config/LifeCycleModule.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/lifecycle/config/LifeCycleModule.java b/core/src/main/java/org/jclouds/lifecycle/config/LifeCycleModule.java
index f002217..e978c24 100644
--- a/core/src/main/java/org/jclouds/lifecycle/config/LifeCycleModule.java
+++ b/core/src/main/java/org/jclouds/lifecycle/config/LifeCycleModule.java
@@ -18,7 +18,7 @@ package org.jclouds.lifecycle.config;
import static com.google.common.base.Throwables.propagate;
import static com.google.common.collect.Iterables.filter;
-import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor;
+import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService;
import static com.google.inject.matcher.Matchers.any;
import static org.jclouds.Constants.PROPERTY_SCHEDULER_THREADS;
import static org.jclouds.Constants.PROPERTY_USER_THREADS;
@@ -117,7 +117,7 @@ public class LifeCycleModule extends AbstractModule {
invokeOnInjectee(method, injectee);
}
- }, sameThreadExecutor());
+ }, newDirectExecutorService());
}
});
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/517323fb/core/src/test/java/org/jclouds/concurrent/FutureIterablesTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/jclouds/concurrent/FutureIterablesTest.java b/core/src/test/java/org/jclouds/concurrent/FutureIterablesTest.java
index 4e815f1..b40584a 100644
--- a/core/src/test/java/org/jclouds/concurrent/FutureIterablesTest.java
+++ b/core/src/test/java/org/jclouds/concurrent/FutureIterablesTest.java
@@ -18,7 +18,7 @@ package org.jclouds.concurrent;
import static com.google.common.collect.Maps.newHashMap;
import static com.google.common.util.concurrent.Futures.immediateFailedFuture;
-import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor;
+import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService;
import static org.jclouds.concurrent.FutureIterables.transformParallel;
import static org.testng.Assert.assertEquals;
import static org.testng.Assert.fail;
@@ -53,7 +53,7 @@ public class FutureIterablesTest {
counter.incrementAndGet();
return immediateFailedFuture(new AuthorizationException());
}
- }, sameThreadExecutor(), null, Logger.NULL, "");
+ }, newDirectExecutorService(), null, Logger.NULL, "");
fail("Expected AuthorizationException");
} catch (AuthorizationException e) {
assertEquals(counter.get(), 2);
@@ -70,7 +70,7 @@ public class FutureIterablesTest {
counter.incrementAndGet();
return immediateFailedFuture(new RuntimeException());
}
- }, sameThreadExecutor(), null, Logger.CONSOLE, "");
+ }, newDirectExecutorService(), null, Logger.CONSOLE, "");
fail("Expected TransformParallelException");
} catch (TransformParallelException e) {
assertEquals(e.getFromToException().size(), 2);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/517323fb/core/src/test/java/org/jclouds/rest/internal/BaseRestApiExpectTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/jclouds/rest/internal/BaseRestApiExpectTest.java b/core/src/test/java/org/jclouds/rest/internal/BaseRestApiExpectTest.java
index d0f1aa4..c6c66b3 100644
--- a/core/src/test/java/org/jclouds/rest/internal/BaseRestApiExpectTest.java
+++ b/core/src/test/java/org/jclouds/rest/internal/BaseRestApiExpectTest.java
@@ -17,7 +17,7 @@
package org.jclouds.rest.internal;
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 com.google.inject.name.Names.named;
import static org.jclouds.Constants.PROPERTY_IDEMPOTENT_METHODS;
import static org.jclouds.Constants.PROPERTY_MAX_RETRIES;
@@ -226,7 +226,7 @@ public abstract class BaseRestApiExpectTest<S> {
@Override
public void configure() {
- bind(ListeningExecutorService.class).annotatedWith(named(PROPERTY_USER_THREADS)).toInstance(sameThreadExecutor());
+ bind(ListeningExecutorService.class).annotatedWith(named(PROPERTY_USER_THREADS)).toInstance(newDirectExecutorService());
bind(new TypeLiteral<Function<HttpRequest, HttpResponse>>() {
}).toInstance(fn);
bind(HttpCommandExecutorService.class).to(ExpectHttpCommandExecutorService.class);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/517323fb/core/src/test/java/org/jclouds/rest/internal/BaseRestApiTest.java
----------------------------------------------------------------------
diff --git a/core/src/test/java/org/jclouds/rest/internal/BaseRestApiTest.java b/core/src/test/java/org/jclouds/rest/internal/BaseRestApiTest.java
index b3b9b3a..915aa99 100644
--- a/core/src/test/java/org/jclouds/rest/internal/BaseRestApiTest.java
+++ b/core/src/test/java/org/jclouds/rest/internal/BaseRestApiTest.java
@@ -18,7 +18,7 @@ package org.jclouds.rest.internal;
import static com.google.common.base.Throwables.propagate;
import static com.google.common.hash.Hashing.md5;
import static com.google.common.net.HttpHeaders.TRANSFER_ENCODING;
-import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor;
+import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService;
import static com.google.inject.name.Names.named;
import static org.easymock.EasyMock.createMock;
import static org.jclouds.Constants.PROPERTY_USER_THREADS;
@@ -77,7 +77,7 @@ public abstract class BaseRestApiTest {
@Override
protected void configure() {
- bind(ListeningExecutorService.class).annotatedWith(named(PROPERTY_USER_THREADS)).toInstance(sameThreadExecutor());
+ bind(ListeningExecutorService.class).annotatedWith(named(PROPERTY_USER_THREADS)).toInstance(newDirectExecutorService());
bind(HttpCommandExecutorService.class).toInstance(mock);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/517323fb/drivers/gae/src/main/java/org/jclouds/gae/config/GoogleAppEngineConfigurationModule.java
----------------------------------------------------------------------
diff --git a/drivers/gae/src/main/java/org/jclouds/gae/config/GoogleAppEngineConfigurationModule.java b/drivers/gae/src/main/java/org/jclouds/gae/config/GoogleAppEngineConfigurationModule.java
index 30facce..fb6fd66 100644
--- a/drivers/gae/src/main/java/org/jclouds/gae/config/GoogleAppEngineConfigurationModule.java
+++ b/drivers/gae/src/main/java/org/jclouds/gae/config/GoogleAppEngineConfigurationModule.java
@@ -16,7 +16,7 @@
*/
package org.jclouds.gae.config;
-import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor;
+import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService;
import org.jclouds.concurrent.SingleThreaded;
import org.jclouds.concurrent.config.ConfiguresExecutorService;
@@ -46,7 +46,7 @@ public class GoogleAppEngineConfigurationModule extends AbstractModule {
private final Module userExecutorModule;
public GoogleAppEngineConfigurationModule() {
- this(new ExecutorServiceModule(sameThreadExecutor()));
+ this(new ExecutorServiceModule(newDirectExecutorService()));
}
/**
http://git-wip-us.apache.org/repos/asf/jclouds/blob/517323fb/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/internal/BaseAWSEC2ApiMockTest.java
----------------------------------------------------------------------
diff --git a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/internal/BaseAWSEC2ApiMockTest.java b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/internal/BaseAWSEC2ApiMockTest.java
index 7ad46c8..aae84d9 100644
--- a/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/internal/BaseAWSEC2ApiMockTest.java
+++ b/providers/aws-ec2/src/test/java/org/jclouds/aws/ec2/internal/BaseAWSEC2ApiMockTest.java
@@ -19,7 +19,7 @@ package org.jclouds.aws.ec2.internal;
import static com.google.common.base.Throwables.propagate;
import static com.google.common.net.HttpHeaders.AUTHORIZATION;
import static com.google.common.net.HttpHeaders.CONTENT_TYPE;
-import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor;
+import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService;
import static javax.ws.rs.core.MediaType.APPLICATION_XML;
import static org.assertj.core.api.Assertions.assertThat;
import static org.jclouds.util.Strings2.toStringAndClose;
@@ -90,7 +90,7 @@ public class BaseAWSEC2ApiMockTest {
}
private final Set<Module> modules = ImmutableSet
- .<Module>of(new MockAWSEC2HttpApiModule(), new ExecutorServiceModule(sameThreadExecutor()));
+ .<Module>of(new MockAWSEC2HttpApiModule(), new ExecutorServiceModule(newDirectExecutorService()));
@ConfiguresHttpApi
class MockAWSEC2HttpApiModule extends AWSEC2HttpApiModule {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/517323fb/providers/b2/src/test/java/org/jclouds/b2/features/B2TestUtils.java
----------------------------------------------------------------------
diff --git a/providers/b2/src/test/java/org/jclouds/b2/features/B2TestUtils.java b/providers/b2/src/test/java/org/jclouds/b2/features/B2TestUtils.java
index 8d3e3a0..20be6f2 100644
--- a/providers/b2/src/test/java/org/jclouds/b2/features/B2TestUtils.java
+++ b/providers/b2/src/test/java/org/jclouds/b2/features/B2TestUtils.java
@@ -41,7 +41,7 @@ import com.squareup.okhttp.mockwebserver.RecordedRequest;
final class B2TestUtils {
static B2Api api(String uri, String provider, Properties overrides) {
Set<Module> modules = ImmutableSet.<Module> of(
- new ExecutorServiceModule(MoreExecutors.sameThreadExecutor()));
+ new ExecutorServiceModule(MoreExecutors.newDirectExecutorService()));
return ContextBuilder.newBuilder(provider)
.credentials("ACCOUNT_ID", "APPLICATION_KEY")
http://git-wip-us.apache.org/repos/asf/jclouds/blob/517323fb/providers/digitalocean2/src/test/java/org/jclouds/digitalocean2/internal/BaseDigitalOcean2ApiMockTest.java
----------------------------------------------------------------------
diff --git a/providers/digitalocean2/src/test/java/org/jclouds/digitalocean2/internal/BaseDigitalOcean2ApiMockTest.java b/providers/digitalocean2/src/test/java/org/jclouds/digitalocean2/internal/BaseDigitalOcean2ApiMockTest.java
index ca0c4bd..16f92c6 100644
--- a/providers/digitalocean2/src/test/java/org/jclouds/digitalocean2/internal/BaseDigitalOcean2ApiMockTest.java
+++ b/providers/digitalocean2/src/test/java/org/jclouds/digitalocean2/internal/BaseDigitalOcean2ApiMockTest.java
@@ -18,7 +18,7 @@ package org.jclouds.digitalocean2.internal;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.collect.Iterables.getOnlyElement;
-import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor;
+import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService;
import static org.testng.Assert.assertEquals;
import java.io.IOException;
@@ -51,7 +51,7 @@ public class BaseDigitalOcean2ApiMockTest {
private static final String MOCK_BEARER_TOKEN = "c5401990f0c24135e8d6b5d260603fc71696d4738da9aa04a720229a01a2521d";
private static final String DEFAULT_ENDPOINT = new DigitalOcean2ProviderMetadata().getEndpoint();
- private final Set<Module> modules = ImmutableSet.<Module> of(new ExecutorServiceModule(sameThreadExecutor()));
+ private final Set<Module> modules = ImmutableSet.<Module> of(new ExecutorServiceModule(newDirectExecutorService()));
protected MockWebServer server;
protected DigitalOcean2Api api;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/517323fb/providers/dynect/src/test/java/org/jclouds/dynect/v3/DynectApiMockTest.java
----------------------------------------------------------------------
diff --git a/providers/dynect/src/test/java/org/jclouds/dynect/v3/DynectApiMockTest.java b/providers/dynect/src/test/java/org/jclouds/dynect/v3/DynectApiMockTest.java
index 969371e..c5bd5b3 100644
--- a/providers/dynect/src/test/java/org/jclouds/dynect/v3/DynectApiMockTest.java
+++ b/providers/dynect/src/test/java/org/jclouds/dynect/v3/DynectApiMockTest.java
@@ -16,7 +16,7 @@
*/
package org.jclouds.dynect.v3;
-import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor;
+import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService;
import static javax.ws.rs.core.Response.Status.OK;
import static org.jclouds.Constants.PROPERTY_MAX_RETRIES;
@@ -39,7 +39,7 @@ import com.squareup.okhttp.mockwebserver.MockWebServer;
public class DynectApiMockTest {
private static final Set<Module> modules = ImmutableSet.<Module> of(
- new ExecutorServiceModule(sameThreadExecutor()));
+ new ExecutorServiceModule(newDirectExecutorService()));
static DynECTApi mockDynectApi(String uri) {
Properties overrides = new Properties();
http://git-wip-us.apache.org/repos/asf/jclouds/blob/517323fb/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/internal/BaseGoogleCloudStorageApiMockTest.java
----------------------------------------------------------------------
diff --git a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/internal/BaseGoogleCloudStorageApiMockTest.java b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/internal/BaseGoogleCloudStorageApiMockTest.java
index c303145..80db201 100644
--- a/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/internal/BaseGoogleCloudStorageApiMockTest.java
+++ b/providers/google-cloud-storage/src/test/java/org/jclouds/googlecloudstorage/internal/BaseGoogleCloudStorageApiMockTest.java
@@ -18,7 +18,7 @@ package org.jclouds.googlecloudstorage.internal;
import static com.google.common.base.Charsets.UTF_8;
import static com.google.common.base.Throwables.propagate;
-import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor;
+import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService;
import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
import static org.jclouds.googlecloud.config.GoogleCloudProperties.CREDENTIAL_TYPE;
import static org.jclouds.googlecloud.config.GoogleCloudProperties.PROJECT_NAME;
@@ -74,7 +74,7 @@ public class BaseGoogleCloudStorageApiMockTest {
}
private final Set<AbstractModule> modules = ImmutableSet
- .of(new ExecutorServiceModule(sameThreadExecutor()), new OkHttpCommandExecutorServiceModule());
+ .of(new ExecutorServiceModule(newDirectExecutorService()), new OkHttpCommandExecutorServiceModule());
final AtomicInteger suffix = new AtomicInteger();
http://git-wip-us.apache.org/repos/asf/jclouds/blob/517323fb/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/internal/BaseGoogleComputeEngineApiMockTest.java
----------------------------------------------------------------------
diff --git a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/internal/BaseGoogleComputeEngineApiMockTest.java b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/internal/BaseGoogleComputeEngineApiMockTest.java
index 23ed532..d45a6ea 100644
--- a/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/internal/BaseGoogleComputeEngineApiMockTest.java
+++ b/providers/google-compute-engine/src/test/java/org/jclouds/googlecomputeengine/internal/BaseGoogleComputeEngineApiMockTest.java
@@ -18,7 +18,7 @@ package org.jclouds.googlecomputeengine.internal;
import static com.google.common.base.Charsets.UTF_8;
import static com.google.common.base.Throwables.propagate;
-import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor;
+import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService;
import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
import static org.jclouds.compute.config.ComputeServiceProperties.TIMEOUT_NODE_TERMINATED;
import static org.jclouds.googlecloud.config.GoogleCloudProperties.CREDENTIAL_TYPE;
@@ -83,7 +83,7 @@ public class BaseGoogleComputeEngineApiMockTest {
}
private final Set<Module> modules = ImmutableSet
- .of(new ExecutorServiceModule(sameThreadExecutor()), GoogleComputeEngineTestModule.INSTANCE, new OkHttpCommandExecutorServiceModule());
+ .of(new ExecutorServiceModule(newDirectExecutorService()), GoogleComputeEngineTestModule.INSTANCE, new OkHttpCommandExecutorServiceModule());
final AtomicInteger suffix = new AtomicInteger();
http://git-wip-us.apache.org/repos/asf/jclouds/blob/517323fb/providers/packet/src/test/java/org/jclouds/packet/compute/internal/BasePacketApiMockTest.java
----------------------------------------------------------------------
diff --git a/providers/packet/src/test/java/org/jclouds/packet/compute/internal/BasePacketApiMockTest.java b/providers/packet/src/test/java/org/jclouds/packet/compute/internal/BasePacketApiMockTest.java
index 9fe3d6f..18aaf5f 100644
--- a/providers/packet/src/test/java/org/jclouds/packet/compute/internal/BasePacketApiMockTest.java
+++ b/providers/packet/src/test/java/org/jclouds/packet/compute/internal/BasePacketApiMockTest.java
@@ -43,7 +43,7 @@ import com.squareup.okhttp.mockwebserver.RecordedRequest;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.collect.Iterables.getOnlyElement;
-import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor;
+import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService;
import static org.jclouds.Constants.PROPERTY_MAX_RETRIES;
import static org.testng.Assert.assertEquals;
@@ -52,7 +52,7 @@ public class BasePacketApiMockTest {
private static final String X_AUTHORIZATION_TOKEN = "c5401990f0c24135e8d6b5d260603fc71696d4738da9aa04a720229a01a2521d";
private static final String DEFAULT_ENDPOINT = new PacketProviderMetadata().getEndpoint();
- private final Set<Module> modules = ImmutableSet.<Module> of(new ExecutorServiceModule(sameThreadExecutor()));
+ private final Set<Module> modules = ImmutableSet.<Module> of(new ExecutorServiceModule(newDirectExecutorService()));
protected MockWebServer server;
protected PacketApi api;
[9/9] jclouds git commit: JCLOUDS-1225: Upgrade to Guava 18.0
Posted by ga...@apache.org.
JCLOUDS-1225: Upgrade to Guava 18.0
Combined with previous commits, this allows applications to use up to
Guava 23.
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/04a3f6fd
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/04a3f6fd
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/04a3f6fd
Branch: refs/heads/master
Commit: 04a3f6fd87807585ff4d7f2c97cb123d494c0f81
Parents: 517323f
Author: Andrew Gaul <ga...@apache.org>
Authored: Mon Aug 21 13:56:25 2017 -0700
Committer: Andrew Gaul <ga...@apache.org>
Committed: Tue Aug 22 17:14:22 2017 -0700
----------------------------------------------------------------------
project/pom.xml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/04a3f6fd/project/pom.xml
----------------------------------------------------------------------
diff --git a/project/pom.xml b/project/pom.xml
index 33a19ba..81a6543 100644
--- a/project/pom.xml
+++ b/project/pom.xml
@@ -221,8 +221,8 @@
<maven.compile.target>1.6</maven.compile.target>
<maven.compile.deprecation>true</maven.compile.deprecation>
<maven.site.url.base>gitsite:git@github.com/jclouds/jclouds-maven-site.git</maven.site.url.base>
- <guava.version>16.0.1</guava.version>
- <guava.osgi.import>com.google.common.*;version="[16.0.1,20.0.0)"</guava.osgi.import>
+ <guava.version>18.0</guava.version>
+ <guava.osgi.import>com.google.common.*;version="[18.0.1,24.0.0)"</guava.osgi.import>
<guice.version>3.0</guice.version>
<okhttp.version>2.2.0</okhttp.version>
<okio.osgi.import>okio;version="[1.2.0,1.3)"</okio.osgi.import>
[7/9] jclouds git commit: JCLOUDS-1225: Address Guava 18 Objects
changes
Posted by ga...@apache.org.
JCLOUDS-1225: Address Guava 18 Objects changes
Fixed with:
find -name \*.java | xargs sed -i 's/Objects.[Tt]oStringHelper/More&/g'
find -name \*.java | xargs sed -i 's/Objects.firstNonNull/More&/g'
find -name \*.java | xargs sed -i 's/^\(import com.google.common.base.\)\(Objects.*\)/\1More\2\n\1\2/g'
find -name \*.java | xargs java -jar google-java-format-1.3-all-deps.jar -i --fix-imports-only --skip-sorting-imports
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/a493e2ca
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/a493e2ca
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/a493e2ca
Branch: refs/heads/master
Commit: a493e2ca2fb586ed54c743565ac469d207f178ce
Parents: e331a00
Author: Andrew Gaul <ga...@apache.org>
Authored: Mon Aug 21 13:35:48 2017 -0700
Committer: Andrew Gaul <ga...@apache.org>
Committed: Tue Aug 22 17:12:53 2017 -0700
----------------------------------------------------------------------
apis/byon/src/main/java/org/jclouds/byon/Node.java | 3 ++-
.../org/jclouds/chef/suppliers/ChefVersionSupplier.java | 2 +-
.../config/CloudStackComputeServiceContextModule.java | 6 +++---
.../compute/options/CloudStackTemplateOptions.java | 3 ++-
.../main/java/org/jclouds/cloudstack/domain/Account.java | 5 +++--
.../src/main/java/org/jclouds/cloudstack/domain/Alert.java | 5 +++--
.../main/java/org/jclouds/cloudstack/domain/ApiKeyPair.java | 5 +++--
.../org/jclouds/cloudstack/domain/AsyncCreateResponse.java | 5 +++--
.../main/java/org/jclouds/cloudstack/domain/AsyncJob.java | 5 +++--
.../java/org/jclouds/cloudstack/domain/AsyncJobError.java | 5 +++--
.../java/org/jclouds/cloudstack/domain/Capabilities.java | 5 +++--
.../main/java/org/jclouds/cloudstack/domain/Capacity.java | 5 +++--
.../main/java/org/jclouds/cloudstack/domain/Cluster.java | 5 +++--
.../org/jclouds/cloudstack/domain/ConfigurationEntry.java | 5 +++--
.../java/org/jclouds/cloudstack/domain/DiskOffering.java | 5 +++--
.../src/main/java/org/jclouds/cloudstack/domain/Domain.java | 5 +++--
.../cloudstack/domain/EncryptedPasswordAndPrivateKey.java | 3 ++-
.../src/main/java/org/jclouds/cloudstack/domain/Event.java | 5 +++--
.../java/org/jclouds/cloudstack/domain/FirewallRule.java | 5 +++--
.../src/main/java/org/jclouds/cloudstack/domain/Host.java | 5 +++--
.../org/jclouds/cloudstack/domain/IPForwardingRule.java | 5 +++--
.../src/main/java/org/jclouds/cloudstack/domain/ISO.java | 5 +++--
.../java/org/jclouds/cloudstack/domain/ISOExtraction.java | 5 +++--
.../java/org/jclouds/cloudstack/domain/ISOPermissions.java | 5 +++--
.../java/org/jclouds/cloudstack/domain/IngressRule.java | 5 +++--
.../main/java/org/jclouds/cloudstack/domain/JobResult.java | 5 +++--
.../org/jclouds/cloudstack/domain/LoadBalancerRule.java | 5 +++--
.../java/org/jclouds/cloudstack/domain/LoginResponse.java | 5 +++--
.../src/main/java/org/jclouds/cloudstack/domain/NIC.java | 5 +++--
.../main/java/org/jclouds/cloudstack/domain/Network.java | 5 +++--
.../java/org/jclouds/cloudstack/domain/NetworkOffering.java | 5 +++--
.../java/org/jclouds/cloudstack/domain/NetworkService.java | 7 ++++---
.../src/main/java/org/jclouds/cloudstack/domain/OSType.java | 5 +++--
.../src/main/java/org/jclouds/cloudstack/domain/Pod.java | 5 +++--
.../org/jclouds/cloudstack/domain/PortForwardingRule.java | 5 +++--
.../main/java/org/jclouds/cloudstack/domain/Project.java | 5 +++--
.../java/org/jclouds/cloudstack/domain/PublicIPAddress.java | 5 +++--
.../java/org/jclouds/cloudstack/domain/ResourceLimit.java | 5 +++--
.../java/org/jclouds/cloudstack/domain/SecurityGroup.java | 5 +++--
.../java/org/jclouds/cloudstack/domain/ServiceOffering.java | 5 +++--
.../main/java/org/jclouds/cloudstack/domain/Snapshot.java | 5 +++--
.../java/org/jclouds/cloudstack/domain/SnapshotPolicy.java | 5 +++--
.../jclouds/cloudstack/domain/SnapshotPolicySchedule.java | 5 +++--
.../main/java/org/jclouds/cloudstack/domain/SshKeyPair.java | 5 +++--
.../java/org/jclouds/cloudstack/domain/StoragePool.java | 5 +++--
.../src/main/java/org/jclouds/cloudstack/domain/Tag.java | 5 +++--
.../main/java/org/jclouds/cloudstack/domain/Template.java | 5 +++--
.../org/jclouds/cloudstack/domain/TemplateExtraction.java | 5 +++--
.../org/jclouds/cloudstack/domain/TemplateMetadata.java | 5 +++--
.../org/jclouds/cloudstack/domain/TemplatePermission.java | 5 +++--
.../java/org/jclouds/cloudstack/domain/UsageRecord.java | 5 +++--
.../src/main/java/org/jclouds/cloudstack/domain/User.java | 5 +++--
.../main/java/org/jclouds/cloudstack/domain/VMGroup.java | 5 +++--
.../java/org/jclouds/cloudstack/domain/VirtualMachine.java | 5 +++--
.../java/org/jclouds/cloudstack/domain/VlanIPRange.java | 5 +++--
.../src/main/java/org/jclouds/cloudstack/domain/Volume.java | 5 +++--
.../src/main/java/org/jclouds/cloudstack/domain/Zone.java | 5 +++--
.../java/org/jclouds/cloudstack/domain/ZoneAndName.java | 5 +++--
.../cloudstack/domain/ZoneSecurityGroupNamePortsCidrs.java | 5 +++--
.../src/main/java/org/jclouds/cloudwatch/domain/Alarm.java | 2 +-
.../org/jclouds/cloudwatch/domain/AlarmHistoryItem.java | 2 +-
.../main/java/org/jclouds/cloudwatch/domain/Datapoint.java | 3 ++-
.../main/java/org/jclouds/cloudwatch/domain/Dimension.java | 3 ++-
.../cloudwatch/domain/GetMetricStatisticsResponse.java | 3 ++-
.../org/jclouds/cloudwatch/domain/ListMetricsResponse.java | 3 ++-
.../src/main/java/org/jclouds/cloudwatch/domain/Metric.java | 3 ++-
.../java/org/jclouds/cloudwatch/domain/MetricDatum.java | 5 +++--
.../docker/compute/options/DockerTemplateOptions.java | 3 ++-
.../ec2/compute/domain/PasswordDataAndPrivateKey.java | 3 ++-
.../java/org/jclouds/ec2/compute/domain/RegionAndName.java | 5 +++--
.../org/jclouds/ec2/compute/options/EC2TemplateOptions.java | 2 +-
.../src/main/java/org/jclouds/ec2/domain/PasswordData.java | 3 ++-
.../src/main/java/org/jclouds/ec2/domain/Reservation.java | 3 ++-
.../main/java/org/jclouds/ec2/domain/RunningInstance.java | 5 +++--
.../src/main/java/org/jclouds/ec2/domain/SecurityGroup.java | 5 +++--
apis/ec2/src/main/java/org/jclouds/ec2/domain/Subnet.java | 5 +++--
apis/ec2/src/main/java/org/jclouds/ec2/domain/Tag.java | 5 +++--
.../org/jclouds/elasticstack/domain/WellKnownImage.java | 5 +++--
.../openstack/cinder/v1/domain/AvailabilityZone.java | 5 +++--
.../org/jclouds/openstack/cinder/v1/domain/Snapshot.java | 5 +++--
.../cinder/v1/domain/SnapshotExtendedAttributes.java | 5 +++--
.../java/org/jclouds/openstack/cinder/v1/domain/Volume.java | 5 +++--
.../openstack/cinder/v1/domain/VolumeAttachment.java | 5 +++--
.../org/jclouds/openstack/cinder/v1/domain/VolumeQuota.java | 5 +++--
.../org/jclouds/openstack/cinder/v1/domain/VolumeType.java | 5 +++--
.../org/jclouds/openstack/cinder/v1/domain/ZoneState.java | 5 +++--
.../openstack/cinder/v1/options/CreateSnapshotOptions.java | 4 ++--
.../openstack/cinder/v1/options/CreateVolumeOptions.java | 4 ++--
.../org/jclouds/openstack/keystone/v2_0/domain/Access.java | 5 +++--
.../keystone/v2_0/domain/ApiAccessKeyCredentials.java | 5 +++--
.../jclouds/openstack/keystone/v2_0/domain/ApiMetadata.java | 2 +-
.../jclouds/openstack/keystone/v2_0/domain/Endpoint.java | 5 +++--
.../jclouds/openstack/keystone/v2_0/domain/MediaType.java | 5 +++--
.../openstack/keystone/v2_0/domain/PasswordCredentials.java | 5 +++--
.../org/jclouds/openstack/keystone/v2_0/domain/Role.java | 5 +++--
.../org/jclouds/openstack/keystone/v2_0/domain/Service.java | 5 +++--
.../org/jclouds/openstack/keystone/v2_0/domain/Tenant.java | 5 +++--
.../org/jclouds/openstack/keystone/v2_0/domain/Token.java | 5 +++--
.../org/jclouds/openstack/keystone/v2_0/domain/User.java | 5 +++--
.../keystone/v2_0/options/CreateTenantOptions.java | 5 +++--
.../openstack/keystone/v2_0/options/CreateUserOptions.java | 5 +++--
.../keystone/v2_0/options/UpdateTenantOptions.java | 5 +++--
.../openstack/keystone/v2_0/options/UpdateUserOptions.java | 5 +++--
.../java/org/jclouds/openstack/v2_0/domain/Extension.java | 2 +-
.../main/java/org/jclouds/openstack/v2_0/domain/Limit.java | 2 +-
.../main/java/org/jclouds/openstack/v2_0/domain/Limits.java | 2 +-
.../main/java/org/jclouds/openstack/v2_0/domain/Link.java | 5 +++--
.../java/org/jclouds/openstack/v2_0/domain/RateLimit.java | 2 +-
.../java/org/jclouds/openstack/v2_0/domain/Resource.java | 5 +++--
.../nova/v2_0/compute/NovaComputeServiceAdapter.java | 4 ++--
.../compute/functions/AllocateAndAddFloatingIpToNode.java | 4 ++--
.../nova/v2_0/compute/functions/ImageInRegionToImage.java | 4 ++--
.../nova/v2_0/compute/functions/ImageToOperatingSystem.java | 4 ++--
.../functions/RemoveFloatingIpFromNodeAndDeallocate.java | 4 ++--
.../nova/v2_0/compute/options/NovaTemplateOptions.java | 2 +-
.../org/jclouds/openstack/nova/v2_0/domain/Address.java | 5 +++--
.../openstack/nova/v2_0/domain/BlockDeviceMapping.java | 5 +++--
.../org/jclouds/openstack/nova/v2_0/domain/Console.java | 4 ++--
.../org/jclouds/openstack/nova/v2_0/domain/FixedIP.java | 5 +++--
.../java/org/jclouds/openstack/nova/v2_0/domain/Flavor.java | 2 +-
.../org/jclouds/openstack/nova/v2_0/domain/FloatingIP.java | 5 +++--
.../jclouds/openstack/nova/v2_0/domain/FloatingIPPool.java | 5 +++--
.../java/org/jclouds/openstack/nova/v2_0/domain/Host.java | 5 +++--
.../jclouds/openstack/nova/v2_0/domain/HostAggregate.java | 5 +++--
.../openstack/nova/v2_0/domain/HostResourceUsage.java | 5 +++--
.../java/org/jclouds/openstack/nova/v2_0/domain/Image.java | 2 +-
.../org/jclouds/openstack/nova/v2_0/domain/Ingress.java | 5 +++--
.../openstack/nova/v2_0/domain/InterfaceAttachment.java | 5 +++--
.../org/jclouds/openstack/nova/v2_0/domain/KeyPair.java | 5 +++--
.../org/jclouds/openstack/nova/v2_0/domain/Network.java | 5 +++--
.../java/org/jclouds/openstack/nova/v2_0/domain/Quota.java | 5 +++--
.../jclouds/openstack/nova/v2_0/domain/SecurityGroup.java | 5 +++--
.../openstack/nova/v2_0/domain/SecurityGroupRule.java | 2 +-
.../java/org/jclouds/openstack/nova/v2_0/domain/Server.java | 2 +-
.../jclouds/openstack/nova/v2_0/domain/ServerCreated.java | 2 +-
.../nova/v2_0/domain/ServerExtendedAttributes.java | 5 +++--
.../openstack/nova/v2_0/domain/ServerExtendedStatus.java | 5 +++--
.../nova/v2_0/domain/ServerWithSecurityGroups.java | 2 +-
.../openstack/nova/v2_0/domain/SimpleServerUsage.java | 5 +++--
.../openstack/nova/v2_0/domain/SimpleTenantUsage.java | 5 +++--
.../jclouds/openstack/nova/v2_0/domain/TenantIdAndName.java | 5 +++--
.../openstack/nova/v2_0/domain/VirtualInterface.java | 5 +++--
.../java/org/jclouds/openstack/nova/v2_0/domain/Volume.java | 5 +++--
.../openstack/nova/v2_0/domain/VolumeAttachment.java | 5 +++--
.../jclouds/openstack/nova/v2_0/domain/VolumeSnapshot.java | 5 +++--
.../org/jclouds/openstack/nova/v2_0/domain/VolumeType.java | 5 +++--
.../nova/v2_0/domain/regionscoped/AvailabilityZone.java | 5 +++--
.../v2_0/domain/regionscoped/AvailabilityZoneDetails.java | 9 +++++----
.../nova/v2_0/domain/regionscoped/FlavorInRegion.java | 2 +-
.../nova/v2_0/domain/regionscoped/ImageInRegion.java | 2 +-
.../nova/v2_0/domain/regionscoped/RegionAndId.java | 5 +++--
.../nova/v2_0/domain/regionscoped/RegionAndName.java | 5 +++--
.../regionscoped/RegionSecurityGroupNameAndPorts.java | 2 +-
.../v2_0/domain/regionscoped/SecurityGroupInRegion.java | 2 +-
.../nova/v2_0/domain/regionscoped/ServerInRegion.java | 2 +-
.../openstack/nova/v2_0/domain/regionscoped/ZoneState.java | 5 +++--
.../nova/v2_0/domain/zonescoped/AvailabilityZone.java | 5 +++--
.../nova/v2_0/domain/zonescoped/RegionAndName.java | 5 +++--
.../domain/zonescoped/RegionSecurityGroupNameAndPorts.java | 2 +-
.../openstack/nova/v2_0/domain/zonescoped/ZoneState.java | 5 +++--
.../nova/v2_0/options/CreateBackupOfServerOptions.java | 4 ++--
.../openstack/nova/v2_0/options/CreateServerOptions.java | 7 ++++---
.../openstack/nova/v2_0/options/CreateVolumeOptions.java | 4 ++--
.../nova/v2_0/options/CreateVolumeSnapshotOptions.java | 4 ++--
.../nova/v2_0/options/CreateVolumeTypeOptions.java | 4 ++--
.../java/org/jclouds/openstack/swift/v1/domain/Account.java | 4 ++--
.../openstack/swift/v1/domain/BulkDeleteResponse.java | 4 ++--
.../org/jclouds/openstack/swift/v1/domain/Container.java | 4 ++--
.../openstack/swift/v1/domain/ExtractArchiveResponse.java | 4 ++--
.../java/org/jclouds/openstack/swift/v1/domain/Segment.java | 4 ++--
.../org/jclouds/openstack/swift/v1/domain/SwiftObject.java | 4 ++--
.../java/org/jclouds/openstack/trove/v1/domain/Flavor.java | 5 +++--
.../org/jclouds/openstack/trove/v1/domain/Instance.java | 5 +++--
.../java/org/jclouds/openstack/trove/v1/domain/User.java | 5 +++--
.../jclouds/rackspace/clouddns/v1/domain/CreateDomain.java | 5 +++--
.../rackspace/clouddns/v1/domain/CreateSubdomain.java | 5 +++--
.../org/jclouds/rackspace/clouddns/v1/domain/Domain.java | 5 +++--
.../jclouds/rackspace/clouddns/v1/domain/DomainChange.java | 7 ++++---
.../java/org/jclouds/rackspace/clouddns/v1/domain/Job.java | 2 +-
.../org/jclouds/rackspace/clouddns/v1/domain/Record.java | 4 ++--
.../jclouds/rackspace/clouddns/v1/domain/RecordDetail.java | 4 ++--
.../org/jclouds/rackspace/clouddns/v1/domain/Subdomain.java | 3 ++-
.../jclouds/rackspace/clouddns/v1/domain/UpdateDomain.java | 5 +++--
.../rackspace/cloudfiles/v1/domain/CDNContainer.java | 4 ++--
.../cloudidentity/v2_0/domain/ApiKeyCredentials.java | 2 +-
.../rackspace/cloudloadbalancers/v1/domain/AccessRule.java | 5 +++--
.../cloudloadbalancers/v1/domain/AccessRuleWithId.java | 5 +++--
.../cloudloadbalancers/v1/domain/AccountUsage.java | 3 ++-
.../rackspace/cloudloadbalancers/v1/domain/AddNode.java | 5 +++--
.../cloudloadbalancers/v1/domain/ConnectionThrottle.java | 5 +++--
.../cloudloadbalancers/v1/domain/CreateLoadBalancer.java | 6 +++---
.../cloudloadbalancers/v1/domain/HealthMonitor.java | 5 +++--
.../cloudloadbalancers/v1/domain/HistoricalUsage.java | 3 ++-
.../cloudloadbalancers/v1/domain/LoadBalancer.java | 5 +++--
.../cloudloadbalancers/v1/domain/LoadBalancerInfo.java | 3 ++-
.../cloudloadbalancers/v1/domain/LoadBalancerStats.java | 4 ++--
.../cloudloadbalancers/v1/domain/LoadBalancerUsage.java | 3 ++-
.../rackspace/cloudloadbalancers/v1/domain/Node.java | 5 +++--
.../rackspace/cloudloadbalancers/v1/domain/Protocol.java | 3 ++-
.../cloudloadbalancers/v1/domain/SSLTermination.java | 5 +++--
.../cloudloadbalancers/v1/domain/SourceAddresses.java | 5 +++--
.../cloudloadbalancers/v1/domain/UpdateLoadBalancer.java | 5 +++--
.../rackspace/cloudloadbalancers/v1/domain/UpdateNode.java | 5 +++--
.../rackspace/cloudloadbalancers/v1/domain/VirtualIP.java | 5 +++--
.../cloudloadbalancers/v1/domain/VirtualIPWithId.java | 5 +++--
.../v1/domain/internal/BaseLoadBalancer.java | 5 +++--
.../cloudloadbalancers/v1/domain/internal/BaseNode.java | 5 +++--
.../src/main/java/org/jclouds/route53/domain/Change.java | 2 +-
.../main/java/org/jclouds/route53/domain/ChangeBatch.java | 2 +-
.../main/java/org/jclouds/route53/domain/HostedZone.java | 2 +-
.../jclouds/route53/domain/HostedZoneAndNameServers.java | 2 +-
.../main/java/org/jclouds/route53/domain/NewHostedZone.java | 2 +-
.../java/org/jclouds/route53/domain/ResourceRecordSet.java | 4 ++--
.../jclouds/route53/domain/ResourceRecordSetIterable.java | 2 +-
.../src/main/java/org/jclouds/s3/domain/DeleteResult.java | 5 +++--
apis/sqs/src/main/java/org/jclouds/sqs/SQS.java | 4 ++--
.../src/main/java/org/jclouds/sqs/domain/BatchError.java | 3 ++-
.../src/main/java/org/jclouds/sqs/domain/BatchResult.java | 3 ++-
apis/sqs/src/main/java/org/jclouds/sqs/domain/Message.java | 3 ++-
.../main/java/org/jclouds/sqs/domain/MessageIdAndMD5.java | 3 ++-
.../main/java/org/jclouds/sqs/domain/QueueAttributes.java | 3 ++-
.../java/org/jclouds/sqs/options/CreateQueueOptions.java | 3 ++-
.../java/org/jclouds/sqs/options/ReceiveMessageOptions.java | 3 ++-
.../java/org/jclouds/sqs/options/SendMessageOptions.java | 3 ++-
.../java/org/jclouds/aws/domain/SessionCredentials.java | 3 ++-
apis/sts/src/main/java/org/jclouds/sts/domain/User.java | 3 ++-
.../org/jclouds/sts/domain/UserAndSessionCredentials.java | 3 ++-
.../java/org/jclouds/sts/options/AssumeRoleOptions.java | 3 ++-
.../java/org/jclouds/sts/options/FederatedUserOptions.java | 3 ++-
.../org/jclouds/sts/options/SessionCredentialsOptions.java | 3 ++-
.../jclouds/blobstore/domain/internal/BlobMetadataImpl.java | 2 +-
.../blobstore/domain/internal/MutableBlobMetadataImpl.java | 2 +-
.../domain/internal/MutableStorageMetadataImpl.java | 2 +-
.../blobstore/domain/internal/StorageMetadataImpl.java | 2 +-
.../jclouds/openstack/domain/AuthenticationResponse.java | 3 ++-
.../src/main/java/org/jclouds/openstack/domain/Link.java | 2 +-
.../main/java/org/jclouds/openstack/domain/Resource.java | 5 +++--
.../org/jclouds/openstack/keystone/v1_1/domain/Auth.java | 2 +-
.../jclouds/openstack/keystone/v1_1/domain/Endpoint.java | 2 +-
.../org/jclouds/openstack/keystone/v1_1/domain/Token.java | 2 +-
.../BlockUntilInitScriptStatusIsZeroThenReturnOutput.java | 3 ++-
.../jclouds/compute/callables/RunScriptOnNodeUsingSsh.java | 4 ++--
.../org/jclouds/compute/callables/SudoAwareInitManager.java | 4 ++--
.../compute/config/ComputeServiceAdapterContextModule.java | 2 +-
.../java/org/jclouds/compute/domain/CIMOperatingSystem.java | 2 +-
.../main/java/org/jclouds/compute/domain/ExecResponse.java | 3 ++-
.../java/org/jclouds/compute/domain/OperatingSystem.java | 5 +++--
.../src/main/java/org/jclouds/compute/domain/Processor.java | 5 +++--
.../main/java/org/jclouds/compute/domain/SecurityGroup.java | 2 +-
.../org/jclouds/compute/domain/TemplateBuilderSpec.java | 2 +-
.../compute/domain/internal/ComputeMetadataImpl.java | 5 +++--
.../org/jclouds/compute/domain/internal/HardwareImpl.java | 2 +-
.../java/org/jclouds/compute/domain/internal/ImageImpl.java | 2 +-
.../jclouds/compute/domain/internal/NodeMetadataImpl.java | 2 +-
.../compute/domain/internal/TemplateBuilderImpl.java | 6 +++---
.../org/jclouds/compute/domain/internal/TemplateImpl.java | 5 +++--
.../org/jclouds/compute/domain/internal/VolumeImpl.java | 5 +++--
.../java/org/jclouds/compute/events/StatementOnNode.java | 5 +++--
.../jclouds/compute/events/StatementOnNodeCompletion.java | 2 +-
.../org/jclouds/compute/events/StatementOnNodeFailure.java | 2 +-
.../java/org/jclouds/compute/options/RunScriptOptions.java | 5 +++--
.../java/org/jclouds/compute/options/TemplateOptions.java | 2 +-
.../strategy/InitializeRunScriptOnNodeOrPlaceInBadMap.java | 4 ++--
...ScriptOnNodeAndAddToGoodMapOrPutExceptionIntoBadMap.java | 4 ++--
.../CreateNodesWithGroupEncodedIntoNameThenAddToSet.java | 8 ++++----
.../strategy/impl/ReturnCredentialsBoundToImage.java | 4 ++--
.../src/main/java/org/jclouds/net/domain/IpPermission.java | 5 +++--
core/src/main/java/org/jclouds/ContextBuilder.java | 2 +-
.../java/org/jclouds/apis/internal/BaseApiMetadata.java | 5 +++--
.../java/org/jclouds/collect/AdvanceUntilEmptyIterable.java | 3 ++-
core/src/main/java/org/jclouds/collect/PagedIterables.java | 3 ++-
.../main/java/org/jclouds/domain/internal/LocationImpl.java | 5 +++--
.../domain/internal/MutableResourceMetadataImpl.java | 5 +++--
.../org/jclouds/domain/internal/ResourceMetadataImpl.java | 5 +++--
core/src/main/java/org/jclouds/http/HttpMessage.java | 5 +++--
core/src/main/java/org/jclouds/http/HttpRequest.java | 5 +++--
core/src/main/java/org/jclouds/http/HttpResponse.java | 5 +++--
.../org/jclouds/http/options/BaseHttpRequestOptions.java | 4 ++--
core/src/main/java/org/jclouds/internal/BaseView.java | 5 +++--
core/src/main/java/org/jclouds/internal/ContextImpl.java | 2 +-
...alizationConstructorAndReflectiveTypeAdapterFactory.java | 3 ++-
.../json/internal/NullFilteringTypeAdapterFactories.java | 2 +-
.../jclouds/providers/internal/BaseProviderMetadata.java | 5 +++--
.../java/org/jclouds/proxy/internal/GuiceProxyConfig.java | 4 ++--
.../main/java/org/jclouds/reflect/InvocationSuccess.java | 5 +++--
core/src/main/java/org/jclouds/reflect/Reflection2.java | 5 +++--
.../java/org/jclouds/rest/internal/BaseHttpApiMetadata.java | 2 +-
.../rest/internal/DelegatesToInvocationFunction.java | 4 ++--
.../java/org/jclouds/rest/internal/InvokeHttpMethod.java | 5 +++--
.../org/jclouds/rest/internal/RestAnnotationProcessor.java | 4 ++--
...etryOnTimeOutButNotOnAuthorizationExceptionSupplier.java | 6 +++---
.../org/jclouds/rest/suppliers/URIFromStringSupplier.java | 4 ++--
core/src/main/java/org/jclouds/util/Suppliers2.java | 6 +++---
.../main/java/org/jclouds/ssh/jsch/SessionConnection.java | 3 ++-
.../src/main/java/org/jclouds/sshj/SSHClientConnection.java | 3 ++-
.../org/jclouds/aws/ec2/compute/AWSEC2TemplateOptions.java | 2 +-
.../java/org/jclouds/aws/ec2/domain/AWSRunningInstance.java | 4 ++--
.../org/jclouds/aws/ec2/domain/LaunchSpecification.java | 2 +-
.../compute/options/DigitalOcean2TemplateOptions.java | 2 +-
.../org/jclouds/dynect/v3/domain/CreatePrimaryZone.java | 2 +-
.../java/org/jclouds/dynect/v3/domain/CreateRecord.java | 2 +-
.../java/org/jclouds/dynect/v3/domain/GeoRegionGroup.java | 2 +-
.../main/java/org/jclouds/dynect/v3/domain/GeoService.java | 2 +-
.../src/main/java/org/jclouds/dynect/v3/domain/Job.java | 2 +-
.../src/main/java/org/jclouds/dynect/v3/domain/Node.java | 3 ++-
.../src/main/java/org/jclouds/dynect/v3/domain/Record.java | 2 +-
.../main/java/org/jclouds/dynect/v3/domain/RecordId.java | 4 ++--
.../main/java/org/jclouds/dynect/v3/domain/RecordSet.java | 2 +-
.../main/java/org/jclouds/dynect/v3/domain/SOARecord.java | 2 +-
.../src/main/java/org/jclouds/dynect/v3/domain/Session.java | 3 ++-
.../org/jclouds/dynect/v3/domain/SessionCredentials.java | 3 ++-
.../src/main/java/org/jclouds/dynect/v3/domain/Zone.java | 2 +-
.../glesys/compute/options/GleSYSTemplateOptions.java | 2 +-
.../java/org/jclouds/glesys/domain/AllowedArguments.java | 5 +++--
.../glesys/domain/AllowedArgumentsForCreateServer.java | 5 +++--
.../src/main/java/org/jclouds/glesys/domain/Archive.java | 5 +++--
.../org/jclouds/glesys/domain/ArchiveAllowedArguments.java | 5 +++--
.../src/main/java/org/jclouds/glesys/domain/Console.java | 5 +++--
.../src/main/java/org/jclouds/glesys/domain/Cost.java | 5 +++--
.../src/main/java/org/jclouds/glesys/domain/Domain.java | 5 +++--
.../main/java/org/jclouds/glesys/domain/DomainRecord.java | 5 +++--
.../main/java/org/jclouds/glesys/domain/EmailAccount.java | 5 +++--
.../src/main/java/org/jclouds/glesys/domain/EmailAlias.java | 5 +++--
.../main/java/org/jclouds/glesys/domain/EmailOverview.java | 5 +++--
.../java/org/jclouds/glesys/domain/EmailOverviewDomain.java | 5 +++--
.../org/jclouds/glesys/domain/EmailOverviewSummary.java | 5 +++--
.../src/main/java/org/jclouds/glesys/domain/EmailQuota.java | 5 +++--
.../glesys/src/main/java/org/jclouds/glesys/domain/Ip.java | 5 +++--
.../src/main/java/org/jclouds/glesys/domain/IpDetails.java | 5 +++--
.../src/main/java/org/jclouds/glesys/domain/OSTemplate.java | 5 +++--
.../main/java/org/jclouds/glesys/domain/ResourceStatus.java | 5 +++--
.../main/java/org/jclouds/glesys/domain/ResourceUsage.java | 5 +++--
.../java/org/jclouds/glesys/domain/ResourceUsageInfo.java | 5 +++--
.../java/org/jclouds/glesys/domain/ResourceUsageValue.java | 5 +++--
.../src/main/java/org/jclouds/glesys/domain/Server.java | 5 +++--
.../main/java/org/jclouds/glesys/domain/ServerDetails.java | 2 +-
.../main/java/org/jclouds/glesys/domain/ServerLimit.java | 5 +++--
.../src/main/java/org/jclouds/glesys/domain/ServerSpec.java | 5 +++--
.../main/java/org/jclouds/glesys/domain/ServerStatus.java | 5 +++--
.../main/java/org/jclouds/glesys/domain/ServerUptime.java | 5 +++--
.../org/jclouds/glesys/options/CreateServerOptions.java | 2 +-
.../main/java/org/jclouds/gogrid/domain/BillingToken.java | 5 +++--
.../src/main/java/org/jclouds/gogrid/domain/Customer.java | 5 +++--
.../gogrid/src/main/java/org/jclouds/gogrid/domain/Ip.java | 5 +++--
.../src/main/java/org/jclouds/gogrid/domain/IpPortPair.java | 5 +++--
.../gogrid/src/main/java/org/jclouds/gogrid/domain/Job.java | 5 +++--
.../main/java/org/jclouds/gogrid/domain/JobProperties.java | 5 +++--
.../main/java/org/jclouds/gogrid/domain/LoadBalancer.java | 5 +++--
.../src/main/java/org/jclouds/gogrid/domain/Option.java | 5 +++--
.../src/main/java/org/jclouds/gogrid/domain/Server.java | 5 +++--
.../main/java/org/jclouds/gogrid/domain/ServerImage.java | 5 +++--
.../org/jclouds/gogrid/domain/internal/ErrorResponse.java | 5 +++--
.../googlecloudstorage/domain/templates/ObjectTemplate.java | 4 ++--
.../compute/GoogleComputeEngineTemplateBuilderLiveTest.java | 2 +-
.../packet/compute/options/PacketTemplateOptions.java | 2 +-
.../config/SoftLayerComputeServiceContextModule.java | 4 ++--
.../src/main/java/org/jclouds/softlayer/domain/Address.java | 3 ++-
.../domain/ContainerVirtualGuestConfiguration.java | 3 ++-
.../domain/ContainerVirtualGuestConfigurationOption.java | 3 ++-
.../main/java/org/jclouds/softlayer/domain/Datacenter.java | 3 ++-
.../main/java/org/jclouds/softlayer/domain/NetworkVlan.java | 3 ++-
.../java/org/jclouds/softlayer/domain/OperatingSystem.java | 3 ++-
.../main/java/org/jclouds/softlayer/domain/Password.java | 3 ++-
.../main/java/org/jclouds/softlayer/domain/PowerState.java | 5 +++--
.../main/java/org/jclouds/softlayer/domain/ProductItem.java | 3 ++-
.../java/org/jclouds/softlayer/domain/ProductItemPrice.java | 3 ++-
.../src/main/java/org/jclouds/softlayer/domain/Region.java | 3 ++-
.../java/org/jclouds/softlayer/domain/SecuritySshKey.java | 3 ++-
.../org/jclouds/softlayer/domain/SoftwareDescription.java | 3 ++-
.../java/org/jclouds/softlayer/domain/SoftwareLicense.java | 3 ++-
.../src/main/java/org/jclouds/softlayer/domain/Tag.java | 3 ++-
.../java/org/jclouds/softlayer/domain/TagReference.java | 3 ++-
.../src/main/java/org/jclouds/softlayer/domain/TagType.java | 3 ++-
.../java/org/jclouds/softlayer/domain/VirtualDiskImage.java | 3 ++-
.../jclouds/softlayer/domain/VirtualDiskImageSoftware.java | 3 ++-
.../java/org/jclouds/softlayer/domain/VirtualGuest.java | 3 ++-
.../org/jclouds/softlayer/domain/VirtualGuestAttribute.java | 3 ++-
.../jclouds/softlayer/domain/VirtualGuestBlockDevice.java | 3 ++-
.../softlayer/domain/VirtualGuestBlockDeviceTemplate.java | 3 ++-
.../domain/VirtualGuestBlockDeviceTemplateGroup.java | 3 ++-
.../softlayer/domain/VirtualGuestNetworkComponent.java | 3 ++-
.../org/jclouds/ultradns/ws/domain/AccountLevelGroup.java | 3 ++-
.../org/jclouds/ultradns/ws/domain/DirectionalGroup.java | 2 +-
.../ultradns/ws/domain/DirectionalGroupCoordinates.java | 2 +-
.../org/jclouds/ultradns/ws/domain/DirectionalPool.java | 3 ++-
.../jclouds/ultradns/ws/domain/DirectionalPoolRecord.java | 2 +-
.../ultradns/ws/domain/DirectionalPoolRecordDetail.java | 2 +-
.../main/java/org/jclouds/ultradns/ws/domain/IdAndName.java | 3 ++-
.../java/org/jclouds/ultradns/ws/domain/PoolRecordSpec.java | 2 +-
.../java/org/jclouds/ultradns/ws/domain/ResourceRecord.java | 2 +-
.../jclouds/ultradns/ws/domain/ResourceRecordDetail.java | 2 +-
.../java/org/jclouds/ultradns/ws/domain/RoundRobinPool.java | 3 ++-
.../src/main/java/org/jclouds/ultradns/ws/domain/Task.java | 3 ++-
.../jclouds/ultradns/ws/domain/TrafficControllerPool.java | 3 ++-
.../ultradns/ws/domain/TrafficControllerPoolRecord.java | 2 +-
.../ws/domain/TrafficControllerPoolRecordDetail.java | 3 ++-
.../org/jclouds/ultradns/ws/domain/UpdatePoolRecord.java | 2 +-
.../src/main/java/org/jclouds/ultradns/ws/domain/Zone.java | 3 ++-
.../java/org/jclouds/ultradns/ws/domain/ZoneProperties.java | 3 ++-
.../src/main/java/org/jclouds/scriptbuilder/InitScript.java | 2 +-
.../org/jclouds/scriptbuilder/domain/GitRepoAndRef.java | 3 ++-
.../java/org/jclouds/scriptbuilder/domain/chef/DataBag.java | 3 ++-
.../java/org/jclouds/scriptbuilder/domain/chef/Role.java | 3 ++-
.../jclouds/scriptbuilder/statements/git/CloneGitRepo.java | 3 ++-
.../statements/login/AdminAccessBuilderSpec.java | 2 +-
.../org/jclouds/scriptbuilder/statements/login/UserAdd.java | 3 ++-
.../src/main/java/org/jclouds/servermanager/Datacenter.java | 3 ++-
.../src/main/java/org/jclouds/servermanager/Hardware.java | 3 ++-
.../src/main/java/org/jclouds/servermanager/Image.java | 3 ++-
.../src/main/java/org/jclouds/servermanager/Server.java | 3 ++-
410 files changed, 953 insertions(+), 667 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/byon/src/main/java/org/jclouds/byon/Node.java
----------------------------------------------------------------------
diff --git a/apis/byon/src/main/java/org/jclouds/byon/Node.java b/apis/byon/src/main/java/org/jclouds/byon/Node.java
index 814b854..61bf0b3 100644
--- a/apis/byon/src/main/java/org/jclouds/byon/Node.java
+++ b/apis/byon/src/main/java/org/jclouds/byon/Node.java
@@ -20,6 +20,7 @@ import java.net.URI;
import java.util.Map;
import java.util.Set;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
@@ -299,7 +300,7 @@ public class Node {
@Override
public String toString() {
- return Objects.toStringHelper(this).add("id", id).add("name", name).add("description", description)
+ return MoreObjects.toStringHelper(this).add("id", id).add("name", name).add("description", description)
.add("locationId", locationId).add("hostname", hostname).add("osArch", osArch).add("osFamily", osFamily)
.add("osDescription", osDescription).add("osVersion", osVersion).add("os64Bit", os64Bit)
.add("group", group).add("loginPort", loginPort).add("tags", tags).add("metadata", metadata)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/chef/src/main/java/org/jclouds/chef/suppliers/ChefVersionSupplier.java
----------------------------------------------------------------------
diff --git a/apis/chef/src/main/java/org/jclouds/chef/suppliers/ChefVersionSupplier.java b/apis/chef/src/main/java/org/jclouds/chef/suppliers/ChefVersionSupplier.java
index a0d8b04..f1e1820 100644
--- a/apis/chef/src/main/java/org/jclouds/chef/suppliers/ChefVersionSupplier.java
+++ b/apis/chef/src/main/java/org/jclouds/chef/suppliers/ChefVersionSupplier.java
@@ -16,7 +16,7 @@
*/
package org.jclouds.chef.suppliers;
-import static com.google.common.base.Objects.firstNonNull;
+import static com.google.common.base.MoreObjects.firstNonNull;
import static com.google.common.base.Preconditions.checkNotNull;
import java.util.regex.Matcher;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/config/CloudStackComputeServiceContextModule.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/config/CloudStackComputeServiceContextModule.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/config/CloudStackComputeServiceContextModule.java
index f46937d..11f00c8 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/config/CloudStackComputeServiceContextModule.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/config/CloudStackComputeServiceContextModule.java
@@ -88,7 +88,7 @@ import org.jclouds.rest.AuthorizationException;
import org.jclouds.rest.suppliers.MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier;
import com.google.common.base.Function;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Predicate;
import com.google.common.base.Supplier;
import com.google.common.cache.CacheBuilder;
@@ -177,7 +177,7 @@ public class CloudStackComputeServiceContextModule extends
}
@Override
public String toString() {
- return Objects.toStringHelper(client.getGuestOSApi()).add("method", "listOSCategories").toString();
+ return MoreObjects.toStringHelper(client.getGuestOSApi()).add("method", "listOSCategories").toString();
}
}, seconds, TimeUnit.SECONDS);
}
@@ -202,7 +202,7 @@ public class CloudStackComputeServiceContextModule extends
}
@Override
public String toString() {
- return Objects.toStringHelper(client.getGuestOSApi()).add("method", "listOSTypes").toString();
+ return MoreObjects.toStringHelper(client.getGuestOSApi()).add("method", "listOSTypes").toString();
}
}, seconds, TimeUnit.SECONDS);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/options/CloudStackTemplateOptions.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/options/CloudStackTemplateOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/options/CloudStackTemplateOptions.java
index baa2e2e..2faed88 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/options/CloudStackTemplateOptions.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/options/CloudStackTemplateOptions.java
@@ -29,6 +29,7 @@ import org.jclouds.domain.LoginCredentials;
import org.jclouds.scriptbuilder.domain.Statement;
import com.google.common.base.Charsets;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
@@ -240,7 +241,7 @@ public class CloudStackTemplateOptions extends TemplateOptions implements Clonea
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("securityGroupIds", securityGroupIds)
.add("ipsToNetworks", ipsToNetworks)
.add("ipOnDefaultNetwork", ipOnDefaultNetwork)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Account.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Account.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Account.java
index 761003d..37ff133 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Account.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Account.java
@@ -26,8 +26,9 @@ 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.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ForwardingSet;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
@@ -776,7 +777,7 @@ public class Account extends ForwardingSet<User> {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id).add("type", type).add("networkDomain", networkDomain).add("domain", domain).add("domainId", domainId).add("IPsAvailable", IPsAvailable).add("IPLimit", IPLimit).add("IPs", IPs).add("cleanupRequired", cleanupRequired).add("name", name).add("receivedBytes", receivedBytes).add("sentBytes", sentBytes).add("snapshotsAvailable", snapshotsAvailable).add("snapshotLimit", snapshotLimit).add("snapshots", snapshots).add("state", state).add("templatesAvailable", templatesAvailable).add("templateLimit", templateLimit).add("templates", templates).add("VMsAvailable", VMsAvailable).add("VMLimit", VMLimit).add("VMsRunning", VMsRunning).add("VMsStopped", VMsStopped).add("VMs", VMs).add("volumesAvailable", volumesAvailable).add("volumeLimit", volumeLimit).add("volumes", volumes).add("users", users);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Alert.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Alert.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Alert.java
index 70ba897..c03d8c1 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Alert.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Alert.java
@@ -23,8 +23,9 @@ import java.util.Date;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Represents an alert issued by Cloudstack
@@ -150,7 +151,7 @@ public class Alert {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id).add("description", description).add("sent", sent).add("type", type);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ApiKeyPair.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ApiKeyPair.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ApiKeyPair.java
index 17883a7..2a05d9f 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ApiKeyPair.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ApiKeyPair.java
@@ -20,8 +20,9 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Representation of the API keypair response
@@ -112,7 +113,7 @@ public class ApiKeyPair {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("apiKey", apiKey).add("secretKey", secretKey);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncCreateResponse.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncCreateResponse.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncCreateResponse.java
index 0df0546..4738777 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncCreateResponse.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncCreateResponse.java
@@ -20,8 +20,9 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Class AsyncCreateResponse
@@ -119,7 +120,7 @@ public class AsyncCreateResponse {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id).add("jobId", jobId);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncJob.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncJob.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncJob.java
index b82665c..51b9b5b 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncJob.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncJob.java
@@ -23,8 +23,9 @@ import java.util.Date;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Class AsyncJob
@@ -441,7 +442,7 @@ public class AsyncJob<S> {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("accountId", accountId).add("cmd", cmd).add("created", created).add("id", id).add("instanceId", instanceId)
.add("instanceType", instanceType).add("progress", progress).add("result", result).add("resultCode", resultCode)
.add("resultType", resultType).add("status", status).add("userId", userId).add("error", error);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncJobError.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncJobError.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncJobError.java
index 1805ec8..c328761 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncJobError.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncJobError.java
@@ -20,8 +20,9 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
public class AsyncJobError {
@@ -149,7 +150,7 @@ public class AsyncJobError {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("errorCode", errorCode).add("errorText", errorText);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Capabilities.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Capabilities.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Capabilities.java
index faabfc1..bd80f36 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Capabilities.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Capabilities.java
@@ -20,8 +20,9 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Class Capabilities
@@ -175,7 +176,7 @@ public class Capabilities {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("cloudStackVersion", cloudStackVersion).add("securityGroupsEnabled", securityGroupsEnabled).add("canShareTemplates", canShareTemplates).add("firewallRuleUiEnabled", firewallRuleUiEnabled).add("supportELB", supportELB);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Capacity.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Capacity.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Capacity.java
index fd12bef..baca2e1 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Capacity.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Capacity.java
@@ -24,8 +24,9 @@ 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.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.Maps;
@@ -266,7 +267,7 @@ public class Capacity implements Comparable<Capacity> {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("capacityTotal", capacityTotal).add("capacityUsed", capacityUsed).add("percentUsed", percentUsed)
.add("podId", podId).add("podName", podName).add("type", type).add("zoneId", zoneId).add("zoneName", zoneName);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Cluster.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Cluster.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Cluster.java
index d53ad6f..c651bf4 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Cluster.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Cluster.java
@@ -24,8 +24,9 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Represents a CloudStack Cluster.
@@ -284,7 +285,7 @@ public class Cluster implements Comparable<Cluster> {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id).add("allocationState", allocationState).add("clusterType", clusterType).add("hypervisor", hypervisor)
.add("managedState", managedState).add("name", name).add("podId", podId).add("podName", podName).add("zoneId", zoneId).add("zoneName", zoneName);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ConfigurationEntry.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ConfigurationEntry.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ConfigurationEntry.java
index a0526e3..6fe533f 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ConfigurationEntry.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ConfigurationEntry.java
@@ -22,8 +22,9 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Representation of the API configuration entry response
@@ -149,7 +150,7 @@ public class ConfigurationEntry implements Comparable<ConfigurationEntry> {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("category", category).add("description", description).add("name", name).add("value", value);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/DiskOffering.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/DiskOffering.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/DiskOffering.java
index 452457a..2132beb 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/DiskOffering.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/DiskOffering.java
@@ -24,8 +24,9 @@ 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.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
@@ -276,7 +277,7 @@ public class DiskOffering implements Comparable<DiskOffering> {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id).add("name", name).add("displayText", displayText).add("created", created).add("domain", domain)
.add("domainId", domainId).add("diskSize", diskSize).add("customized", customized).add("tags", tags);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Domain.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Domain.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Domain.java
index ca203b9..c60689e 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Domain.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Domain.java
@@ -22,8 +22,9 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Representation of the API domain response
@@ -202,7 +203,7 @@ public class Domain implements Comparable<Domain> {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id).add("hasChild", hasChild).add("level", level).add("name", name).add("networkDomain", networkDomain).add("parentDomainId", parentDomainId).add("parentDomainName", parentDomainName);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/EncryptedPasswordAndPrivateKey.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/EncryptedPasswordAndPrivateKey.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/EncryptedPasswordAndPrivateKey.java
index c0b4330..bb81cd1 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/EncryptedPasswordAndPrivateKey.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/EncryptedPasswordAndPrivateKey.java
@@ -20,6 +20,7 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
public final class EncryptedPasswordAndPrivateKey {
@@ -106,7 +107,7 @@ public final class EncryptedPasswordAndPrivateKey {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues()
+ return MoreObjects.toStringHelper(this).omitNullValues()
.add("encryptedPassword", encryptedPassword).add("privateKey", privateKey).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Event.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Event.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Event.java
index ef324b0..436db98 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Event.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Event.java
@@ -23,8 +23,9 @@ import java.util.Date;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Class Event
@@ -313,7 +314,7 @@ public class Event implements Comparable<Event> {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id).add("account", account).add("description", description).add("created", created)
.add("domain", domain).add("domainId", domainId).add("level", level).add("parentId", parentId)
.add("state", state).add("type", type).add("username", username);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/FirewallRule.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/FirewallRule.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/FirewallRule.java
index 144f232..7b9803d 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/FirewallRule.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/FirewallRule.java
@@ -24,8 +24,9 @@ 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.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
@@ -341,7 +342,7 @@ public class FirewallRule implements Comparable<FirewallRule> {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id).add("CIDRs", CIDRs).add("startPort", startPort).add("endPort", endPort).add("icmpCode", icmpCode)
.add("icmpType", icmpType).add("ipAddress", ipAddress).add("ipAddressId", ipAddressId).add("protocol", protocol).add("state", state)
.add("tags", tags);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Host.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Host.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Host.java
index f6e26f9..9ebf04a 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Host.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Host.java
@@ -26,8 +26,9 @@ 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.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
@@ -930,7 +931,7 @@ public class Host implements Comparable<Host> {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id).add("allocationState", allocationState).add("averageLoad", averageLoad)
.add("capabilities", capabilities).add("clusterId", clusterId).add("clusterName", clusterName)
.add("clusterType", clusterType).add("cpuAllocated", cpuAllocated).add("cpuNumber", cpuNumber)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/IPForwardingRule.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/IPForwardingRule.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/IPForwardingRule.java
index 80c98b3..3f5e22b 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/IPForwardingRule.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/IPForwardingRule.java
@@ -23,8 +23,9 @@ 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.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
@@ -402,7 +403,7 @@ public class IPForwardingRule implements Comparable<IPForwardingRule> {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id).add("IPAddress", IPAddress).add("IPAddressId", IPAddressId).add("startPort", startPort)
.add("protocol", protocol).add("endPort", endPort).add("state", state).add("virtualMachineDisplayName", virtualMachineDisplayName)
.add("virtualMachineId", virtualMachineId).add("virtualMachineName", virtualMachineName).add("publicPort", publicPort)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISO.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISO.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISO.java
index 3a4226f..e4e8ccf 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISO.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISO.java
@@ -25,8 +25,9 @@ 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.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Class ISO
@@ -776,7 +777,7 @@ public class ISO {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id).add("account", account).add("accountId", accountId).add("bootable", bootable)
.add("checksum", checksum).add("created", created).add("crossZones", crossZones).add("displayText", displayText)
.add("domain", domain).add("domainid", domainid).add("format", format).add("hostId", hostId).add("hostName", hostName)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISOExtraction.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISOExtraction.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISOExtraction.java
index 0e6bb63..3144afc 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISOExtraction.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISOExtraction.java
@@ -23,8 +23,9 @@ import java.util.Date;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Class ISOExtraction
@@ -353,7 +354,7 @@ public class ISOExtraction {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.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/a493e2ca/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISOPermissions.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISOPermissions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISOPermissions.java
index 5a3b62e..5ecf1db 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISOPermissions.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISOPermissions.java
@@ -23,8 +23,9 @@ 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.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
@@ -165,7 +166,7 @@ public class ISOPermissions {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id).add("accounts", accounts).add("domainId", domainId).add("isPublic", isPublic);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/IngressRule.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/IngressRule.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/IngressRule.java
index d072a46..acc550e 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/IngressRule.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/IngressRule.java
@@ -23,8 +23,9 @@ 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.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
public class IngressRule implements Comparable<IngressRule> {
@@ -288,7 +289,7 @@ public class IngressRule implements Comparable<IngressRule> {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("account", account).add("CIDR", CIDR).add("endPort", endPort).add("ICMPCode", ICMPCode)
.add("ICMPType", ICMPType).add("protocol", protocol).add("id", id).add("securityGroupName", securityGroupName).add("startPort", startPort)
.add("tags", tags);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/JobResult.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/JobResult.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/JobResult.java
index 1c0b1d9..0ad9e41 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/JobResult.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/JobResult.java
@@ -20,8 +20,9 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* The result of an operation.
@@ -114,7 +115,7 @@ public class JobResult {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this).add("success", success).add("displayText", displayText);
+ return MoreObjects.toStringHelper(this).add("success", success).add("displayText", displayText);
}
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/LoadBalancerRule.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/LoadBalancerRule.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/LoadBalancerRule.java
index f30654f..0717385 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/LoadBalancerRule.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/LoadBalancerRule.java
@@ -24,8 +24,9 @@ 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.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
@@ -431,7 +432,7 @@ public class LoadBalancerRule {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id).add("account", account).add("algorithm", algorithm).add("description", description).add("domain", domain).add("domainId", domainId).add("name", name).add("privatePort", privatePort).add("publicIP", publicIP).add("publicIPId", publicIPId).add("publicPort", publicPort).add("state", state).add("CIDRs", CIDRs).add("zoneId", zoneId);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/LoginResponse.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/LoginResponse.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/LoginResponse.java
index be6aacf..82b7154 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/LoginResponse.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/LoginResponse.java
@@ -20,8 +20,9 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Representation of the login API call response
@@ -326,7 +327,7 @@ public class LoginResponse {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("username", username).add("userId", userId).add("password", password).add("domainId", domainId).add("timeout", timeout).add("registered", registered).add("accountName", accountName).add("firstName", firstName).add("lastName", lastName).add("accountType", accountType).add("timezone", timezone).add("timezoneOffset", timezoneOffset).add("sessionKey", sessionKey).add("jSessionId", jSessionId);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NIC.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NIC.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NIC.java
index 4c38e1d..4e6adbb 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NIC.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NIC.java
@@ -23,8 +23,9 @@ import java.net.URI;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Class NIC
@@ -310,7 +311,7 @@ public class NIC {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id).add("broadcastURI", broadcastURI).add("gateway", gateway).add("IPAddress", IPAddress)
.add("isDefault", isDefault).add("isolationURI", isolationURI).add("netmask", netmask).add("macAddress", macAddress)
.add("networkId", networkId).add("trafficType", trafficType).add("guestIPType", guestIPType);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Network.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Network.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Network.java
index 7471322..3b7a64b 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Network.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Network.java
@@ -25,8 +25,9 @@ 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.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.ImmutableSortedSet;
@@ -723,7 +724,7 @@ public class Network {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id).add("account", account).add("broadcastDomainType", broadcastDomainType).add("broadcastURI", broadcastURI)
.add("displayText", displayText).add("DNS1", dns1).add("dns2", dns2).add("domain", domain).add("domainId", domainId)
.add("endIP", endIP).add("gateway", gateway).add("isDefault", isDefault).add("isShared", isShared).add("isSystem", isSystem)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkOffering.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkOffering.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkOffering.java
index 509fcc1..f8f730e 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkOffering.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkOffering.java
@@ -24,8 +24,9 @@ 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.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
@@ -338,7 +339,7 @@ public class NetworkOffering implements Comparable<NetworkOffering> {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id).add("name", name).add("displayText", displayText).add("created", created).add("availability", availability).add("maxConnections", maxConnections).add("isDefault", isDefault).add("supportsVLAN", supportsVLAN).add("trafficType", trafficType).add("guestIPType", guestIPType).add("networkRate", networkRate).add("tags", tags);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkService.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkService.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkService.java
index f6820da..b3ba390 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkService.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkService.java
@@ -24,8 +24,9 @@ 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.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.ImmutableSortedMap;
import com.google.common.collect.ImmutableSortedSet;
@@ -122,7 +123,7 @@ public class NetworkService implements Comparable<NetworkService> {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("name", name).add("value", value);
}
@@ -226,7 +227,7 @@ public class NetworkService implements Comparable<NetworkService> {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this).add("name", name).add("capabilities", capabilities);
+ return MoreObjects.toStringHelper(this).add("name", name).add("capabilities", capabilities);
}
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/OSType.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/OSType.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/OSType.java
index 447f4ef..8c2b4b9 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/OSType.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/OSType.java
@@ -22,8 +22,9 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Class OSType
@@ -140,7 +141,7 @@ public class OSType implements Comparable<OSType> {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this).add("id", id).add("OSCategoryId", OSCategoryId).add("description", description);
+ return MoreObjects.toStringHelper(this).add("id", id).add("OSCategoryId", OSCategoryId).add("description", description);
}
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/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 0019c6d..de4ac76 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,8 +22,9 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Represents a Pod in CloudStack.
@@ -266,7 +267,7 @@ public class Pod implements Comparable<Pod> {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.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/a493e2ca/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 b246c7d..7126111 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,8 +24,9 @@ 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.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
@@ -437,7 +438,7 @@ public class PortForwardingRule implements Comparable<PortForwardingRule> {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.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/a493e2ca/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 7744f74..6e44660 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,8 +25,9 @@ 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.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Representation of the API project response
@@ -248,7 +249,7 @@ public class Project implements Comparable<Project> {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this).omitNullValues()
+ return MoreObjects.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/a493e2ca/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 666d80f..a30f532 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,8 +26,9 @@ 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.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Class PublicIPAddress
@@ -576,7 +577,7 @@ public class PublicIPAddress {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.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/a493e2ca/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 3e1b2ec..3add3f2 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,8 +24,9 @@ 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.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.Maps;
@@ -258,7 +259,7 @@ public class ResourceLimit {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.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/a493e2ca/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 04ba26c..6584910 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,8 +23,9 @@ 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.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.ImmutableSortedSet;
@@ -296,7 +297,7 @@ public class SecurityGroup implements Comparable<SecurityGroup> {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this).add("id", id).add("account", account).add("name", name).add("description", description)
+ return MoreObjects.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/a493e2ca/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 4979f2c..16b5bb5 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,8 +24,9 @@ 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.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
@@ -435,7 +436,7 @@ public class ServiceOffering implements Comparable<ServiceOffering> {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.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/a493e2ca/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 1bc9795..39dac9e 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,8 +26,9 @@ 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.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Class Snapshot
@@ -453,7 +454,7 @@ public class Snapshot {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.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/a493e2ca/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 cab2592..84b6644 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,8 +22,9 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Class SnapshotPolicy
@@ -203,7 +204,7 @@ public class SnapshotPolicy {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id).add("interval", interval).add("numberToRetain", numberToRetain).add("schedule", schedule).add("timezone", timezone)
.add("volumeId", volumeId);
}
[3/9] jclouds git commit: JCLOUDS-1225: Address Guava 18 Objects
changes
Posted by ga...@apache.org.
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/compute/src/main/java/org/jclouds/compute/domain/CIMOperatingSystem.java
----------------------------------------------------------------------
diff --git a/compute/src/main/java/org/jclouds/compute/domain/CIMOperatingSystem.java b/compute/src/main/java/org/jclouds/compute/domain/CIMOperatingSystem.java
index b743a71..fefa100 100644
--- a/compute/src/main/java/org/jclouds/compute/domain/CIMOperatingSystem.java
+++ b/compute/src/main/java/org/jclouds/compute/domain/CIMOperatingSystem.java
@@ -21,7 +21,7 @@ import org.jclouds.javax.annotation.Nullable;
import org.jclouds.ovf.Envelope;
import com.google.common.annotations.Beta;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Operating system based on DMTF CIM model.
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/compute/src/main/java/org/jclouds/compute/domain/ExecResponse.java
----------------------------------------------------------------------
diff --git a/compute/src/main/java/org/jclouds/compute/domain/ExecResponse.java b/compute/src/main/java/org/jclouds/compute/domain/ExecResponse.java
index b74729b..6cd47bc 100644
--- a/compute/src/main/java/org/jclouds/compute/domain/ExecResponse.java
+++ b/compute/src/main/java/org/jclouds/compute/domain/ExecResponse.java
@@ -18,6 +18,7 @@ package org.jclouds.compute.domain;
import org.jclouds.compute.config.CustomizationResponse;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
public class ExecResponse implements CustomizationResponse {
@@ -64,7 +65,7 @@ public class ExecResponse implements CustomizationResponse {
@Override
public String toString() {
- return Objects.toStringHelper("").add("output", output).add("error", error).add("exitStatus", exitStatus)
+ return MoreObjects.toStringHelper("").add("output", output).add("error", error).add("exitStatus", exitStatus)
.toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/compute/src/main/java/org/jclouds/compute/domain/OperatingSystem.java
----------------------------------------------------------------------
diff --git a/compute/src/main/java/org/jclouds/compute/domain/OperatingSystem.java b/compute/src/main/java/org/jclouds/compute/domain/OperatingSystem.java
index 64fab3d..a03161f 100644
--- a/compute/src/main/java/org/jclouds/compute/domain/OperatingSystem.java
+++ b/compute/src/main/java/org/jclouds/compute/domain/OperatingSystem.java
@@ -22,8 +22,9 @@ import static com.google.common.base.Preconditions.checkNotNull;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.annotations.Beta;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Running Operating system
@@ -117,7 +118,7 @@ public class OperatingSystem {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("").omitNullValues().add("family", family).add("name", name).add("arch", arch)
+ return MoreObjects.toStringHelper("").omitNullValues().add("family", family).add("name", name).add("arch", arch)
.add("version", version).add("description", description).add("is64Bit", is64Bit);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/compute/src/main/java/org/jclouds/compute/domain/Processor.java
----------------------------------------------------------------------
diff --git a/compute/src/main/java/org/jclouds/compute/domain/Processor.java b/compute/src/main/java/org/jclouds/compute/domain/Processor.java
index 932e635..67a57f2 100644
--- a/compute/src/main/java/org/jclouds/compute/domain/Processor.java
+++ b/compute/src/main/java/org/jclouds/compute/domain/Processor.java
@@ -18,8 +18,9 @@ package org.jclouds.compute.domain;
import static com.google.common.base.Objects.equal;
+import com.google.common.base.MoreObjects;
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.ComparisonChain;
/**
@@ -80,7 +81,7 @@ public class Processor implements Comparable<Processor> {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("").omitNullValues().add("cores", cores).add("speed", speed);
+ return MoreObjects.toStringHelper("").omitNullValues().add("cores", cores).add("speed", speed);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/compute/src/main/java/org/jclouds/compute/domain/SecurityGroup.java
----------------------------------------------------------------------
diff --git a/compute/src/main/java/org/jclouds/compute/domain/SecurityGroup.java b/compute/src/main/java/org/jclouds/compute/domain/SecurityGroup.java
index 5f3a7ef..7170f27 100644
--- a/compute/src/main/java/org/jclouds/compute/domain/SecurityGroup.java
+++ b/compute/src/main/java/org/jclouds/compute/domain/SecurityGroup.java
@@ -27,7 +27,7 @@ import org.jclouds.domain.Location;
import org.jclouds.javax.annotation.Nullable;
import org.jclouds.net.domain.IpPermission;
-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/blob/a493e2ca/compute/src/main/java/org/jclouds/compute/domain/TemplateBuilderSpec.java
----------------------------------------------------------------------
diff --git a/compute/src/main/java/org/jclouds/compute/domain/TemplateBuilderSpec.java b/compute/src/main/java/org/jclouds/compute/domain/TemplateBuilderSpec.java
index d00cb3b..f1f8488 100644
--- a/compute/src/main/java/org/jclouds/compute/domain/TemplateBuilderSpec.java
+++ b/compute/src/main/java/org/jclouds/compute/domain/TemplateBuilderSpec.java
@@ -17,7 +17,7 @@
package org.jclouds.compute.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkArgument;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/compute/src/main/java/org/jclouds/compute/domain/internal/ComputeMetadataImpl.java
----------------------------------------------------------------------
diff --git a/compute/src/main/java/org/jclouds/compute/domain/internal/ComputeMetadataImpl.java b/compute/src/main/java/org/jclouds/compute/domain/internal/ComputeMetadataImpl.java
index 21fa298..a9adbad 100644
--- a/compute/src/main/java/org/jclouds/compute/domain/internal/ComputeMetadataImpl.java
+++ b/compute/src/main/java/org/jclouds/compute/domain/internal/ComputeMetadataImpl.java
@@ -31,8 +31,9 @@ import org.jclouds.domain.Location;
import org.jclouds.domain.ResourceMetadata;
import org.jclouds.domain.internal.ResourceMetadataImpl;
+import com.google.common.base.MoreObjects;
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 ComputeMetadataImpl extends ResourceMetadataImpl<ComputeType> implements ComputeMetadata {
@@ -106,7 +107,7 @@ public class ComputeMetadataImpl extends ResourceMetadataImpl<ComputeType> imple
}
protected ToStringHelper computeToStringPrefix() {
- return Objects.toStringHelper("").omitNullValues().add("id", getId()).add("providerId", getProviderId())
+ return MoreObjects.toStringHelper("").omitNullValues().add("id", getId()).add("providerId", getProviderId())
.add("uri", getUri()).add("name", getName()).add("uri", getUri()).add("location", getLocation());
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/compute/src/main/java/org/jclouds/compute/domain/internal/HardwareImpl.java
----------------------------------------------------------------------
diff --git a/compute/src/main/java/org/jclouds/compute/domain/internal/HardwareImpl.java b/compute/src/main/java/org/jclouds/compute/domain/internal/HardwareImpl.java
index 2753cf7..490f035 100644
--- a/compute/src/main/java/org/jclouds/compute/domain/internal/HardwareImpl.java
+++ b/compute/src/main/java/org/jclouds/compute/domain/internal/HardwareImpl.java
@@ -34,7 +34,7 @@ import org.jclouds.domain.Location;
import org.jclouds.domain.ResourceMetadata;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Predicate;
import com.google.common.collect.ComparisonChain;
import com.google.common.collect.ImmutableList;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/compute/src/main/java/org/jclouds/compute/domain/internal/ImageImpl.java
----------------------------------------------------------------------
diff --git a/compute/src/main/java/org/jclouds/compute/domain/internal/ImageImpl.java b/compute/src/main/java/org/jclouds/compute/domain/internal/ImageImpl.java
index d6ee20d..453b4cb 100644
--- a/compute/src/main/java/org/jclouds/compute/domain/internal/ImageImpl.java
+++ b/compute/src/main/java/org/jclouds/compute/domain/internal/ImageImpl.java
@@ -30,7 +30,7 @@ import org.jclouds.domain.Location;
import org.jclouds.domain.LoginCredentials;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
public class ImageImpl extends ComputeMetadataImpl implements Image {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/compute/src/main/java/org/jclouds/compute/domain/internal/NodeMetadataImpl.java
----------------------------------------------------------------------
diff --git a/compute/src/main/java/org/jclouds/compute/domain/internal/NodeMetadataImpl.java b/compute/src/main/java/org/jclouds/compute/domain/internal/NodeMetadataImpl.java
index 09919a7..cf4eae8 100644
--- a/compute/src/main/java/org/jclouds/compute/domain/internal/NodeMetadataImpl.java
+++ b/compute/src/main/java/org/jclouds/compute/domain/internal/NodeMetadataImpl.java
@@ -31,7 +31,7 @@ import org.jclouds.domain.Location;
import org.jclouds.domain.LoginCredentials;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
public class NodeMetadataImpl extends ComputeMetadataImpl implements NodeMetadata {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateBuilderImpl.java
----------------------------------------------------------------------
diff --git a/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateBuilderImpl.java b/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateBuilderImpl.java
index f860674..293d81b 100644
--- a/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateBuilderImpl.java
+++ b/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateBuilderImpl.java
@@ -18,8 +18,8 @@ package org.jclouds.compute.domain.internal;
import com.google.common.annotations.VisibleForTesting;
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;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Optional;
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
@@ -1094,7 +1094,7 @@ public class TemplateBuilderImpl implements TemplateBuilder {
* @since 1.5
*/
protected ToStringHelper string() {
- ToStringHelper toString = Objects.toStringHelper("").omitNullValues();
+ ToStringHelper toString = MoreObjects.toStringHelper("").omitNullValues();
if (biggest)
toString.add("biggest", biggest);
if (fastest)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateImpl.java
----------------------------------------------------------------------
diff --git a/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateImpl.java b/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateImpl.java
index 4c71e9a..6e1fc0d 100644
--- a/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateImpl.java
+++ b/compute/src/main/java/org/jclouds/compute/domain/internal/TemplateImpl.java
@@ -25,8 +25,9 @@ import org.jclouds.compute.domain.Template;
import org.jclouds.compute.options.TemplateOptions;
import org.jclouds.domain.Location;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
public class TemplateImpl implements Template {
@@ -96,7 +97,7 @@ public class TemplateImpl implements Template {
}
protected ToStringHelper string() {
- ToStringHelper helper = Objects.toStringHelper("").omitNullValues().add("image", image).add("hardware", hardware)
+ ToStringHelper helper = MoreObjects.toStringHelper("").omitNullValues().add("image", image).add("hardware", hardware)
.add("location", location);
if (!options.equals(defaultOptions()))
helper.add("options", options);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/compute/src/main/java/org/jclouds/compute/domain/internal/VolumeImpl.java
----------------------------------------------------------------------
diff --git a/compute/src/main/java/org/jclouds/compute/domain/internal/VolumeImpl.java b/compute/src/main/java/org/jclouds/compute/domain/internal/VolumeImpl.java
index f8c5d5f..11a7203 100644
--- a/compute/src/main/java/org/jclouds/compute/domain/internal/VolumeImpl.java
+++ b/compute/src/main/java/org/jclouds/compute/domain/internal/VolumeImpl.java
@@ -22,8 +22,9 @@ import static com.google.common.base.Preconditions.checkNotNull;
import org.jclouds.compute.domain.Volume;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
public class VolumeImpl implements Volume {
@@ -60,7 +61,7 @@ public class VolumeImpl implements Volume {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("").omitNullValues().add("id", id).add("type", getType()).add("size", size)
+ return MoreObjects.toStringHelper("").omitNullValues().add("id", id).add("type", getType()).add("size", size)
.add("device", device).add("bootDevice", bootDevice).add("durable", durable);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/compute/src/main/java/org/jclouds/compute/events/StatementOnNode.java
----------------------------------------------------------------------
diff --git a/compute/src/main/java/org/jclouds/compute/events/StatementOnNode.java b/compute/src/main/java/org/jclouds/compute/events/StatementOnNode.java
index cf89b79..7496006 100644
--- a/compute/src/main/java/org/jclouds/compute/events/StatementOnNode.java
+++ b/compute/src/main/java/org/jclouds/compute/events/StatementOnNode.java
@@ -22,8 +22,9 @@ import org.jclouds.compute.domain.NodeMetadata;
import org.jclouds.scriptbuilder.domain.Statement;
import com.google.common.annotations.Beta;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
@@ -67,7 +68,7 @@ public class StatementOnNode {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this).add("statement", statement).add("node", node.getId());
+ return MoreObjects.toStringHelper(this).add("statement", statement).add("node", node.getId());
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/compute/src/main/java/org/jclouds/compute/events/StatementOnNodeCompletion.java
----------------------------------------------------------------------
diff --git a/compute/src/main/java/org/jclouds/compute/events/StatementOnNodeCompletion.java b/compute/src/main/java/org/jclouds/compute/events/StatementOnNodeCompletion.java
index 0d92915..9a8cf19 100644
--- a/compute/src/main/java/org/jclouds/compute/events/StatementOnNodeCompletion.java
+++ b/compute/src/main/java/org/jclouds/compute/events/StatementOnNodeCompletion.java
@@ -23,7 +23,7 @@ import org.jclouds.compute.domain.NodeMetadata;
import org.jclouds.scriptbuilder.domain.Statement;
import com.google.common.annotations.Beta;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* A statement that completed execution on a node.
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/compute/src/main/java/org/jclouds/compute/events/StatementOnNodeFailure.java
----------------------------------------------------------------------
diff --git a/compute/src/main/java/org/jclouds/compute/events/StatementOnNodeFailure.java b/compute/src/main/java/org/jclouds/compute/events/StatementOnNodeFailure.java
index e4d0685..93bfab8 100644
--- a/compute/src/main/java/org/jclouds/compute/events/StatementOnNodeFailure.java
+++ b/compute/src/main/java/org/jclouds/compute/events/StatementOnNodeFailure.java
@@ -22,7 +22,7 @@ import org.jclouds.compute.domain.NodeMetadata;
import org.jclouds.scriptbuilder.domain.Statement;
import com.google.common.annotations.Beta;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* A statement that failed execution on a node.
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/compute/src/main/java/org/jclouds/compute/options/RunScriptOptions.java
----------------------------------------------------------------------
diff --git a/compute/src/main/java/org/jclouds/compute/options/RunScriptOptions.java b/compute/src/main/java/org/jclouds/compute/options/RunScriptOptions.java
index 7c90c22..8f35904 100644
--- a/compute/src/main/java/org/jclouds/compute/options/RunScriptOptions.java
+++ b/compute/src/main/java/org/jclouds/compute/options/RunScriptOptions.java
@@ -23,9 +23,10 @@ import static com.google.common.base.Preconditions.checkNotNull;
import org.jclouds.domain.LoginCredentials;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Optional;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Enables additional options for running a script.
@@ -482,7 +483,7 @@ public class RunScriptOptions {
}
protected ToStringHelper string() {
- ToStringHelper toString = Objects.toStringHelper("").omitNullValues();
+ ToStringHelper toString = MoreObjects.toStringHelper("").omitNullValues();
toString.add("loginUser", loginUser);
if (loginPassword != null && loginPassword.isPresent())
toString.add("loginPasswordPresent", true);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/compute/src/main/java/org/jclouds/compute/options/TemplateOptions.java
----------------------------------------------------------------------
diff --git a/compute/src/main/java/org/jclouds/compute/options/TemplateOptions.java b/compute/src/main/java/org/jclouds/compute/options/TemplateOptions.java
index 115710c..e7c6be7 100644
--- a/compute/src/main/java/org/jclouds/compute/options/TemplateOptions.java
+++ b/compute/src/main/java/org/jclouds/compute/options/TemplateOptions.java
@@ -29,7 +29,7 @@ import org.jclouds.scriptbuilder.domain.Statement;
import org.jclouds.scriptbuilder.domain.Statements;
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.Maps;
import com.google.common.primitives.Ints;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/compute/src/main/java/org/jclouds/compute/strategy/InitializeRunScriptOnNodeOrPlaceInBadMap.java
----------------------------------------------------------------------
diff --git a/compute/src/main/java/org/jclouds/compute/strategy/InitializeRunScriptOnNodeOrPlaceInBadMap.java b/compute/src/main/java/org/jclouds/compute/strategy/InitializeRunScriptOnNodeOrPlaceInBadMap.java
index 4bd7e98..a601bf5 100644
--- a/compute/src/main/java/org/jclouds/compute/strategy/InitializeRunScriptOnNodeOrPlaceInBadMap.java
+++ b/compute/src/main/java/org/jclouds/compute/strategy/InitializeRunScriptOnNodeOrPlaceInBadMap.java
@@ -28,7 +28,7 @@ import org.jclouds.compute.domain.NodeMetadata;
import org.jclouds.compute.options.RunScriptOptions;
import org.jclouds.scriptbuilder.domain.Statement;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
import com.google.inject.assistedinject.Assisted;
public class InitializeRunScriptOnNodeOrPlaceInBadMap implements Callable<RunScriptOnNode> {
@@ -67,6 +67,6 @@ public class InitializeRunScriptOnNodeOrPlaceInBadMap implements Callable<RunScr
@Override
public String toString() {
- return Objects.toStringHelper(this).add("node", node).add("options", options).toString();
+ return MoreObjects.toStringHelper(this).add("node", node).add("options", options).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/compute/src/main/java/org/jclouds/compute/strategy/RunScriptOnNodeAndAddToGoodMapOrPutExceptionIntoBadMap.java
----------------------------------------------------------------------
diff --git a/compute/src/main/java/org/jclouds/compute/strategy/RunScriptOnNodeAndAddToGoodMapOrPutExceptionIntoBadMap.java b/compute/src/main/java/org/jclouds/compute/strategy/RunScriptOnNodeAndAddToGoodMapOrPutExceptionIntoBadMap.java
index 91c01f5..a9bbb0f 100644
--- a/compute/src/main/java/org/jclouds/compute/strategy/RunScriptOnNodeAndAddToGoodMapOrPutExceptionIntoBadMap.java
+++ b/compute/src/main/java/org/jclouds/compute/strategy/RunScriptOnNodeAndAddToGoodMapOrPutExceptionIntoBadMap.java
@@ -32,7 +32,7 @@ import org.jclouds.compute.domain.NodeMetadata;
import org.jclouds.compute.reference.ComputeServiceConstants;
import org.jclouds.logging.Logger;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
import com.google.inject.assistedinject.AssistedInject;
public class RunScriptOnNodeAndAddToGoodMapOrPutExceptionIntoBadMap implements Callable<ExecResponse> {
@@ -75,7 +75,7 @@ public class RunScriptOnNodeAndAddToGoodMapOrPutExceptionIntoBadMap implements C
@Override
public String toString() {
- return Objects.toStringHelper(this).add("runScriptOnNode", runScriptOnNode).add("goodNodes", goodNodes).add(
+ return MoreObjects.toStringHelper(this).add("runScriptOnNode", runScriptOnNode).add("goodNodes", goodNodes).add(
"badNodes", badNodes).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/compute/src/main/java/org/jclouds/compute/strategy/impl/CreateNodesWithGroupEncodedIntoNameThenAddToSet.java
----------------------------------------------------------------------
diff --git a/compute/src/main/java/org/jclouds/compute/strategy/impl/CreateNodesWithGroupEncodedIntoNameThenAddToSet.java b/compute/src/main/java/org/jclouds/compute/strategy/impl/CreateNodesWithGroupEncodedIntoNameThenAddToSet.java
index 6ac36c7..f93cee0 100644
--- a/compute/src/main/java/org/jclouds/compute/strategy/impl/CreateNodesWithGroupEncodedIntoNameThenAddToSet.java
+++ b/compute/src/main/java/org/jclouds/compute/strategy/impl/CreateNodesWithGroupEncodedIntoNameThenAddToSet.java
@@ -16,7 +16,7 @@
*/
package org.jclouds.compute.strategy.impl;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.collect.Iterables.any;
import static com.google.common.collect.Maps.newLinkedHashMap;
@@ -33,7 +33,7 @@ import javax.inject.Inject;
import javax.inject.Named;
import javax.inject.Singleton;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
import org.jclouds.Constants;
import org.jclouds.compute.config.CustomizationResponse;
import org.jclouds.compute.domain.ComputeMetadata;
@@ -76,8 +76,8 @@ public class CreateNodesWithGroupEncodedIntoNameThenAddToSet implements CreateNo
public AtomicReference<NodeMetadata> call() throws Exception {
NodeMetadata node = null;
logger.debug(">> adding node location(%s) name(%s) image(%s) hardware(%s)", template.getLocation().getId(),
- name, Objects.firstNonNull(template.getImage().getProviderId(), template.getImage().getId()),
- Objects.firstNonNull(template.getHardware().getProviderId(), template.getHardware().getId()));
+ name, MoreObjects.firstNonNull(template.getImage().getProviderId(), template.getImage().getId()),
+ MoreObjects.firstNonNull(template.getHardware().getProviderId(), template.getHardware().getId()));
node = addNodeWithGroupStrategy.createNodeWithGroupEncodedIntoName(group, name, template);
logger.debug("<< %s node(%s)", formatStatus(node), node.getId());
return new AtomicReference<NodeMetadata>(node);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/compute/src/main/java/org/jclouds/compute/strategy/impl/ReturnCredentialsBoundToImage.java
----------------------------------------------------------------------
diff --git a/compute/src/main/java/org/jclouds/compute/strategy/impl/ReturnCredentialsBoundToImage.java b/compute/src/main/java/org/jclouds/compute/strategy/impl/ReturnCredentialsBoundToImage.java
index f45426f..1b51a74 100644
--- a/compute/src/main/java/org/jclouds/compute/strategy/impl/ReturnCredentialsBoundToImage.java
+++ b/compute/src/main/java/org/jclouds/compute/strategy/impl/ReturnCredentialsBoundToImage.java
@@ -31,7 +31,7 @@ import org.jclouds.domain.Credentials;
import org.jclouds.domain.LoginCredentials;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
@Singleton
public class ReturnCredentialsBoundToImage implements PopulateDefaultLoginCredentialsForImageStrategy {
@@ -67,6 +67,6 @@ public class ReturnCredentialsBoundToImage implements PopulateDefaultLoginCreden
@Override
public String toString() {
- return Objects.toStringHelper(this).toString();
+ return MoreObjects.toStringHelper(this).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/compute/src/main/java/org/jclouds/net/domain/IpPermission.java
----------------------------------------------------------------------
diff --git a/compute/src/main/java/org/jclouds/net/domain/IpPermission.java b/compute/src/main/java/org/jclouds/net/domain/IpPermission.java
index bfcb7b2..0108caf 100644
--- a/compute/src/main/java/org/jclouds/net/domain/IpPermission.java
+++ b/compute/src/main/java/org/jclouds/net/domain/IpPermission.java
@@ -31,8 +31,9 @@ import org.jclouds.net.util.IpPermissions;
import com.google.common.annotations.Beta;
import com.google.common.base.Function;
+import com.google.common.base.MoreObjects;
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.ImmutableMultimap;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
@@ -328,7 +329,7 @@ public class IpPermission implements Comparable<IpPermission> {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("").add("ipProtocol", ipProtocol).add("fromPort", fromPort)
+ return MoreObjects.toStringHelper("").add("ipProtocol", ipProtocol).add("fromPort", fromPort)
.add("toPort", toPort).add("tenantIdGroupNamePairs", tenantIdGroupNamePairs).add("groupIds", groupIds)
.add("cidrBlocks", cidrBlocks).add("exclusionCidrBlocks", exclusionCidrBlocks);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/core/src/main/java/org/jclouds/ContextBuilder.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/ContextBuilder.java b/core/src/main/java/org/jclouds/ContextBuilder.java
index 404ef79..a547599 100644
--- a/core/src/main/java/org/jclouds/ContextBuilder.java
+++ b/core/src/main/java/org/jclouds/ContextBuilder.java
@@ -16,7 +16,7 @@
*/
package org.jclouds;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Predicates.containsPattern;
import static com.google.common.base.Predicates.instanceOf;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/core/src/main/java/org/jclouds/apis/internal/BaseApiMetadata.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/apis/internal/BaseApiMetadata.java b/core/src/main/java/org/jclouds/apis/internal/BaseApiMetadata.java
index e074a6c..5b85dc7 100644
--- a/core/src/main/java/org/jclouds/apis/internal/BaseApiMetadata.java
+++ b/core/src/main/java/org/jclouds/apis/internal/BaseApiMetadata.java
@@ -45,8 +45,9 @@ import org.jclouds.JcloudsVersion;
import org.jclouds.View;
import org.jclouds.apis.ApiMetadata;
+import com.google.common.base.MoreObjects;
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.collect.ImmutableSet;
import com.google.common.reflect.TypeToken;
@@ -348,7 +349,7 @@ public abstract class BaseApiMetadata implements ApiMetadata {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("").add("id", getId()).add("name", getName()).add("views", getViews()).add(
+ return MoreObjects.toStringHelper("").add("id", getId()).add("name", getName()).add("views", getViews()).add(
"endpointName", getEndpointName()).add("identityName", getIdentityName()).add("credentialName",
getCredentialName()).add("documentation", getDocumentation());
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/core/src/main/java/org/jclouds/collect/AdvanceUntilEmptyIterable.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/collect/AdvanceUntilEmptyIterable.java b/core/src/main/java/org/jclouds/collect/AdvanceUntilEmptyIterable.java
index 78e380d..0ae224f 100644
--- a/core/src/main/java/org/jclouds/collect/AdvanceUntilEmptyIterable.java
+++ b/core/src/main/java/org/jclouds/collect/AdvanceUntilEmptyIterable.java
@@ -21,6 +21,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Iterator;
import com.google.common.annotations.Beta;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Supplier;
import com.google.common.collect.AbstractIterator;
@@ -104,7 +105,7 @@ public class AdvanceUntilEmptyIterable<E> extends FluentIterable<FluentIterable<
*/
@Override
public String toString() {
- return Objects.toStringHelper("").omitNullValues().add("current", current).add("unread", unread).toString();
+ return MoreObjects.toStringHelper("").omitNullValues().add("current", current).add("unread", unread).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/core/src/main/java/org/jclouds/collect/PagedIterables.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/collect/PagedIterables.java b/core/src/main/java/org/jclouds/collect/PagedIterables.java
index 90ad17f..69421fa 100644
--- a/core/src/main/java/org/jclouds/collect/PagedIterables.java
+++ b/core/src/main/java/org/jclouds/collect/PagedIterables.java
@@ -22,6 +22,7 @@ import java.util.Iterator;
import com.google.common.annotations.Beta;
import com.google.common.base.Function;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.AbstractIterator;
import com.google.common.collect.ImmutableSet;
@@ -115,7 +116,7 @@ public class PagedIterables {
@Override
public String toString() {
- return Objects.toStringHelper("").add("current", current).add("unread", unread).toString();
+ return MoreObjects.toStringHelper("").add("current", current).add("unread", unread).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/core/src/main/java/org/jclouds/domain/internal/LocationImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/domain/internal/LocationImpl.java b/core/src/main/java/org/jclouds/domain/internal/LocationImpl.java
index f02c73f..775f799 100644
--- a/core/src/main/java/org/jclouds/domain/internal/LocationImpl.java
+++ b/core/src/main/java/org/jclouds/domain/internal/LocationImpl.java
@@ -26,8 +26,9 @@ import org.jclouds.domain.Location;
import org.jclouds.domain.LocationScope;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
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;
@@ -57,7 +58,7 @@ public class LocationImpl implements Location {
@Override
public String toString() {
- ToStringHelper helper = Objects.toStringHelper("").omitNullValues().add("scope", scope).add("id", id)
+ ToStringHelper helper = MoreObjects.toStringHelper("").omitNullValues().add("scope", scope).add("id", id)
.add("description", description);
if (parent != null)
helper.add("parent", parent.getId());
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/core/src/main/java/org/jclouds/domain/internal/MutableResourceMetadataImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/domain/internal/MutableResourceMetadataImpl.java b/core/src/main/java/org/jclouds/domain/internal/MutableResourceMetadataImpl.java
index 973eb93..e6a6b56 100644
--- a/core/src/main/java/org/jclouds/domain/internal/MutableResourceMetadataImpl.java
+++ b/core/src/main/java/org/jclouds/domain/internal/MutableResourceMetadataImpl.java
@@ -23,8 +23,9 @@ import org.jclouds.domain.Location;
import org.jclouds.domain.MutableResourceMetadata;
import org.jclouds.domain.ResourceMetadata;
+import com.google.common.base.MoreObjects;
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.Maps;
/**
@@ -164,7 +165,7 @@ public class MutableResourceMetadataImpl<T extends Enum<T>> implements MutableRe
}
protected ToStringHelper string() {
- return Objects.toStringHelper("").omitNullValues()
+ return MoreObjects.toStringHelper("").omitNullValues()
.add("id", id)
.add("location", location)
.add("name", name)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/core/src/main/java/org/jclouds/domain/internal/ResourceMetadataImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/domain/internal/ResourceMetadataImpl.java b/core/src/main/java/org/jclouds/domain/internal/ResourceMetadataImpl.java
index a46b3c4..1aaa4ec 100644
--- a/core/src/main/java/org/jclouds/domain/internal/ResourceMetadataImpl.java
+++ b/core/src/main/java/org/jclouds/domain/internal/ResourceMetadataImpl.java
@@ -28,8 +28,9 @@ import org.jclouds.domain.Location;
import org.jclouds.domain.ResourceMetadata;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
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.Maps;
/**
@@ -130,7 +131,7 @@ public abstract class ResourceMetadataImpl<T extends Enum<T>> implements Resourc
}
protected ToStringHelper string() {
- return Objects.toStringHelper("").omitNullValues().add("type", getType()).add("providerId", providerId)
+ return MoreObjects.toStringHelper("").omitNullValues().add("type", getType()).add("providerId", providerId)
.add("name", name).add("location", location).add("uri", uri).add("userMetadata", userMetadata);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/core/src/main/java/org/jclouds/http/HttpMessage.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/http/HttpMessage.java b/core/src/main/java/org/jclouds/http/HttpMessage.java
index 71656c3..07bc27c 100644
--- a/core/src/main/java/org/jclouds/http/HttpMessage.java
+++ b/core/src/main/java/org/jclouds/http/HttpMessage.java
@@ -29,8 +29,9 @@ import org.jclouds.io.Payloads;
import org.jclouds.javax.annotation.Nullable;
import org.jclouds.util.Multimaps2;
+import com.google.common.base.MoreObjects;
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.ImmutableMultimap;
import com.google.common.collect.Multimap;
import com.google.common.io.ByteSource;
@@ -218,7 +219,7 @@ public class HttpMessage extends PayloadEnclosingImpl {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("").omitNullValues()
+ return MoreObjects.toStringHelper("").omitNullValues()
.add("headers", headers)
.add("payload", payload);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/core/src/main/java/org/jclouds/http/HttpRequest.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/http/HttpRequest.java b/core/src/main/java/org/jclouds/http/HttpRequest.java
index bb84161..de07a05 100644
--- a/core/src/main/java/org/jclouds/http/HttpRequest.java
+++ b/core/src/main/java/org/jclouds/http/HttpRequest.java
@@ -31,8 +31,9 @@ import java.util.Set;
import org.jclouds.io.Payload;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
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.ImmutableMultimap;
import com.google.common.collect.ImmutableSet;
@@ -285,7 +286,7 @@ public class HttpRequest extends HttpMessage {
@Override
protected ToStringHelper string() {
- return Objects.toStringHelper("").omitNullValues()
+ return MoreObjects.toStringHelper("").omitNullValues()
.add("method", method)
.add("endpoint", endpoint)
.add("headers", headers)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/core/src/main/java/org/jclouds/http/HttpResponse.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/http/HttpResponse.java b/core/src/main/java/org/jclouds/http/HttpResponse.java
index 2f894a9..f2b6e07 100644
--- a/core/src/main/java/org/jclouds/http/HttpResponse.java
+++ b/core/src/main/java/org/jclouds/http/HttpResponse.java
@@ -19,8 +19,9 @@ package org.jclouds.http;
import org.jclouds.io.Payload;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
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.Multimap;
/**
@@ -114,7 +115,7 @@ public class HttpResponse extends HttpMessage {
@Override
protected ToStringHelper string() {
- return Objects.toStringHelper("").omitNullValues()
+ return MoreObjects.toStringHelper("").omitNullValues()
.add("statusCode", statusCode)
.add("message", message)
.add("headers", headers)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/core/src/main/java/org/jclouds/http/options/BaseHttpRequestOptions.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/http/options/BaseHttpRequestOptions.java b/core/src/main/java/org/jclouds/http/options/BaseHttpRequestOptions.java
index 7316b94..7e5d918 100644
--- a/core/src/main/java/org/jclouds/http/options/BaseHttpRequestOptions.java
+++ b/core/src/main/java/org/jclouds/http/options/BaseHttpRequestOptions.java
@@ -18,7 +18,7 @@ package org.jclouds.http.options;
import java.util.Collection;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
import com.google.common.collect.LinkedHashMultimap;
import com.google.common.collect.Multimap;
@@ -133,7 +133,7 @@ public class BaseHttpRequestOptions implements HttpRequestOptions {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("formParameters", formParameters)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("formParameters", formParameters)
.add("headers", headers).add("pathSuffix", pathSuffix).add("payload", payload)
.add("queryParameters", queryParameters).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/core/src/main/java/org/jclouds/internal/BaseView.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/internal/BaseView.java b/core/src/main/java/org/jclouds/internal/BaseView.java
index 287852c..73e699b 100644
--- a/core/src/main/java/org/jclouds/internal/BaseView.java
+++ b/core/src/main/java/org/jclouds/internal/BaseView.java
@@ -27,8 +27,9 @@ import org.jclouds.location.Provider;
import org.jclouds.rest.ApiContext;
import org.jclouds.util.TypeTokenUtils;
+import com.google.common.base.MoreObjects;
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.ForwardingObject;
import com.google.common.reflect.TypeParameter;
import com.google.common.reflect.TypeToken;
@@ -98,7 +99,7 @@ public abstract class BaseView extends ForwardingObject implements View {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("").add("backend", delegate()).add("backendType", getBackendType());
+ return MoreObjects.toStringHelper("").add("backend", delegate()).add("backendType", getBackendType());
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/core/src/main/java/org/jclouds/internal/ContextImpl.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/internal/ContextImpl.java b/core/src/main/java/org/jclouds/internal/ContextImpl.java
index 374710c..533d4df 100644
--- a/core/src/main/java/org/jclouds/internal/ContextImpl.java
+++ b/core/src/main/java/org/jclouds/internal/ContextImpl.java
@@ -17,7 +17,7 @@
package org.jclouds.internal;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import static org.jclouds.lifecycle.Closer.State.AVAILABLE;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/core/src/main/java/org/jclouds/json/internal/DeserializationConstructorAndReflectiveTypeAdapterFactory.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/json/internal/DeserializationConstructorAndReflectiveTypeAdapterFactory.java b/core/src/main/java/org/jclouds/json/internal/DeserializationConstructorAndReflectiveTypeAdapterFactory.java
index 85293e2..ae07809 100644
--- a/core/src/main/java/org/jclouds/json/internal/DeserializationConstructorAndReflectiveTypeAdapterFactory.java
+++ b/core/src/main/java/org/jclouds/json/internal/DeserializationConstructorAndReflectiveTypeAdapterFactory.java
@@ -28,6 +28,7 @@ import java.util.Map;
import org.jclouds.json.internal.NamingStrategies.AnnotationConstructorNamingStrategy;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableMap;
@@ -250,7 +251,7 @@ public final class DeserializationConstructorAndReflectiveTypeAdapterFactory imp
@Override
public String toString() {
- return Objects.toStringHelper(this).add("parameterizedCtor", parameterizedCtor)
+ return MoreObjects.toStringHelper(this).add("parameterizedCtor", parameterizedCtor)
.add("parameterReaders", parameterReaders).add("serializer", serializer).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/core/src/main/java/org/jclouds/json/internal/NullFilteringTypeAdapterFactories.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/json/internal/NullFilteringTypeAdapterFactories.java b/core/src/main/java/org/jclouds/json/internal/NullFilteringTypeAdapterFactories.java
index 7ad257e..85dd545 100644
--- a/core/src/main/java/org/jclouds/json/internal/NullFilteringTypeAdapterFactories.java
+++ b/core/src/main/java/org/jclouds/json/internal/NullFilteringTypeAdapterFactories.java
@@ -43,7 +43,7 @@ import java.util.Map.Entry;
import java.util.Set;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
/**
* Eliminates null values when deserializing Collections, Maps, and Multimaps
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/core/src/main/java/org/jclouds/providers/internal/BaseProviderMetadata.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/providers/internal/BaseProviderMetadata.java b/core/src/main/java/org/jclouds/providers/internal/BaseProviderMetadata.java
index fea73ed..6fea9d5 100644
--- a/core/src/main/java/org/jclouds/providers/internal/BaseProviderMetadata.java
+++ b/core/src/main/java/org/jclouds/providers/internal/BaseProviderMetadata.java
@@ -29,9 +29,10 @@ import org.jclouds.apis.ApiMetadata;
import org.jclouds.javax.annotation.Nullable;
import org.jclouds.providers.ProviderMetadata;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Optional;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
@@ -246,7 +247,7 @@ public abstract class BaseProviderMetadata implements ProviderMetadata {
}
public ToStringHelper string() {
- return Objects.toStringHelper("").add("id", getId()).add("name", getName()).add("api", getApiMetadata()).add(
+ return MoreObjects.toStringHelper("").add("id", getId()).add("name", getName()).add("api", getApiMetadata()).add(
"endpoint", getEndpoint()).add("console", getConsole()).add("homepage", getHomepage()).add(
"linkedServices", getLinkedServices()).add("iso3166Codes", getIso3166Codes());
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/core/src/main/java/org/jclouds/proxy/internal/GuiceProxyConfig.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/proxy/internal/GuiceProxyConfig.java b/core/src/main/java/org/jclouds/proxy/internal/GuiceProxyConfig.java
index 609a850..bc20f7a 100644
--- a/core/src/main/java/org/jclouds/proxy/internal/GuiceProxyConfig.java
+++ b/core/src/main/java/org/jclouds/proxy/internal/GuiceProxyConfig.java
@@ -34,7 +34,7 @@ import javax.inject.Singleton;
import org.jclouds.domain.Credentials;
import org.jclouds.proxy.ProxyConfig;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Optional;
import com.google.common.base.Strings;
import com.google.common.net.HostAndPort;
@@ -123,7 +123,7 @@ public class GuiceProxyConfig implements ProxyConfig {
*/
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("systemProxies", systemProxies ? "true" : null)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("systemProxies", systemProxies ? "true" : null)
.add("jvmProxyEnabled", jvmProxyEnabled ? "true" : "false")
.add("proxyHostPort", getProxy().orNull()).add("user", user).add("type", host != null ? type : null).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/core/src/main/java/org/jclouds/reflect/InvocationSuccess.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/reflect/InvocationSuccess.java b/core/src/main/java/org/jclouds/reflect/InvocationSuccess.java
index a1e1381..9fabc6e 100644
--- a/core/src/main/java/org/jclouds/reflect/InvocationSuccess.java
+++ b/core/src/main/java/org/jclouds/reflect/InvocationSuccess.java
@@ -22,8 +22,9 @@ import static com.google.common.base.Preconditions.checkNotNull;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.annotations.Beta;
+import com.google.common.base.MoreObjects;
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;
/**
@@ -75,6 +76,6 @@ public final class InvocationSuccess {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("").omitNullValues().add("invocation", invocation).add("result", result.orNull());
+ return MoreObjects.toStringHelper("").omitNullValues().add("invocation", invocation).add("result", result.orNull());
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/core/src/main/java/org/jclouds/reflect/Reflection2.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/reflect/Reflection2.java b/core/src/main/java/org/jclouds/reflect/Reflection2.java
index eb43ce0..7302884 100644
--- a/core/src/main/java/org/jclouds/reflect/Reflection2.java
+++ b/core/src/main/java/org/jclouds/reflect/Reflection2.java
@@ -33,6 +33,7 @@ import java.util.concurrent.ExecutionException;
import com.google.common.annotations.Beta;
import com.google.common.base.Function;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Optional;
import com.google.common.base.Predicate;
@@ -248,7 +249,7 @@ public class Reflection2 {
}
public String toString() {
- return Objects.toStringHelper("").add("type", type).add("parameterTypes", parameterTypes).toString();
+ return MoreObjects.toStringHelper("").add("type", type).add("parameterTypes", parameterTypes).toString();
}
}
@@ -297,7 +298,7 @@ public class Reflection2 {
}
public String toString() {
- return Objects.toStringHelper("").add("type", type).add("name", name).add("parameterTypes", parameterTypes)
+ return MoreObjects.toStringHelper("").add("type", type).add("name", name).add("parameterTypes", parameterTypes)
.toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/core/src/main/java/org/jclouds/rest/internal/BaseHttpApiMetadata.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/rest/internal/BaseHttpApiMetadata.java b/core/src/main/java/org/jclouds/rest/internal/BaseHttpApiMetadata.java
index 3d52021..110e7d5 100644
--- a/core/src/main/java/org/jclouds/rest/internal/BaseHttpApiMetadata.java
+++ b/core/src/main/java/org/jclouds/rest/internal/BaseHttpApiMetadata.java
@@ -28,7 +28,7 @@ import org.jclouds.rest.ApiContext;
import org.jclouds.rest.HttpApiMetadata;
import com.google.common.annotations.Beta;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.reflect.TypeParameter;
import com.google.common.reflect.TypeToken;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/core/src/main/java/org/jclouds/rest/internal/DelegatesToInvocationFunction.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/rest/internal/DelegatesToInvocationFunction.java b/core/src/main/java/org/jclouds/rest/internal/DelegatesToInvocationFunction.java
index 8d94c3e..da2a8a9 100644
--- a/core/src/main/java/org/jclouds/rest/internal/DelegatesToInvocationFunction.java
+++ b/core/src/main/java/org/jclouds/rest/internal/DelegatesToInvocationFunction.java
@@ -52,7 +52,7 @@ import org.jclouds.rest.config.SetCaller;
import com.google.common.annotations.Beta;
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.Supplier;
@@ -282,7 +282,7 @@ public class DelegatesToInvocationFunction<S, F extends Function<Invocation, Obj
@Override
public String toString() {
- return Objects.toStringHelper("").omitNullValues().add("ownerType", ownerType.getRawType().getSimpleName())
+ return MoreObjects.toStringHelper("").omitNullValues().add("ownerType", ownerType.getRawType().getSimpleName())
.add("methodInvoker", methodInvoker).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/core/src/main/java/org/jclouds/rest/internal/InvokeHttpMethod.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/rest/internal/InvokeHttpMethod.java b/core/src/main/java/org/jclouds/rest/internal/InvokeHttpMethod.java
index 9aa3330..064e500 100644
--- a/core/src/main/java/org/jclouds/rest/internal/InvokeHttpMethod.java
+++ b/core/src/main/java/org/jclouds/rest/internal/InvokeHttpMethod.java
@@ -17,7 +17,7 @@
package org.jclouds.rest.internal;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Throwables.propagate;
import static java.util.concurrent.TimeUnit.NANOSECONDS;
@@ -37,6 +37,7 @@ import org.jclouds.rest.config.InvocationConfig;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Function;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Optional;
import com.google.common.util.concurrent.TimeLimiter;
@@ -214,6 +215,6 @@ public class InvokeHttpMethod implements Function<Invocation, Object> {
@Override
public String toString() {
- return Objects.toStringHelper("").omitNullValues().add("annotationParser", annotationProcessor).toString();
+ return MoreObjects.toStringHelper("").omitNullValues().add("annotationParser", annotationProcessor).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java b/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java
index 0ee891a..8fdbb43 100644
--- a/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java
+++ b/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java
@@ -110,7 +110,7 @@ import org.jclouds.rest.binders.BindToJsonPayloadWrappedWith;
import com.google.common.annotations.VisibleForTesting;
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.Supplier;
@@ -889,6 +889,6 @@ public class RestAnnotationProcessor implements Function<Invocation, HttpRequest
public String toString() {
String callerString = caller != null ? String.format("%s.%s%s", caller.getInvokable().getOwnerType().getRawType().getSimpleName(),
caller.getInvokable().getName(), caller.getArgs()) : null;
- return Objects.toStringHelper("").omitNullValues().add("caller", callerString).toString();
+ return MoreObjects.toStringHelper("").omitNullValues().add("caller", callerString).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/core/src/main/java/org/jclouds/rest/suppliers/MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/rest/suppliers/MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier.java b/core/src/main/java/org/jclouds/rest/suppliers/MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier.java
index a481e12..aecce10 100644
--- a/core/src/main/java/org/jclouds/rest/suppliers/MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier.java
+++ b/core/src/main/java/org/jclouds/rest/suppliers/MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier.java
@@ -26,7 +26,7 @@ import java.util.concurrent.atomic.AtomicReference;
import org.jclouds.rest.AuthorizationException;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Optional;
import com.google.common.base.Supplier;
import com.google.common.cache.CacheBuilder;
@@ -87,7 +87,7 @@ public class MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier<T> ext
@Override
public String toString() {
- return Objects.toStringHelper(this).add("delegate", delegate).toString();
+ return MoreObjects.toStringHelper(this).add("delegate", delegate).toString();
}
}
@@ -157,7 +157,7 @@ public class MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier<T> ext
@Override
public String toString() {
- return Objects.toStringHelper(this).add("delegate", delegate).add("duration", duration).add("unit", unit)
+ return MoreObjects.toStringHelper(this).add("delegate", delegate).add("duration", duration).add("unit", unit)
.toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/core/src/main/java/org/jclouds/rest/suppliers/URIFromStringSupplier.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/rest/suppliers/URIFromStringSupplier.java b/core/src/main/java/org/jclouds/rest/suppliers/URIFromStringSupplier.java
index 8d54d9b..5736412 100644
--- a/core/src/main/java/org/jclouds/rest/suppliers/URIFromStringSupplier.java
+++ b/core/src/main/java/org/jclouds/rest/suppliers/URIFromStringSupplier.java
@@ -17,7 +17,7 @@
package org.jclouds.rest.suppliers;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.net.URI;
@@ -25,7 +25,7 @@ import java.net.URI;
import javax.inject.Inject;
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.Supplier;
public class URIFromStringSupplier implements Supplier<URI> {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/core/src/main/java/org/jclouds/util/Suppliers2.java
----------------------------------------------------------------------
diff --git a/core/src/main/java/org/jclouds/util/Suppliers2.java b/core/src/main/java/org/jclouds/util/Suppliers2.java
index df0e4f2..783fd23 100644
--- a/core/src/main/java/org/jclouds/util/Suppliers2.java
+++ b/core/src/main/java/org/jclouds/util/Suppliers2.java
@@ -20,7 +20,7 @@ import java.util.Map;
import com.google.common.annotations.Beta;
import com.google.common.base.Function;
-import com.google.common.base.Objects;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Supplier;
import com.google.common.base.Suppliers;
import com.google.common.base.Throwables;
@@ -91,7 +91,7 @@ public class Suppliers2 {
@Override
public String toString() {
- return Objects.toStringHelper(this).add("unlessNull", unlessNull).add("fallback", fallback).toString();
+ return MoreObjects.toStringHelper(this).add("unlessNull", unlessNull).add("fallback", fallback).toString();
}
};
}
@@ -117,7 +117,7 @@ public class Suppliers2 {
@Override
public String toString() {
- return Objects.toStringHelper(this).add("unlessThrowable", unlessThrowable)
+ return MoreObjects.toStringHelper(this).add("unlessThrowable", unlessThrowable)
.add("throwable", throwable.getSimpleName()).add("fallback", fallback).toString();
}
};
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/SessionConnection.java
----------------------------------------------------------------------
diff --git a/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/SessionConnection.java b/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/SessionConnection.java
index 2ff4e75..bf45922 100644
--- a/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/SessionConnection.java
+++ b/drivers/jsch/src/main/java/org/jclouds/ssh/jsch/SessionConnection.java
@@ -25,6 +25,7 @@ import org.jclouds.javax.annotation.Nullable;
import org.jclouds.proxy.ProxyConfig;
import org.jclouds.ssh.jsch.JschSshClient.Connection;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Optional;
import com.google.common.net.HostAndPort;
@@ -253,7 +254,7 @@ public final class SessionConnection implements Connection<Session> {
@Override
public String toString() {
- return Objects.toStringHelper("").omitNullValues()
+ return MoreObjects.toStringHelper("").omitNullValues()
.add("hostAndPort", hostAndPort).add("loginUser", loginCredentials.getUser())
.add("session", session != null ? session.hashCode() : null)
.add("connectTimeout", connectTimeout)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/drivers/sshj/src/main/java/org/jclouds/sshj/SSHClientConnection.java
----------------------------------------------------------------------
diff --git a/drivers/sshj/src/main/java/org/jclouds/sshj/SSHClientConnection.java b/drivers/sshj/src/main/java/org/jclouds/sshj/SSHClientConnection.java
index 5a4895d..01a5f42 100644
--- a/drivers/sshj/src/main/java/org/jclouds/sshj/SSHClientConnection.java
+++ b/drivers/sshj/src/main/java/org/jclouds/sshj/SSHClientConnection.java
@@ -36,6 +36,7 @@ import org.jclouds.logging.Logger;
import org.jclouds.sshj.SshjSshClient.Connection;
import com.google.common.annotations.VisibleForTesting;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableList;
@@ -235,7 +236,7 @@ public class SSHClientConnection implements Connection<SSHClient> {
@Override
public String toString() {
- return Objects.toStringHelper("").add("hostAndPort", hostAndPort).add("loginUser", loginCredentials.getUser())
+ return MoreObjects.toStringHelper("").add("hostAndPort", hostAndPort).add("loginUser", loginCredentials.getUser())
.add("ssh", ssh != null ? ssh.hashCode() : null).add("connectTimeout", connectTimeout).add(
"sessionTimeout", sessionTimeout).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/AWSEC2TemplateOptions.java
----------------------------------------------------------------------
diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/AWSEC2TemplateOptions.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/AWSEC2TemplateOptions.java
index d711ad7..6608146 100644
--- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/AWSEC2TemplateOptions.java
+++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/compute/AWSEC2TemplateOptions.java
@@ -38,7 +38,7 @@ import org.jclouds.rest.annotations.SinceApiVersion;
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.collect.ImmutableSet;
import com.google.common.collect.Iterables;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/domain/AWSRunningInstance.java
----------------------------------------------------------------------
diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/domain/AWSRunningInstance.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/domain/AWSRunningInstance.java
index f3ffc0b..ba75584 100644
--- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/domain/AWSRunningInstance.java
+++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/domain/AWSRunningInstance.java
@@ -17,7 +17,7 @@
package org.jclouds.aws.ec2.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Date;
@@ -33,7 +33,7 @@ import org.jclouds.javax.annotation.Nullable;
import org.jclouds.rest.annotations.SinceApiVersion;
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.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/domain/LaunchSpecification.java
----------------------------------------------------------------------
diff --git a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/domain/LaunchSpecification.java b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/domain/LaunchSpecification.java
index 2972dd5..1b9a47a 100644
--- a/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/domain/LaunchSpecification.java
+++ b/providers/aws-ec2/src/main/java/org/jclouds/aws/ec2/domain/LaunchSpecification.java
@@ -17,7 +17,7 @@
package org.jclouds.aws.ec2.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Arrays;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/options/DigitalOcean2TemplateOptions.java
----------------------------------------------------------------------
diff --git a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/options/DigitalOcean2TemplateOptions.java b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/options/DigitalOcean2TemplateOptions.java
index 2a86f85..f25bc0b 100644
--- a/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/options/DigitalOcean2TemplateOptions.java
+++ b/providers/digitalocean2/src/main/java/org/jclouds/digitalocean2/compute/options/DigitalOcean2TemplateOptions.java
@@ -24,7 +24,7 @@ import java.util.Map;
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.base.Objects;
import com.google.common.collect.ImmutableSet;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/CreatePrimaryZone.java
----------------------------------------------------------------------
diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/CreatePrimaryZone.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/CreatePrimaryZone.java
index 04bdb1f..ff3a43b 100644
--- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/CreatePrimaryZone.java
+++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/CreatePrimaryZone.java
@@ -17,7 +17,7 @@
package org.jclouds.dynect.v3.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import javax.inject.Named;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/CreateRecord.java
----------------------------------------------------------------------
diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/CreateRecord.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/CreateRecord.java
index bf9dd04..dbb30d7 100644
--- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/CreateRecord.java
+++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/CreateRecord.java
@@ -17,7 +17,7 @@
package org.jclouds.dynect.v3.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.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/a493e2ca/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/GeoRegionGroup.java
----------------------------------------------------------------------
diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/GeoRegionGroup.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/GeoRegionGroup.java
index 0910036..c9d027b 100644
--- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/GeoRegionGroup.java
+++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/GeoRegionGroup.java
@@ -17,7 +17,7 @@
package org.jclouds.dynect.v3.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/GeoService.java
----------------------------------------------------------------------
diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/GeoService.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/GeoService.java
index 23aa4be..a24959a 100644
--- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/GeoService.java
+++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/GeoService.java
@@ -17,7 +17,7 @@
package org.jclouds.dynect.v3.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Job.java
----------------------------------------------------------------------
diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Job.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Job.java
index e03444e..0217840 100644
--- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Job.java
+++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Job.java
@@ -17,7 +17,7 @@
package org.jclouds.dynect.v3.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Node.java
----------------------------------------------------------------------
diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Node.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Node.java
index 24e122c..576d33a 100644
--- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Node.java
+++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Node.java
@@ -20,6 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
public class Node {
@@ -70,6 +71,6 @@ public class Node {
@Override
public String toString() {
- return Objects.toStringHelper("").add("zone", zone).add("fqdn", fqdn).toString();
+ return MoreObjects.toStringHelper("").add("zone", zone).add("fqdn", fqdn).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Record.java
----------------------------------------------------------------------
diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Record.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Record.java
index 084dc6a..ec6aeeb 100644
--- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Record.java
+++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Record.java
@@ -24,7 +24,7 @@ import java.util.Map;
import javax.inject.Named;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
public class Record<D extends Map<String, Object>> extends RecordId {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/RecordId.java
----------------------------------------------------------------------
diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/RecordId.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/RecordId.java
index e5b5476..b384b1b 100644
--- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/RecordId.java
+++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/RecordId.java
@@ -17,13 +17,13 @@
package org.jclouds.dynect.v3.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
public class RecordId extends Node {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/RecordSet.java
----------------------------------------------------------------------
diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/RecordSet.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/RecordSet.java
index aeed65e..8131317 100644
--- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/RecordSet.java
+++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/RecordSet.java
@@ -17,7 +17,7 @@
package org.jclouds.dynect.v3.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.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/a493e2ca/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/SOARecord.java
----------------------------------------------------------------------
diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/SOARecord.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/SOARecord.java
index b64e139..08fa9ca 100644
--- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/SOARecord.java
+++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/SOARecord.java
@@ -25,7 +25,7 @@ import javax.inject.Named;
import org.jclouds.dynect.v3.domain.Zone.SerialStyle;
import org.jclouds.dynect.v3.domain.rdata.SOAData;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Start of Authority per RFC 1035
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Session.java
----------------------------------------------------------------------
diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Session.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Session.java
index 3cc7ecc..fda4736 100644
--- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Session.java
+++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Session.java
@@ -20,6 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
public final class Session {
@@ -70,6 +71,6 @@ public final class Session {
@Override
public String toString() {
- return Objects.toStringHelper(this).add("token", token).add("version", version).toString();
+ return MoreObjects.toStringHelper(this).add("token", token).add("version", version).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/SessionCredentials.java
----------------------------------------------------------------------
diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/SessionCredentials.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/SessionCredentials.java
index 752bf5c..2347899 100644
--- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/SessionCredentials.java
+++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/SessionCredentials.java
@@ -24,6 +24,7 @@ import javax.inject.Named;
import org.jclouds.domain.Credentials;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -144,6 +145,6 @@ public final class SessionCredentials extends Credentials {
@Override
public String toString() {
- return Objects.toStringHelper(this).add("userName", identity).add("customerName", customerName).toString();
+ return MoreObjects.toStringHelper(this).add("userName", identity).add("customerName", customerName).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Zone.java
----------------------------------------------------------------------
diff --git a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Zone.java b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Zone.java
index a229fb8..287bb5c 100644
--- a/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Zone.java
+++ b/providers/dynect/src/main/java/org/jclouds/dynect/v3/domain/Zone.java
@@ -17,7 +17,7 @@
package org.jclouds.dynect.v3.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/glesys/src/main/java/org/jclouds/glesys/compute/options/GleSYSTemplateOptions.java
----------------------------------------------------------------------
diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/compute/options/GleSYSTemplateOptions.java b/providers/glesys/src/main/java/org/jclouds/glesys/compute/options/GleSYSTemplateOptions.java
index d85a455..912d716 100644
--- a/providers/glesys/src/main/java/org/jclouds/glesys/compute/options/GleSYSTemplateOptions.java
+++ b/providers/glesys/src/main/java/org/jclouds/glesys/compute/options/GleSYSTemplateOptions.java
@@ -23,7 +23,7 @@ import java.util.Map;
import org.jclouds.compute.options.TemplateOptions;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.net.InetAddresses;
/**
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/glesys/src/main/java/org/jclouds/glesys/domain/AllowedArguments.java
----------------------------------------------------------------------
diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/AllowedArguments.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/AllowedArguments.java
index 9e3d968..11bbc6d 100644
--- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/AllowedArguments.java
+++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/AllowedArguments.java
@@ -21,8 +21,9 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
import java.util.Set;
+import com.google.common.base.MoreObjects;
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;
/**
@@ -122,7 +123,7 @@ public class AllowedArguments {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("").add("costPerUnit", this.costPerUnit)
+ return MoreObjects.toStringHelper("").add("costPerUnit", this.costPerUnit)
.add("allowedUnits", this.allowedUnits);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/glesys/src/main/java/org/jclouds/glesys/domain/AllowedArgumentsForCreateServer.java
----------------------------------------------------------------------
diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/AllowedArgumentsForCreateServer.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/AllowedArgumentsForCreateServer.java
index 5eb568f..9fb171e 100644
--- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/AllowedArgumentsForCreateServer.java
+++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/AllowedArgumentsForCreateServer.java
@@ -21,8 +21,9 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
import java.util.Set;
+import com.google.common.base.MoreObjects;
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;
/**
@@ -205,7 +206,7 @@ public class AllowedArgumentsForCreateServer {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("").add("diskSizesInGB", diskSizesInGB).add("memorySizesInMB", memorySizesInMB)
+ return MoreObjects.toStringHelper("").add("diskSizesInGB", diskSizesInGB).add("memorySizesInMB", memorySizesInMB)
.add("cpuCoreOptions", cpuCoreOptions).add("templateNames", templateNames)
.add("transfersInGB", transfersInGB).add("dataCenters", dataCenters);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/glesys/src/main/java/org/jclouds/glesys/domain/Archive.java
----------------------------------------------------------------------
diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/Archive.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/Archive.java
index 6141782..99c04db 100644
--- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/Archive.java
+++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/Archive.java
@@ -20,8 +20,9 @@ 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.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Information about an archive
@@ -158,7 +159,7 @@ public class Archive {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("username", username).add("totalSize", totalSize).add("freeSize", freeSize).add("locked", locked);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/a493e2ca/providers/glesys/src/main/java/org/jclouds/glesys/domain/ArchiveAllowedArguments.java
----------------------------------------------------------------------
diff --git a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ArchiveAllowedArguments.java b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ArchiveAllowedArguments.java
index b93332b..ef39156 100644
--- a/providers/glesys/src/main/java/org/jclouds/glesys/domain/ArchiveAllowedArguments.java
+++ b/providers/glesys/src/main/java/org/jclouds/glesys/domain/ArchiveAllowedArguments.java
@@ -21,8 +21,9 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
import java.util.List;
+import com.google.common.base.MoreObjects;
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;
/**
@@ -103,7 +104,7 @@ public class ArchiveAllowedArguments {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("archiveSizes", archiveSizes);
}