You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ad...@apache.org on 2014/10/24 19:50:17 UTC
[1/8] Revert "JCLOUDS-653: Address Guava 18 deprecations"
Repository: jclouds
Updated Branches:
refs/heads/master f134367c6 -> 0339cd2fd
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 520ce4c..a65acfa 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,9 +22,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.primitives.Longs;
/**
@@ -137,7 +136,7 @@ public class Option implements Comparable<Option> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("name", name).add("description", description);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 970129b..2c85fab 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,9 +22,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.primitives.Longs;
/**
@@ -271,7 +270,7 @@ public class Server implements Comparable<Server> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.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/3980cd79/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 63b41cf..b8a7966 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,9 +24,8 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableSet;
import com.google.common.primitives.Longs;
@@ -366,7 +365,7 @@ public class ServerImage implements Comparable<ServerImage> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.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/3980cd79/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 19578d5..6a3e639 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,9 +20,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ComparisonChain;
/**
@@ -120,7 +119,7 @@ public class ErrorResponse implements Comparable<ErrorResponse> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("message", message).add("errorCode", errorCode);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/domain/CDNContainer.java
----------------------------------------------------------------------
diff --git a/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/domain/CDNContainer.java b/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/domain/CDNContainer.java
index 58bb631..e674b27 100644
--- a/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/domain/CDNContainer.java
+++ b/providers/hpcloud-objectstorage/src/main/java/org/jclouds/hpcloud/objectstorage/domain/CDNContainer.java
@@ -21,10 +21,9 @@ import java.net.URI;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
import com.google.common.base.Strings;
+import com.google.common.base.Objects.ToStringHelper;
public class CDNContainer implements Comparable<CDNContainer> {
@@ -204,7 +203,7 @@ public class CDNContainer implements Comparable<CDNContainer> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("name", name).add("cdnEnabled", cdnEnabled)
+ return Objects.toStringHelper(this).omitNullValues().add("name", name).add("cdnEnabled", cdnEnabled)
.add("ttl", ttl).add("CDNUri", CDNUri).add("CDNSslUri", CDNSslUri).add("referrerAcl", referrerAcl)
.add("useragentAcl", useragentAcl).add("logRetention", logRetention);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/providers/hpcloud-objectstorage/src/test/java/org/jclouds/hpcloud/objectstorage/internal/BaseHPCloudObjectStorageMockTest.java
----------------------------------------------------------------------
diff --git a/providers/hpcloud-objectstorage/src/test/java/org/jclouds/hpcloud/objectstorage/internal/BaseHPCloudObjectStorageMockTest.java b/providers/hpcloud-objectstorage/src/test/java/org/jclouds/hpcloud/objectstorage/internal/BaseHPCloudObjectStorageMockTest.java
index 4074229..8491708 100644
--- a/providers/hpcloud-objectstorage/src/test/java/org/jclouds/hpcloud/objectstorage/internal/BaseHPCloudObjectStorageMockTest.java
+++ b/providers/hpcloud-objectstorage/src/test/java/org/jclouds/hpcloud/objectstorage/internal/BaseHPCloudObjectStorageMockTest.java
@@ -16,7 +16,7 @@
*/
package org.jclouds.hpcloud.objectstorage.internal;
-import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService;
+import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor;
import static org.jclouds.Constants.PROPERTY_MAX_RETRIES;
import java.io.IOException;
@@ -46,7 +46,7 @@ public class BaseHPCloudObjectStorageMockTest {
.credentials("jclouds:joe", "letmein") //
.endpoint(uri) //
.overrides(overrides) //
- .modules(ImmutableSet.<Module> of(new ExecutorServiceModule(newDirectExecutorService()))) //
+ .modules(ImmutableSet.<Module> of(new ExecutorServiceModule(sameThreadExecutor()))) //
.buildApi(HPCloudObjectStorageApi.class);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 a026d4e..82ea706 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
@@ -16,7 +16,6 @@
*/
package org.jclouds.softlayer.domain;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.inject.name.Named;
import org.jclouds.javax.annotation.Nullable;
@@ -307,7 +306,7 @@ public class Address {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id)
.add("country", country)
.add("state", state)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 8219bc9..6834d31 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,7 +17,6 @@
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.collect.FluentIterable;
@@ -259,7 +258,7 @@ public class ContainerVirtualGuestConfiguration {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("blockDevices", blockDevices)
.add("datacenters", datacenters)
.add("memory", memory)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 28e9673..c2201d3 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,7 +21,6 @@ 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;
@@ -102,7 +101,7 @@ public class ContainerVirtualGuestConfigurationOption {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("productItemPrice", productItemPrice)
.add("template", template)
.toString();
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 9e02856..5180ab6 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,7 +22,6 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
@@ -197,7 +196,7 @@ public class Datacenter {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id)
.add("name", name)
.add("longName", longName)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 1132cee..053a91a 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,7 +22,6 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
@@ -152,7 +151,7 @@ public class OperatingSystem {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id)
.add("softwareLicense", softwareLicense)
.add("operatingSystemReferenceCode", operatingSystemReferenceCode)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 29af98c..49ff2cd 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,7 +22,6 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -140,7 +139,7 @@ public class Password {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id)
.add("username", username)
.add("password", password)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 a39e9a5..81e8af2 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,9 +22,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* The power state class provides a common set of values for which a guest's power state will be presented in the SoftLayer API.
@@ -103,7 +102,7 @@ public class PowerState {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("keyName", keyName);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 221d2fa..79c8d5b 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,7 +20,6 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -79,7 +78,7 @@ public class ProductItem {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id)
.add("description", description)
.add("softwareDescriptionId", softwareDescriptionId)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 295e288..8bfc0ec 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,7 +19,6 @@ 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;
/**
@@ -77,7 +76,7 @@ public class ProductItemPrice {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id)
.add("hourlyRecurringFee", hourlyRecurringFee)
.add("recurringFee", recurringFee)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 fca375c..fa91e82 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,7 +22,6 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -115,7 +114,7 @@ public class Region implements Comparable<Region> {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("sortOrder", sortOrder)
.add("keyname", keyname)
.add("description", description)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 5aa74ee..11adef6 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,7 +20,6 @@ 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 {
@@ -283,7 +282,7 @@ public class SoftwareDescription {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id)
.add("longDescription", longDescription)
.add("manufacturer", manufacturer)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 20b9085..78f8431 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,7 +16,6 @@
*/
package org.jclouds.softlayer.domain;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import org.jclouds.javax.annotation.Nullable;
@@ -72,7 +71,7 @@ public class SoftwareLicense {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id)
.add("softwareDescription", softwareDescription)
.add("softwareDescriptionId", softwareDescriptionId)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 252c3e3..719f110 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,7 +19,6 @@ 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 {
@@ -72,7 +71,7 @@ public class Tag {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("accountId", accountId)
.add("id", id)
.add("internal", internal)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 ef9edff..924e5bc 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,7 +20,6 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -106,7 +105,7 @@ public class TagReference {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id)
.add("usrRecordId", usrRecordId)
.add("tagTypeId", tagTypeId)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 ac250a6..8fbe417 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,7 +16,6 @@
*/
package org.jclouds.softlayer.domain;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import org.jclouds.javax.annotation.Nullable;
@@ -58,7 +57,7 @@ public class TagType {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("keyName", keyName)
.add("description", description)
.toString();
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 2ca3bbf..3315b4b 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,7 +22,6 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
@@ -235,7 +234,7 @@ public class VirtualDiskImage {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id)
.add("uuid", uuid)
.add("capacity", capacity)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 e85690d..3378d75 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,7 +20,6 @@ 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 {
@@ -118,7 +117,7 @@ public class VirtualDiskImageSoftware {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id)
.add("softwareDescriptionId", softwareDescriptionId)
.add("softwareDescription", softwareDescription)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 f4f57b5..9216634 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,7 +21,6 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -227,7 +226,7 @@ public class VirtualGuestBlockDevice {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id)
.add("uuid", uuid)
.add("statusId", statusId)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 fbe08a7..aa4aed5 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,7 +19,6 @@ 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;
/**
@@ -190,7 +189,7 @@ public class VirtualGuestBlockDeviceTemplate {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id)
.add("device", device)
.add("diskImageId", diskImageId)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 d1b2b33..09587a6 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,7 +22,6 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
@@ -242,7 +241,7 @@ public class VirtualGuestBlockDeviceTemplateGroup {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id)
.add("name", name)
.add("globalIdentifier", globalIdentifier)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 843b044..82a28e5 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,7 +20,6 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -248,7 +247,7 @@ public class VirtualGuestNetworkComponent {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id)
.add("uuid", uuid)
.add("guestId", guestId)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 8e89f56..d23c78a 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,7 +21,6 @@ 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 {
@@ -75,7 +74,7 @@ public final class AccountLevelGroup {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("id", id).add("name", name).add("type", type)
+ return Objects.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/3980cd79/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 a6864d7..fea2f45 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.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.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/3980cd79/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 3527721..320ca8a 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.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 6e41c5e..7db64d9 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,7 +18,6 @@ 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;
@@ -148,7 +147,7 @@ public final class DirectionalPool {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("zoneId", zoneId).add("id", id).add("dname", dname)
+ return Objects.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/3980cd79/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 9f3c77d..1db37f0 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.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.collect.Iterables.transform;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 ee30287..a7dc449 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.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.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/3980cd79/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 21c181f..972a3d3 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,7 +21,6 @@ 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;
@@ -72,7 +71,7 @@ public final class IdAndName {
@Override
public String toString() {
- return MoreObjects.toStringHelper("").add("id", id).add("name", name).toString();
+ return Objects.toStringHelper("").add("id", id).add("name", name).toString();
}
/**
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 b0c29f1..d6e4b0b 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.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 07dfbda..fcb85ab 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.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.collect.Iterables.transform;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 fc80706..a29e103 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.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Date;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 cefb52f..2ae13c1 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,7 +18,6 @@ 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 {
@@ -107,7 +106,7 @@ public final class RoundRobinPool {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("zoneId", zoneId).add("id", id).add("name", name)
+ return Objects.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/3980cd79/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 86af600..6fc26b2 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,7 +20,6 @@ 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;
@@ -83,7 +82,7 @@ public final class Task {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).add("guid", guid).add("statusCode", statusCode).add("message", message)
+ return Objects.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/3980cd79/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 a80c127..6e69a3d 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,7 +18,6 @@ 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;
/**
@@ -144,7 +143,7 @@ public final class TrafficControllerPool {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("zoneId", zoneId).add("id", id).add("name", name)
+ return Objects.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/3980cd79/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 0f7952e..4c30008 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.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.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/3980cd79/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 ae0a3d2..bda5ffc 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,7 +19,6 @@ 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 {
@@ -146,7 +145,7 @@ public final class TrafficControllerPoolRecordDetail {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).add("id", id).add("poolId", poolId).add("record", record)
+ return Objects.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/3980cd79/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 04f163b..80b0c79 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.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 1aaeb78..50349bf 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,7 +19,6 @@ 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;
@@ -123,7 +122,7 @@ public final class Zone {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("id", id).add("name", name).add("type", type)
+ return Objects.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/3980cd79/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 ab9bceb..58a6866 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,7 +23,6 @@ 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 {
@@ -95,7 +94,7 @@ public final class ZoneProperties {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).add("name", name).add("type", type)
+ return Objects.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/3980cd79/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 a7fd425..a684d02 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.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.collect.Iterables.concat;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 b5bf0f2..5df47c6 100644
--- a/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/GitRepoAndRef.java
+++ b/scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/GitRepoAndRef.java
@@ -20,7 +20,6 @@ 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;
@@ -146,7 +145,7 @@ public class GitRepoAndRef {
*/
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("repository", repository).add("branch", branch.orNull())
+ return Objects.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/3980cd79/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 be13c0d..dd3d264 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,7 +20,6 @@ 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;
@@ -105,7 +104,7 @@ public class DataBag extends ForwardingMap<String, String> {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).add("name", name).toString();
+ return Objects.toStringHelper(this).add("name", name).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 7b383df..5adad79 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,7 +18,6 @@ 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;
@@ -140,7 +139,7 @@ public class Role {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("name", name).add("description", description.orNull())
+ return Objects.toStringHelper(this).omitNullValues().add("name", name).add("description", description.orNull())
.toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 4793f7a..1300fca 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,7 +25,6 @@ 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;
@@ -191,7 +190,7 @@ public class CloneGitRepo implements Statement {
*/
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("gitRepoAndRef", gitRepoAndRef)
+ return Objects.toStringHelper(this).omitNullValues().add("gitRepoAndRef", gitRepoAndRef)
.add("directory", directory.orNull()).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 250727a..5f4aeeb 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.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkArgument;
import java.io.File;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 370f76e..2fac592 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,7 +31,6 @@ 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;
@@ -254,6 +253,6 @@ public class UserAdd implements Statement {
@Override
public String toString() {
- return MoreObjects.toStringHelper("").add("login", login).toString();
+ return Objects.toStringHelper("").add("login", login).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 92feb7b..bbed39a 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,7 +16,6 @@
*/
package org.jclouds.servermanager;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -51,7 +50,7 @@ public class Datacenter {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).add("id", id).add("name", name).toString();
+ return Objects.toStringHelper(this).add("id", id).add("name", name).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 f0068bd..f17cace 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,7 +16,6 @@
*/
package org.jclouds.servermanager;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -60,7 +59,7 @@ public class Hardware {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).add("id", id).add("name", name).add("cores", cores).add("ram", ram)
+ return Objects.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/3980cd79/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 e187a03..dc192cd 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,7 +16,6 @@
*/
package org.jclouds.servermanager;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -51,7 +50,7 @@ public class Image {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).add("id", id).add("name", name).toString();
+ return Objects.toStringHelper(this).add("id", id).add("name", name).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 3c2a8dd..ea8eac4 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,7 +16,6 @@
*/
package org.jclouds.servermanager;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -67,7 +66,7 @@ public class Server {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).add("id", id).add("name", name).add("status", status)
+ return Objects.toStringHelper(this).add("id", id).add("name", name).add("status", status)
.add("datacenter", datacenter).add("imageId", imageId).add("hardwareId", hardwareId)
.add("publicAddress", publicAddress).add("privateAddress", privateAddress).add("loginUser", loginUser)
.toString();
[8/8] git commit: JCLOUDS-653 revert guava 18.
Posted by ad...@apache.org.
JCLOUDS-653 revert guava 18.
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/0339cd2f
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/0339cd2f
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/0339cd2f
Branch: refs/heads/master
Commit: 0339cd2fd07ecdcc42fa0ebc74f6c1d9014eebfd
Parents: 3980cd7
Author: Adrian Cole <ac...@twitter.com>
Authored: Fri Oct 24 10:14:17 2014 -0700
Committer: Adrian Cole <ad...@apache.org>
Committed: Fri Oct 24 10:46:09 2014 -0700
----------------------------------------------------------------------
core/pom.xml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/0339cd2f/core/pom.xml
----------------------------------------------------------------------
diff --git a/core/pom.xml b/core/pom.xml
index e73b1cb..6f82aec 100644
--- a/core/pom.xml
+++ b/core/pom.xml
@@ -95,7 +95,7 @@
<dependency>
<groupId>com.google.guava</groupId>
<artifactId>guava</artifactId>
- <version>18.0</version>
+ <version>17.0</version>
</dependency>
<dependency>
<groupId>org.osgi</groupId>
[7/8] git commit: Revert "JCLOUDS-653: Address Guava 18 deprecations"
Posted by ad...@apache.org.
Revert "JCLOUDS-653: Address Guava 18 deprecations"
This reverts commit 95cfc0d950861e5bc753ee3b0669aa5c59c217e8.
Many conflicts due to duration between above commit and now
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/3980cd79
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/3980cd79
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/3980cd79
Branch: refs/heads/master
Commit: 3980cd791b727e22a7d3f20e645ce7cbb9e311bf
Parents: f134367
Author: Adrian Cole <ad...@gmail.com>
Authored: Thu Oct 23 20:48:35 2014 -0700
Committer: Adrian Cole <ad...@apache.org>
Committed: Fri Oct 24 10:45:58 2014 -0700
----------------------------------------------------------------------
apis/byon/src/main/java/org/jclouds/byon/Node.java | 3 +--
.../java/org/jclouds/cloudservers/domain/AbsoluteLimit.java | 5 ++---
.../java/org/jclouds/cloudservers/domain/Addresses.java | 5 ++---
.../org/jclouds/cloudservers/domain/BackupSchedule.java | 5 ++---
.../main/java/org/jclouds/cloudservers/domain/Flavor.java | 5 ++---
.../main/java/org/jclouds/cloudservers/domain/Image.java | 5 ++---
.../main/java/org/jclouds/cloudservers/domain/Limits.java | 5 ++---
.../java/org/jclouds/cloudservers/domain/RateLimit.java | 5 ++---
.../main/java/org/jclouds/cloudservers/domain/Server.java | 5 ++---
.../main/java/org/jclouds/cloudservers/domain/ShareIp.java | 5 ++---
.../java/org/jclouds/cloudservers/domain/SharedIpGroup.java | 5 ++---
.../main/java/org/jclouds/cloudservers/domain/Version.java | 5 ++---
.../config/CloudStackComputeServiceContextModule.java | 6 +++---
.../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 | 8 ++++----
.../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 | 8 ++++----
.../main/java/org/jclouds/cloudstack/domain/Template.java | 8 ++++----
.../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 ++---
.../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 ++---
.../org/jclouds/openstack/cinder/v1/domain/Snapshot.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 ++---
.../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 ++---
.../openstack/v2_0/internal/BaseOpenStackMockTest.java | 4 ++--
.../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 ++--
.../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 | 4 ++--
.../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 ++---
.../org/jclouds/openstack/nova/v2_0/domain/KeyPair.java | 5 ++---
.../org/jclouds/openstack/nova/v2_0/domain/Network.java | 9 ++++-----
.../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/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 | 6 ++----
.../regionscoped/RegionSecurityGroupNameAndPorts.java | 2 +-
.../v2_0/domain/regionscoped/SecurityGroupInRegion.java | 2 +-
.../nova/v2_0/domain/regionscoped/ServerInRegion.java | 2 +-
.../nova/v2_0/domain/zonescoped/AvailabilityZone.java | 9 ++++-----
.../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 ++---
.../jclouds/rackspace/cloudidentity/v1_1/domain/Auth.java | 2 +-
.../rackspace/cloudidentity/v1_1/domain/Endpoint.java | 2 +-
.../jclouds/rackspace/cloudidentity/v1_1/domain/Token.java | 2 +-
.../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 | 6 +++---
.../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 +-
apis/s3/src/test/java/org/jclouds/s3/S3ClientMockTest.java | 4 ++--
.../blobstore/functions/BucketsToStorageMetadataTest.java | 4 ++--
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 +--
.../org/jclouds/sqs/features/PermissionApiLiveTest.java | 4 ++--
.../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 +--
.../org/jclouds/openstack/swift/domain/AccountMetadata.java | 5 ++---
.../jclouds/openstack/swift/domain/ContainerMetadata.java | 5 ++---
.../openstack/swift/domain/internal/ObjectInfoImpl.java | 5 ++---
.../internal/SequentialMultipartUploadStrategyMockTest.java | 4 ++--
.../vcloud/compute/options/VCloudTemplateOptions.java | 2 +-
.../java/org/jclouds/vcloud/config/VCloudHttpApiModule.java | 4 ++--
.../jclouds/vcloud/domain/internal/ReferenceTypeImpl.java | 5 ++---
.../java/org/jclouds/vcloud/domain/internal/TaskImpl.java | 4 ++--
.../java/org/jclouds/vcloud/domain/network/DhcpService.java | 3 +--
.../java/org/jclouds/vcloud/domain/network/Features.java | 3 +--
.../org/jclouds/vcloud/domain/network/FirewallService.java | 5 ++---
.../java/org/jclouds/vcloud/domain/network/IpRange.java | 3 +--
.../java/org/jclouds/vcloud/domain/network/IpScope.java | 5 ++---
.../java/org/jclouds/vcloud/domain/network/NatService.java | 5 ++---
.../vcloud/domain/network/firewall/FirewallProtocols.java | 3 +--
.../vcloud/domain/network/firewall/FirewallRule.java | 3 +--
.../vcloud/domain/network/internal/OrgNetworkImpl.java | 5 ++---
.../vcloud/domain/network/nat/rules/OneToOneVmRule.java | 3 +--
.../vcloud/domain/network/nat/rules/PortForwardingRule.java | 3 +--
.../org/jclouds/vcloud/domain/network/nat/rules/VmRule.java | 3 +--
.../vcloud/options/InstantiateVAppTemplateOptions.java | 5 ++---
.../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 | 2 +-
.../strategy/impl/ReturnCredentialsBoundToImage.java | 4 ++--
.../src/main/java/org/jclouds/net/domain/IpPermission.java | 5 ++---
...lockUntilInitScriptStatusIsZeroThenReturnOutputTest.java | 8 ++++----
...OnNodeAsInitScriptUsingSshAndBlockUntilCompleteTest.java | 4 ++--
core/src/main/java/org/jclouds/ContextBuilder.java | 6 +++---
.../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 ++---
.../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 +-
.../java/org/jclouds/lifecycle/config/LifeCycleModule.java | 4 ++--
.../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 +++---
.../java/org/jclouds/concurrent/FutureIterablesTest.java | 6 +++---
.../org/jclouds/rest/internal/BaseRestApiExpectTest.java | 4 ++--
.../java/org/jclouds/rest/internal/BaseRestApiTest.java | 4 ++--
.../gae/config/GoogleAppEngineConfigurationModule.java | 5 ++---
.../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 +-
.../main/java/org/jclouds/aws/s3/domain/DeleteResult.java | 5 ++---
.../internal/SequentialMultipartUploadStrategyMockTest.java | 4 ++--
.../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 +-
.../test/java/org/jclouds/dynect/v3/DynectApiMockTest.java | 4 ++--
.../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 ++---
.../jclouds/hpcloud/objectstorage/domain/CDNContainer.java | 5 ++---
.../internal/BaseHPCloudObjectStorageMockTest.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 +--
.../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 +--
.../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 +--
.../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 +--
434 files changed, 728 insertions(+), 1025 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 61bf0b3..814b854 100644
--- a/apis/byon/src/main/java/org/jclouds/byon/Node.java
+++ b/apis/byon/src/main/java/org/jclouds/byon/Node.java
@@ -20,7 +20,6 @@ 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;
@@ -300,7 +299,7 @@ public class Node {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).add("id", id).add("name", name).add("description", description)
+ return Objects.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/3980cd79/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/AbsoluteLimit.java
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/AbsoluteLimit.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/AbsoluteLimit.java
index 638a209..286b2c3 100644
--- a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/AbsoluteLimit.java
+++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/AbsoluteLimit.java
@@ -20,9 +20,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Class AbsoluteLimit
@@ -112,7 +111,7 @@ public class AbsoluteLimit {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("name", name).add("value", value);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Addresses.java
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Addresses.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Addresses.java
index 1ddbbfd..a308f67 100644
--- a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Addresses.java
+++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Addresses.java
@@ -26,9 +26,8 @@ import javax.inject.Named;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
@@ -131,7 +130,7 @@ public class Addresses {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("publicAddresses", publicAddresses).add("privateAddresses", privateAddresses);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/BackupSchedule.java
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/BackupSchedule.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/BackupSchedule.java
index ea8f73f..dc46e3a 100644
--- a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/BackupSchedule.java
+++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/BackupSchedule.java
@@ -20,9 +20,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* A backup schedule can be defined to create server images at regular intervals (daily and weekly).
@@ -132,7 +131,7 @@ public class BackupSchedule {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("daily", daily).add("enabled", enabled).add("weekly", weekly);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Flavor.java
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Flavor.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Flavor.java
index fe24514..4edc77f 100644
--- a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Flavor.java
+++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Flavor.java
@@ -22,9 +22,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* A flavor is an available hardware configuration for a server. Each flavor has a unique
@@ -151,7 +150,7 @@ public class Flavor {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("name", name).add("disk", disk).add("ram", ram);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Image.java
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Image.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Image.java
index 01ed54a..61c8397 100644
--- a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Image.java
+++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Image.java
@@ -23,9 +23,8 @@ import java.util.Date;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* An image is a collection of files used to create or rebuild a server. Rackspace provides a number
@@ -208,7 +207,7 @@ public class Image {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("created", created).add("id", id).add("name", name).add("progress", progress).add("serverId", serverId).add("status", status).add("updated", updated);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Limits.java
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Limits.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Limits.java
index 6b72a5c..1b085c8 100644
--- a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Limits.java
+++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Limits.java
@@ -22,9 +22,8 @@ import java.beans.ConstructorProperties;
import java.util.Map;
import java.util.Set;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
@@ -119,7 +118,7 @@ public class Limits {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("rate", rate).add("absolute", absolute);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/RateLimit.java
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/RateLimit.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/RateLimit.java
index ad012bb..b56f623 100644
--- a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/RateLimit.java
+++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/RateLimit.java
@@ -22,9 +22,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* RateLimit.
@@ -214,7 +213,7 @@ public class RateLimit {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("uri", uri).add("regex", regex).add("remaining", remaining).add("resetTime", resetTime).add("unit", unit).add("value", value).add("verb", verb);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Server.java
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Server.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Server.java
index 2c1dc89..6590a41 100644
--- a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Server.java
+++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Server.java
@@ -23,9 +23,8 @@ import java.util.Map;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableMap;
/**
@@ -290,7 +289,7 @@ public class Server {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("name", name).add("metadata", metadata).add("addresses", addresses).add("adminPass", adminPass).add("flavorId", flavorId).add("hostId", hostId).add("imageId", imageId).add("sharedIpGroupId", sharedIpGroupId).add("progress", progress).add("status", status);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/ShareIp.java
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/ShareIp.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/ShareIp.java
index c3a869f..9c18f29 100644
--- a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/ShareIp.java
+++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/ShareIp.java
@@ -18,9 +18,8 @@ package org.jclouds.cloudservers.domain;
import java.beans.ConstructorProperties;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Class ShareIp
@@ -109,7 +108,7 @@ public class ShareIp {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("configureServer", configureServer).add("sharedIpGroupId", sharedIpGroupId);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/SharedIpGroup.java
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/SharedIpGroup.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/SharedIpGroup.java
index d658c50..62354e3 100644
--- a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/SharedIpGroup.java
+++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/SharedIpGroup.java
@@ -23,9 +23,8 @@ import java.util.List;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableList;
/**
@@ -141,7 +140,7 @@ public class SharedIpGroup {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("name", name).add("servers", servers);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Version.java
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Version.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Version.java
index 9a569ca..753f0eb 100644
--- a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Version.java
+++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Version.java
@@ -22,9 +22,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Class Version
@@ -148,7 +147,7 @@ public class Version {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("docURL", docURL).add("id", id).add("status", status).add("wadl", wadl);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 b2c02ad..572e7ec 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.MoreObjects;
+import com.google.common.base.Objects;
import com.google.common.base.Optional;
import com.google.common.base.Predicate;
import com.google.common.base.Supplier;
@@ -179,7 +179,7 @@ public class CloudStackComputeServiceContextModule extends
}
@Override
public String toString() {
- return MoreObjects.toStringHelper(client.getGuestOSApi()).add("method", "listOSCategories").toString();
+ return Objects.toStringHelper(client.getGuestOSApi()).add("method", "listOSCategories").toString();
}
}, seconds, TimeUnit.SECONDS);
}
@@ -204,7 +204,7 @@ public class CloudStackComputeServiceContextModule extends
}
@Override
public String toString() {
- return MoreObjects.toStringHelper(client.getGuestOSApi()).add("method", "listOSTypes").toString();
+ return Objects.toStringHelper(client.getGuestOSApi()).add("method", "listOSTypes").toString();
}
}, seconds, TimeUnit.SECONDS);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 8dad3a9..761003d 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,9 +26,8 @@ import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.CaseFormat;
import com.google.common.base.Function;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ForwardingSet;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
@@ -777,7 +776,7 @@ public class Account extends ForwardingSet<User> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.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/3980cd79/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 e46ec15..70ba897 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,9 +23,8 @@ import java.util.Date;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Represents an alert issued by Cloudstack
@@ -151,7 +150,7 @@ public class Alert {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("description", description).add("sent", sent).add("type", type);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 4acfa0c..17883a7 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,9 +20,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Representation of the API keypair response
@@ -113,7 +112,7 @@ public class ApiKeyPair {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("apiKey", apiKey).add("secretKey", secretKey);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/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 8db03f7..0df0546 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,9 +20,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Class AsyncCreateResponse
@@ -120,7 +119,7 @@ public class AsyncCreateResponse {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("jobId", jobId);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 229d7ef..b82665c 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,9 +23,8 @@ import java.util.Date;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Class AsyncJob
@@ -442,7 +441,7 @@ public class AsyncJob<S> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.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/3980cd79/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 15c4399..1805ec8 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,9 +20,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
public class AsyncJobError {
@@ -150,7 +149,7 @@ public class AsyncJobError {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("errorCode", errorCode).add("errorText", errorText);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 e6e7e79..faabfc1 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,9 +20,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Class Capabilities
@@ -176,7 +175,7 @@ public class Capabilities {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.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/3980cd79/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 1e87723..fd12bef 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,9 +24,8 @@ import java.util.Map;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.Function;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
@@ -267,7 +266,7 @@ public class Capacity implements Comparable<Capacity> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.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/3980cd79/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 a3b75fa..d53ad6f 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,9 +24,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Represents a CloudStack Cluster.
@@ -285,7 +284,7 @@ public class Cluster implements Comparable<Cluster> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.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/3980cd79/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 ceb0f84..a0526e3 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,9 +22,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Representation of the API configuration entry response
@@ -150,7 +149,7 @@ public class ConfigurationEntry implements Comparable<ConfigurationEntry> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("category", category).add("description", description).add("name", name).add("value", value);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 9f9377f..452457a 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,9 +24,8 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
@@ -277,7 +276,7 @@ public class DiskOffering implements Comparable<DiskOffering> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("name", name).add("displayText", displayText).add("created", created).add("domain", domain)
.add("domainId", domainId).add("diskSize", diskSize).add("customized", customized).add("tags", tags);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 29f0fd4..ca203b9 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,9 +22,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Representation of the API domain response
@@ -203,7 +202,7 @@ public class Domain implements Comparable<Domain> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.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/3980cd79/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 bb81cd1..c0b4330 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,7 +20,6 @@ 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 {
@@ -107,7 +106,7 @@ public final class EncryptedPasswordAndPrivateKey {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues()
+ return Objects.toStringHelper(this).omitNullValues()
.add("encryptedPassword", encryptedPassword).add("privateKey", privateKey).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 87c442b..ef324b0 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,9 +23,8 @@ import java.util.Date;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Class Event
@@ -314,7 +313,7 @@ public class Event implements Comparable<Event> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.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/3980cd79/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 8c604b8..144f232 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,9 +24,8 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.CaseFormat;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
@@ -342,7 +341,7 @@ public class FirewallRule implements Comparable<FirewallRule> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.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/3980cd79/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 d80982b..f6e26f9 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,9 +26,8 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
@@ -931,7 +930,7 @@ public class Host implements Comparable<Host> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.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/3980cd79/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 e06888b..80c98b3 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,9 +23,8 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
@@ -403,7 +402,7 @@ public class IPForwardingRule implements Comparable<IPForwardingRule> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.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/3980cd79/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 a93304a..3a4226f 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,9 +25,8 @@ import java.util.Set;
import com.google.common.collect.ImmutableSet;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Class ISO
@@ -777,7 +776,7 @@ public class ISO {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.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/3980cd79/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 e6706e5..0e6bb63 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,9 +23,8 @@ import java.util.Date;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Class ISOExtraction
@@ -354,7 +353,7 @@ public class ISOExtraction {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("accountId", accountId).add("created", created).add("extractId", extractId).add("extractMode", extractMode)
.add("name", name).add("state", state).add("status", status).add("storageType", storageType).add("uploadPercentage", uploadPercentage)
.add("url", url).add("zoneId", zoneId).add("zoneName", zoneName);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/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 b85e741..5a3b62e 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,9 +23,8 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
@@ -166,7 +165,7 @@ public class ISOPermissions {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("accounts", accounts).add("domainId", domainId).add("isPublic", isPublic);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/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 df3a388..d072a46 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
@@ -21,11 +21,11 @@ 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.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.collect.ImmutableSet;
-import org.jclouds.javax.annotation.Nullable;
public class IngressRule implements Comparable<IngressRule> {
@@ -288,7 +288,7 @@ public class IngressRule implements Comparable<IngressRule> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.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/3980cd79/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 7df671e..1c0b1d9 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,9 +20,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* The result of an operation.
@@ -115,7 +114,7 @@ public class JobResult {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).add("success", success).add("displayText", displayText);
+ return Objects.toStringHelper(this).add("success", success).add("displayText", displayText);
}
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 d0e9f10..f30654f 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,9 +24,8 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.CaseFormat;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
@@ -432,7 +431,7 @@ public class LoadBalancerRule {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.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/3980cd79/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 8161e63..be6aacf 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,9 +20,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Representation of the login API call response
@@ -327,7 +326,7 @@ public class LoginResponse {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.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/3980cd79/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 0f8eae8..4c38e1d 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,9 +23,8 @@ import java.net.URI;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Class NIC
@@ -311,7 +310,7 @@ public class NIC {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.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/3980cd79/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 bcfd411..94f0f5b 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,9 +25,8 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.ImmutableSortedSet;
@@ -724,7 +723,7 @@ public class Network {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.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/3980cd79/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 9937391..509fcc1 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,9 +24,8 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
@@ -339,7 +338,7 @@ public class NetworkOffering implements Comparable<NetworkOffering> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.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/3980cd79/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 800bc23..f6820da 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,9 +24,8 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.ImmutableSortedMap;
import com.google.common.collect.ImmutableSortedSet;
@@ -123,7 +122,7 @@ public class NetworkService implements Comparable<NetworkService> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("name", name).add("value", value);
}
@@ -227,7 +226,7 @@ public class NetworkService implements Comparable<NetworkService> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).add("name", name).add("capabilities", capabilities);
+ return Objects.toStringHelper(this).add("name", name).add("capabilities", capabilities);
}
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 b03738f..447f4ef 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,9 +22,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Class OSType
@@ -141,7 +140,7 @@ public class OSType implements Comparable<OSType> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).add("id", id).add("OSCategoryId", OSCategoryId).add("description", description);
+ return Objects.toStringHelper(this).add("id", id).add("OSCategoryId", OSCategoryId).add("description", description);
}
@Override
[2/8] Revert "JCLOUDS-653: Address Guava 18 deprecations"
Posted by ad...@apache.org.
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 4f4219a..c3406b4 100644
--- a/core/src/main/java/org/jclouds/proxy/internal/GuiceProxyConfig.java
+++ b/core/src/main/java/org/jclouds/proxy/internal/GuiceProxyConfig.java
@@ -33,7 +33,7 @@ import javax.inject.Singleton;
import org.jclouds.domain.Credentials;
import org.jclouds.proxy.ProxyConfig;
-import com.google.common.base.MoreObjects;
+import com.google.common.base.Objects;
import com.google.common.base.Optional;
import com.google.common.base.Strings;
import com.google.common.net.HostAndPort;
@@ -112,7 +112,7 @@ public class GuiceProxyConfig implements ProxyConfig {
*/
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("systemProxies", systemProxies ? "true" : null)
+ return Objects.toStringHelper(this).omitNullValues().add("systemProxies", systemProxies ? "true" : null)
.add("proxy", getProxy().orNull()).add("user", user).add("type", host != null ? type : null).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 b39fc55..a1e1381 100644
--- a/core/src/main/java/org/jclouds/reflect/InvocationSuccess.java
+++ b/core/src/main/java/org/jclouds/reflect/InvocationSuccess.java
@@ -22,9 +22,8 @@ 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.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.Optional;
/**
@@ -76,6 +75,6 @@ public final class InvocationSuccess {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper("").omitNullValues().add("invocation", invocation).add("result", result.orNull());
+ return Objects.toStringHelper("").omitNullValues().add("invocation", invocation).add("result", result.orNull());
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 d98944e..7246f64 100644
--- a/core/src/main/java/org/jclouds/reflect/Reflection2.java
+++ b/core/src/main/java/org/jclouds/reflect/Reflection2.java
@@ -32,7 +32,6 @@ 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;
@@ -238,7 +237,7 @@ public class Reflection2 {
}
public String toString() {
- return MoreObjects.toStringHelper("").add("type", type).add("parameterTypes", parameterTypes).toString();
+ return Objects.toStringHelper("").add("type", type).add("parameterTypes", parameterTypes).toString();
}
}
@@ -287,7 +286,7 @@ public class Reflection2 {
}
public String toString() {
- return MoreObjects.toStringHelper("").add("type", type).add("name", name).add("parameterTypes", parameterTypes)
+ return Objects.toStringHelper("").add("type", type).add("name", name).add("parameterTypes", parameterTypes)
.toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 110e7d5..3d52021 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.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.reflect.TypeParameter;
import com.google.common.reflect.TypeToken;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 da2a8a9..8d94c3e 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.MoreObjects;
+import com.google.common.base.Objects;
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 MoreObjects.toStringHelper("").omitNullValues().add("ownerType", ownerType.getRawType().getSimpleName())
+ return Objects.toStringHelper("").omitNullValues().add("ownerType", ownerType.getRawType().getSimpleName())
.add("methodInvoker", methodInvoker).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 064e500..9aa3330 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.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Throwables.propagate;
import static java.util.concurrent.TimeUnit.NANOSECONDS;
@@ -37,7 +37,6 @@ 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;
@@ -215,6 +214,6 @@ public class InvokeHttpMethod implements Function<Invocation, Object> {
@Override
public String toString() {
- return MoreObjects.toStringHelper("").omitNullValues().add("annotationParser", annotationProcessor).toString();
+ return Objects.toStringHelper("").omitNullValues().add("annotationParser", annotationProcessor).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 0f12ba3..7915ac1 100644
--- a/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java
+++ b/core/src/main/java/org/jclouds/rest/internal/RestAnnotationProcessor.java
@@ -102,7 +102,7 @@ import org.jclouds.rest.binders.BindToJsonPayloadWrappedWith;
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.base.Predicate;
import com.google.common.base.Supplier;
@@ -829,6 +829,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 MoreObjects.toStringHelper("").omitNullValues().add("caller", callerString).toString();
+ return Objects.toStringHelper("").omitNullValues().add("caller", callerString).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 081c3cd..0750a1f 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.MoreObjects;
+import com.google.common.base.Objects;
import com.google.common.base.Optional;
import com.google.common.base.Supplier;
import com.google.common.cache.CacheBuilder;
@@ -83,7 +83,7 @@ public class MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier<T> ext
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).add("delegate", delegate).toString();
+ return Objects.toStringHelper(this).add("delegate", delegate).toString();
}
}
@@ -126,7 +126,7 @@ public class MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier<T> ext
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).add("delegate", delegate).add("duration", duration).add("unit", unit)
+ return Objects.toStringHelper(this).add("delegate", delegate).add("duration", duration).add("unit", unit)
.toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 5736412..8d54d9b 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.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.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.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.Supplier;
public class URIFromStringSupplier implements Supplier<URI> {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 783fd23..df0e4f2 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.MoreObjects;
+import com.google.common.base.Objects;
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 MoreObjects.toStringHelper(this).add("unlessNull", unlessNull).add("fallback", fallback).toString();
+ return Objects.toStringHelper(this).add("unlessNull", unlessNull).add("fallback", fallback).toString();
}
};
}
@@ -117,7 +117,7 @@ public class Suppliers2 {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).add("unlessThrowable", unlessThrowable)
+ return Objects.toStringHelper(this).add("unlessThrowable", unlessThrowable)
.add("throwable", throwable.getSimpleName()).add("fallback", fallback).toString();
}
};
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 b40584a..4e815f1 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.newDirectExecutorService;
+import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor;
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());
}
- }, newDirectExecutorService(), null, Logger.NULL, "");
+ }, sameThreadExecutor(), 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());
}
- }, newDirectExecutorService(), null, Logger.CONSOLE, "");
+ }, sameThreadExecutor(), null, Logger.CONSOLE, "");
fail("Expected TransformParallelException");
} catch (TransformParallelException e) {
assertEquals(e.getFromToException().size(), 2);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 92bf77b..246f925 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.newDirectExecutorService;
+import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor;
import static com.google.inject.name.Names.named;
import static org.jclouds.Constants.PROPERTY_MAX_RETRIES;
import static org.jclouds.Constants.PROPERTY_USER_THREADS;
@@ -224,7 +224,7 @@ public abstract class BaseRestApiExpectTest<S> {
@Override
public void configure() {
- bind(ListeningExecutorService.class).annotatedWith(named(PROPERTY_USER_THREADS)).toInstance(newDirectExecutorService());
+ bind(ListeningExecutorService.class).annotatedWith(named(PROPERTY_USER_THREADS)).toInstance(sameThreadExecutor());
bind(new TypeLiteral<Function<HttpRequest, HttpResponse>>() {
}).toInstance(fn);
bind(HttpCommandExecutorService.class).to(ExpectHttpCommandExecutorService.class);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 915aa99..b3b9b3a 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.newDirectExecutorService;
+import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor;
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(newDirectExecutorService());
+ bind(ListeningExecutorService.class).annotatedWith(named(PROPERTY_USER_THREADS)).toInstance(sameThreadExecutor());
bind(HttpCommandExecutorService.class).toInstance(mock);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 21d40e2..e991951 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.newDirectExecutorService;
+import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor;
import org.jclouds.concurrent.SingleThreaded;
import org.jclouds.concurrent.config.ConfiguresExecutorService;
@@ -46,13 +46,12 @@ public class GoogleAppEngineConfigurationModule extends AbstractModule {
private final Module userExecutorModule;
public GoogleAppEngineConfigurationModule() {
- this(new ExecutorServiceModule(newDirectExecutorService()));
+ this(new ExecutorServiceModule(sameThreadExecutor()));
}
/**
* Used when you are creating multiple contexts in the same app.
*
- * @param currentRequestExecutorService
* @see CurrentRequestExecutorServiceModule#currentRequestExecutorService
*/
public GoogleAppEngineConfigurationModule(Module userExecutorModule) {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 c7e1eb5..987d8b9 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,7 +25,6 @@ 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;
@@ -254,7 +253,7 @@ public final class SessionConnection implements Connection<Session> {
@Override
public String toString() {
- return MoreObjects.toStringHelper("").omitNullValues()
+ return Objects.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/3980cd79/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 4337ad0..68754e9 100644
--- a/drivers/sshj/src/main/java/org/jclouds/sshj/SSHClientConnection.java
+++ b/drivers/sshj/src/main/java/org/jclouds/sshj/SSHClientConnection.java
@@ -36,7 +36,6 @@ 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;
@@ -236,7 +235,7 @@ public class SSHClientConnection implements Connection<SSHClient> {
@Override
public String toString() {
- return MoreObjects.toStringHelper("").add("hostAndPort", hostAndPort).add("loginUser", loginCredentials.getUser())
+ return Objects.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/3980cd79/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 82f0cd4..1818dd4 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
@@ -35,7 +35,7 @@ import org.jclouds.rest.annotations.SinceApiVersion;
import org.jclouds.scriptbuilder.domain.Statement;
import com.google.common.base.Objects;
-import com.google.common.base.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 ba75584..f3ffc0b 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.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.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.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.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/3980cd79/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 1b9a47a..2972dd5 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.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Arrays;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/providers/aws-s3/src/main/java/org/jclouds/aws/s3/domain/DeleteResult.java
----------------------------------------------------------------------
diff --git a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/domain/DeleteResult.java b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/domain/DeleteResult.java
index bc76c65..a1d5202 100644
--- a/providers/aws-s3/src/main/java/org/jclouds/aws/s3/domain/DeleteResult.java
+++ b/providers/aws-s3/src/main/java/org/jclouds/aws/s3/domain/DeleteResult.java
@@ -21,7 +21,6 @@ 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;
@@ -70,7 +69,7 @@ public class DeleteResult extends ForwardingSet<String> {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues()
+ return Objects.toStringHelper(this).omitNullValues()
.add("code", code).add("message", message).toString();
}
}
@@ -182,7 +181,7 @@ public class DeleteResult extends ForwardingSet<String> {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues()
+ return Objects.toStringHelper(this).omitNullValues()
.add("deleted", deleted).add("errors", errors).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/strategy/internal/SequentialMultipartUploadStrategyMockTest.java
----------------------------------------------------------------------
diff --git a/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/strategy/internal/SequentialMultipartUploadStrategyMockTest.java b/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/strategy/internal/SequentialMultipartUploadStrategyMockTest.java
index 71ae0ea..6b9269b 100644
--- a/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/strategy/internal/SequentialMultipartUploadStrategyMockTest.java
+++ b/providers/aws-s3/src/test/java/org/jclouds/aws/s3/blobstore/strategy/internal/SequentialMultipartUploadStrategyMockTest.java
@@ -16,7 +16,7 @@
*/
package org.jclouds.aws.s3.blobstore.strategy.internal;
-import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService;
+import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor;
import static org.jclouds.Constants.PROPERTY_MAX_RETRIES;
import static org.jclouds.Constants.PROPERTY_SO_TIMEOUT;
import static org.jclouds.s3.reference.S3Constants.PROPERTY_S3_VIRTUAL_HOST_BUCKETS;
@@ -128,7 +128,7 @@ public class SequentialMultipartUploadStrategyMockTest {
}
private static final Set<Module> modules = ImmutableSet.<Module>of(
- new ExecutorServiceModule(newDirectExecutorService()));
+ new ExecutorServiceModule(sameThreadExecutor()));
static SequentialMultipartUploadStrategy mockSequentialMultipartUploadStrategy(String uri, int partSize) {
Properties overrides = new Properties();
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 6edb52d..5dac001 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.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import javax.inject.Named;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 dbb30d7..bf9dd04 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.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 c9d027b..0910036 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.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 3bd3be0..20b81e5 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.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 54c52ea..5bbafb8 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.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 576d33a..24e122c 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,7 +20,6 @@ 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 {
@@ -71,6 +70,6 @@ public class Node {
@Override
public String toString() {
- return MoreObjects.toStringHelper("").add("zone", zone).add("fqdn", fqdn).toString();
+ return Objects.toStringHelper("").add("zone", zone).add("fqdn", fqdn).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 ec6aeeb..084dc6a 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.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
public class Record<D extends Map<String, Object>> extends RecordId {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 33d75ca..20ad13d 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.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
import com.google.common.base.Objects;
-import com.google.common.base.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
public class RecordId extends Node {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 8131317..aeed65e 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.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 08fa9ca..b64e139 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.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Start of Authority per RFC 1035
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 fda4736..3cc7ecc 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,7 +20,6 @@ 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 {
@@ -71,6 +70,6 @@ public final class Session {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).add("token", token).add("version", version).toString();
+ return Objects.toStringHelper(this).add("token", token).add("version", version).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 2347899..752bf5c 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,7 +24,6 @@ import javax.inject.Named;
import org.jclouds.domain.Credentials;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -145,6 +144,6 @@ public final class SessionCredentials extends Credentials {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).add("userName", identity).add("customerName", customerName).toString();
+ return Objects.toStringHelper(this).add("userName", identity).add("customerName", customerName).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 c932266..6ac5c56 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.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 c5bd5b3..969371e 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.newDirectExecutorService;
+import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor;
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(newDirectExecutorService()));
+ new ExecutorServiceModule(sameThreadExecutor()));
static DynECTApi mockDynectApi(String uri) {
Properties overrides = new Properties();
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 912d716..d85a455 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.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.net.InetAddresses;
/**
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 d80a86a..9e3d968 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,9 +21,8 @@ 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.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
@@ -123,7 +122,7 @@ public class AllowedArguments {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper("").add("costPerUnit", this.costPerUnit)
+ return Objects.toStringHelper("").add("costPerUnit", this.costPerUnit)
.add("allowedUnits", this.allowedUnits);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 accb9af..5eb568f 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,9 +21,8 @@ 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.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
@@ -206,7 +205,7 @@ public class AllowedArgumentsForCreateServer {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper("").add("diskSizesInGB", diskSizesInGB).add("memorySizesInMB", memorySizesInMB)
+ return Objects.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/3980cd79/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 b35631a..6141782 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,9 +20,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Information about an archive
@@ -159,7 +158,7 @@ public class Archive {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper("")
+ return Objects.toStringHelper("")
.add("username", username).add("totalSize", totalSize).add("freeSize", freeSize).add("locked", locked);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 d072007..b93332b 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,9 +21,8 @@ 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.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableList;
/**
@@ -104,7 +103,7 @@ public class ArchiveAllowedArguments {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper("")
+ return Objects.toStringHelper("")
.add("archiveSizes", archiveSizes);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 3d508b7..aee64a7 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,9 +20,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Connection information to connect to a server with VNC.
@@ -154,7 +153,7 @@ public class Console {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper("").add("host", host).add("port", port).add("protocol", protocol)
+ return Objects.toStringHelper("").add("host", host).add("port", port).add("protocol", protocol)
.add("password", password);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 27e6622..160758a 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,9 +20,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* The Cost class contains information about the cost of a server
@@ -136,7 +135,7 @@ public class Cost {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper("")
+ return Objects.toStringHelper("")
.add("amount", amount).add("currency", currency).add("timePeriod", timePeriod);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 3283da1..9633165 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,9 +23,8 @@ import java.util.Date;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Domain data for a Glesys account.
@@ -295,7 +294,7 @@ public class Domain {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper("")
+ return Objects.toStringHelper("")
.add("domainName", domainName).add("createTime", createTime).add("recordCount", recordCount).add("useGlesysNameServer", useGlesysNameServer);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 2b1b761..9a3dd6b 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,9 +22,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* DNS record data.
@@ -197,7 +196,7 @@ public class DomainRecord {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper("")
+ return Objects.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/3980cd79/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 3ed90da..b564cc4 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,9 +23,8 @@ import java.util.Date;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Detailed information on an Email Account
@@ -256,7 +255,7 @@ public class EmailAccount {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper("")
+ return Objects.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/3980cd79/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 5d14d5f..426e942 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,9 +20,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Detailed information on an Email Account
@@ -116,7 +115,7 @@ public class EmailAlias {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper("")
+ return Objects.toStringHelper("")
.add("alias", alias).add("forwardTo", forwardTo);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 2a08e6a..32353ab 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,9 +22,8 @@ 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.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
@@ -126,7 +125,7 @@ public class EmailOverview {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper("")
+ return Objects.toStringHelper("")
.add("summary", summary).add("domains", domains);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 ea7ccb7..8376721 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,9 +21,8 @@ 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.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Detailed information about e-mail settings for a single domain
@@ -130,7 +129,7 @@ public class EmailOverviewDomain {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper("").add("domain", domain).add("accounts", accounts).add("aliases", aliases);
+ return Objects.toStringHelper("").add("domain", domain).add("accounts", accounts).add("aliases", aliases);
}
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 5717d70..f99b233 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,9 +19,8 @@ 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.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Summary information of e-mail settings and limits for a GleSYS account
@@ -159,7 +158,7 @@ public class EmailOverviewSummary {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper("")
+ return Objects.toStringHelper("")
.add("accounts", accounts).add("maxAccounts", maxAccounts).add("aliases", aliases).add("maxAliases", maxAliases);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 0b8772c..96686f5 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,9 +20,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Information on an Email Account Quota size
@@ -117,7 +116,7 @@ public class EmailQuota {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper("").add("max", max).add("unit", unit);
+ return Objects.toStringHelper("").add("max", max).add("unit", unit);
}
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 8575a12..401929d 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,9 +20,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Represents an ip address used by a server.
@@ -172,7 +171,7 @@ public class Ip {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper("")
+ return Objects.toStringHelper("")
.add("ip", ip).add("version", version).add("cost", cost).add("currency", currency);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 0b1d547..4197cf7 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,9 +23,8 @@ import java.util.List;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableList;
/**
@@ -311,7 +310,7 @@ public class IpDetails {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper("")
+ return Objects.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/3980cd79/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 a0744c0..f11a691 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,9 +20,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Operating system template
@@ -176,7 +175,7 @@ public class OSTemplate {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper("")
+ return Objects.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/3980cd79/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 c183fed..fafc6ec 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,9 +20,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Detailed information on usage
@@ -136,7 +135,7 @@ public class ResourceStatus {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper("").add("usage", usage).add("max", max).add("unit", unit);
+ return Objects.toStringHelper("").add("usage", usage).add("max", max).add("unit", unit);
}
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 2910a77..989bd83 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,9 +21,8 @@ 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.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
@@ -123,7 +122,7 @@ public class ResourceUsage {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper("")
+ return Objects.toStringHelper("")
.add("info", info).add("values", values);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 b96fd07..c4517bc 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,9 +20,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Detailed information on usage
@@ -130,7 +129,7 @@ public class ResourceUsageInfo {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper("")
+ return Objects.toStringHelper("")
.add("resource", resource).add("resolution", resolution).add("unit", unit);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 06c789b..e49a0cb 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,9 +21,8 @@ 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.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Detailed information on usage
@@ -115,7 +114,7 @@ public class ResourceUsageValue {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper("").add("value", value).add("timestamp", timestamp);
+ return Objects.toStringHelper("").add("value", value).add("timestamp", timestamp);
}
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 80b64e4..7d700d4 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,9 +21,8 @@ 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.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Listing of a server.
@@ -177,7 +176,7 @@ public class Server {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper("").add("id", id).add("hostname", hostname).add("datacenter", datacenter)
+ return Objects.toStringHelper("").add("id", id).add("hostname", hostname).add("datacenter", datacenter)
.add("platform", platform);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 781443f..cb35e99 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.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 c0a6e1a..8c6b112 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,9 +18,8 @@ package org.jclouds.glesys.domain;
import java.beans.ConstructorProperties;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Detailed information about an OpenVZ server's limits
@@ -161,7 +160,7 @@ public class ServerLimit {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper("").add("held", held).add("maxHeld", maxHeld).add("barrier", barrier)
+ return Objects.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/3980cd79/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 4315374..5ca4cb1 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,9 +20,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Class ServerSpec
@@ -216,7 +215,7 @@ public class ServerSpec {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper("").add("platform", platform).add("datacenter", datacenter)
+ return Objects.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/3980cd79/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 e18f1d1..912a7f6 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,9 +22,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Detailed information server status including hardware usage (cpu, memory and disk), bandwidth and up-time.
@@ -182,7 +181,7 @@ public class ServerStatus {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper("")
+ return Objects.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/3980cd79/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 3f63926..8eac4ae 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,9 +20,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Represents an 'uptime' duration of server in a Glesys cloud
@@ -116,7 +115,7 @@ public class ServerUptime {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper("").add("current", current).add("unit", unit);
+ return Objects.toStringHelper("").add("current", current).add("unit", unit);
}
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 05af302..c956860 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.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Predicates.instanceOf;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 6a87fee..84e0248 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,9 +20,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.primitives.Longs;
/**
@@ -130,7 +129,7 @@ public class BillingToken implements Comparable<BillingToken> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("name", name).add("price", price);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 7ce48bb..98274de 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,9 +20,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Class Customer
@@ -112,7 +111,7 @@ public class Customer {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("name", name);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 73a713b..bbbeeeb 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,9 +22,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.primitives.Longs;
/**
@@ -185,7 +184,7 @@ public class Ip implements Comparable<Ip> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.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/3980cd79/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 74ea67bc..ca90764 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,9 +20,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.primitives.Ints;
import com.google.common.primitives.Longs;
@@ -114,7 +113,7 @@ public class IpPortPair implements Comparable<IpPortPair> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("ip", ip).add("port", port);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 8af0b9a..3639b8d 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,9 +25,8 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
import com.google.common.primitives.Longs;
@@ -265,7 +264,7 @@ public class Job implements Comparable<Job> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.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/3980cd79/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 98a116d..897b73e 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,9 +23,8 @@ import java.util.Date;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.primitives.Longs;
/**
@@ -152,7 +151,7 @@ public class JobProperties implements Comparable<JobProperties> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("updatedOn", updatedOn).add("state", state).add("note", note);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 3c5006d..9fcb8b8 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,9 +23,8 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
import com.google.common.primitives.Longs;
@@ -258,7 +257,7 @@ public class LoadBalancer implements Comparable<LoadBalancer> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.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);
}
[3/8] Revert "JCLOUDS-653: Address Guava 18 deprecations"
Posted by ad...@apache.org.
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/swift/src/test/java/org/jclouds/openstack/swift/blobstore/strategy/internal/SequentialMultipartUploadStrategyMockTest.java
----------------------------------------------------------------------
diff --git a/apis/swift/src/test/java/org/jclouds/openstack/swift/blobstore/strategy/internal/SequentialMultipartUploadStrategyMockTest.java b/apis/swift/src/test/java/org/jclouds/openstack/swift/blobstore/strategy/internal/SequentialMultipartUploadStrategyMockTest.java
index 352cf8d..1652b5f 100644
--- a/apis/swift/src/test/java/org/jclouds/openstack/swift/blobstore/strategy/internal/SequentialMultipartUploadStrategyMockTest.java
+++ b/apis/swift/src/test/java/org/jclouds/openstack/swift/blobstore/strategy/internal/SequentialMultipartUploadStrategyMockTest.java
@@ -16,7 +16,7 @@
*/
package org.jclouds.openstack.swift.blobstore.strategy.internal;
-import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService;
+import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor;
import static org.jclouds.Constants.PROPERTY_MAX_RETRIES;
import static org.jclouds.Constants.PROPERTY_SO_TIMEOUT;
import static org.testng.Assert.assertEquals;
@@ -98,7 +98,7 @@ public class SequentialMultipartUploadStrategyMockTest {
}
private static final Set<Module> modules = ImmutableSet.<Module> of(
- new ExecutorServiceModule(newDirectExecutorService()));
+ new ExecutorServiceModule(sameThreadExecutor()));
static SequentialMultipartUploadStrategy mockSequentialMultipartUploadStrategy(String uri, int partSize) {
Properties overrides = new Properties();
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/options/VCloudTemplateOptions.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/options/VCloudTemplateOptions.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/options/VCloudTemplateOptions.java
index 20a3cc2..03b12fe 100644
--- a/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/options/VCloudTemplateOptions.java
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/compute/options/VCloudTemplateOptions.java
@@ -28,7 +28,7 @@ import org.jclouds.vcloud.domain.network.FenceMode;
import org.jclouds.vcloud.domain.network.IpAddressAllocationMode;
import com.google.common.base.Objects;
-import com.google.common.base.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Contains options supported in the {@code ComputeService#runNode} operation on
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/vcloud/src/main/java/org/jclouds/vcloud/config/VCloudHttpApiModule.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/config/VCloudHttpApiModule.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/config/VCloudHttpApiModule.java
index 5a98257b..50d21ca 100644
--- a/apis/vcloud/src/main/java/org/jclouds/vcloud/config/VCloudHttpApiModule.java
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/config/VCloudHttpApiModule.java
@@ -89,7 +89,7 @@ import org.jclouds.vcloud.predicates.TaskSuccess;
import org.jclouds.vcloud.xml.ovf.VCloudResourceAllocationSettingDataHandler;
import com.google.common.base.Function;
-import com.google.common.base.MoreObjects;
+import com.google.common.base.Objects;
import com.google.common.base.Predicate;
import com.google.common.base.Supplier;
import com.google.common.base.Suppliers;
@@ -125,7 +125,7 @@ public class VCloudHttpApiModule extends HttpApiModule<VCloudApi> {
@Override
public String toString() {
- return MoreObjects.toStringHelper(login).add("method", "login").toString();
+ return Objects.toStringHelper(login).add("method", "login").toString();
}
}, seconds, TimeUnit.SECONDS);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/ReferenceTypeImpl.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/ReferenceTypeImpl.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/ReferenceTypeImpl.java
index 0efd054..4519eba 100644
--- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/ReferenceTypeImpl.java
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/ReferenceTypeImpl.java
@@ -22,9 +22,8 @@ import java.net.URI;
import org.jclouds.vcloud.domain.ReferenceType;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Location of a Rest resource
@@ -81,6 +80,6 @@ public class ReferenceTypeImpl implements ReferenceType {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper("").omitNullValues().add("href", href).add("name", name).add("type", type);
+ return Objects.toStringHelper("").omitNullValues().add("href", href).add("name", name).add("type", type);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/TaskImpl.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/TaskImpl.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/TaskImpl.java
index a4eca56..70815a1 100644
--- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/TaskImpl.java
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/internal/TaskImpl.java
@@ -28,7 +28,7 @@ import org.jclouds.vcloud.domain.Task;
import org.jclouds.vcloud.domain.TaskStatus;
import org.jclouds.vcloud.domain.VCloudError;
-import com.google.common.base.MoreObjects;
+import com.google.common.base.Objects;
public class TaskImpl extends ReferenceTypeImpl implements Task {
@@ -82,7 +82,7 @@ public class TaskImpl extends ReferenceTypeImpl implements Task {
@Override
public String toString() {
- return MoreObjects.toStringHelper("").omitNullValues().add("href", getHref()).add("name", getName())
+ return Objects.toStringHelper("").omitNullValues().add("href", getHref()).add("name", getName())
.add("owner", owner).add("operation", operation).add("startTime", startTime).add("endTime", endTime)
.add("expiryTime", expiryTime).add("error", error).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/DhcpService.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/DhcpService.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/DhcpService.java
index 8dea319..628a7d1 100644
--- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/DhcpService.java
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/DhcpService.java
@@ -20,7 +20,6 @@ import static com.google.common.base.Objects.equal;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -100,7 +99,7 @@ public class DhcpService {
@Override
public String toString() {
- return MoreObjects.toStringHelper("").omitNullValues().add("enabled", enabled)
+ return Objects.toStringHelper("").omitNullValues().add("enabled", enabled)
.add("defaultLeaseTime", defaultLeaseTime).add("maxLeaseTime", maxLeaseTime).add("ipRange", ipRange)
.toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/Features.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/Features.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/Features.java
index faca148..24eb38e 100644
--- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/Features.java
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/Features.java
@@ -20,7 +20,6 @@ import static com.google.common.base.Objects.equal;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -89,7 +88,7 @@ public class Features {
@Override
public String toString() {
- return MoreObjects.toStringHelper("").omitNullValues().add("dhcpService", dhcpService)
+ return Objects.toStringHelper("").omitNullValues().add("dhcpService", dhcpService)
.add("firewallService", firewallService).add("natService", natService).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/FirewallService.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/FirewallService.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/FirewallService.java
index 7b71a6a..bde3a21 100644
--- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/FirewallService.java
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/FirewallService.java
@@ -24,9 +24,8 @@ import java.util.List;
import org.jclouds.javax.annotation.Nullable;
import org.jclouds.vcloud.domain.network.firewall.FirewallRule;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
@@ -79,7 +78,7 @@ public class FirewallService {
@Override
public String toString() {
- ToStringHelper helper = MoreObjects.toStringHelper("").omitNullValues().add("enabled", enabled);
+ ToStringHelper helper = Objects.toStringHelper("").omitNullValues().add("enabled", enabled);
if (!firewallRules.isEmpty())
helper.add("firewallRules", firewallRules);
return helper.toString();
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/IpRange.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/IpRange.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/IpRange.java
index 931cc30..180d13d 100644
--- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/IpRange.java
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/IpRange.java
@@ -19,7 +19,6 @@ package org.jclouds.vcloud.domain.network;
import static com.google.common.base.Objects.equal;
import static com.google.common.base.Preconditions.checkNotNull;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -69,7 +68,7 @@ public class IpRange {
@Override
public String toString() {
- return MoreObjects.toStringHelper("").omitNullValues().add("startAddress", startAddress)
+ return Objects.toStringHelper("").omitNullValues().add("startAddress", startAddress)
.add("endAddress", endAddress).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/IpScope.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/IpScope.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/IpScope.java
index da042fa..13cd9bb 100644
--- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/IpScope.java
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/IpScope.java
@@ -23,9 +23,8 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.Iterables;
import com.google.common.collect.Sets;
@@ -159,7 +158,7 @@ public class IpScope {
@Override
public String toString() {
- ToStringHelper helper = MoreObjects.toStringHelper("").omitNullValues().add("inherited", inherited).add("gateway", gateway)
+ ToStringHelper helper = Objects.toStringHelper("").omitNullValues().add("inherited", inherited).add("gateway", gateway)
.add("netmask", netmask).add("dns1", dns1).add("dns2", dns2).add("dnsSuffix", dnsSuffix);
if (!ipRanges.isEmpty())
helper.add("ipRanges", ipRanges);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/NatService.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/NatService.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/NatService.java
index 240d780..14e0251 100644
--- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/NatService.java
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/NatService.java
@@ -26,9 +26,8 @@ import org.jclouds.vcloud.domain.network.nat.NatPolicy;
import org.jclouds.vcloud.domain.network.nat.NatRule;
import org.jclouds.vcloud.domain.network.nat.NatType;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
@@ -107,7 +106,7 @@ public class NatService {
@Override
public String toString() {
- ToStringHelper helper = MoreObjects.toStringHelper("").omitNullValues().add("enabled", enabled)
+ ToStringHelper helper = Objects.toStringHelper("").omitNullValues().add("enabled", enabled)
.add("type", type).add("policy", policy);
if (!natRules.isEmpty())
helper.add("natRules", natRules);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/firewall/FirewallProtocols.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/firewall/FirewallProtocols.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/firewall/FirewallProtocols.java
index 1482053..8b09dc2 100644
--- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/firewall/FirewallProtocols.java
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/firewall/FirewallProtocols.java
@@ -18,7 +18,6 @@ package org.jclouds.vcloud.domain.network.firewall;
import static com.google.common.base.Objects.equal;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -66,7 +65,7 @@ public class FirewallProtocols {
@Override
public String toString() {
- return MoreObjects.toStringHelper("").omitNullValues().add("tcp", tcp).add("udp", udp).toString();
+ return Objects.toStringHelper("").omitNullValues().add("tcp", tcp).add("udp", udp).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/firewall/FirewallRule.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/firewall/FirewallRule.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/firewall/FirewallRule.java
index 835d41a..dfb578b 100644
--- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/firewall/FirewallRule.java
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/firewall/FirewallRule.java
@@ -21,7 +21,6 @@ import static com.google.common.base.Preconditions.checkNotNull;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -117,7 +116,7 @@ public class FirewallRule {
@Override
public String toString() {
- return MoreObjects.toStringHelper("").omitNullValues().add("enabled", enabled).add("description", description)
+ return Objects.toStringHelper("").omitNullValues().add("enabled", enabled).add("description", description)
.add("policy", policy).add("protocols", protocols).add("port", port).add("destinationIp", destinationIp)
.toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/internal/OrgNetworkImpl.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/internal/OrgNetworkImpl.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/internal/OrgNetworkImpl.java
index 29add2c..0dc059a 100644
--- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/internal/OrgNetworkImpl.java
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/internal/OrgNetworkImpl.java
@@ -32,9 +32,8 @@ import org.jclouds.vcloud.domain.network.FenceMode;
import org.jclouds.vcloud.domain.network.IpScope;
import org.jclouds.vcloud.domain.network.OrgNetwork;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
@@ -131,7 +130,7 @@ public class OrgNetworkImpl extends ReferenceTypeImpl implements OrgNetwork {
@Override
public String toString() {
- return MoreObjects.toStringHelper("").omitNullValues().add("ipScope", ipScope).add("parentNetwork", parentNetwork)
+ return Objects.toStringHelper("").omitNullValues().add("ipScope", ipScope).add("parentNetwork", parentNetwork)
.add("fenceMode", fenceMode).add("features", features).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/rules/OneToOneVmRule.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/rules/OneToOneVmRule.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/rules/OneToOneVmRule.java
index 7f9bdc8..c2b1b4b 100644
--- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/rules/OneToOneVmRule.java
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/rules/OneToOneVmRule.java
@@ -22,7 +22,6 @@ import static com.google.common.base.Preconditions.checkNotNull;
import org.jclouds.javax.annotation.Nullable;
import org.jclouds.vcloud.domain.network.nat.NatRule;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -67,7 +66,7 @@ public class OneToOneVmRule implements NatRule {
@Override
public String toString() {
- return MoreObjects.toStringHelper("").omitNullValues().add("mappingMode", mappingMode).add("externalIP", externalIP)
+ return Objects.toStringHelper("").omitNullValues().add("mappingMode", mappingMode).add("externalIP", externalIP)
.add("vAppScopedVmId", vAppScopedVmId).add("vmNicId", vmNicId).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/rules/PortForwardingRule.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/rules/PortForwardingRule.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/rules/PortForwardingRule.java
index b888e58..3170a73 100644
--- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/rules/PortForwardingRule.java
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/rules/PortForwardingRule.java
@@ -22,7 +22,6 @@ import static com.google.common.base.Preconditions.checkNotNull;
import org.jclouds.vcloud.domain.network.nat.NatProtocol;
import org.jclouds.vcloud.domain.network.nat.NatRule;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -103,7 +102,7 @@ public class PortForwardingRule implements NatRule {
@Override
public String toString() {
- return MoreObjects.toStringHelper("").omitNullValues().add("externalIP", externalIP)
+ return Objects.toStringHelper("").omitNullValues().add("externalIP", externalIP)
.add("externalPort", externalPort).add("internalIP", internalIP).add("internalPort", internalPort)
.add("protocol", protocol).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/rules/VmRule.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/rules/VmRule.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/rules/VmRule.java
index 1d2e443..8793a58 100644
--- a/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/rules/VmRule.java
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/domain/network/nat/rules/VmRule.java
@@ -23,7 +23,6 @@ import org.jclouds.javax.annotation.Nullable;
import org.jclouds.vcloud.domain.network.nat.NatProtocol;
import org.jclouds.vcloud.domain.network.nat.NatRule;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -120,7 +119,7 @@ public class VmRule implements NatRule {
@Override
public String toString() {
- return MoreObjects.toStringHelper("").omitNullValues().add("externalIP", externalIP)
+ return Objects.toStringHelper("").omitNullValues().add("externalIP", externalIP)
.add("externalPort", externalPort).add("vAppScopedLocalId", vAppScopedLocalId).add("vmNicId", vmNicId)
.add("internalPort", internalPort).add("protocol", protocol).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/vcloud/src/main/java/org/jclouds/vcloud/options/InstantiateVAppTemplateOptions.java
----------------------------------------------------------------------
diff --git a/apis/vcloud/src/main/java/org/jclouds/vcloud/options/InstantiateVAppTemplateOptions.java b/apis/vcloud/src/main/java/org/jclouds/vcloud/options/InstantiateVAppTemplateOptions.java
index 090b7a4..7f6c2c1 100644
--- a/apis/vcloud/src/main/java/org/jclouds/vcloud/options/InstantiateVAppTemplateOptions.java
+++ b/apis/vcloud/src/main/java/org/jclouds/vcloud/options/InstantiateVAppTemplateOptions.java
@@ -23,9 +23,8 @@ import java.util.Set;
import org.jclouds.vcloud.domain.network.NetworkConfig;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.Sets;
public class InstantiateVAppTemplateOptions {
@@ -160,7 +159,7 @@ public class InstantiateVAppTemplateOptions {
}
protected ToStringHelper string() {
- ToStringHelper toString = MoreObjects.toStringHelper("").omitNullValues();
+ ToStringHelper toString = Objects.toStringHelper("").omitNullValues();
toString.add("customizeOnInstantiate", customizeOnInstantiate).add("description", description);
if (!networkConfig.isEmpty())
toString.add("networkConfig", networkConfig);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 d86673f..79829ec 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,7 +21,6 @@ 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;
@@ -61,7 +60,7 @@ public class AuthenticationResponse {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).add("authToken", authToken).add("services", services).toString();
+ return Objects.toStringHelper(this).add("authToken", authToken).add("services", services).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 04828dd..a8f00a9 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.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 70610e6..2cc629e 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,9 +23,8 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
@@ -150,7 +149,7 @@ public class Resource implements Comparable<Resource> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper("")
+ return Objects.toStringHelper("")
.add("id", getId())
.add("name", name)
.add("links", links);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 3580738..2f94619 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.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.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/3980cd79/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 18115be..79a25d2 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.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.net.URI;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 4fac522..0e4edff 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.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Date;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 5d3a977..4d46015 100644
--- a/compute/src/main/java/org/jclouds/compute/callables/BlockUntilInitScriptStatusIsZeroThenReturnOutput.java
+++ b/compute/src/main/java/org/jclouds/compute/callables/BlockUntilInitScriptStatusIsZeroThenReturnOutput.java
@@ -35,7 +35,6 @@ 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;
@@ -167,7 +166,7 @@ public class BlockUntilInitScriptStatusIsZeroThenReturnOutput extends AbstractFu
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).add("commandRunner", commandRunner).toString();
+ return Objects.toStringHelper(this).add("commandRunner", commandRunner).toString();
}
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 2d72e3a..419109d 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.MoreObjects;
+import com.google.common.base.Objects;
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 MoreObjects.toStringHelper(this).add("node", node).add("name", statement).add("runAsRoot", runAsRoot)
+ return Objects.toStringHelper(this).add("node", node).add("name", statement).add("runAsRoot", runAsRoot)
.toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 03e691f..cef8056 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.MoreObjects;
+import com.google.common.base.Objects;
import com.google.common.base.Predicates;
import com.google.common.collect.ImmutableSet;
@@ -131,7 +131,7 @@ public class SudoAwareInitManager {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).add("node", node.getId()).add("name", init.getInstanceName())
+ return Objects.toStringHelper(this).add("node", node.getId()).add("name", init.getInstanceName())
.add("runAsRoot", runAsRoot).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 bfc1e03..343ed0d 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.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Predicates.notNull;
import java.util.Set;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 fefa100..b743a71 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.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Operating system based on DMTF CIM model.
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 baf7dcb..345d6da 100644
--- a/compute/src/main/java/org/jclouds/compute/domain/ExecResponse.java
+++ b/compute/src/main/java/org/jclouds/compute/domain/ExecResponse.java
@@ -18,7 +18,6 @@ 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 {
@@ -63,7 +62,7 @@ public class ExecResponse implements CustomizationResponse {
@Override
public String toString() {
- return MoreObjects.toStringHelper("").add("output", output).add("error", error).add("exitStatus", exitStatus)
+ return Objects.toStringHelper("").add("output", output).add("error", error).add("exitStatus", exitStatus)
.toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 70c3e2f..64fab3d 100644
--- a/compute/src/main/java/org/jclouds/compute/domain/OperatingSystem.java
+++ b/compute/src/main/java/org/jclouds/compute/domain/OperatingSystem.java
@@ -22,9 +22,8 @@ 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.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Running Operating system
@@ -118,7 +117,7 @@ public class OperatingSystem {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper("").omitNullValues().add("family", family).add("name", name).add("arch", arch)
+ return Objects.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/3980cd79/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 d95688e..932e635 100644
--- a/compute/src/main/java/org/jclouds/compute/domain/Processor.java
+++ b/compute/src/main/java/org/jclouds/compute/domain/Processor.java
@@ -18,9 +18,8 @@ package org.jclouds.compute.domain;
import static com.google.common.base.Objects.equal;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ComparisonChain;
/**
@@ -81,7 +80,7 @@ public class Processor implements Comparable<Processor> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper("").omitNullValues().add("cores", cores).add("speed", speed);
+ return Objects.toStringHelper("").omitNullValues().add("cores", cores).add("speed", speed);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 7170f27..5f3a7ef 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.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 e5d7e0c..5a073e0 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.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkArgument;
import java.util.List;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 15657f2..21fa298 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,9 +31,8 @@ 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.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
public class ComputeMetadataImpl extends ResourceMetadataImpl<ComputeType> implements ComputeMetadata {
@@ -107,7 +106,7 @@ public class ComputeMetadataImpl extends ResourceMetadataImpl<ComputeType> imple
}
protected ToStringHelper computeToStringPrefix() {
- return MoreObjects.toStringHelper("").omitNullValues().add("id", getId()).add("providerId", getProviderId())
+ return Objects.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/3980cd79/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 e554241..4a547bb 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.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.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/3980cd79/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 453b4cb..d6ee20d 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.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
public class ImageImpl extends ComputeMetadataImpl implements Image {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 cf4eae8..09919a7 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.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
public class NodeMetadataImpl extends ComputeMetadataImpl implements NodeMetadata {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 944d38f..d2c1a45 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
@@ -60,8 +60,8 @@ import org.jclouds.logging.Logger;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Function;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.Optional;
import com.google.common.base.Predicate;
import com.google.common.base.Predicates;
@@ -1121,7 +1121,7 @@ public class TemplateBuilderImpl implements TemplateBuilder {
* @since 1.5
*/
protected ToStringHelper string() {
- ToStringHelper toString = MoreObjects.toStringHelper("").omitNullValues();
+ ToStringHelper toString = Objects.toStringHelper("").omitNullValues();
if (biggest)
toString.add("biggest", biggest);
if (fastest)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 598376b..4c71e9a 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,9 +25,8 @@ 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.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
public class TemplateImpl implements Template {
@@ -97,7 +96,7 @@ public class TemplateImpl implements Template {
}
protected ToStringHelper string() {
- ToStringHelper helper = MoreObjects.toStringHelper("").omitNullValues().add("image", image).add("hardware", hardware)
+ ToStringHelper helper = Objects.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/3980cd79/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 bd3c1ee..f8c5d5f 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,9 +22,8 @@ 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.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
public class VolumeImpl implements Volume {
@@ -61,7 +60,7 @@ public class VolumeImpl implements Volume {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper("").omitNullValues().add("id", id).add("type", getType()).add("size", size)
+ return Objects.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/3980cd79/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 8dfbaf5..cf89b79 100644
--- a/compute/src/main/java/org/jclouds/compute/events/StatementOnNode.java
+++ b/compute/src/main/java/org/jclouds/compute/events/StatementOnNode.java
@@ -22,9 +22,8 @@ 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.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
@@ -68,7 +67,7 @@ public class StatementOnNode {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).add("statement", statement).add("node", node.getId());
+ return Objects.toStringHelper(this).add("statement", statement).add("node", node.getId());
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 9a8cf19..0d92915 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.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
/**
* A statement that completed execution on a node.
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 93bfab8..e4d0685 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.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
/**
* A statement that failed execution on a node.
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 df7a0d7..2e072b9 100644
--- a/compute/src/main/java/org/jclouds/compute/options/RunScriptOptions.java
+++ b/compute/src/main/java/org/jclouds/compute/options/RunScriptOptions.java
@@ -23,10 +23,9 @@ 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.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
import com.google.common.base.Optional;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Enables additional options for running a script.
@@ -452,7 +451,7 @@ public class RunScriptOptions {
}
protected ToStringHelper string() {
- ToStringHelper toString = MoreObjects.toStringHelper("").omitNullValues();
+ ToStringHelper toString = Objects.toStringHelper("").omitNullValues();
toString.add("loginUser", loginUser);
if (loginPassword != null)
toString.add("loginPasswordPresent", true);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 2a8b6d2..4770f65 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.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.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/3980cd79/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 a601bf5..4bd7e98 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.MoreObjects;
+import com.google.common.base.Objects;
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 MoreObjects.toStringHelper(this).add("node", node).add("options", options).toString();
+ return Objects.toStringHelper(this).add("node", node).add("options", options).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 a9bbb0f..91c01f5 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.MoreObjects;
+import com.google.common.base.Objects;
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 MoreObjects.toStringHelper(this).add("runScriptOnNode", runScriptOnNode).add("goodNodes", goodNodes).add(
+ return Objects.toStringHelper(this).add("runScriptOnNode", runScriptOnNode).add("goodNodes", goodNodes).add(
"badNodes", badNodes).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 986ed3b..e7f3384 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.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.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;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 1b51a74..f45426f 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.MoreObjects;
+import com.google.common.base.Objects;
@Singleton
public class ReturnCredentialsBoundToImage implements PopulateDefaultLoginCredentialsForImageStrategy {
@@ -67,6 +67,6 @@ public class ReturnCredentialsBoundToImage implements PopulateDefaultLoginCreden
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).toString();
+ return Objects.toStringHelper(this).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 548a568..8eb4ab8 100644
--- a/compute/src/main/java/org/jclouds/net/domain/IpPermission.java
+++ b/compute/src/main/java/org/jclouds/net/domain/IpPermission.java
@@ -26,9 +26,8 @@ import java.util.Set;
import com.google.common.annotations.Beta;
import com.google.common.base.Function;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableMultimap;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
@@ -279,7 +278,7 @@ public class IpPermission implements Comparable<IpPermission> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper("").add("ipProtocol", ipProtocol).add("fromPort", fromPort)
+ return Objects.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/3980cd79/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 fe3803d..7d71e4c 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.newDirectExecutorService();
+ ListeningExecutorService userExecutor = MoreExecutors.sameThreadExecutor();
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.newDirectExecutorService();
+ ListeningExecutorService userExecutor = MoreExecutors.sameThreadExecutor();
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.newDirectExecutorService();
+ ListeningExecutorService userExecutor = MoreExecutors.sameThreadExecutor();
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.newDirectExecutorService();
+ ListeningExecutorService userExecutor = MoreExecutors.sameThreadExecutor();
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/3980cd79/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 bd3a299..5b57db4 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.newDirectExecutorService;
+import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor;
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(newDirectExecutorService()),
+ Injector injector = Guice.createInjector(new ExecutorServiceModule(sameThreadExecutor()),
new AbstractModule() {
protected void configure() {
bindConstant().annotatedWith(named(PROPERTY_USER_THREADS)).to(1);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 ef52f20..e8052a9 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.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.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;
@@ -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.newDirectExecutorService;
+import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor;
import static org.jclouds.Constants.PROPERTY_API;
import static org.jclouds.Constants.PROPERTY_API_VERSION;
import static org.jclouds.Constants.PROPERTY_BUILD_VERSION;
@@ -540,7 +540,7 @@ public class ContextBuilder {
return input.getClass().isAnnotationPresent(SingleThreaded.class);
}
})) {
- modules.add(new ExecutorServiceModule(newDirectExecutorService()));
+ modules.add(new ExecutorServiceModule(sameThreadExecutor()));
} else {
modules.add(new ExecutorServiceModule());
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 410d27b..7b5ff35 100644
--- a/core/src/main/java/org/jclouds/apis/internal/BaseApiMetadata.java
+++ b/core/src/main/java/org/jclouds/apis/internal/BaseApiMetadata.java
@@ -41,9 +41,8 @@ import org.jclouds.Context;
import org.jclouds.View;
import org.jclouds.apis.ApiMetadata;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableSet;
import com.google.common.reflect.TypeToken;
@@ -338,7 +337,7 @@ public abstract class BaseApiMetadata implements ApiMetadata {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper("").add("id", getId()).add("name", getName()).add("views", getViews()).add(
+ return Objects.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/3980cd79/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 0ae224f..78e380d 100644
--- a/core/src/main/java/org/jclouds/collect/AdvanceUntilEmptyIterable.java
+++ b/core/src/main/java/org/jclouds/collect/AdvanceUntilEmptyIterable.java
@@ -21,7 +21,6 @@ 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;
@@ -105,7 +104,7 @@ public class AdvanceUntilEmptyIterable<E> extends FluentIterable<FluentIterable<
*/
@Override
public String toString() {
- return MoreObjects.toStringHelper("").omitNullValues().add("current", current).add("unread", unread).toString();
+ return Objects.toStringHelper("").omitNullValues().add("current", current).add("unread", unread).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 69421fa..90ad17f 100644
--- a/core/src/main/java/org/jclouds/collect/PagedIterables.java
+++ b/core/src/main/java/org/jclouds/collect/PagedIterables.java
@@ -22,7 +22,6 @@ 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;
@@ -116,7 +115,7 @@ public class PagedIterables {
@Override
public String toString() {
- return MoreObjects.toStringHelper("").add("current", current).add("unread", unread).toString();
+ return Objects.toStringHelper("").add("current", current).add("unread", unread).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 db290e3..f02c73f 100644
--- a/core/src/main/java/org/jclouds/domain/internal/LocationImpl.java
+++ b/core/src/main/java/org/jclouds/domain/internal/LocationImpl.java
@@ -26,9 +26,8 @@ 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.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
@@ -58,7 +57,7 @@ public class LocationImpl implements Location {
@Override
public String toString() {
- ToStringHelper helper = MoreObjects.toStringHelper("").omitNullValues().add("scope", scope).add("id", id)
+ ToStringHelper helper = Objects.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/3980cd79/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 99ab643..220732d 100644
--- a/core/src/main/java/org/jclouds/domain/internal/ResourceMetadataImpl.java
+++ b/core/src/main/java/org/jclouds/domain/internal/ResourceMetadataImpl.java
@@ -28,9 +28,8 @@ 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.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.Maps;
/**
@@ -129,7 +128,7 @@ public abstract class ResourceMetadataImpl<T extends Enum<T>> implements Resourc
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper("").omitNullValues().add("type", getType()).add("providerId", providerId)
+ return Objects.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/3980cd79/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 d702c69..08b45ce 100644
--- a/core/src/main/java/org/jclouds/http/HttpMessage.java
+++ b/core/src/main/java/org/jclouds/http/HttpMessage.java
@@ -29,9 +29,8 @@ 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.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableMultimap;
import com.google.common.collect.Multimap;
import com.google.common.io.ByteSource;
@@ -225,7 +224,7 @@ public class HttpMessage extends PayloadEnclosingImpl {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper("").omitNullValues()
+ return Objects.toStringHelper("").omitNullValues()
.add("headers", headers)
.add("payload", payload);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 9721240..80b235e 100644
--- a/core/src/main/java/org/jclouds/http/HttpRequest.java
+++ b/core/src/main/java/org/jclouds/http/HttpRequest.java
@@ -31,9 +31,8 @@ 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.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMultimap;
import com.google.common.collect.ImmutableSet;
@@ -286,7 +285,7 @@ public class HttpRequest extends HttpMessage {
@Override
protected ToStringHelper string() {
- return MoreObjects.toStringHelper("").omitNullValues()
+ return Objects.toStringHelper("").omitNullValues()
.add("method", method)
.add("endpoint", endpoint)
.add("headers", headers)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 7dcdd3a..2f894a9 100644
--- a/core/src/main/java/org/jclouds/http/HttpResponse.java
+++ b/core/src/main/java/org/jclouds/http/HttpResponse.java
@@ -19,9 +19,8 @@ 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.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.Multimap;
/**
@@ -115,7 +114,7 @@ public class HttpResponse extends HttpMessage {
@Override
protected ToStringHelper string() {
- return MoreObjects.toStringHelper("").omitNullValues()
+ return Objects.toStringHelper("").omitNullValues()
.add("statusCode", statusCode)
.add("message", message)
.add("headers", headers)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 7e5d918..7316b94 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.MoreObjects;
+import com.google.common.base.Objects;
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 MoreObjects.toStringHelper(this).omitNullValues().add("formParameters", formParameters)
+ return Objects.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/3980cd79/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 59526c9..e7ab845 100644
--- a/core/src/main/java/org/jclouds/internal/BaseView.java
+++ b/core/src/main/java/org/jclouds/internal/BaseView.java
@@ -28,9 +28,8 @@ import org.jclouds.View;
import org.jclouds.location.Provider;
import org.jclouds.rest.ApiContext;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ForwardingObject;
import com.google.common.reflect.TypeParameter;
import com.google.common.reflect.TypeToken;
@@ -101,7 +100,7 @@ public abstract class BaseView extends ForwardingObject implements View {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper("").add("backend", delegate()).add("backendType", getBackendType());
+ return Objects.toStringHelper("").add("backend", delegate()).add("backendType", getBackendType());
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 533d4df..374710c 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.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.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/3980cd79/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 e24d902..e00f57c 100644
--- a/core/src/main/java/org/jclouds/json/internal/DeserializationConstructorAndReflectiveTypeAdapterFactory.java
+++ b/core/src/main/java/org/jclouds/json/internal/DeserializationConstructorAndReflectiveTypeAdapterFactory.java
@@ -27,7 +27,6 @@ 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;
@@ -239,7 +238,7 @@ public final class DeserializationConstructorAndReflectiveTypeAdapterFactory imp
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).add("parameterizedCtor", parameterizedCtor)
+ return Objects.toStringHelper(this).add("parameterizedCtor", parameterizedCtor)
.add("parameterReaders", parameterReaders).add("serializer", serializer).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 d883ca7..0479d87 100644
--- a/core/src/main/java/org/jclouds/json/internal/NullFilteringTypeAdapterFactories.java
+++ b/core/src/main/java/org/jclouds/json/internal/NullFilteringTypeAdapterFactories.java
@@ -42,7 +42,7 @@ import java.util.Map.Entry;
import java.util.Set;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.toStringHelper;
/**
* Eliminates null values when deserializing Collections, Maps, and Multimaps
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 e978c24..f002217 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.newDirectExecutorService;
+import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor;
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);
}
- }, newDirectExecutorService());
+ }, sameThreadExecutor());
}
});
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 c22b289..fea73ed 100644
--- a/core/src/main/java/org/jclouds/providers/internal/BaseProviderMetadata.java
+++ b/core/src/main/java/org/jclouds/providers/internal/BaseProviderMetadata.java
@@ -29,10 +29,9 @@ 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.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
import com.google.common.base.Optional;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
@@ -247,7 +246,7 @@ public abstract class BaseProviderMetadata implements ProviderMetadata {
}
public ToStringHelper string() {
- return MoreObjects.toStringHelper("").add("id", getId()).add("name", getName()).add("api", getApiMetadata()).add(
+ return Objects.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());
}
[5/8] Revert "JCLOUDS-653: Address Guava 18 deprecations"
Posted by ad...@apache.org.
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 37a486a..be9b561 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,9 +26,8 @@ import org.jclouds.http.HttpRequest;
import org.jclouds.rest.MapBinder;
import org.jclouds.rest.binders.BindToJsonPayload;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableMap;
public class UpdateUserOptions implements MapBinder{
@@ -60,7 +59,7 @@ public class UpdateUserOptions implements MapBinder{
}
protected ToStringHelper string() {
- ToStringHelper toString = MoreObjects.toStringHelper("").omitNullValues();
+ ToStringHelper toString = Objects.toStringHelper("").omitNullValues();
toString.add("name", name);
toString.add("email", email);
toString.add("password", password);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 68c10d1..c44b72f 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.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
/**
* The OpenStack Compute API is extensible. Extensions serve two purposes: They
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 969f16a..10893d9 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.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 d7fa692..8899896 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.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 08f787d..46f5466 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,9 +23,8 @@ import java.net.URI;
import javax.inject.Named;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.Optional;
/**
@@ -197,7 +196,7 @@ public class Link {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("relation", relation).add("type", type.orNull())
+ return Objects.toStringHelper(this).omitNullValues().add("relation", relation).add("type", type.orNull())
.add("href", href);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 62918e8..9c4e72c 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.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 73dea1b..1824835 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,9 +23,8 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
@@ -153,7 +152,7 @@ public class Resource implements Comparable<Resource> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("name", name).add("links", links);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 af27d40..d36f7e2 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.newDirectExecutorService;
+import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor;
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\":\"marconi\",\"type\":\"queuing\"},{\"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(newDirectExecutorService()));
+ new ExecutorServiceModule(sameThreadExecutor()));
/**
* Pattern for replacing the URL token with the correct local address.
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 00d5802..4518e71 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
@@ -55,7 +55,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.MoreObjects;
+import com.google.common.base.Objects;
import com.google.common.base.Optional;
import com.google.common.base.Predicate;
import com.google.common.base.Supplier;
@@ -179,7 +179,7 @@ public class NovaComputeServiceAdapter implements
@Override
public String apply(Image input) {
- return MoreObjects.toStringHelper("").add("id", input.getId()).add("status", input.getStatus())
+ return Objects.toStringHelper("").add("id", input.getId()).add("status", input.getStatus())
.toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 12b6b91..4d7fba9 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
@@ -41,7 +41,7 @@ import org.jclouds.openstack.nova.v2_0.extensions.FloatingIPApi;
import org.jclouds.rest.InsufficientResourcesException;
import com.google.common.base.Function;
-import com.google.common.base.MoreObjects;
+import com.google.common.base.Objects;
import com.google.common.base.Optional;
import com.google.common.base.Predicate;
import com.google.common.cache.LoadingCache;
@@ -147,6 +147,6 @@ public class AllocateAndAddFloatingIpToNode implements
@Override
public String toString() {
- return MoreObjects.toStringHelper("AllocateAndAddFloatingIpToNode").toString();
+ return Objects.toStringHelper("AllocateAndAddFloatingIpToNode").toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 35a6787..4617f06 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.MoreObjects;
+import com.google.common.base.Objects;
import com.google.common.base.Supplier;
/**
@@ -63,6 +63,6 @@ public class ImageInRegionToImage implements Function<ImageInRegion, Image> {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).toString();
+ return Objects.toStringHelper(this).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 ca0d94d..2781942 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.MoreObjects;
+import com.google.common.base.Objects;
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 = MoreObjects.firstNonNull(from.getName(), "unspecified");
+ String imageName = Objects.firstNonNull(from.getName(), "unspecified");
boolean is64Bit = true;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 94309c8..dbf2836 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.MoreObjects;
+import com.google.common.base.Objects;
import com.google.common.cache.LoadingCache;
/**
@@ -67,6 +67,6 @@ public class RemoveFloatingIpFromNodeAndDeallocate implements Function<RegionAnd
@Override
public String toString() {
- return MoreObjects.toStringHelper("RemoveFloatingIpFromNodeAndDecreate").toString();
+ return Objects.toStringHelper("RemoveFloatingIpFromNodeAndDecreate").toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 f9906ed..b7d6c5d 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
@@ -31,7 +31,7 @@ import org.jclouds.openstack.nova.v2_0.domain.Network;
import org.jclouds.scriptbuilder.domain.Statement;
import com.google.common.base.Objects;
-import com.google.common.base.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableSet;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 86477ec..c57136c 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,9 +20,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* IP address
@@ -126,7 +125,7 @@ public class Address {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("addr", addr).add("version", version);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 9938b7c..7e05614 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,9 +22,8 @@ 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.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
/**
* A representation of a block device that can be used to boot a Nova instance.
@@ -186,7 +185,7 @@ public class BlockDeviceMapping {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("uuid", uuid)
.add("deviceName", deviceName)
.add("deviceType", deviceType)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 18dcb90..b0963ec 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.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
import java.net.URI;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Represents an Openstack Console.
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 c33ffda..ce40d51 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.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.Optional;
/**
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 405f18e..76e1c26 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,9 +24,8 @@ import javax.inject.Named;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* A Floating IP is an IP address that can be created and associated with a
@@ -173,7 +172,7 @@ public class FloatingIP implements Comparable<FloatingIP> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.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/3980cd79/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 b453750..4e3b919 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
@@ -16,10 +16,10 @@
*/
package org.jclouds.openstack.nova.v2_0.domain;
-import com.google.common.base.Objects;
-
import java.beans.ConstructorProperties;
+import com.google.common.base.Objects;
+
/**
* A pool that holds a collection of floating IP's that can be allocated from it.
*/
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 d3599ac..2c690f4 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,9 +22,8 @@ import javax.inject.Named;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Class Host
@@ -133,7 +132,7 @@ public class Host {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("name", name).add("service", service).add("zone", zone);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 c6f3457..f79245a 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,9 +27,8 @@ import javax.inject.Named;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
@@ -237,7 +236,7 @@ public class HostAggregate {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.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/3980cd79/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 7bb0a48..186fb33 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,9 +24,8 @@ import javax.inject.Named;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Class HostResourceUsage
@@ -169,7 +168,7 @@ public class HostResourceUsage {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.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/3980cd79/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 7f6fdbc..7a73154 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
@@ -29,7 +29,7 @@ import org.jclouds.openstack.v2_0.domain.Link;
import org.jclouds.openstack.v2_0.domain.Resource;
import com.google.common.base.Objects;
-import com.google.common.base.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableMap;
/**
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 172ea64..38f4e90 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,9 +24,8 @@ 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.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Ingress access to a destination protocol on particular ports
@@ -148,7 +147,7 @@ public class Ingress {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("ipProtocol", ipProtocol).add("fromPort", fromPort).add("toPort", toPort);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 e4f0802..aded550 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,9 +24,8 @@ import javax.inject.Named;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Class KeyPair
@@ -173,7 +172,7 @@ public class KeyPair {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper("")
+ return Objects.toStringHelper("")
.omitNullValues()
.add("public_key", publicKey)
.add("private_key", privateKey)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 3249b1f..49a3194 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
@@ -16,13 +16,12 @@
*/
package org.jclouds.openstack.nova.v2_0.domain;
+import static com.google.common.base.Preconditions.checkArgument;
+
import java.beans.ConstructorProperties;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
-
-import static com.google.common.base.Preconditions.checkArgument;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Nova (or Neutron) network definition
@@ -82,7 +81,7 @@ public class Network implements Comparable<Network> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("networkUuid", networkUuid)
.add("portUuid", portUuid)
.add("fixedIp", fixedIp);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 6457e8b..c16693e 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,9 +22,8 @@ import java.beans.ConstructorProperties;
import javax.inject.Named;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Represents the set of limits (quotas) returned by the Quota Extension
@@ -345,7 +344,7 @@ public class Quota {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.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/3980cd79/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 e00348b..0e47fcd 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,9 +25,8 @@ import javax.inject.Named;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
@@ -177,7 +176,7 @@ public class SecurityGroup {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.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/3980cd79/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 15df347..92d58f7 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.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ForwardingObject;
/**
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 c462625..220ff62 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.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.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/3980cd79/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 6db9f5f..8b13ec8 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.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.Optional;
/**
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 eeb1f9b..1dea7a5 100644
--- 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,9 +22,8 @@ import javax.inject.Named;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Additional attributes delivered by Extended Server Attributes extension (alias "OS-EXT-SRV-ATTR")
@@ -144,7 +143,7 @@ public class ServerExtendedAttributes {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("instanceName", instanceName).add("hostName", hostName).add("hypervisorHostName", hypervisorHostName);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 aa63fd6..3116470 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,9 +22,8 @@ import javax.inject.Named;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Additional attributes delivered by Extended Server Status extension (alias "OS-EXT-STS")
@@ -143,7 +142,7 @@ public class ServerExtendedStatus {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("taskState", taskState).add("vmState", vmState).add("powerState", powerState);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 31d0fa6..64c01af 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.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Multimap;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 ee616b8..f790d67 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,9 +25,8 @@ import javax.inject.Named;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Information the SimpleTenantUsage extension return data about each Server
@@ -300,7 +299,7 @@ public class SimpleServerUsage {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.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/3980cd79/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 75fe99f..4b12743 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,9 +26,8 @@ import javax.inject.Named;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
@@ -233,7 +232,7 @@ public class SimpleTenantUsage {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.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/3980cd79/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 2abd66e..b0b2164 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,9 +22,8 @@ import java.beans.ConstructorProperties;
import javax.inject.Named;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Class TenantIdAndName
@@ -115,7 +114,7 @@ public class TenantIdAndName {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("tenantId", tenantId).add("name", name);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 a6eca5b..42b2fba 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,9 +22,8 @@ import java.beans.ConstructorProperties;
import javax.inject.Named;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Represents a Virtual Interface (VIF)
@@ -116,7 +115,7 @@ public class VirtualInterface {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("macAddress", macAddress);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 371abd3..7fecfb2 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,9 +28,8 @@ import javax.inject.Named;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.CaseFormat;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
@@ -335,7 +334,7 @@ public class Volume {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("status", status).add("size", size).add("zone", zone).add("created", created).add("attachments", attachments).add("volumeType", volumeType).add("snapshotId", snapshotId).add("name", name).add("description", description).add("metadata", metadata);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/openstack-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 36e8140..894f85b 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,9 +22,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* An OpenStack Nova Volume Attachment (describes how Volumes are attached to Servers)
@@ -161,7 +160,7 @@ public class VolumeAttachment {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("volumeId", volumeId).add("serverId", serverId).add("device", device);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/openstack-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 b716dfa..bbd45a4 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,9 +25,8 @@ import javax.inject.Named;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* An OpenStack Nova Volume Snapshot
@@ -228,7 +227,7 @@ public class VolumeSnapshot {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("volumeId", volumeId).add("status", status).add("size", size).add("created", created).add("name", name).add("description", description);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/openstack-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 51639dc..43a0aba 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,9 +26,8 @@ import javax.inject.Named;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableMap;
@@ -181,7 +180,7 @@ public class VolumeType {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("name", name).add("created", created).add("updated", updated).add("extraSpecs", extraSpecs);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/openstack-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 5754bba..6f8737b 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.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
public class FlavorInRegion extends RegionAndId {
protected final Flavor flavor;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 9fd9829..b9f0f53 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.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
public class ImageInRegion extends RegionAndId {
protected final Image image;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 dab5b69..0a31634 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,9 +19,8 @@ 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.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.Splitter;
import com.google.common.collect.Iterables;
@@ -79,7 +78,7 @@ public class RegionAndId {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).add("regionId", regionId).add("id", id);
+ return Objects.toStringHelper(this).add("regionId", regionId).add("id", id);
}
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 13a666b..25d7d25 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,9 +21,8 @@ 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.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.Splitter;
import com.google.common.collect.Iterables;
@@ -96,12 +95,11 @@ public class RegionAndName {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).add("regionId", regionId).add("name", name);
+ return Objects.toStringHelper(this).add("regionId", regionId).add("name", name);
}
@Override
public String toString() {
return string().toString();
}
-
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 789b49c..5ee360b 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
@@ -21,8 +21,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Set;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
public class RegionSecurityGroupNameAndPorts extends RegionAndName {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 5f33b68..88168d4 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
@@ -20,7 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
import org.jclouds.openstack.nova.v2_0.domain.SecurityGroup;
-import com.google.common.base.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
public class SecurityGroupInRegion extends RegionAndName {
protected final SecurityGroup securityGroup;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 18c3071..be80937 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.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
public class ServerInRegion extends RegionAndId {
protected final Server server;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 a963dcd..283aa15 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
@@ -16,12 +16,11 @@
*/
package org.jclouds.openstack.nova.v2_0.domain.zonescoped;
-import com.google.common.base.MoreObjects;
+import java.beans.ConstructorProperties;
+
import com.google.common.base.Objects;
import com.google.gson.annotations.SerializedName;
-import java.beans.ConstructorProperties;
-
public class AvailabilityZone {
@SerializedName("zoneName")
@@ -55,8 +54,8 @@ public class AvailabilityZone {
return Objects.equal(this.name, that.name) && Objects.equal(this.state, that.state);
}
- protected MoreObjects.ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ protected Objects.ToStringHelper string() {
+ return Objects.toStringHelper(this)
.add("name", name)
.add("state", state);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 c7d07e2..dd628c2 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,9 +21,8 @@ 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.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.Splitter;
import com.google.common.collect.Iterables;
@@ -110,6 +109,6 @@ public class RegionAndName {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper("").add("regionId", regionId).add("name", name);
+ return Objects.toStringHelper("").add("regionId", regionId).add("name", name);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 b464925..a0322fc 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.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/openstack-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 6beea92..d32c368 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,7 +16,6 @@
*/
package org.jclouds.openstack.nova.v2_0.domain.zonescoped;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
public class ZoneState {
@@ -44,8 +43,8 @@ public class ZoneState {
return Objects.equal(this.available, that.available);
}
- protected MoreObjects.ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ protected Objects.ToStringHelper string() {
+ return Objects.toStringHelper(this)
.add("available", available);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 1b1fbd7..c2d3809 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.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.toStringHelper;
import java.util.Map;
@@ -28,7 +28,7 @@ import org.jclouds.rest.MapBinder;
import org.jclouds.rest.binders.BindToJsonPayload;
import com.google.common.base.Objects;
-import com.google.common.base.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/openstack-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 5dcd179..c57e296 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
@@ -16,8 +16,8 @@
*/
package org.jclouds.openstack.nova.v2_0.options;
-import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Objects.equal;
+import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;
@@ -38,9 +38,8 @@ 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.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ForwardingObject;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
@@ -139,7 +138,7 @@ public class CreateServerOptions implements MapBinder {
}
protected ToStringHelper string() {
- ToStringHelper toString = MoreObjects.toStringHelper(this);
+ ToStringHelper toString = Objects.toStringHelper(this);
toString.add("keyName", keyName);
if (!securityGroupNames.isEmpty())
toString.add("securityGroupNames", securityGroupNames);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 7741c19..df9a879 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.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
@@ -31,7 +31,7 @@ import org.jclouds.rest.MapBinder;
import org.jclouds.rest.binders.BindToJsonPayload;
import com.google.common.base.Objects;
-import com.google.common.base.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/openstack-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 3772434..c8a2fdd 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.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.toStringHelper;
import java.util.Map;
@@ -28,7 +28,7 @@ import org.jclouds.rest.MapBinder;
import org.jclouds.rest.binders.BindToJsonPayload;
import com.google.common.base.Objects;
-import com.google.common.base.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/openstack-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 aeb870e..a5b72e4 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.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.toStringHelper;
import java.util.Map;
@@ -28,7 +28,7 @@ import org.jclouds.rest.MapBinder;
import org.jclouds.rest.binders.BindToJsonPayload;
import com.google.common.base.Objects;
-import com.google.common.base.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/openstack-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 932c134..496087e 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
@@ -16,15 +16,15 @@
*/
package org.jclouds.openstack.swift.v1.domain;
-import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Objects.equal;
+import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Map;
import java.util.Map.Entry;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableMultimap;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 4f79044..9933a1c 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
@@ -16,14 +16,14 @@
*/
package org.jclouds.openstack.swift.v1.domain;
-import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Objects.equal;
+import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Map;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Represents a response from a Bulk Delete request.
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 4a31ab7..cc671de 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
@@ -16,16 +16,16 @@
*/
package org.jclouds.openstack.swift.v1.domain;
-import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Objects.equal;
+import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
import java.util.Map;
import java.util.Map.Entry;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableMultimap;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 7e06e0e..e569cf4 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
@@ -16,14 +16,14 @@
*/
package org.jclouds.openstack.swift.v1.domain;
-import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Objects.equal;
+import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Map;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Represents a response from an Extract Archive request.
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 a5f064f..18b394f 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
@@ -16,14 +16,14 @@
*/
package org.jclouds.openstack.swift.v1.domain;
-import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Objects.equal;
+import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import javax.inject.Named;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Represents a single segment of a multi-part upload.
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 7f638e8..0bbea90 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
@@ -16,8 +16,8 @@
*/
package org.jclouds.openstack.swift.v1.domain;
-import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Objects.equal;
+import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.net.URI;
@@ -27,8 +27,8 @@ import java.util.Map.Entry;
import org.jclouds.io.Payload;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableMultimap;
import com.google.common.collect.Multimap;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 acf0b06..4bf9830 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,9 +21,8 @@ import java.util.List;
import org.jclouds.openstack.v2_0.domain.Link;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableList;
@@ -89,7 +88,7 @@ public class Flavor implements Comparable<Flavor>{
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("name", name).add("ram", ram);
}
[6/8] Revert "JCLOUDS-653: Address Guava 18 deprecations"
Posted by ad...@apache.org.
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Pod.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Pod.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Pod.java
index 4186812..0019c6d 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Pod.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Pod.java
@@ -22,9 +22,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Represents a Pod in CloudStack.
@@ -267,7 +266,7 @@ public class Pod implements Comparable<Pod> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("name", name).add("zoneId", zoneId).add("zoneName", zoneName).add("gateway", gateway).add("netmask", netmask).add("startIp", startIp).add("endIp", endIp).add("allocationState", allocationState);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/PortForwardingRule.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/PortForwardingRule.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/PortForwardingRule.java
index b98123f..b246c7d 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/PortForwardingRule.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/PortForwardingRule.java
@@ -24,9 +24,8 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.CaseFormat;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
@@ -438,7 +437,7 @@ public class PortForwardingRule implements Comparable<PortForwardingRule> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("IPAddress", IPAddress).add("IPAddressId", IPAddressId).add("privatePort", privatePort)
.add("protocol", protocol).add("publicPort", publicPort).add("state", state).add("virtualMachineDisplayName", virtualMachineDisplayName)
.add("virtualMachineId", virtualMachineId).add("virtualMachineName", virtualMachineName).add("CIDRs", CIDRs)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Project.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Project.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Project.java
index cecc372..7744f74 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Project.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Project.java
@@ -25,9 +25,8 @@ import com.google.common.collect.ImmutableSet;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.CaseFormat;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Representation of the API project response
@@ -249,7 +248,7 @@ public class Project implements Comparable<Project> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).omitNullValues()
+ return Objects.toStringHelper(this).omitNullValues()
.add("id", id).add("account", account).add("displayText", displayText)
.add("domain", domain).add("domainId", domainId).add("name", name).add("state", state)
.add("tags", tags);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/PublicIPAddress.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/PublicIPAddress.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/PublicIPAddress.java
index d6211df..666d80f 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/PublicIPAddress.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/PublicIPAddress.java
@@ -26,9 +26,8 @@ import com.google.common.collect.ImmutableSet;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.CaseFormat;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Class PublicIPAddress
@@ -577,7 +576,7 @@ public class PublicIPAddress {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("account", account).add("allocated", allocated).add("associatedNetworkId", associatedNetworkId)
.add("domain", domain).add("domainId", domainId).add("usesVirtualNetwork", usesVirtualNetwork).add("IPAddress", IPAddress)
.add("isSourceNAT", isSourceNAT).add("isStaticNAT", isStaticNAT).add("networkId", networkId).add("state", state)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ResourceLimit.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ResourceLimit.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ResourceLimit.java
index 9d59faf..3e1b2ec 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ResourceLimit.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ResourceLimit.java
@@ -24,9 +24,8 @@ import java.util.Map;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.Function;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
@@ -259,7 +258,7 @@ public class ResourceLimit {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("account", account).add("domain", domain).add("domainId", domainId).add("max", max).add("resourceType", resourceType);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SecurityGroup.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SecurityGroup.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SecurityGroup.java
index b261965..04ba26c 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SecurityGroup.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SecurityGroup.java
@@ -23,9 +23,8 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.ImmutableSortedSet;
@@ -297,7 +296,7 @@ public class SecurityGroup implements Comparable<SecurityGroup> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).add("id", id).add("account", account).add("name", name).add("description", description)
+ return Objects.toStringHelper(this).add("id", id).add("account", account).add("name", name).add("description", description)
.add("domain", domain).add("domainId", domainId).add("jobId", jobId).add("jobStatus", jobStatus).add("ingressRules", ingressRules)
.add("tags", tags);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ServiceOffering.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ServiceOffering.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ServiceOffering.java
index d17ccca..4979f2c 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ServiceOffering.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ServiceOffering.java
@@ -24,9 +24,8 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
@@ -436,7 +435,7 @@ public class ServiceOffering implements Comparable<ServiceOffering> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("name", name).add("displayText", displayText).add("created", created).add("domain", domain)
.add("domainId", domainId).add("cpuNumber", cpuNumber).add("cpuSpeed", cpuSpeed).add("memory", memory)
.add("haSupport", haSupport).add("storageType", storageType).add("tags", getTags()).add("defaultUse", defaultUse)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Snapshot.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Snapshot.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Snapshot.java
index 86636d0..1bc9795 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Snapshot.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Snapshot.java
@@ -26,9 +26,8 @@ import com.google.common.collect.ImmutableSet;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.CaseFormat;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Class Snapshot
@@ -454,7 +453,7 @@ public class Snapshot {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("account", account).add("created", created).add("domain", domain).add("domainId", domainId)
.add("interval", interval).add("jobId", jobId).add("jobStatus", jobStatus).add("name", name).add("snapshotType", snapshotType)
.add("state", state).add("volumeId", volumeId).add("volumeName", volumeName).add("volumeType", volumeType)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SnapshotPolicy.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SnapshotPolicy.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SnapshotPolicy.java
index a460247..cab2592 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SnapshotPolicy.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SnapshotPolicy.java
@@ -22,9 +22,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Class SnapshotPolicy
@@ -204,7 +203,7 @@ public class SnapshotPolicy {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("interval", interval).add("numberToRetain", numberToRetain).add("schedule", schedule).add("timezone", timezone)
.add("volumeId", volumeId);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SnapshotPolicySchedule.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SnapshotPolicySchedule.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SnapshotPolicySchedule.java
index 888eaf6..1c7c7e4 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SnapshotPolicySchedule.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SnapshotPolicySchedule.java
@@ -20,9 +20,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Describes the schedule of a snapshot policy.
@@ -115,7 +114,7 @@ public class SnapshotPolicySchedule {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("interval", interval).add("time", time);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SshKeyPair.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SshKeyPair.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SshKeyPair.java
index 9eaaac9..e02d13e 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SshKeyPair.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SshKeyPair.java
@@ -22,9 +22,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Class SshKeyPair
@@ -132,7 +131,7 @@ public class SshKeyPair {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("fingerprint", fingerprint).add("name", name).add("privateKey", privateKey);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/StoragePool.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/StoragePool.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/StoragePool.java
index c134e70..35d33dc 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/StoragePool.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/StoragePool.java
@@ -25,9 +25,8 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.CaseFormat;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
@@ -467,7 +466,7 @@ public class StoragePool implements Comparable<StoragePool> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("name", name).add("path", path).add("tags", tags).add("state", state).add("type", type).add("zoneId", zoneId).add("zoneName", zoneName).add("podId", podId).add("podName", podName).add("clusterId", clusterId).add("clusterName", clusterName).add("created", created).add("diskSizeAllocated", diskSizeAllocated).add("diskSizeTotal", diskSizeTotal).add("ipAddress", ipAddress).add("jobId", jobId).add("jobStatus", jobStatus);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Tag.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Tag.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Tag.java
index 1868c51..b046251 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Tag.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Tag.java
@@ -21,13 +21,13 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
import java.util.Map;
+import org.jclouds.javax.annotation.Nullable;
+
import com.google.common.base.Function;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
-import org.jclouds.javax.annotation.Nullable;
/**
* Class Tag
@@ -331,7 +331,7 @@ public class Tag {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("account", account)
.add("customer", customer)
.add("domain", domain)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Template.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Template.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Template.java
index 76dce48..26ba3e3 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Template.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Template.java
@@ -22,12 +22,12 @@ import java.beans.ConstructorProperties;
import java.util.Date;
import java.util.Set;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
+import org.jclouds.javax.annotation.Nullable;
+
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableSet;
-import org.jclouds.javax.annotation.Nullable;
public class Template implements Comparable<Template> {
public enum Status {
@@ -878,7 +878,7 @@ public class Template implements Comparable<Template> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("displayText", displayText).add("domain", domain).add("domainId", domainId).add("account", account).add("accountId", accountId).add("zone", zone).add("zoneId", zoneId).add("OSType", OSType).add("OSTypeId", OSTypeId).add("name", name).add("type", type).add("status", status).add("format", format).add("hypervisor", hypervisor).add("size", size).add("created", created).add("removed", removed).add("crossZones", crossZones).add("bootable", bootable).add("extractable", extractable).add("featured", featured).add("ispublic", ispublic).add("ready", ready).add("passwordEnabled", passwordEnabled).add("jobId", jobId).add("jobStatus", jobStatus).add("checksum", checksum).add("hostId", hostId).add("hostName", hostName).add("sourceTemplateId", sourceTemplateId).add("templateTag", templateTag).add("tags", tags);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplateExtraction.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplateExtraction.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplateExtraction.java
index 4a603fa..2b3554a 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplateExtraction.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplateExtraction.java
@@ -23,9 +23,8 @@ import java.util.Date;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
public class TemplateExtraction implements Comparable<TemplateExtraction> {
@@ -351,7 +350,7 @@ public class TemplateExtraction implements Comparable<TemplateExtraction> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("accountId", accountId).add("created", created).add("extractId", extractId).add("extractMode", extractMode).add("name", name).add("state", state).add("status", status).add("storageType", storageType).add("uploadPercentage", uploadPercentage).add("url", url).add("zoneId", zoneId).add("zoneName", zoneName);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplateMetadata.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplateMetadata.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplateMetadata.java
index 17b845c..447b2bf 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplateMetadata.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplateMetadata.java
@@ -22,9 +22,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Class TemplateMetadata
@@ -223,7 +222,7 @@ public class TemplateMetadata {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("name", name).add("osTypeId", osTypeId).add("displayText", displayText).add("snapshotId", snapshotId)
.add("volumeId", volumeId).add("virtualMachineId", virtualMachineId).add("passwordEnabled", passwordEnabled);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplatePermission.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplatePermission.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplatePermission.java
index a4584db..1005e35 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplatePermission.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplatePermission.java
@@ -22,9 +22,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
public class TemplatePermission {
@@ -166,7 +165,7 @@ public class TemplatePermission {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("account", account).add("domainId", domainId).add("isPublic", isPublic);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/UsageRecord.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/UsageRecord.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/UsageRecord.java
index 5d413da..fe54b70 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/UsageRecord.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/UsageRecord.java
@@ -25,9 +25,8 @@ import java.util.Map;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.Function;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
@@ -498,7 +497,7 @@ public class UsageRecord {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("description", description).add("accountId", accountId).add("accountName", accountName)
.add("domainId", domainId).add("startDate", startDate).add("endDate", endDate).add("assignDate", assignDate)
.add("releaseDate", releaseDate).add("zoneId", zoneId).add("virtualMachineId", virtualMachineId)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/User.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/User.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/User.java
index 8c3d71c..4fa6337 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/User.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/User.java
@@ -23,9 +23,8 @@ import java.util.Date;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Class User
@@ -398,7 +397,7 @@ public class User {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("name", name).add("firstName", firstName).add("lastName", lastName).add("email", email)
.add("created", created).add("state", state).add("account", account).add("accountType", accountType).add("domain", domain)
.add("domainId", domainId).add("timeZone", timeZone).add("apiKey", apiKey).add("secretKey", secretKey);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VMGroup.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VMGroup.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VMGroup.java
index b3e5215..6f5ae60 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VMGroup.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VMGroup.java
@@ -23,9 +23,8 @@ import java.util.Date;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Class VMGroup
@@ -205,7 +204,7 @@ public class VMGroup {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("account", account).add("created", created).add("domain", domain).add("domainId", domainId).add("name", name);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VirtualMachine.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VirtualMachine.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VirtualMachine.java
index 920914c..cd7e255 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VirtualMachine.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VirtualMachine.java
@@ -25,9 +25,8 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.CaseFormat;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableSet;
@@ -1051,7 +1050,7 @@ public class VirtualMachine {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("account", account).add("cpuCount", cpuCount).add("cpuSpeed", cpuSpeed).add("cpuUsed", cpuUsed)
.add("displayName", displayName).add("created", created).add("domain", domain).add("domainId", domainId)
.add("usesVirtualNetwork", usesVirtualNetwork).add("group", group).add("groupId", groupId).add("guestOSId", guestOSId)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VlanIPRange.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VlanIPRange.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VlanIPRange.java
index 49c7d18..e9625f67 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VlanIPRange.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VlanIPRange.java
@@ -22,9 +22,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Represents the data object used in CloudStack's "Vlan" API.
@@ -352,7 +351,7 @@ public class VlanIPRange implements Comparable<VlanIPRange> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("description", description).add("forVirtualNetwork", forVirtualNetwork).add("zoneId", zoneId)
.add("vlan", vlan).add("account", account).add("domainId", domainId).add("domain", domain).add("podId", podId)
.add("podName", podName).add("gateway", gateway).add("netmask", netmask).add("startIP", startIP).add("endIP", endIP)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Volume.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Volume.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Volume.java
index 30e3a4f..47dd9a1 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Volume.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Volume.java
@@ -27,9 +27,8 @@ import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.CaseFormat;
import com.google.common.base.Function;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
@@ -745,7 +744,7 @@ public class Volume {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("account", account).add("attached", attached).add("created", created).add("destroyed", destroyed)
.add("deviceId", deviceId).add("diskOfferingDisplayText", diskOfferingDisplayText).add("diskOfferingId", diskOfferingId)
.add("diskOfferingName", diskOfferingName).add("domain", domain).add("domainId", domainId).add("hypervisor", hypervisor)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Zone.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Zone.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Zone.java
index 1548507..b710710 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Zone.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Zone.java
@@ -25,9 +25,8 @@ import java.util.Set;
import com.google.common.collect.ImmutableSet;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableList;
public class Zone implements Comparable<Zone> {
@@ -441,7 +440,7 @@ public class Zone implements Comparable<Zone> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("description", description).add("displayText", displayText).add("DNS1", DNS1).add("DNS2", DNS2)
.add("domain", domain).add("domainId", domainId).add("guestCIDRAddress", guestCIDRAddress).add("internalDNS1", internalDNS1)
.add("internalDNS2", internalDNS2).add("name", name).add("networkType", networkType).add("VLAN", VLAN)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ZoneAndName.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ZoneAndName.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ZoneAndName.java
index b6e7d2f..0154051 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ZoneAndName.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ZoneAndName.java
@@ -20,9 +20,8 @@ import static com.google.common.base.Objects.equal;
import static com.google.common.base.Preconditions.checkNotNull;
import com.google.common.base.Function;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Helpful when looking for resources by zone and name
@@ -88,6 +87,6 @@ public class ZoneAndName {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper("").add("zoneId", zoneId).add("name", name);
+ return Objects.toStringHelper("").add("zoneId", zoneId).add("name", name);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ZoneSecurityGroupNamePortsCidrs.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ZoneSecurityGroupNamePortsCidrs.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ZoneSecurityGroupNamePortsCidrs.java
index 8d75264..a269391 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ZoneSecurityGroupNamePortsCidrs.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ZoneSecurityGroupNamePortsCidrs.java
@@ -21,9 +21,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Set;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
public class ZoneSecurityGroupNamePortsCidrs extends ZoneAndName {
@@ -147,7 +146,7 @@ public class ZoneSecurityGroupNamePortsCidrs extends ZoneAndName {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("zoneId", zoneId).add("name", name).add("ports", ports).add("cidrs", cidrs);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Alarm.java
----------------------------------------------------------------------
diff --git a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Alarm.java b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Alarm.java
index 8209b3d..4ea6cec 100644
--- a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Alarm.java
+++ b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Alarm.java
@@ -17,7 +17,7 @@
package org.jclouds.cloudwatch.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/AlarmHistoryItem.java
----------------------------------------------------------------------
diff --git a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/AlarmHistoryItem.java b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/AlarmHistoryItem.java
index 7e1fc70..b9e05d2 100644
--- a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/AlarmHistoryItem.java
+++ b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/AlarmHistoryItem.java
@@ -17,7 +17,7 @@
package org.jclouds.cloudwatch.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Date;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Datapoint.java
----------------------------------------------------------------------
diff --git a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Datapoint.java b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Datapoint.java
index 9cb2a17..2dffd0e 100644
--- a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Datapoint.java
+++ b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Datapoint.java
@@ -16,7 +16,6 @@
*/
package org.jclouds.cloudwatch.domain;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import org.jclouds.javax.annotation.Nullable;
@@ -140,7 +139,7 @@ public class Datapoint {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("timestamp", timestamp)
.add("customUnit", customUnit)
.add("maximum", maximum)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Dimension.java
----------------------------------------------------------------------
diff --git a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Dimension.java b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Dimension.java
index 85437f6..bd89f64 100644
--- a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Dimension.java
+++ b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Dimension.java
@@ -16,7 +16,6 @@
*/
package org.jclouds.cloudwatch.domain;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -75,7 +74,7 @@ public class Dimension {
*/
@Override
public String toString() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("name", name)
.add("value", value).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/GetMetricStatisticsResponse.java
----------------------------------------------------------------------
diff --git a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/GetMetricStatisticsResponse.java b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/GetMetricStatisticsResponse.java
index 8a87396..5639f6a 100644
--- a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/GetMetricStatisticsResponse.java
+++ b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/GetMetricStatisticsResponse.java
@@ -20,7 +20,6 @@ import java.util.Iterator;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.FluentIterable;
import com.google.common.collect.ImmutableSet;
@@ -81,7 +80,7 @@ public class GetMetricStatisticsResponse extends FluentIterable<Datapoint> {
*/
@Override
public String toString() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("label", label)
.add("datapoints", datapoints).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/ListMetricsResponse.java
----------------------------------------------------------------------
diff --git a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/ListMetricsResponse.java b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/ListMetricsResponse.java
index 5257ec6..3d6279c 100644
--- a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/ListMetricsResponse.java
+++ b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/ListMetricsResponse.java
@@ -20,7 +20,6 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ForwardingSet;
import com.google.common.collect.ImmutableSet;
@@ -81,7 +80,7 @@ public class ListMetricsResponse extends ForwardingSet<Metric> {
*/
@Override
public String toString() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("metrics", metrics)
.add("nextToken", nextToken).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Metric.java
----------------------------------------------------------------------
diff --git a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Metric.java b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Metric.java
index c0329cb..18a4f33 100644
--- a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Metric.java
+++ b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Metric.java
@@ -16,7 +16,6 @@
*/
package org.jclouds.cloudwatch.domain;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.Sets;
import org.jclouds.javax.annotation.Nullable;
@@ -96,7 +95,7 @@ public class Metric {
*/
@Override
public String toString() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("namespace", namespace)
.add("metricName", metricName)
.add("dimension", dimensions).toString();
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/MetricDatum.java
----------------------------------------------------------------------
diff --git a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/MetricDatum.java b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/MetricDatum.java
index 512be1d..73e1ecc 100644
--- a/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/MetricDatum.java
+++ b/apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/MetricDatum.java
@@ -22,9 +22,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Date;
import java.util.Set;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
@@ -247,7 +246,7 @@ public class MetricDatum {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper("").omitNullValues().add("dimensions", dimensions).add("metricName", metricName)
+ return Objects.toStringHelper("").omitNullValues().add("dimensions", dimensions).add("metricName", metricName)
.add("statisticValues", statisticValues.orNull()).add("timestamp", timestamp.orNull()).add("unit", unit)
.add("value", value.orNull());
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/ec2/src/main/java/org/jclouds/ec2/compute/domain/PasswordDataAndPrivateKey.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/domain/PasswordDataAndPrivateKey.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/domain/PasswordDataAndPrivateKey.java
index 05c3bf5..b3d9100 100644
--- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/domain/PasswordDataAndPrivateKey.java
+++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/domain/PasswordDataAndPrivateKey.java
@@ -18,7 +18,6 @@ package org.jclouds.ec2.compute.domain;
import org.jclouds.ec2.domain.PasswordData;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -70,6 +69,6 @@ public class PasswordDataAndPrivateKey {
*/
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("passwordData", passwordData).toString();
+ return Objects.toStringHelper(this).omitNullValues().add("passwordData", passwordData).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/ec2/src/main/java/org/jclouds/ec2/compute/domain/RegionAndName.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/domain/RegionAndName.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/domain/RegionAndName.java
index 3de363c..cf38056 100644
--- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/domain/RegionAndName.java
+++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/domain/RegionAndName.java
@@ -19,9 +19,8 @@ package org.jclouds.ec2.compute.domain;
import static com.google.common.base.Preconditions.checkNotNull;
import com.google.common.base.Function;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
public class RegionAndName {
@@ -68,7 +67,7 @@ public class RegionAndName {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper("").add("region", region).add("name", name);
+ return Objects.toStringHelper("").add("region", region).add("name", name);
}
private static enum RegionFunction implements Function<RegionAndName, String> {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/ec2/src/main/java/org/jclouds/ec2/compute/options/EC2TemplateOptions.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/compute/options/EC2TemplateOptions.java b/apis/ec2/src/main/java/org/jclouds/ec2/compute/options/EC2TemplateOptions.java
index 3e5f34c..a56d640 100644
--- a/apis/ec2/src/main/java/org/jclouds/ec2/compute/options/EC2TemplateOptions.java
+++ b/apis/ec2/src/main/java/org/jclouds/ec2/compute/options/EC2TemplateOptions.java
@@ -27,7 +27,7 @@ import java.util.Map;
import java.util.Set;
import com.google.common.base.Objects;
-import com.google.common.base.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
import com.google.common.hash.Hashing;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/ec2/src/main/java/org/jclouds/ec2/domain/PasswordData.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/domain/PasswordData.java b/apis/ec2/src/main/java/org/jclouds/ec2/domain/PasswordData.java
index bc65dfe..4103286 100644
--- a/apis/ec2/src/main/java/org/jclouds/ec2/domain/PasswordData.java
+++ b/apis/ec2/src/main/java/org/jclouds/ec2/domain/PasswordData.java
@@ -20,7 +20,6 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Date;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -145,7 +144,7 @@ public class PasswordData {
*/
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("instanceId", instanceId).add("timestamp", timestamp)
+ return Objects.toStringHelper(this).omitNullValues().add("instanceId", instanceId).add("timestamp", timestamp)
.add("passwordData", passwordData).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/ec2/src/main/java/org/jclouds/ec2/domain/Reservation.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/domain/Reservation.java b/apis/ec2/src/main/java/org/jclouds/ec2/domain/Reservation.java
index 336d623..4fb7e22 100644
--- a/apis/ec2/src/main/java/org/jclouds/ec2/domain/Reservation.java
+++ b/apis/ec2/src/main/java/org/jclouds/ec2/domain/Reservation.java
@@ -22,7 +22,6 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ComparisonChain;
import com.google.common.collect.ForwardingSet;
@@ -215,7 +214,7 @@ public class Reservation<T extends RunningInstance> extends ForwardingSet<T> imp
*/
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("region", region).add("reservationId", reservationId)
+ return Objects.toStringHelper(this).omitNullValues().add("region", region).add("reservationId", reservationId)
.add("requesterId", requesterId).add("instances", instances).add("groupNames", groupNames).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/ec2/src/main/java/org/jclouds/ec2/domain/RunningInstance.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/domain/RunningInstance.java b/apis/ec2/src/main/java/org/jclouds/ec2/domain/RunningInstance.java
index d0f1ab6..00ab3e2 100644
--- a/apis/ec2/src/main/java/org/jclouds/ec2/domain/RunningInstance.java
+++ b/apis/ec2/src/main/java/org/jclouds/ec2/domain/RunningInstance.java
@@ -24,9 +24,8 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.Strings;
import com.google.common.collect.ComparisonChain;
import com.google.common.collect.ImmutableMap;
@@ -507,7 +506,7 @@ public class RunningInstance implements Comparable<RunningInstance> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("region", region)
+ return Objects.toStringHelper(this).omitNullValues().add("region", region)
.add("availabilityZone", availabilityZone).add("id", instanceId).add("state", rawState)
.add("type", instanceType).add("virtualizationType", virtualizationType).add("imageId", imageId)
.add("ipAddress", ipAddress).add("dnsName", dnsName).add("privateIpAddress", privateIpAddress)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/ec2/src/main/java/org/jclouds/ec2/domain/SecurityGroup.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/domain/SecurityGroup.java b/apis/ec2/src/main/java/org/jclouds/ec2/domain/SecurityGroup.java
index a45a16f..b497790 100644
--- a/apis/ec2/src/main/java/org/jclouds/ec2/domain/SecurityGroup.java
+++ b/apis/ec2/src/main/java/org/jclouds/ec2/domain/SecurityGroup.java
@@ -23,9 +23,8 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
import org.jclouds.net.domain.IpPermission;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ForwardingSet;
import com.google.common.collect.ImmutableSet;
@@ -212,7 +211,7 @@ public class SecurityGroup extends ForwardingSet<IpPermission> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("region", region).add("id", id).add("name", name)
+ return Objects.toStringHelper(this).omitNullValues().add("region", region).add("id", id).add("name", name)
.add("ownerId", ownerId).add("description", description)
.add("ipPermissions", ipPermissions.isEmpty() ? null : ipPermissions);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/ec2/src/main/java/org/jclouds/ec2/domain/Subnet.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/domain/Subnet.java b/apis/ec2/src/main/java/org/jclouds/ec2/domain/Subnet.java
index 87be905..eecc169 100644
--- a/apis/ec2/src/main/java/org/jclouds/ec2/domain/Subnet.java
+++ b/apis/ec2/src/main/java/org/jclouds/ec2/domain/Subnet.java
@@ -20,9 +20,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Map;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableMap;
/**
@@ -144,7 +143,7 @@ public final class Subnet {
}
private ToStringHelper string() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("subnetId", subnetId).add("subnetState", subnetState)
+ return Objects.toStringHelper(this).omitNullValues().add("subnetId", subnetId).add("subnetState", subnetState)
.add("vpcId", vpcId).add("cidrBlock", cidrBlock).add("availableIpAddressCount", availableIpAddressCount)
.add("availabilityZone", availabilityZone).add("tags", tags);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/ec2/src/main/java/org/jclouds/ec2/domain/Tag.java
----------------------------------------------------------------------
diff --git a/apis/ec2/src/main/java/org/jclouds/ec2/domain/Tag.java b/apis/ec2/src/main/java/org/jclouds/ec2/domain/Tag.java
index 88e5069..e83b7da 100644
--- a/apis/ec2/src/main/java/org/jclouds/ec2/domain/Tag.java
+++ b/apis/ec2/src/main/java/org/jclouds/ec2/domain/Tag.java
@@ -18,9 +18,8 @@ package org.jclouds.ec2.domain;
import static com.google.common.base.Preconditions.checkNotNull;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.Optional;
/**
@@ -192,7 +191,7 @@ public class Tag {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("resourceId", resourceId)
+ return Objects.toStringHelper(this).omitNullValues().add("resourceId", resourceId)
.add("resourceType", resourceType).add("key", key).add("value", value.orNull());
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/WellKnownImage.java
----------------------------------------------------------------------
diff --git a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/WellKnownImage.java b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/WellKnownImage.java
index 41b2683..22ce5d4 100644
--- a/apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/WellKnownImage.java
+++ b/apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/WellKnownImage.java
@@ -16,13 +16,12 @@
*/
package org.jclouds.elasticstack.domain;
-import static com.google.common.base.MoreObjects.firstNonNull;
+import static com.google.common.base.Objects.firstNonNull;
import static com.google.common.base.Preconditions.checkNotNull;
import org.jclouds.compute.domain.OsFamily;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
public class WellKnownImage {
@@ -153,7 +152,7 @@ public class WellKnownImage {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("uuid", uuid).add("description", description)
+ return Objects.toStringHelper(this).omitNullValues().add("uuid", uuid).add("description", description)
.add("osFamily", osFamily).add("osVersion", osVersion).add("size", size).add("is64bit", is64bit)
.add("loginUser", loginUser).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Snapshot.java
----------------------------------------------------------------------
diff --git a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Snapshot.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Snapshot.java
index 8387eb0..e5e2e48 100644
--- a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Snapshot.java
+++ b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Snapshot.java
@@ -25,9 +25,8 @@ import javax.inject.Named;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* An Openstack Cinder Volume Snapshot.
@@ -229,7 +228,7 @@ public class Snapshot {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("volumeId", volumeId).add("status", status).add("size", size).add("created", created).add("name", name).add("description", description);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Volume.java
----------------------------------------------------------------------
diff --git a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Volume.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Volume.java
index 20a29ba..eed17f8 100644
--- a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Volume.java
+++ b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Volume.java
@@ -28,9 +28,8 @@ import javax.inject.Named;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.CaseFormat;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
@@ -350,7 +349,7 @@ public class Volume {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("status", status).add("size", size).add("zone", zone).add("created", created).add("attachments", attachments).add("volumeType", volumeType).add("snapshotId", snapshotId).add("name", name).add("description", description).add("metadata", metadata);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeAttachment.java
----------------------------------------------------------------------
diff --git a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeAttachment.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeAttachment.java
index 19e9743..d86f23b 100644
--- a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeAttachment.java
+++ b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeAttachment.java
@@ -24,9 +24,8 @@ import javax.inject.Named;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* An OpenStack Cinder Volume Attachment (describes how Volumes are attached to Servers).
@@ -165,7 +164,7 @@ public class VolumeAttachment {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("volumeId", volumeId).add("serverId", serverId).add("device", device);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeQuota.java
----------------------------------------------------------------------
diff --git a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeQuota.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeQuota.java
index ae150e8..78b5936 100644
--- a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeQuota.java
+++ b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeQuota.java
@@ -16,7 +16,6 @@
*/
package org.jclouds.openstack.cinder.v1.domain;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import static com.google.common.base.Preconditions.checkNotNull;
@@ -80,8 +79,8 @@ public class VolumeQuota {
&& Objects.equal(this.snapshots, that.snapshots);
}
- protected MoreObjects.ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ protected Objects.ToStringHelper string() {
+ return Objects.toStringHelper(this)
.add("id", id).add("volumes", volumes).add("gigabytes", gigabytes).add("snapshots", snapshots);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeType.java
----------------------------------------------------------------------
diff --git a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeType.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeType.java
index c82168f..596b984 100644
--- a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeType.java
+++ b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeType.java
@@ -26,9 +26,8 @@ import javax.inject.Named;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableMap;
@@ -179,7 +178,7 @@ public class VolumeType {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("name", name).add("created", created).add("updated", updated).add("extraSpecs", extraSpecs);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateSnapshotOptions.java
----------------------------------------------------------------------
diff --git a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateSnapshotOptions.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateSnapshotOptions.java
index f549b2f..5ce3fe0 100644
--- a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateSnapshotOptions.java
+++ b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateSnapshotOptions.java
@@ -17,7 +17,7 @@
package org.jclouds.openstack.cinder.v1.options;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.toStringHelper;
import java.util.Map;
@@ -28,7 +28,7 @@ import org.jclouds.rest.MapBinder;
import org.jclouds.rest.binders.BindToJsonPayload;
import com.google.common.base.Objects;
-import com.google.common.base.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateVolumeOptions.java
----------------------------------------------------------------------
diff --git a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateVolumeOptions.java b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateVolumeOptions.java
index 1b986a1..6c5681b 100644
--- a/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateVolumeOptions.java
+++ b/apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateVolumeOptions.java
@@ -17,7 +17,7 @@
package org.jclouds.openstack.cinder.v1.options;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
@@ -31,7 +31,7 @@ import org.jclouds.rest.MapBinder;
import org.jclouds.rest.binders.BindToJsonPayload;
import com.google.common.base.Objects;
-import com.google.common.base.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Access.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Access.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Access.java
index 93d31f9..e121745 100644
--- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Access.java
+++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Access.java
@@ -23,9 +23,8 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ForwardingSet;
import com.google.common.collect.ImmutableSet;
@@ -143,7 +142,7 @@ public class Access extends ForwardingSet<Service> implements Comparable<Access>
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("token", token).add("user", user)
+ return Objects.toStringHelper(this).omitNullValues().add("token", token).add("user", user)
.add("serviceCatalog", serviceCatalog);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/ApiAccessKeyCredentials.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/ApiAccessKeyCredentials.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/ApiAccessKeyCredentials.java
index 4e4d6dc..f926083 100644
--- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/ApiAccessKeyCredentials.java
+++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/ApiAccessKeyCredentials.java
@@ -23,9 +23,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.openstack.keystone.v2_0.config.CredentialType;
import org.jclouds.openstack.keystone.v2_0.config.CredentialTypes;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Api AccessKey Credentials
@@ -128,7 +127,7 @@ public class ApiAccessKeyCredentials {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("accessKey", accessKey).add("secretKey", secretKey);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/ApiMetadata.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/ApiMetadata.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/ApiMetadata.java
index fa354b8..ad20938 100644
--- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/ApiMetadata.java
+++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/ApiMetadata.java
@@ -29,7 +29,7 @@ import org.jclouds.openstack.v2_0.domain.Link;
import org.jclouds.openstack.v2_0.domain.Resource;
import com.google.common.base.Objects;
-import com.google.common.base.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Endpoint.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Endpoint.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Endpoint.java
index 0080b2e..4a71b1f 100644
--- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Endpoint.java
+++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Endpoint.java
@@ -21,9 +21,8 @@ import java.net.URI;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* An network-accessible address, usually described by URL, where a service may
@@ -332,7 +331,7 @@ public class Endpoint {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("id", id).add("versionId", versionId)
+ return Objects.toStringHelper(this).omitNullValues().add("id", id).add("versionId", versionId)
.add("region", region).add("publicURL", publicURL).add("internalURL", internalURL)
.add("adminURL", adminURL).add("versionInfo", versionInfo).add("versionList", versionList)
.add("tenantId", tenantId);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/MediaType.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/MediaType.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/MediaType.java
index da04359..796eed5 100644
--- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/MediaType.java
+++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/MediaType.java
@@ -20,9 +20,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Class MediaType
@@ -113,7 +112,7 @@ public class MediaType {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("base", base).add("type", type);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/PasswordCredentials.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/PasswordCredentials.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/PasswordCredentials.java
index aa0dcbb..73443f1 100644
--- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/PasswordCredentials.java
+++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/PasswordCredentials.java
@@ -22,9 +22,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.openstack.keystone.v2_0.config.CredentialType;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Password Credentials
@@ -127,7 +126,7 @@ public class PasswordCredentials {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("username", username).add("password", password);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Role.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Role.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Role.java
index c1ec687..be3c544 100644
--- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Role.java
+++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Role.java
@@ -22,9 +22,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* A personality that a user assumes when performing a specific set of operations. A role includes a
@@ -193,7 +192,7 @@ public class Role {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).omitNullValues()
+ return Objects.toStringHelper(this).omitNullValues()
.add("id", id).add("name", name).add("description", description).add("serviceId", serviceId).add("tenantId", tenantId);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Service.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Service.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Service.java
index 4642d5e..9d71a78 100644
--- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Service.java
+++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Service.java
@@ -23,9 +23,8 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ForwardingSet;
import com.google.common.collect.ImmutableSet;
@@ -192,7 +191,7 @@ public class Service extends ForwardingSet<Endpoint> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).omitNullValues()
+ return Objects.toStringHelper(this).omitNullValues()
.add("id", id).add("type", type).add("name", name)
.add("description", description).add("endpoints", endpoints);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Tenant.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Tenant.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Tenant.java
index c4e3cf9..adb71c4 100644
--- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Tenant.java
+++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Tenant.java
@@ -22,9 +22,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* A container used to group or isolate resources and/or identity objects.
@@ -163,7 +162,7 @@ public class Tenant {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("id", id).add("name", name)
+ return Objects.toStringHelper(this).omitNullValues().add("id", id).add("name", name)
.add("description", description).add("enabled", enabled);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Token.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Token.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Token.java
index bd2ba76..52a5e0f 100644
--- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Token.java
+++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Token.java
@@ -23,9 +23,8 @@ import java.util.Date;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.Optional;
/**
@@ -152,7 +151,7 @@ public class Token implements Comparable<Token> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).omitNullValues()
+ return Objects.toStringHelper(this).omitNullValues()
.add("id", id).add("expires", expires).add("tenant", tenant.orNull());
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/User.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/User.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/User.java
index 6e20818..8d4d90d 100644
--- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/User.java
+++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/User.java
@@ -23,9 +23,8 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ForwardingSet;
import com.google.common.collect.ImmutableSet;
@@ -208,7 +207,7 @@ public class User extends ForwardingSet<Role> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("id", id).add("name", name).add("email", email)
+ return Objects.toStringHelper(this).omitNullValues().add("id", id).add("name", name).add("email", email)
.add("enabled", enabled).add("roles", roles).add("tenanId", tenantId);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/CreateTenantOptions.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/CreateTenantOptions.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/CreateTenantOptions.java
index e654d9b..24b0523 100644
--- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/CreateTenantOptions.java
+++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/CreateTenantOptions.java
@@ -27,9 +27,8 @@ import org.jclouds.http.HttpRequest;
import org.jclouds.rest.MapBinder;
import org.jclouds.rest.binders.BindToJsonPayload;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableMap;
public class CreateTenantOptions implements MapBinder {
@@ -58,7 +57,7 @@ public class CreateTenantOptions implements MapBinder {
}
protected ToStringHelper string() {
- ToStringHelper toString = MoreObjects.toStringHelper("").omitNullValues();
+ ToStringHelper toString = Objects.toStringHelper("").omitNullValues();
toString.add("description", description);
toString.add("enabled", Boolean.valueOf(enabled));
return toString;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/CreateUserOptions.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/CreateUserOptions.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/CreateUserOptions.java
index 7411536..1e1b843 100644
--- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/CreateUserOptions.java
+++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/CreateUserOptions.java
@@ -27,9 +27,8 @@ import org.jclouds.http.HttpRequest;
import org.jclouds.rest.MapBinder;
import org.jclouds.rest.binders.BindToJsonPayload;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableMap;
public class CreateUserOptions implements MapBinder{
@@ -61,7 +60,7 @@ public class CreateUserOptions implements MapBinder{
}
protected ToStringHelper string() {
- ToStringHelper toString = MoreObjects.toStringHelper("").omitNullValues();
+ ToStringHelper toString = Objects.toStringHelper("").omitNullValues();
toString.add("tenant", tenant);
toString.add("password", password);
toString.add("email", email);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/UpdateTenantOptions.java
----------------------------------------------------------------------
diff --git a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/UpdateTenantOptions.java b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/UpdateTenantOptions.java
index d7af8d2..bfc2caa 100644
--- a/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/UpdateTenantOptions.java
+++ b/apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/UpdateTenantOptions.java
@@ -26,9 +26,8 @@ import org.jclouds.http.HttpRequest;
import org.jclouds.rest.MapBinder;
import org.jclouds.rest.binders.BindToJsonPayload;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableMap;
public class UpdateTenantOptions implements MapBinder {
@@ -58,7 +57,7 @@ public class UpdateTenantOptions implements MapBinder {
}
protected ToStringHelper string() {
- ToStringHelper toString = MoreObjects.toStringHelper("").omitNullValues();
+ ToStringHelper toString = Objects.toStringHelper("").omitNullValues();
toString.add("name", name);
toString.add("description", description);
toString.add("enabled", Boolean.valueOf(enabled));
[4/8] Revert "JCLOUDS-653: Address Guava 18 deprecations"
Posted by ad...@apache.org.
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 691f97f..d5afb53 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,9 +23,8 @@ 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.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableList;
/**
@@ -176,7 +175,7 @@ public class Instance implements Comparable<Instance>{
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.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/3980cd79/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 5bd0b61..1012c74 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,9 +21,8 @@ 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.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Lists;
@@ -139,7 +138,7 @@ public class User implements Comparable<User>{
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("name", name)
.add("password", password)
.add("host", host)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 509b6bd..6425111 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,9 +18,8 @@ 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.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableMap;
@@ -107,7 +106,7 @@ public class CreateDomain {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("name", name).add("email", emailAddress)
+ return Objects.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/3980cd79/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 2b443ec..d620bfa 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,9 +18,8 @@ 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.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.Optional;
public class CreateSubdomain {
@@ -81,7 +80,7 @@ public class CreateSubdomain {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("name", name).add("email", emailAddress)
+ return Objects.toStringHelper(this).omitNullValues().add("name", name).add("email", emailAddress)
.add("ttl", ttl.orNull()).add("comment", comment.orNull());
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 4657da2..382924a 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,9 +24,8 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableSet;
@@ -126,7 +125,7 @@ public class Domain {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("id", id).add("name", name).add("email", email)
+ return Objects.toStringHelper(this).omitNullValues().add("id", id).add("name", name).add("email", email)
.add("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/3980cd79/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 6bc930d..02972ad 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,7 +22,6 @@ 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 {
@@ -66,7 +65,7 @@ public class DomainChange {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("from", from).add("to", to).add("changes", changes)
+ return Objects.toStringHelper(this).omitNullValues().add("from", from).add("to", to).add("changes", changes)
.toString();
}
@@ -132,7 +131,7 @@ public class DomainChange {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("domain", domain).add("action", action)
+ return Objects.toStringHelper(this).omitNullValues().add("domain", domain).add("action", action)
.add("targetType", targetType).add("accountId", accountId).add("targetId", targetId)
.add("changeDetails", changeDetails).toString();
}
@@ -180,7 +179,7 @@ public class DomainChange {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("field", field).add("originalValue", originalValue)
+ return Objects.toStringHelper(this).omitNullValues().add("field", field).add("originalValue", originalValue)
.add("newValue", newValue).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 aea4bd2..a0a0b48 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.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 60b133a..1d768bc 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.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.toStringHelper;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.Objects;
-import com.google.common.base.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.Optional;
public class Record {
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 ad588a0..8548550 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.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Date;
import com.google.common.base.Objects;
-import com.google.common.base.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
public class RecordDetail {
private final String id;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 53f7591..13cf7b4 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,7 +21,6 @@ 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;
@@ -89,7 +88,7 @@ public class Subdomain {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("id", id).add("name", name).add("email", emailAddress)
+ return Objects.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/3980cd79/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 1c6cc46..ce62c42 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,9 +16,8 @@
*/
package org.jclouds.rackspace.clouddns.v1.domain;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.Optional;
/**
@@ -65,7 +64,7 @@ public class UpdateDomain {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("email", emailAddress.orNull()).add("ttl", ttl.orNull())
+ return Objects.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/3980cd79/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v1_1/domain/Auth.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v1_1/domain/Auth.java b/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v1_1/domain/Auth.java
index be320a3..04bdba5 100644
--- a/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v1_1/domain/Auth.java
+++ b/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v1_1/domain/Auth.java
@@ -17,7 +17,7 @@
package org.jclouds.rackspace.cloudidentity.v1_1.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import com.google.common.base.Objects;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v1_1/domain/Endpoint.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v1_1/domain/Endpoint.java b/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v1_1/domain/Endpoint.java
index ee621c0..020ed85 100644
--- a/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v1_1/domain/Endpoint.java
+++ b/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v1_1/domain/Endpoint.java
@@ -17,7 +17,7 @@
package org.jclouds.rackspace.cloudidentity.v1_1.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.net.URI;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v1_1/domain/Token.java
----------------------------------------------------------------------
diff --git a/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v1_1/domain/Token.java b/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v1_1/domain/Token.java
index bc39162..9d9845b 100644
--- a/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v1_1/domain/Token.java
+++ b/apis/rackspace-cloudidentity/src/main/java/org/jclouds/rackspace/cloudidentity/v1_1/domain/Token.java
@@ -17,7 +17,7 @@
package org.jclouds.rackspace.cloudidentity.v1_1.domain;
import static com.google.common.base.Objects.equal;
-import static com.google.common.base.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Date;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/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 4976ec2..0583856 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.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.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/3980cd79/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 0892ba1..2398c43 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,9 +18,8 @@ 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.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* The access rule management feature allows fine-grained network access controls to be applied to the load balancer's
@@ -76,7 +75,7 @@ public class AccessRule {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).omitNullValues()
+ return Objects.toStringHelper(this).omitNullValues()
.add("address", address).add("type", type);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 7b9e64a..78cff08 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,9 +16,8 @@
*/
package org.jclouds.rackspace.cloudloadbalancers.v1.domain;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* The same as {@link AccessRule} but this will have an id as assigned by the Cloud Load Balancers service.
@@ -51,7 +50,7 @@ public class AccessRuleWithId extends AccessRule {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).omitNullValues()
+ return Objects.toStringHelper(this).omitNullValues()
.add("id", id).add("address", getAddress()).add("type", getType());
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 1839cb2..89e506c 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,7 +21,6 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
import java.util.Date;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Optional;
@@ -83,7 +82,7 @@ public final class AccountUsage {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("numPublicVIPs", numPublicVIPs)
+ return Objects.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/3980cd79/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 1e1d601..ff84867 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,9 +18,8 @@ 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.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* The nodes defined by the load balancer are responsible for servicing the requests received
@@ -57,7 +56,7 @@ public class AddNode extends BaseNode<AddNode> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).omitNullValues()
+ return Objects.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/3980cd79/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 71af6e2..cbdb847 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,9 +20,8 @@ import static com.google.common.base.Preconditions.checkArgument;
import java.beans.ConstructorProperties;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* The connection throttling feature imposes limits on the number of connections per IP address to help mitigate
@@ -88,7 +87,7 @@ public class ConnectionThrottle {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).add("maxConnections", maxConnections).add("minConnections", minConnections)
+ return Objects.toStringHelper(this).add("maxConnections", maxConnections).add("minConnections", minConnections)
.add("maxConnectionRate", maxConnectionRate).add("rateInterval", rateInterval);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 fd3be7a..d3153f7 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.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
@@ -83,7 +83,7 @@ public class CreateLoadBalancer extends BaseLoadBalancer<AddNode, CreateLoadBala
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("name", name).add("protocol", protocol)
+ return Objects.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/3980cd79/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 9cddec2..8970c34 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,9 +22,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.Optional;
/**
@@ -140,7 +139,7 @@ public class HealthMonitor {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("type", type).add("delay", delay)
+ return Objects.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/3980cd79/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 332c2cb..64b7e6f 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,7 +21,6 @@ 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;
@@ -68,7 +67,7 @@ public final class HistoricalUsage {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("accountId", accountId)
+ return Objects.toStringHelper(this).omitNullValues().add("accountId", accountId)
.add("accountUsage", getAccountUsage()).add("loadBalancerInfo", loadBalancerUsages).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 245282e..74c6bcf 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,9 +27,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.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
public class LoadBalancer extends BaseLoadBalancer<Node, LoadBalancer> {
@@ -171,7 +170,7 @@ public class LoadBalancer extends BaseLoadBalancer<Node, LoadBalancer> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("id", id).add("region", region).add("status", status)
+ return Objects.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/3980cd79/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 bf9b3a2..0c2372f 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,7 +20,6 @@ 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 {
@@ -65,7 +64,7 @@ public final class LoadBalancerInfo {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("loadBalancerId", loadBalancerId)
+ return Objects.toStringHelper(this).omitNullValues().add("loadBalancerId", loadBalancerId)
.add("loadBalancerName", loadBalancerName).add("loadBalancerUsage", loadBalancerUsageRecords).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 822edb2..b73992a 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.MoreObjects;
+import com.google.common.base.Objects;
public final class LoadBalancerStats {
private final int connectTimeOut;
@@ -84,7 +84,7 @@ public final class LoadBalancerStats {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("connectTimeOut", connectTimeOut)
+ return Objects.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/3980cd79/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 1b6b61c..0137002 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,7 +23,6 @@ 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;
@@ -140,7 +139,7 @@ public final class LoadBalancerUsage {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues()
+ return Objects.toStringHelper(this).omitNullValues()
.add("averageNumConnections", averageNumConnections)
.add("averageNumConnectionsSsl", averageNumConnectionsSsl)
.add("incomingTransferInBytes", incomingTransferInBytes)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 5fb7809..5088e24 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,9 +21,8 @@ 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.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* The nodes defined by the load balancer are responsible for servicing the requests received
@@ -80,7 +79,7 @@ public class Node extends BaseNode<Node> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).omitNullValues()
+ return Objects.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/3980cd79/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 c68fd1f..007f6fe 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,7 +20,6 @@ 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 {
@@ -59,6 +58,6 @@ public final class Protocol {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("name", name).add("port", port).toString();
+ return Objects.toStringHelper(this).omitNullValues().add("name", name).add("port", port).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 97e532f..0fead4d 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,9 +20,8 @@ import java.beans.ConstructorProperties;
import javax.inject.Named;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.Optional;
/**
@@ -187,7 +186,7 @@ public class SSLTermination {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("enabled", enabled)
+ return Objects.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/3980cd79/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 2d68487..a968c04 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,9 +16,8 @@
*/
package org.jclouds.rackspace.cloudloadbalancers.v1.domain;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* The load balancer source IP addresses are useful for customers who are automating the deployment of infrastructure
@@ -66,7 +65,7 @@ public class SourceAddresses {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).add("ipv6Public", ipv6Public).add("ipv4Public", ipv4Public)
+ return Objects.toStringHelper(this).add("ipv6Public", ipv6Public).add("ipv4Public", ipv4Public)
.add("ipv4Servicenet", ipv4Servicenet);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 8a9f65f..c09976e 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,9 +19,8 @@ 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.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Used to update Load Balancers.
@@ -69,7 +68,7 @@ public class UpdateLoadBalancer {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("name", name).add("algorithm", algorithm)
+ return Objects.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/3980cd79/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 fc2911d..e38561e 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,9 +20,8 @@ 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.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Used to update Nodes.
@@ -51,7 +50,7 @@ public class UpdateNode {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).omitNullValues()
+ return Objects.toStringHelper(this).omitNullValues()
.add("condition", condition).add("type", type).add("weight", weight);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 475c6dd..6506071 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,9 +18,8 @@ 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.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* A virtual IP (VIP) makes a load balancer accessible by clients. The load balancing service
@@ -53,7 +52,7 @@ public class VirtualIP {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).omitNullValues()
+ return Objects.toStringHelper(this).omitNullValues()
.add("ipVersion", ipVersion).add("type", type);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 f77f8e4..372d1ff 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,9 +18,8 @@ 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.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* @see VirtualIP
@@ -45,7 +44,7 @@ public class VirtualIPWithId extends VirtualIP {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).omitNullValues()
+ return Objects.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/3980cd79/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 05753c1..1b892e0 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
@@ -28,9 +28,8 @@ 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.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.ImmutableSortedSet;
import com.google.common.collect.Maps;
@@ -160,7 +159,7 @@ public class BaseLoadBalancer<N extends BaseNode<N>, T extends BaseLoadBalancer<
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("name", name).add("protocol", protocol)
+ return Objects.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/3980cd79/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 49b47a2..926ca89 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
@@ -19,9 +19,9 @@ package org.jclouds.rackspace.cloudloadbalancers.v1.domain.internal;
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.MoreObjects.ToStringHelper;
+
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* The nodes defined by the load balancer are responsible for servicing the requests received
@@ -97,7 +97,7 @@ public class BaseNode<T extends BaseNode<T>> implements Comparable<BaseNode<T>>
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("address", address).add("port", port)
+ return Objects.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/3980cd79/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 1f16993..470a6f2 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.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Date;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/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 4865b13..184c525 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.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/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 626e470..b227b73 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.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.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/3980cd79/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 f339b32..f8c3eda 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.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.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/3980cd79/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 20722a0..5d978b1 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.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.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/3980cd79/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 9b67d59..20e225f 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.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
@@ -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.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableList;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 a94e45e..87670ce 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.MoreObjects.toStringHelper;
+import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Iterator;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 5cb2db5..c91b316 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.newDirectExecutorService;
+import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor;
import static org.jclouds.Constants.PROPERTY_MAX_RETRIES;
import static org.testng.Assert.assertEquals;
@@ -45,7 +45,7 @@ import com.squareup.okhttp.mockwebserver.RecordedRequest;
public class S3ClientMockTest {
private static final Set<Module> modules = ImmutableSet.<Module> of(new OkHttpCommandExecutorServiceModule(),
- new ExecutorServiceModule(newDirectExecutorService()));
+ new ExecutorServiceModule(sameThreadExecutor()));
static S3Client getS3Client(URL server) {
Properties overrides = new Properties();
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 46fa6b5..3d638db 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.newDirectExecutorService;
+import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor;
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(
- newDirectExecutorService(),
+ sameThreadExecutor(),
new BucketToResourceMetadata(Functions.forMap(ImmutableMap.<String, Location> of("mycontainer", region))));
MutableStorageMetadata expected = new MutableStorageMetadataImpl();
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 1689bfe..a51db4c 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.MoreObjects;
+import com.google.common.base.Objects;
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 = MoreObjects.firstNonNull(options, NO_OPTIONS);
+ this.options = Objects.firstNonNull(options, NO_OPTIONS);
}
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 428918a..1c8d35c 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,7 +18,6 @@ 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;
/**
@@ -145,7 +144,7 @@ public class BatchError {
*/
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("id", id).add("senderFault", senderFault)
+ return Objects.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/3980cd79/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 ca60327..58aa80a 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,7 +21,6 @@ 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;
@@ -137,7 +136,7 @@ public class BatchResult<V> extends ForwardingMap<String, V> {
*/
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("results", results).add("errors", errors).toString();
+ return Objects.toStringHelper(this).omitNullValues().add("results", results).add("errors", errors).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 0c43f7d..5566e50 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,7 +20,6 @@ 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;
@@ -176,7 +175,7 @@ public class Message {
*/
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("id", id).add("body", body).add("md5", md5)
+ return Objects.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/3980cd79/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 26e2f9c..934f13d 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,7 +18,6 @@ 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;
@@ -110,7 +109,7 @@ public class MessageIdAndMD5 {
*/
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("id", id).add("md5", md5).toString();
+ return Objects.toStringHelper(this).omitNullValues().add("id", id).add("md5", md5).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 82f7126..d12a20b 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,7 +20,6 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Date;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Optional;
@@ -299,7 +298,7 @@ public class QueueAttributes {
*/
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("queueArn", queueArn)
+ return Objects.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/3980cd79/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 d02b49f..d8f70b3 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,7 +21,6 @@ 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;
@@ -139,7 +138,7 @@ public class CreateQueueOptions extends BaseHttpRequestOptions implements Clonea
@Override
public String toString() {
ImmutableMap<String, String> attributes = this.attributes.build();
- return MoreObjects.toStringHelper(this).omitNullValues().add("attributes", !attributes.isEmpty() ? attributes : null)
+ return Objects.toStringHelper(this).omitNullValues().add("attributes", !attributes.isEmpty() ? attributes : null)
.toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 a626d56..279e1b5 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,7 +18,6 @@ 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;
@@ -155,7 +154,7 @@ public class ReceiveMessageOptions extends BaseHttpRequestOptions implements Clo
@Override
public String toString() {
ImmutableSet<String> attributes = this.attributes.build();
- return MoreObjects.toStringHelper(this).omitNullValues().add("visibilityTimeout", visibilityTimeout)
+ return Objects.toStringHelper(this).omitNullValues().add("visibilityTimeout", visibilityTimeout)
.add("attributes", !attributes.isEmpty() ? attributes : null).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 a491bcb..eee4e7d 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,7 +18,6 @@ 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;
@@ -100,6 +99,6 @@ public class SendMessageOptions extends BaseHttpRequestOptions implements Clonea
*/
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("delaySeconds", delaySeconds).toString();
+ return Objects.toStringHelper(this).omitNullValues().add("delaySeconds", delaySeconds).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 b8a7f31..7a04b9b 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.newDirectExecutorService;
+import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor;
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(newDirectExecutorService())))
+ .modules(ImmutableSet.<Module> of(new ExecutorServiceModule(sameThreadExecutor())))
.buildApi(AnonymousAttributesApi.class);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 0ca4ece..2adcaea 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,7 +22,6 @@ 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;
@@ -94,7 +93,7 @@ public final class SessionCredentials extends Credentials {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("accessKeyId", identity)
+ return Objects.toStringHelper(this).omitNullValues().add("accessKeyId", identity)
.add("sessionToken", sessionToken).add("expiration", expiration.orNull()).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 2bcf5aa..f98cebe 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,7 +18,6 @@ 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 {
@@ -71,6 +70,6 @@ public final class User {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).add("id", id).add("arn", arn).toString();
+ return Objects.toStringHelper(this).add("id", id).add("arn", arn).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 9ad382e..57aacaf 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,7 +20,6 @@ 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 {
@@ -122,7 +121,7 @@ public final class UserAndSessionCredentials {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).add("user", user).add("credentials", credentials)
+ return Objects.toStringHelper(this).add("user", user).add("credentials", credentials)
.add("packedPolicySize", packedPolicySize).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 77fda0c..feab718 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,7 +18,6 @@ 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;
@@ -131,7 +130,7 @@ public class AssumeRoleOptions extends BaseHttpRequestOptions implements Cloneab
*/
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("externalId", externalId)
+ return Objects.toStringHelper(this).omitNullValues().add("externalId", externalId)
.add("durationSeconds", durationSeconds).add("policy", policy).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 b2b3a88..d8c950d 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,7 +18,6 @@ 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;
@@ -111,7 +110,7 @@ public class FederatedUserOptions extends BaseHttpRequestOptions implements Clon
*/
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("durationSeconds", durationSeconds)
+ return Objects.toStringHelper(this).omitNullValues().add("durationSeconds", durationSeconds)
.add("policy", policy).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/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 6a75e6d..2f40684 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,7 +18,6 @@ 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;
@@ -133,7 +132,7 @@ public class SessionCredentialsOptions extends BaseHttpRequestOptions implements
*/
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues().add("serialNumber", serialNumber)
+ return Objects.toStringHelper(this).omitNullValues().add("serialNumber", serialNumber)
.add("durationSeconds", durationSeconds).add("tokenCode", tokenCode).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/swift/src/main/java/org/jclouds/openstack/swift/domain/AccountMetadata.java
----------------------------------------------------------------------
diff --git a/apis/swift/src/main/java/org/jclouds/openstack/swift/domain/AccountMetadata.java b/apis/swift/src/main/java/org/jclouds/openstack/swift/domain/AccountMetadata.java
index 6c42ae3..8fec10a 100644
--- a/apis/swift/src/main/java/org/jclouds/openstack/swift/domain/AccountMetadata.java
+++ b/apis/swift/src/main/java/org/jclouds/openstack/swift/domain/AccountMetadata.java
@@ -18,9 +18,8 @@ package org.jclouds.openstack.swift.domain;
import java.beans.ConstructorProperties;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
public class AccountMetadata {
@@ -106,7 +105,7 @@ public class AccountMetadata {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("containerCount", containerCount).add("bytes", bytes);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/swift/src/main/java/org/jclouds/openstack/swift/domain/ContainerMetadata.java
----------------------------------------------------------------------
diff --git a/apis/swift/src/main/java/org/jclouds/openstack/swift/domain/ContainerMetadata.java b/apis/swift/src/main/java/org/jclouds/openstack/swift/domain/ContainerMetadata.java
index 1173070..0b7a426 100644
--- a/apis/swift/src/main/java/org/jclouds/openstack/swift/domain/ContainerMetadata.java
+++ b/apis/swift/src/main/java/org/jclouds/openstack/swift/domain/ContainerMetadata.java
@@ -23,9 +23,8 @@ import java.util.Map;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableMap;
/**
@@ -165,7 +164,7 @@ public class ContainerMetadata {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("name", name).add("count", count).add("bytes", bytes).add("readACL", readACL).add("metadata", metadata);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/swift/src/main/java/org/jclouds/openstack/swift/domain/internal/ObjectInfoImpl.java
----------------------------------------------------------------------
diff --git a/apis/swift/src/main/java/org/jclouds/openstack/swift/domain/internal/ObjectInfoImpl.java b/apis/swift/src/main/java/org/jclouds/openstack/swift/domain/internal/ObjectInfoImpl.java
index 1a5eb11..c9f391a 100644
--- a/apis/swift/src/main/java/org/jclouds/openstack/swift/domain/internal/ObjectInfoImpl.java
+++ b/apis/swift/src/main/java/org/jclouds/openstack/swift/domain/internal/ObjectInfoImpl.java
@@ -28,9 +28,8 @@ import javax.inject.Named;
import org.jclouds.javax.annotation.Nullable;
import org.jclouds.openstack.swift.domain.ObjectInfo;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ComparisonChain;
import com.google.common.collect.Ordering;
@@ -238,7 +237,7 @@ public class ObjectInfoImpl implements ObjectInfo {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("name", name).add("container", container).add("uri", uri).add("hash", Arrays.toString(hash))
.add("bytes", bytes).add("contentType", contentType).add("lastModified", lastModified);
}