Skip to content
Permalink
Browse files
Revert "JCLOUDS-653: Address Guava 18 deprecations" 
This reverts commit 65e1def.

Many conflicts due to many changes between above commit and now.
  • Loading branch information
Adrian Cole authored and Adrian Cole committed Oct 24, 2014
1 parent 9e2049d commit 41948661a47f46fd0b4baa6801dd90fae6364b40
Showing 64 changed files with 146 additions and 183 deletions.
2 openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/Image.java
View file
@@ -25,8 +25,8 @@
import org.jclouds.openstack.v2_0.domain.Link;
import org.jclouds.openstack.v2_0.domain.Resource;

import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.Optional;

/**
2 openstack-glance/src/main/java/org/jclouds/openstack/glance/v1_0/domain/ImageDetails.java
View file
@@ -28,8 +28,8 @@
import org.jclouds.javax.annotation.Nullable;
import org.jclouds.openstack.v2_0.domain.Link;

import com.google.common.base.MoreObjects.ToStringHelper;
import com.google.common.base.Objects;
import com.google.common.base.Objects.ToStringHelper;
import com.google.common.base.Optional;
import com.google.common.collect.ImmutableMap;

5 openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/Aged.java
View file
@@ -17,7 +17,6 @@

package org.jclouds.openstack.marconi.v1.domain;

import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;

import javax.inject.Named;
@@ -80,8 +79,8 @@ public boolean equals(Object obj) {
&& Objects.equal(this.id, that.id);
}

protected MoreObjects.ToStringHelper string() {
return MoreObjects.toStringHelper(this)
protected Objects.ToStringHelper string() {
return Objects.toStringHelper(this)
.add("age", age).add("created", created).add("id", id);
}

5 openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/Claim.java
View file
@@ -17,7 +17,6 @@

package org.jclouds.openstack.marconi.v1.domain;

import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ImmutableList;
import org.jclouds.javax.annotation.Nullable;
@@ -84,8 +83,8 @@ public boolean equals(Object obj) {
return Objects.equal(this.id, that.id);
}

protected MoreObjects.ToStringHelper string() {
return MoreObjects.toStringHelper(this)
protected Objects.ToStringHelper string() {
return Objects.toStringHelper(this)
.add("id", id).add("ttl", ttl).add("age", age).add("messages", messages);
}

5 openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/CreateMessage.java
View file
@@ -17,7 +17,6 @@

package org.jclouds.openstack.marconi.v1.domain;

import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import org.jclouds.domain.JsonBall;

@@ -63,8 +62,8 @@ public boolean equals(Object obj) {
return Objects.equal(this.ttl, that.ttl) && Objects.equal(this.body, that.body);
}

protected MoreObjects.ToStringHelper string() {
return MoreObjects.toStringHelper(this)
protected Objects.ToStringHelper string() {
return Objects.toStringHelper(this)
.add("ttl", ttl).add("body", body);
}

5 openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/Message.java
View file
@@ -17,7 +17,6 @@

package org.jclouds.openstack.marconi.v1.domain;

import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Optional;
import org.jclouds.javax.annotation.Nullable;
@@ -91,8 +90,8 @@ public boolean equals(Object obj) {
return Objects.equal(this.id, that.id);
}

protected MoreObjects.ToStringHelper string() {
return MoreObjects.toStringHelper(this).omitNullValues()
protected Objects.ToStringHelper string() {
return Objects.toStringHelper(this).omitNullValues()
.add("id", id).add("ttl", ttl).add("body", body).add("age", age).add("claimId", claimId);
}

5 openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/MessagesCreated.java
View file
@@ -17,7 +17,6 @@

package org.jclouds.openstack.marconi.v1.domain;

import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;

import javax.inject.Named;
@@ -61,8 +60,8 @@ public boolean equals(Object obj) {
return Objects.equal(this.messageIds, that.messageIds);
}

protected MoreObjects.ToStringHelper string() {
return MoreObjects.toStringHelper(this).add("messageIds", messageIds);
protected Objects.ToStringHelper string() {
return Objects.toStringHelper(this).add("messageIds", messageIds);
}

@Override
5 openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/MessagesStats.java
View file
@@ -17,7 +17,6 @@

package org.jclouds.openstack.marconi.v1.domain;

import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Optional;
import org.jclouds.javax.annotation.Nullable;
@@ -98,8 +97,8 @@ public boolean equals(Object obj) {
&& Objects.equal(this.newest, that.newest);
}

protected MoreObjects.ToStringHelper string() {
return MoreObjects.toStringHelper(this).omitNullValues()
protected Objects.ToStringHelper string() {
return Objects.toStringHelper(this).omitNullValues()
.add("claimed", claimed).add("free", free).add("total", total).add("oldest", oldest).add("newest", newest);
}

5 openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/Queue.java
View file
@@ -17,7 +17,6 @@

package org.jclouds.openstack.marconi.v1.domain;

import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Optional;
import org.jclouds.javax.annotation.Nullable;
@@ -66,8 +65,8 @@ public boolean equals(Object obj) {
return Objects.equal(this.name, that.name);
}

protected MoreObjects.ToStringHelper string() {
return MoreObjects.toStringHelper(this).omitNullValues()
protected Objects.ToStringHelper string() {
return Objects.toStringHelper(this).omitNullValues()
.add("name", name).add("metadata", metadata);
}

5 openstack-marconi/src/main/java/org/jclouds/openstack/marconi/v1/domain/QueueStats.java
View file
@@ -17,7 +17,6 @@

package org.jclouds.openstack.marconi.v1.domain;

import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;

import static com.google.common.base.Preconditions.checkNotNull;
@@ -53,8 +52,8 @@ public boolean equals(Object obj) {
return Objects.equal(this.messages, that.messages);
}

protected MoreObjects.ToStringHelper string() {
return MoreObjects.toStringHelper(this)
protected Objects.ToStringHelper string() {
return Objects.toStringHelper(this)
.add("messagesStats", messages);
}

15 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 boolean equals(Object obj) {
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 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 boolean equals(Object obj) {
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 ...ck-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 Builder toBuilder() {

@Override
public String toString() {
return MoreObjects.toStringHelper(this)
return Objects.toStringHelper(this)
.add("networkId", networkId)
.add("enableSnat", enableSnat)
.toString();
13 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 boolean equals(Object obj) {
&& 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 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 int hashCode() {

@Override
public String toString() {
return MoreObjects.toStringHelper(this)
return Objects.toStringHelper(this)
.add("id", id)
.add("routerId", routerId)
.add("tenantId", tenantId)
13 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 boolean equals(Object obj) {
}

protected ToStringHelper string() {
return MoreObjects.toStringHelper(this)
return Objects.toStringHelper(this)
.add("destinationCidr", destinationCidr).add("nextHop", nextHop);
}

13 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 boolean equals(Object obj) {
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 openstack-neutron/src/main/java/org/jclouds/openstack/neutron/v2/domain/Network.java
View file
@@ -24,7 +24,6 @@

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 boolean equals(Object obj) {

@Override
public String toString() {
return MoreObjects.toStringHelper(this)
return Objects.toStringHelper(this)
.add("id", id)
.add("status", status)
.add("subnets", subnets)

0 comments on commit 4194866

Please sign in to comment.