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 e2e288ee86d537d249c7e58c782a66b0201f2134.

Many conflicts on account of lots of changes since the original commit.
This commit is contained in:
Adrian Cole 2014-10-23 20:11:39 -07:00 committed by Adrian Cole
parent 52cf5555db
commit f94d0caf3b
5 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apis/oauth/src/main/java/org/jclouds/oauth/v2/domain/ClaimSet.java
View File

@ -26,9 +26,9 @@ import com.google.common.collect.Sets;
import java.util.Map;
import java.util.Set;
import static com.google.common.base.MoreObjects.ToStringHelper;
import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Objects.ToStringHelper;
import static com.google.common.base.Objects.equal;
import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.base.Preconditions.checkState;

5
apis/oauth/src/main/java/org/jclouds/oauth/v2/domain/Header.java
View File

@ -16,11 +16,10 @@
*/
package org.jclouds.oauth.v2.domain;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Objects.equal;
import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
/**
@ -122,7 +121,7 @@ public class Header {
return string().toString();
}
protected MoreObjects.ToStringHelper string() {
protected Objects.ToStringHelper string() {
return toStringHelper(this).omitNullValues().add("signerAlgorithm", signerAlgorithm)
.add("type", type);
}

5
apis/oauth/src/main/java/org/jclouds/oauth/v2/domain/OAuthCredentials.java
View File

@ -16,14 +16,13 @@
*/
package org.jclouds.oauth.v2.domain;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import org.jclouds.domain.Credentials;
import java.security.PrivateKey;
import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Objects.equal;
import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
/**
@ -122,7 +121,7 @@ public class OAuthCredentials extends Credentials {
return string().toString();
}
protected MoreObjects.ToStringHelper string() {
protected Objects.ToStringHelper string() {
return toStringHelper(this).omitNullValues().add("identity", identity)
.add("credential", credential != null ? credential.hashCode() : null).add("privateKey",
privateKey.hashCode());

5
apis/oauth/src/main/java/org/jclouds/oauth/v2/domain/Token.java
View File

@ -16,13 +16,12 @@
*/
package org.jclouds.oauth.v2.domain;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import java.beans.ConstructorProperties;
import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Objects.equal;
import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
/**
@ -142,7 +141,7 @@ public class Token {
return string().toString();
}
protected MoreObjects.ToStringHelper string() {
protected Objects.ToStringHelper string() {
return toStringHelper(this).omitNullValues().add("accessToken", accessToken)
.add("tokenType", tokenType).add("expiresIn", expiresIn);
}

5
apis/oauth/src/main/java/org/jclouds/oauth/v2/domain/TokenRequest.java
View File

@ -16,11 +16,10 @@
*/
package org.jclouds.oauth.v2.domain;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Objects.equal;
import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkNotNull;
/**
@ -123,7 +122,7 @@ public class TokenRequest {
return string().toString();
}
protected MoreObjects.ToStringHelper string() {
protected Objects.ToStringHelper string() {
return toStringHelper(this).omitNullValues().add("header", header)
.add("claimSet", claimSet);
}