You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jclouds.apache.org by na...@apache.org on 2015/04/15 21:41:29 UTC

[24/39] jclouds git commit: Revert "JCLOUDS-653: Address Guava 18 deprecations"

Revert "JCLOUDS-653: Address Guava 18 deprecations"

This reverts commit e2e288ee86d537d249c7e58c782a66b0201f2134.

Many conflicts on account of lots of changes since the original commit.


Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/f94d0caf
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/f94d0caf
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/f94d0caf

Branch: refs/heads/master
Commit: f94d0caf3b1cda76b4e536fa048994943bc192bb
Parents: 52cf555
Author: Adrian Cole <ad...@gmail.com>
Authored: Thu Oct 23 20:11:39 2014 -0700
Committer: Adrian Cole <ac...@twitter.com>
Committed: Fri Oct 24 10:54:47 2014 -0700

----------------------------------------------------------------------
 .../src/main/java/org/jclouds/oauth/v2/domain/ClaimSet.java     | 4 ++--
 .../oauth/src/main/java/org/jclouds/oauth/v2/domain/Header.java | 5 ++---
 .../main/java/org/jclouds/oauth/v2/domain/OAuthCredentials.java | 5 ++---
 apis/oauth/src/main/java/org/jclouds/oauth/v2/domain/Token.java | 5 ++---
 .../src/main/java/org/jclouds/oauth/v2/domain/TokenRequest.java | 5 ++---
 5 files changed, 10 insertions(+), 14 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jclouds/blob/f94d0caf/apis/oauth/src/main/java/org/jclouds/oauth/v2/domain/ClaimSet.java
----------------------------------------------------------------------
diff --git a/apis/oauth/src/main/java/org/jclouds/oauth/v2/domain/ClaimSet.java b/apis/oauth/src/main/java/org/jclouds/oauth/v2/domain/ClaimSet.java
index 2143474..5c0b348 100644
--- a/apis/oauth/src/main/java/org/jclouds/oauth/v2/domain/ClaimSet.java
+++ b/apis/oauth/src/main/java/org/jclouds/oauth/v2/domain/ClaimSet.java
@@ -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;
 

http://git-wip-us.apache.org/repos/asf/jclouds/blob/f94d0caf/apis/oauth/src/main/java/org/jclouds/oauth/v2/domain/Header.java
----------------------------------------------------------------------
diff --git a/apis/oauth/src/main/java/org/jclouds/oauth/v2/domain/Header.java b/apis/oauth/src/main/java/org/jclouds/oauth/v2/domain/Header.java
index baacc11..c230e1d 100644
--- a/apis/oauth/src/main/java/org/jclouds/oauth/v2/domain/Header.java
+++ b/apis/oauth/src/main/java/org/jclouds/oauth/v2/domain/Header.java
@@ -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);
    }

http://git-wip-us.apache.org/repos/asf/jclouds/blob/f94d0caf/apis/oauth/src/main/java/org/jclouds/oauth/v2/domain/OAuthCredentials.java
----------------------------------------------------------------------
diff --git a/apis/oauth/src/main/java/org/jclouds/oauth/v2/domain/OAuthCredentials.java b/apis/oauth/src/main/java/org/jclouds/oauth/v2/domain/OAuthCredentials.java
index ca2bd08..78cb402 100644
--- a/apis/oauth/src/main/java/org/jclouds/oauth/v2/domain/OAuthCredentials.java
+++ b/apis/oauth/src/main/java/org/jclouds/oauth/v2/domain/OAuthCredentials.java
@@ -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());

http://git-wip-us.apache.org/repos/asf/jclouds/blob/f94d0caf/apis/oauth/src/main/java/org/jclouds/oauth/v2/domain/Token.java
----------------------------------------------------------------------
diff --git a/apis/oauth/src/main/java/org/jclouds/oauth/v2/domain/Token.java b/apis/oauth/src/main/java/org/jclouds/oauth/v2/domain/Token.java
index ff44d69..a18a7eb 100644
--- a/apis/oauth/src/main/java/org/jclouds/oauth/v2/domain/Token.java
+++ b/apis/oauth/src/main/java/org/jclouds/oauth/v2/domain/Token.java
@@ -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);
    }

http://git-wip-us.apache.org/repos/asf/jclouds/blob/f94d0caf/apis/oauth/src/main/java/org/jclouds/oauth/v2/domain/TokenRequest.java
----------------------------------------------------------------------
diff --git a/apis/oauth/src/main/java/org/jclouds/oauth/v2/domain/TokenRequest.java b/apis/oauth/src/main/java/org/jclouds/oauth/v2/domain/TokenRequest.java
index 71f3420..7d1a6a4 100644
--- a/apis/oauth/src/main/java/org/jclouds/oauth/v2/domain/TokenRequest.java
+++ b/apis/oauth/src/main/java/org/jclouds/oauth/v2/domain/TokenRequest.java
@@ -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);
    }