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:25 UTC
[20/39] jclouds git commit: JCLOUDS-653: Address Guava 18 deprecations
JCLOUDS-653: Address Guava 18 deprecations
Mostly renaming Objects.toStringHelper to MoreObjects.toStringHelper.
Project: http://git-wip-us.apache.org/repos/asf/jclouds/repo
Commit: http://git-wip-us.apache.org/repos/asf/jclouds/commit/5c1e36e5
Tree: http://git-wip-us.apache.org/repos/asf/jclouds/tree/5c1e36e5
Diff: http://git-wip-us.apache.org/repos/asf/jclouds/diff/5c1e36e5
Branch: refs/heads/master
Commit: 5c1e36e5d19bc211196b1973d119f2c16ce40167
Parents: a6ad6d4
Author: Andrew Gaul <ga...@apache.org>
Authored: Fri Aug 8 11:49:42 2014 -0700
Committer: Andrew Gaul <ga...@apache.org>
Committed: Fri Aug 8 11:55:25 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, 14 insertions(+), 10 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jclouds/blob/5c1e36e5/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 5c0b348..2143474 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.Objects.ToStringHelper;
+import static com.google.common.base.MoreObjects.ToStringHelper;
+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;
import static com.google.common.base.Preconditions.checkState;
http://git-wip-us.apache.org/repos/asf/jclouds/blob/5c1e36e5/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 c230e1d..baacc11 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,10 +16,11 @@
*/
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;
/**
@@ -121,7 +122,7 @@ public class Header {
return string().toString();
}
- protected Objects.ToStringHelper string() {
+ protected MoreObjects.ToStringHelper string() {
return toStringHelper(this).omitNullValues().add("signerAlgorithm", signerAlgorithm)
.add("type", type);
}
http://git-wip-us.apache.org/repos/asf/jclouds/blob/5c1e36e5/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 78cb402..ca2bd08 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,13 +16,14 @@
*/
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;
/**
@@ -121,7 +122,7 @@ public class OAuthCredentials extends Credentials {
return string().toString();
}
- protected Objects.ToStringHelper string() {
+ protected MoreObjects.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/5c1e36e5/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 a18a7eb..ff44d69 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,12 +16,13 @@
*/
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;
/**
@@ -141,7 +142,7 @@ public class Token {
return string().toString();
}
- protected Objects.ToStringHelper string() {
+ protected MoreObjects.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/5c1e36e5/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 7d1a6a4..71f3420 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,10 +16,11 @@
*/
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 +123,7 @@ public class TokenRequest {
return string().toString();
}
- protected Objects.ToStringHelper string() {
+ protected MoreObjects.ToStringHelper string() {
return toStringHelper(this).omitNullValues().add("header", header)
.add("claimSet", claimSet);
}