This is an automated email from the ASF dual-hosted git repository. heneveld pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/brooklyn-server.git
commit c112e132cd742eaba478b85bf01352289af4783e Author: Alex Heneveld <[email protected]> AuthorDate: Tue Nov 9 14:00:03 2021 +0000 more guava updates --- .../src/main/java/org/apache/brooklyn/cli/AbstractMain.java | 10 +++++----- .../src/main/java/org/apache/brooklyn/cli/CloudExplorer.java | 4 ++-- server-cli/src/main/java/org/apache/brooklyn/cli/Main.java | 2 +- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/server-cli/src/main/java/org/apache/brooklyn/cli/AbstractMain.java b/server-cli/src/main/java/org/apache/brooklyn/cli/AbstractMain.java index d7835b6..84fe673 100644 --- a/server-cli/src/main/java/org/apache/brooklyn/cli/AbstractMain.java +++ b/server-cli/src/main/java/org/apache/brooklyn/cli/AbstractMain.java @@ -18,6 +18,8 @@ */ package org.apache.brooklyn.cli; +import com.google.common.base.MoreObjects; +import com.google.common.base.MoreObjects.ToStringHelper; import io.airlift.airline.Arguments; import io.airlift.airline.Cli; import io.airlift.airline.Cli.CliBuilder; @@ -51,18 +53,16 @@ import org.slf4j.Logger; import org.slf4j.LoggerFactory; import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Objects; -import com.google.common.base.Objects.ToStringHelper; /** * This class is the primary CLI for brooklyn. * Run with the `help` argument for help. * <p> * This class is designed for subclassing, with subclasses typically: - * <li> providing their own static {@link #main(String...)} (of course) which need simply invoke + * <li> providing their own static main (of course) which need simply invoke * {@link #execCli(String[])} with the arguments * <li> returning their CLI name (e.g. "start.sh") in an overridden {@link #cliScriptName()} - * <li> providing an overridden {@link LaunchCommand} via {@link #cliLaunchCommand()} if desired + * <li> providing an overridden {@link LaunchCommand} if desired * <li> providing any other CLI customisations by overriding {@link #cliBuilder()} * (typically calling the parent and then customizing the builder) * <li> populating a custom catalog using {@link LaunchCommand#populateCatalog(BrooklynCatalog)} @@ -118,7 +118,7 @@ public abstract class AbstractMain { protected InputStream stdin = System.in; public ToStringHelper string() { - return Objects.toStringHelper(getClass()) + return MoreObjects.toStringHelper(getClass()) .add("verbose", verbose) .add("quiet", quiet); } diff --git a/server-cli/src/main/java/org/apache/brooklyn/cli/CloudExplorer.java b/server-cli/src/main/java/org/apache/brooklyn/cli/CloudExplorer.java index dae16a4..8c0bf9e 100644 --- a/server-cli/src/main/java/org/apache/brooklyn/cli/CloudExplorer.java +++ b/server-cli/src/main/java/org/apache/brooklyn/cli/CloudExplorer.java @@ -18,6 +18,8 @@ */ package org.apache.brooklyn.cli; +import com.google.common.base.MoreObjects; +import com.google.common.base.MoreObjects.ToStringHelper; import org.apache.brooklyn.launcher.command.support.CloudExplorerSupport; import org.apache.brooklyn.launcher.command.support.CloudExplorerSupport.BlobstoreListContainer; import org.apache.brooklyn.launcher.command.support.CloudExplorerSupport.BlobstoreListContainers; @@ -34,8 +36,6 @@ import io.airlift.airline.ParseException; import org.apache.brooklyn.core.mgmt.internal.LocalManagementContext; -import com.google.common.base.Objects.ToStringHelper; - /** * Makes use of {@link CloudExplorerSupport} to provide cloud explorer commands at Brooklyn server command line. */ diff --git a/server-cli/src/main/java/org/apache/brooklyn/cli/Main.java b/server-cli/src/main/java/org/apache/brooklyn/cli/Main.java index 4711b9f..ca13e33 100644 --- a/server-cli/src/main/java/org/apache/brooklyn/cli/Main.java +++ b/server-cli/src/main/java/org/apache/brooklyn/cli/Main.java @@ -18,6 +18,7 @@ */ package org.apache.brooklyn.cli; +import com.google.common.base.MoreObjects.ToStringHelper; import static com.google.common.base.Preconditions.checkNotNull; import java.io.Console; @@ -80,7 +81,6 @@ import org.slf4j.LoggerFactory; import com.google.common.annotations.Beta; import com.google.common.annotations.VisibleForTesting; -import com.google.common.base.Objects.ToStringHelper; import com.google.common.collect.ImmutableList; import groovy.lang.GroovyClassLoader;
