honeymoose/jclouds
1
0
Fork 0
mirror of https://github.com/apache/jclouds.git synced 2026-09-01 00:44:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "JCLOUDS-653: Address Guava 18 deprecations"

Browse Source 
This reverts commit 95cfc0d950.

Many conflicts due to duration between above commit and now
This commit is contained in:
Adrian Cole
2014-10-23 20:48:35 -07:00
committed by Adrian Cole
parent f134367c69
commit 3980cd791b
434 changed files with 729 additions and 1026 deletions
Download Patch File Download Diff File Expand all files Collapse all files
scriptbuilder/src/main/java/org/jclouds/scriptbuilder/InitScript.java
+1 -1
View File
@@ -17,7 +17,7 @@
package org.jclouds.scriptbuilder;
import static com.google.common.base.Objects.equal;
import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkArgument;
import static com.google.common.base.Preconditions.checkNotNull;
import static com.google.common.collect.Iterables.concat;
scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/GitRepoAndRef.java
+1 -2
View File
@@ -20,7 +20,6 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.net.URI;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Optional;
@@ -146,7 +145,7 @@ public class GitRepoAndRef {
*/
@Override
public String toString() {
return MoreObjects.toStringHelper(this).omitNullValues().add("repository", repository).add("branch", branch.orNull())
return Objects.toStringHelper(this).omitNullValues().add("repository", repository).add("branch", branch.orNull())
.add("tag", tag.orNull()).toString();
}
scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/chef/DataBag.java
+1 -2
View File
@@ -20,7 +20,6 @@ import static com.google.common.base.Preconditions.checkNotNull;
import java.util.Map;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.collect.ForwardingMap;
import com.google.common.collect.ImmutableMap;
@@ -105,7 +104,7 @@ public class DataBag extends ForwardingMap<String, String> {
@Override
public String toString() {
return MoreObjects.toStringHelper(this).add("name", name).toString();
return Objects.toStringHelper(this).add("name", name).toString();
}
}
scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/chef/Role.java
+1 -2
View File
@@ -18,7 +18,6 @@ package org.jclouds.scriptbuilder.domain.chef;
import static com.google.common.base.Preconditions.checkNotNull;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Optional;
@@ -140,7 +139,7 @@ public class Role {
@Override
public String toString() {
return MoreObjects.toStringHelper(this).omitNullValues().add("name", name).add("description", description.orNull())
return Objects.toStringHelper(this).omitNullValues().add("name", name).add("description", description.orNull())
.toString();
}
scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/git/CloneGitRepo.java
+1 -2
View File
@@ -25,7 +25,6 @@ import org.jclouds.scriptbuilder.domain.OsFamily;
import org.jclouds.scriptbuilder.domain.Statement;
import org.jclouds.scriptbuilder.domain.Statements;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Optional;
import com.google.common.base.Splitter;
@@ -191,7 +190,7 @@ public class CloneGitRepo implements Statement {
*/
@Override
public String toString() {
return MoreObjects.toStringHelper(this).omitNullValues().add("gitRepoAndRef", gitRepoAndRef)
return Objects.toStringHelper(this).omitNullValues().add("gitRepoAndRef", gitRepoAndRef)
.add("directory", directory.orNull()).toString();
}
scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/AdminAccessBuilderSpec.java
+1 -1
View File
@@ -17,7 +17,7 @@
package org.jclouds.scriptbuilder.statements.login;
import static com.google.common.base.Objects.equal;
import static com.google.common.base.MoreObjects.toStringHelper;
import static com.google.common.base.Objects.toStringHelper;
import static com.google.common.base.Preconditions.checkArgument;
import java.io.File;
scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/UserAdd.java
+1 -2
View File
@@ -31,7 +31,6 @@ import org.jclouds.scriptbuilder.statements.ssh.InstallRSAPrivateKey;
import com.google.common.base.Function;
import com.google.common.base.Joiner;
import com.google.common.base.MoreObjects;
import com.google.common.base.Objects;
import com.google.common.base.Strings;
import com.google.common.base.Throwables;
@@ -254,6 +253,6 @@ public class UserAdd implements Statement {
@Override
public String toString() {
return MoreObjects.toStringHelper("").add("login", login).toString();
return Objects.toStringHelper("").add("login", login).toString();
}
}