You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ga...@apache.org on 2014/08/08 20:17:58 UTC
[4/4] git commit: JCLOUDS-653: Address Guava 18 deprecations
JCLOUDS-653: Address Guava 18 deprecations
Mostly renaming Objects.toStringHelper to MoreObjects.toStringHelper.
Project: http://git-wip-us.apache.org/repos/asf/jclouds-labs/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds-labs/commit/b851f0ac
Tree: http://git-wip-us.apache.org/repos/asf/jclouds-labs/tree/b851f0ac
Diff: http://git-wip-us.apache.org/repos/asf/jclouds-labs/diff/b851f0ac
Branch: refs/heads/master
Commit: b851f0ac3a6fd23720d67dbfad6954b2153bbc4b
Parents: 925097c
Author: Andrew Gaul <ga...@apache.org>
Authored: Wed Aug 6 16:28:57 2014 -0700
Committer: Andrew Gaul <ga...@apache.org>
Committed: Fri Aug 8 11:14:10 2014 -0700
----------------------------------------------------------------------
.../jclouds/azure/management/domain/DeploymentParams.java | 5 +++--
.../domain/DetailedHostedServiceProperties.java | 2 +-
.../java/org/jclouds/azure/management/domain/Disk.java | 7 ++++---
.../java/org/jclouds/azure/management/domain/Error.java | 3 ++-
.../jclouds/azure/management/domain/HostedService.java | 5 +++--
.../azure/management/domain/HostedServiceProperties.java | 5 +++--
.../org/jclouds/azure/management/domain/Location.java | 3 ++-
.../java/org/jclouds/azure/management/domain/OSImage.java | 5 +++--
.../jclouds/azure/management/domain/OSImageParams.java | 5 +++--
.../org/jclouds/azure/management/domain/Operation.java | 3 ++-
.../management/options/CreateHostedServiceOptions.java | 3 ++-
.../java/org/jclouds/snia/cdmi/v1/domain/CDMIObject.java | 5 +++--
.../java/org/jclouds/snia/cdmi/v1/domain/Container.java | 2 +-
.../java/org/jclouds/snia/cdmi/v1/domain/DataObject.java | 2 +-
.../compute/options/DigitalOceanTemplateOptions.java | 2 +-
.../digitalocean/internal/BaseDigitalOceanMockTest.java | 6 +++---
dmtf/src/main/java/org/jclouds/dmtf/cim/CimString.java | 3 ++-
.../jclouds/dmtf/cim/ResourceAllocationSettingData.java | 5 +++--
.../org/jclouds/dmtf/cim/VirtualSystemSettingData.java | 3 ++-
.../src/main/java/org/jclouds/dmtf/ovf/Configuration.java | 5 +++--
.../org/jclouds/dmtf/ovf/DeploymentOptionSection.java | 3 ++-
dmtf/src/main/java/org/jclouds/dmtf/ovf/DiskSection.java | 3 ++-
dmtf/src/main/java/org/jclouds/dmtf/ovf/Item.java | 3 ++-
dmtf/src/main/java/org/jclouds/dmtf/ovf/MsgType.java | 3 ++-
.../main/java/org/jclouds/dmtf/ovf/NetworkSection.java | 3 ++-
.../java/org/jclouds/dmtf/ovf/OperatingSystemSection.java | 3 ++-
.../main/java/org/jclouds/dmtf/ovf/ProductSection.java | 3 ++-
dmtf/src/main/java/org/jclouds/dmtf/ovf/Property.java | 3 ++-
dmtf/src/main/java/org/jclouds/dmtf/ovf/SectionType.java | 5 +++--
.../main/java/org/jclouds/dmtf/ovf/StartupSection.java | 2 +-
.../java/org/jclouds/dmtf/ovf/VirtualHardwareSection.java | 3 ++-
.../jclouds/dmtf/ovf/environment/PlatformSectionType.java | 3 ++-
.../jclouds/dmtf/ovf/environment/PropertySectionType.java | 3 ++-
.../org/jclouds/dmtf/ovf/environment/SectionType.java | 5 +++--
.../java/org/jclouds/dmtf/ovf/internal/BaseEnvelope.java | 5 +++--
.../org/jclouds/dmtf/ovf/internal/BaseVirtualSystem.java | 3 ++-
.../docker/compute/options/DockerTemplateOptions.java | 3 ++-
.../src/main/java/org/jclouds/docker/domain/Config.java | 3 ++-
.../main/java/org/jclouds/docker/domain/Container.java | 3 ++-
.../main/java/org/jclouds/docker/domain/ExposedPorts.java | 3 ++-
.../main/java/org/jclouds/docker/domain/HostConfig.java | 3 ++-
docker/src/main/java/org/jclouds/docker/domain/Image.java | 3 ++-
.../java/org/jclouds/docker/domain/NetworkSettings.java | 3 ++-
docker/src/main/java/org/jclouds/docker/domain/Port.java | 3 ++-
docker/src/main/java/org/jclouds/docker/domain/State.java | 3 ++-
.../src/main/java/org/jclouds/docker/domain/Version.java | 3 ++-
.../org/jclouds/docker/internal/BaseDockerMockTest.java | 6 +++---
.../java/org/jclouds/fujitsu/fgcp/FGCPCredentials.java | 3 ++-
.../jclouds/fujitsu/fgcp/domain/BuiltinServerBackup.java | 3 ++-
.../main/java/org/jclouds/fujitsu/fgcp/domain/CPU.java | 3 ++-
.../java/org/jclouds/fujitsu/fgcp/domain/Direction.java | 3 ++-
.../java/org/jclouds/fujitsu/fgcp/domain/DiskImage.java | 3 ++-
.../java/org/jclouds/fujitsu/fgcp/domain/EventLog.java | 3 ++-
.../main/java/org/jclouds/fujitsu/fgcp/domain/Group.java | 3 ++-
.../main/java/org/jclouds/fujitsu/fgcp/domain/Image.java | 3 ++-
.../java/org/jclouds/fujitsu/fgcp/domain/Information.java | 3 ++-
.../jclouds/fujitsu/fgcp/domain/IntermediateCACert.java | 3 ++-
.../org/jclouds/fujitsu/fgcp/domain/LoadStatistics.java | 3 ++-
.../main/java/org/jclouds/fujitsu/fgcp/domain/Memory.java | 3 ++-
.../main/java/org/jclouds/fujitsu/fgcp/domain/NAT.java | 3 ++-
.../org/jclouds/fujitsu/fgcp/domain/PerformanceInfo.java | 3 ++-
.../main/java/org/jclouds/fujitsu/fgcp/domain/Policy.java | 3 ++-
.../java/org/jclouds/fujitsu/fgcp/domain/Product.java | 3 ++-
.../java/org/jclouds/fujitsu/fgcp/domain/PublicIP.java | 3 ++-
.../main/java/org/jclouds/fujitsu/fgcp/domain/Rule.java | 3 ++-
.../java/org/jclouds/fujitsu/fgcp/domain/ServerCert.java | 3 ++-
.../java/org/jclouds/fujitsu/fgcp/domain/ServerType.java | 3 ++-
.../java/org/jclouds/fujitsu/fgcp/domain/Software.java | 3 ++-
.../main/java/org/jclouds/fujitsu/fgcp/domain/Target.java | 3 ++-
.../java/org/jclouds/fujitsu/fgcp/domain/UsageInfo.java | 3 ++-
.../main/java/org/jclouds/fujitsu/fgcp/domain/VDisk.java | 3 ++-
.../main/java/org/jclouds/fujitsu/fgcp/domain/VNIC.java | 3 ++-
.../main/java/org/jclouds/fujitsu/fgcp/domain/VNet.java | 3 ++-
.../java/org/jclouds/fujitsu/fgcp/domain/VServer.java | 3 ++-
.../jclouds/fujitsu/fgcp/domain/VServerWithDetails.java | 4 ++--
.../org/jclouds/fujitsu/fgcp/domain/VServerWithVNICs.java | 4 ++--
.../java/org/jclouds/fujitsu/fgcp/domain/VSystem.java | 3 ++-
.../jclouds/fujitsu/fgcp/domain/VSystemWithDetails.java | 4 ++--
.../java/org/jclouds/blobstore/representations/Blob.java | 3 ++-
.../jclouds/blobstore/representations/BlobMetadata.java | 3 ++-
.../blobstore/representations/ContentMetadata.java | 3 ++-
.../blobstore/representations/StorageMetadata.java | 3 ++-
.../org/jclouds/compute/representations/ExecResponse.java | 3 ++-
.../org/jclouds/compute/representations/Hardware.java | 3 ++-
.../java/org/jclouds/compute/representations/Image.java | 4 ++--
.../jclouds/compute/representations/LoginCredentials.java | 3 ++-
.../org/jclouds/compute/representations/NodeMetadata.java | 3 ++-
.../jclouds/compute/representations/OperatingSystem.java | 3 ++-
.../org/jclouds/compute/representations/Processor.java | 3 ++-
.../java/org/jclouds/compute/representations/Volume.java | 3 ++-
.../java/org/jclouds/representations/ApiMetadata.java | 3 ++-
.../main/java/org/jclouds/representations/Context.java | 3 ++-
.../main/java/org/jclouds/representations/Location.java | 3 ++-
.../org/jclouds/representations/ProviderMetadata.java | 3 ++-
.../main/java/org/jclouds/jenkins/v1/domain/Computer.java | 3 ++-
.../java/org/jclouds/jenkins/v1/domain/ComputerView.java | 3 ++-
.../src/main/java/org/jclouds/jenkins/v1/domain/Job.java | 5 +++--
.../java/org/jclouds/jenkins/v1/domain/JobDetails.java | 2 +-
.../java/org/jclouds/jenkins/v1/domain/LastBuild.java | 5 +++--
.../src/main/java/org/jclouds/jenkins/v1/domain/Node.java | 3 ++-
.../v6_5/compute/options/JoyentCloudTemplateOptions.java | 2 +-
.../org/jclouds/joyent/cloudapi/v6_5/domain/Dataset.java | 3 ++-
.../java/org/jclouds/joyent/cloudapi/v6_5/domain/Key.java | 3 ++-
.../org/jclouds/joyent/cloudapi/v6_5/domain/Machine.java | 3 ++-
.../org/jclouds/joyent/cloudapi/v6_5/domain/Package.java | 3 ++-
.../v6_5/domain/datacenterscoped/DatacenterAndName.java | 5 +++--
.../cloudapi/v6_5/options/CreateMachineOptions.java | 5 +++--
.../java/org/jclouds/opsource/servers/domain/Account.java | 3 ++-
.../org/jclouds/opsource/servers/domain/BaseServer.java | 3 ++-
.../org/jclouds/opsource/servers/domain/DataCenter.java | 3 ++-
.../jclouds/opsource/servers/domain/DataCentersList.java | 3 ++-
.../jclouds/opsource/servers/domain/DeployedServer.java | 3 ++-
.../opsource/servers/domain/DeployedServersList.java | 3 ++-
.../opsource/servers/domain/MachineSpecification.java | 3 ++-
.../jclouds/opsource/servers/domain/OperatingSystem.java | 3 ++-
.../opsource/servers/domain/PendingDeployServer.java | 3 ++-
.../opsource/servers/domain/PendingDeployServersList.java | 3 ++-
.../org/jclouds/opsource/servers/domain/ServerImage.java | 3 ++-
.../jclouds/opsource/servers/domain/ServerImagesList.java | 3 ++-
.../java/org/jclouds/opsource/servers/domain/Status.java | 3 ++-
.../java/org/jclouds/opsource/servers/domain/Step.java | 3 ++-
.../jclouds/savvis/vpdc/config/VPDCRestClientModule.java | 3 ++-
.../java/org/jclouds/smartos/compute/domain/DataSet.java | 3 ++-
.../main/java/org/jclouds/smartos/compute/domain/VM.java | 3 ++-
.../java/org/jclouds/smartos/compute/domain/VmNIC.java | 3 ++-
.../jclouds/smartos/compute/domain/VmSpecification.java | 3 ++-
.../vcloud/director/v1_5/domain/AbstractVAppType.java | 2 +-
.../vcloud/director/v1_5/domain/AccessSetting.java | 3 ++-
.../org/jclouds/vcloud/director/v1_5/domain/AdminVdc.java | 2 +-
.../jclouds/vcloud/director/v1_5/domain/Capabilities.java | 3 ++-
.../jclouds/vcloud/director/v1_5/domain/CapacityType.java | 4 ++--
.../vcloud/director/v1_5/domain/CapacityWithUsage.java | 4 ++--
.../org/jclouds/vcloud/director/v1_5/domain/Catalog.java | 2 +-
.../vcloud/director/v1_5/domain/ComputeCapacity.java | 3 ++-
.../org/jclouds/vcloud/director/v1_5/domain/Entity.java | 2 +-
.../org/jclouds/vcloud/director/v1_5/domain/Error.java | 3 ++-
.../org/jclouds/vcloud/director/v1_5/domain/File.java | 2 +-
.../org/jclouds/vcloud/director/v1_5/domain/Link.java | 2 +-
.../org/jclouds/vcloud/director/v1_5/domain/Media.java | 2 +-
.../org/jclouds/vcloud/director/v1_5/domain/Metadata.java | 2 +-
.../vcloud/director/v1_5/domain/MetadataEntry.java | 2 +-
.../org/jclouds/vcloud/director/v1_5/domain/Owner.java | 2 +-
.../vcloud/director/v1_5/domain/ProductSectionList.java | 2 +-
.../vcloud/director/v1_5/domain/RasdItemsList.java | 2 +-
.../jclouds/vcloud/director/v1_5/domain/Reference.java | 5 +++--
.../jclouds/vcloud/director/v1_5/domain/References.java | 2 +-
.../org/jclouds/vcloud/director/v1_5/domain/Resource.java | 5 +++--
.../vcloud/director/v1_5/domain/ResourceEntity.java | 2 +-
.../jclouds/vcloud/director/v1_5/domain/ScreenTicket.java | 3 ++-
.../org/jclouds/vcloud/director/v1_5/domain/Session.java | 3 ++-
.../vcloud/director/v1_5/domain/SessionWithToken.java | 3 ++-
.../org/jclouds/vcloud/director/v1_5/domain/Task.java | 2 +-
.../jclouds/vcloud/director/v1_5/domain/TasksList.java | 2 +-
.../org/jclouds/vcloud/director/v1_5/domain/User.java | 3 ++-
.../org/jclouds/vcloud/director/v1_5/domain/VApp.java | 2 +-
.../jclouds/vcloud/director/v1_5/domain/VAppChildren.java | 3 ++-
.../jclouds/vcloud/director/v1_5/domain/VAppTemplate.java | 3 ++-
.../jclouds/vcloud/director/v1_5/domain/VMWareTools.java | 3 ++-
.../java/org/jclouds/vcloud/director/v1_5/domain/Vdc.java | 2 +-
.../java/org/jclouds/vcloud/director/v1_5/domain/Vm.java | 2 +-
.../vcloud/director/v1_5/domain/VmPendingQuestion.java | 2 +-
.../vcloud/director/v1_5/domain/VmQuestionAnswer.java | 3 ++-
.../director/v1_5/domain/VmQuestionAnswerChoice.java | 3 ++-
.../vcloud/director/v1_5/domain/dmtf/RasdItem.java | 2 +-
.../vcloud/director/v1_5/domain/dmtf/VirtualSystem.java | 3 ++-
.../vcloud/director/v1_5/domain/network/DhcpService.java | 3 ++-
.../director/v1_5/domain/network/ExternalNetwork.java | 2 +-
.../vcloud/director/v1_5/domain/network/FirewallRule.java | 4 ++--
.../v1_5/domain/network/FirewallRuleProtocols.java | 4 ++--
.../director/v1_5/domain/network/FirewallService.java | 4 ++--
.../vcloud/director/v1_5/domain/network/IpAddresses.java | 3 ++-
.../vcloud/director/v1_5/domain/network/IpRange.java | 3 ++-
.../vcloud/director/v1_5/domain/network/IpRanges.java | 3 ++-
.../vcloud/director/v1_5/domain/network/IpScope.java | 3 ++-
.../v1_5/domain/network/IpsecVpnManagedPeerType.java | 5 +++--
.../director/v1_5/domain/network/IpsecVpnRemotePeer.java | 4 ++--
.../director/v1_5/domain/network/IpsecVpnService.java | 3 ++-
.../director/v1_5/domain/network/IpsecVpnTunnel.java | 4 ++--
.../v1_5/domain/network/NatOneToOneBasicRule.java | 4 ++--
.../director/v1_5/domain/network/NatOneToOneVmRule.java | 4 ++--
.../v1_5/domain/network/NatPortForwardingRule.java | 4 ++--
.../vcloud/director/v1_5/domain/network/NatRule.java | 4 ++--
.../vcloud/director/v1_5/domain/network/NatService.java | 3 ++-
.../vcloud/director/v1_5/domain/network/NatVmRule.java | 4 ++--
.../vcloud/director/v1_5/domain/network/Network.java | 2 +-
.../director/v1_5/domain/network/NetworkAssignment.java | 4 ++--
.../v1_5/domain/network/NetworkConfiguration.java | 3 ++-
.../director/v1_5/domain/network/NetworkConnection.java | 3 ++-
.../director/v1_5/domain/network/NetworkFeatures.java | 3 ++-
.../director/v1_5/domain/network/NetworkServiceType.java | 5 +++--
.../vcloud/director/v1_5/domain/network/RouterInfo.java | 3 ++-
.../director/v1_5/domain/network/SmtpServerSettings.java | 5 +++--
.../vcloud/director/v1_5/domain/network/StaticRoute.java | 3 ++-
.../v1_5/domain/network/StaticRoutingService.java | 3 ++-
.../v1_5/domain/network/SyslogServerSettings.java | 3 ++-
.../vcloud/director/v1_5/domain/network/VAppNetwork.java | 2 +-
.../v1_5/domain/network/VAppNetworkConfiguration.java | 5 +++--
.../jclouds/vcloud/director/v1_5/domain/org/AdminOrg.java | 2 +-
.../director/v1_5/domain/org/CustomOrgLdapSettings.java | 5 +++--
.../org/jclouds/vcloud/director/v1_5/domain/org/Org.java | 2 +-
.../vcloud/director/v1_5/domain/org/OrgEmailSettings.java | 2 +-
.../director/v1_5/domain/org/OrgGeneralSettings.java | 2 +-
.../director/v1_5/domain/org/OrgLdapGroupAttributes.java | 5 +++--
.../vcloud/director/v1_5/domain/org/OrgLdapSettings.java | 2 +-
.../director/v1_5/domain/org/OrgLdapUserAttributes.java | 5 +++--
.../vcloud/director/v1_5/domain/org/OrgLeaseSettings.java | 2 +-
.../vcloud/director/v1_5/domain/org/OrgNetwork.java | 2 +-
.../v1_5/domain/org/OrgPasswordPolicySettings.java | 2 +-
.../vcloud/director/v1_5/domain/org/OrgSettings.java | 2 +-
.../v1_5/domain/org/OrgVAppTemplateLeaseSettings.java | 2 +-
.../director/v1_5/domain/params/CaptureVAppParams.java | 3 ++-
.../director/v1_5/domain/params/CloneMediaParams.java | 4 ++--
.../v1_5/domain/params/CloneVAppTemplateParams.java | 2 +-
.../director/v1_5/domain/params/ComposeVAppParams.java | 2 +-
.../director/v1_5/domain/params/ControlAccessParams.java | 3 ++-
.../director/v1_5/domain/params/DeployVAppParams.java | 3 ++-
.../director/v1_5/domain/params/InstantiateOvfParams.java | 2 +-
.../v1_5/domain/params/InstantiateVAppParams.java | 2 +-
.../v1_5/domain/params/InstantiateVAppTemplateParams.java | 2 +-
.../director/v1_5/domain/params/InstantiationParams.java | 3 ++-
.../v1_5/domain/params/MediaInsertOrEjectParams.java | 3 ++-
.../vcloud/director/v1_5/domain/params/ParamsType.java | 5 +++--
.../director/v1_5/domain/params/PublishCatalogParams.java | 3 ++-
.../director/v1_5/domain/params/RecomposeVAppParams.java | 2 +-
.../director/v1_5/domain/params/RelocateParams.java | 3 ++-
.../v1_5/domain/params/SourcedCompositionItemParam.java | 3 ++-
.../director/v1_5/domain/params/UndeployVAppParams.java | 3 ++-
.../v1_5/domain/params/UploadVAppTemplateParams.java | 3 ++-
.../director/v1_5/domain/params/VAppCreationParams.java | 5 +++--
.../vcloud/director/v1_5/domain/query/ContainerType.java | 2 +-
.../vcloud/director/v1_5/domain/query/QueryList.java | 2 +-
.../v1_5/domain/query/QueryResultAdminGroupRecord.java | 2 +-
.../v1_5/domain/query/QueryResultAdminUserRecord.java | 2 +-
.../v1_5/domain/query/QueryResultAdminVdcRecord.java | 2 +-
.../v1_5/domain/query/QueryResultCatalogRecord.java | 2 +-
.../v1_5/domain/query/QueryResultDatastoreRecord.java | 2 +-
.../v1_5/domain/query/QueryResultMediaRecord.java | 2 +-
.../v1_5/domain/query/QueryResultNetworkRecord.java | 5 +++--
.../director/v1_5/domain/query/QueryResultRecordType.java | 5 +++--
.../director/v1_5/domain/query/QueryResultRecords.java | 2 +-
.../director/v1_5/domain/query/QueryResultReferences.java | 2 +-
.../v1_5/domain/query/QueryResultRightRecord.java | 2 +-
.../director/v1_5/domain/query/QueryResultRoleRecord.java | 2 +-
.../v1_5/domain/query/QueryResultStrandedUserRecord.java | 2 +-
.../director/v1_5/domain/query/QueryResultVAppRecord.java | 2 +-
.../v1_5/domain/query/QueryResultVAppTemplateRecord.java | 2 +-
.../director/v1_5/domain/query/QueryResultVMRecord.java | 2 +-
.../v1_5/domain/section/CustomizationSection.java | 3 ++-
.../v1_5/domain/section/GuestCustomizationSection.java | 3 ++-
.../v1_5/domain/section/LeaseSettingsSection.java | 3 ++-
.../v1_5/domain/section/NetworkConfigSection.java | 3 ++-
.../v1_5/domain/section/NetworkConnectionSection.java | 3 ++-
.../v1_5/domain/section/OperatingSystemSection.java | 2 +-
.../director/v1_5/domain/section/RuntimeInfoSection.java | 2 +-
.../v1_5/domain/section/VirtualHardwareSection.java | 2 +-
.../vcloud/director/v1_5/predicates/LinkPredicates.java | 6 +++---
.../v1_5/internal/BaseVCloudDirectorApiLiveTest.java | 10 +++++-----
.../virtualbox/util/MachineNameOrIdAndNicSlot.java | 4 ++--
.../jclouds/virtualbox/BaseVirtualBoxClientLiveTest.java | 4 ++--
259 files changed, 488 insertions(+), 319 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/azure-management/src/main/java/org/jclouds/azure/management/domain/DeploymentParams.java
----------------------------------------------------------------------
diff --git a/azure-management/src/main/java/org/jclouds/azure/management/domain/DeploymentParams.java b/azure-management/src/main/java/org/jclouds/azure/management/domain/DeploymentParams.java
index 0d62eab..dc51c38 100644
--- a/azure-management/src/main/java/org/jclouds/azure/management/domain/DeploymentParams.java
+++ b/azure-management/src/main/java/org/jclouds/azure/management/domain/DeploymentParams.java
@@ -18,8 +18,9 @@ package org.jclouds.azure.management.domain;
import java.util.List;
+import com.google.common.base.MoreObjects;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.Lists;
/**
@@ -215,7 +216,7 @@ public class DeploymentParams {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this).add("name", name)
+ return MoreObjects.toStringHelper(this).add("name", name)
.add("sourceImageName", sourceImageName).add("size", size);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/azure-management/src/main/java/org/jclouds/azure/management/domain/DetailedHostedServiceProperties.java
----------------------------------------------------------------------
diff --git a/azure-management/src/main/java/org/jclouds/azure/management/domain/DetailedHostedServiceProperties.java b/azure-management/src/main/java/org/jclouds/azure/management/domain/DetailedHostedServiceProperties.java
index e87ed05..6cbb60f 100644
--- a/azure-management/src/main/java/org/jclouds/azure/management/domain/DetailedHostedServiceProperties.java
+++ b/azure-management/src/main/java/org/jclouds/azure/management/domain/DetailedHostedServiceProperties.java
@@ -23,7 +23,7 @@ import java.util.Map;
import org.jclouds.azure.management.domain.HostedService.Status;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableMap;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/azure-management/src/main/java/org/jclouds/azure/management/domain/Disk.java
----------------------------------------------------------------------
diff --git a/azure-management/src/main/java/org/jclouds/azure/management/domain/Disk.java b/azure-management/src/main/java/org/jclouds/azure/management/domain/Disk.java
index f58f98b..a8df087 100644
--- a/azure-management/src/main/java/org/jclouds/azure/management/domain/Disk.java
+++ b/azure-management/src/main/java/org/jclouds/azure/management/domain/Disk.java
@@ -20,8 +20,9 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.net.URI;
+import com.google.common.base.MoreObjects;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.Optional;
/**
@@ -139,7 +140,7 @@ public class Disk {
*/
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("deployment", hostedService).add("role", role)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("deployment", hostedService).add("role", role)
.toString();
}
@@ -451,7 +452,7 @@ public class Disk {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this).omitNullValues().add("os", os).add("name", name)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("os", os).add("name", name)
.add("attachedTo", attachedTo.orNull()).add("logicalSizeInGB", logicalSizeInGB.orNull())
.add("description", description).add("location", location.orNull())
.add("affinityGroup", affinityGroup.orNull()).add("mediaLink", mediaLink.orNull())
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/azure-management/src/main/java/org/jclouds/azure/management/domain/Error.java
----------------------------------------------------------------------
diff --git a/azure-management/src/main/java/org/jclouds/azure/management/domain/Error.java b/azure-management/src/main/java/org/jclouds/azure/management/domain/Error.java
index 82ffbd2..45106a5 100644
--- a/azure-management/src/main/java/org/jclouds/azure/management/domain/Error.java
+++ b/azure-management/src/main/java/org/jclouds/azure/management/domain/Error.java
@@ -19,6 +19,7 @@ package org.jclouds.azure.management.domain;
import static com.google.common.base.Preconditions.checkNotNull;
import com.google.common.base.CaseFormat;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -243,7 +244,7 @@ public class Error {
*/
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("code", rawCode).add("message", message).toString();
+ return MoreObjects.toStringHelper(this).omitNullValues().add("code", rawCode).add("message", message).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/azure-management/src/main/java/org/jclouds/azure/management/domain/HostedService.java
----------------------------------------------------------------------
diff --git a/azure-management/src/main/java/org/jclouds/azure/management/domain/HostedService.java b/azure-management/src/main/java/org/jclouds/azure/management/domain/HostedService.java
index 14dba4f..982266c 100644
--- a/azure-management/src/main/java/org/jclouds/azure/management/domain/HostedService.java
+++ b/azure-management/src/main/java/org/jclouds/azure/management/domain/HostedService.java
@@ -21,8 +21,9 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.net.URI;
import com.google.common.base.CaseFormat;
+import com.google.common.base.MoreObjects;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
/**
* System properties for the specified hosted service
@@ -187,7 +188,7 @@ public class HostedService {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this).omitNullValues().add("url", url).add("name", name)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("url", url).add("name", name)
.add("properties", properties);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/azure-management/src/main/java/org/jclouds/azure/management/domain/HostedServiceProperties.java
----------------------------------------------------------------------
diff --git a/azure-management/src/main/java/org/jclouds/azure/management/domain/HostedServiceProperties.java b/azure-management/src/main/java/org/jclouds/azure/management/domain/HostedServiceProperties.java
index 5de9657..d97f20b 100644
--- a/azure-management/src/main/java/org/jclouds/azure/management/domain/HostedServiceProperties.java
+++ b/azure-management/src/main/java/org/jclouds/azure/management/domain/HostedServiceProperties.java
@@ -18,8 +18,9 @@ package org.jclouds.azure.management.domain;
import static com.google.common.base.Preconditions.checkNotNull;
+import com.google.common.base.MoreObjects;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.Optional;
/**
@@ -172,7 +173,7 @@ public class HostedServiceProperties {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this).omitNullValues().add("description", description.orNull())
+ return MoreObjects.toStringHelper(this).omitNullValues().add("description", description.orNull())
.add("location", location.orNull()).add("affinityGroup", affinityGroup.orNull()).add("label", label);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/azure-management/src/main/java/org/jclouds/azure/management/domain/Location.java
----------------------------------------------------------------------
diff --git a/azure-management/src/main/java/org/jclouds/azure/management/domain/Location.java b/azure-management/src/main/java/org/jclouds/azure/management/domain/Location.java
index 1d422c3..3bae9c1 100644
--- a/azure-management/src/main/java/org/jclouds/azure/management/domain/Location.java
+++ b/azure-management/src/main/java/org/jclouds/azure/management/domain/Location.java
@@ -20,6 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Set;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
@@ -153,7 +154,7 @@ public class Location {
*/
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("name", name).add("displayName", displayName)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("name", name).add("displayName", displayName)
.add("availableServices", availableServices).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/azure-management/src/main/java/org/jclouds/azure/management/domain/OSImage.java
----------------------------------------------------------------------
diff --git a/azure-management/src/main/java/org/jclouds/azure/management/domain/OSImage.java b/azure-management/src/main/java/org/jclouds/azure/management/domain/OSImage.java
index 304230a..dc6cb3e 100644
--- a/azure-management/src/main/java/org/jclouds/azure/management/domain/OSImage.java
+++ b/azure-management/src/main/java/org/jclouds/azure/management/domain/OSImage.java
@@ -20,8 +20,9 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.net.URI;
+import com.google.common.base.MoreObjects;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.Optional;
/**
@@ -295,7 +296,7 @@ public class OSImage {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this).omitNullValues().add("os", os).add("name", name)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("os", os).add("name", name)
.add("logicalSizeInGB", logicalSizeInGB.orNull()).add("description", description)
.add("category", category.orNull()).add("location", location.orNull())
.add("affinityGroup", affinityGroup.orNull()).add("mediaLink", mediaLink.orNull())
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/azure-management/src/main/java/org/jclouds/azure/management/domain/OSImageParams.java
----------------------------------------------------------------------
diff --git a/azure-management/src/main/java/org/jclouds/azure/management/domain/OSImageParams.java b/azure-management/src/main/java/org/jclouds/azure/management/domain/OSImageParams.java
index ceea920..4a9fce5 100644
--- a/azure-management/src/main/java/org/jclouds/azure/management/domain/OSImageParams.java
+++ b/azure-management/src/main/java/org/jclouds/azure/management/domain/OSImageParams.java
@@ -20,8 +20,9 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.net.URI;
+import com.google.common.base.MoreObjects;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
/**
* The Add OS Image operation adds an OS image that is currently stored in a storage account in your
@@ -169,7 +170,7 @@ public class OSImageParams {
}
protected ToStringHelper string() {
- return Objects.toStringHelper(this).add("label", label).add("mediaLink", mediaLink).add("name", name)
+ return MoreObjects.toStringHelper(this).add("label", label).add("mediaLink", mediaLink).add("name", name)
.add("os", os);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/azure-management/src/main/java/org/jclouds/azure/management/domain/Operation.java
----------------------------------------------------------------------
diff --git a/azure-management/src/main/java/org/jclouds/azure/management/domain/Operation.java b/azure-management/src/main/java/org/jclouds/azure/management/domain/Operation.java
index 9d6b40e..f925288 100644
--- a/azure-management/src/main/java/org/jclouds/azure/management/domain/Operation.java
+++ b/azure-management/src/main/java/org/jclouds/azure/management/domain/Operation.java
@@ -19,6 +19,7 @@ package org.jclouds.azure.management.domain;
import static com.google.common.base.Preconditions.checkNotNull;
import com.google.common.base.CaseFormat;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Optional;
@@ -202,7 +203,7 @@ public class Operation {
*/
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("id", id).add("status", rawStatus)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("id", id).add("status", rawStatus)
.add("httpStatusCode", httpStatusCode).add("error", error.orNull()).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/azure-management/src/main/java/org/jclouds/azure/management/options/CreateHostedServiceOptions.java
----------------------------------------------------------------------
diff --git a/azure-management/src/main/java/org/jclouds/azure/management/options/CreateHostedServiceOptions.java b/azure-management/src/main/java/org/jclouds/azure/management/options/CreateHostedServiceOptions.java
index 2722dd5..f33308a 100644
--- a/azure-management/src/main/java/org/jclouds/azure/management/options/CreateHostedServiceOptions.java
+++ b/azure-management/src/main/java/org/jclouds/azure/management/options/CreateHostedServiceOptions.java
@@ -18,6 +18,7 @@ package org.jclouds.azure.management.options;
import java.util.Map;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Optional;
@@ -119,7 +120,7 @@ public class CreateHostedServiceOptions implements Cloneable {
*/
@Override
public String toString() {
- return Objects.toStringHelper("").omitNullValues().add("description", description.orNull())
+ return MoreObjects.toStringHelper("").omitNullValues().add("description", description.orNull())
.add("extendedProperties", extendedProperties.orNull()).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/CDMIObject.java
----------------------------------------------------------------------
diff --git a/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/CDMIObject.java b/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/CDMIObject.java
index dffd298..91ee99f 100644
--- a/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/CDMIObject.java
+++ b/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/CDMIObject.java
@@ -25,8 +25,9 @@ import java.util.Map;
import org.jclouds.domain.JsonBall;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Lists;
import com.google.common.collect.Maps;
@@ -278,7 +279,7 @@ public class CDMIObject {
}
protected ToStringHelper string() {
- return Objects.toStringHelper("").add("objectID", objectID).add("objectName", objectName)
+ return MoreObjects.toStringHelper("").add("objectID", objectID).add("objectName", objectName)
.add("objectType", objectType).add("parentURI", parentURI).add("metadata", metadata);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/Container.java
----------------------------------------------------------------------
diff --git a/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/Container.java b/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/Container.java
index d8ccaf0..4bce943 100644
--- a/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/Container.java
+++ b/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/Container.java
@@ -22,7 +22,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Set;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
public class Container extends CDMIObject {
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/DataObject.java
----------------------------------------------------------------------
diff --git a/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/DataObject.java b/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/DataObject.java
index 4314705..43f2b51 100644
--- a/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/DataObject.java
+++ b/cdmi/src/main/java/org/jclouds/snia/cdmi/v1/domain/DataObject.java
@@ -25,7 +25,7 @@ import java.nio.charset.Charset;
import com.google.common.base.Charsets;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.io.ByteSource;
import com.google.common.io.Files;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/digitalocean/src/main/java/org/jclouds/digitalocean/compute/options/DigitalOceanTemplateOptions.java
----------------------------------------------------------------------
diff --git a/digitalocean/src/main/java/org/jclouds/digitalocean/compute/options/DigitalOceanTemplateOptions.java b/digitalocean/src/main/java/org/jclouds/digitalocean/compute/options/DigitalOceanTemplateOptions.java
index 4d1b2bb..3a25388 100644
--- a/digitalocean/src/main/java/org/jclouds/digitalocean/compute/options/DigitalOceanTemplateOptions.java
+++ b/digitalocean/src/main/java/org/jclouds/digitalocean/compute/options/DigitalOceanTemplateOptions.java
@@ -22,7 +22,7 @@ import java.util.Set;
import org.jclouds.compute.options.TemplateOptions;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/digitalocean/src/test/java/org/jclouds/digitalocean/internal/BaseDigitalOceanMockTest.java
----------------------------------------------------------------------
diff --git a/digitalocean/src/test/java/org/jclouds/digitalocean/internal/BaseDigitalOceanMockTest.java b/digitalocean/src/test/java/org/jclouds/digitalocean/internal/BaseDigitalOceanMockTest.java
index 02022ae..cc25cdc 100644
--- a/digitalocean/src/test/java/org/jclouds/digitalocean/internal/BaseDigitalOceanMockTest.java
+++ b/digitalocean/src/test/java/org/jclouds/digitalocean/internal/BaseDigitalOceanMockTest.java
@@ -16,7 +16,7 @@
*/
package org.jclouds.digitalocean.internal;
-import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor;
+import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService;
import static org.jclouds.digitalocean.http.filters.AuthenticationFilter.CREDENTIAL_PARAM;
import static org.jclouds.digitalocean.http.filters.AuthenticationFilter.IDENTITY_PARAM;
import static org.jclouds.http.utils.Queries.encodeQueryLine;
@@ -48,8 +48,8 @@ import com.squareup.okhttp.mockwebserver.RecordedRequest;
* Base class for all DigitalOcean mock tests.
*/
public class BaseDigitalOceanMockTest {
- private final Set<Module> modules = ImmutableSet.<Module> of(new ExecutorServiceModule(sameThreadExecutor(),
- sameThreadExecutor()));
+ private final Set<Module> modules = ImmutableSet.<Module> of(new ExecutorServiceModule(newDirectExecutorService(),
+ newDirectExecutorService()));
protected String provider;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/dmtf/src/main/java/org/jclouds/dmtf/cim/CimString.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/cim/CimString.java b/dmtf/src/main/java/org/jclouds/dmtf/cim/CimString.java
index 676dc22..8f8b18d 100644
--- a/dmtf/src/main/java/org/jclouds/dmtf/cim/CimString.java
+++ b/dmtf/src/main/java/org/jclouds/dmtf/cim/CimString.java
@@ -25,6 +25,7 @@ import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlValue;
import javax.xml.namespace.QName;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.Maps;
@@ -88,7 +89,7 @@ public class CimString {
@Override
public String toString() {
- return Objects.toStringHelper("").add("value", value).toString();
+ return MoreObjects.toStringHelper("").add("value", value).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/dmtf/src/main/java/org/jclouds/dmtf/cim/ResourceAllocationSettingData.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/cim/ResourceAllocationSettingData.java b/dmtf/src/main/java/org/jclouds/dmtf/cim/ResourceAllocationSettingData.java
index 6ef6631..8b76485 100644
--- a/dmtf/src/main/java/org/jclouds/dmtf/cim/ResourceAllocationSettingData.java
+++ b/dmtf/src/main/java/org/jclouds/dmtf/cim/ResourceAllocationSettingData.java
@@ -31,8 +31,9 @@ import javax.xml.bind.annotation.XmlEnumValue;
import javax.xml.bind.annotation.XmlType;
import com.google.common.base.Function;
+import com.google.common.base.MoreObjects;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
import com.google.common.collect.Sets;
@@ -829,7 +830,7 @@ public class ResourceAllocationSettingData {
}
public ToStringHelper string() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("elementName", elementName)
.add("instanceID", instanceID)
.add("caption", caption)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/dmtf/src/main/java/org/jclouds/dmtf/cim/VirtualSystemSettingData.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/cim/VirtualSystemSettingData.java b/dmtf/src/main/java/org/jclouds/dmtf/cim/VirtualSystemSettingData.java
index 7039b92..7e7ee35 100644
--- a/dmtf/src/main/java/org/jclouds/dmtf/cim/VirtualSystemSettingData.java
+++ b/dmtf/src/main/java/org/jclouds/dmtf/cim/VirtualSystemSettingData.java
@@ -31,6 +31,7 @@ import javax.xml.bind.annotation.XmlEnumValue;
import javax.xml.bind.annotation.XmlType;
import com.google.common.base.Function;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
@@ -692,7 +693,7 @@ public class VirtualSystemSettingData {
@Override
public String toString() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("elementName", elementName)
.add("instanceID", instanceID)
.add("caption", caption)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/dmtf/src/main/java/org/jclouds/dmtf/ovf/Configuration.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/ovf/Configuration.java b/dmtf/src/main/java/org/jclouds/dmtf/ovf/Configuration.java
index 3dc2474..0669a32 100644
--- a/dmtf/src/main/java/org/jclouds/dmtf/ovf/Configuration.java
+++ b/dmtf/src/main/java/org/jclouds/dmtf/ovf/Configuration.java
@@ -22,6 +22,7 @@ import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
@XmlType(name = "Configuration", namespace = OVF_NS, propOrder = {
@@ -124,8 +125,8 @@ public class Configuration {
return string().toString();
}
- protected Objects.ToStringHelper string() {
- return Objects.toStringHelper("").add("id", id).add("default", isDefault).add("label", label).add("description", description);
+ protected MoreObjects.ToStringHelper string() {
+ return MoreObjects.toStringHelper("").add("id", id).add("default", isDefault).add("label", label).add("description", description);
}
public String getId() {
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/dmtf/src/main/java/org/jclouds/dmtf/ovf/DeploymentOptionSection.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/ovf/DeploymentOptionSection.java b/dmtf/src/main/java/org/jclouds/dmtf/ovf/DeploymentOptionSection.java
index 198556b..253bc0b 100644
--- a/dmtf/src/main/java/org/jclouds/dmtf/ovf/DeploymentOptionSection.java
+++ b/dmtf/src/main/java/org/jclouds/dmtf/ovf/DeploymentOptionSection.java
@@ -25,6 +25,7 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
@@ -115,7 +116,7 @@ public class DeploymentOptionSection extends SectionType {
}
@Override
- protected Objects.ToStringHelper string() {
+ protected MoreObjects.ToStringHelper string() {
return super.string().add("configurations", configurations);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/dmtf/src/main/java/org/jclouds/dmtf/ovf/DiskSection.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/ovf/DiskSection.java b/dmtf/src/main/java/org/jclouds/dmtf/ovf/DiskSection.java
index 5d17fc0..7c19370 100644
--- a/dmtf/src/main/java/org/jclouds/dmtf/ovf/DiskSection.java
+++ b/dmtf/src/main/java/org/jclouds/dmtf/ovf/DiskSection.java
@@ -24,6 +24,7 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
@@ -120,7 +121,7 @@ public class DiskSection extends SectionType {
}
@Override
- protected Objects.ToStringHelper string() {
+ protected MoreObjects.ToStringHelper string() {
return super.string().add("disks", disks);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/dmtf/src/main/java/org/jclouds/dmtf/ovf/Item.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/ovf/Item.java b/dmtf/src/main/java/org/jclouds/dmtf/ovf/Item.java
index 8901a0d..7c9e07f 100644
--- a/dmtf/src/main/java/org/jclouds/dmtf/ovf/Item.java
+++ b/dmtf/src/main/java/org/jclouds/dmtf/ovf/Item.java
@@ -27,6 +27,7 @@ import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.bind.annotation.XmlType;
import javax.xml.namespace.QName;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.Maps;
@@ -179,7 +180,7 @@ public class Item {
@Override
public String toString() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("id", id)
.add("order", order)
.add("startDelay", startDelay)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/dmtf/src/main/java/org/jclouds/dmtf/ovf/MsgType.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/ovf/MsgType.java b/dmtf/src/main/java/org/jclouds/dmtf/ovf/MsgType.java
index ef6b29b..069d42a 100644
--- a/dmtf/src/main/java/org/jclouds/dmtf/ovf/MsgType.java
+++ b/dmtf/src/main/java/org/jclouds/dmtf/ovf/MsgType.java
@@ -22,6 +22,7 @@ import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlType;
import javax.xml.bind.annotation.XmlValue;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
@@ -135,7 +136,7 @@ public class MsgType {
@Override
public String toString() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("value", value).add("msgid", msgid).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/dmtf/src/main/java/org/jclouds/dmtf/ovf/NetworkSection.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/ovf/NetworkSection.java b/dmtf/src/main/java/org/jclouds/dmtf/ovf/NetworkSection.java
index a9df5d0..e40f177 100644
--- a/dmtf/src/main/java/org/jclouds/dmtf/ovf/NetworkSection.java
+++ b/dmtf/src/main/java/org/jclouds/dmtf/ovf/NetworkSection.java
@@ -23,6 +23,7 @@ import java.util.Set;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
@@ -115,7 +116,7 @@ public class NetworkSection extends SectionType {
}
@Override
- protected Objects.ToStringHelper string() {
+ protected MoreObjects.ToStringHelper string() {
return super.string()
.add("networks", networks);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/dmtf/src/main/java/org/jclouds/dmtf/ovf/OperatingSystemSection.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/ovf/OperatingSystemSection.java b/dmtf/src/main/java/org/jclouds/dmtf/ovf/OperatingSystemSection.java
index dde69ce..b01bed7 100644
--- a/dmtf/src/main/java/org/jclouds/dmtf/ovf/OperatingSystemSection.java
+++ b/dmtf/src/main/java/org/jclouds/dmtf/ovf/OperatingSystemSection.java
@@ -22,6 +22,7 @@ import static org.jclouds.dmtf.DMTFConstants.OVF_NS;
import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -146,7 +147,7 @@ public class OperatingSystemSection extends SectionType {
}
@Override
- protected Objects.ToStringHelper string() {
+ protected MoreObjects.ToStringHelper string() {
return super.string()
.add("id", id)
.add("version", version)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/dmtf/src/main/java/org/jclouds/dmtf/ovf/ProductSection.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/ovf/ProductSection.java b/dmtf/src/main/java/org/jclouds/dmtf/ovf/ProductSection.java
index 8b4c5d6..ac3bb26 100644
--- a/dmtf/src/main/java/org/jclouds/dmtf/ovf/ProductSection.java
+++ b/dmtf/src/main/java/org/jclouds/dmtf/ovf/ProductSection.java
@@ -28,6 +28,7 @@ import javax.xml.bind.annotation.XmlType;
import org.jclouds.dmtf.cim.CimString;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
@@ -284,7 +285,7 @@ public class ProductSection extends SectionType {
}
@Override
- protected Objects.ToStringHelper string() {
+ protected MoreObjects.ToStringHelper string() {
return super.string()
.add("product", product)
.add("vendor", vendor)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/dmtf/src/main/java/org/jclouds/dmtf/ovf/Property.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/ovf/Property.java b/dmtf/src/main/java/org/jclouds/dmtf/ovf/Property.java
index c404694..eb19fef 100644
--- a/dmtf/src/main/java/org/jclouds/dmtf/ovf/Property.java
+++ b/dmtf/src/main/java/org/jclouds/dmtf/ovf/Property.java
@@ -27,6 +27,7 @@ import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.bind.annotation.XmlType;
import com.google.common.base.Joiner;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.Sets;
@@ -293,7 +294,7 @@ public class Property {
@Override
public String toString() {
- return Objects.toStringHelper("")
+ return MoreObjects.toStringHelper("")
.add("key", key).add("values", values).add("label", label).add("description", description)
.add("type", type).add("qualifiers", qualifiers).add("userConfigurable", userConfigurable).add("defaultValue", defaultValue)
.toString();
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/dmtf/src/main/java/org/jclouds/dmtf/ovf/SectionType.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/ovf/SectionType.java b/dmtf/src/main/java/org/jclouds/dmtf/ovf/SectionType.java
index cc532a7..aadaf96 100644
--- a/dmtf/src/main/java/org/jclouds/dmtf/ovf/SectionType.java
+++ b/dmtf/src/main/java/org/jclouds/dmtf/ovf/SectionType.java
@@ -23,6 +23,7 @@ import javax.xml.bind.annotation.XmlAttribute;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlType;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -134,8 +135,8 @@ public abstract class SectionType {
return string().toString();
}
- protected Objects.ToStringHelper string() {
- return Objects.toStringHelper("").add("info", info).add("required", required);
+ protected MoreObjects.ToStringHelper string() {
+ return MoreObjects.toStringHelper("").add("info", info).add("required", required);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/dmtf/src/main/java/org/jclouds/dmtf/ovf/StartupSection.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/ovf/StartupSection.java b/dmtf/src/main/java/org/jclouds/dmtf/ovf/StartupSection.java
index fecdfa3..3acf05a 100644
--- a/dmtf/src/main/java/org/jclouds/dmtf/ovf/StartupSection.java
+++ b/dmtf/src/main/java/org/jclouds/dmtf/ovf/StartupSection.java
@@ -26,7 +26,7 @@ import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
import com.google.common.base.Objects;
-import com.google.common.base.Objects.ToStringHelper;
+import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.Lists;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/dmtf/src/main/java/org/jclouds/dmtf/ovf/VirtualHardwareSection.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/ovf/VirtualHardwareSection.java b/dmtf/src/main/java/org/jclouds/dmtf/ovf/VirtualHardwareSection.java
index 864d153..0d4d0f9 100644
--- a/dmtf/src/main/java/org/jclouds/dmtf/ovf/VirtualHardwareSection.java
+++ b/dmtf/src/main/java/org/jclouds/dmtf/ovf/VirtualHardwareSection.java
@@ -28,6 +28,7 @@ import org.jclouds.dmtf.cim.ResourceAllocationSettingData;
import org.jclouds.dmtf.cim.VirtualSystemSettingData;
import com.google.common.base.Joiner;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
@@ -189,7 +190,7 @@ public class VirtualHardwareSection extends SectionType {
}
@Override
- protected Objects.ToStringHelper string() {
+ protected MoreObjects.ToStringHelper string() {
return super.string()
.add("transport", transport)
.add("virtualSystem", virtualSystem)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/dmtf/src/main/java/org/jclouds/dmtf/ovf/environment/PlatformSectionType.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/ovf/environment/PlatformSectionType.java b/dmtf/src/main/java/org/jclouds/dmtf/ovf/environment/PlatformSectionType.java
index fd56577..0a766de 100644
--- a/dmtf/src/main/java/org/jclouds/dmtf/ovf/environment/PlatformSectionType.java
+++ b/dmtf/src/main/java/org/jclouds/dmtf/ovf/environment/PlatformSectionType.java
@@ -25,6 +25,7 @@ import javax.xml.bind.annotation.XmlType;
import org.jclouds.dmtf.cim.CimString;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.Sets;
@@ -132,7 +133,7 @@ public class PlatformSectionType extends SectionType<PlatformSectionType> {
}
@Override
- protected Objects.ToStringHelper string() {
+ protected MoreObjects.ToStringHelper string() {
return super.string()
.add("version", version).add("vendor", vendor).add("timezone", timezone)
.add("locale", locale).add("kind", kind).add("any", any);
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/dmtf/src/main/java/org/jclouds/dmtf/ovf/environment/PropertySectionType.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/ovf/environment/PropertySectionType.java b/dmtf/src/main/java/org/jclouds/dmtf/ovf/environment/PropertySectionType.java
index 1d88afd..cb1229f 100644
--- a/dmtf/src/main/java/org/jclouds/dmtf/ovf/environment/PropertySectionType.java
+++ b/dmtf/src/main/java/org/jclouds/dmtf/ovf/environment/PropertySectionType.java
@@ -23,6 +23,7 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.Sets;
@@ -96,7 +97,7 @@ public class PropertySectionType extends SectionType<PropertySectionType> {
}
@Override
- protected Objects.ToStringHelper string() {
+ protected MoreObjects.ToStringHelper string() {
return super.string()
.add("properties", properties).add("any", any);
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/dmtf/src/main/java/org/jclouds/dmtf/ovf/environment/SectionType.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/ovf/environment/SectionType.java b/dmtf/src/main/java/org/jclouds/dmtf/ovf/environment/SectionType.java
index 0345933..6f8e653 100644
--- a/dmtf/src/main/java/org/jclouds/dmtf/ovf/environment/SectionType.java
+++ b/dmtf/src/main/java/org/jclouds/dmtf/ovf/environment/SectionType.java
@@ -23,6 +23,7 @@ import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.bind.annotation.XmlType;
import javax.xml.namespace.QName;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.Maps;
@@ -83,8 +84,8 @@ public abstract class SectionType<T extends SectionType<T>> {
return string().toString();
}
- protected Objects.ToStringHelper string() {
- return Objects.toStringHelper("").add("otherAttributes", otherAttributes);
+ protected MoreObjects.ToStringHelper string() {
+ return MoreObjects.toStringHelper("").add("otherAttributes", otherAttributes);
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/dmtf/src/main/java/org/jclouds/dmtf/ovf/internal/BaseEnvelope.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/ovf/internal/BaseEnvelope.java b/dmtf/src/main/java/org/jclouds/dmtf/ovf/internal/BaseEnvelope.java
index d0bbea7..f105f78 100644
--- a/dmtf/src/main/java/org/jclouds/dmtf/ovf/internal/BaseEnvelope.java
+++ b/dmtf/src/main/java/org/jclouds/dmtf/ovf/internal/BaseEnvelope.java
@@ -24,6 +24,7 @@ import org.jclouds.dmtf.ovf.DiskSection;
import org.jclouds.dmtf.ovf.NetworkSection;
import org.jclouds.dmtf.ovf.SectionType;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
@@ -166,8 +167,8 @@ public abstract class BaseEnvelope<V extends BaseVirtualSystem, E extends BaseEn
return string().toString();
}
- protected Objects.ToStringHelper string() {
- return Objects.toStringHelper("")
+ protected MoreObjects.ToStringHelper string() {
+ return MoreObjects.toStringHelper("")
.add("diskSections", diskSections)
.add("networkSections", networkSections)
.add("additionalSections", additionalSections)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/dmtf/src/main/java/org/jclouds/dmtf/ovf/internal/BaseVirtualSystem.java
----------------------------------------------------------------------
diff --git a/dmtf/src/main/java/org/jclouds/dmtf/ovf/internal/BaseVirtualSystem.java b/dmtf/src/main/java/org/jclouds/dmtf/ovf/internal/BaseVirtualSystem.java
index 951ff98..4a82f74 100644
--- a/dmtf/src/main/java/org/jclouds/dmtf/ovf/internal/BaseVirtualSystem.java
+++ b/dmtf/src/main/java/org/jclouds/dmtf/ovf/internal/BaseVirtualSystem.java
@@ -29,6 +29,7 @@ import javax.xml.bind.annotation.XmlElementRef;
import org.jclouds.dmtf.ovf.ProductSection;
import org.jclouds.dmtf.ovf.SectionType;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
@@ -160,7 +161,7 @@ public abstract class BaseVirtualSystem extends SectionType {
}
@Override
- protected Objects.ToStringHelper string() {
+ protected MoreObjects.ToStringHelper string() {
return super.string()
.add("id", id)
.add("name", name)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/docker/src/main/java/org/jclouds/docker/compute/options/DockerTemplateOptions.java
----------------------------------------------------------------------
diff --git a/docker/src/main/java/org/jclouds/docker/compute/options/DockerTemplateOptions.java b/docker/src/main/java/org/jclouds/docker/compute/options/DockerTemplateOptions.java
index 5e4669b..36029da 100644
--- a/docker/src/main/java/org/jclouds/docker/compute/options/DockerTemplateOptions.java
+++ b/docker/src/main/java/org/jclouds/docker/compute/options/DockerTemplateOptions.java
@@ -16,6 +16,7 @@
*/
package org.jclouds.docker.compute.options;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableList;
@@ -109,7 +110,7 @@ public class DockerTemplateOptions extends TemplateOptions implements Cloneable
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("dns", dns)
.add("hostname", hostname)
.add("memory", memory)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/docker/src/main/java/org/jclouds/docker/domain/Config.java
----------------------------------------------------------------------
diff --git a/docker/src/main/java/org/jclouds/docker/domain/Config.java b/docker/src/main/java/org/jclouds/docker/domain/Config.java
index 9c80472..3674d6d 100644
--- a/docker/src/main/java/org/jclouds/docker/domain/Config.java
+++ b/docker/src/main/java/org/jclouds/docker/domain/Config.java
@@ -16,6 +16,7 @@
*/
package org.jclouds.docker.domain;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
@@ -245,7 +246,7 @@ public class Config {
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("hostname", hostname)
.add("domainName", domainName)
.add("user", user)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/docker/src/main/java/org/jclouds/docker/domain/Container.java
----------------------------------------------------------------------
diff --git a/docker/src/main/java/org/jclouds/docker/domain/Container.java b/docker/src/main/java/org/jclouds/docker/domain/Container.java
index 2752529..0f0c727 100644
--- a/docker/src/main/java/org/jclouds/docker/domain/Container.java
+++ b/docker/src/main/java/org/jclouds/docker/domain/Container.java
@@ -16,6 +16,7 @@
*/
package org.jclouds.docker.domain;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
@@ -210,7 +211,7 @@ public class Container {
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id)
.add("name", name)
.add("created", created)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/docker/src/main/java/org/jclouds/docker/domain/ExposedPorts.java
----------------------------------------------------------------------
diff --git a/docker/src/main/java/org/jclouds/docker/domain/ExposedPorts.java b/docker/src/main/java/org/jclouds/docker/domain/ExposedPorts.java
index b7a831a..347ad3a 100644
--- a/docker/src/main/java/org/jclouds/docker/domain/ExposedPorts.java
+++ b/docker/src/main/java/org/jclouds/docker/domain/ExposedPorts.java
@@ -22,6 +22,7 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.gson.annotations.SerializedName;
@@ -65,7 +66,7 @@ public class ExposedPorts {
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("portAndProtocol", portAndProtocol)
.add("hostPorts", hostPorts)
.toString();
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/docker/src/main/java/org/jclouds/docker/domain/HostConfig.java
----------------------------------------------------------------------
diff --git a/docker/src/main/java/org/jclouds/docker/domain/HostConfig.java b/docker/src/main/java/org/jclouds/docker/domain/HostConfig.java
index 275961f..94155c3 100644
--- a/docker/src/main/java/org/jclouds/docker/domain/HostConfig.java
+++ b/docker/src/main/java/org/jclouds/docker/domain/HostConfig.java
@@ -23,6 +23,7 @@ import java.util.Map;
import org.jclouds.javax.annotation.Nullable;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
@@ -135,7 +136,7 @@ public class HostConfig {
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("containerIDFile", containerIDFile)
.add("binds", binds)
.add("lxcConf", lxcConf)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/docker/src/main/java/org/jclouds/docker/domain/Image.java
----------------------------------------------------------------------
diff --git a/docker/src/main/java/org/jclouds/docker/domain/Image.java b/docker/src/main/java/org/jclouds/docker/domain/Image.java
index 186ece3..80d6f68 100644
--- a/docker/src/main/java/org/jclouds/docker/domain/Image.java
+++ b/docker/src/main/java/org/jclouds/docker/domain/Image.java
@@ -16,6 +16,7 @@
*/
package org.jclouds.docker.domain;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableList;
import com.google.gson.annotations.SerializedName;
@@ -132,7 +133,7 @@ public class Image {
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("id", id)
.add("parent", parent)
.add("created", created)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/docker/src/main/java/org/jclouds/docker/domain/NetworkSettings.java
----------------------------------------------------------------------
diff --git a/docker/src/main/java/org/jclouds/docker/domain/NetworkSettings.java b/docker/src/main/java/org/jclouds/docker/domain/NetworkSettings.java
index 23f3fbe..0c60719 100644
--- a/docker/src/main/java/org/jclouds/docker/domain/NetworkSettings.java
+++ b/docker/src/main/java/org/jclouds/docker/domain/NetworkSettings.java
@@ -16,6 +16,7 @@
*/
package org.jclouds.docker.domain;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableMap;
import com.google.gson.annotations.SerializedName;
@@ -99,7 +100,7 @@ public class NetworkSettings {
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("ipAddress", ipAddress)
.add("ipPrefixLen", ipPrefixLen)
.add("gateway", gateway)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/docker/src/main/java/org/jclouds/docker/domain/Port.java
----------------------------------------------------------------------
diff --git a/docker/src/main/java/org/jclouds/docker/domain/Port.java b/docker/src/main/java/org/jclouds/docker/domain/Port.java
index b49dfa6..3a43ec5 100644
--- a/docker/src/main/java/org/jclouds/docker/domain/Port.java
+++ b/docker/src/main/java/org/jclouds/docker/domain/Port.java
@@ -16,6 +16,7 @@
*/
package org.jclouds.docker.domain;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.gson.annotations.SerializedName;
@@ -78,7 +79,7 @@ public class Port {
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("privatePort", privatePort)
.add("publicPort", publicPort)
.add("type", type)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/docker/src/main/java/org/jclouds/docker/domain/State.java
----------------------------------------------------------------------
diff --git a/docker/src/main/java/org/jclouds/docker/domain/State.java b/docker/src/main/java/org/jclouds/docker/domain/State.java
index ac1ba85..cc665c8 100644
--- a/docker/src/main/java/org/jclouds/docker/domain/State.java
+++ b/docker/src/main/java/org/jclouds/docker/domain/State.java
@@ -19,6 +19,7 @@ package org.jclouds.docker.domain;
import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.gson.annotations.SerializedName;
@@ -92,7 +93,7 @@ public class State {
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("pid", pid)
.add("running", running)
.add("exitCode", exitCode)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/docker/src/main/java/org/jclouds/docker/domain/Version.java
----------------------------------------------------------------------
diff --git a/docker/src/main/java/org/jclouds/docker/domain/Version.java b/docker/src/main/java/org/jclouds/docker/domain/Version.java
index 445a225..f6dbb49 100644
--- a/docker/src/main/java/org/jclouds/docker/domain/Version.java
+++ b/docker/src/main/java/org/jclouds/docker/domain/Version.java
@@ -19,6 +19,7 @@ package org.jclouds.docker.domain;
import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.gson.annotations.SerializedName;
@@ -92,7 +93,7 @@ public class Version {
@Override
public String toString() {
- return Objects.toStringHelper(this)
+ return MoreObjects.toStringHelper(this)
.add("arch", arch)
.add("gitCommit", gitCommit)
.add("goVersion", goVersion)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/docker/src/test/java/org/jclouds/docker/internal/BaseDockerMockTest.java
----------------------------------------------------------------------
diff --git a/docker/src/test/java/org/jclouds/docker/internal/BaseDockerMockTest.java b/docker/src/test/java/org/jclouds/docker/internal/BaseDockerMockTest.java
index 146b2a0..04020b6 100644
--- a/docker/src/test/java/org/jclouds/docker/internal/BaseDockerMockTest.java
+++ b/docker/src/test/java/org/jclouds/docker/internal/BaseDockerMockTest.java
@@ -16,7 +16,7 @@
*/
package org.jclouds.docker.internal;
-import static com.google.common.util.concurrent.MoreExecutors.sameThreadExecutor;
+import static com.google.common.util.concurrent.MoreExecutors.newDirectExecutorService;
import static org.jclouds.http.utils.Queries.encodeQueryLine;
import static org.jclouds.util.Strings2.toStringAndClose;
import static org.testng.Assert.assertEquals;
@@ -45,8 +45,8 @@ import com.squareup.okhttp.mockwebserver.RecordedRequest;
* Base class for all Docker mock tests.
*/
public class BaseDockerMockTest {
- private final Set<Module> modules = ImmutableSet.<Module> of(new ExecutorServiceModule(sameThreadExecutor(),
- sameThreadExecutor()));
+ private final Set<Module> modules = ImmutableSet.<Module> of(new ExecutorServiceModule(newDirectExecutorService(),
+ newDirectExecutorService()));
protected String provider;
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/FGCPCredentials.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/FGCPCredentials.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/FGCPCredentials.java
index b74a925..70fe72b 100644
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/FGCPCredentials.java
+++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/FGCPCredentials.java
@@ -22,6 +22,7 @@ import java.util.Collection;
import org.jclouds.domain.Credentials;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Preconditions;
@@ -100,7 +101,7 @@ public class FGCPCredentials extends Credentials {
}
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("identity", identity)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("identity", identity)
.add("credential", credential == null ? null : ((Object) (Integer.valueOf(credential.hashCode()))))
.add("privateKey", privateKey.hashCode()).add("certificates", certificates.hashCode()).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/BuiltinServerBackup.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/BuiltinServerBackup.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/BuiltinServerBackup.java
index 7a90a0f..5bae70d 100644
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/BuiltinServerBackup.java
+++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/BuiltinServerBackup.java
@@ -19,6 +19,7 @@ package org.jclouds.fujitsu.fgcp.domain;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -65,7 +66,7 @@ public class BuiltinServerBackup {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("id", id)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("id", id)
.add("time", time).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/CPU.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/CPU.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/CPU.java
index abab543..33f3931 100644
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/CPU.java
+++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/CPU.java
@@ -19,6 +19,7 @@ package org.jclouds.fujitsu.fgcp.domain;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -66,7 +67,7 @@ public class CPU {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues()
+ return MoreObjects.toStringHelper(this).omitNullValues()
.add("cores", cores).add("speedPerCore", speedPerCore)
.add("arch", arch).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Direction.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Direction.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Direction.java
index 303885a..b3ac788 100644
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Direction.java
+++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Direction.java
@@ -18,6 +18,7 @@ package org.jclouds.fujitsu.fgcp.domain;
import java.util.Set;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
@@ -101,7 +102,7 @@ public class Direction {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("from", from)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("from", from)
.add("to", to).add("prefix", prefix).add("policies", policies)
.add("maxPolicyNum", maxPolicyNum)
.add("acceptable", acceptable).toString();
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/DiskImage.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/DiskImage.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/DiskImage.java
index ad7ed5e..3d2c0c0 100644
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/DiskImage.java
+++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/DiskImage.java
@@ -22,6 +22,7 @@ import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementWrapper;
import javax.xml.bind.annotation.XmlRootElement;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
@@ -186,7 +187,7 @@ public class DiskImage {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("id", id)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("id", id)
.add("name", name).add("osName", osName).add("osType", osType)
.add("size", size).add("creatorName", creatorName)
.add("description", description)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/EventLog.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/EventLog.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/EventLog.java
index 98138c6..a5578c8 100644
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/EventLog.java
+++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/EventLog.java
@@ -18,6 +18,7 @@ package org.jclouds.fujitsu.fgcp.domain;
import javax.xml.bind.annotation.XmlRootElement;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -87,7 +88,7 @@ public class EventLog {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues()
+ return MoreObjects.toStringHelper(this).omitNullValues()
.add("entryDate", entryDate).add("title", title)
.add("message", message).add("startDate", startDate)
.add("expiry", expiry).toString();
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Group.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Group.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Group.java
index 917f7cd..a71994e 100644
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Group.java
+++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Group.java
@@ -20,6 +20,7 @@ import java.util.Set;
import javax.xml.bind.annotation.XmlEnumValue;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
@@ -208,7 +209,7 @@ public class Group {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("id", id)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("id", id)
.add("protocol", protocol).add("port1", port1)
.add("port2", port2).add("balanceType", balanceType)
.add("uniqueType", uniqueType).add("monitorType", monitorType)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Image.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Image.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Image.java
index 20004bc..1122e45 100644
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Image.java
+++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Image.java
@@ -21,6 +21,7 @@ import java.util.Set;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementWrapper;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
@@ -100,7 +101,7 @@ public class Image {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("id", id)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("id", id)
.add("serverCategory", serverCategory)
.add("serverApplication", serverApplication)
.add("cpuBit", cpuBit).add("sysvolSize", sysvolSize)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Information.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Information.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Information.java
index 9b6c5d3..62c1531 100644
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Information.java
+++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Information.java
@@ -16,6 +16,7 @@
*/
package org.jclouds.fujitsu.fgcp.domain;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -93,7 +94,7 @@ public class Information {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues()
+ return MoreObjects.toStringHelper(this).omitNullValues()
.add("seqno", seqno).add("entryDate", entryDate)
.add("title", title).add("message", message)
.add("startDate", startDate).add("expiry", expiry).toString();
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/IntermediateCACert.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/IntermediateCACert.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/IntermediateCACert.java
index 66be9f4..9a261c2 100644
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/IntermediateCACert.java
+++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/IntermediateCACert.java
@@ -18,6 +18,7 @@ package org.jclouds.fujitsu.fgcp.domain;
import javax.xml.bind.annotation.XmlRootElement;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -101,7 +102,7 @@ public class IntermediateCACert implements Comparable<IntermediateCACert> {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues()
+ return MoreObjects.toStringHelper(this).omitNullValues()
.add("ccacertNum", ccacertNum).add("issuer", issuer)
.add("subject", subject).add("validity", validity)
.add("description", description).add("detail", detail)
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/LoadStatistics.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/LoadStatistics.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/LoadStatistics.java
index fc1143e..499d701 100644
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/LoadStatistics.java
+++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/LoadStatistics.java
@@ -20,6 +20,7 @@ import java.util.Set;
import javax.xml.bind.annotation.XmlRootElement;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
@@ -58,7 +59,7 @@ public class LoadStatistics {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues()
+ return MoreObjects.toStringHelper(this).omitNullValues()
.add("groups", groups).toString();
}
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Memory.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Memory.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Memory.java
index c3009a3..379bdd0 100644
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Memory.java
+++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/Memory.java
@@ -18,6 +18,7 @@ package org.jclouds.fujitsu.fgcp.domain;
import javax.xml.bind.annotation.XmlElement;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@@ -50,7 +51,7 @@ public class Memory implements Comparable<Memory> {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues().add("size", size)
+ return MoreObjects.toStringHelper(this).omitNullValues().add("size", size)
.toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds-labs/blob/b851f0ac/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/NAT.java
----------------------------------------------------------------------
diff --git a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/NAT.java b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/NAT.java
index 104e257..70f3d4c 100644
--- a/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/NAT.java
+++ b/fgcp/src/main/java/org/jclouds/fujitsu/fgcp/domain/NAT.java
@@ -18,6 +18,7 @@ package org.jclouds.fujitsu.fgcp.domain;
import java.util.Set;
+import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Sets;
@@ -55,7 +56,7 @@ public class NAT {
@Override
public String toString() {
- return Objects.toStringHelper(this).omitNullValues()
+ return MoreObjects.toStringHelper(this).omitNullValues()
.add("rules", rules).toString();
}
}