You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by ad...@apache.org on 2014/10/24 19:50:23 UTC
[7/8] git commit: Revert "JCLOUDS-653: Address Guava 18 deprecations"
Revert "JCLOUDS-653: Address Guava 18 deprecations"
This reverts commit 95cfc0d950861e5bc753ee3b0669aa5c59c217e8.
Many conflicts due to duration between above commit and now
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/3980cd79
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/3980cd79
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/3980cd79
Branch: refs/heads/master
Commit: 3980cd791b727e22a7d3f20e645ce7cbb9e311bf
Parents: f134367
Author: Adrian Cole <ad...@gmail.com>
Authored: Thu Oct 23 20:48:35 2014 -0700
Committer: Adrian Cole <ad...@apache.org>
Committed: Fri Oct 24 10:45:58 2014 -0700
----------------------------------------------------------------------
apis/byon/src/main/java/org/jclouds/byon/Node.java | 3 +--
.../java/org/jclouds/cloudservers/domain/AbsoluteLimit.java | 5 ++---
.../java/org/jclouds/cloudservers/domain/Addresses.java | 5 ++---
.../org/jclouds/cloudservers/domain/BackupSchedule.java | 5 ++---
.../main/java/org/jclouds/cloudservers/domain/Flavor.java | 5 ++---
.../main/java/org/jclouds/cloudservers/domain/Image.java | 5 ++---
.../main/java/org/jclouds/cloudservers/domain/Limits.java | 5 ++---
.../java/org/jclouds/cloudservers/domain/RateLimit.java | 5 ++---
.../main/java/org/jclouds/cloudservers/domain/Server.java | 5 ++---
.../main/java/org/jclouds/cloudservers/domain/ShareIp.java | 5 ++---
.../java/org/jclouds/cloudservers/domain/SharedIpGroup.java | 5 ++---
.../main/java/org/jclouds/cloudservers/domain/Version.java | 5 ++---
.../config/CloudStackComputeServiceContextModule.java | 6 +++---
.../main/java/org/jclouds/cloudstack/domain/Account.java | 5 ++---
.../src/main/java/org/jclouds/cloudstack/domain/Alert.java | 5 ++---
.../main/java/org/jclouds/cloudstack/domain/ApiKeyPair.java | 5 ++---
.../org/jclouds/cloudstack/domain/AsyncCreateResponse.java | 5 ++---
.../main/java/org/jclouds/cloudstack/domain/AsyncJob.java | 5 ++---
.../java/org/jclouds/cloudstack/domain/AsyncJobError.java | 5 ++---
.../java/org/jclouds/cloudstack/domain/Capabilities.java | 5 ++---
.../main/java/org/jclouds/cloudstack/domain/Capacity.java | 5 ++---
.../main/java/org/jclouds/cloudstack/domain/Cluster.java | 5 ++---
.../org/jclouds/cloudstack/domain/ConfigurationEntry.java | 5 ++---
.../java/org/jclouds/cloudstack/domain/DiskOffering.java | 5 ++---
.../src/main/java/org/jclouds/cloudstack/domain/Domain.java | 5 ++---
.../cloudstack/domain/EncryptedPasswordAndPrivateKey.java | 3 +--
.../src/main/java/org/jclouds/cloudstack/domain/Event.java | 5 ++---
.../java/org/jclouds/cloudstack/domain/FirewallRule.java | 5 ++---
.../src/main/java/org/jclouds/cloudstack/domain/Host.java | 5 ++---
.../org/jclouds/cloudstack/domain/IPForwardingRule.java | 5 ++---
.../src/main/java/org/jclouds/cloudstack/domain/ISO.java | 5 ++---
.../java/org/jclouds/cloudstack/domain/ISOExtraction.java | 5 ++---
.../java/org/jclouds/cloudstack/domain/ISOPermissions.java | 5 ++---
.../java/org/jclouds/cloudstack/domain/IngressRule.java | 8 ++++----
.../main/java/org/jclouds/cloudstack/domain/JobResult.java | 5 ++---
.../org/jclouds/cloudstack/domain/LoadBalancerRule.java | 5 ++---
.../java/org/jclouds/cloudstack/domain/LoginResponse.java | 5 ++---
.../src/main/java/org/jclouds/cloudstack/domain/NIC.java | 5 ++---
.../main/java/org/jclouds/cloudstack/domain/Network.java | 5 ++---
.../java/org/jclouds/cloudstack/domain/NetworkOffering.java | 5 ++---
.../java/org/jclouds/cloudstack/domain/NetworkService.java | 7 +++----
.../src/main/java/org/jclouds/cloudstack/domain/OSType.java | 5 ++---
.../src/main/java/org/jclouds/cloudstack/domain/Pod.java | 5 ++---
.../org/jclouds/cloudstack/domain/PortForwardingRule.java | 5 ++---
.../main/java/org/jclouds/cloudstack/domain/Project.java | 5 ++---
.../java/org/jclouds/cloudstack/domain/PublicIPAddress.java | 5 ++---
.../java/org/jclouds/cloudstack/domain/ResourceLimit.java | 5 ++---
.../java/org/jclouds/cloudstack/domain/SecurityGroup.java | 5 ++---
.../java/org/jclouds/cloudstack/domain/ServiceOffering.java | 5 ++---
.../main/java/org/jclouds/cloudstack/domain/Snapshot.java | 5 ++---
.../java/org/jclouds/cloudstack/domain/SnapshotPolicy.java | 5 ++---
.../jclouds/cloudstack/domain/SnapshotPolicySchedule.java | 5 ++---
.../main/java/org/jclouds/cloudstack/domain/SshKeyPair.java | 5 ++---
.../java/org/jclouds/cloudstack/domain/StoragePool.java | 5 ++---
.../src/main/java/org/jclouds/cloudstack/domain/Tag.java | 8 ++++----
.../main/java/org/jclouds/cloudstack/domain/Template.java | 8 ++++----
.../org/jclouds/cloudstack/domain/TemplateExtraction.java | 5 ++---
.../org/jclouds/cloudstack/domain/TemplateMetadata.java | 5 ++---
.../org/jclouds/cloudstack/domain/TemplatePermission.java | 5 ++---
.../java/org/jclouds/cloudstack/domain/UsageRecord.java | 5 ++---
.../src/main/java/org/jclouds/cloudstack/domain/User.java | 5 ++---
.../main/java/org/jclouds/cloudstack/domain/VMGroup.java | 5 ++---
.../java/org/jclouds/cloudstack/domain/VirtualMachine.java | 5 ++---
.../java/org/jclouds/cloudstack/domain/VlanIPRange.java | 5 ++---
.../src/main/java/org/jclouds/cloudstack/domain/Volume.java | 5 ++---
.../src/main/java/org/jclouds/cloudstack/domain/Zone.java | 5 ++---
.../java/org/jclouds/cloudstack/domain/ZoneAndName.java | 5 ++---
.../cloudstack/domain/ZoneSecurityGroupNamePortsCidrs.java | 5 ++---
.../src/main/java/org/jclouds/cloudwatch/domain/Alarm.java | 2 +-
.../org/jclouds/cloudwatch/domain/AlarmHistoryItem.java | 2 +-
.../main/java/org/jclouds/cloudwatch/domain/Datapoint.java | 3 +--
.../main/java/org/jclouds/cloudwatch/domain/Dimension.java | 3 +--
.../cloudwatch/domain/GetMetricStatisticsResponse.java | 3 +--
.../org/jclouds/cloudwatch/domain/ListMetricsResponse.java | 3 +--
.../src/main/java/org/jclouds/cloudwatch/domain/Metric.java | 3 +--
.../java/org/jclouds/cloudwatch/domain/MetricDatum.java | 5 ++---
.../ec2/compute/domain/PasswordDataAndPrivateKey.java | 3 +--
.../java/org/jclouds/ec2/compute/domain/RegionAndName.java | 5 ++---
.../org/jclouds/ec2/compute/options/EC2TemplateOptions.java | 2 +-
.../src/main/java/org/jclouds/ec2/domain/PasswordData.java | 3 +--
.../src/main/java/org/jclouds/ec2/domain/Reservation.java | 3 +--
.../main/java/org/jclouds/ec2/domain/RunningInstance.java | 5 ++---
.../src/main/java/org/jclouds/ec2/domain/SecurityGroup.java | 5 ++---
apis/ec2/src/main/java/org/jclouds/ec2/domain/Subnet.java | 5 ++---
apis/ec2/src/main/java/org/jclouds/ec2/domain/Tag.java | 5 ++---
.../org/jclouds/elasticstack/domain/WellKnownImage.java | 5 ++---
.../org/jclouds/openstack/cinder/v1/domain/Snapshot.java | 5 ++---
.../java/org/jclouds/openstack/cinder/v1/domain/Volume.java | 5 ++---
.../openstack/cinder/v1/domain/VolumeAttachment.java | 5 ++---
.../org/jclouds/openstack/cinder/v1/domain/VolumeQuota.java | 5 ++---
.../org/jclouds/openstack/cinder/v1/domain/VolumeType.java | 5 ++---
.../openstack/cinder/v1/options/CreateSnapshotOptions.java | 4 ++--
.../openstack/cinder/v1/options/CreateVolumeOptions.java | 4 ++--
.../org/jclouds/openstack/keystone/v2_0/domain/Access.java | 5 ++---
.../keystone/v2_0/domain/ApiAccessKeyCredentials.java | 5 ++---
.../jclouds/openstack/keystone/v2_0/domain/ApiMetadata.java | 2 +-
.../jclouds/openstack/keystone/v2_0/domain/Endpoint.java | 5 ++---
.../jclouds/openstack/keystone/v2_0/domain/MediaType.java | 5 ++---
.../openstack/keystone/v2_0/domain/PasswordCredentials.java | 5 ++---
.../org/jclouds/openstack/keystone/v2_0/domain/Role.java | 5 ++---
.../org/jclouds/openstack/keystone/v2_0/domain/Service.java | 5 ++---
.../org/jclouds/openstack/keystone/v2_0/domain/Tenant.java | 5 ++---
.../org/jclouds/openstack/keystone/v2_0/domain/Token.java | 5 ++---
.../org/jclouds/openstack/keystone/v2_0/domain/User.java | 5 ++---
.../keystone/v2_0/options/CreateTenantOptions.java | 5 ++---
.../openstack/keystone/v2_0/options/CreateUserOptions.java | 5 ++---
.../keystone/v2_0/options/UpdateTenantOptions.java | 5 ++---
.../openstack/keystone/v2_0/options/UpdateUserOptions.java | 5 ++---
.../java/org/jclouds/openstack/v2_0/domain/Extension.java | 2 +-
.../main/java/org/jclouds/openstack/v2_0/domain/Limit.java | 2 +-
.../main/java/org/jclouds/openstack/v2_0/domain/Limits.java | 2 +-
.../main/java/org/jclouds/openstack/v2_0/domain/Link.java | 5 ++---
.../java/org/jclouds/openstack/v2_0/domain/RateLimit.java | 2 +-
.../java/org/jclouds/openstack/v2_0/domain/Resource.java | 5 ++---
.../openstack/v2_0/internal/BaseOpenStackMockTest.java | 4 ++--
.../nova/v2_0/compute/NovaComputeServiceAdapter.java | 4 ++--
.../compute/functions/AllocateAndAddFloatingIpToNode.java | 4 ++--
.../nova/v2_0/compute/functions/ImageInRegionToImage.java | 4 ++--
.../nova/v2_0/compute/functions/ImageToOperatingSystem.java | 4 ++--
.../functions/RemoveFloatingIpFromNodeAndDeallocate.java | 4 ++--
.../nova/v2_0/compute/options/NovaTemplateOptions.java | 2 +-
.../org/jclouds/openstack/nova/v2_0/domain/Address.java | 5 ++---
.../openstack/nova/v2_0/domain/BlockDeviceMapping.java | 5 ++---
.../org/jclouds/openstack/nova/v2_0/domain/Console.java | 4 ++--
.../java/org/jclouds/openstack/nova/v2_0/domain/Flavor.java | 2 +-
.../org/jclouds/openstack/nova/v2_0/domain/FloatingIP.java | 5 ++---
.../jclouds/openstack/nova/v2_0/domain/FloatingIPPool.java | 4 ++--
.../java/org/jclouds/openstack/nova/v2_0/domain/Host.java | 5 ++---
.../jclouds/openstack/nova/v2_0/domain/HostAggregate.java | 5 ++---
.../openstack/nova/v2_0/domain/HostResourceUsage.java | 5 ++---
.../java/org/jclouds/openstack/nova/v2_0/domain/Image.java | 2 +-
.../org/jclouds/openstack/nova/v2_0/domain/Ingress.java | 5 ++---
.../org/jclouds/openstack/nova/v2_0/domain/KeyPair.java | 5 ++---
.../org/jclouds/openstack/nova/v2_0/domain/Network.java | 9 ++++-----
.../java/org/jclouds/openstack/nova/v2_0/domain/Quota.java | 5 ++---
.../jclouds/openstack/nova/v2_0/domain/SecurityGroup.java | 5 ++---
.../openstack/nova/v2_0/domain/SecurityGroupRule.java | 2 +-
.../java/org/jclouds/openstack/nova/v2_0/domain/Server.java | 2 +-
.../jclouds/openstack/nova/v2_0/domain/ServerCreated.java | 2 +-
.../nova/v2_0/domain/ServerExtendedAttributes.java | 5 ++---
.../openstack/nova/v2_0/domain/ServerExtendedStatus.java | 5 ++---
.../nova/v2_0/domain/ServerWithSecurityGroups.java | 2 +-
.../openstack/nova/v2_0/domain/SimpleServerUsage.java | 5 ++---
.../openstack/nova/v2_0/domain/SimpleTenantUsage.java | 5 ++---
.../jclouds/openstack/nova/v2_0/domain/TenantIdAndName.java | 5 ++---
.../openstack/nova/v2_0/domain/VirtualInterface.java | 5 ++---
.../java/org/jclouds/openstack/nova/v2_0/domain/Volume.java | 5 ++---
.../openstack/nova/v2_0/domain/VolumeAttachment.java | 5 ++---
.../jclouds/openstack/nova/v2_0/domain/VolumeSnapshot.java | 5 ++---
.../org/jclouds/openstack/nova/v2_0/domain/VolumeType.java | 5 ++---
.../nova/v2_0/domain/regionscoped/FlavorInRegion.java | 2 +-
.../nova/v2_0/domain/regionscoped/ImageInRegion.java | 2 +-
.../nova/v2_0/domain/regionscoped/RegionAndId.java | 5 ++---
.../nova/v2_0/domain/regionscoped/RegionAndName.java | 6 ++----
.../regionscoped/RegionSecurityGroupNameAndPorts.java | 2 +-
.../v2_0/domain/regionscoped/SecurityGroupInRegion.java | 2 +-
.../nova/v2_0/domain/regionscoped/ServerInRegion.java | 2 +-
.../nova/v2_0/domain/zonescoped/AvailabilityZone.java | 9 ++++-----
.../nova/v2_0/domain/zonescoped/RegionAndName.java | 5 ++---
.../domain/zonescoped/RegionSecurityGroupNameAndPorts.java | 2 +-
.../openstack/nova/v2_0/domain/zonescoped/ZoneState.java | 5 ++---
.../nova/v2_0/options/CreateBackupOfServerOptions.java | 4 ++--
.../openstack/nova/v2_0/options/CreateServerOptions.java | 7 +++----
.../openstack/nova/v2_0/options/CreateVolumeOptions.java | 4 ++--
.../nova/v2_0/options/CreateVolumeSnapshotOptions.java | 4 ++--
.../nova/v2_0/options/CreateVolumeTypeOptions.java | 4 ++--
.../java/org/jclouds/openstack/swift/v1/domain/Account.java | 4 ++--
.../openstack/swift/v1/domain/BulkDeleteResponse.java | 4 ++--
.../org/jclouds/openstack/swift/v1/domain/Container.java | 4 ++--
.../openstack/swift/v1/domain/ExtractArchiveResponse.java | 4 ++--
.../java/org/jclouds/openstack/swift/v1/domain/Segment.java | 4 ++--
.../org/jclouds/openstack/swift/v1/domain/SwiftObject.java | 4 ++--
.../java/org/jclouds/openstack/trove/v1/domain/Flavor.java | 5 ++---
.../org/jclouds/openstack/trove/v1/domain/Instance.java | 5 ++---
.../java/org/jclouds/openstack/trove/v1/domain/User.java | 5 ++---
.../jclouds/rackspace/clouddns/v1/domain/CreateDomain.java | 5 ++---
.../rackspace/clouddns/v1/domain/CreateSubdomain.java | 5 ++---
.../org/jclouds/rackspace/clouddns/v1/domain/Domain.java | 5 ++---
.../jclouds/rackspace/clouddns/v1/domain/DomainChange.java | 7 +++----
.../java/org/jclouds/rackspace/clouddns/v1/domain/Job.java | 2 +-
.../org/jclouds/rackspace/clouddns/v1/domain/Record.java | 4 ++--
.../jclouds/rackspace/clouddns/v1/domain/RecordDetail.java | 4 ++--
.../org/jclouds/rackspace/clouddns/v1/domain/Subdomain.java | 3 +--
.../jclouds/rackspace/clouddns/v1/domain/UpdateDomain.java | 5 ++---
.../jclouds/rackspace/cloudidentity/v1_1/domain/Auth.java | 2 +-
.../rackspace/cloudidentity/v1_1/domain/Endpoint.java | 2 +-
.../jclouds/rackspace/cloudidentity/v1_1/domain/Token.java | 2 +-
.../cloudidentity/v2_0/domain/ApiKeyCredentials.java | 2 +-
.../rackspace/cloudloadbalancers/v1/domain/AccessRule.java | 5 ++---
.../cloudloadbalancers/v1/domain/AccessRuleWithId.java | 5 ++---
.../cloudloadbalancers/v1/domain/AccountUsage.java | 3 +--
.../rackspace/cloudloadbalancers/v1/domain/AddNode.java | 5 ++---
.../cloudloadbalancers/v1/domain/ConnectionThrottle.java | 5 ++---
.../cloudloadbalancers/v1/domain/CreateLoadBalancer.java | 6 +++---
.../cloudloadbalancers/v1/domain/HealthMonitor.java | 5 ++---
.../cloudloadbalancers/v1/domain/HistoricalUsage.java | 3 +--
.../cloudloadbalancers/v1/domain/LoadBalancer.java | 5 ++---
.../cloudloadbalancers/v1/domain/LoadBalancerInfo.java | 3 +--
.../cloudloadbalancers/v1/domain/LoadBalancerStats.java | 4 ++--
.../cloudloadbalancers/v1/domain/LoadBalancerUsage.java | 3 +--
.../rackspace/cloudloadbalancers/v1/domain/Node.java | 5 ++---
.../rackspace/cloudloadbalancers/v1/domain/Protocol.java | 3 +--
.../cloudloadbalancers/v1/domain/SSLTermination.java | 5 ++---
.../cloudloadbalancers/v1/domain/SourceAddresses.java | 5 ++---
.../cloudloadbalancers/v1/domain/UpdateLoadBalancer.java | 5 ++---
.../rackspace/cloudloadbalancers/v1/domain/UpdateNode.java | 5 ++---
.../rackspace/cloudloadbalancers/v1/domain/VirtualIP.java | 5 ++---
.../cloudloadbalancers/v1/domain/VirtualIPWithId.java | 5 ++---
.../v1/domain/internal/BaseLoadBalancer.java | 5 ++---
.../cloudloadbalancers/v1/domain/internal/BaseNode.java | 6 +++---
.../src/main/java/org/jclouds/route53/domain/Change.java | 2 +-
.../main/java/org/jclouds/route53/domain/ChangeBatch.java | 2 +-
.../main/java/org/jclouds/route53/domain/HostedZone.java | 2 +-
.../jclouds/route53/domain/HostedZoneAndNameServers.java | 2 +-
.../main/java/org/jclouds/route53/domain/NewHostedZone.java | 2 +-
.../java/org/jclouds/route53/domain/ResourceRecordSet.java | 4 ++--
.../jclouds/route53/domain/ResourceRecordSetIterable.java | 2 +-
apis/s3/src/test/java/org/jclouds/s3/S3ClientMockTest.java | 4 ++--
.../blobstore/functions/BucketsToStorageMetadataTest.java | 4 ++--
apis/sqs/src/main/java/org/jclouds/sqs/SQS.java | 4 ++--
.../src/main/java/org/jclouds/sqs/domain/BatchError.java | 3 +--
.../src/main/java/org/jclouds/sqs/domain/BatchResult.java | 3 +--
apis/sqs/src/main/java/org/jclouds/sqs/domain/Message.java | 3 +--
.../main/java/org/jclouds/sqs/domain/MessageIdAndMD5.java | 3 +--
.../main/java/org/jclouds/sqs/domain/QueueAttributes.java | 3 +--
.../java/org/jclouds/sqs/options/CreateQueueOptions.java | 3 +--
.../java/org/jclouds/sqs/options/ReceiveMessageOptions.java | 3 +--
.../java/org/jclouds/sqs/options/SendMessageOptions.java | 3 +--
.../org/jclouds/sqs/features/PermissionApiLiveTest.java | 4 ++--
.../java/org/jclouds/aws/domain/SessionCredentials.java | 3 +--
apis/sts/src/main/java/org/jclouds/sts/domain/User.java | 3 +--
.../org/jclouds/sts/domain/UserAndSessionCredentials.java | 3 +--
.../java/org/jclouds/sts/options/AssumeRoleOptions.java | 3 +--
.../java/org/jclouds/sts/options/FederatedUserOptions.java | 3 +--
.../org/jclouds/sts/options/SessionCredentialsOptions.java | 3 +--
.../org/jclouds/openstack/swift/domain/AccountMetadata.java | 5 ++---
.../jclouds/openstack/swift/domain/ContainerMetadata.java | 5 ++---
.../openstack/swift/domain/internal/ObjectInfoImpl.java | 5 ++---
.../internal/SequentialMultipartUploadStrategyMockTest.java | 4 ++--
.../vcloud/compute/options/VCloudTemplateOptions.java | 2 +-
.../java/org/jclouds/vcloud/config/VCloudHttpApiModule.java | 4 ++--
.../jclouds/vcloud/domain/internal/ReferenceTypeImpl.java | 5 ++---
.../java/org/jclouds/vcloud/domain/internal/TaskImpl.java | 4 ++--
.../java/org/jclouds/vcloud/domain/network/DhcpService.java | 3 +--
.../java/org/jclouds/vcloud/domain/network/Features.java | 3 +--
.../org/jclouds/vcloud/domain/network/FirewallService.java | 5 ++---
.../java/org/jclouds/vcloud/domain/network/IpRange.java | 3 +--
.../java/org/jclouds/vcloud/domain/network/IpScope.java | 5 ++---
.../java/org/jclouds/vcloud/domain/network/NatService.java | 5 ++---
.../vcloud/domain/network/firewall/FirewallProtocols.java | 3 +--
.../vcloud/domain/network/firewall/FirewallRule.java | 3 +--
.../vcloud/domain/network/internal/OrgNetworkImpl.java | 5 ++---
.../vcloud/domain/network/nat/rules/OneToOneVmRule.java | 3 +--
.../vcloud/domain/network/nat/rules/PortForwardingRule.java | 3 +--
.../org/jclouds/vcloud/domain/network/nat/rules/VmRule.java | 3 +--
.../vcloud/options/InstantiateVAppTemplateOptions.java | 5 ++---
.../jclouds/openstack/domain/AuthenticationResponse.java | 3 +--
.../src/main/java/org/jclouds/openstack/domain/Link.java | 2 +-
.../main/java/org/jclouds/openstack/domain/Resource.java | 5 ++---
.../org/jclouds/openstack/keystone/v1_1/domain/Auth.java | 2 +-
.../jclouds/openstack/keystone/v1_1/domain/Endpoint.java | 2 +-
.../org/jclouds/openstack/keystone/v1_1/domain/Token.java | 2 +-
.../BlockUntilInitScriptStatusIsZeroThenReturnOutput.java | 3 +--
.../jclouds/compute/callables/RunScriptOnNodeUsingSsh.java | 4 ++--
.../org/jclouds/compute/callables/SudoAwareInitManager.java | 4 ++--
.../compute/config/ComputeServiceAdapterContextModule.java | 2 +-
.../java/org/jclouds/compute/domain/CIMOperatingSystem.java | 2 +-
.../main/java/org/jclouds/compute/domain/ExecResponse.java | 3 +--
.../java/org/jclouds/compute/domain/OperatingSystem.java | 5 ++---
.../src/main/java/org/jclouds/compute/domain/Processor.java | 5 ++---
.../main/java/org/jclouds/compute/domain/SecurityGroup.java | 2 +-
.../org/jclouds/compute/domain/TemplateBuilderSpec.java | 2 +-
.../compute/domain/internal/ComputeMetadataImpl.java | 5 ++---
.../org/jclouds/compute/domain/internal/HardwareImpl.java | 2 +-
.../java/org/jclouds/compute/domain/internal/ImageImpl.java | 2 +-
.../jclouds/compute/domain/internal/NodeMetadataImpl.java | 2 +-
.../compute/domain/internal/TemplateBuilderImpl.java | 6 +++---
.../org/jclouds/compute/domain/internal/TemplateImpl.java | 5 ++---
.../org/jclouds/compute/domain/internal/VolumeImpl.java | 5 ++---
.../java/org/jclouds/compute/events/StatementOnNode.java | 5 ++---
.../jclouds/compute/events/StatementOnNodeCompletion.java | 2 +-
.../org/jclouds/compute/events/StatementOnNodeFailure.java | 2 +-
.../java/org/jclouds/compute/options/RunScriptOptions.java | 5 ++---
.../java/org/jclouds/compute/options/TemplateOptions.java | 2 +-
.../strategy/InitializeRunScriptOnNodeOrPlaceInBadMap.java | 4 ++--
...ScriptOnNodeAndAddToGoodMapOrPutExceptionIntoBadMap.java | 4 ++--
.../CreateNodesWithGroupEncodedIntoNameThenAddToSet.java | 2 +-
.../strategy/impl/ReturnCredentialsBoundToImage.java | 4 ++--
.../src/main/java/org/jclouds/net/domain/IpPermission.java | 5 ++---
...lockUntilInitScriptStatusIsZeroThenReturnOutputTest.java | 8 ++++----
...OnNodeAsInitScriptUsingSshAndBlockUntilCompleteTest.java | 4 ++--
core/src/main/java/org/jclouds/ContextBuilder.java | 6 +++---
.../java/org/jclouds/apis/internal/BaseApiMetadata.java | 5 ++---
.../java/org/jclouds/collect/AdvanceUntilEmptyIterable.java | 3 +--
core/src/main/java/org/jclouds/collect/PagedIterables.java | 3 +--
.../main/java/org/jclouds/domain/internal/LocationImpl.java | 5 ++---
.../org/jclouds/domain/internal/ResourceMetadataImpl.java | 5 ++---
core/src/main/java/org/jclouds/http/HttpMessage.java | 5 ++---
core/src/main/java/org/jclouds/http/HttpRequest.java | 5 ++---
core/src/main/java/org/jclouds/http/HttpResponse.java | 5 ++---
.../org/jclouds/http/options/BaseHttpRequestOptions.java | 4 ++--
core/src/main/java/org/jclouds/internal/BaseView.java | 5 ++---
core/src/main/java/org/jclouds/internal/ContextImpl.java | 2 +-
...alizationConstructorAndReflectiveTypeAdapterFactory.java | 3 +--
.../json/internal/NullFilteringTypeAdapterFactories.java | 2 +-
.../java/org/jclouds/lifecycle/config/LifeCycleModule.java | 4 ++--
.../jclouds/providers/internal/BaseProviderMetadata.java | 5 ++---
.../java/org/jclouds/proxy/internal/GuiceProxyConfig.java | 4 ++--
.../main/java/org/jclouds/reflect/InvocationSuccess.java | 5 ++---
core/src/main/java/org/jclouds/reflect/Reflection2.java | 5 ++---
.../java/org/jclouds/rest/internal/BaseHttpApiMetadata.java | 2 +-
.../rest/internal/DelegatesToInvocationFunction.java | 4 ++--
.../java/org/jclouds/rest/internal/InvokeHttpMethod.java | 5 ++---
.../org/jclouds/rest/internal/RestAnnotationProcessor.java | 4 ++--
...etryOnTimeOutButNotOnAuthorizationExceptionSupplier.java | 6 +++---
.../org/jclouds/rest/suppliers/URIFromStringSupplier.java | 4 ++--
core/src/main/java/org/jclouds/util/Suppliers2.java | 6 +++---
.../java/org/jclouds/concurrent/FutureIterablesTest.java | 6 +++---
.../org/jclouds/rest/internal/BaseRestApiExpectTest.java | 4 ++--
.../java/org/jclouds/rest/internal/BaseRestApiTest.java | 4 ++--
.../gae/config/GoogleAppEngineConfigurationModule.java | 5 ++---
.../main/java/org/jclouds/ssh/jsch/SessionConnection.java | 3 +--
.../src/main/java/org/jclouds/sshj/SSHClientConnection.java | 3 +--
.../org/jclouds/aws/ec2/compute/AWSEC2TemplateOptions.java | 2 +-
.../java/org/jclouds/aws/ec2/domain/AWSRunningInstance.java | 4 ++--
.../org/jclouds/aws/ec2/domain/LaunchSpecification.java | 2 +-
.../main/java/org/jclouds/aws/s3/domain/DeleteResult.java | 5 ++---
.../internal/SequentialMultipartUploadStrategyMockTest.java | 4 ++--
.../org/jclouds/dynect/v3/domain/CreatePrimaryZone.java | 2 +-
.../java/org/jclouds/dynect/v3/domain/CreateRecord.java | 2 +-
.../java/org/jclouds/dynect/v3/domain/GeoRegionGroup.java | 2 +-
.../main/java/org/jclouds/dynect/v3/domain/GeoService.java | 2 +-
.../src/main/java/org/jclouds/dynect/v3/domain/Job.java | 2 +-
.../src/main/java/org/jclouds/dynect/v3/domain/Node.java | 3 +--
.../src/main/java/org/jclouds/dynect/v3/domain/Record.java | 2 +-
.../main/java/org/jclouds/dynect/v3/domain/RecordId.java | 4 ++--
.../main/java/org/jclouds/dynect/v3/domain/RecordSet.java | 2 +-
.../main/java/org/jclouds/dynect/v3/domain/SOARecord.java | 2 +-
.../src/main/java/org/jclouds/dynect/v3/domain/Session.java | 3 +--
.../org/jclouds/dynect/v3/domain/SessionCredentials.java | 3 +--
.../src/main/java/org/jclouds/dynect/v3/domain/Zone.java | 2 +-
.../test/java/org/jclouds/dynect/v3/DynectApiMockTest.java | 4 ++--
.../glesys/compute/options/GleSYSTemplateOptions.java | 2 +-
.../java/org/jclouds/glesys/domain/AllowedArguments.java | 5 ++---
.../glesys/domain/AllowedArgumentsForCreateServer.java | 5 ++---
.../src/main/java/org/jclouds/glesys/domain/Archive.java | 5 ++---
.../org/jclouds/glesys/domain/ArchiveAllowedArguments.java | 5 ++---
.../src/main/java/org/jclouds/glesys/domain/Console.java | 5 ++---
.../src/main/java/org/jclouds/glesys/domain/Cost.java | 5 ++---
.../src/main/java/org/jclouds/glesys/domain/Domain.java | 5 ++---
.../main/java/org/jclouds/glesys/domain/DomainRecord.java | 5 ++---
.../main/java/org/jclouds/glesys/domain/EmailAccount.java | 5 ++---
.../src/main/java/org/jclouds/glesys/domain/EmailAlias.java | 5 ++---
.../main/java/org/jclouds/glesys/domain/EmailOverview.java | 5 ++---
.../java/org/jclouds/glesys/domain/EmailOverviewDomain.java | 5 ++---
.../org/jclouds/glesys/domain/EmailOverviewSummary.java | 5 ++---
.../src/main/java/org/jclouds/glesys/domain/EmailQuota.java | 5 ++---
.../glesys/src/main/java/org/jclouds/glesys/domain/Ip.java | 5 ++---
.../src/main/java/org/jclouds/glesys/domain/IpDetails.java | 5 ++---
.../src/main/java/org/jclouds/glesys/domain/OSTemplate.java | 5 ++---
.../main/java/org/jclouds/glesys/domain/ResourceStatus.java | 5 ++---
.../main/java/org/jclouds/glesys/domain/ResourceUsage.java | 5 ++---
.../java/org/jclouds/glesys/domain/ResourceUsageInfo.java | 5 ++---
.../java/org/jclouds/glesys/domain/ResourceUsageValue.java | 5 ++---
.../src/main/java/org/jclouds/glesys/domain/Server.java | 5 ++---
.../main/java/org/jclouds/glesys/domain/ServerDetails.java | 2 +-
.../main/java/org/jclouds/glesys/domain/ServerLimit.java | 5 ++---
.../src/main/java/org/jclouds/glesys/domain/ServerSpec.java | 5 ++---
.../main/java/org/jclouds/glesys/domain/ServerStatus.java | 5 ++---
.../main/java/org/jclouds/glesys/domain/ServerUptime.java | 5 ++---
.../org/jclouds/glesys/options/CreateServerOptions.java | 2 +-
.../main/java/org/jclouds/gogrid/domain/BillingToken.java | 5 ++---
.../src/main/java/org/jclouds/gogrid/domain/Customer.java | 5 ++---
.../gogrid/src/main/java/org/jclouds/gogrid/domain/Ip.java | 5 ++---
.../src/main/java/org/jclouds/gogrid/domain/IpPortPair.java | 5 ++---
.../gogrid/src/main/java/org/jclouds/gogrid/domain/Job.java | 5 ++---
.../main/java/org/jclouds/gogrid/domain/JobProperties.java | 5 ++---
.../main/java/org/jclouds/gogrid/domain/LoadBalancer.java | 5 ++---
.../src/main/java/org/jclouds/gogrid/domain/Option.java | 5 ++---
.../src/main/java/org/jclouds/gogrid/domain/Server.java | 5 ++---
.../main/java/org/jclouds/gogrid/domain/ServerImage.java | 5 ++---
.../org/jclouds/gogrid/domain/internal/ErrorResponse.java | 5 ++---
.../jclouds/hpcloud/objectstorage/domain/CDNContainer.java | 5 ++---
.../internal/BaseHPCloudObjectStorageMockTest.java | 4 ++--
.../src/main/java/org/jclouds/softlayer/domain/Address.java | 3 +--
.../domain/ContainerVirtualGuestConfiguration.java | 3 +--
.../domain/ContainerVirtualGuestConfigurationOption.java | 3 +--
.../main/java/org/jclouds/softlayer/domain/Datacenter.java | 3 +--
.../java/org/jclouds/softlayer/domain/OperatingSystem.java | 3 +--
.../main/java/org/jclouds/softlayer/domain/Password.java | 3 +--
.../main/java/org/jclouds/softlayer/domain/PowerState.java | 5 ++---
.../main/java/org/jclouds/softlayer/domain/ProductItem.java | 3 +--
.../java/org/jclouds/softlayer/domain/ProductItemPrice.java | 3 +--
.../src/main/java/org/jclouds/softlayer/domain/Region.java | 3 +--
.../org/jclouds/softlayer/domain/SoftwareDescription.java | 3 +--
.../java/org/jclouds/softlayer/domain/SoftwareLicense.java | 3 +--
.../src/main/java/org/jclouds/softlayer/domain/Tag.java | 3 +--
.../java/org/jclouds/softlayer/domain/TagReference.java | 3 +--
.../src/main/java/org/jclouds/softlayer/domain/TagType.java | 3 +--
.../java/org/jclouds/softlayer/domain/VirtualDiskImage.java | 3 +--
.../jclouds/softlayer/domain/VirtualDiskImageSoftware.java | 3 +--
.../jclouds/softlayer/domain/VirtualGuestBlockDevice.java | 3 +--
.../softlayer/domain/VirtualGuestBlockDeviceTemplate.java | 3 +--
.../domain/VirtualGuestBlockDeviceTemplateGroup.java | 3 +--
.../softlayer/domain/VirtualGuestNetworkComponent.java | 3 +--
.../org/jclouds/ultradns/ws/domain/AccountLevelGroup.java | 3 +--
.../org/jclouds/ultradns/ws/domain/DirectionalGroup.java | 2 +-
.../ultradns/ws/domain/DirectionalGroupCoordinates.java | 2 +-
.../org/jclouds/ultradns/ws/domain/DirectionalPool.java | 3 +--
.../jclouds/ultradns/ws/domain/DirectionalPoolRecord.java | 2 +-
.../ultradns/ws/domain/DirectionalPoolRecordDetail.java | 2 +-
.../main/java/org/jclouds/ultradns/ws/domain/IdAndName.java | 3 +--
.../java/org/jclouds/ultradns/ws/domain/PoolRecordSpec.java | 2 +-
.../java/org/jclouds/ultradns/ws/domain/ResourceRecord.java | 2 +-
.../jclouds/ultradns/ws/domain/ResourceRecordDetail.java | 2 +-
.../java/org/jclouds/ultradns/ws/domain/RoundRobinPool.java | 3 +--
.../src/main/java/org/jclouds/ultradns/ws/domain/Task.java | 3 +--
.../jclouds/ultradns/ws/domain/TrafficControllerPool.java | 3 +--
.../ultradns/ws/domain/TrafficControllerPoolRecord.java | 2 +-
.../ws/domain/TrafficControllerPoolRecordDetail.java | 3 +--
.../org/jclouds/ultradns/ws/domain/UpdatePoolRecord.java | 2 +-
.../src/main/java/org/jclouds/ultradns/ws/domain/Zone.java | 3 +--
.../java/org/jclouds/ultradns/ws/domain/ZoneProperties.java | 3 +--
.../src/main/java/org/jclouds/scriptbuilder/InitScript.java | 2 +-
.../org/jclouds/scriptbuilder/domain/GitRepoAndRef.java | 3 +--
.../java/org/jclouds/scriptbuilder/domain/chef/DataBag.java | 3 +--
.../java/org/jclouds/scriptbuilder/domain/chef/Role.java | 3 +--
.../jclouds/scriptbuilder/statements/git/CloneGitRepo.java | 3 +--
.../statements/login/AdminAccessBuilderSpec.java | 2 +-
.../org/jclouds/scriptbuilder/statements/login/UserAdd.java | 3 +--
.../src/main/java/org/jclouds/servermanager/Datacenter.java | 3 +--
.../src/main/java/org/jclouds/servermanager/Hardware.java | 3 +--
.../src/main/java/org/jclouds/servermanager/Image.java | 3 +--
.../src/main/java/org/jclouds/servermanager/Server.java | 3 +--
434 files changed, 728 insertions(+), 1025 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/byon/src/main/java/org/jclouds/byon/Node.java
----------------------------------------------------------------------
diff --git a/apis/byon/src/main/java/org/jclouds/byon/Node.java b/apis/byon/src/main/java/org/jclouds/byon/Node.java
index 61bf0b3..814b854 100644
--- a/apis/byon/src/main/java/org/jclouds/byon/Node.java
+++ b/apis/byon/src/main/java/org/jclouds/byon/Node.java
@@ -20,7 +20,6 @@ import java.net.URI;
import java.util.Map;
import java.util.Set;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
@@ -300,7 +299,7 @@ public class Node {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).add("id", id).add("name", name).add("description", description)
+ return Objects.toStringHelper(this).add("id", id).add("name", name).add("description", description)
.add("locationId", locationId).add("hostname", hostname).add("osArch", osArch).add("osFamily", osFamily)
.add("osDescription", osDescription).add("osVersion", osVersion).add("os64Bit", os64Bit)
.add("group", group).add("loginPort", loginPort).add("tags", tags).add("metadata", metadata)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/AbsoluteLimit.java
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/AbsoluteLimit.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/AbsoluteLimit.java
index 638a209..286b2c3 100644
--- a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/AbsoluteLimit.java
+++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/AbsoluteLimit.java
@@ -20,9 +20,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Class AbsoluteLimit
@@ -112,7 +111,7 @@ public class AbsoluteLimit {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("name", name).add("value", value);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Addresses.java
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Addresses.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Addresses.java
index 1ddbbfd..a308f67 100644
--- a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Addresses.java
+++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Addresses.java
@@ -26,9 +26,8 @@ import javax.inject.Named;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
@@ -131,7 +130,7 @@ public class Addresses {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("publicAddresses", publicAddresses).add("privateAddresses", privateAddresses);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/BackupSchedule.java
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/BackupSchedule.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/BackupSchedule.java
index ea8f73f..dc46e3a 100644
--- a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/BackupSchedule.java
+++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/BackupSchedule.java
@@ -20,9 +20,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* A backup schedule can be defined to create server images at regular intervals (daily and weekly).
@@ -132,7 +131,7 @@ public class BackupSchedule {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("daily", daily).add("enabled", enabled).add("weekly", weekly);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Flavor.java
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Flavor.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Flavor.java
index fe24514..4edc77f 100644
--- a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Flavor.java
+++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Flavor.java
@@ -22,9 +22,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* A flavor is an available hardware configuration for a server. Each flavor has a unique
@@ -151,7 +150,7 @@ public class Flavor {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("name", name).add("disk", disk).add("ram", ram);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Image.java
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Image.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Image.java
index 01ed54a..61c8397 100644
--- a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Image.java
+++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Image.java
@@ -23,9 +23,8 @@ import java.util.Date;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* An image is a collection of files used to create or rebuild a server. Rackspace provides a number
@@ -208,7 +207,7 @@ public class Image {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("created", created).add("id", id).add("name", name).add("progress", progress).add("serverId", serverId).add("status", status).add("updated", updated);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Limits.java
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Limits.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Limits.java
index 6b72a5c..1b085c8 100644
--- a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Limits.java
+++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Limits.java
@@ -22,9 +22,8 @@ import java.beans.ConstructorProperties;
import java.util.Map;
import java.util.Set;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
@@ -119,7 +118,7 @@ public class Limits {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("rate", rate).add("absolute", absolute);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/RateLimit.java
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/RateLimit.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/RateLimit.java
index ad012bb..b56f623 100644
--- a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/RateLimit.java
+++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/RateLimit.java
@@ -22,9 +22,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* RateLimit.
@@ -214,7 +213,7 @@ public class RateLimit {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("uri", uri).add("regex", regex).add("remaining", remaining).add("resetTime", resetTime).add("unit", unit).add("value", value).add("verb", verb);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Server.java
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Server.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Server.java
index 2c1dc89..6590a41 100644
--- a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Server.java
+++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Server.java
@@ -23,9 +23,8 @@ import java.util.Map;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableMap;
/**
@@ -290,7 +289,7 @@ public class Server {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("name", name).add("metadata", metadata).add("addresses", addresses).add("adminPass", adminPass).add("flavorId", flavorId).add("hostId", hostId).add("imageId", imageId).add("sharedIpGroupId", sharedIpGroupId).add("progress", progress).add("status", status);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/ShareIp.java
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/ShareIp.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/ShareIp.java
index c3a869f..9c18f29 100644
--- a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/ShareIp.java
+++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/ShareIp.java
@@ -18,9 +18,8 @@ package org.jclouds.cloudservers.domain;
import java.beans.ConstructorProperties;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Class ShareIp
@@ -109,7 +108,7 @@ public class ShareIp {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("configureServer", configureServer).add("sharedIpGroupId", sharedIpGroupId);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/SharedIpGroup.java
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/SharedIpGroup.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/SharedIpGroup.java
index d658c50..62354e3 100644
--- a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/SharedIpGroup.java
+++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/SharedIpGroup.java
@@ -23,9 +23,8 @@ import java.util.List;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableList;
/**
@@ -141,7 +140,7 @@ public class SharedIpGroup {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("name", name).add("servers", servers);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Version.java
----------------------------------------------------------------------
diff --git a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Version.java b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Version.java
index 9a569ca..753f0eb 100644
--- a/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Version.java
+++ b/apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Version.java
@@ -22,9 +22,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Class Version
@@ -148,7 +147,7 @@ public class Version {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("docURL", docURL).add("id", id).add("status", status).add("wadl", wadl);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/config/CloudStackComputeServiceContextModule.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/config/CloudStackComputeServiceContextModule.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/config/CloudStackComputeServiceContextModule.java
index b2c02ad..572e7ec 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/config/CloudStackComputeServiceContextModule.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/config/CloudStackComputeServiceContextModule.java
@@ -88,7 +88,7 @@ import org.jclouds.rest.AuthorizationException;
import org.jclouds.rest.suppliers.MemoizedRetryOnTimeOutButNotOnAuthorizationExceptionSupplier;
import com.google.common.base.Function;
-import com.google.common.base.MoreObjects;
+import com.google.common.base.Objects;
import com.google.common.base.Optional;
import com.google.common.base.Predicate;
import com.google.common.base.Supplier;
@@ -179,7 +179,7 @@ public class CloudStackComputeServiceContextModule extends
}
@Override
public String toString() {
- return MoreObjects.toStringHelper(client.getGuestOSApi()).add("method", "listOSCategories").toString();
+ return Objects.toStringHelper(client.getGuestOSApi()).add("method", "listOSCategories").toString();
}
}, seconds, TimeUnit.SECONDS);
}
@@ -204,7 +204,7 @@ public class CloudStackComputeServiceContextModule extends
}
@Override
public String toString() {
- return MoreObjects.toStringHelper(client.getGuestOSApi()).add("method", "listOSTypes").toString();
+ return Objects.toStringHelper(client.getGuestOSApi()).add("method", "listOSTypes").toString();
}
}, seconds, TimeUnit.SECONDS);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Account.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Account.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Account.java
index 8dad3a9..761003d 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Account.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Account.java
@@ -26,9 +26,8 @@ import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.CaseFormat;
import com.google.common.base.Function;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ForwardingSet;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
@@ -777,7 +776,7 @@ public class Account extends ForwardingSet<User> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("type", type).add("networkDomain", networkDomain).add("domain", domain).add("domainId", domainId).add("IPsAvailable", IPsAvailable).add("IPLimit", IPLimit).add("IPs", IPs).add("cleanupRequired", cleanupRequired).add("name", name).add("receivedBytes", receivedBytes).add("sentBytes", sentBytes).add("snapshotsAvailable", snapshotsAvailable).add("snapshotLimit", snapshotLimit).add("snapshots", snapshots).add("state", state).add("templatesAvailable", templatesAvailable).add("templateLimit", templateLimit).add("templates", templates).add("VMsAvailable", VMsAvailable).add("VMLimit", VMLimit).add("VMsRunning", VMsRunning).add("VMsStopped", VMsStopped).add("VMs", VMs).add("volumesAvailable", volumesAvailable).add("volumeLimit", volumeLimit).add("volumes", volumes).add("users", users);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Alert.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Alert.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Alert.java
index e46ec15..70ba897 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Alert.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Alert.java
@@ -23,9 +23,8 @@ import java.util.Date;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Represents an alert issued by Cloudstack
@@ -151,7 +150,7 @@ public class Alert {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("description", description).add("sent", sent).add("type", type);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ApiKeyPair.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ApiKeyPair.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ApiKeyPair.java
index 4acfa0c..17883a7 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ApiKeyPair.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ApiKeyPair.java
@@ -20,9 +20,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Representation of the API keypair response
@@ -113,7 +112,7 @@ public class ApiKeyPair {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("apiKey", apiKey).add("secretKey", secretKey);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncCreateResponse.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncCreateResponse.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncCreateResponse.java
index 8db03f7..0df0546 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncCreateResponse.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncCreateResponse.java
@@ -20,9 +20,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Class AsyncCreateResponse
@@ -120,7 +119,7 @@ public class AsyncCreateResponse {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("jobId", jobId);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncJob.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncJob.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncJob.java
index 229d7ef..b82665c 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncJob.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncJob.java
@@ -23,9 +23,8 @@ import java.util.Date;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Class AsyncJob
@@ -442,7 +441,7 @@ public class AsyncJob<S> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("accountId", accountId).add("cmd", cmd).add("created", created).add("id", id).add("instanceId", instanceId)
.add("instanceType", instanceType).add("progress", progress).add("result", result).add("resultCode", resultCode)
.add("resultType", resultType).add("status", status).add("userId", userId).add("error", error);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncJobError.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncJobError.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncJobError.java
index 15c4399..1805ec8 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncJobError.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncJobError.java
@@ -20,9 +20,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
public class AsyncJobError {
@@ -150,7 +149,7 @@ public class AsyncJobError {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("errorCode", errorCode).add("errorText", errorText);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Capabilities.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Capabilities.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Capabilities.java
index e6e7e79..faabfc1 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Capabilities.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Capabilities.java
@@ -20,9 +20,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Class Capabilities
@@ -176,7 +175,7 @@ public class Capabilities {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("cloudStackVersion", cloudStackVersion).add("securityGroupsEnabled", securityGroupsEnabled).add("canShareTemplates", canShareTemplates).add("firewallRuleUiEnabled", firewallRuleUiEnabled).add("supportELB", supportELB);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Capacity.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Capacity.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Capacity.java
index 1e87723..fd12bef 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Capacity.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Capacity.java
@@ -24,9 +24,8 @@ import java.util.Map;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.Function;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
@@ -267,7 +266,7 @@ public class Capacity implements Comparable<Capacity> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("capacityTotal", capacityTotal).add("capacityUsed", capacityUsed).add("percentUsed", percentUsed)
.add("podId", podId).add("podName", podName).add("type", type).add("zoneId", zoneId).add("zoneName", zoneName);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Cluster.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Cluster.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Cluster.java
index a3b75fa..d53ad6f 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Cluster.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Cluster.java
@@ -24,9 +24,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Represents a CloudStack Cluster.
@@ -285,7 +284,7 @@ public class Cluster implements Comparable<Cluster> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("allocationState", allocationState).add("clusterType", clusterType).add("hypervisor", hypervisor)
.add("managedState", managedState).add("name", name).add("podId", podId).add("podName", podName).add("zoneId", zoneId).add("zoneName", zoneName);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ConfigurationEntry.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ConfigurationEntry.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ConfigurationEntry.java
index ceb0f84..a0526e3 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ConfigurationEntry.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ConfigurationEntry.java
@@ -22,9 +22,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Representation of the API configuration entry response
@@ -150,7 +149,7 @@ public class ConfigurationEntry implements Comparable<ConfigurationEntry> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("category", category).add("description", description).add("name", name).add("value", value);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/DiskOffering.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/DiskOffering.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/DiskOffering.java
index 9f9377f..452457a 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/DiskOffering.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/DiskOffering.java
@@ -24,9 +24,8 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
@@ -277,7 +276,7 @@ public class DiskOffering implements Comparable<DiskOffering> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("name", name).add("displayText", displayText).add("created", created).add("domain", domain)
.add("domainId", domainId).add("diskSize", diskSize).add("customized", customized).add("tags", tags);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Domain.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Domain.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Domain.java
index 29f0fd4..ca203b9 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Domain.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Domain.java
@@ -22,9 +22,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Representation of the API domain response
@@ -203,7 +202,7 @@ public class Domain implements Comparable<Domain> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("hasChild", hasChild).add("level", level).add("name", name).add("networkDomain", networkDomain).add("parentDomainId", parentDomainId).add("parentDomainName", parentDomainName);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/EncryptedPasswordAndPrivateKey.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/EncryptedPasswordAndPrivateKey.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/EncryptedPasswordAndPrivateKey.java
index bb81cd1..c0b4330 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/EncryptedPasswordAndPrivateKey.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/EncryptedPasswordAndPrivateKey.java
@@ -20,7 +20,6 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
public final class EncryptedPasswordAndPrivateKey {
@@ -107,7 +106,7 @@ public final class EncryptedPasswordAndPrivateKey {
@Override
public String toString() {
- return MoreObjects.toStringHelper(this).omitNullValues()
+ return Objects.toStringHelper(this).omitNullValues()
.add("encryptedPassword", encryptedPassword).add("privateKey", privateKey).toString();
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Event.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Event.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Event.java
index 87c442b..ef324b0 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Event.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Event.java
@@ -23,9 +23,8 @@ import java.util.Date;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Class Event
@@ -314,7 +313,7 @@ public class Event implements Comparable<Event> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("account", account).add("description", description).add("created", created)
.add("domain", domain).add("domainId", domainId).add("level", level).add("parentId", parentId)
.add("state", state).add("type", type).add("username", username);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/FirewallRule.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/FirewallRule.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/FirewallRule.java
index 8c604b8..144f232 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/FirewallRule.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/FirewallRule.java
@@ -24,9 +24,8 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.CaseFormat;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
@@ -342,7 +341,7 @@ public class FirewallRule implements Comparable<FirewallRule> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("CIDRs", CIDRs).add("startPort", startPort).add("endPort", endPort).add("icmpCode", icmpCode)
.add("icmpType", icmpType).add("ipAddress", ipAddress).add("ipAddressId", ipAddressId).add("protocol", protocol).add("state", state)
.add("tags", tags);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Host.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Host.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Host.java
index d80982b..f6e26f9 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Host.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Host.java
@@ -26,9 +26,8 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
@@ -931,7 +930,7 @@ public class Host implements Comparable<Host> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("allocationState", allocationState).add("averageLoad", averageLoad)
.add("capabilities", capabilities).add("clusterId", clusterId).add("clusterName", clusterName)
.add("clusterType", clusterType).add("cpuAllocated", cpuAllocated).add("cpuNumber", cpuNumber)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/IPForwardingRule.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/IPForwardingRule.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/IPForwardingRule.java
index e06888b..80c98b3 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/IPForwardingRule.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/IPForwardingRule.java
@@ -23,9 +23,8 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
@@ -403,7 +402,7 @@ public class IPForwardingRule implements Comparable<IPForwardingRule> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("IPAddress", IPAddress).add("IPAddressId", IPAddressId).add("startPort", startPort)
.add("protocol", protocol).add("endPort", endPort).add("state", state).add("virtualMachineDisplayName", virtualMachineDisplayName)
.add("virtualMachineId", virtualMachineId).add("virtualMachineName", virtualMachineName).add("publicPort", publicPort)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISO.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISO.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISO.java
index a93304a..3a4226f 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISO.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISO.java
@@ -25,9 +25,8 @@ import java.util.Set;
import com.google.common.collect.ImmutableSet;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Class ISO
@@ -777,7 +776,7 @@ public class ISO {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("account", account).add("accountId", accountId).add("bootable", bootable)
.add("checksum", checksum).add("created", created).add("crossZones", crossZones).add("displayText", displayText)
.add("domain", domain).add("domainid", domainid).add("format", format).add("hostId", hostId).add("hostName", hostName)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISOExtraction.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISOExtraction.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISOExtraction.java
index e6706e5..0e6bb63 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISOExtraction.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISOExtraction.java
@@ -23,9 +23,8 @@ import java.util.Date;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Class ISOExtraction
@@ -354,7 +353,7 @@ public class ISOExtraction {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("accountId", accountId).add("created", created).add("extractId", extractId).add("extractMode", extractMode)
.add("name", name).add("state", state).add("status", status).add("storageType", storageType).add("uploadPercentage", uploadPercentage)
.add("url", url).add("zoneId", zoneId).add("zoneName", zoneName);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISOPermissions.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISOPermissions.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISOPermissions.java
index b85e741..5a3b62e 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISOPermissions.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISOPermissions.java
@@ -23,9 +23,8 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
@@ -166,7 +165,7 @@ public class ISOPermissions {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("accounts", accounts).add("domainId", domainId).add("isPublic", isPublic);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/IngressRule.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/IngressRule.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/IngressRule.java
index df3a388..d072a46 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/IngressRule.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/IngressRule.java
@@ -21,11 +21,11 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
import java.util.Set;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
+import org.jclouds.javax.annotation.Nullable;
+
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
-import org.jclouds.javax.annotation.Nullable;
public class IngressRule implements Comparable<IngressRule> {
@@ -288,7 +288,7 @@ public class IngressRule implements Comparable<IngressRule> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("account", account).add("CIDR", CIDR).add("endPort", endPort).add("ICMPCode", ICMPCode)
.add("ICMPType", ICMPType).add("protocol", protocol).add("id", id).add("securityGroupName", securityGroupName).add("startPort", startPort)
.add("tags", tags);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/JobResult.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/JobResult.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/JobResult.java
index 7df671e..1c0b1d9 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/JobResult.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/JobResult.java
@@ -20,9 +20,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* The result of an operation.
@@ -115,7 +114,7 @@ public class JobResult {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).add("success", success).add("displayText", displayText);
+ return Objects.toStringHelper(this).add("success", success).add("displayText", displayText);
}
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/LoadBalancerRule.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/LoadBalancerRule.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/LoadBalancerRule.java
index d0e9f10..f30654f 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/LoadBalancerRule.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/LoadBalancerRule.java
@@ -24,9 +24,8 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.CaseFormat;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
@@ -432,7 +431,7 @@ public class LoadBalancerRule {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("account", account).add("algorithm", algorithm).add("description", description).add("domain", domain).add("domainId", domainId).add("name", name).add("privatePort", privatePort).add("publicIP", publicIP).add("publicIPId", publicIPId).add("publicPort", publicPort).add("state", state).add("CIDRs", CIDRs).add("zoneId", zoneId);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/LoginResponse.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/LoginResponse.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/LoginResponse.java
index 8161e63..be6aacf 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/LoginResponse.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/LoginResponse.java
@@ -20,9 +20,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Representation of the login API call response
@@ -327,7 +326,7 @@ public class LoginResponse {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("username", username).add("userId", userId).add("password", password).add("domainId", domainId).add("timeout", timeout).add("registered", registered).add("accountName", accountName).add("firstName", firstName).add("lastName", lastName).add("accountType", accountType).add("timezone", timezone).add("timezoneOffset", timezoneOffset).add("sessionKey", sessionKey).add("jSessionId", jSessionId);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NIC.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NIC.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NIC.java
index 0f8eae8..4c38e1d 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NIC.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NIC.java
@@ -23,9 +23,8 @@ import java.net.URI;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Class NIC
@@ -311,7 +310,7 @@ public class NIC {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("broadcastURI", broadcastURI).add("gateway", gateway).add("IPAddress", IPAddress)
.add("isDefault", isDefault).add("isolationURI", isolationURI).add("netmask", netmask).add("macAddress", macAddress)
.add("networkId", networkId).add("trafficType", trafficType).add("guestIPType", guestIPType);
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Network.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Network.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Network.java
index bcfd411..94f0f5b 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Network.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Network.java
@@ -25,9 +25,8 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.ImmutableSortedSet;
@@ -724,7 +723,7 @@ public class Network {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("account", account).add("broadcastDomainType", broadcastDomainType).add("broadcastURI", broadcastURI)
.add("displayText", displayText).add("DNS1", DNS1).add("DNS2", DNS2).add("domain", domain).add("domainId", domainId)
.add("endIP", endIP).add("gateway", gateway).add("isDefault", isDefault).add("isShared", isShared).add("isSystem", isSystem)
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkOffering.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkOffering.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkOffering.java
index 9937391..509fcc1 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkOffering.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkOffering.java
@@ -24,9 +24,8 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
@@ -339,7 +338,7 @@ public class NetworkOffering implements Comparable<NetworkOffering> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("id", id).add("name", name).add("displayText", displayText).add("created", created).add("availability", availability).add("maxConnections", maxConnections).add("isDefault", isDefault).add("supportsVLAN", supportsVLAN).add("trafficType", trafficType).add("guestIPType", guestIPType).add("networkRate", networkRate).add("tags", tags);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkService.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkService.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkService.java
index 800bc23..f6820da 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkService.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkService.java
@@ -24,9 +24,8 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.ImmutableSortedMap;
import com.google.common.collect.ImmutableSortedSet;
@@ -123,7 +122,7 @@ public class NetworkService implements Comparable<NetworkService> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this)
+ return Objects.toStringHelper(this)
.add("name", name).add("value", value);
}
@@ -227,7 +226,7 @@ public class NetworkService implements Comparable<NetworkService> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).add("name", name).add("capabilities", capabilities);
+ return Objects.toStringHelper(this).add("name", name).add("capabilities", capabilities);
}
@Override
http://git-wip-us.apache.org/repos/asf/jclouds/blob/3980cd79/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/OSType.java
----------------------------------------------------------------------
diff --git a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/OSType.java b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/OSType.java
index b03738f..447f4ef 100644
--- a/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/OSType.java
+++ b/apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/OSType.java
@@ -22,9 +22,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
-import com.google.common.base.MoreObjects;
-import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
+import com.google.common.base.Objects.ToStringHelper;
/**
* Class OSType
@@ -141,7 +140,7 @@ public class OSType implements Comparable<OSType> {
}
protected ToStringHelper string() {
- return MoreObjects.toStringHelper(this).add("id", id).add("OSCategoryId", OSCategoryId).add("description", description);
+ return Objects.toStringHelper(this).add("id", id).add("OSCategoryId", OSCategoryId).add("description", description);
}
@Override