From a493e2ca2fb586ed54c743565ac469d207f178ce Mon Sep 17 00:00:00 2001 From: Andrew Gaul Date: Mon, 21 Aug 2017 13:35:48 -0700 Subject: [PATCH] JCLOUDS-1225: Address Guava 18 Objects changes Fixed with: find -name \*.java | xargs sed -i 's/Objects.[Tt]oStringHelper/More&/g' find -name \*.java | xargs sed -i 's/Objects.firstNonNull/More&/g' find -name \*.java | xargs sed -i 's/^\(import com.google.common.base.\)\(Objects.*\)/\1More\2\n\1\2/g' find -name \*.java | xargs java -jar google-java-format-1.3-all-deps.jar -i --fix-imports-only --skip-sorting-imports --- apis/byon/src/main/java/org/jclouds/byon/Node.java | 3 ++- .../org/jclouds/chef/suppliers/ChefVersionSupplier.java | 2 +- .../config/CloudStackComputeServiceContextModule.java | 6 +++--- .../compute/options/CloudStackTemplateOptions.java | 3 ++- .../main/java/org/jclouds/cloudstack/domain/Account.java | 5 +++-- .../main/java/org/jclouds/cloudstack/domain/Alert.java | 5 +++-- .../java/org/jclouds/cloudstack/domain/ApiKeyPair.java | 5 +++-- .../jclouds/cloudstack/domain/AsyncCreateResponse.java | 5 +++-- .../java/org/jclouds/cloudstack/domain/AsyncJob.java | 5 +++-- .../org/jclouds/cloudstack/domain/AsyncJobError.java | 5 +++-- .../java/org/jclouds/cloudstack/domain/Capabilities.java | 5 +++-- .../java/org/jclouds/cloudstack/domain/Capacity.java | 5 +++-- .../main/java/org/jclouds/cloudstack/domain/Cluster.java | 5 +++-- .../jclouds/cloudstack/domain/ConfigurationEntry.java | 5 +++-- .../java/org/jclouds/cloudstack/domain/DiskOffering.java | 5 +++-- .../main/java/org/jclouds/cloudstack/domain/Domain.java | 5 +++-- .../domain/EncryptedPasswordAndPrivateKey.java | 3 ++- .../main/java/org/jclouds/cloudstack/domain/Event.java | 5 +++-- .../java/org/jclouds/cloudstack/domain/FirewallRule.java | 5 +++-- .../main/java/org/jclouds/cloudstack/domain/Host.java | 5 +++-- .../org/jclouds/cloudstack/domain/IPForwardingRule.java | 5 +++-- .../src/main/java/org/jclouds/cloudstack/domain/ISO.java | 5 +++-- .../org/jclouds/cloudstack/domain/ISOExtraction.java | 5 +++-- .../org/jclouds/cloudstack/domain/ISOPermissions.java | 5 +++-- .../java/org/jclouds/cloudstack/domain/IngressRule.java | 5 +++-- .../java/org/jclouds/cloudstack/domain/JobResult.java | 5 +++-- .../org/jclouds/cloudstack/domain/LoadBalancerRule.java | 5 +++-- .../org/jclouds/cloudstack/domain/LoginResponse.java | 5 +++-- .../src/main/java/org/jclouds/cloudstack/domain/NIC.java | 5 +++-- .../main/java/org/jclouds/cloudstack/domain/Network.java | 5 +++-- .../org/jclouds/cloudstack/domain/NetworkOffering.java | 5 +++-- .../org/jclouds/cloudstack/domain/NetworkService.java | 7 ++++--- .../main/java/org/jclouds/cloudstack/domain/OSType.java | 5 +++-- .../src/main/java/org/jclouds/cloudstack/domain/Pod.java | 5 +++-- .../jclouds/cloudstack/domain/PortForwardingRule.java | 5 +++-- .../main/java/org/jclouds/cloudstack/domain/Project.java | 5 +++-- .../org/jclouds/cloudstack/domain/PublicIPAddress.java | 5 +++-- .../org/jclouds/cloudstack/domain/ResourceLimit.java | 5 +++-- .../org/jclouds/cloudstack/domain/SecurityGroup.java | 5 +++-- .../org/jclouds/cloudstack/domain/ServiceOffering.java | 5 +++-- .../java/org/jclouds/cloudstack/domain/Snapshot.java | 5 +++-- .../org/jclouds/cloudstack/domain/SnapshotPolicy.java | 5 +++-- .../cloudstack/domain/SnapshotPolicySchedule.java | 5 +++-- .../java/org/jclouds/cloudstack/domain/SshKeyPair.java | 5 +++-- .../java/org/jclouds/cloudstack/domain/StoragePool.java | 5 +++-- .../src/main/java/org/jclouds/cloudstack/domain/Tag.java | 5 +++-- .../java/org/jclouds/cloudstack/domain/Template.java | 5 +++-- .../jclouds/cloudstack/domain/TemplateExtraction.java | 5 +++-- .../org/jclouds/cloudstack/domain/TemplateMetadata.java | 5 +++-- .../jclouds/cloudstack/domain/TemplatePermission.java | 5 +++-- .../java/org/jclouds/cloudstack/domain/UsageRecord.java | 5 +++-- .../main/java/org/jclouds/cloudstack/domain/User.java | 5 +++-- .../main/java/org/jclouds/cloudstack/domain/VMGroup.java | 5 +++-- .../org/jclouds/cloudstack/domain/VirtualMachine.java | 5 +++-- .../java/org/jclouds/cloudstack/domain/VlanIPRange.java | 5 +++-- .../main/java/org/jclouds/cloudstack/domain/Volume.java | 5 +++-- .../main/java/org/jclouds/cloudstack/domain/Zone.java | 5 +++-- .../java/org/jclouds/cloudstack/domain/ZoneAndName.java | 5 +++-- .../domain/ZoneSecurityGroupNamePortsCidrs.java | 5 +++-- .../main/java/org/jclouds/cloudwatch/domain/Alarm.java | 2 +- .../org/jclouds/cloudwatch/domain/AlarmHistoryItem.java | 2 +- .../java/org/jclouds/cloudwatch/domain/Datapoint.java | 3 ++- .../java/org/jclouds/cloudwatch/domain/Dimension.java | 3 ++- .../cloudwatch/domain/GetMetricStatisticsResponse.java | 3 ++- .../jclouds/cloudwatch/domain/ListMetricsResponse.java | 3 ++- .../main/java/org/jclouds/cloudwatch/domain/Metric.java | 3 ++- .../java/org/jclouds/cloudwatch/domain/MetricDatum.java | 5 +++-- .../docker/compute/options/DockerTemplateOptions.java | 3 ++- .../ec2/compute/domain/PasswordDataAndPrivateKey.java | 3 ++- .../org/jclouds/ec2/compute/domain/RegionAndName.java | 5 +++-- .../jclouds/ec2/compute/options/EC2TemplateOptions.java | 2 +- .../main/java/org/jclouds/ec2/domain/PasswordData.java | 3 ++- .../main/java/org/jclouds/ec2/domain/Reservation.java | 3 ++- .../java/org/jclouds/ec2/domain/RunningInstance.java | 5 +++-- .../main/java/org/jclouds/ec2/domain/SecurityGroup.java | 5 +++-- .../ec2/src/main/java/org/jclouds/ec2/domain/Subnet.java | 5 +++-- apis/ec2/src/main/java/org/jclouds/ec2/domain/Tag.java | 5 +++-- .../org/jclouds/elasticstack/domain/WellKnownImage.java | 5 +++-- .../openstack/cinder/v1/domain/AvailabilityZone.java | 5 +++-- .../org/jclouds/openstack/cinder/v1/domain/Snapshot.java | 5 +++-- .../cinder/v1/domain/SnapshotExtendedAttributes.java | 5 +++-- .../org/jclouds/openstack/cinder/v1/domain/Volume.java | 5 +++-- .../openstack/cinder/v1/domain/VolumeAttachment.java | 5 +++-- .../jclouds/openstack/cinder/v1/domain/VolumeQuota.java | 5 +++-- .../jclouds/openstack/cinder/v1/domain/VolumeType.java | 5 +++-- .../jclouds/openstack/cinder/v1/domain/ZoneState.java | 5 +++-- .../cinder/v1/options/CreateSnapshotOptions.java | 4 ++-- .../openstack/cinder/v1/options/CreateVolumeOptions.java | 4 ++-- .../jclouds/openstack/keystone/v2_0/domain/Access.java | 5 +++-- .../keystone/v2_0/domain/ApiAccessKeyCredentials.java | 5 +++-- .../openstack/keystone/v2_0/domain/ApiMetadata.java | 2 +- .../jclouds/openstack/keystone/v2_0/domain/Endpoint.java | 5 +++-- .../openstack/keystone/v2_0/domain/MediaType.java | 5 +++-- .../keystone/v2_0/domain/PasswordCredentials.java | 5 +++-- .../org/jclouds/openstack/keystone/v2_0/domain/Role.java | 5 +++-- .../jclouds/openstack/keystone/v2_0/domain/Service.java | 5 +++-- .../jclouds/openstack/keystone/v2_0/domain/Tenant.java | 5 +++-- .../jclouds/openstack/keystone/v2_0/domain/Token.java | 5 +++-- .../org/jclouds/openstack/keystone/v2_0/domain/User.java | 5 +++-- .../keystone/v2_0/options/CreateTenantOptions.java | 5 +++-- .../keystone/v2_0/options/CreateUserOptions.java | 5 +++-- .../keystone/v2_0/options/UpdateTenantOptions.java | 5 +++-- .../keystone/v2_0/options/UpdateUserOptions.java | 5 +++-- .../org/jclouds/openstack/v2_0/domain/Extension.java | 2 +- .../java/org/jclouds/openstack/v2_0/domain/Limit.java | 2 +- .../java/org/jclouds/openstack/v2_0/domain/Limits.java | 2 +- .../java/org/jclouds/openstack/v2_0/domain/Link.java | 5 +++-- .../org/jclouds/openstack/v2_0/domain/RateLimit.java | 2 +- .../java/org/jclouds/openstack/v2_0/domain/Resource.java | 5 +++-- .../nova/v2_0/compute/NovaComputeServiceAdapter.java | 4 ++-- .../functions/AllocateAndAddFloatingIpToNode.java | 4 ++-- .../v2_0/compute/functions/ImageInRegionToImage.java | 4 ++-- .../v2_0/compute/functions/ImageToOperatingSystem.java | 4 ++-- .../functions/RemoveFloatingIpFromNodeAndDeallocate.java | 4 ++-- .../nova/v2_0/compute/options/NovaTemplateOptions.java | 2 +- .../org/jclouds/openstack/nova/v2_0/domain/Address.java | 5 +++-- .../openstack/nova/v2_0/domain/BlockDeviceMapping.java | 5 +++-- .../org/jclouds/openstack/nova/v2_0/domain/Console.java | 4 ++-- .../org/jclouds/openstack/nova/v2_0/domain/FixedIP.java | 5 +++-- .../org/jclouds/openstack/nova/v2_0/domain/Flavor.java | 2 +- .../jclouds/openstack/nova/v2_0/domain/FloatingIP.java | 5 +++-- .../openstack/nova/v2_0/domain/FloatingIPPool.java | 5 +++-- .../org/jclouds/openstack/nova/v2_0/domain/Host.java | 5 +++-- .../openstack/nova/v2_0/domain/HostAggregate.java | 5 +++-- .../openstack/nova/v2_0/domain/HostResourceUsage.java | 5 +++-- .../org/jclouds/openstack/nova/v2_0/domain/Image.java | 2 +- .../org/jclouds/openstack/nova/v2_0/domain/Ingress.java | 5 +++-- .../openstack/nova/v2_0/domain/InterfaceAttachment.java | 5 +++-- .../org/jclouds/openstack/nova/v2_0/domain/KeyPair.java | 5 +++-- .../org/jclouds/openstack/nova/v2_0/domain/Network.java | 5 +++-- .../org/jclouds/openstack/nova/v2_0/domain/Quota.java | 5 +++-- .../openstack/nova/v2_0/domain/SecurityGroup.java | 5 +++-- .../openstack/nova/v2_0/domain/SecurityGroupRule.java | 2 +- .../org/jclouds/openstack/nova/v2_0/domain/Server.java | 2 +- .../openstack/nova/v2_0/domain/ServerCreated.java | 2 +- .../nova/v2_0/domain/ServerExtendedAttributes.java | 5 +++-- .../openstack/nova/v2_0/domain/ServerExtendedStatus.java | 5 +++-- .../nova/v2_0/domain/ServerWithSecurityGroups.java | 2 +- .../openstack/nova/v2_0/domain/SimpleServerUsage.java | 5 +++-- .../openstack/nova/v2_0/domain/SimpleTenantUsage.java | 5 +++-- .../openstack/nova/v2_0/domain/TenantIdAndName.java | 5 +++-- .../openstack/nova/v2_0/domain/VirtualInterface.java | 5 +++-- .../org/jclouds/openstack/nova/v2_0/domain/Volume.java | 5 +++-- .../openstack/nova/v2_0/domain/VolumeAttachment.java | 5 +++-- .../openstack/nova/v2_0/domain/VolumeSnapshot.java | 5 +++-- .../jclouds/openstack/nova/v2_0/domain/VolumeType.java | 5 +++-- .../nova/v2_0/domain/regionscoped/AvailabilityZone.java | 5 +++-- .../domain/regionscoped/AvailabilityZoneDetails.java | 9 +++++---- .../nova/v2_0/domain/regionscoped/FlavorInRegion.java | 2 +- .../nova/v2_0/domain/regionscoped/ImageInRegion.java | 2 +- .../nova/v2_0/domain/regionscoped/RegionAndId.java | 5 +++-- .../nova/v2_0/domain/regionscoped/RegionAndName.java | 5 +++-- .../regionscoped/RegionSecurityGroupNameAndPorts.java | 2 +- .../v2_0/domain/regionscoped/SecurityGroupInRegion.java | 2 +- .../nova/v2_0/domain/regionscoped/ServerInRegion.java | 2 +- .../nova/v2_0/domain/regionscoped/ZoneState.java | 5 +++-- .../nova/v2_0/domain/zonescoped/AvailabilityZone.java | 5 +++-- .../nova/v2_0/domain/zonescoped/RegionAndName.java | 5 +++-- .../zonescoped/RegionSecurityGroupNameAndPorts.java | 2 +- .../openstack/nova/v2_0/domain/zonescoped/ZoneState.java | 5 +++-- .../nova/v2_0/options/CreateBackupOfServerOptions.java | 4 ++-- .../openstack/nova/v2_0/options/CreateServerOptions.java | 7 ++++--- .../openstack/nova/v2_0/options/CreateVolumeOptions.java | 4 ++-- .../nova/v2_0/options/CreateVolumeSnapshotOptions.java | 4 ++-- .../nova/v2_0/options/CreateVolumeTypeOptions.java | 4 ++-- .../org/jclouds/openstack/swift/v1/domain/Account.java | 4 ++-- .../openstack/swift/v1/domain/BulkDeleteResponse.java | 4 ++-- .../org/jclouds/openstack/swift/v1/domain/Container.java | 4 ++-- .../swift/v1/domain/ExtractArchiveResponse.java | 4 ++-- .../org/jclouds/openstack/swift/v1/domain/Segment.java | 4 ++-- .../jclouds/openstack/swift/v1/domain/SwiftObject.java | 4 ++-- .../org/jclouds/openstack/trove/v1/domain/Flavor.java | 5 +++-- .../org/jclouds/openstack/trove/v1/domain/Instance.java | 5 +++-- .../java/org/jclouds/openstack/trove/v1/domain/User.java | 5 +++-- .../rackspace/clouddns/v1/domain/CreateDomain.java | 5 +++-- .../rackspace/clouddns/v1/domain/CreateSubdomain.java | 5 +++-- .../org/jclouds/rackspace/clouddns/v1/domain/Domain.java | 5 +++-- .../rackspace/clouddns/v1/domain/DomainChange.java | 7 ++++--- .../org/jclouds/rackspace/clouddns/v1/domain/Job.java | 2 +- .../org/jclouds/rackspace/clouddns/v1/domain/Record.java | 4 ++-- .../rackspace/clouddns/v1/domain/RecordDetail.java | 4 ++-- .../jclouds/rackspace/clouddns/v1/domain/Subdomain.java | 3 ++- .../rackspace/clouddns/v1/domain/UpdateDomain.java | 5 +++-- .../rackspace/cloudfiles/v1/domain/CDNContainer.java | 4 ++-- .../cloudidentity/v2_0/domain/ApiKeyCredentials.java | 2 +- .../cloudloadbalancers/v1/domain/AccessRule.java | 5 +++-- .../cloudloadbalancers/v1/domain/AccessRuleWithId.java | 5 +++-- .../cloudloadbalancers/v1/domain/AccountUsage.java | 3 ++- .../rackspace/cloudloadbalancers/v1/domain/AddNode.java | 5 +++-- .../cloudloadbalancers/v1/domain/ConnectionThrottle.java | 5 +++-- .../cloudloadbalancers/v1/domain/CreateLoadBalancer.java | 6 +++--- .../cloudloadbalancers/v1/domain/HealthMonitor.java | 5 +++-- .../cloudloadbalancers/v1/domain/HistoricalUsage.java | 3 ++- .../cloudloadbalancers/v1/domain/LoadBalancer.java | 5 +++-- .../cloudloadbalancers/v1/domain/LoadBalancerInfo.java | 3 ++- .../cloudloadbalancers/v1/domain/LoadBalancerStats.java | 4 ++-- .../cloudloadbalancers/v1/domain/LoadBalancerUsage.java | 3 ++- .../rackspace/cloudloadbalancers/v1/domain/Node.java | 5 +++-- .../rackspace/cloudloadbalancers/v1/domain/Protocol.java | 3 ++- .../cloudloadbalancers/v1/domain/SSLTermination.java | 5 +++-- .../cloudloadbalancers/v1/domain/SourceAddresses.java | 5 +++-- .../cloudloadbalancers/v1/domain/UpdateLoadBalancer.java | 5 +++-- .../cloudloadbalancers/v1/domain/UpdateNode.java | 5 +++-- .../cloudloadbalancers/v1/domain/VirtualIP.java | 5 +++-- .../cloudloadbalancers/v1/domain/VirtualIPWithId.java | 5 +++-- .../v1/domain/internal/BaseLoadBalancer.java | 5 +++-- .../cloudloadbalancers/v1/domain/internal/BaseNode.java | 5 +++-- .../src/main/java/org/jclouds/route53/domain/Change.java | 2 +- .../java/org/jclouds/route53/domain/ChangeBatch.java | 2 +- .../main/java/org/jclouds/route53/domain/HostedZone.java | 2 +- .../jclouds/route53/domain/HostedZoneAndNameServers.java | 2 +- .../java/org/jclouds/route53/domain/NewHostedZone.java | 2 +- .../org/jclouds/route53/domain/ResourceRecordSet.java | 4 ++-- .../route53/domain/ResourceRecordSetIterable.java | 2 +- .../main/java/org/jclouds/s3/domain/DeleteResult.java | 5 +++-- apis/sqs/src/main/java/org/jclouds/sqs/SQS.java | 4 ++-- .../src/main/java/org/jclouds/sqs/domain/BatchError.java | 3 ++- .../main/java/org/jclouds/sqs/domain/BatchResult.java | 3 ++- .../src/main/java/org/jclouds/sqs/domain/Message.java | 3 ++- .../java/org/jclouds/sqs/domain/MessageIdAndMD5.java | 3 ++- .../java/org/jclouds/sqs/domain/QueueAttributes.java | 3 ++- .../java/org/jclouds/sqs/options/CreateQueueOptions.java | 3 ++- .../org/jclouds/sqs/options/ReceiveMessageOptions.java | 3 ++- .../java/org/jclouds/sqs/options/SendMessageOptions.java | 3 ++- .../java/org/jclouds/aws/domain/SessionCredentials.java | 3 ++- apis/sts/src/main/java/org/jclouds/sts/domain/User.java | 3 ++- .../jclouds/sts/domain/UserAndSessionCredentials.java | 3 ++- .../java/org/jclouds/sts/options/AssumeRoleOptions.java | 3 ++- .../org/jclouds/sts/options/FederatedUserOptions.java | 3 ++- .../jclouds/sts/options/SessionCredentialsOptions.java | 3 ++- .../blobstore/domain/internal/BlobMetadataImpl.java | 2 +- .../domain/internal/MutableBlobMetadataImpl.java | 2 +- .../domain/internal/MutableStorageMetadataImpl.java | 2 +- .../blobstore/domain/internal/StorageMetadataImpl.java | 2 +- .../jclouds/openstack/domain/AuthenticationResponse.java | 3 ++- .../src/main/java/org/jclouds/openstack/domain/Link.java | 2 +- .../main/java/org/jclouds/openstack/domain/Resource.java | 5 +++-- .../org/jclouds/openstack/keystone/v1_1/domain/Auth.java | 2 +- .../jclouds/openstack/keystone/v1_1/domain/Endpoint.java | 2 +- .../jclouds/openstack/keystone/v1_1/domain/Token.java | 2 +- ...BlockUntilInitScriptStatusIsZeroThenReturnOutput.java | 3 ++- .../compute/callables/RunScriptOnNodeUsingSsh.java | 4 ++-- .../jclouds/compute/callables/SudoAwareInitManager.java | 4 ++-- .../config/ComputeServiceAdapterContextModule.java | 2 +- .../org/jclouds/compute/domain/CIMOperatingSystem.java | 2 +- .../java/org/jclouds/compute/domain/ExecResponse.java | 3 ++- .../java/org/jclouds/compute/domain/OperatingSystem.java | 5 +++-- .../main/java/org/jclouds/compute/domain/Processor.java | 5 +++-- .../java/org/jclouds/compute/domain/SecurityGroup.java | 2 +- .../org/jclouds/compute/domain/TemplateBuilderSpec.java | 2 +- .../compute/domain/internal/ComputeMetadataImpl.java | 5 +++-- .../jclouds/compute/domain/internal/HardwareImpl.java | 2 +- .../org/jclouds/compute/domain/internal/ImageImpl.java | 2 +- .../compute/domain/internal/NodeMetadataImpl.java | 2 +- .../compute/domain/internal/TemplateBuilderImpl.java | 6 +++--- .../jclouds/compute/domain/internal/TemplateImpl.java | 5 +++-- .../org/jclouds/compute/domain/internal/VolumeImpl.java | 5 +++-- .../java/org/jclouds/compute/events/StatementOnNode.java | 5 +++-- .../compute/events/StatementOnNodeCompletion.java | 2 +- .../jclouds/compute/events/StatementOnNodeFailure.java | 2 +- .../org/jclouds/compute/options/RunScriptOptions.java | 5 +++-- .../org/jclouds/compute/options/TemplateOptions.java | 2 +- .../InitializeRunScriptOnNodeOrPlaceInBadMap.java | 4 ++-- ...iptOnNodeAndAddToGoodMapOrPutExceptionIntoBadMap.java | 4 ++-- .../CreateNodesWithGroupEncodedIntoNameThenAddToSet.java | 8 ++++---- .../strategy/impl/ReturnCredentialsBoundToImage.java | 4 ++-- .../main/java/org/jclouds/net/domain/IpPermission.java | 5 +++-- core/src/main/java/org/jclouds/ContextBuilder.java | 2 +- .../java/org/jclouds/apis/internal/BaseApiMetadata.java | 5 +++-- .../org/jclouds/collect/AdvanceUntilEmptyIterable.java | 3 ++- .../main/java/org/jclouds/collect/PagedIterables.java | 3 ++- .../java/org/jclouds/domain/internal/LocationImpl.java | 5 +++-- .../domain/internal/MutableResourceMetadataImpl.java | 5 +++-- .../jclouds/domain/internal/ResourceMetadataImpl.java | 5 +++-- core/src/main/java/org/jclouds/http/HttpMessage.java | 5 +++-- core/src/main/java/org/jclouds/http/HttpRequest.java | 5 +++-- core/src/main/java/org/jclouds/http/HttpResponse.java | 5 +++-- .../org/jclouds/http/options/BaseHttpRequestOptions.java | 4 ++-- core/src/main/java/org/jclouds/internal/BaseView.java | 5 +++-- core/src/main/java/org/jclouds/internal/ContextImpl.java | 2 +- ...zationConstructorAndReflectiveTypeAdapterFactory.java | 3 ++- .../json/internal/NullFilteringTypeAdapterFactories.java | 2 +- .../jclouds/providers/internal/BaseProviderMetadata.java | 5 +++-- .../org/jclouds/proxy/internal/GuiceProxyConfig.java | 4 ++-- .../main/java/org/jclouds/reflect/InvocationSuccess.java | 5 +++-- core/src/main/java/org/jclouds/reflect/Reflection2.java | 5 +++-- .../org/jclouds/rest/internal/BaseHttpApiMetadata.java | 2 +- .../rest/internal/DelegatesToInvocationFunction.java | 4 ++-- .../java/org/jclouds/rest/internal/InvokeHttpMethod.java | 5 +++-- .../jclouds/rest/internal/RestAnnotationProcessor.java | 4 ++-- ...yOnTimeOutButNotOnAuthorizationExceptionSupplier.java | 6 +++--- .../jclouds/rest/suppliers/URIFromStringSupplier.java | 4 ++-- core/src/main/java/org/jclouds/util/Suppliers2.java | 6 +++--- .../java/org/jclouds/ssh/jsch/SessionConnection.java | 3 ++- .../main/java/org/jclouds/sshj/SSHClientConnection.java | 3 ++- .../jclouds/aws/ec2/compute/AWSEC2TemplateOptions.java | 2 +- .../org/jclouds/aws/ec2/domain/AWSRunningInstance.java | 4 ++-- .../org/jclouds/aws/ec2/domain/LaunchSpecification.java | 2 +- .../compute/options/DigitalOcean2TemplateOptions.java | 2 +- .../org/jclouds/dynect/v3/domain/CreatePrimaryZone.java | 2 +- .../java/org/jclouds/dynect/v3/domain/CreateRecord.java | 2 +- .../org/jclouds/dynect/v3/domain/GeoRegionGroup.java | 2 +- .../java/org/jclouds/dynect/v3/domain/GeoService.java | 2 +- .../src/main/java/org/jclouds/dynect/v3/domain/Job.java | 2 +- .../src/main/java/org/jclouds/dynect/v3/domain/Node.java | 3 ++- .../main/java/org/jclouds/dynect/v3/domain/Record.java | 2 +- .../main/java/org/jclouds/dynect/v3/domain/RecordId.java | 4 ++-- .../java/org/jclouds/dynect/v3/domain/RecordSet.java | 2 +- .../java/org/jclouds/dynect/v3/domain/SOARecord.java | 2 +- .../main/java/org/jclouds/dynect/v3/domain/Session.java | 3 ++- .../org/jclouds/dynect/v3/domain/SessionCredentials.java | 3 ++- .../src/main/java/org/jclouds/dynect/v3/domain/Zone.java | 2 +- .../glesys/compute/options/GleSYSTemplateOptions.java | 2 +- .../java/org/jclouds/glesys/domain/AllowedArguments.java | 5 +++-- .../glesys/domain/AllowedArgumentsForCreateServer.java | 5 +++-- .../src/main/java/org/jclouds/glesys/domain/Archive.java | 5 +++-- .../jclouds/glesys/domain/ArchiveAllowedArguments.java | 5 +++-- .../src/main/java/org/jclouds/glesys/domain/Console.java | 5 +++-- .../src/main/java/org/jclouds/glesys/domain/Cost.java | 5 +++-- .../src/main/java/org/jclouds/glesys/domain/Domain.java | 5 +++-- .../java/org/jclouds/glesys/domain/DomainRecord.java | 5 +++-- .../java/org/jclouds/glesys/domain/EmailAccount.java | 5 +++-- .../main/java/org/jclouds/glesys/domain/EmailAlias.java | 5 +++-- .../java/org/jclouds/glesys/domain/EmailOverview.java | 5 +++-- .../org/jclouds/glesys/domain/EmailOverviewDomain.java | 5 +++-- .../org/jclouds/glesys/domain/EmailOverviewSummary.java | 5 +++-- .../main/java/org/jclouds/glesys/domain/EmailQuota.java | 5 +++-- .../src/main/java/org/jclouds/glesys/domain/Ip.java | 5 +++-- .../main/java/org/jclouds/glesys/domain/IpDetails.java | 5 +++-- .../main/java/org/jclouds/glesys/domain/OSTemplate.java | 5 +++-- .../java/org/jclouds/glesys/domain/ResourceStatus.java | 5 +++-- .../java/org/jclouds/glesys/domain/ResourceUsage.java | 5 +++-- .../org/jclouds/glesys/domain/ResourceUsageInfo.java | 5 +++-- .../org/jclouds/glesys/domain/ResourceUsageValue.java | 5 +++-- .../src/main/java/org/jclouds/glesys/domain/Server.java | 5 +++-- .../java/org/jclouds/glesys/domain/ServerDetails.java | 2 +- .../main/java/org/jclouds/glesys/domain/ServerLimit.java | 5 +++-- .../main/java/org/jclouds/glesys/domain/ServerSpec.java | 5 +++-- .../java/org/jclouds/glesys/domain/ServerStatus.java | 5 +++-- .../java/org/jclouds/glesys/domain/ServerUptime.java | 5 +++-- .../org/jclouds/glesys/options/CreateServerOptions.java | 2 +- .../java/org/jclouds/gogrid/domain/BillingToken.java | 5 +++-- .../main/java/org/jclouds/gogrid/domain/Customer.java | 5 +++-- .../src/main/java/org/jclouds/gogrid/domain/Ip.java | 5 +++-- .../main/java/org/jclouds/gogrid/domain/IpPortPair.java | 5 +++-- .../src/main/java/org/jclouds/gogrid/domain/Job.java | 5 +++-- .../java/org/jclouds/gogrid/domain/JobProperties.java | 5 +++-- .../java/org/jclouds/gogrid/domain/LoadBalancer.java | 5 +++-- .../src/main/java/org/jclouds/gogrid/domain/Option.java | 5 +++-- .../src/main/java/org/jclouds/gogrid/domain/Server.java | 5 +++-- .../main/java/org/jclouds/gogrid/domain/ServerImage.java | 5 +++-- .../jclouds/gogrid/domain/internal/ErrorResponse.java | 5 +++-- .../domain/templates/ObjectTemplate.java | 4 ++-- .../GoogleComputeEngineTemplateBuilderLiveTest.java | 2 +- .../packet/compute/options/PacketTemplateOptions.java | 2 +- .../config/SoftLayerComputeServiceContextModule.java | 4 ++-- .../main/java/org/jclouds/softlayer/domain/Address.java | 3 ++- .../domain/ContainerVirtualGuestConfiguration.java | 3 ++- .../domain/ContainerVirtualGuestConfigurationOption.java | 3 ++- .../java/org/jclouds/softlayer/domain/Datacenter.java | 3 ++- .../java/org/jclouds/softlayer/domain/NetworkVlan.java | 3 ++- .../org/jclouds/softlayer/domain/OperatingSystem.java | 3 ++- .../main/java/org/jclouds/softlayer/domain/Password.java | 3 ++- .../java/org/jclouds/softlayer/domain/PowerState.java | 5 +++-- .../java/org/jclouds/softlayer/domain/ProductItem.java | 3 ++- .../org/jclouds/softlayer/domain/ProductItemPrice.java | 3 ++- .../main/java/org/jclouds/softlayer/domain/Region.java | 3 ++- .../org/jclouds/softlayer/domain/SecuritySshKey.java | 3 ++- .../jclouds/softlayer/domain/SoftwareDescription.java | 3 ++- .../org/jclouds/softlayer/domain/SoftwareLicense.java | 3 ++- .../src/main/java/org/jclouds/softlayer/domain/Tag.java | 3 ++- .../java/org/jclouds/softlayer/domain/TagReference.java | 3 ++- .../main/java/org/jclouds/softlayer/domain/TagType.java | 3 ++- .../org/jclouds/softlayer/domain/VirtualDiskImage.java | 3 ++- .../softlayer/domain/VirtualDiskImageSoftware.java | 3 ++- .../java/org/jclouds/softlayer/domain/VirtualGuest.java | 3 ++- .../jclouds/softlayer/domain/VirtualGuestAttribute.java | 3 ++- .../softlayer/domain/VirtualGuestBlockDevice.java | 3 ++- .../domain/VirtualGuestBlockDeviceTemplate.java | 3 ++- .../domain/VirtualGuestBlockDeviceTemplateGroup.java | 3 ++- .../softlayer/domain/VirtualGuestNetworkComponent.java | 3 ++- .../jclouds/ultradns/ws/domain/AccountLevelGroup.java | 3 ++- .../org/jclouds/ultradns/ws/domain/DirectionalGroup.java | 2 +- .../ultradns/ws/domain/DirectionalGroupCoordinates.java | 2 +- .../org/jclouds/ultradns/ws/domain/DirectionalPool.java | 3 ++- .../ultradns/ws/domain/DirectionalPoolRecord.java | 2 +- .../ultradns/ws/domain/DirectionalPoolRecordDetail.java | 2 +- .../java/org/jclouds/ultradns/ws/domain/IdAndName.java | 3 ++- .../org/jclouds/ultradns/ws/domain/PoolRecordSpec.java | 2 +- .../org/jclouds/ultradns/ws/domain/ResourceRecord.java | 2 +- .../jclouds/ultradns/ws/domain/ResourceRecordDetail.java | 2 +- .../org/jclouds/ultradns/ws/domain/RoundRobinPool.java | 3 ++- .../main/java/org/jclouds/ultradns/ws/domain/Task.java | 3 ++- .../ultradns/ws/domain/TrafficControllerPool.java | 3 ++- .../ultradns/ws/domain/TrafficControllerPoolRecord.java | 2 +- .../ws/domain/TrafficControllerPoolRecordDetail.java | 3 ++- .../org/jclouds/ultradns/ws/domain/UpdatePoolRecord.java | 2 +- .../main/java/org/jclouds/ultradns/ws/domain/Zone.java | 3 ++- .../org/jclouds/ultradns/ws/domain/ZoneProperties.java | 3 ++- .../main/java/org/jclouds/scriptbuilder/InitScript.java | 2 +- .../org/jclouds/scriptbuilder/domain/GitRepoAndRef.java | 3 ++- .../org/jclouds/scriptbuilder/domain/chef/DataBag.java | 3 ++- .../java/org/jclouds/scriptbuilder/domain/chef/Role.java | 3 ++- .../scriptbuilder/statements/git/CloneGitRepo.java | 3 ++- .../statements/login/AdminAccessBuilderSpec.java | 2 +- .../jclouds/scriptbuilder/statements/login/UserAdd.java | 3 ++- .../main/java/org/jclouds/servermanager/Datacenter.java | 3 ++- .../main/java/org/jclouds/servermanager/Hardware.java | 3 ++- .../src/main/java/org/jclouds/servermanager/Image.java | 3 ++- .../src/main/java/org/jclouds/servermanager/Server.java | 3 ++- 410 files changed, 953 insertions(+), 667 deletions(-) diff --git a/apis/byon/src/main/java/org/jclouds/byon/Node.java b/apis/byon/src/main/java/org/jclouds/byon/Node.java index 814b854319..61bf0b34b2 100644 --- a/apis/byon/src/main/java/org/jclouds/byon/Node.java +++ b/apis/byon/src/main/java/org/jclouds/byon/Node.java @@ -20,6 +20,7 @@ import java.net.URI; import java.util.Map; import java.util.Set; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; @@ -299,7 +300,7 @@ public class Node { @Override public String toString() { - return Objects.toStringHelper(this).add("id", id).add("name", name).add("description", description) + return MoreObjects.toStringHelper(this).add("id", id).add("name", name).add("description", description) .add("locationId", locationId).add("hostname", hostname).add("osArch", osArch).add("osFamily", osFamily) .add("osDescription", osDescription).add("osVersion", osVersion).add("os64Bit", os64Bit) .add("group", group).add("loginPort", loginPort).add("tags", tags).add("metadata", metadata) diff --git a/apis/chef/src/main/java/org/jclouds/chef/suppliers/ChefVersionSupplier.java b/apis/chef/src/main/java/org/jclouds/chef/suppliers/ChefVersionSupplier.java index a0d8b04beb..f1e1820b40 100644 --- a/apis/chef/src/main/java/org/jclouds/chef/suppliers/ChefVersionSupplier.java +++ b/apis/chef/src/main/java/org/jclouds/chef/suppliers/ChefVersionSupplier.java @@ -16,7 +16,7 @@ */ package org.jclouds.chef.suppliers; -import static com.google.common.base.Objects.firstNonNull; +import static com.google.common.base.MoreObjects.firstNonNull; import static com.google.common.base.Preconditions.checkNotNull; import java.util.regex.Matcher; diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/config/CloudStackComputeServiceContextModule.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/config/CloudStackComputeServiceContextModule.java index f46937d78c..11f00c8dff 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/config/CloudStackComputeServiceContextModule.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/config/CloudStackComputeServiceContextModule.java @@ -88,7 +88,7 @@ import org.jclouds.rest.AuthorizationException; import org.jclouds.rest.suppliers.MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier; import com.google.common.base.Function; -import com.google.common.base.Objects; +import com.google.common.base.MoreObjects; import com.google.common.base.Predicate; import com.google.common.base.Supplier; import com.google.common.cache.CacheBuilder; @@ -177,7 +177,7 @@ public class CloudStackComputeServiceContextModule extends } @Override public String toString() { - return Objects.toStringHelper(client.getGuestOSApi()).add("method", "listOSCategories").toString(); + return MoreObjects.toStringHelper(client.getGuestOSApi()).add("method", "listOSCategories").toString(); } }, seconds, TimeUnit.SECONDS); } @@ -202,7 +202,7 @@ public class CloudStackComputeServiceContextModule extends } @Override public String toString() { - return Objects.toStringHelper(client.getGuestOSApi()).add("method", "listOSTypes").toString(); + return MoreObjects.toStringHelper(client.getGuestOSApi()).add("method", "listOSTypes").toString(); } }, seconds, TimeUnit.SECONDS); } diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/options/CloudStackTemplateOptions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/options/CloudStackTemplateOptions.java index baa2e2e259..2faed88b46 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/options/CloudStackTemplateOptions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/options/CloudStackTemplateOptions.java @@ -29,6 +29,7 @@ import org.jclouds.domain.LoginCredentials; import org.jclouds.scriptbuilder.domain.Statement; import com.google.common.base.Charsets; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; import com.google.common.collect.ImmutableMap; import com.google.common.collect.ImmutableSet; @@ -240,7 +241,7 @@ public class CloudStackTemplateOptions extends TemplateOptions implements Clonea @Override public String toString() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("securityGroupIds", securityGroupIds) .add("ipsToNetworks", ipsToNetworks) .add("ipOnDefaultNetwork", ipOnDefaultNetwork) diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Account.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Account.java index 761003d6ee..37ff133f3b 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Account.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Account.java @@ -26,8 +26,9 @@ import org.jclouds.javax.annotation.Nullable; import com.google.common.base.CaseFormat; import com.google.common.base.Function; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ForwardingSet; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; @@ -776,7 +777,7 @@ public class Account extends ForwardingSet { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("type", type).add("networkDomain", networkDomain).add("domain", domain).add("domainId", domainId).add("IPsAvailable", IPsAvailable).add("IPLimit", IPLimit).add("IPs", IPs).add("cleanupRequired", cleanupRequired).add("name", name).add("receivedBytes", receivedBytes).add("sentBytes", sentBytes).add("snapshotsAvailable", snapshotsAvailable).add("snapshotLimit", snapshotLimit).add("snapshots", snapshots).add("state", state).add("templatesAvailable", templatesAvailable).add("templateLimit", templateLimit).add("templates", templates).add("VMsAvailable", VMsAvailable).add("VMLimit", VMLimit).add("VMsRunning", VMsRunning).add("VMsStopped", VMsStopped).add("VMs", VMs).add("volumesAvailable", volumesAvailable).add("volumeLimit", volumeLimit).add("volumes", volumes).add("users", users); } diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Alert.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Alert.java index 70ba8971e6..c03d8c1fbd 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Alert.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Alert.java @@ -23,8 +23,9 @@ import java.util.Date; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Represents an alert issued by Cloudstack @@ -150,7 +151,7 @@ public class Alert { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("description", description).add("sent", sent).add("type", type); } diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ApiKeyPair.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ApiKeyPair.java index 17883a7089..2a05d9f7f8 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ApiKeyPair.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ApiKeyPair.java @@ -20,8 +20,9 @@ import java.beans.ConstructorProperties; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Representation of the API keypair response @@ -112,7 +113,7 @@ public class ApiKeyPair { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("apiKey", apiKey).add("secretKey", secretKey); } diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncCreateResponse.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncCreateResponse.java index 0df0546867..47387770ac 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncCreateResponse.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncCreateResponse.java @@ -20,8 +20,9 @@ import java.beans.ConstructorProperties; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Class AsyncCreateResponse @@ -119,7 +120,7 @@ public class AsyncCreateResponse { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("jobId", jobId); } diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncJob.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncJob.java index b82665cd73..51b9b5b584 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncJob.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncJob.java @@ -23,8 +23,9 @@ import java.util.Date; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Class AsyncJob @@ -441,7 +442,7 @@ public class AsyncJob { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("accountId", accountId).add("cmd", cmd).add("created", created).add("id", id).add("instanceId", instanceId) .add("instanceType", instanceType).add("progress", progress).add("result", result).add("resultCode", resultCode) .add("resultType", resultType).add("status", status).add("userId", userId).add("error", error); diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncJobError.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncJobError.java index 1805ec8644..c328761831 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncJobError.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncJobError.java @@ -20,8 +20,9 @@ import java.beans.ConstructorProperties; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; public class AsyncJobError { @@ -149,7 +150,7 @@ public class AsyncJobError { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("errorCode", errorCode).add("errorText", errorText); } diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Capabilities.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Capabilities.java index faabfc167e..bd80f36f05 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Capabilities.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Capabilities.java @@ -20,8 +20,9 @@ import java.beans.ConstructorProperties; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Class Capabilities @@ -175,7 +176,7 @@ public class Capabilities { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("cloudStackVersion", cloudStackVersion).add("securityGroupsEnabled", securityGroupsEnabled).add("canShareTemplates", canShareTemplates).add("firewallRuleUiEnabled", firewallRuleUiEnabled).add("supportELB", supportELB); } diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Capacity.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Capacity.java index fd12bef4be..baca2e13a9 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Capacity.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Capacity.java @@ -24,8 +24,9 @@ import java.util.Map; import org.jclouds.javax.annotation.Nullable; import com.google.common.base.Function; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; @@ -266,7 +267,7 @@ public class Capacity implements Comparable { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("capacityTotal", capacityTotal).add("capacityUsed", capacityUsed).add("percentUsed", percentUsed) .add("podId", podId).add("podName", podName).add("type", type).add("zoneId", zoneId).add("zoneName", zoneName); } diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Cluster.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Cluster.java index d53ad6f868..c651bf48e6 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Cluster.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Cluster.java @@ -24,8 +24,9 @@ import java.beans.ConstructorProperties; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Represents a CloudStack Cluster. @@ -284,7 +285,7 @@ public class Cluster implements Comparable { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("allocationState", allocationState).add("clusterType", clusterType).add("hypervisor", hypervisor) .add("managedState", managedState).add("name", name).add("podId", podId).add("podName", podName).add("zoneId", zoneId).add("zoneName", zoneName); } diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ConfigurationEntry.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ConfigurationEntry.java index a0526e3b78..6fe533f90d 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ConfigurationEntry.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ConfigurationEntry.java @@ -22,8 +22,9 @@ import java.beans.ConstructorProperties; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Representation of the API configuration entry response @@ -149,7 +150,7 @@ public class ConfigurationEntry implements Comparable { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("category", category).add("description", description).add("name", name).add("value", value); } diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/DiskOffering.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/DiskOffering.java index 452457a276..2132bebc71 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/DiskOffering.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/DiskOffering.java @@ -24,8 +24,9 @@ import java.util.Set; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableSet; /** @@ -276,7 +277,7 @@ public class DiskOffering implements Comparable { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("name", name).add("displayText", displayText).add("created", created).add("domain", domain) .add("domainId", domainId).add("diskSize", diskSize).add("customized", customized).add("tags", tags); } diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Domain.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Domain.java index ca203b9f90..c60689ecac 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Domain.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Domain.java @@ -22,8 +22,9 @@ import java.beans.ConstructorProperties; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Representation of the API domain response @@ -202,7 +203,7 @@ public class Domain implements Comparable { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("hasChild", hasChild).add("level", level).add("name", name).add("networkDomain", networkDomain).add("parentDomainId", parentDomainId).add("parentDomainName", parentDomainName); } diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/EncryptedPasswordAndPrivateKey.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/EncryptedPasswordAndPrivateKey.java index c0b4330f30..bb81cd1c6a 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/EncryptedPasswordAndPrivateKey.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/EncryptedPasswordAndPrivateKey.java @@ -20,6 +20,7 @@ import java.beans.ConstructorProperties; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; public final class EncryptedPasswordAndPrivateKey { @@ -106,7 +107,7 @@ public final class EncryptedPasswordAndPrivateKey { @Override public String toString() { - return Objects.toStringHelper(this).omitNullValues() + return MoreObjects.toStringHelper(this).omitNullValues() .add("encryptedPassword", encryptedPassword).add("privateKey", privateKey).toString(); } diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Event.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Event.java index ef324b0499..436db986f5 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Event.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Event.java @@ -23,8 +23,9 @@ import java.util.Date; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Class Event @@ -313,7 +314,7 @@ public class Event implements Comparable { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("account", account).add("description", description).add("created", created) .add("domain", domain).add("domainId", domainId).add("level", level).add("parentId", parentId) .add("state", state).add("type", type).add("username", username); diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/FirewallRule.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/FirewallRule.java index 144f232a36..7b9803df8c 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/FirewallRule.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/FirewallRule.java @@ -24,8 +24,9 @@ import java.util.Set; import org.jclouds.javax.annotation.Nullable; import com.google.common.base.CaseFormat; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableSet; /** @@ -341,7 +342,7 @@ public class FirewallRule implements Comparable { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("CIDRs", CIDRs).add("startPort", startPort).add("endPort", endPort).add("icmpCode", icmpCode) .add("icmpType", icmpType).add("ipAddress", ipAddress).add("ipAddressId", ipAddressId).add("protocol", protocol).add("state", state) .add("tags", tags); diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Host.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Host.java index f6e26f96b0..9ebf04a639 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Host.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Host.java @@ -26,8 +26,9 @@ import java.util.Set; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableSet; /** @@ -930,7 +931,7 @@ public class Host implements Comparable { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("allocationState", allocationState).add("averageLoad", averageLoad) .add("capabilities", capabilities).add("clusterId", clusterId).add("clusterName", clusterName) .add("clusterType", clusterType).add("cpuAllocated", cpuAllocated).add("cpuNumber", cpuNumber) diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/IPForwardingRule.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/IPForwardingRule.java index 80c98b3fb5..3f5e22be42 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/IPForwardingRule.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/IPForwardingRule.java @@ -23,8 +23,9 @@ import java.util.Set; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableSet; /** @@ -402,7 +403,7 @@ public class IPForwardingRule implements Comparable { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("IPAddress", IPAddress).add("IPAddressId", IPAddressId).add("startPort", startPort) .add("protocol", protocol).add("endPort", endPort).add("state", state).add("virtualMachineDisplayName", virtualMachineDisplayName) .add("virtualMachineId", virtualMachineId).add("virtualMachineName", virtualMachineName).add("publicPort", publicPort) diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISO.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISO.java index 3a4226f729..e4e8ccfe50 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISO.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISO.java @@ -25,8 +25,9 @@ import java.util.Set; import com.google.common.collect.ImmutableSet; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Class ISO @@ -776,7 +777,7 @@ public class ISO { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("account", account).add("accountId", accountId).add("bootable", bootable) .add("checksum", checksum).add("created", created).add("crossZones", crossZones).add("displayText", displayText) .add("domain", domain).add("domainid", domainid).add("format", format).add("hostId", hostId).add("hostName", hostName) diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISOExtraction.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISOExtraction.java index 0e6bb63e6f..3144afccd8 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISOExtraction.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISOExtraction.java @@ -23,8 +23,9 @@ import java.util.Date; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Class ISOExtraction @@ -353,7 +354,7 @@ public class ISOExtraction { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("accountId", accountId).add("created", created).add("extractId", extractId).add("extractMode", extractMode) .add("name", name).add("state", state).add("status", status).add("storageType", storageType).add("uploadPercentage", uploadPercentage) .add("url", url).add("zoneId", zoneId).add("zoneName", zoneName); diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISOPermissions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISOPermissions.java index 5a3b62e4fa..5ecf1db661 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISOPermissions.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISOPermissions.java @@ -23,8 +23,9 @@ import java.util.Set; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableSet; /** @@ -165,7 +166,7 @@ public class ISOPermissions { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("accounts", accounts).add("domainId", domainId).add("isPublic", isPublic); } diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/IngressRule.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/IngressRule.java index d072a462ab..acc550ef9d 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/IngressRule.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/IngressRule.java @@ -23,8 +23,9 @@ import java.util.Set; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableSet; public class IngressRule implements Comparable { @@ -288,7 +289,7 @@ public class IngressRule implements Comparable { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("account", account).add("CIDR", CIDR).add("endPort", endPort).add("ICMPCode", ICMPCode) .add("ICMPType", ICMPType).add("protocol", protocol).add("id", id).add("securityGroupName", securityGroupName).add("startPort", startPort) .add("tags", tags); diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/JobResult.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/JobResult.java index 1c0b1d9387..0ad9e41a2e 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/JobResult.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/JobResult.java @@ -20,8 +20,9 @@ import java.beans.ConstructorProperties; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * The result of an operation. @@ -114,7 +115,7 @@ public class JobResult { } protected ToStringHelper string() { - return Objects.toStringHelper(this).add("success", success).add("displayText", displayText); + return MoreObjects.toStringHelper(this).add("success", success).add("displayText", displayText); } @Override diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/LoadBalancerRule.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/LoadBalancerRule.java index f30654f17f..0717385e28 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/LoadBalancerRule.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/LoadBalancerRule.java @@ -24,8 +24,9 @@ import java.util.Set; import org.jclouds.javax.annotation.Nullable; import com.google.common.base.CaseFormat; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableSet; /** @@ -431,7 +432,7 @@ public class LoadBalancerRule { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("account", account).add("algorithm", algorithm).add("description", description).add("domain", domain).add("domainId", domainId).add("name", name).add("privatePort", privatePort).add("publicIP", publicIP).add("publicIPId", publicIPId).add("publicPort", publicPort).add("state", state).add("CIDRs", CIDRs).add("zoneId", zoneId); } diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/LoginResponse.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/LoginResponse.java index be6aacfe80..82b715451e 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/LoginResponse.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/LoginResponse.java @@ -20,8 +20,9 @@ import java.beans.ConstructorProperties; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Representation of the login API call response @@ -326,7 +327,7 @@ public class LoginResponse { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("username", username).add("userId", userId).add("password", password).add("domainId", domainId).add("timeout", timeout).add("registered", registered).add("accountName", accountName).add("firstName", firstName).add("lastName", lastName).add("accountType", accountType).add("timezone", timezone).add("timezoneOffset", timezoneOffset).add("sessionKey", sessionKey).add("jSessionId", jSessionId); } diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NIC.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NIC.java index 4c38e1d73b..4e6adbb47d 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NIC.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NIC.java @@ -23,8 +23,9 @@ import java.net.URI; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Class NIC @@ -310,7 +311,7 @@ public class NIC { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("broadcastURI", broadcastURI).add("gateway", gateway).add("IPAddress", IPAddress) .add("isDefault", isDefault).add("isolationURI", isolationURI).add("netmask", netmask).add("macAddress", macAddress) .add("networkId", networkId).add("trafficType", trafficType).add("guestIPType", guestIPType); diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Network.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Network.java index 74713227bf..3b7a64b39f 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Network.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Network.java @@ -25,8 +25,9 @@ import java.util.Set; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedSet; @@ -723,7 +724,7 @@ public class Network { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("account", account).add("broadcastDomainType", broadcastDomainType).add("broadcastURI", broadcastURI) .add("displayText", displayText).add("DNS1", dns1).add("dns2", dns2).add("domain", domain).add("domainId", domainId) .add("endIP", endIP).add("gateway", gateway).add("isDefault", isDefault).add("isShared", isShared).add("isSystem", isSystem) diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkOffering.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkOffering.java index 509fcc16ac..f8f730ef66 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkOffering.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkOffering.java @@ -24,8 +24,9 @@ import java.util.Set; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableSet; /** @@ -338,7 +339,7 @@ public class NetworkOffering implements Comparable { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("name", name).add("displayText", displayText).add("created", created).add("availability", availability).add("maxConnections", maxConnections).add("isDefault", isDefault).add("supportsVLAN", supportsVLAN).add("trafficType", trafficType).add("guestIPType", guestIPType).add("networkRate", networkRate).add("tags", tags); } diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkService.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkService.java index f6820dafd3..b3ba39040c 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkService.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkService.java @@ -24,8 +24,9 @@ import java.util.Set; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedMap; import com.google.common.collect.ImmutableSortedSet; @@ -122,7 +123,7 @@ public class NetworkService implements Comparable { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("name", name).add("value", value); } @@ -226,7 +227,7 @@ public class NetworkService implements Comparable { } protected ToStringHelper string() { - return Objects.toStringHelper(this).add("name", name).add("capabilities", capabilities); + return MoreObjects.toStringHelper(this).add("name", name).add("capabilities", capabilities); } @Override diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/OSType.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/OSType.java index 447f4ef999..8c2b4b989b 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/OSType.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/OSType.java @@ -22,8 +22,9 @@ import java.beans.ConstructorProperties; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Class OSType @@ -140,7 +141,7 @@ public class OSType implements Comparable { } protected ToStringHelper string() { - return Objects.toStringHelper(this).add("id", id).add("OSCategoryId", OSCategoryId).add("description", description); + return MoreObjects.toStringHelper(this).add("id", id).add("OSCategoryId", OSCategoryId).add("description", description); } @Override diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Pod.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Pod.java index 0019c6dadd..de4ac7647a 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Pod.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Pod.java @@ -22,8 +22,9 @@ import java.beans.ConstructorProperties; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Represents a Pod in CloudStack. @@ -266,7 +267,7 @@ public class Pod implements Comparable { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("name", name).add("zoneId", zoneId).add("zoneName", zoneName).add("gateway", gateway).add("netmask", netmask).add("startIp", startIp).add("endIp", endIp).add("allocationState", allocationState); } diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/PortForwardingRule.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/PortForwardingRule.java index b246c7d5d7..7126111731 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/PortForwardingRule.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/PortForwardingRule.java @@ -24,8 +24,9 @@ import java.util.Set; import org.jclouds.javax.annotation.Nullable; import com.google.common.base.CaseFormat; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableSet; /** @@ -437,7 +438,7 @@ public class PortForwardingRule implements Comparable { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("IPAddress", IPAddress).add("IPAddressId", IPAddressId).add("privatePort", privatePort) .add("protocol", protocol).add("publicPort", publicPort).add("state", state).add("virtualMachineDisplayName", virtualMachineDisplayName) .add("virtualMachineId", virtualMachineId).add("virtualMachineName", virtualMachineName).add("CIDRs", CIDRs) diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Project.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Project.java index 7744f747ad..6e44660ddd 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Project.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Project.java @@ -25,8 +25,9 @@ import com.google.common.collect.ImmutableSet; import org.jclouds.javax.annotation.Nullable; import com.google.common.base.CaseFormat; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Representation of the API project response @@ -248,7 +249,7 @@ public class Project implements Comparable { } protected ToStringHelper string() { - return Objects.toStringHelper(this).omitNullValues() + return MoreObjects.toStringHelper(this).omitNullValues() .add("id", id).add("account", account).add("displayText", displayText) .add("domain", domain).add("domainId", domainId).add("name", name).add("state", state) .add("tags", tags); diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/PublicIPAddress.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/PublicIPAddress.java index 666d80f0ed..a30f5320e4 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/PublicIPAddress.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/PublicIPAddress.java @@ -26,8 +26,9 @@ import com.google.common.collect.ImmutableSet; import org.jclouds.javax.annotation.Nullable; import com.google.common.base.CaseFormat; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Class PublicIPAddress @@ -576,7 +577,7 @@ public class PublicIPAddress { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("account", account).add("allocated", allocated).add("associatedNetworkId", associatedNetworkId) .add("domain", domain).add("domainId", domainId).add("usesVirtualNetwork", usesVirtualNetwork).add("IPAddress", IPAddress) .add("isSourceNAT", isSourceNAT).add("isStaticNAT", isStaticNAT).add("networkId", networkId).add("state", state) diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ResourceLimit.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ResourceLimit.java index 3e1b2ecc6f..3add3f2f2f 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ResourceLimit.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ResourceLimit.java @@ -24,8 +24,9 @@ import java.util.Map; import org.jclouds.javax.annotation.Nullable; import com.google.common.base.Function; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; @@ -258,7 +259,7 @@ public class ResourceLimit { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("account", account).add("domain", domain).add("domainId", domainId).add("max", max).add("resourceType", resourceType); } diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SecurityGroup.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SecurityGroup.java index 04ba26c07d..6584910805 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SecurityGroup.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SecurityGroup.java @@ -23,8 +23,9 @@ import java.util.Set; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableSet; import com.google.common.collect.ImmutableSortedSet; @@ -296,7 +297,7 @@ public class SecurityGroup implements Comparable { } protected ToStringHelper string() { - return Objects.toStringHelper(this).add("id", id).add("account", account).add("name", name).add("description", description) + return MoreObjects.toStringHelper(this).add("id", id).add("account", account).add("name", name).add("description", description) .add("domain", domain).add("domainId", domainId).add("jobId", jobId).add("jobStatus", jobStatus).add("ingressRules", ingressRules) .add("tags", tags); } diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ServiceOffering.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ServiceOffering.java index 4979f2c1e3..16b5bb595c 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ServiceOffering.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ServiceOffering.java @@ -24,8 +24,9 @@ import java.util.Set; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableSet; /** @@ -435,7 +436,7 @@ public class ServiceOffering implements Comparable { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("name", name).add("displayText", displayText).add("created", created).add("domain", domain) .add("domainId", domainId).add("cpuNumber", cpuNumber).add("cpuSpeed", cpuSpeed).add("memory", memory) .add("haSupport", haSupport).add("storageType", storageType).add("tags", getTags()).add("defaultUse", defaultUse) diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Snapshot.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Snapshot.java index 1bc9795ddb..39dac9eda1 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Snapshot.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Snapshot.java @@ -26,8 +26,9 @@ import com.google.common.collect.ImmutableSet; import org.jclouds.javax.annotation.Nullable; import com.google.common.base.CaseFormat; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Class Snapshot @@ -453,7 +454,7 @@ public class Snapshot { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("account", account).add("created", created).add("domain", domain).add("domainId", domainId) .add("interval", interval).add("jobId", jobId).add("jobStatus", jobStatus).add("name", name).add("snapshotType", snapshotType) .add("state", state).add("volumeId", volumeId).add("volumeName", volumeName).add("volumeType", volumeType) diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SnapshotPolicy.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SnapshotPolicy.java index cab25921ef..84b6644e64 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SnapshotPolicy.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SnapshotPolicy.java @@ -22,8 +22,9 @@ import java.beans.ConstructorProperties; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Class SnapshotPolicy @@ -203,7 +204,7 @@ public class SnapshotPolicy { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("interval", interval).add("numberToRetain", numberToRetain).add("schedule", schedule).add("timezone", timezone) .add("volumeId", volumeId); } diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SnapshotPolicySchedule.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SnapshotPolicySchedule.java index 1c7c7e4b53..56e297f502 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SnapshotPolicySchedule.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SnapshotPolicySchedule.java @@ -20,8 +20,9 @@ import java.beans.ConstructorProperties; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Describes the schedule of a snapshot policy. @@ -114,7 +115,7 @@ public class SnapshotPolicySchedule { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("interval", interval).add("time", time); } diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SshKeyPair.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SshKeyPair.java index e02d13e6c3..5c10a6af2f 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SshKeyPair.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SshKeyPair.java @@ -22,8 +22,9 @@ import java.beans.ConstructorProperties; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; /** * Class SshKeyPair @@ -131,7 +132,7 @@ public class SshKeyPair { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("fingerprint", fingerprint).add("name", name).add("privateKey", privateKey); } diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/StoragePool.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/StoragePool.java index 35d33dc35d..3b1cbe7cbb 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/StoragePool.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/StoragePool.java @@ -25,8 +25,9 @@ import java.util.Set; import org.jclouds.javax.annotation.Nullable; import com.google.common.base.CaseFormat; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableSet; /** @@ -466,7 +467,7 @@ public class StoragePool implements Comparable { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("id", id).add("name", name).add("path", path).add("tags", tags).add("state", state).add("type", type).add("zoneId", zoneId).add("zoneName", zoneName).add("podId", podId).add("podName", podName).add("clusterId", clusterId).add("clusterName", clusterName).add("created", created).add("diskSizeAllocated", diskSizeAllocated).add("diskSizeTotal", diskSizeTotal).add("ipAddress", ipAddress).add("jobId", jobId).add("jobStatus", jobStatus); } diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Tag.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Tag.java index b0462514dc..af05e9b55b 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Tag.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Tag.java @@ -24,8 +24,9 @@ import java.util.Map; import org.jclouds.javax.annotation.Nullable; import com.google.common.base.Function; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.collect.ImmutableSet; import com.google.common.collect.Maps; @@ -331,7 +332,7 @@ public class Tag { } protected ToStringHelper string() { - return Objects.toStringHelper(this) + return MoreObjects.toStringHelper(this) .add("account", account) .add("customer", customer) .add("domain", domain) diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Template.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Template.java index 26ba3e3647..56a7131fc4 100644 --- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Template.java +++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Template.java @@ -24,8 +24,9 @@ import java.util.Set; import org.jclouds.javax.annotation.Nullable; +import com.google.common.base.MoreObjects; import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; +import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.base.Strings; import com.google.common.collect.ImmutableSet; @@ -878,7 +879,7 @@ public class Template implements Comparable