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 65e1def4bdc1d763f505a8316dd6eb78f26300a8.

Many conflicts due to many changes between above commit and now.
This commit is contained in:
Adrian Cole 2014-10-23 20:21:23 -07:00 committed by Adrian Cole
parent a164c071a9
commit bec0a921da
37 changed files with 98 additions and 113 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/AddressPair.java
View File

@ -16,14 +16,15 @@
*/
package org.jclouds.openstack.neutron.v2.domain;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import org.jclouds.javax.annotation.Nullable;
import static com.google.common.base.Preconditions.checkNotNull;
import javax.inject.Named;
import java.beans.ConstructorProperties;
import static com.google.common.base.Preconditions.checkNotNull;
import javax.inject.Named;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.Objects;
/**
* Contains a mapping between a MAC address and an IP address.
@ -87,8 +88,8 @@ public class AddressPair {
return Objects.equal(this.macAddress, that.macAddress) && Objects.equal(this.ipAddress, that.ipAddress);
}
protected MoreObjects.ToStringHelper string() {
return MoreObjects.toStringHelper(this).add("macAddress", macAddress).add("ipAddress", ipAddress);
protected Objects.ToStringHelper string() {
return Objects.toStringHelper(this).add("macAddress", macAddress).add("ipAddress", ipAddress);
}
@Override

10
apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/AllocationPool.java
View File

@ -16,11 +16,11 @@
*/
package org.jclouds.openstack.neutron.v2.domain;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
import java.beans.ConstructorProperties;
import com.google.common.base.Objects;
/**
* A Neutron Subnet Allocation Pool
@ -72,8 +72,8 @@ public class AllocationPool {
return Objects.equal(this.start, that.start) && Objects.equal(this.end, that.end);
}
protected MoreObjects.ToStringHelper string() {
return MoreObjects.toStringHelper(this).add("start", start).add("end", end);
protected Objects.ToStringHelper string() {
return Objects.toStringHelper(this).add("start", start).add("end", end);
}
@Override

11
apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/ExternalGatewayInfo.java
View File

@ -16,12 +16,13 @@
*/
package org.jclouds.openstack.neutron.v2.domain;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import org.jclouds.javax.annotation.Nullable;
import java.beans.ConstructorProperties;
import javax.inject.Named;
import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.Objects;
/**
* Information on the external gateway for the router
@ -89,7 +90,7 @@ public class ExternalGatewayInfo {
@Override
public String toString() {
return MoreObjects.toStringHelper(this)
return Objects.toStringHelper(this)
.add("networkId", networkId)
.add("enableSnat", enableSnat)
.toString();

13
apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/ExtraDhcpOption.java
View File

@ -16,12 +16,13 @@
*/
package org.jclouds.openstack.neutron.v2.domain;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import org.jclouds.javax.annotation.Nullable;
import java.beans.ConstructorProperties;
import javax.inject.Named;
import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.Objects;
/**
* This is used to provide additional DHCP-related options to Subnet. This is
@ -88,8 +89,8 @@ public class ExtraDhcpOption {
&& Objects.equal(this.optionValue, that.optionValue);
}
protected MoreObjects.ToStringHelper string() {
return MoreObjects.toStringHelper(this).add("id", id).add("optionName", optionName).add("optionValue", optionValue);
protected Objects.ToStringHelper string() {
return Objects.toStringHelper(this).add("id", id).add("optionName", optionName).add("optionValue", optionValue);
}
@Override

5
apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/FloatingIP.java
View File

@ -17,10 +17,11 @@
package org.jclouds.openstack.neutron.v2.domain;
import java.beans.ConstructorProperties;
import javax.inject.Named;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@ -152,7 +153,7 @@ public class FloatingIP {
@Override
public String toString() {
return MoreObjects.toStringHelper(this)
return Objects.toStringHelper(this)
.add("id", id)
.add("routerId", routerId)
.add("tenantId", tenantId)

13
apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/HostRoute.java
View File

@ -16,13 +16,14 @@
*/
package org.jclouds.openstack.neutron.v2.domain;
import com.google.common.base.MoreObjects;
import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
import org.jclouds.javax.annotation.Nullable;
import java.beans.ConstructorProperties;
import javax.inject.Named;
import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
/**
* A Neutron Subnet Host Route
@ -72,7 +73,7 @@ public class HostRoute {
}
protected ToStringHelper string() {
return MoreObjects.toStringHelper(this)
return Objects.toStringHelper(this)
.add("destinationCidr", destinationCidr).add("nextHop", nextHop);
}

13
apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/IP.java
View File

@ -16,12 +16,13 @@
*/
package org.jclouds.openstack.neutron.v2.domain;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import org.jclouds.javax.annotation.Nullable;
import java.beans.ConstructorProperties;
import javax.inject.Named;
import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.Objects;
/**
* Describes an IP address
@ -70,8 +71,8 @@ public class IP {
return Objects.equal(this.ipAddress, that.ipAddress) && Objects.equal(this.subnetId, that.subnetId);
}
protected MoreObjects.ToStringHelper string() {
return MoreObjects.toStringHelper(this).add("ipAddress", ipAddress).add("subnetId", subnetId);
protected Objects.ToStringHelper string() {
return Objects.toStringHelper(this).add("ipAddress", ipAddress).add("subnetId", subnetId);
}
@Override

3
apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Network.java
View File

@ -24,7 +24,6 @@ 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.collect.ImmutableSet;
@ -339,7 +338,7 @@ public class Network {
@Override
public String toString() {
return MoreObjects.toStringHelper(this)
return Objects.toStringHelper(this)
.add("id", id)
.add("status", status)
.add("subnets", subnets)

13
apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/NetworkSegment.java
View File

@ -16,12 +16,13 @@
*/
package org.jclouds.openstack.neutron.v2.domain;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import org.jclouds.javax.annotation.Nullable;
import java.beans.ConstructorProperties;
import javax.inject.Named;
import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.Objects;
/**
* A Neutron Network Segment
@ -88,8 +89,8 @@ public class NetworkSegment {
&& Objects.equal(this.segmentationId, that.segmentationId);
}
protected MoreObjects.ToStringHelper string() {
return MoreObjects.toStringHelper(this).add("networkType", networkType).add("physicalNetwork", physicalNetwork)
protected Objects.ToStringHelper string() {
return Objects.toStringHelper(this).add("networkType", networkType).add("physicalNetwork", physicalNetwork)
.add("segmentationId", segmentationId);
}

3
apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Port.java
View File

@ -24,7 +24,6 @@ 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.collect.ImmutableMap;
import com.google.common.collect.ImmutableSet;
@ -428,7 +427,7 @@ public class Port {
@Override
public String toString() {
return MoreObjects.toStringHelper(this)
return Objects.toStringHelper(this)
.add("id", id)
.add("status", status)
.add("vifType", vifType)

3
apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Router.java
View File

@ -22,7 +22,6 @@ import javax.inject.Named;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@ -162,7 +161,7 @@ public class Router {
@Override
public String toString() {
return MoreObjects.toStringHelper(this)
return Objects.toStringHelper(this)
.add("id", id)
.add("status", status)
.add("name", name)

13
apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/RouterInterface.java
View File

@ -16,12 +16,13 @@
*/
package org.jclouds.openstack.neutron.v2.domain;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import org.jclouds.javax.annotation.Nullable;
import java.beans.ConstructorProperties;
import javax.inject.Named;
import java.beans.ConstructorProperties;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.Objects;
/**
* A Neutron Router Interface
@ -74,8 +75,8 @@ public class RouterInterface {
return Objects.equal(this.subnetId, that.subnetId) && Objects.equal(this.portId, that.portId);
}
protected MoreObjects.ToStringHelper string() {
return MoreObjects.toStringHelper(this).add("subnetId", subnetId).add("portId", portId);
protected Objects.ToStringHelper string() {
return Objects.toStringHelper(this).add("subnetId", subnetId).add("portId", portId);
}
@Override

3
apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Rule.java
View File

@ -25,7 +25,6 @@ import javax.inject.Named;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@ -196,7 +195,7 @@ public class Rule {
@Override
public String toString() {
return MoreObjects.toStringHelper(this)
return Objects.toStringHelper(this)
.add("id", id)
.add("tenantId", tenantId)
.add("direction", direction)

1
apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Rules.java
View File

@ -20,6 +20,7 @@ import java.beans.ConstructorProperties;
import org.jclouds.openstack.v2_0.domain.Link;
import org.jclouds.openstack.v2_0.domain.PaginatedCollection;
import com.google.common.collect.ImmutableSet;
/**

4
apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/SecurityGroup.java
View File

@ -19,9 +19,9 @@ package org.jclouds.openstack.neutron.v2.domain;
import java.beans.ConstructorProperties;
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.collect.ImmutableList;
@ -121,7 +121,7 @@ public class SecurityGroup {
@Override
public String toString() {
return MoreObjects.toStringHelper(this)
return Objects.toStringHelper(this)
.add("id", id)
.add("tenantId", tenantId)
.add("name", name)

3
apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Subnet.java
View File

@ -25,7 +25,6 @@ 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.collect.ImmutableSet;
@ -244,7 +243,7 @@ public class Subnet {
@Override
public String toString() {
return MoreObjects.toStringHelper(this)
return Objects.toStringHelper(this)
.add("id", id)
.add("name", name)
.add("networkId", networkId)

3
apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/HealthMonitor.java
View File

@ -22,7 +22,6 @@ 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.collect.ImmutableList;
@ -226,7 +225,7 @@ public class HealthMonitor {
@Override
public String toString() {
return MoreObjects.toStringHelper(this).add("id", id).add("tenantId", tenantId).add("type", type)
return Objects.toStringHelper(this).add("id", id).add("tenantId", tenantId).add("type", type)
.add("delay", delay).add("timeout", timeout).add("maxRetries", maxRetries).add("httpMethod", httpMethod)
.add("urlPath", urlPath).add("expectedCodes", expectedCodes).add("pools", pools)
.add("adminStateUp", adminStateUp).add("status", status).add("statusDescription", statusDescription)

5
apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/HealthMonitorStatus.java
View File

@ -22,7 +22,6 @@ import javax.inject.Named;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@ -88,8 +87,8 @@ public class HealthMonitorStatus {
&& Objects.equal(this.statusDescription, that.statusDescription);
}
protected MoreObjects.ToStringHelper string() {
return MoreObjects.toStringHelper(this).add("id", id).add("status", status)
protected Objects.ToStringHelper string() {
return Objects.toStringHelper(this).add("id", id).add("status", status)
.add("statusDescription", statusDescription);
}

3
apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/Member.java
View File

@ -22,7 +22,6 @@ import javax.inject.Named;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@ -179,7 +178,7 @@ public class Member {
@Override
public String toString() {
return MoreObjects.toStringHelper(this).add("id", id).add("tenantId", tenantId).add("poolId", poolId)
return Objects.toStringHelper(this).add("id", id).add("tenantId", tenantId).add("poolId", poolId)
.add("address", address).add("protocolPort", protocolPort).add("weight", weight)
.add("adminStateUp", adminStateUp).add("status", status).add("statusDescription", statusDescription)
.toString();

3
apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/Pool.java
View File

@ -22,7 +22,6 @@ 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.collect.ImmutableList;
import com.google.common.collect.ImmutableSet;
@ -258,7 +257,7 @@ public class Pool {
@Override
public String toString() {
return MoreObjects.toStringHelper(this).add("id", id).add("tenantId", tenantId).add("vipId", vipId)
return Objects.toStringHelper(this).add("id", id).add("tenantId", tenantId).add("vipId", vipId)
.add("name", name).add("description", description).add("subnetId", subnetId).add("protocol", protocol)
.add("provider", provider).add("lbMethod", lbMethod).add("healthMonitors", healthMonitors)
.add("healthMonitorsStatus", healthMonitorsStatus).add("members", members)

5
apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/PoolStatus.java
View File

@ -22,7 +22,6 @@ import javax.inject.Named;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@ -88,8 +87,8 @@ public class PoolStatus {
&& Objects.equal(this.statusDescription, that.statusDescription);
}
protected MoreObjects.ToStringHelper string() {
return MoreObjects.toStringHelper(this).add("id", id).add("status", status)
protected Objects.ToStringHelper string() {
return Objects.toStringHelper(this).add("id", id).add("status", status)
.add("statusDescription", statusDescription);
}

5
apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/SessionPersistence.java
View File

@ -22,7 +22,6 @@ import javax.inject.Named;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@ -74,8 +73,8 @@ public class SessionPersistence {
return Objects.equal(this.type, that.type) && Objects.equal(this.cookieName, that.cookieName);
}
protected MoreObjects.ToStringHelper string() {
return MoreObjects.toStringHelper(this).add("type", type).add("cookieName", cookieName);
protected Objects.ToStringHelper string() {
return Objects.toStringHelper(this).add("type", type).add("cookieName", cookieName);
}
@Override

3
apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/lbaas/v1/VIP.java
View File

@ -22,7 +22,6 @@ import javax.inject.Named;
import org.jclouds.javax.annotation.Nullable;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
/**
@ -251,7 +250,7 @@ public class VIP {
@Override
public String toString() {
return MoreObjects.toStringHelper(this).add("id", id).add("tenantId", tenantId).add("name", name)
return Objects.toStringHelper(this).add("id", id).add("tenantId", tenantId).add("name", name)
.add("description", description).add("subnetId", subnetId).add("address", address).add("portId", portId)
.add("protocol", protocol).add("protocolPort", protocolPort).add("poolId", poolId)
.add("sessionPersistence", sessionPersistence).add("connectionLimit", connectionLimit)

5
apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/AllocationPool.java
View File

@ -17,9 +17,8 @@
package org.jclouds.openstack.neutron.v2_0.domain;
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 java.beans.ConstructorProperties;
@ -69,7 +68,7 @@ public class AllocationPool {
}
protected ToStringHelper string() {
return MoreObjects.toStringHelper(this).add("start", start).add("end", end);
return Objects.toStringHelper(this).add("start", start).add("end", end);
}
@Override

5
apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/BulkNetwork.java
View File

@ -17,7 +17,6 @@
package org.jclouds.openstack.neutron.v2_0.domain;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import java.beans.ConstructorProperties;
@ -107,8 +106,8 @@ public class BulkNetwork {
&& Objects.equal(this.segmentationId, that.segmentationId);
}
protected MoreObjects.ToStringHelper string() {
return MoreObjects.toStringHelper(this)
protected Objects.ToStringHelper string() {
return Objects.toStringHelper(this)
.add("name", name).add("adminStateUp", adminStateUp).add("external", external)
.add("networkType", networkType).add("physicalNetworkName", physicalNetworkName)
.add("segmentationId", segmentationId);

5
apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/BulkPort.java
View File

@ -17,7 +17,6 @@
package org.jclouds.openstack.neutron.v2_0.domain;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
@ -120,8 +119,8 @@ public class BulkPort {
&& Objects.equal(this.macAddress, that.macAddress);
}
protected MoreObjects.ToStringHelper string() {
return MoreObjects.toStringHelper(this)
protected Objects.ToStringHelper string() {
return Objects.toStringHelper(this)
.add("name", name).add("networkId", networkId).add("adminStateUp", adminStateUp)
.add("deviceId", deviceId).add("deviceOwner", deviceOwner).add("fixedIps", fixedIps).add("macAddress", macAddress);
}

5
apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/BulkSubnet.java
View File

@ -17,7 +17,6 @@
package org.jclouds.openstack.neutron.v2_0.domain;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
@ -142,8 +141,8 @@ public class BulkSubnet {
&& Objects.equal(this.hostRoutes, that.hostRoutes);
}
protected MoreObjects.ToStringHelper string() {
return MoreObjects.toStringHelper(this)
protected Objects.ToStringHelper string() {
return Objects.toStringHelper(this)
.add("name", name).add("networkId", networkId).add("gatewayIp", gatewayIp).add("ipVersion", ipVersion)
.add("cidr", cidr).add("enableDhcp", enableDhcp).add("allocationPools", allocationPools)
.add("dnsNameServers", dnsNameServers).add("hostRoutes", hostRoutes);

5
apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/ExternalGatewayInfo.java
View File

@ -17,7 +17,6 @@
package org.jclouds.openstack.neutron.v2_0.domain;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import java.beans.ConstructorProperties;
@ -54,8 +53,8 @@ public class ExternalGatewayInfo {
return Objects.equal(this.networkId, that.networkId);
}
protected MoreObjects.ToStringHelper string() {
return MoreObjects.toStringHelper(this).add("networkId", networkId);
protected Objects.ToStringHelper string() {
return Objects.toStringHelper(this).add("networkId", networkId);
}
@Override

5
apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/HostRoute.java
View File

@ -17,9 +17,8 @@
package org.jclouds.openstack.neutron.v2_0.domain;
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 java.beans.ConstructorProperties;
@ -69,7 +68,7 @@ public class HostRoute {
}
protected ToStringHelper string() {
return MoreObjects.toStringHelper(this)
return Objects.toStringHelper(this)
.add("destinationCidr", destinationCidr).add("nextHop", nextHop);
}

5
apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/IP.java
View File

@ -17,7 +17,6 @@
package org.jclouds.openstack.neutron.v2_0.domain;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import java.beans.ConstructorProperties;
@ -62,8 +61,8 @@ public class IP {
return Objects.equal(this.ipAddress, that.ipAddress) && Objects.equal(this.subnetId, that.subnetId);
}
protected MoreObjects.ToStringHelper string() {
return MoreObjects.toStringHelper(this)
protected Objects.ToStringHelper string() {
return Objects.toStringHelper(this)
.add("ipAddress", ipAddress).add("subnetId", subnetId);
}

3
apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Network.java
View File

@ -17,7 +17,6 @@
package org.jclouds.openstack.neutron.v2_0.domain;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableSet;
@ -136,7 +135,7 @@ public class Network extends ReferenceWithName {
&& Objects.equal(this.segmentationId, that.segmentationId);
}
protected MoreObjects.ToStringHelper string() {
protected Objects.ToStringHelper string() {
return super.string()
.add("state", state).add("subnets", subnets).add("adminStateUp", adminStateUp).add("shared", shared).add("external", external)
.add("networkType", networkType).add("physicalNetworkName", physicalNetworkName).add("segmentationId", segmentationId);

3
apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Port.java
View File

@ -17,7 +17,6 @@
package org.jclouds.openstack.neutron.v2_0.domain;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import java.beans.ConstructorProperties;
@ -124,7 +123,7 @@ public class Port extends ReferenceWithName {
&& Objects.equal(this.macAddress, that.macAddress);
}
protected MoreObjects.ToStringHelper string() {
protected Objects.ToStringHelper string() {
return super.string()
.add("state", state).add("adminStateUp", adminStateUp).add("networkId", networkId).add("deviceId", deviceId)
.add("deviceOwner", deviceOwner).add("fixedIps", fixedIps).add("macAddress", macAddress);

5
apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Reference.java
View File

@ -17,7 +17,6 @@
package org.jclouds.openstack.neutron.v2_0.domain;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import java.beans.ConstructorProperties;
@ -69,8 +68,8 @@ public class Reference {
return Objects.equal(this.id, that.id) && Objects.equal(this.tenantId, that.tenantId);
}
protected MoreObjects.ToStringHelper string() {
return MoreObjects.toStringHelper(this)
protected Objects.ToStringHelper string() {
return Objects.toStringHelper(this)
.add("id", id).add("tenantId", tenantId);
}

2
apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/ReferenceWithName.java
View File

@ -17,8 +17,8 @@
package org.jclouds.openstack.neutron.v2_0.domain;
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 java.beans.ConstructorProperties;

3
apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Router.java
View File

@ -17,7 +17,6 @@
package org.jclouds.openstack.neutron.v2_0.domain;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import java.beans.ConstructorProperties;
@ -80,7 +79,7 @@ public class Router extends ReferenceWithName {
&& Objects.equal(this.externalGatewayInfo, that.externalGatewayInfo);
}
protected MoreObjects.ToStringHelper string() {
protected Objects.ToStringHelper string() {
return super.string()
.add("adminStateUp", adminStateUp).add("state", state).add("externalGatewayInfo", externalGatewayInfo != null ? externalGatewayInfo.toString() : "");
}

5
apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/RouterInterface.java
View File

@ -17,7 +17,6 @@
package org.jclouds.openstack.neutron.v2_0.domain;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import java.beans.ConstructorProperties;
@ -67,8 +66,8 @@ public class RouterInterface {
return Objects.equal(this.subnetId, that.subnetId) && Objects.equal(this.portId, that.portId);
}
protected MoreObjects.ToStringHelper string() {
return MoreObjects.toStringHelper(this)
protected Objects.ToStringHelper string() {
return Objects.toStringHelper(this)
.add("subnetId", subnetId).add("portId", portId);
}

2
apis/openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2_0/domain/Subnet.java
View File

@ -17,8 +17,8 @@
package org.jclouds.openstack.neutron.v2_0.domain;
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 java.beans.ConstructorProperties;