JCLOUDS-653: Address Guava 18 deprecations

Mostly renaming Objects.toStringHelper to MoreObjects.toStringHelper.

scriptbuilder/src/main/java/org/jclouds/scriptbuilder/InitScript.java

@@ -17,7 +17,7 @@
 package org.jclouds.scriptbuilder;
 
 import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.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

@@ -20,6 +20,7 @@ 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;
 
@@ -145,7 +146,7 @@ public class GitRepoAndRef  {
     */
    @Override
    public String toString() {
-      return Objects.toStringHelper(this).omitNullValues().add("repository", repository).add("branch", branch.orNull())
+      return MoreObjects.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

@@ -20,6 +20,7 @@ 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;
@@ -104,7 +105,7 @@ public class DataBag extends ForwardingMap<String, String> {
 
    @Override
    public String toString() {
-      return Objects.toStringHelper(this).add("name", name).toString();
+      return MoreObjects.toStringHelper(this).add("name", name).toString();
    }
 
 }

scriptbuilder/src/main/java/org/jclouds/scriptbuilder/domain/chef/Role.java

@@ -18,6 +18,7 @@ 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;
 
@@ -139,7 +140,7 @@ public class Role {
 
    @Override
    public String toString() {
-      return Objects.toStringHelper(this).omitNullValues().add("name", name).add("description", description.orNull())
+      return MoreObjects.toStringHelper(this).omitNullValues().add("name", name).add("description", description.orNull())
             .toString();
    }
 

scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/git/CloneGitRepo.java

@@ -25,6 +25,7 @@ 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;
@@ -190,7 +191,7 @@ public class CloneGitRepo implements Statement {
     */
    @Override
    public String toString() {
-      return Objects.toStringHelper(this).omitNullValues().add("gitRepoAndRef", gitRepoAndRef)
+      return MoreObjects.toStringHelper(this).omitNullValues().add("gitRepoAndRef", gitRepoAndRef)
             .add("directory", directory.orNull()).toString();
    }
 

scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/AdminAccessBuilderSpec.java

@@ -17,7 +17,7 @@
 package org.jclouds.scriptbuilder.statements.login;
 
 import static com.google.common.base.Objects.equal;
-import static com.google.common.base.Objects.toStringHelper;
+import static com.google.common.base.MoreObjects.toStringHelper;
 import static com.google.common.base.Preconditions.checkArgument;
 
 import java.io.File;

scriptbuilder/src/main/java/org/jclouds/scriptbuilder/statements/login/UserAdd.java

@@ -31,6 +31,7 @@ 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;
@@ -253,6 +254,6 @@ public class UserAdd implements Statement {
 
    @Override
    public String toString() {
-      return Objects.toStringHelper("").add("login", login).toString();
+      return MoreObjects.toStringHelper("").add("login", login).toString();
    }
 }