You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ad...@apache.org on 2014/10/24 20:46:51 UTC
[3/3] git commit: Revert "JCLOUDS-653: Address Guava 18 deprecations"
Revert "JCLOUDS-653: Address Guava 18 deprecations"
This reverts commit b851f0ac3a6fd23720d67dbfad6954b2153bbc4b.
The above change made the floor guava version of jclouds latest guava. This is disasterous for compatibility.
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/53d85b62
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/53d85b62
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/53d85b62
Branch: refs/heads/master
Commit: 53d85b62a7ad0b48bca0001c3e903d44480b83dc
Parents: 5d23c2b
Author: Adrian Cole <ac...@twitter.com>
Authored: Thu Oct 23 10:32:47 2014 -0700
Committer: Adrian Cole <ad...@apache.org>
Committed: Fri Oct 24 11:44:40 2014 -0700
----------------------------------------------------------------------
.../internal/BaseAzureComputeApiMockTest.java | 4 ++--
.../java/org/jclouds/snia/cdmi/v1/domain/CDMIObject.java | 5 ++---
.../java/org/jclouds/snia/cdmi/v1/domain/Container.java | 2 +-
.../java/org/jclouds/snia/cdmi/v1/domain/DataObject.java | 2 +-
.../compute/options/DigitalOceanTemplateOptions.java | 2 +-
.../digitalocean/internal/BaseDigitalOceanMockTest.java | 6 +++---
.../digitalocean/strategy/ListSshKeysLiveTest.java | 2 +-
.../main/java/org/jclouds/docker/domain/Container.java | 3 +--
.../main/java/org/jclouds/docker/domain/ExposedPorts.java | 3 +--
.../main/java/org/jclouds/docker/domain/HostConfig.java | 3 +--
docker/src/main/java/org/jclouds/docker/domain/Image.java | 3 +--
.../java/org/jclouds/docker/domain/NetworkSettings.java | 3 +--
docker/src/main/java/org/jclouds/docker/domain/Port.java | 3 +--
docker/src/main/java/org/jclouds/docker/domain/State.java | 3 +--
.../src/main/java/org/jclouds/docker/domain/Version.java | 3 +--
.../org/jclouds/docker/internal/BaseDockerMockTest.java | 6 +++---
.../java/org/jclouds/blobstore/representations/Blob.java | 3 +--
.../jclouds/blobstore/representations/BlobMetadata.java | 3 +--
.../blobstore/representations/ContentMetadata.java | 3 +--
.../blobstore/representations/StorageMetadata.java | 3 +--
.../org/jclouds/compute/representations/ExecResponse.java | 3 +--
.../org/jclouds/compute/representations/Hardware.java | 3 +--
.../java/org/jclouds/compute/representations/Image.java | 4 ++--
.../jclouds/compute/representations/LoginCredentials.java | 3 +--
.../org/jclouds/compute/representations/NodeMetadata.java | 3 +--
.../jclouds/compute/representations/OperatingSystem.java | 3 +--
.../org/jclouds/compute/representations/Processor.java | 3 +--
.../java/org/jclouds/compute/representations/Volume.java | 3 +--
.../java/org/jclouds/representations/ApiMetadata.java | 3 +--
.../main/java/org/jclouds/representations/Context.java | 3 +--
.../main/java/org/jclouds/representations/Location.java | 3 +--
.../org/jclouds/representations/ProviderMetadata.java | 3 +--
.../v6_5/compute/options/JoyentCloudTemplateOptions.java | 2 +-
.../org/jclouds/joyent/cloudapi/v6_5/domain/Dataset.java | 3 +--
.../java/org/jclouds/joyent/cloudapi/v6_5/domain/Key.java | 3 +--
.../org/jclouds/joyent/cloudapi/v6_5/domain/Machine.java | 3 +--
.../org/jclouds/joyent/cloudapi/v6_5/domain/Package.java | 3 +--
.../v6_5/domain/datacenterscoped/DatacenterAndName.java | 5 ++---
.../cloudapi/v6_5/options/CreateMachineOptions.java | 5 ++---
.../src/main/java/org/jclouds/dmtf/cim/CimString.java | 3 +--
.../jclouds/dmtf/cim/ResourceAllocationSettingData.java | 5 ++---
.../org/jclouds/dmtf/cim/VirtualSystemSettingData.java | 3 +--
.../src/main/java/org/jclouds/dmtf/ovf/Configuration.java | 5 ++---
.../org/jclouds/dmtf/ovf/DeploymentOptionSection.java | 3 +--
.../src/main/java/org/jclouds/dmtf/ovf/DiskSection.java | 3 +--
.../src/main/java/org/jclouds/dmtf/ovf/Item.java | 3 +--
.../src/main/java/org/jclouds/dmtf/ovf/MsgType.java | 3 +--
.../main/java/org/jclouds/dmtf/ovf/NetworkSection.java | 3 +--
.../java/org/jclouds/dmtf/ovf/OperatingSystemSection.java | 3 +--
.../main/java/org/jclouds/dmtf/ovf/ProductSection.java | 3 +--
.../src/main/java/org/jclouds/dmtf/ovf/Property.java | 3 +--
.../src/main/java/org/jclouds/dmtf/ovf/SectionType.java | 5 ++---
.../main/java/org/jclouds/dmtf/ovf/StartupSection.java | 2 +-
.../java/org/jclouds/dmtf/ovf/VirtualHardwareSection.java | 3 +--
.../jclouds/dmtf/ovf/environment/PlatformSectionType.java | 3 +--
.../jclouds/dmtf/ovf/environment/PropertySectionType.java | 3 +--
.../org/jclouds/dmtf/ovf/environment/SectionType.java | 5 ++---
.../java/org/jclouds/dmtf/ovf/internal/BaseEnvelope.java | 5 ++---
.../org/jclouds/dmtf/ovf/internal/BaseVirtualSystem.java | 3 +--
.../jclouds/vcloud/director/v1_5/domain/AbstractVApp.java | 2 +-
.../vcloud/director/v1_5/domain/AccessSetting.java | 3 +--
.../org/jclouds/vcloud/director/v1_5/domain/AdminVdc.java | 2 +-
.../jclouds/vcloud/director/v1_5/domain/Capabilities.java | 3 +--
.../org/jclouds/vcloud/director/v1_5/domain/Capacity.java | 4 ++--
.../vcloud/director/v1_5/domain/CapacityWithUsage.java | 4 ++--
.../org/jclouds/vcloud/director/v1_5/domain/Catalog.java | 2 +-
.../vcloud/director/v1_5/domain/ComputeCapacity.java | 3 +--
.../org/jclouds/vcloud/director/v1_5/domain/Entity.java | 2 +-
.../org/jclouds/vcloud/director/v1_5/domain/Error.java | 3 +--
.../org/jclouds/vcloud/director/v1_5/domain/File.java | 2 +-
.../org/jclouds/vcloud/director/v1_5/domain/Link.java | 2 +-
.../org/jclouds/vcloud/director/v1_5/domain/Media.java | 2 +-
.../org/jclouds/vcloud/director/v1_5/domain/Metadata.java | 2 +-
.../vcloud/director/v1_5/domain/MetadataEntry.java | 2 +-
.../org/jclouds/vcloud/director/v1_5/domain/Owner.java | 2 +-
.../vcloud/director/v1_5/domain/ProductSectionList.java | 2 +-
.../vcloud/director/v1_5/domain/RasdItemsList.java | 2 +-
.../jclouds/vcloud/director/v1_5/domain/Reference.java | 5 ++---
.../jclouds/vcloud/director/v1_5/domain/References.java | 2 +-
.../org/jclouds/vcloud/director/v1_5/domain/Resource.java | 5 ++---
.../vcloud/director/v1_5/domain/ResourceEntity.java | 2 +-
.../jclouds/vcloud/director/v1_5/domain/ScreenTicket.java | 3 +--
.../org/jclouds/vcloud/director/v1_5/domain/Session.java | 3 +--
.../vcloud/director/v1_5/domain/SessionWithToken.java | 3 +--
.../org/jclouds/vcloud/director/v1_5/domain/Task.java | 2 +-
.../jclouds/vcloud/director/v1_5/domain/TasksList.java | 2 +-
.../org/jclouds/vcloud/director/v1_5/domain/User.java | 3 +--
.../org/jclouds/vcloud/director/v1_5/domain/VApp.java | 2 +-
.../jclouds/vcloud/director/v1_5/domain/VAppChildren.java | 3 +--
.../jclouds/vcloud/director/v1_5/domain/VAppTemplate.java | 3 +--
.../jclouds/vcloud/director/v1_5/domain/VMWareTools.java | 3 +--
.../java/org/jclouds/vcloud/director/v1_5/domain/Vdc.java | 2 +-
.../java/org/jclouds/vcloud/director/v1_5/domain/Vm.java | 2 +-
.../vcloud/director/v1_5/domain/VmPendingQuestion.java | 2 +-
.../vcloud/director/v1_5/domain/VmQuestionAnswer.java | 3 +--
.../director/v1_5/domain/VmQuestionAnswerChoice.java | 3 +--
.../vcloud/director/v1_5/domain/dmtf/RasdItem.java | 2 +-
.../vcloud/director/v1_5/domain/dmtf/VirtualSystem.java | 3 +--
.../vcloud/director/v1_5/domain/network/DhcpService.java | 3 +--
.../director/v1_5/domain/network/ExternalNetwork.java | 2 +-
.../vcloud/director/v1_5/domain/network/FirewallRule.java | 3 +--
.../v1_5/domain/network/FirewallRuleProtocols.java | 3 +--
.../director/v1_5/domain/network/FirewallService.java | 3 +--
.../vcloud/director/v1_5/domain/network/IpAddresses.java | 3 +--
.../vcloud/director/v1_5/domain/network/IpRange.java | 3 +--
.../vcloud/director/v1_5/domain/network/IpRanges.java | 3 +--
.../vcloud/director/v1_5/domain/network/IpScope.java | 3 +--
.../director/v1_5/domain/network/IpsecVpnManagedPeer.java | 5 ++---
.../director/v1_5/domain/network/IpsecVpnRemotePeer.java | 3 +--
.../director/v1_5/domain/network/IpsecVpnService.java | 3 +--
.../director/v1_5/domain/network/IpsecVpnTunnel.java | 3 +--
.../v1_5/domain/network/NatOneToOneBasicRule.java | 4 ++--
.../director/v1_5/domain/network/NatOneToOneVmRule.java | 4 ++--
.../v1_5/domain/network/NatPortForwardingRule.java | 4 ++--
.../vcloud/director/v1_5/domain/network/NatRule.java | 3 +--
.../vcloud/director/v1_5/domain/network/NatService.java | 3 +--
.../vcloud/director/v1_5/domain/network/NatVmRule.java | 4 ++--
.../vcloud/director/v1_5/domain/network/Network.java | 2 +-
.../director/v1_5/domain/network/NetworkAssignment.java | 4 ++--
.../v1_5/domain/network/NetworkConfiguration.java | 3 +--
.../director/v1_5/domain/network/NetworkConnection.java | 3 +--
.../director/v1_5/domain/network/NetworkFeatures.java | 3 +--
.../director/v1_5/domain/network/NetworkService.java | 5 ++---
.../vcloud/director/v1_5/domain/network/RouterInfo.java | 3 +--
.../director/v1_5/domain/network/SmtpServerSettings.java | 5 ++---
.../vcloud/director/v1_5/domain/network/StaticRoute.java | 3 +--
.../v1_5/domain/network/StaticRoutingService.java | 3 +--
.../v1_5/domain/network/SyslogServerSettings.java | 3 +--
.../vcloud/director/v1_5/domain/network/VAppNetwork.java | 2 +-
.../v1_5/domain/network/VAppNetworkConfiguration.java | 5 ++---
.../jclouds/vcloud/director/v1_5/domain/org/AdminOrg.java | 2 +-
.../director/v1_5/domain/org/CustomOrgLdapSettings.java | 5 ++---
.../org/jclouds/vcloud/director/v1_5/domain/org/Org.java | 2 +-
.../vcloud/director/v1_5/domain/org/OrgEmailSettings.java | 2 +-
.../director/v1_5/domain/org/OrgGeneralSettings.java | 2 +-
.../director/v1_5/domain/org/OrgLdapGroupAttributes.java | 5 ++---
.../vcloud/director/v1_5/domain/org/OrgLdapSettings.java | 2 +-
.../director/v1_5/domain/org/OrgLdapUserAttributes.java | 5 ++---
.../vcloud/director/v1_5/domain/org/OrgLeaseSettings.java | 2 +-
.../vcloud/director/v1_5/domain/org/OrgNetwork.java | 2 +-
.../v1_5/domain/org/OrgPasswordPolicySettings.java | 2 +-
.../vcloud/director/v1_5/domain/org/OrgSettings.java | 2 +-
.../v1_5/domain/org/OrgVAppTemplateLeaseSettings.java | 2 +-
.../director/v1_5/domain/params/CaptureVAppParams.java | 3 +--
.../director/v1_5/domain/params/CloneMediaParams.java | 4 ++--
.../v1_5/domain/params/CloneVAppTemplateParams.java | 2 +-
.../director/v1_5/domain/params/ComposeVAppParams.java | 2 +-
.../director/v1_5/domain/params/ControlAccessParams.java | 3 +--
.../director/v1_5/domain/params/DeployVAppParams.java | 3 +--
.../v1_5/domain/params/InstantiateVAppParams.java | 2 +-
.../v1_5/domain/params/InstantiateVAppTemplateParams.java | 2 +-
.../director/v1_5/domain/params/InstantiationParams.java | 3 +--
.../v1_5/domain/params/MediaInsertOrEjectParams.java | 3 +--
.../vcloud/director/v1_5/domain/params/ParamsType.java | 5 ++---
.../director/v1_5/domain/params/PublishCatalogParams.java | 3 +--
.../director/v1_5/domain/params/RecomposeVAppParams.java | 2 +-
.../director/v1_5/domain/params/RelocateParams.java | 3 +--
.../v1_5/domain/params/SourcedCompositionItemParam.java | 3 +--
.../director/v1_5/domain/params/UndeployVAppParams.java | 3 +--
.../v1_5/domain/params/UploadVAppTemplateParams.java | 3 +--
.../director/v1_5/domain/params/VAppCreationParams.java | 5 ++---
.../vcloud/director/v1_5/domain/query/Container.java | 2 +-
.../vcloud/director/v1_5/domain/query/QueryList.java | 2 +-
.../v1_5/domain/query/QueryResultAdminGroupRecord.java | 2 +-
.../v1_5/domain/query/QueryResultAdminUserRecord.java | 2 +-
.../v1_5/domain/query/QueryResultAdminVdcRecord.java | 2 +-
.../v1_5/domain/query/QueryResultCatalogRecord.java | 2 +-
.../v1_5/domain/query/QueryResultDatastoreRecord.java | 2 +-
.../v1_5/domain/query/QueryResultMediaRecord.java | 2 +-
.../v1_5/domain/query/QueryResultNetworkRecord.java | 5 ++---
.../director/v1_5/domain/query/QueryResultRecord.java | 5 ++---
.../director/v1_5/domain/query/QueryResultRecords.java | 2 +-
.../director/v1_5/domain/query/QueryResultReferences.java | 2 +-
.../v1_5/domain/query/QueryResultRightRecord.java | 2 +-
.../director/v1_5/domain/query/QueryResultRoleRecord.java | 2 +-
.../v1_5/domain/query/QueryResultStrandedUserRecord.java | 2 +-
.../director/v1_5/domain/query/QueryResultVAppRecord.java | 2 +-
.../v1_5/domain/query/QueryResultVAppTemplateRecord.java | 2 +-
.../director/v1_5/domain/query/QueryResultVMRecord.java | 2 +-
.../v1_5/domain/section/CustomizationSection.java | 3 +--
.../v1_5/domain/section/GuestCustomizationSection.java | 3 +--
.../v1_5/domain/section/LeaseSettingsSection.java | 3 +--
.../v1_5/domain/section/NetworkConfigSection.java | 3 +--
.../v1_5/domain/section/NetworkConnectionSection.java | 3 +--
.../v1_5/domain/section/OperatingSystemSection.java | 2 +-
.../director/v1_5/domain/section/RuntimeInfoSection.java | 2 +-
.../v1_5/domain/section/VirtualHardwareSection.java | 2 +-
.../vcloud/director/v1_5/predicates/LinkPredicates.java | 6 +++---
.../v1_5/internal/BaseVCloudDirectorApiLiveTest.java | 10 +++++-----
.../virtualbox/util/MachineNameOrIdAndNicSlot.java | 4 ++--
.../jclouds/virtualbox/BaseVirtualBoxClientLiveTest.java | 4 ++--
191 files changed, 234 insertions(+), 345 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/azurecompute/src/test/java/org/jclouds/azurecompute/internal/BaseAzureComputeApiMockTest.java
----------------------------------------------------------------------
diff --git a/azurecompute/src/test/java/org/jclouds/azurecompute/internal/BaseAzureComputeApiMockTest.java b/azurecompute/src/test/java/org/jclouds/azurecompute/internal/BaseAzureComputeApiMockTest.java
index e991331..ddd82a8 100644
--- a/azurecompute/src/test/java/org/jclouds/azurecompute/internal/BaseAzureComputeApiMockTest.java
+++ b/azurecompute/src/test/java/org/jclouds/azurecompute/internal/BaseAzureComputeApiMockTest.java
@@ -17,7 +17,7 @@
package org.jclouds.azurecompute.internal;
import static com.google.common.base.Charsets.UTF_8;
-import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService;
+import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor;
import static org.assertj.core.api.Assertions.assertThat;
import java.io.IOException;
@@ -38,7 +38,7 @@ import com.squareup.okhttp.mockwebserver.RecordedRequest;
public class BaseAzureComputeApiMockTest {
private final Set<Module> modules = ImmutableSet
- .<Module>of(new ExecutorServiceModule(newDirectExecutorService(), newDirectExecutorService()));
+ .<Module>of(new ExecutorServiceModule(sameThreadExecutor()));
protected String provider;
private final String identity;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/CDMIObject.java
----------------------------------------------------------------------
diff --git a/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/CDMIObject.java b/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/CDMIObject.java
index 91ee99f..dffd298 100644
--- a/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/CDMIObject.java
+++ b/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/CDMIObject.java
@@ -25,9 +25,8 @@ import java.util.Map;
import org.jclouds.domain.JsonBall;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
@@ -279,7 +278,7 @@ public class CDMIObject {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper("").add("objectID", objectID).add("objectName", objectName)
+ return Objects.toStringHelper("").add("objectID", objectID).add("objectName", objectName)
.add("objectType", objectType).add("parentURI", parentURI).add("metadata", metadata);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/Container.java
----------------------------------------------------------------------
diff --git a/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/Container.java b/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/Container.java
index 4bce943..d8ccaf0 100644
--- a/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/Container.java
+++ b/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/Container.java
@@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Set;
import com.google.common.base.Objects;
-import com.google.common.base.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
public class Container extends CDMIObject {
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/DataObject.java
----------------------------------------------------------------------
diff --git a/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/DataObject.java b/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/DataObject.java
index 43f2b51..4314705 100644
--- a/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/DataObject.java
+++ b/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/DataObject.java
@@ -25,7 +25,7 @@ import java.nio.charset.Charset;
import com.google.common.base.Charsets;
import com.google.common.base.Objects;
-import com.google.common.base.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.io.ByteSource;
import com.google.common.io.Files;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/digitalocean/src/main/java/org/jclouds/digitalocean/compute/options/DigitalOceanTemplateOptions.java
----------------------------------------------------------------------
diff --git a/digitalocean/src/main/java/org/jclouds/digitalocean/compute/options/DigitalOceanTemplateOptions.java b/digitalocean/src/main/java/org/jclouds/digitalocean/compute/options/DigitalOceanTemplateOptions.java
index ffaba7d..6aa541c 100644
--- a/digitalocean/src/main/java/org/jclouds/digitalocean/compute/options/DigitalOceanTemplateOptions.java
+++ b/digitalocean/src/main/java/org/jclouds/digitalocean/compute/options/DigitalOceanTemplateOptions.java
@@ -23,8 +23,8 @@ import java.util.Set;
import org.jclouds.compute.options.TemplateOptions;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/digitalocean/src/test/java/org/jclouds/digitalocean/internal/BaseDigitalOceanMockTest.java
----------------------------------------------------------------------
diff --git a/digitalocean/src/test/java/org/jclouds/digitalocean/internal/BaseDigitalOceanMockTest.java b/digitalocean/src/test/java/org/jclouds/digitalocean/internal/BaseDigitalOceanMockTest.java
index cc25cdc..02022ae 100644
--- a/digitalocean/src/test/java/org/jclouds/digitalocean/internal/BaseDigitalOceanMockTest.java
+++ b/digitalocean/src/test/java/org/jclouds/digitalocean/internal/BaseDigitalOceanMockTest.java
@@ -16,7 +16,7 @@
*/
package org.jclouds.digitalocean.internal;
-import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService;
+import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor;
import static org.jclouds.digitalocean.http.filters.AuthenticationFilter.CREDENTIAL_PARAM;
import static org.jclouds.digitalocean.http.filters.AuthenticationFilter.IDENTITY_PARAM;
import static org.jclouds.http.utils.Queries.encodeQueryLine;
@@ -48,8 +48,8 @@ import com.squareup.okhttp.mockwebserver.RecordedRequest;
* Base class for all DigitalOcean mock tests.
*/
public class BaseDigitalOceanMockTest {
- private final Set<Module> modules = ImmutableSet.<Module> of(new ExecutorServiceModule(newDirectExecutorService(),
- newDirectExecutorService()));
+ private final Set<Module> modules = ImmutableSet.<Module> of(new ExecutorServiceModule(sameThreadExecutor(),
+ sameThreadExecutor()));
protected String provider;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/digitalocean/src/test/java/org/jclouds/digitalocean/strategy/ListSshKeysLiveTest.java
----------------------------------------------------------------------
diff --git a/digitalocean/src/test/java/org/jclouds/digitalocean/strategy/ListSshKeysLiveTest.java b/digitalocean/src/test/java/org/jclouds/digitalocean/strategy/ListSshKeysLiveTest.java
index 336a166..5969377 100644
--- a/digitalocean/src/test/java/org/jclouds/digitalocean/strategy/ListSshKeysLiveTest.java
+++ b/digitalocean/src/test/java/org/jclouds/digitalocean/strategy/ListSshKeysLiveTest.java
@@ -47,7 +47,7 @@ public class ListSshKeysLiveTest extends BaseDigitalOceanLiveTest {
@Override
protected void initialize() {
super.initialize();
- strategy = new ListSshKeys(api, MoreExecutors.newDirectExecutorService());
+ strategy = new ListSshKeys(api, MoreExecutors.sameThreadExecutor());
}
@BeforeClass
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/docker/src/main/java/org/jclouds/docker/domain/Container.java
----------------------------------------------------------------------
diff --git a/docker/src/main/java/org/jclouds/docker/domain/Container.java b/docker/src/main/java/org/jclouds/docker/domain/Container.java
index 4e7c059..efaf5b5 100644
--- a/docker/src/main/java/org/jclouds/docker/domain/Container.java
+++ b/docker/src/main/java/org/jclouds/docker/domain/Container.java
@@ -16,7 +16,6 @@
*/
package org.jclouds.docker.domain;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
@@ -212,7 +211,7 @@ public class Container {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id)
.add("name", name)
.add("created", created)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/docker/src/main/java/org/jclouds/docker/domain/ExposedPorts.java
----------------------------------------------------------------------
diff --git a/docker/src/main/java/org/jclouds/docker/domain/ExposedPorts.java b/docker/src/main/java/org/jclouds/docker/domain/ExposedPorts.java
index 347ad3a..b7a831a 100644
--- a/docker/src/main/java/org/jclouds/docker/domain/ExposedPorts.java
+++ b/docker/src/main/java/org/jclouds/docker/domain/ExposedPorts.java
@@ -22,7 +22,6 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.gson.annotations.SerializedName;
@@ -66,7 +65,7 @@ public class ExposedPorts {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("portAndProtocol", portAndProtocol)
.add("hostPorts", hostPorts)
.toString();
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/docker/src/main/java/org/jclouds/docker/domain/HostConfig.java
----------------------------------------------------------------------
diff --git a/docker/src/main/java/org/jclouds/docker/domain/HostConfig.java b/docker/src/main/java/org/jclouds/docker/domain/HostConfig.java
index 94155c3..275961f 100644
--- a/docker/src/main/java/org/jclouds/docker/domain/HostConfig.java
+++ b/docker/src/main/java/org/jclouds/docker/domain/HostConfig.java
@@ -23,7 +23,6 @@ import java.util.Map;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
@@ -136,7 +135,7 @@ public class HostConfig {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("containerIDFile", containerIDFile)
.add("binds", binds)
.add("lxcConf", lxcConf)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/docker/src/main/java/org/jclouds/docker/domain/Image.java
----------------------------------------------------------------------
diff --git a/docker/src/main/java/org/jclouds/docker/domain/Image.java b/docker/src/main/java/org/jclouds/docker/domain/Image.java
index 80d6f68..186ece3 100644
--- a/docker/src/main/java/org/jclouds/docker/domain/Image.java
+++ b/docker/src/main/java/org/jclouds/docker/domain/Image.java
@@ -16,7 +16,6 @@
*/
package org.jclouds.docker.domain;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableList;
import com.google.gson.annotations.SerializedName;
@@ -133,7 +132,7 @@ public class Image {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id)
.add("parent", parent)
.add("created", created)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/docker/src/main/java/org/jclouds/docker/domain/NetworkSettings.java
----------------------------------------------------------------------
diff --git a/docker/src/main/java/org/jclouds/docker/domain/NetworkSettings.java b/docker/src/main/java/org/jclouds/docker/domain/NetworkSettings.java
index 0c60719..23f3fbe 100644
--- a/docker/src/main/java/org/jclouds/docker/domain/NetworkSettings.java
+++ b/docker/src/main/java/org/jclouds/docker/domain/NetworkSettings.java
@@ -16,7 +16,6 @@
*/
package org.jclouds.docker.domain;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableMap;
import com.google.gson.annotations.SerializedName;
@@ -100,7 +99,7 @@ public class NetworkSettings {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("ipAddress", ipAddress)
.add("ipPrefixLen", ipPrefixLen)
.add("gateway", gateway)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/docker/src/main/java/org/jclouds/docker/domain/Port.java
----------------------------------------------------------------------
diff --git a/docker/src/main/java/org/jclouds/docker/domain/Port.java b/docker/src/main/java/org/jclouds/docker/domain/Port.java
index 3a43ec5..b49dfa6 100644
--- a/docker/src/main/java/org/jclouds/docker/domain/Port.java
+++ b/docker/src/main/java/org/jclouds/docker/domain/Port.java
@@ -16,7 +16,6 @@
*/
package org.jclouds.docker.domain;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.gson.annotations.SerializedName;
@@ -79,7 +78,7 @@ public class Port {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("privatePort", privatePort)
.add("publicPort", publicPort)
.add("type", type)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/docker/src/main/java/org/jclouds/docker/domain/State.java
----------------------------------------------------------------------
diff --git a/docker/src/main/java/org/jclouds/docker/domain/State.java b/docker/src/main/java/org/jclouds/docker/domain/State.java
index cc665c8..ac1ba85 100644
--- a/docker/src/main/java/org/jclouds/docker/domain/State.java
+++ b/docker/src/main/java/org/jclouds/docker/domain/State.java
@@ -19,7 +19,6 @@ package org.jclouds.docker.domain;
import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.gson.annotations.SerializedName;
@@ -93,7 +92,7 @@ public class State {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("pid", pid)
.add("running", running)
.add("exitCode", exitCode)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/docker/src/main/java/org/jclouds/docker/domain/Version.java
----------------------------------------------------------------------
diff --git a/docker/src/main/java/org/jclouds/docker/domain/Version.java b/docker/src/main/java/org/jclouds/docker/domain/Version.java
index f6dbb49..445a225 100644
--- a/docker/src/main/java/org/jclouds/docker/domain/Version.java
+++ b/docker/src/main/java/org/jclouds/docker/domain/Version.java
@@ -19,7 +19,6 @@ package org.jclouds.docker.domain;
import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.gson.annotations.SerializedName;
@@ -93,7 +92,7 @@ public class Version {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("arch", arch)
.add("gitCommit", gitCommit)
.add("goVersion", goVersion)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/docker/src/test/java/org/jclouds/docker/internal/BaseDockerMockTest.java
----------------------------------------------------------------------
diff --git a/docker/src/test/java/org/jclouds/docker/internal/BaseDockerMockTest.java b/docker/src/test/java/org/jclouds/docker/internal/BaseDockerMockTest.java
index 04020b6..146b2a0 100644
--- a/docker/src/test/java/org/jclouds/docker/internal/BaseDockerMockTest.java
+++ b/docker/src/test/java/org/jclouds/docker/internal/BaseDockerMockTest.java
@@ -16,7 +16,7 @@
*/
package org.jclouds.docker.internal;
-import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService;
+import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor;
import static org.jclouds.http.utils.Queries.encodeQueryLine;
import static org.jclouds.util.Strings2.toStringAndClose;
import static org.testng.Assert.assertEquals;
@@ -45,8 +45,8 @@ import com.squareup.okhttp.mockwebserver.RecordedRequest;
* Base class for all Docker mock tests.
*/
public class BaseDockerMockTest {
- private final Set<Module> modules = ImmutableSet.<Module> of(new ExecutorServiceModule(newDirectExecutorService(),
- newDirectExecutorService()));
+ private final Set<Module> modules = ImmutableSet.<Module> of(new ExecutorServiceModule(sameThreadExecutor(),
+ sameThreadExecutor()));
protected String provider;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/Blob.java
----------------------------------------------------------------------
diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/Blob.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/Blob.java
index df50f55..d916652 100644
--- a/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/Blob.java
+++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/Blob.java
@@ -16,7 +16,6 @@
*/
package org.jclouds.blobstore.representations;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import java.io.Serializable;
@@ -84,7 +83,7 @@ public class Blob implements Serializable {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).add("blobMetadata", blobMetadata).add("allHeaders", allHeaders)
+ return Objects.toStringHelper(this).add("blobMetadata", blobMetadata).add("allHeaders", allHeaders)
.toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/BlobMetadata.java
----------------------------------------------------------------------
diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/BlobMetadata.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/BlobMetadata.java
index 7e65d5e..6e22b8d 100644
--- a/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/BlobMetadata.java
+++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/BlobMetadata.java
@@ -16,7 +16,6 @@
*/
package org.jclouds.blobstore.representations;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableMap;
@@ -221,7 +220,7 @@ public class BlobMetadata implements Serializable {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).add("type", type).add("providerId", providerId).add("name", name)
+ return Objects.toStringHelper(this).add("type", type).add("providerId", providerId).add("name", name)
.add("userMetadata", userMetadata).add("eTag", eTag).add("creationDate", creationDate)
.add("lastModifiedDate", lastModifiedDate).add("publicUri", publicUri).add("contentMetadata", contentMetadata)
.toString();
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/ContentMetadata.java
----------------------------------------------------------------------
diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/ContentMetadata.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/ContentMetadata.java
index 86c695b..c6da5aa 100644
--- a/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/ContentMetadata.java
+++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/ContentMetadata.java
@@ -16,7 +16,6 @@
*/
package org.jclouds.blobstore.representations;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import java.io.Serializable;
@@ -157,7 +156,7 @@ public class ContentMetadata implements Serializable {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).add("length", language).add("disposition", disposition).add("encoding", encoding)
+ return Objects.toStringHelper(this).add("length", language).add("disposition", disposition).add("encoding", encoding)
.add("type", type).add("md5", md5).add("language", language)
.add("expires", expires).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/StorageMetadata.java
----------------------------------------------------------------------
diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/StorageMetadata.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/StorageMetadata.java
index b1bf21f..e2cf49e 100644
--- a/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/StorageMetadata.java
+++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/blobstore/representations/StorageMetadata.java
@@ -16,7 +16,6 @@
*/
package org.jclouds.blobstore.representations;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableMap;
@@ -185,7 +184,7 @@ public class StorageMetadata implements Serializable {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).add("type", type).add("providerId", providerId).add("name", name)
+ return Objects.toStringHelper(this).add("type", type).add("providerId", providerId).add("name", name)
.add("userMetadata", userMetadata).add("eTag", eTag).add("creationDate", creationDate)
.add("lastModifiedDate", lastModifiedDate).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/ExecResponse.java
----------------------------------------------------------------------
diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/ExecResponse.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/ExecResponse.java
index ab43600..001486b 100644
--- a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/ExecResponse.java
+++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/ExecResponse.java
@@ -16,7 +16,6 @@
*/
package org.jclouds.compute.representations;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import java.io.Serializable;
@@ -96,6 +95,6 @@ public class ExecResponse implements Serializable {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).add("out", output).add("error", error).add("exitStatus", exitStatus).toString();
+ return Objects.toStringHelper(this).add("out", output).add("error", error).add("exitStatus", exitStatus).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Hardware.java
----------------------------------------------------------------------
diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Hardware.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Hardware.java
index 3a32160..95bb5d4 100644
--- a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Hardware.java
+++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Hardware.java
@@ -16,7 +16,6 @@
*/
package org.jclouds.compute.representations;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
@@ -154,7 +153,7 @@ public class Hardware implements Serializable {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).add("id", id).add("name", name)
+ return Objects.toStringHelper(this).add("id", id).add("name", name)
.add("processors", processors).add("ram", ram).add("volums", volumes).add("hypervisor", hypervisor)
.toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Image.java
----------------------------------------------------------------------
diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Image.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Image.java
index 74600a1..f421af1 100644
--- a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Image.java
+++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Image.java
@@ -16,7 +16,7 @@
*/
package org.jclouds.compute.representations;
-import com.google.common.base.MoreObjects;
+
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
@@ -164,7 +164,7 @@ public class Image implements Serializable {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).add("id", id).add("name", name).add("status", status)
+ return Objects.toStringHelper(this).add("id", id).add("name", name).add("status", status)
.add("description", description)
.add("tags", tags).add("os", operatingSystem).add("version", version)
.add("defaultCredentials", defaultCredentials).toString();
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/LoginCredentials.java
----------------------------------------------------------------------
diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/LoginCredentials.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/LoginCredentials.java
index 87f6ead..b609966 100644
--- a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/LoginCredentials.java
+++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/LoginCredentials.java
@@ -16,7 +16,6 @@
*/
package org.jclouds.compute.representations;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import java.io.Serializable;
@@ -128,7 +127,7 @@ public class LoginCredentials implements Serializable {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("username", username)
.add("hasPassword", password != null || credentialUrl != null)
.add("hasPrivateKey", privateKey != null)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/NodeMetadata.java
----------------------------------------------------------------------
diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/NodeMetadata.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/NodeMetadata.java
index 41a23bf..b785636 100644
--- a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/NodeMetadata.java
+++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/NodeMetadata.java
@@ -16,7 +16,6 @@
*/
package org.jclouds.compute.representations;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
@@ -229,7 +228,7 @@ public class NodeMetadata implements Serializable {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).add("id", id).add("name", name).add("description", description).add("status", status)
+ return Objects.toStringHelper(this).add("id", id).add("name", name).add("description", description).add("status", status)
.add("locationId", locationId).add("imageId", imageId).add("hostname", hostname)
.add("group", group).add("loginPort", loginPort).add("tags", tags).add("metadata", metadata)
.add("defaultCredentials", defaultCredentials).toString();
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/OperatingSystem.java
----------------------------------------------------------------------
diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/OperatingSystem.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/OperatingSystem.java
index c23c7fd..c36c11e 100644
--- a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/OperatingSystem.java
+++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/OperatingSystem.java
@@ -16,7 +16,6 @@
*/
package org.jclouds.compute.representations;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import java.io.Serializable;
@@ -136,7 +135,7 @@ public class OperatingSystem implements Serializable {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).add("family", family).add("name", name).add("arch", arch)
+ return Objects.toStringHelper(this).add("family", family).add("name", name).add("arch", arch)
.add("version", version).add("description", description).add("is64bit", is64Bit).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Processor.java
----------------------------------------------------------------------
diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Processor.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Processor.java
index 592b877..67acb82 100644
--- a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Processor.java
+++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Processor.java
@@ -16,7 +16,6 @@
*/
package org.jclouds.compute.representations;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import java.io.Serializable;
@@ -84,6 +83,6 @@ public class Processor implements Serializable {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).add("cores", cores).add("spped", speed).toString();
+ return Objects.toStringHelper(this).add("cores", cores).add("spped", speed).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Volume.java
----------------------------------------------------------------------
diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Volume.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Volume.java
index 687c68c..ff6f1bc 100644
--- a/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Volume.java
+++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/compute/representations/Volume.java
@@ -16,7 +16,6 @@
*/
package org.jclouds.compute.representations;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import java.io.Serializable;
@@ -137,7 +136,7 @@ public class Volume implements Serializable {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).add("id", id).add("type", type).add("size", size)
+ return Objects.toStringHelper(this).add("id", id).add("type", type).add("size", size)
.add("device", device).add("isDurable", durable).add("bootDevice", bootDevice).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/ApiMetadata.java
----------------------------------------------------------------------
diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/ApiMetadata.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/ApiMetadata.java
index 63f0b1f..2c119c3 100644
--- a/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/ApiMetadata.java
+++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/ApiMetadata.java
@@ -16,7 +16,6 @@
*/
package org.jclouds.representations;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
@@ -265,7 +264,7 @@ public class ApiMetadata implements Serializable {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).add("id", id).add("name", name).add("endpointName", endpointName)
+ return Objects.toStringHelper(this).add("id", id).add("name", name).add("endpointName", endpointName)
.add("identityName", identityName).add("credentialName", credentialName).add("version", version)
.add("defaultEndpoint", defaultEndpoint).add("defaultIdentity", defaultIdentity)
.add("defaultCredential", defaultCredential).add("defaultProperties", defaultProperties).add("defaultModules", defaultModules)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/Context.java
----------------------------------------------------------------------
diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/Context.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/Context.java
index faac681..f1b61e0 100644
--- a/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/Context.java
+++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/Context.java
@@ -16,7 +16,6 @@
*/
package org.jclouds.representations;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import java.io.Serializable;
@@ -97,6 +96,6 @@ public class Context implements Serializable {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).add("name", name).add("providerId", providerId).add("identity", identity).toString();
+ return Objects.toStringHelper(this).add("name", name).add("providerId", providerId).add("identity", identity).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/Location.java
----------------------------------------------------------------------
diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/Location.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/Location.java
index 218cd34..e2cdc3a 100644
--- a/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/Location.java
+++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/Location.java
@@ -16,7 +16,6 @@
*/
package org.jclouds.representations;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
@@ -126,7 +125,7 @@ public class Location implements Serializable {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).add("id", id).add("scope", scope).add("description", description)
+ return Objects.toStringHelper(this).add("id", id).add("scope", scope).add("description", description)
.add("perentId", parentId).add("iso3166Codes", iso3166Codes).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/ProviderMetadata.java
----------------------------------------------------------------------
diff --git a/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/ProviderMetadata.java b/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/ProviderMetadata.java
index ee02a94..c8f7b7f 100644
--- a/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/ProviderMetadata.java
+++ b/jclouds-representations/representations-core/src/main/java/org/jclouds/representations/ProviderMetadata.java
@@ -16,7 +16,6 @@
*/
package org.jclouds.representations;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
@@ -270,7 +269,7 @@ public class ProviderMetadata implements Serializable {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).add("id", id).add("name", name).add("endpointName", endpointName)
+ return Objects.toStringHelper(this).add("id", id).add("name", name).add("endpointName", endpointName)
.add("identityName", identityName).add("credentialName", credentialName).add("defaultModules", defaultModules)
.add("documentation", documentation).add("views", views)
.add("endpoint", endpoint).add("defaultProperties", defaultProperties).add("console", console)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/compute/options/JoyentCloudTemplateOptions.java
----------------------------------------------------------------------
diff --git a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/compute/options/JoyentCloudTemplateOptions.java b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/compute/options/JoyentCloudTemplateOptions.java
index da65c0c..b1e401b 100644
--- a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/compute/options/JoyentCloudTemplateOptions.java
+++ b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/compute/options/JoyentCloudTemplateOptions.java
@@ -25,7 +25,7 @@ import org.jclouds.domain.LoginCredentials;
import org.jclouds.scriptbuilder.domain.Statement;
import com.google.common.base.Objects;
-import com.google.common.base.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.Optional;
/**
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Dataset.java
----------------------------------------------------------------------
diff --git a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Dataset.java b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Dataset.java
index d476904..0655f52 100644
--- a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Dataset.java
+++ b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Dataset.java
@@ -30,7 +30,6 @@ import org.jclouds.joyent.cloudapi.v6_5.domain.Machine.Type;
import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.Function;
import com.google.common.base.Functions;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ComparisonChain;
import com.google.common.collect.ImmutableMap;
@@ -314,7 +313,7 @@ public class Dataset implements Comparable<Dataset> {
@Override
public String toString() {
- return MoreObjects.toStringHelper("").omitNullValues()
+ return Objects.toStringHelper("").omitNullValues()
.add("id", id)
.add("urn", urn)
.add("name", name)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Key.java
----------------------------------------------------------------------
diff --git a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Key.java b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Key.java
index 84a3f2a..e2ec1ff 100644
--- a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Key.java
+++ b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Key.java
@@ -21,7 +21,6 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
import java.util.Date;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ComparisonChain;
@@ -132,7 +131,7 @@ public class Key implements Comparable<Key> {
@Override
public String toString() {
- return MoreObjects.toStringHelper("").omitNullValues()
+ return Objects.toStringHelper("").omitNullValues()
.add("name", name)
.add("key", key)
.add("created", created).toString();
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Machine.java
----------------------------------------------------------------------
diff --git a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Machine.java b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Machine.java
index f33935e..7867fda 100644
--- a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Machine.java
+++ b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Machine.java
@@ -31,7 +31,6 @@ import com.google.common.annotations.VisibleForTesting;
import com.google.common.base.CaseFormat;
import com.google.common.base.Function;
import com.google.common.base.Functions;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ComparisonChain;
import com.google.common.collect.ImmutableMap;
@@ -387,7 +386,7 @@ public class Machine implements Comparable<Machine> {
@Override
public String toString() {
- return MoreObjects.toStringHelper("").omitNullValues()
+ return Objects.toStringHelper("").omitNullValues()
.add("id", id)
.add("name", name)
.add("type", type)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Package.java
----------------------------------------------------------------------
diff --git a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Package.java b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Package.java
index a9c20a1..17953b8 100644
--- a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Package.java
+++ b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/Package.java
@@ -22,7 +22,6 @@ import java.beans.ConstructorProperties;
import javax.inject.Named;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ComparisonChain;
@@ -174,7 +173,7 @@ public class Package implements Comparable<Package> {
@Override
public String toString() {
- return MoreObjects.toStringHelper("").omitNullValues()
+ return Objects.toStringHelper("").omitNullValues()
.add("name", name)
.add("memorySizeMb", memorySizeMb)
.add("diskSizeGb", diskSizeGb)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/datacenterscoped/DatacenterAndName.java
----------------------------------------------------------------------
diff --git a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/datacenterscoped/DatacenterAndName.java b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/datacenterscoped/DatacenterAndName.java
index 11e067d..cb10222 100644
--- a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/datacenterscoped/DatacenterAndName.java
+++ b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/domain/datacenterscoped/DatacenterAndName.java
@@ -21,10 +21,9 @@ import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import com.google.common.base.Function;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Splitter;
-import com.google.common.base.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.Iterables;
/**
@@ -105,6 +104,6 @@ public class DatacenterAndName {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper("").add("datacenterId", datacenterId).add("name", name);
+ return Objects.toStringHelper("").add("datacenterId", datacenterId).add("name", name);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/options/CreateMachineOptions.java
----------------------------------------------------------------------
diff --git a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/options/CreateMachineOptions.java b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/options/CreateMachineOptions.java
index 23ba16f..34730fa 100644
--- a/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/options/CreateMachineOptions.java
+++ b/joyent-cloudapi/src/main/java/org/jclouds/joyent/cloudapi/v6_5/options/CreateMachineOptions.java
@@ -25,9 +25,8 @@ import org.jclouds.http.options.BaseHttpRequestOptions;
import org.jclouds.util.Maps2;
import com.google.common.base.Function;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Multimap;
import com.google.common.collect.Multimaps;
@@ -57,7 +56,7 @@ public class CreateMachineOptions extends BaseHttpRequestOptions {
@Override
public String toString() {
- ToStringHelper toString = MoreObjects.toStringHelper("").omitNullValues();
+ ToStringHelper toString = Objects.toStringHelper("").omitNullValues();
toString.add("name", name).add("package", name);
if (metadata.size() > 0)
toString.add("metadata", metadata);
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimString.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimString.java b/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimString.java
index 8f8b18d..676dc22 100644
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimString.java
+++ b/vcloud-director/src/main/java/org/jclouds/dmtf/cim/CimString.java
@@ -25,7 +25,6 @@ import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlValue;
import javax.xml.namespace.QName;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.Maps;
@@ -89,7 +88,7 @@ public class CimString {
@Override
public String toString() {
- return MoreObjects.toStringHelper("").add("value", value).toString();
+ return Objects.toStringHelper("").add("value", value).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/dmtf/cim/ResourceAllocationSettingData.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/cim/ResourceAllocationSettingData.java b/vcloud-director/src/main/java/org/jclouds/dmtf/cim/ResourceAllocationSettingData.java
index 8b76485..6ef6631 100644
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/cim/ResourceAllocationSettingData.java
+++ b/vcloud-director/src/main/java/org/jclouds/dmtf/cim/ResourceAllocationSettingData.java
@@ -31,9 +31,8 @@ import javax.xml.bind.annotation.XmlEnumValue;
import javax.xml.bind.annotation.XmlType;
import com.google.common.base.Function;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
@@ -830,7 +829,7 @@ public class ResourceAllocationSettingData {
}
public ToStringHelper string() {
- return MoreObjects.toStringHelper("")
+ return Objects.toStringHelper("")
.add("elementName", elementName)
.add("instanceID", instanceID)
.add("caption", caption)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/dmtf/cim/VirtualSystemSettingData.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/cim/VirtualSystemSettingData.java b/vcloud-director/src/main/java/org/jclouds/dmtf/cim/VirtualSystemSettingData.java
index 7e7ee35..7039b92 100644
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/cim/VirtualSystemSettingData.java
+++ b/vcloud-director/src/main/java/org/jclouds/dmtf/cim/VirtualSystemSettingData.java
@@ -31,7 +31,6 @@ import javax.xml.bind.annotation.XmlEnumValue;
import javax.xml.bind.annotation.XmlType;
import com.google.common.base.Function;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
@@ -693,7 +692,7 @@ public class VirtualSystemSettingData {
@Override
public String toString() {
- return MoreObjects.toStringHelper("")
+ return Objects.toStringHelper("")
.add("elementName", elementName)
.add("instanceID", instanceID)
.add("caption", caption)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Configuration.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Configuration.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Configuration.java
index 0669a32..3dc2474 100644
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Configuration.java
+++ b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Configuration.java
@@ -22,7 +22,6 @@ import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
@XmlType(name = "Configuration", namespace = OVF_NS, propOrder = {
@@ -125,8 +124,8 @@ public class Configuration {
return string().toString();
}
- protected MoreObjects.ToStringHelper string() {
- return MoreObjects.toStringHelper("").add("id", id).add("default", isDefault).add("label", label).add("description", description);
+ protected Objects.ToStringHelper string() {
+ return Objects.toStringHelper("").add("id", id).add("default", isDefault).add("label", label).add("description", description);
}
public String getId() {
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/DeploymentOptionSection.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/DeploymentOptionSection.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/DeploymentOptionSection.java
index 253bc0b..198556b 100644
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/DeploymentOptionSection.java
+++ b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/DeploymentOptionSection.java
@@ -25,7 +25,6 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
@@ -116,7 +115,7 @@ public class DeploymentOptionSection extends SectionType {
}
@Override
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return super.string().add("configurations", configurations);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/DiskSection.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/DiskSection.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/DiskSection.java
index 7c19370..5d17fc0 100644
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/DiskSection.java
+++ b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/DiskSection.java
@@ -24,7 +24,6 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
@@ -121,7 +120,7 @@ public class DiskSection extends SectionType {
}
@Override
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return super.string().add("disks", disks);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Item.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Item.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Item.java
index 7c9e07f..8901a0d 100644
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Item.java
+++ b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Item.java
@@ -27,7 +27,6 @@ import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.bind.annotation.XmlType;
import javax.xml.namespace.QName;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.Maps;
@@ -180,7 +179,7 @@ public class Item {
@Override
public String toString() {
- return MoreObjects.toStringHelper("")
+ return Objects.toStringHelper("")
.add("id", id)
.add("order", order)
.add("startDelay", startDelay)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/MsgType.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/MsgType.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/MsgType.java
index 069d42a..ef6b29b 100644
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/MsgType.java
+++ b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/MsgType.java
@@ -22,7 +22,6 @@ import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlValue;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
@@ -136,7 +135,7 @@ public class MsgType {
@Override
public String toString() {
- return MoreObjects.toStringHelper("")
+ return Objects.toStringHelper("")
.add("value", value).add("msgid", msgid).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/NetworkSection.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/NetworkSection.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/NetworkSection.java
index e40f177..a9df5d0 100644
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/NetworkSection.java
+++ b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/NetworkSection.java
@@ -23,7 +23,6 @@ import java.util.Set;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
@@ -116,7 +115,7 @@ public class NetworkSection extends SectionType {
}
@Override
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return super.string()
.add("networks", networks);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/OperatingSystemSection.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/OperatingSystemSection.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/OperatingSystemSection.java
index b01bed7..dde69ce 100644
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/OperatingSystemSection.java
+++ b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/OperatingSystemSection.java
@@ -22,7 +22,6 @@ import static org.jclouds.dmtf.DMTFConstants.OVF_NS;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -147,7 +146,7 @@ public class OperatingSystemSection extends SectionType {
}
@Override
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return super.string()
.add("id", id)
.add("version", version)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/ProductSection.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/ProductSection.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/ProductSection.java
index ac3bb26..8b4c5d6 100644
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/ProductSection.java
+++ b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/ProductSection.java
@@ -28,7 +28,6 @@ import javax.xml.bind.annotation.XmlType;
import org.jclouds.dmtf.cim.CimString;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
@@ -285,7 +284,7 @@ public class ProductSection extends SectionType {
}
@Override
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return super.string()
.add("product", product)
.add("vendor", vendor)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Property.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Property.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Property.java
index eb19fef..c404694 100644
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Property.java
+++ b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/Property.java
@@ -27,7 +27,6 @@ import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.bind.annotation.XmlType;
import com.google.common.base.Joiner;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.Sets;
@@ -294,7 +293,7 @@ public class Property {
@Override
public String toString() {
- return MoreObjects.toStringHelper("")
+ return Objects.toStringHelper("")
.add("key", key).add("values", values).add("label", label).add("description", description)
.add("type", type).add("qualifiers", qualifiers).add("userConfigurable", userConfigurable).add("defaultValue", defaultValue)
.toString();
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/SectionType.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/SectionType.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/SectionType.java
index aadaf96..cc532a7 100644
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/SectionType.java
+++ b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/SectionType.java
@@ -23,7 +23,6 @@ import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -135,8 +134,8 @@ public abstract class SectionType {
return string().toString();
}
- protected MoreObjects.ToStringHelper string() {
- return MoreObjects.toStringHelper("").add("info", info).add("required", required);
+ protected Objects.ToStringHelper string() {
+ return Objects.toStringHelper("").add("info", info).add("required", required);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/StartupSection.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/StartupSection.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/StartupSection.java
index 3acf05a..fecdfa3 100644
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/StartupSection.java
+++ b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/StartupSection.java
@@ -26,7 +26,7 @@ import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
import com.google.common.base.Objects;
-import com.google.common.base.MoreObjects.ToStringHelper;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/VirtualHardwareSection.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/VirtualHardwareSection.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/VirtualHardwareSection.java
index 0d4d0f9..864d153 100644
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/VirtualHardwareSection.java
+++ b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/VirtualHardwareSection.java
@@ -28,7 +28,6 @@ import org.jclouds.dmtf.cim.ResourceAllocationSettingData;
import org.jclouds.dmtf.cim.VirtualSystemSettingData;
import com.google.common.base.Joiner;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
@@ -190,7 +189,7 @@ public class VirtualHardwareSection extends SectionType {
}
@Override
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return super.string()
.add("transport", transport)
.add("virtualSystem", virtualSystem)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/PlatformSectionType.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/PlatformSectionType.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/PlatformSectionType.java
index 0a766de..fd56577 100644
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/PlatformSectionType.java
+++ b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/PlatformSectionType.java
@@ -25,7 +25,6 @@ import javax.xml.bind.annotation.XmlType;
import org.jclouds.dmtf.cim.CimString;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.Sets;
@@ -133,7 +132,7 @@ public class PlatformSectionType extends SectionType<PlatformSectionType> {
}
@Override
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return super.string()
.add("version", version).add("vendor", vendor).add("timezone", timezone)
.add("locale", locale).add("kind", kind).add("any", any);
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/PropertySectionType.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/PropertySectionType.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/PropertySectionType.java
index cb1229f..1d88afd 100644
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/PropertySectionType.java
+++ b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/PropertySectionType.java
@@ -23,7 +23,6 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.Sets;
@@ -97,7 +96,7 @@ public class PropertySectionType extends SectionType<PropertySectionType> {
}
@Override
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return super.string()
.add("properties", properties).add("any", any);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/SectionType.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/SectionType.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/SectionType.java
index 6f8e653..0345933 100644
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/SectionType.java
+++ b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/environment/SectionType.java
@@ -23,7 +23,6 @@ import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.bind.annotation.XmlType;
import javax.xml.namespace.QName;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.Maps;
@@ -84,8 +83,8 @@ public abstract class SectionType<T extends SectionType<T>> {
return string().toString();
}
- protected MoreObjects.ToStringHelper string() {
- return MoreObjects.toStringHelper("").add("otherAttributes", otherAttributes);
+ protected Objects.ToStringHelper string() {
+ return Objects.toStringHelper("").add("otherAttributes", otherAttributes);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/internal/BaseEnvelope.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/internal/BaseEnvelope.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/internal/BaseEnvelope.java
index f105f78..d0bbea7 100644
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/internal/BaseEnvelope.java
+++ b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/internal/BaseEnvelope.java
@@ -24,7 +24,6 @@ import org.jclouds.dmtf.ovf.DiskSection;
import org.jclouds.dmtf.ovf.NetworkSection;
import org.jclouds.dmtf.ovf.SectionType;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
@@ -167,8 +166,8 @@ public abstract class BaseEnvelope<V extends BaseVirtualSystem, E extends BaseEn
return string().toString();
}
- protected MoreObjects.ToStringHelper string() {
- return MoreObjects.toStringHelper("")
+ protected Objects.ToStringHelper string() {
+ return Objects.toStringHelper("")
.add("diskSections", diskSections)
.add("networkSections", networkSections)
.add("additionalSections", additionalSections)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/internal/BaseVirtualSystem.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/internal/BaseVirtualSystem.java b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/internal/BaseVirtualSystem.java
index 4a82f74..951ff98 100644
--- a/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/internal/BaseVirtualSystem.java
+++ b/vcloud-director/src/main/java/org/jclouds/dmtf/ovf/internal/BaseVirtualSystem.java
@@ -29,7 +29,6 @@ import javax.xml.bind.annotation.XmlElementRef;
import org.jclouds.dmtf.ovf.ProductSection;
import org.jclouds.dmtf.ovf.SectionType;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
@@ -161,7 +160,7 @@ public abstract class BaseVirtualSystem extends SectionType {
}
@Override
- protected MoreObjects.ToStringHelper string() {
+ protected Objects.ToStringHelper string() {
return super.string()
.add("id", id)
.add("name", name)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/53d85b62/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AbstractVApp.java
----------------------------------------------------------------------
diff --git a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AbstractVApp.java b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AbstractVApp.java
index db7c2c5..6b6af2a 100644
--- a/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AbstractVApp.java
+++ b/vcloud-director/src/main/java/org/jclouds/vcloud/director/v1_5/domain/AbstractVApp.java
@@ -42,8 +42,8 @@ import org.jclouds.vcloud.director.v1_5.domain.section.OperatingSystemSection;
import org.jclouds.vcloud.director.v1_5.domain.section.RuntimeInfoSection;
import org.jclouds.vcloud.director.v1_5.domain.section.VirtualHardwareSection;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;