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

JCLOUDS-1225: Address Guava 18 Objects changes 

Fixed with:

find -name \*.java | xargs sed -i 's/Objects.[Tt]oStringHelper/More&/g'
find -name \*.java | xargs sed -i 's/Objects.firstNonNull/More&/g'
find -name \*.java | xargs sed -i 's/^\(import com.google.common.base.\)\(Objects.*\)/\1More\2\n\1\2/g'
find -name \*.java | xargs java -jar google-java-format-1.3-all-deps.jar -i --fix-imports-only --skip-sorting-imports
This commit is contained in:
Andrew Gaul 2017-08-21 13:35:48 -07:00
parent e331a000d1
commit a493e2ca2f
410 changed files with 953 additions and 667 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,6 +20,7 @@ import java.net.URI;
import java.util.Map;
import java.util.Set;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
@ -299,7 +300,7 @@ public class Node {
@Override
public String toString() {
return Objects.toStringHelper(this).add("id", id).add("name", name).add("description", description)
return MoreObjects.toStringHelper(this).add("id", id).add("name", name).add("description", description)
.add("locationId", locationId).add("hostname", hostname).add("osArch", osArch).add("osFamily", osFamily)
.add("osDescription", osDescription).add("osVersion", osVersion).add("os64Bit", os64Bit)
.add("group", group).add("loginPort", loginPort).add("tags", tags).add("metadata", metadata)

2
apis/chef/src/main/java/org/jclouds/chef/suppliers/ChefVersionSupplier.java
View File

@ -16,7 +16,7 @@
*/
package org.jclouds.chef.suppliers;
import static com.google.common.base.Objects.firstNonNull;
import static com.google.common.base.MoreObjects.firstNonNull;
import static com.google.common.base.Preconditions.checkNotNull;
import java.util.regex.Matcher;

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.Objects;
import com.google.common.base.MoreObjects;
import com.google.common.base.Predicate;
import com.google.common.base.Supplier;
import com.google.common.cache.CacheBuilder;
@ -177,7 +177,7 @@ public class CloudStackComputeServiceContextModule extends
}
@Override
public String toString() {
return Objects.toStringHelper(client.getGuestOSApi()).add("method", "listOSCategories").toString();
return MoreObjects.toStringHelper(client.getGuestOSApi()).add("method", "listOSCategories").toString();
}
}, seconds, TimeUnit.SECONDS);
}
@ -202,7 +202,7 @@ public class CloudStackComputeServiceContextModule extends
}
@Override
public String toString() {
return Objects.toStringHelper(client.getGuestOSApi()).add("method", "listOSTypes").toString();
return MoreObjects.toStringHelper(client.getGuestOSApi()).add("method", "listOSTypes").toString();
}
}, seconds, TimeUnit.SECONDS);
}

3
apis/cloudstack/src/main/java/org/jclouds/cloudstack/compute/options/CloudStackTemplateOptions.java
View File

@ -29,6 +29,7 @@ import org.jclouds.domain.LoginCredentials;
import org.jclouds.scriptbuilder.domain.Statement;
import com.google.common.base.Charsets;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
@ -240,7 +241,7 @@ public class CloudStackTemplateOptions extends TemplateOptions implements Clonea
@Override
public String toString() {
return Objects.toStringHelper(this)
return MoreObjects.toStringHelper(this)
.add("securityGroupIds", securityGroupIds)
.add("ipsToNetworks", ipsToNetworks)
.add("ipOnDefaultNetwork", ipOnDefaultNetwork)

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

@ -26,8 +26,9 @@ import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.CaseFormat;
import com.google.common.base.Function;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ForwardingSet;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
@ -776,7 +777,7 @@ public class Account extends ForwardingSet<User> {
}
protected ToStringHelper string() {
return Objects.toStringHelper(this)
return MoreObjects.toStringHelper(this)
.add("id", id).add("type", type).add("networkDomain", networkDomain).add("domain", domain).add("domainId", domainId).add("IPsAvailable", IPsAvailable).add("IPLimit", IPLimit).add("IPs", IPs).add("cleanupRequired", cleanupRequired).add("name", name).add("receivedBytes", receivedBytes).add("sentBytes", sentBytes).add("snapshotsAvailable", snapshotsAvailable).add("snapshotLimit", snapshotLimit).add("snapshots", snapshots).add("state", state).add("templatesAvailable", templatesAvailable).add("templateLimit", templateLimit).add("templates", templates).add("VMsAvailable", VMsAvailable).add("VMLimit", VMLimit).add("VMsRunning", VMsRunning).add("VMsStopped", VMsStopped).add("VMs", VMs).add("volumesAvailable", volumesAvailable).add("volumeLimit", volumeLimit).add("volumes", volumes).add("users", users);
}

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

@ -23,8 +23,9 @@ import java.util.Date;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Represents an alert issued by Cloudstack
@ -150,7 +151,7 @@ public class Alert {
}
protected ToStringHelper string() {
return Objects.toStringHelper(this)
return MoreObjects.toStringHelper(this)
.add("id", id).add("description", description).add("sent", sent).add("type", type);
}

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

@ -20,8 +20,9 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Representation of the API keypair response
@ -112,7 +113,7 @@ public class ApiKeyPair {
}
protected ToStringHelper string() {
return Objects.toStringHelper(this)
return MoreObjects.toStringHelper(this)
.add("apiKey", apiKey).add("secretKey", secretKey);
}

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

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

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

@ -23,8 +23,9 @@ import java.util.Date;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Class AsyncJob
@ -441,7 +442,7 @@ public class AsyncJob<S> {
}
protected ToStringHelper string() {
return Objects.toStringHelper(this)
return MoreObjects.toStringHelper(this)
.add("accountId", accountId).add("cmd", cmd).add("created", created).add("id", id).add("instanceId", instanceId)
.add("instanceType", instanceType).add("progress", progress).add("result", result).add("resultCode", resultCode)
.add("resultType", resultType).add("status", status).add("userId", userId).add("error", error);

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

@ -20,8 +20,9 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.ToStringHelper;
public class AsyncJobError {
@ -149,7 +150,7 @@ public class AsyncJobError {
}
protected ToStringHelper string() {
return Objects.toStringHelper(this)
return MoreObjects.toStringHelper(this)
.add("errorCode", errorCode).add("errorText", errorText);
}

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

@ -20,8 +20,9 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Class Capabilities
@ -175,7 +176,7 @@ public class Capabilities {
}
protected ToStringHelper string() {
return Objects.toStringHelper(this)
return MoreObjects.toStringHelper(this)
.add("cloudStackVersion", cloudStackVersion).add("securityGroupsEnabled", securityGroupsEnabled).add("canShareTemplates", canShareTemplates).add("firewallRuleUiEnabled", firewallRuleUiEnabled).add("supportELB", supportELB);
}

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

@ -24,8 +24,9 @@ import java.util.Map;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.Function;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
@ -266,7 +267,7 @@ public class Capacity implements Comparable<Capacity> {
}
protected ToStringHelper string() {
return Objects.toStringHelper(this)
return MoreObjects.toStringHelper(this)
.add("capacityTotal", capacityTotal).add("capacityUsed", capacityUsed).add("percentUsed", percentUsed)
.add("podId", podId).add("podName", podName).add("type", type).add("zoneId", zoneId).add("zoneName", zoneName);
}

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

@ -24,8 +24,9 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Represents a CloudStack Cluster.
@ -284,7 +285,7 @@ public class Cluster implements Comparable<Cluster> {
}
protected ToStringHelper string() {
return Objects.toStringHelper(this)
return MoreObjects.toStringHelper(this)
.add("id", id).add("allocationState", allocationState).add("clusterType", clusterType).add("hypervisor", hypervisor)
.add("managedState", managedState).add("name", name).add("podId", podId).add("podName", podName).add("zoneId", zoneId).add("zoneName", zoneName);
}

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

@ -22,8 +22,9 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Representation of the API configuration entry response
@ -149,7 +150,7 @@ public class ConfigurationEntry implements Comparable<ConfigurationEntry> {
}
protected ToStringHelper string() {
return Objects.toStringHelper(this)
return MoreObjects.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,8 +24,9 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
@ -276,7 +277,7 @@ public class DiskOffering implements Comparable<DiskOffering> {
}
protected ToStringHelper string() {
return Objects.toStringHelper(this)
return MoreObjects.toStringHelper(this)
.add("id", id).add("name", name).add("displayText", displayText).add("created", created).add("domain", domain)
.add("domainId", domainId).add("diskSize", diskSize).add("customized", customized).add("tags", tags);
}

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

@ -22,8 +22,9 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Representation of the API domain response
@ -202,7 +203,7 @@ public class Domain implements Comparable<Domain> {
}
protected ToStringHelper string() {
return Objects.toStringHelper(this)
return MoreObjects.toStringHelper(this)
.add("id", id).add("hasChild", hasChild).add("level", level).add("name", name).add("networkDomain", networkDomain).add("parentDomainId", parentDomainId).add("parentDomainName", parentDomainName);
}

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

@ -20,6 +20,7 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
public final class EncryptedPasswordAndPrivateKey {
@ -106,7 +107,7 @@ public final class EncryptedPasswordAndPrivateKey {
@Override
public String toString() {
return Objects.toStringHelper(this).omitNullValues()
return MoreObjects.toStringHelper(this).omitNullValues()
.add("encryptedPassword", encryptedPassword).add("privateKey", privateKey).toString();
}

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

@ -23,8 +23,9 @@ import java.util.Date;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Class Event
@ -313,7 +314,7 @@ public class Event implements Comparable<Event> {
}
protected ToStringHelper string() {
return Objects.toStringHelper(this)
return MoreObjects.toStringHelper(this)
.add("id", id).add("account", account).add("description", description).add("created", created)
.add("domain", domain).add("domainId", domainId).add("level", level).add("parentId", parentId)
.add("state", state).add("type", type).add("username", username);

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

@ -24,8 +24,9 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.CaseFormat;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
@ -341,7 +342,7 @@ public class FirewallRule implements Comparable<FirewallRule> {
}
protected ToStringHelper string() {
return Objects.toStringHelper(this)
return MoreObjects.toStringHelper(this)
.add("id", id).add("CIDRs", CIDRs).add("startPort", startPort).add("endPort", endPort).add("icmpCode", icmpCode)
.add("icmpType", icmpType).add("ipAddress", ipAddress).add("ipAddressId", ipAddressId).add("protocol", protocol).add("state", state)
.add("tags", tags);

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

@ -26,8 +26,9 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
@ -930,7 +931,7 @@ public class Host implements Comparable<Host> {
}
protected ToStringHelper string() {
return Objects.toStringHelper(this)
return MoreObjects.toStringHelper(this)
.add("id", id).add("allocationState", allocationState).add("averageLoad", averageLoad)
.add("capabilities", capabilities).add("clusterId", clusterId).add("clusterName", clusterName)
.add("clusterType", clusterType).add("cpuAllocated", cpuAllocated).add("cpuNumber", cpuNumber)

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

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

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

@ -25,8 +25,9 @@ import java.util.Set;
import com.google.common.collect.ImmutableSet;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Class ISO
@ -776,7 +777,7 @@ public class ISO {
}
protected ToStringHelper string() {
return Objects.toStringHelper(this)
return MoreObjects.toStringHelper(this)
.add("id", id).add("account", account).add("accountId", accountId).add("bootable", bootable)
.add("checksum", checksum).add("created", created).add("crossZones", crossZones).add("displayText", displayText)
.add("domain", domain).add("domainid", domainid).add("format", format).add("hostId", hostId).add("hostName", hostName)

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

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

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

@ -23,8 +23,9 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
@ -165,7 +166,7 @@ public class ISOPermissions {
}
protected ToStringHelper string() {
return Objects.toStringHelper(this)
return MoreObjects.toStringHelper(this)
.add("id", id).add("accounts", accounts).add("domainId", domainId).add("isPublic", isPublic);
}

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

@ -23,8 +23,9 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
public class IngressRule implements Comparable<IngressRule> {
@ -288,7 +289,7 @@ public class IngressRule implements Comparable<IngressRule> {
}
protected ToStringHelper string() {
return Objects.toStringHelper(this)
return MoreObjects.toStringHelper(this)
.add("account", account).add("CIDR", CIDR).add("endPort", endPort).add("ICMPCode", ICMPCode)
.add("ICMPType", ICMPType).add("protocol", protocol).add("id", id).add("securityGroupName", securityGroupName).add("startPort", startPort)
.add("tags", tags);

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

@ -20,8 +20,9 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.ToStringHelper;
/**
* The result of an operation.
@ -114,7 +115,7 @@ public class JobResult {
}
protected ToStringHelper string() {
return Objects.toStringHelper(this).add("success", success).add("displayText", displayText);
return MoreObjects.toStringHelper(this).add("success", success).add("displayText", displayText);
}
@Override

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

@ -24,8 +24,9 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.CaseFormat;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
@ -431,7 +432,7 @@ public class LoadBalancerRule {
}
protected ToStringHelper string() {
return Objects.toStringHelper(this)
return MoreObjects.toStringHelper(this)
.add("id", id).add("account", account).add("algorithm", algorithm).add("description", description).add("domain", domain).add("domainId", domainId).add("name", name).add("privatePort", privatePort).add("publicIP", publicIP).add("publicIPId", publicIPId).add("publicPort", publicPort).add("state", state).add("CIDRs", CIDRs).add("zoneId", zoneId);
}

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

@ -20,8 +20,9 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Representation of the login API call response
@ -326,7 +327,7 @@ public class LoginResponse {
}
protected ToStringHelper string() {
return Objects.toStringHelper(this)
return MoreObjects.toStringHelper(this)
.add("username", username).add("userId", userId).add("password", password).add("domainId", domainId).add("timeout", timeout).add("registered", registered).add("accountName", accountName).add("firstName", firstName).add("lastName", lastName).add("accountType", accountType).add("timezone", timezone).add("timezoneOffset", timezoneOffset).add("sessionKey", sessionKey).add("jSessionId", jSessionId);
}

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

@ -23,8 +23,9 @@ import java.net.URI;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Class NIC
@ -310,7 +311,7 @@ public class NIC {
}
protected ToStringHelper string() {
return Objects.toStringHelper(this)
return MoreObjects.toStringHelper(this)
.add("id", id).add("broadcastURI", broadcastURI).add("gateway", gateway).add("IPAddress", IPAddress)
.add("isDefault", isDefault).add("isolationURI", isolationURI).add("netmask", netmask).add("macAddress", macAddress)
.add("networkId", networkId).add("trafficType", trafficType).add("guestIPType", guestIPType);

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

@ -25,8 +25,9 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.ImmutableSortedSet;
@ -723,7 +724,7 @@ public class Network {
}
protected ToStringHelper string() {
return Objects.toStringHelper(this)
return MoreObjects.toStringHelper(this)
.add("id", id).add("account", account).add("broadcastDomainType", broadcastDomainType).add("broadcastURI", broadcastURI)
.add("displayText", displayText).add("DNS1", dns1).add("dns2", dns2).add("domain", domain).add("domainId", domainId)
.add("endIP", endIP).add("gateway", gateway).add("isDefault", isDefault).add("isShared", isShared).add("isSystem", isSystem)

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

@ -24,8 +24,9 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
/**
@ -338,7 +339,7 @@ public class NetworkOffering implements Comparable<NetworkOffering> {
}
protected ToStringHelper string() {
return Objects.toStringHelper(this)
return MoreObjects.toStringHelper(this)
.add("id", id).add("name", name).add("displayText", displayText).add("created", created).add("availability", availability).add("maxConnections", maxConnections).add("isDefault", isDefault).add("supportsVLAN", supportsVLAN).add("trafficType", trafficType).add("guestIPType", guestIPType).add("networkRate", networkRate).add("tags", tags);
}

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

@ -24,8 +24,9 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.ImmutableSortedMap;
import com.google.common.collect.ImmutableSortedSet;
@ -122,7 +123,7 @@ public class NetworkService implements Comparable<NetworkService> {
}
protected ToStringHelper string() {
return Objects.toStringHelper(this)
return MoreObjects.toStringHelper(this)
.add("name", name).add("value", value);
}
@ -226,7 +227,7 @@ public class NetworkService implements Comparable<NetworkService> {
}
protected ToStringHelper string() {
return Objects.toStringHelper(this).add("name", name).add("capabilities", capabilities);
return MoreObjects.toStringHelper(this).add("name", name).add("capabilities", capabilities);
}
@Override

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

@ -22,8 +22,9 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Class OSType
@ -140,7 +141,7 @@ public class OSType implements Comparable<OSType> {
}
protected ToStringHelper string() {
return Objects.toStringHelper(this).add("id", id).add("OSCategoryId", OSCategoryId).add("description", description);
return MoreObjects.toStringHelper(this).add("id", id).add("OSCategoryId", OSCategoryId).add("description", description);
}
@Override

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

@ -22,8 +22,9 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Class TemplateMetadata
@ -222,7 +223,7 @@ public class TemplateMetadata {
}
protected ToStringHelper string() {
return Objects.toStringHelper(this)
return MoreObjects.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,8 +22,9 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.ToStringHelper;
public class TemplatePermission {
@ -165,7 +166,7 @@ public class TemplatePermission {
}
protected ToStringHelper string() {
return Objects.toStringHelper(this)
return MoreObjects.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,8 +25,9 @@ import java.util.Map;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.Function;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
@ -550,7 +551,7 @@ public class UsageRecord {
}
protected ToStringHelper string() {
return Objects.toStringHelper(this)
return MoreObjects.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,8 +23,9 @@ import java.util.Date;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Class User
@ -397,7 +398,7 @@ public class User {
}
protected ToStringHelper string() {
return Objects.toStringHelper(this)
return MoreObjects.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,8 +23,9 @@ import java.util.Date;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Class VMGroup
@ -204,7 +205,7 @@ public class VMGroup {
}
protected ToStringHelper string() {
return Objects.toStringHelper(this)
return MoreObjects.toStringHelper(this)
.add("id", id).add("account", account).add("created", created).add("domain", domain).add("domainId", domainId).add("name", name);
}

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

@ -25,8 +25,9 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.CaseFormat;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Preconditions;
import com.google.common.base.Strings;
import com.google.common.collect.ImmutableSet;
@ -1050,7 +1051,7 @@ public class VirtualMachine {
}
protected ToStringHelper string() {
return Objects.toStringHelper(this)
return MoreObjects.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,8 +22,9 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Represents the data object used in CloudStack's "Vlan" API.
@ -351,7 +352,7 @@ public class VlanIPRange implements Comparable<VlanIPRange> {
}
protected ToStringHelper string() {
return Objects.toStringHelper(this)
return MoreObjects.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,8 +27,9 @@ import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.CaseFormat;
import com.google.common.base.Function;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Maps;
@ -744,7 +745,7 @@ public class Volume {
}
protected ToStringHelper string() {
return Objects.toStringHelper(this)
return MoreObjects.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,8 +25,9 @@ import java.util.Set;
import com.google.common.collect.ImmutableSet;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableList;
public class Zone implements Comparable<Zone> {
@ -440,7 +441,7 @@ public class Zone implements Comparable<Zone> {
}
protected ToStringHelper string() {
return Objects.toStringHelper(this)
return MoreObjects.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,8 +20,9 @@ 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.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Helpful when looking for resources by zone and name
@ -87,6 +88,6 @@ public class ZoneAndName {
}
protected ToStringHelper string() {
return Objects.toStringHelper("").add("zoneId", zoneId).add("name", name);
return MoreObjects.toStringHelper("").add("zoneId", zoneId).add("name", name);
}
}

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

@ -21,8 +21,9 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Set;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableSet;
public class ZoneSecurityGroupNamePortsCidrs extends ZoneAndName {
@ -146,7 +147,7 @@ public class ZoneSecurityGroupNamePortsCidrs extends ZoneAndName {
}
protected ToStringHelper string() {
return Objects.toStringHelper(this)
return MoreObjects.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.Objects.toStringHelper;
import static com.google.common.base.MoreObjects.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.Objects.toStringHelper;
import static com.google.common.base.MoreObjects.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,6 +16,7 @@
*/
package org.jclouds.cloudwatch.domain;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import org.jclouds.javax.annotation.Nullable;
@ -139,7 +140,7 @@ public class Datapoint {
@Override
public String toString() {
return Objects.toStringHelper(this)
return MoreObjects.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,6 +16,7 @@
*/
package org.jclouds.cloudwatch.domain;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@ -74,7 +75,7 @@ public class Dimension {
*/
@Override
public String toString() {
return Objects.toStringHelper(this)
return MoreObjects.toStringHelper(this)
.add("name", name)
.add("value", value).toString();
}

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

@ -20,6 +20,7 @@ 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;
@ -80,7 +81,7 @@ public class GetMetricStatisticsResponse extends FluentIterable<Datapoint> {
*/
@Override
public String toString() {
return Objects.toStringHelper(this)
return MoreObjects.toStringHelper(this)
.add("label", label)
.add("datapoints", datapoints).toString();
}

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

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

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

@ -16,6 +16,7 @@
*/
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;
@ -95,7 +96,7 @@ public class Metric {
*/
@Override
public String toString() {
return Objects.toStringHelper(this)
return MoreObjects.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,8 +22,9 @@ 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.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
@ -246,7 +247,7 @@ public class MetricDatum {
}
protected ToStringHelper string() {
return Objects.toStringHelper("").omitNullValues().add("dimensions", dimensions).add("metricName", metricName)
return MoreObjects.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/docker/src/main/java/org/jclouds/docker/compute/options/DockerTemplateOptions.java
View File

@ -21,6 +21,7 @@ import static com.google.common.base.Objects.equal;
import java.util.List;
import java.util.Map;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableList;
import com.google.common.collect.ImmutableMap;
@ -169,7 +170,7 @@ public class DockerTemplateOptions extends TemplateOptions implements Cloneable
@Override
public String toString() {
return Objects.toStringHelper(this)
return MoreObjects.toStringHelper(this)
.add("volumes", volumes)
.add("hostname", hostname)
.add("dns", dns)

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

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

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

@ -19,8 +19,9 @@ 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.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.ToStringHelper;
public class RegionAndName {
@ -67,7 +68,7 @@ public class RegionAndName {
}
protected ToStringHelper string() {
return Objects.toStringHelper("").add("region", region).add("name", name);
return MoreObjects.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.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.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,6 +20,7 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Date;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@ -144,7 +145,7 @@ public class PasswordData {
*/
@Override
public String toString() {
return Objects.toStringHelper(this).omitNullValues().add("instanceId", instanceId).add("timestamp", timestamp)
return MoreObjects.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,6 +22,7 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ComparisonChain;
import com.google.common.collect.ForwardingSet;
@ -214,7 +215,7 @@ public class Reservation<T extends RunningInstance> extends ForwardingSet<T> imp
*/
@Override
public String toString() {
return Objects.toStringHelper(this).omitNullValues().add("region", region).add("reservationId", reservationId)
return MoreObjects.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,8 +24,9 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Strings;
import com.google.common.collect.ComparisonChain;
import com.google.common.collect.ImmutableMap;
@ -506,7 +507,7 @@ public class RunningInstance implements Comparable<RunningInstance> {
}
protected ToStringHelper string() {
return Objects.toStringHelper(this).omitNullValues().add("region", region)
return MoreObjects.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,8 +23,9 @@ 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.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ForwardingSet;
import com.google.common.collect.ImmutableSet;
@ -211,7 +212,7 @@ public class SecurityGroup extends ForwardingSet<IpPermission> {
}
protected ToStringHelper string() {
return Objects.toStringHelper(this).omitNullValues().add("region", region).add("id", id).add("name", name)
return MoreObjects.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,8 +20,9 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Map;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableMap;
/**
@ -143,7 +144,7 @@ public final class Subnet {
}
private ToStringHelper string() {
return Objects.toStringHelper(this).omitNullValues().add("subnetId", subnetId).add("subnetState", subnetState)
return MoreObjects.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,8 +18,9 @@ package org.jclouds.ec2.domain;
import static com.google.common.base.Preconditions.checkNotNull;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Optional;
/**
@ -191,7 +192,7 @@ public class Tag {
}
protected ToStringHelper string() {
return Objects.toStringHelper(this).omitNullValues().add("resourceId", resourceId)
return MoreObjects.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,12 +16,13 @@
*/
package org.jclouds.elasticstack.domain;
import static com.google.common.base.Objects.firstNonNull;
import static com.google.common.base.MoreObjects.firstNonNull;
import static com.google.common.base.Preconditions.checkNotNull;
import 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 {
@ -152,7 +153,7 @@ public class WellKnownImage {
@Override
public String toString() {
return Objects.toStringHelper(this).omitNullValues().add("uuid", uuid).add("description", description)
return MoreObjects.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/AvailabilityZone.java
View File

@ -16,6 +16,7 @@
*/
package org.jclouds.openstack.cinder.v1.domain;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import java.beans.ConstructorProperties;
@ -97,8 +98,8 @@ public class AvailabilityZone {
return Objects.equal(this.name, that.name) && Objects.equal(this.state, that.state);
}
protected Objects.ToStringHelper string() {
return Objects.toStringHelper(this)
protected MoreObjects.ToStringHelper string() {
return MoreObjects.toStringHelper(this)
.add("name", name)
.add("state", state);
}

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

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

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

@ -17,6 +17,7 @@
package org.jclouds.openstack.cinder.v1.domain;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import org.jclouds.javax.annotation.Nullable;
@ -112,8 +113,8 @@ public class SnapshotExtendedAttributes {
&& Objects.equal(this.progress, that.progress);
}
protected Objects.ToStringHelper string() {
return Objects.toStringHelper(this)
protected MoreObjects.ToStringHelper string() {
return MoreObjects.toStringHelper(this)
.add("projectId", projectId).add("progress", progress);
}

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

@ -28,8 +28,9 @@ 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.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
@ -366,7 +367,7 @@ public class Volume {
}
protected ToStringHelper string() {
return Objects.toStringHelper(this)
return MoreObjects.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).add("extendedAttributes", tenantId);
}

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

@ -24,8 +24,9 @@ import javax.inject.Named;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.ToStringHelper;
/**
* An OpenStack Cinder Volume Attachment (describes how Volumes are attached to Servers).
@ -164,7 +165,7 @@ public class VolumeAttachment {
}
protected ToStringHelper string() {
return Objects.toStringHelper(this)
return MoreObjects.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,6 +16,7 @@
*/
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;
@ -79,8 +80,8 @@ public class VolumeQuota {
&& Objects.equal(this.snapshots, that.snapshots);
}
protected Objects.ToStringHelper string() {
return Objects.toStringHelper(this)
protected MoreObjects.ToStringHelper string() {
return MoreObjects.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

@ -16,8 +16,9 @@
*/
package org.jclouds.openstack.cinder.v1.domain;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableMap;
import org.jclouds.javax.annotation.Nullable;
@ -182,7 +183,7 @@ public class VolumeType {
}
protected ToStringHelper string() {
return Objects.toStringHelper(this)
return MoreObjects.toStringHelper(this)
.add("id", id).add("name", name).add("created", created).add("updated", updated).add("extraSpecs", extraSpecs);
}

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

@ -16,6 +16,7 @@
*/
package org.jclouds.openstack.cinder.v1.domain;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import java.beans.ConstructorProperties;
@ -79,8 +80,8 @@ public class ZoneState {
return Objects.equal(this.available, that.available);
}
protected Objects.ToStringHelper string() {
return Objects.toStringHelper(this)
protected MoreObjects.ToStringHelper string() {
return MoreObjects.toStringHelper(this)
.add("available", available);
}

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.Objects.toStringHelper;
import static com.google.common.base.MoreObjects.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.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.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.Objects.toStringHelper;
import static com.google.common.base.MoreObjects.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.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.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,8 +23,9 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ForwardingSet;
import com.google.common.collect.ImmutableSet;
@ -142,7 +143,7 @@ public class Access extends ForwardingSet<Service> implements Comparable<Access>
}
protected ToStringHelper string() {
return Objects.toStringHelper(this).omitNullValues().add("token", token).add("user", user)
return MoreObjects.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,8 +23,9 @@ 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.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Api AccessKey Credentials
@ -127,7 +128,7 @@ public class ApiAccessKeyCredentials {
}
protected ToStringHelper string() {
return Objects.toStringHelper(this)
return MoreObjects.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.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.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,8 +21,9 @@ import java.net.URI;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.ToStringHelper;
/**
* An network-accessible address, usually described by URL, where a service may
@ -331,7 +332,7 @@ public class Endpoint {
}
protected ToStringHelper string() {
return Objects.toStringHelper(this).omitNullValues().add("id", id).add("versionId", versionId)
return MoreObjects.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,8 +20,9 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Class MediaType
@ -112,7 +113,7 @@ public class MediaType {
}
protected ToStringHelper string() {
return Objects.toStringHelper(this)
return MoreObjects.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,8 +22,9 @@ import java.beans.ConstructorProperties;
import org.jclouds.openstack.keystone.v2_0.config.CredentialType;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.ToStringHelper;
/**
* Password Credentials
@ -126,7 +127,7 @@ public class PasswordCredentials {
}
protected ToStringHelper string() {
return Objects.toStringHelper(this)
return MoreObjects.toStringHelper(this)
.add("username", username)
.add("password", password == null ? null : "*****");
}

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

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

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

@ -23,8 +23,9 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ForwardingSet;
import com.google.common.collect.ImmutableSet;
@ -191,7 +192,7 @@ public class Service extends ForwardingSet<Endpoint> {
}
protected ToStringHelper string() {
return Objects.toStringHelper(this).omitNullValues()
return MoreObjects.toStringHelper(this).omitNullValues()
.add("id", id).add("type", type).add("name", name)
.add("description", description).add("endpoints", endpoints);
}

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

@ -22,8 +22,9 @@ import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.ToStringHelper;
/**
* A container used to group or isolate resources and/or identity objects.
@ -162,7 +163,7 @@ public class Tenant {
}
protected ToStringHelper string() {
return Objects.toStringHelper(this).omitNullValues().add("id", id).add("name", name)
return MoreObjects.toStringHelper(this).omitNullValues().add("id", id).add("name", name)
.add("description", description).add("enabled", enabled);
}

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

@ -23,8 +23,9 @@ import java.util.Date;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Optional;
/**
@ -151,7 +152,7 @@ public class Token implements Comparable<Token> {
}
protected ToStringHelper string() {
return Objects.toStringHelper(this).omitNullValues()
return MoreObjects.toStringHelper(this).omitNullValues()
.add("id", id).add("expires", expires).add("tenant", tenant.orNull());
}

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

@ -23,8 +23,9 @@ import java.util.Set;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ForwardingSet;
import com.google.common.collect.ImmutableSet;
@ -207,7 +208,7 @@ public class User extends ForwardingSet<Role> {
}
protected ToStringHelper string() {
return Objects.toStringHelper(this).omitNullValues().add("id", id).add("name", name).add("email", email)
return MoreObjects.toStringHelper(this).omitNullValues().add("id", id).add("name", name).add("email", email)
.add("enabled", enabled).add("roles", roles).add("tenanId", tenantId);
}

5
apis/openstack-keystone/src/main/java/org/jclouds/openstack/keystone/v2_0/options/CreateTenantOptions.java
View File

@ -27,8 +27,9 @@ import org.jclouds.http.HttpRequest;
import org.jclouds.rest.MapBinder;
import org.jclouds.rest.binders.BindToJsonPayload;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.collect.ImmutableMap;
public class CreateTenantOptions implements MapBinder {
@ -57,7 +58,7 @@ public class CreateTenantOptions implements MapBinder {
}
protected ToStringHelper string() {
ToStringHelper toString = Objects.toStringHelper("").omitNullValues();
ToStringHelper toString = MoreObjects.toStringHelper("").omitNullValues();
toString.add("description", description);
toString.add("enabled", Boolean.valueOf(enabled));
return toString;

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