Apache
/
jclouds
mirror of https://github.com/apache/jclouds.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Revert "JCLOUDS-653: Address Guava 18 deprecations" 

This reverts commit 95cfc0d950.

Many conflicts due to duration between above commit and now
This commit is contained in:
Adrian Cole 2014-10-23 20:48:35 -07:00 committed by Adrian Cole
parent f134367c69
commit 3980cd791b
434 changed files with 729 additions and 1026 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
apis/byon/src/main/java/org/jclouds/byon/Node.java
View File

@ -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)

5
apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/AbsoluteLimit.java
View File

@ -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);
}

5
apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Addresses.java
View File

@ -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);
}

5
apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/BackupSchedule.java
View File

@ -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);
}

5
apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Flavor.java
View File

@ -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);
}

5
apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Image.java
View File

@ -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);
}

5
apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Limits.java
View File

@ -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);
}

5
apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/RateLimit.java
View File

@ -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);
}

5
apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Server.java
View File

@ -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);
}

5
apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/ShareIp.java
View File

@ -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);
}

5
apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/SharedIpGroup.java
View File

@ -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);
}

5
apis/cloudservers/src/main/java/org/jclouds/cloudservers/domain/Version.java
View File

@ -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);
}

6
apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/config/CloudStackComputeServiceContextModule.java
View File

@ -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);
}

5
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Account.java
View File

@ -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);
}

5
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Alert.java
View File

@ -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);
}

5
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ApiKeyPair.java
View File

@ -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);
}

5
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncCreateResponse.java
View File

@ -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);
}

5
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncJob.java
View File

@ -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);

5
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/AsyncJobError.java
View File

@ -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);
}

5
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Capabilities.java
View File

@ -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);
}

5
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Capacity.java
View File

@ -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);
}

5
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Cluster.java
View File

@ -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);
}

5
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ConfigurationEntry.java
View File

@ -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);
}

5
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/DiskOffering.java
View File

@ -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);
}

5
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Domain.java
View File

@ -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);
}

3
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/EncryptedPasswordAndPrivateKey.java
View File

@ -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();
}

5
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Event.java
View File

@ -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);

5
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/FirewallRule.java
View File

@ -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);

5
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Host.java
View File

@ -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)

5
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/IPForwardingRule.java
View File

@ -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)

5
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISO.java
View File

@ -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)

5
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISOExtraction.java
View File

@ -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);

5
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ISOPermissions.java
View File

@ -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);
}

10
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/IngressRule.java
View File

@ -21,12 +21,12 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
import java.util.Set;
import com.google.common.base.MoreObjects;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
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;
public class IngressRule implements Comparable<IngressRule> {
public static Builder<?> builder() {
@ -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);

5
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/JobResult.java
View File

@ -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

5
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/LoadBalancerRule.java
View File

@ -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);
}

5
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/LoginResponse.java
View File

@ -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);
}

5
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NIC.java
View File

@ -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);

5
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Network.java
View File

@ -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)

5
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkOffering.java
View File

@ -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);
}

7
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/NetworkService.java
View File

@ -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

5
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/OSType.java
View File

@ -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

5
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Pod.java
View File

@ -22,9 +22,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
/**
* Represents a Pod in CloudStack.
@ -267,7 +266,7 @@ public class Pod implements Comparable<Pod> {
}
protected ToStringHelper string() {
return MoreObjects.toStringHelper(this)
return Objects.toStringHelper(this)
.add("id", id).add("name", name).add("zoneId", zoneId).add("zoneName", zoneName).add("gateway", gateway).add("netmask", netmask).add("startIp", startIp).add("endIp", endIp).add("allocationState", allocationState);
}

5
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/PortForwardingRule.java
View File

@ -24,9 +24,8 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.CaseFormat;
import com.google.common.base.MoreObjects;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
@ -438,7 +437,7 @@ public class PortForwardingRule implements Comparable<PortForwardingRule> {
}
protected ToStringHelper string() {
return MoreObjects.toStringHelper(this)
return Objects.toStringHelper(this)
.add("id", id).add("IPAddress", IPAddress).add("IPAddressId", IPAddressId).add("privatePort", privatePort)
.add("protocol", protocol).add("publicPort", publicPort).add("state", state).add("virtualMachineDisplayName", virtualMachineDisplayName)
.add("virtualMachineId", virtualMachineId).add("virtualMachineName", virtualMachineName).add("CIDRs", CIDRs)

5
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Project.java
View File

@ -25,9 +25,8 @@ import com.google.common.collect.ImmutableSet;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.CaseFormat;
import com.google.common.base.MoreObjects;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
/**
* Representation of the API project response
@ -249,7 +248,7 @@ public class Project implements Comparable<Project> {
}
protected ToStringHelper string() {
return MoreObjects.toStringHelper(this).omitNullValues()
return Objects.toStringHelper(this).omitNullValues()
.add("id", id).add("account", account).add("displayText", displayText)
.add("domain", domain).add("domainId", domainId).add("name", name).add("state", state)
.add("tags", tags);

5
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/PublicIPAddress.java
View File

@ -26,9 +26,8 @@ import com.google.common.collect.ImmutableSet;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.CaseFormat;
import com.google.common.base.MoreObjects;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
/**
* Class PublicIPAddress
@ -577,7 +576,7 @@ public class PublicIPAddress {
}
protected ToStringHelper string() {
return MoreObjects.toStringHelper(this)
return Objects.toStringHelper(this)
.add("id", id).add("account", account).add("allocated", allocated).add("associatedNetworkId", associatedNetworkId)
.add("domain", domain).add("domainId", domainId).add("usesVirtualNetwork", usesVirtualNetwork).add("IPAddress", IPAddress)
.add("isSourceNAT", isSourceNAT).add("isStaticNAT", isStaticNAT).add("networkId", networkId).add("state", state)

5
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ResourceLimit.java
View File

@ -24,9 +24,8 @@ import java.util.Map;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.Function;
import com.google.common.base.MoreObjects;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
@ -259,7 +258,7 @@ public class ResourceLimit {
}
protected ToStringHelper string() {
return MoreObjects.toStringHelper(this)
return Objects.toStringHelper(this)
.add("account", account).add("domain", domain).add("domainId", domainId).add("max", max).add("resourceType", resourceType);
}

5
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SecurityGroup.java
View File

@ -23,9 +23,8 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.ImmutableSortedSet;
@ -297,7 +296,7 @@ public class SecurityGroup implements Comparable<SecurityGroup> {
}
protected ToStringHelper string() {
return MoreObjects.toStringHelper(this).add("id", id).add("account", account).add("name", name).add("description", description)
return Objects.toStringHelper(this).add("id", id).add("account", account).add("name", name).add("description", description)
.add("domain", domain).add("domainId", domainId).add("jobId", jobId).add("jobStatus", jobStatus).add("ingressRules", ingressRules)
.add("tags", tags);
}

5
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ServiceOffering.java
View File

@ -24,9 +24,8 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
@ -436,7 +435,7 @@ public class ServiceOffering implements Comparable<ServiceOffering> {
}
protected ToStringHelper string() {
return MoreObjects.toStringHelper(this)
return Objects.toStringHelper(this)
.add("id", id).add("name", name).add("displayText", displayText).add("created", created).add("domain", domain)
.add("domainId", domainId).add("cpuNumber", cpuNumber).add("cpuSpeed", cpuSpeed).add("memory", memory)
.add("haSupport", haSupport).add("storageType", storageType).add("tags", getTags()).add("defaultUse", defaultUse)

5
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Snapshot.java
View File

@ -26,9 +26,8 @@ import com.google.common.collect.ImmutableSet;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.CaseFormat;
import com.google.common.base.MoreObjects;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
/**
* Class Snapshot
@ -454,7 +453,7 @@ public class Snapshot {
}
protected ToStringHelper string() {
return MoreObjects.toStringHelper(this)
return Objects.toStringHelper(this)
.add("id", id).add("account", account).add("created", created).add("domain", domain).add("domainId", domainId)
.add("interval", interval).add("jobId", jobId).add("jobStatus", jobStatus).add("name", name).add("snapshotType", snapshotType)
.add("state", state).add("volumeId", volumeId).add("volumeName", volumeName).add("volumeType", volumeType)

5
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SnapshotPolicy.java
View File

@ -22,9 +22,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
/**
* Class SnapshotPolicy
@ -204,7 +203,7 @@ public class SnapshotPolicy {
}
protected ToStringHelper string() {
return MoreObjects.toStringHelper(this)
return Objects.toStringHelper(this)
.add("id", id).add("interval", interval).add("numberToRetain", numberToRetain).add("schedule", schedule).add("timezone", timezone)
.add("volumeId", volumeId);
}

5
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SnapshotPolicySchedule.java
View File

@ -20,9 +20,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
/**
* Describes the schedule of a snapshot policy.
@ -115,7 +114,7 @@ public class SnapshotPolicySchedule {
}
protected ToStringHelper string() {
return MoreObjects.toStringHelper(this)
return Objects.toStringHelper(this)
.add("interval", interval).add("time", time);
}

5
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/SshKeyPair.java
View File

@ -22,9 +22,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
/**
* Class SshKeyPair
@ -132,7 +131,7 @@ public class SshKeyPair {
}
protected ToStringHelper string() {
return MoreObjects.toStringHelper(this)
return Objects.toStringHelper(this)
.add("fingerprint", fingerprint).add("name", name).add("privateKey", privateKey);
}

5
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/StoragePool.java
View File

@ -25,9 +25,8 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.CaseFormat;
import com.google.common.base.MoreObjects;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
@ -467,7 +466,7 @@ public class StoragePool implements Comparable<StoragePool> {
}
protected ToStringHelper string() {
return MoreObjects.toStringHelper(this)
return Objects.toStringHelper(this)
.add("id", id).add("name", name).add("path", path).add("tags", tags).add("state", state).add("type", type).add("zoneId", zoneId).add("zoneName", zoneName).add("podId", podId).add("podName", podName).add("clusterId", clusterId).add("clusterName", clusterName).add("created", created).add("diskSizeAllocated", diskSizeAllocated).add("diskSizeTotal", diskSizeTotal).add("ipAddress", ipAddress).add("jobId", jobId).add("jobStatus", jobStatus);
}

8
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Tag.java
View File

@ -21,13 +21,13 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.beans.ConstructorProperties;
import java.util.Map;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.Function;
import com.google.common.base.MoreObjects;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
import org.jclouds.javax.annotation.Nullable;
/**
* Class Tag
@ -331,7 +331,7 @@ public class Tag {
}
protected ToStringHelper string() {
return MoreObjects.toStringHelper(this)
return Objects.toStringHelper(this)
.add("account", account)
.add("customer", customer)
.add("domain", domain)

8
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Template.java
View File

@ -22,12 +22,12 @@ import java.beans.ConstructorProperties;
import java.util.Date;
import java.util.Set;
import com.google.common.base.MoreObjects;
import com.google.common.base.MoreObjects.ToStringHelper;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableSet;
import org.jclouds.javax.annotation.Nullable;
public class Template implements Comparable<Template> {
public enum Status {
@ -878,7 +878,7 @@ public class Template implements Comparable<Template> {
}
protected ToStringHelper string() {
return MoreObjects.toStringHelper(this)
return Objects.toStringHelper(this)
.add("id", id).add("displayText", displayText).add("domain", domain).add("domainId", domainId).add("account", account).add("accountId", accountId).add("zone", zone).add("zoneId", zoneId).add("OSType", OSType).add("OSTypeId", OSTypeId).add("name", name).add("type", type).add("status", status).add("format", format).add("hypervisor", hypervisor).add("size", size).add("created", created).add("removed", removed).add("crossZones", crossZones).add("bootable", bootable).add("extractable", extractable).add("featured", featured).add("ispublic", ispublic).add("ready", ready).add("passwordEnabled", passwordEnabled).add("jobId", jobId).add("jobStatus", jobStatus).add("checksum", checksum).add("hostId", hostId).add("hostName", hostName).add("sourceTemplateId", sourceTemplateId).add("templateTag", templateTag).add("tags", tags);
}

5
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplateExtraction.java
View File

@ -23,9 +23,8 @@ import java.util.Date;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
public class TemplateExtraction implements Comparable<TemplateExtraction> {
@ -351,7 +350,7 @@ public class TemplateExtraction implements Comparable<TemplateExtraction> {
}
protected ToStringHelper string() {
return MoreObjects.toStringHelper(this)
return Objects.toStringHelper(this)
.add("id", id).add("accountId", accountId).add("created", created).add("extractId", extractId).add("extractMode", extractMode).add("name", name).add("state", state).add("status", status).add("storageType", storageType).add("uploadPercentage", uploadPercentage).add("url", url).add("zoneId", zoneId).add("zoneName", zoneName);
}

5
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplateMetadata.java
View File

@ -22,9 +22,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
/**
* Class TemplateMetadata
@ -223,7 +222,7 @@ public class TemplateMetadata {
}
protected ToStringHelper string() {
return MoreObjects.toStringHelper(this)
return Objects.toStringHelper(this)
.add("name", name).add("osTypeId", osTypeId).add("displayText", displayText).add("snapshotId", snapshotId)
.add("volumeId", volumeId).add("virtualMachineId", virtualMachineId).add("passwordEnabled", passwordEnabled);
}

5
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/TemplatePermission.java
View File

@ -22,9 +22,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
public class TemplatePermission {
@ -166,7 +165,7 @@ public class TemplatePermission {
}
protected ToStringHelper string() {
return MoreObjects.toStringHelper(this)
return Objects.toStringHelper(this)
.add("id", id).add("account", account).add("domainId", domainId).add("isPublic", isPublic);
}

5
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/UsageRecord.java
View File

@ -25,9 +25,8 @@ import java.util.Map;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.Function;
import com.google.common.base.MoreObjects;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
@ -498,7 +497,7 @@ public class UsageRecord {
}
protected ToStringHelper string() {
return MoreObjects.toStringHelper(this)
return Objects.toStringHelper(this)
.add("id", id).add("description", description).add("accountId", accountId).add("accountName", accountName)
.add("domainId", domainId).add("startDate", startDate).add("endDate", endDate).add("assignDate", assignDate)
.add("releaseDate", releaseDate).add("zoneId", zoneId).add("virtualMachineId", virtualMachineId)

5
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/User.java
View File

@ -23,9 +23,8 @@ import java.util.Date;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
/**
* Class User
@ -398,7 +397,7 @@ public class User {
}
protected ToStringHelper string() {
return MoreObjects.toStringHelper(this)
return Objects.toStringHelper(this)
.add("id", id).add("name", name).add("firstName", firstName).add("lastName", lastName).add("email", email)
.add("created", created).add("state", state).add("account", account).add("accountType", accountType).add("domain", domain)
.add("domainId", domainId).add("timeZone", timeZone).add("apiKey", apiKey).add("secretKey", secretKey);

5
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VMGroup.java
View File

@ -23,9 +23,8 @@ import java.util.Date;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
/**
* Class VMGroup
@ -205,7 +204,7 @@ public class VMGroup {
}
protected ToStringHelper string() {
return MoreObjects.toStringHelper(this)
return Objects.toStringHelper(this)
.add("id", id).add("account", account).add("created", created).add("domain", domain).add("domainId", domainId).add("name", name);
}

5
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VirtualMachine.java
View File

@ -25,9 +25,8 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.CaseFormat;
import com.google.common.base.MoreObjects;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableSet;
@ -1051,7 +1050,7 @@ public class VirtualMachine {
}
protected ToStringHelper string() {
return MoreObjects.toStringHelper(this)
return Objects.toStringHelper(this)
.add("id", id).add("account", account).add("cpuCount", cpuCount).add("cpuSpeed", cpuSpeed).add("cpuUsed", cpuUsed)
.add("displayName", displayName).add("created", created).add("domain", domain).add("domainId", domainId)
.add("usesVirtualNetwork", usesVirtualNetwork).add("group", group).add("groupId", groupId).add("guestOSId", guestOSId)

5
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/VlanIPRange.java
View File

@ -22,9 +22,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
/**
* Represents the data object used in CloudStack's "Vlan" API.
@ -352,7 +351,7 @@ public class VlanIPRange implements Comparable<VlanIPRange> {
}
protected ToStringHelper string() {
return MoreObjects.toStringHelper(this)
return Objects.toStringHelper(this)
.add("id", id).add("description", description).add("forVirtualNetwork", forVirtualNetwork).add("zoneId", zoneId)
.add("vlan", vlan).add("account", account).add("domainId", domainId).add("domain", domain).add("podId", podId)
.add("podName", podName).add("gateway", gateway).add("netmask", netmask).add("startIP", startIP).add("endIP", endIP)

5
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Volume.java
View File

@ -27,9 +27,8 @@ import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.CaseFormat;
import com.google.common.base.Function;
import com.google.common.base.MoreObjects;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
@ -745,7 +744,7 @@ public class Volume {
}
protected ToStringHelper string() {
return MoreObjects.toStringHelper(this)
return Objects.toStringHelper(this)
.add("id", id).add("account", account).add("attached", attached).add("created", created).add("destroyed", destroyed)
.add("deviceId", deviceId).add("diskOfferingDisplayText", diskOfferingDisplayText).add("diskOfferingId", diskOfferingId)
.add("diskOfferingName", diskOfferingName).add("domain", domain).add("domainId", domainId).add("hypervisor", hypervisor)

5
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/Zone.java
View File

@ -25,9 +25,8 @@ import java.util.Set;
import com.google.common.collect.ImmutableSet;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableList;
public class Zone implements Comparable<Zone> {
@ -441,7 +440,7 @@ public class Zone implements Comparable<Zone> {
}
protected ToStringHelper string() {
return MoreObjects.toStringHelper(this)
return Objects.toStringHelper(this)
.add("id", id).add("description", description).add("displayText", displayText).add("DNS1", DNS1).add("DNS2", DNS2)
.add("domain", domain).add("domainId", domainId).add("guestCIDRAddress", guestCIDRAddress).add("internalDNS1", internalDNS1)
.add("internalDNS2", internalDNS2).add("name", name).add("networkType", networkType).add("VLAN", VLAN)

5
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ZoneAndName.java
View File

@ -20,9 +20,8 @@ import static com.google.common.base.Objects.equal;
import static com.google.common.base.Preconditions.checkNotNull;
import com.google.common.base.Function;
import com.google.common.base.MoreObjects;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
/**
* Helpful when looking for resources by zone and name
@ -88,6 +87,6 @@ public class ZoneAndName {
}
protected ToStringHelper string() {
return MoreObjects.toStringHelper("").add("zoneId", zoneId).add("name", name);
return Objects.toStringHelper("").add("zoneId", zoneId).add("name", name);
}
}

5
apis/cloudstack/src/main/java/org/jclouds/cloudstack/domain/ZoneSecurityGroupNamePortsCidrs.java
View File

@ -21,9 +21,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Set;
import com.google.common.base.MoreObjects;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
public class ZoneSecurityGroupNamePortsCidrs extends ZoneAndName {
@ -147,7 +146,7 @@ public class ZoneSecurityGroupNamePortsCidrs extends ZoneAndName {
}
protected ToStringHelper string() {
return MoreObjects.toStringHelper(this)
return Objects.toStringHelper(this)
.add("zoneId", zoneId).add("name", name).add("ports", ports).add("cidrs", cidrs);
}

2
apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Alarm.java
View File

@ -17,7 +17,7 @@
package org.jclouds.cloudwatch.domain;
import static com.google.common.base.Objects.equal;
import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;

2
apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/AlarmHistoryItem.java
View File

@ -17,7 +17,7 @@
package org.jclouds.cloudwatch.domain;
import static com.google.common.base.Objects.equal;
import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Date;

3
apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Datapoint.java
View File

@ -16,7 +16,6 @@
*/
package org.jclouds.cloudwatch.domain;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import org.jclouds.javax.annotation.Nullable;
@ -140,7 +139,7 @@ public class Datapoint {
@Override
public String toString() {
return MoreObjects.toStringHelper(this)
return Objects.toStringHelper(this)
.add("timestamp", timestamp)
.add("customUnit", customUnit)
.add("maximum", maximum)

3
apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Dimension.java
View File

@ -16,7 +16,6 @@
*/
package org.jclouds.cloudwatch.domain;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@ -75,7 +74,7 @@ public class Dimension {
*/
@Override
public String toString() {
return MoreObjects.toStringHelper(this)
return Objects.toStringHelper(this)
.add("name", name)
.add("value", value).toString();
}

3
apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/GetMetricStatisticsResponse.java
View File

@ -20,7 +20,6 @@ import java.util.Iterator;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.FluentIterable;
import com.google.common.collect.ImmutableSet;
@ -81,7 +80,7 @@ public class GetMetricStatisticsResponse extends FluentIterable<Datapoint> {
*/
@Override
public String toString() {
return MoreObjects.toStringHelper(this)
return Objects.toStringHelper(this)
.add("label", label)
.add("datapoints", datapoints).toString();
}

3
apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/ListMetricsResponse.java
View File

@ -20,7 +20,6 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ForwardingSet;
import com.google.common.collect.ImmutableSet;
@ -81,7 +80,7 @@ public class ListMetricsResponse extends ForwardingSet<Metric> {
*/
@Override
public String toString() {
return MoreObjects.toStringHelper(this)
return Objects.toStringHelper(this)
.add("metrics", metrics)
.add("nextToken", nextToken).toString();
}

3
apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/Metric.java
View File

@ -16,7 +16,6 @@
*/
package org.jclouds.cloudwatch.domain;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.Sets;
import org.jclouds.javax.annotation.Nullable;
@ -96,7 +95,7 @@ public class Metric {
*/
@Override
public String toString() {
return MoreObjects.toStringHelper(this)
return Objects.toStringHelper(this)
.add("namespace", namespace)
.add("metricName", metricName)
.add("dimension", dimensions).toString();

5
apis/cloudwatch/src/main/java/org/jclouds/cloudwatch/domain/MetricDatum.java
View File

@ -22,9 +22,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Date;
import java.util.Set;
import com.google.common.base.MoreObjects;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
@ -247,7 +246,7 @@ public class MetricDatum {
}
protected ToStringHelper string() {
return MoreObjects.toStringHelper("").omitNullValues().add("dimensions", dimensions).add("metricName", metricName)
return Objects.toStringHelper("").omitNullValues().add("dimensions", dimensions).add("metricName", metricName)
.add("statisticValues", statisticValues.orNull()).add("timestamp", timestamp.orNull()).add("unit", unit)
.add("value", value.orNull());
}

3
apis/ec2/src/main/java/org/jclouds/ec2/compute/domain/PasswordDataAndPrivateKey.java
View File

@ -18,7 +18,6 @@ package org.jclouds.ec2.compute.domain;
import org.jclouds.ec2.domain.PasswordData;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@ -70,6 +69,6 @@ public class PasswordDataAndPrivateKey {
*/
@Override
public String toString() {
return MoreObjects.toStringHelper(this).omitNullValues().add("passwordData", passwordData).toString();
return Objects.toStringHelper(this).omitNullValues().add("passwordData", passwordData).toString();
}
}

5
apis/ec2/src/main/java/org/jclouds/ec2/compute/domain/RegionAndName.java
View File

@ -19,9 +19,8 @@ package org.jclouds.ec2.compute.domain;
import static com.google.common.base.Preconditions.checkNotNull;
import com.google.common.base.Function;
import com.google.common.base.MoreObjects;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
public class RegionAndName {
@ -68,7 +67,7 @@ public class RegionAndName {
}
protected ToStringHelper string() {
return MoreObjects.toStringHelper("").add("region", region).add("name", name);
return Objects.toStringHelper("").add("region", region).add("name", name);
}
private static enum RegionFunction implements Function<RegionAndName, String> {

2
apis/ec2/src/main/java/org/jclouds/ec2/compute/options/EC2TemplateOptions.java
View File

@ -27,7 +27,7 @@ import java.util.Map;
import java.util.Set;
import com.google.common.base.Objects;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
import com.google.common.hash.Hashing;

3
apis/ec2/src/main/java/org/jclouds/ec2/domain/PasswordData.java
View File

@ -20,7 +20,6 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Date;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@ -145,7 +144,7 @@ public class PasswordData {
*/
@Override
public String toString() {
return MoreObjects.toStringHelper(this).omitNullValues().add("instanceId", instanceId).add("timestamp", timestamp)
return Objects.toStringHelper(this).omitNullValues().add("instanceId", instanceId).add("timestamp", timestamp)
.add("passwordData", passwordData).toString();
}

3
apis/ec2/src/main/java/org/jclouds/ec2/domain/Reservation.java
View File

@ -22,7 +22,6 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ComparisonChain;
import com.google.common.collect.ForwardingSet;
@ -215,7 +214,7 @@ public class Reservation<T extends RunningInstance> extends ForwardingSet<T> imp
*/
@Override
public String toString() {
return MoreObjects.toStringHelper(this).omitNullValues().add("region", region).add("reservationId", reservationId)
return Objects.toStringHelper(this).omitNullValues().add("region", region).add("reservationId", reservationId)
.add("requesterId", requesterId).add("instances", instances).add("groupNames", groupNames).toString();
}

5
apis/ec2/src/main/java/org/jclouds/ec2/domain/RunningInstance.java
View File

@ -24,9 +24,8 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.Strings;
import com.google.common.collect.ComparisonChain;
import com.google.common.collect.ImmutableMap;
@ -507,7 +506,7 @@ public class RunningInstance implements Comparable<RunningInstance> {
}
protected ToStringHelper string() {
return MoreObjects.toStringHelper(this).omitNullValues().add("region", region)
return Objects.toStringHelper(this).omitNullValues().add("region", region)
.add("availabilityZone", availabilityZone).add("id", instanceId).add("state", rawState)
.add("type", instanceType).add("virtualizationType", virtualizationType).add("imageId", imageId)
.add("ipAddress", ipAddress).add("dnsName", dnsName).add("privateIpAddress", privateIpAddress)

5
apis/ec2/src/main/java/org/jclouds/ec2/domain/SecurityGroup.java
View File

@ -23,9 +23,8 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
import org.jclouds.net.domain.IpPermission;
import com.google.common.base.MoreObjects;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ForwardingSet;
import com.google.common.collect.ImmutableSet;
@ -212,7 +211,7 @@ public class SecurityGroup extends ForwardingSet<IpPermission> {
}
protected ToStringHelper string() {
return MoreObjects.toStringHelper(this).omitNullValues().add("region", region).add("id", id).add("name", name)
return Objects.toStringHelper(this).omitNullValues().add("region", region).add("id", id).add("name", name)
.add("ownerId", ownerId).add("description", description)
.add("ipPermissions", ipPermissions.isEmpty() ? null : ipPermissions);
}

5
apis/ec2/src/main/java/org/jclouds/ec2/domain/Subnet.java
View File

@ -20,9 +20,8 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Map;
import com.google.common.base.MoreObjects;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableMap;
/**
@ -144,7 +143,7 @@ public final class Subnet {
}
private ToStringHelper string() {
return MoreObjects.toStringHelper(this).omitNullValues().add("subnetId", subnetId).add("subnetState", subnetState)
return Objects.toStringHelper(this).omitNullValues().add("subnetId", subnetId).add("subnetState", subnetState)
.add("vpcId", vpcId).add("cidrBlock", cidrBlock).add("availableIpAddressCount", availableIpAddressCount)
.add("availabilityZone", availabilityZone).add("tags", tags);
}

5
apis/ec2/src/main/java/org/jclouds/ec2/domain/Tag.java
View File

@ -18,9 +18,8 @@ package org.jclouds.ec2.domain;
import static com.google.common.base.Preconditions.checkNotNull;
import com.google.common.base.MoreObjects;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.Optional;
/**
@ -192,7 +191,7 @@ public class Tag {
}
protected ToStringHelper string() {
return MoreObjects.toStringHelper(this).omitNullValues().add("resourceId", resourceId)
return Objects.toStringHelper(this).omitNullValues().add("resourceId", resourceId)
.add("resourceType", resourceType).add("key", key).add("value", value.orNull());
}

5
apis/elasticstack/src/main/java/org/jclouds/elasticstack/domain/WellKnownImage.java
View File

@ -16,13 +16,12 @@
*/
package org.jclouds.elasticstack.domain;
import static com.google.common.base.MoreObjects.firstNonNull;
import static com.google.common.base.Objects.firstNonNull;
import static com.google.common.base.Preconditions.checkNotNull;
import org.jclouds.compute.domain.OsFamily;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
public class WellKnownImage {
@ -153,7 +152,7 @@ public class WellKnownImage {
@Override
public String toString() {
return MoreObjects.toStringHelper(this).omitNullValues().add("uuid", uuid).add("description", description)
return Objects.toStringHelper(this).omitNullValues().add("uuid", uuid).add("description", description)
.add("osFamily", osFamily).add("osVersion", osVersion).add("size", size).add("is64bit", is64bit)
.add("loginUser", loginUser).toString();
}

5
apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Snapshot.java
View File

@ -25,9 +25,8 @@ import javax.inject.Named;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
/**
* An Openstack Cinder Volume Snapshot.
@ -229,7 +228,7 @@ public class Snapshot {
}
protected ToStringHelper string() {
return MoreObjects.toStringHelper(this)
return Objects.toStringHelper(this)
.add("id", id).add("volumeId", volumeId).add("status", status).add("size", size).add("created", created).add("name", name).add("description", description);
}

5
apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/Volume.java
View File

@ -28,9 +28,8 @@ import javax.inject.Named;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.CaseFormat;
import com.google.common.base.MoreObjects;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
@ -350,7 +349,7 @@ public class Volume {
}
protected ToStringHelper string() {
return MoreObjects.toStringHelper(this)
return Objects.toStringHelper(this)
.add("id", id).add("status", status).add("size", size).add("zone", zone).add("created", created).add("attachments", attachments).add("volumeType", volumeType).add("snapshotId", snapshotId).add("name", name).add("description", description).add("metadata", metadata);
}

5
apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeAttachment.java
View File

@ -24,9 +24,8 @@ import javax.inject.Named;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
/**
* An OpenStack Cinder Volume Attachment (describes how Volumes are attached to Servers).
@ -165,7 +164,7 @@ public class VolumeAttachment {
}
protected ToStringHelper string() {
return MoreObjects.toStringHelper(this)
return Objects.toStringHelper(this)
.add("id", id).add("volumeId", volumeId).add("serverId", serverId).add("device", device);
}

5
apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeQuota.java
View File

@ -16,7 +16,6 @@
*/
package org.jclouds.openstack.cinder.v1.domain;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import static com.google.common.base.Preconditions.checkNotNull;
@ -80,8 +79,8 @@ public class VolumeQuota {
&& Objects.equal(this.snapshots, that.snapshots);
}
protected MoreObjects.ToStringHelper string() {
return MoreObjects.toStringHelper(this)
protected Objects.ToStringHelper string() {
return Objects.toStringHelper(this)
.add("id", id).add("volumes", volumes).add("gigabytes", gigabytes).add("snapshots", snapshots);
}

5
apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/domain/VolumeType.java
View File

@ -26,9 +26,8 @@ import javax.inject.Named;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableMap;
@ -179,7 +178,7 @@ public class VolumeType {
}
protected ToStringHelper string() {
return MoreObjects.toStringHelper(this)
return Objects.toStringHelper(this)
.add("id", id).add("name", name).add("created", created).add("updated", updated).add("extraSpecs", extraSpecs);
}

4
apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateSnapshotOptions.java
View File

@ -17,7 +17,7 @@
package org.jclouds.openstack.cinder.v1.options;
import static com.google.common.base.Objects.equal;
import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Objects.toStringHelper;
import java.util.Map;
@ -28,7 +28,7 @@ import org.jclouds.rest.MapBinder;
import org.jclouds.rest.binders.BindToJsonPayload;
import com.google.common.base.Objects;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;

4
apis/openstack-cinder/src/main/java/org/jclouds/openstack/cinder/v1/options/CreateVolumeOptions.java
View File

@ -17,7 +17,7 @@
package org.jclouds.openstack.cinder.v1.options;
import static com.google.common.base.Objects.equal;
import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
@ -31,7 +31,7 @@ import org.jclouds.rest.MapBinder;
import org.jclouds.rest.binders.BindToJsonPayload;
import com.google.common.base.Objects;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Maps;

5
apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Access.java
View File

@ -23,9 +23,8 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ForwardingSet;
import com.google.common.collect.ImmutableSet;
@ -143,7 +142,7 @@ public class Access extends ForwardingSet<Service> implements Comparable<Access>
}
protected ToStringHelper string() {
return MoreObjects.toStringHelper(this).omitNullValues().add("token", token).add("user", user)
return Objects.toStringHelper(this).omitNullValues().add("token", token).add("user", user)
.add("serviceCatalog", serviceCatalog);
}

5
apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/ApiAccessKeyCredentials.java
View File

@ -23,9 +23,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.openstack.keystone.v2_0.config.CredentialType;
import org.jclouds.openstack.keystone.v2_0.config.CredentialTypes;
import com.google.common.base.MoreObjects;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
/**
* Api AccessKey Credentials
@ -128,7 +127,7 @@ public class ApiAccessKeyCredentials {
}
protected ToStringHelper string() {
return MoreObjects.toStringHelper(this)
return Objects.toStringHelper(this)
.add("accessKey", accessKey).add("secretKey", secretKey);
}

2
apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/ApiMetadata.java
View File

@ -29,7 +29,7 @@ import org.jclouds.openstack.v2_0.domain.Link;
import org.jclouds.openstack.v2_0.domain.Resource;
import com.google.common.base.Objects;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**

5
apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Endpoint.java
View File

@ -21,9 +21,8 @@ import java.net.URI;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
/**
* An network-accessible address, usually described by URL, where a service may
@ -332,7 +331,7 @@ public class Endpoint {
}
protected ToStringHelper string() {
return MoreObjects.toStringHelper(this).omitNullValues().add("id", id).add("versionId", versionId)
return Objects.toStringHelper(this).omitNullValues().add("id", id).add("versionId", versionId)
.add("region", region).add("publicURL", publicURL).add("internalURL", internalURL)
.add("adminURL", adminURL).add("versionInfo", versionInfo).add("versionList", versionList)
.add("tenantId", tenantId);

5
apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/MediaType.java
View File

@ -20,9 +20,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
/**
* Class MediaType
@ -113,7 +112,7 @@ public class MediaType {
}
protected ToStringHelper string() {
return MoreObjects.toStringHelper(this)
return Objects.toStringHelper(this)
.add("base", base).add("type", type);
}

5
apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/PasswordCredentials.java
View File

@ -22,9 +22,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.openstack.keystone.v2_0.config.CredentialType;
import com.google.common.base.MoreObjects;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
/**
* Password Credentials
@ -127,7 +126,7 @@ public class PasswordCredentials {
}
protected ToStringHelper string() {
return MoreObjects.toStringHelper(this)
return Objects.toStringHelper(this)
.add("username", username).add("password", password);
}

5
apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/domain/Role.java
View File

@ -22,9 +22,8 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
/**
* A personality that a user assumes when performing a specific set of operations. A role includes a
@ -193,7 +192,7 @@ public class Role {
}
protected ToStringHelper string() {
return MoreObjects.toStringHelper(this).omitNullValues()
return Objects.toStringHelper(this).omitNullValues()
.add("id", id).add("name", name).add("description", description).add("serviceId", serviceId).add("tenantId", tenantId);
}

Some files were not shown because too many files have changed in this diff Show More