This is an automated email from the ASF dual-hosted git repository. jensdeppe pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push: new 8698edc GEODE-5971: Refactor server status/stop commands to return ResultModel (#2887) 8698edc is described below commit 8698edc9fa3b5ec8cd96e2db5628a51040096c88 Author: Jens Deppe <jde...@pivotal.io> AuthorDate: Fri Nov 30 12:27:16 2018 -0800 GEODE-5971: Refactor server status/stop commands to return ResultModel (#2887) --- .../commands/lifecycle/StatusServerCommand.java | 23 +++++++++++----------- .../cli/commands/lifecycle/StopServerCommand.java | 18 +++++++---------- 2 files changed, 18 insertions(+), 23 deletions(-) diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StatusServerCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StatusServerCommand.java index cd4e6dc..725cb21 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StatusServerCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StatusServerCommand.java @@ -27,17 +27,16 @@ import org.apache.geode.internal.lang.StringUtils; import org.apache.geode.management.MemberMXBean; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.ConverterHint; -import org.apache.geode.management.cli.Result; -import org.apache.geode.management.internal.cli.commands.InternalGfshCommand; +import org.apache.geode.management.cli.GfshCommand; import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.management.internal.cli.result.ResultBuilder; +import org.apache.geode.management.internal.cli.result.model.ResultModel; -public class StatusServerCommand extends InternalGfshCommand { +public class StatusServerCommand extends GfshCommand { @CliCommand(value = CliStrings.STATUS_SERVER, help = CliStrings.STATUS_SERVER__HELP) @CliMetaData(shellOnly = true, relatedTopic = {CliStrings.TOPIC_GEODE_SERVER, CliStrings.TOPIC_GEODE_LIFECYCLE}) - public Result statusServer( + public ResultModel statusServer( @CliOption(key = CliStrings.STATUS_SERVER__MEMBER, optionContext = ConverterHint.MEMBERIDNAME, help = CliStrings.STATUS_SERVER__MEMBER__HELP) final String member, @CliOption(key = CliStrings.STATUS_SERVER__PID, @@ -51,19 +50,19 @@ public class StatusServerCommand extends InternalGfshCommand { final MemberMXBean serverProxy = getMemberMXBean(member); if (serverProxy != null) { - return ResultBuilder.createInfoResult( + return ResultModel.createInfo( ServerLauncher.ServerState.fromJson(serverProxy.status()).toString()); } else { - return ResultBuilder.createUserErrorResult(CliStrings - .format(CliStrings.STATUS_SERVER__NO_SERVER_FOUND_FOR_MEMBER_ERROR_MESSAGE, member)); + return ResultModel.createError((CliStrings + .format(CliStrings.STATUS_SERVER__NO_SERVER_FOUND_FOR_MEMBER_ERROR_MESSAGE, member))); } } else { - return ResultBuilder.createUserErrorResult(CliStrings + return ResultModel.createError(CliStrings .format(CliStrings.STATUS_SERVICE__GFSH_NOT_CONNECTED_ERROR_MESSAGE, "Cache Server")); } } else { final ServerLauncher serverLauncher = new ServerLauncher.Builder() - .setCommand(ServerLauncher.Command.STATUS).setDebug(isDebugging()) + .setCommand(ServerLauncher.Command.STATUS) // NOTE since we do not know whether the "CacheServer" was enabled or not on the GemFire // server when it was started, // set the disableDefaultServer property in the ServerLauncher.Builder to default status @@ -75,9 +74,9 @@ public class StatusServerCommand extends InternalGfshCommand { if (status.getStatus().equals(AbstractLauncher.Status.NOT_RESPONDING) || status.getStatus().equals(AbstractLauncher.Status.STOPPED)) { - return ResultBuilder.createGemFireErrorResult(status.toString()); + return ResultModel.createError(status.toString()); } - return ResultBuilder.createInfoResult(status.toString()); + return ResultModel.createInfo(status.toString()); } } } diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StopServerCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StopServerCommand.java index ee1fd77..bea88d1 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StopServerCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StopServerCommand.java @@ -28,10 +28,9 @@ import org.apache.geode.internal.util.StopWatch; import org.apache.geode.management.MemberMXBean; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.ConverterHint; -import org.apache.geode.management.cli.Result; import org.apache.geode.management.internal.cli.commands.InternalGfshCommand; import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.management.internal.cli.result.ResultBuilder; +import org.apache.geode.management.internal.cli.result.model.ResultModel; import org.apache.geode.management.internal.cli.shell.Gfsh; public class StopServerCommand extends InternalGfshCommand { @@ -40,7 +39,7 @@ public class StopServerCommand extends InternalGfshCommand { @CliCommand(value = CliStrings.STOP_SERVER, help = CliStrings.STOP_SERVER__HELP) @CliMetaData(shellOnly = true, relatedTopic = {CliStrings.TOPIC_GEODE_SERVER, CliStrings.TOPIC_GEODE_LIFECYCLE}) - public Result stopServer( + public ResultModel stopServer( @CliOption(key = CliStrings.STOP_SERVER__MEMBER, optionContext = ConverterHint.MEMBERIDNAME, help = CliStrings.STOP_SERVER__MEMBER__HELP) final String member, @CliOption(key = CliStrings.STOP_SERVER__PID, @@ -52,7 +51,7 @@ public class StopServerCommand extends InternalGfshCommand { if (StringUtils.isNotBlank(member)) { if (!isConnectedAndReady()) { - return ResultBuilder.createUserErrorResult(CliStrings + return ResultModel.createError(CliStrings .format(CliStrings.STOP_SERVICE__GFSH_NOT_CONNECTED_ERROR_MESSAGE, "Cache Server")); } @@ -67,14 +66,14 @@ public class StopServerCommand extends InternalGfshCommand { serverState = ServerLauncher.ServerState.fromJson(serverProxy.status()); serverProxy.shutDownMember(); } else { - return ResultBuilder.createUserErrorResult(CliStrings + return ResultModel.createError(CliStrings .format(CliStrings.STOP_SERVER__NO_SERVER_FOUND_FOR_MEMBER_ERROR_MESSAGE, member)); } } else { final ServerLauncher serverLauncher = new ServerLauncher.Builder().setCommand(ServerLauncher.Command.STOP) - .setDebug(isDebugging()).setPid(pid).setWorkingDirectory(workingDirectory).build(); + .setPid(pid).setWorkingDirectory(workingDirectory).build(); serverState = serverLauncher.status(); serverLauncher.stop(); @@ -98,13 +97,10 @@ public class StopServerCommand extends InternalGfshCommand { } } - return ResultBuilder.createInfoResult(StringUtils.EMPTY); + return ResultModel.createInfo(StringUtils.EMPTY); } else { - return ResultBuilder.createUserErrorResult(serverState.toString()); + return ResultModel.createError(serverState.toString()); } } - private void stop(String member) {} - - private void stop(String pid, String workingDir) {} }