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 f816d89 GEODE-5971: Refactor various commands to extend GfshCommand
and extend ResultModel (#3356)
f816d89 is described below
commit f816d897de44ed5908b562ecaf00e02f67883c36
Author: Jens Deppe <jde...@pivotal.io>
AuthorDate: Fri Mar 29 06:10:12 2019 -0700
GEODE-5971: Refactor various commands to extend GfshCommand and extend
ResultModel (#3356)
* GEODE-5971: Refactor various commands to extend GfshCommand and extend
ResultModel
- DebugCommand
- ExportStackTraceCommand
- GfshHelpCommand
- GfshHintCommand
Authored-by: Jens Deppe <jde...@pivotal.io>
---
.../management/internal/cli/commands/DebugCommand.java | 17 ++++++-----------
.../internal/cli/commands/ExportStackTraceCommand.java | 17 +++++++++--------
.../internal/cli/commands/GfshHelpCommand.java | 9 ++++-----
.../internal/cli/commands/GfshHintCommand.java | 9 ++++-----
4 files changed, 23 insertions(+), 29 deletions(-)
diff --git
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DebugCommand.java
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DebugCommand.java
index 1f025a0..8dcb08a 100644
---
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DebugCommand.java
+++
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DebugCommand.java
@@ -19,17 +19,15 @@ import org.springframework.shell.core.annotation.CliCommand;
import org.springframework.shell.core.annotation.CliOption;
import org.apache.geode.management.cli.CliMetaData;
-import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
-import org.apache.geode.management.internal.cli.result.ErrorResultData;
-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 DebugCommand extends InternalGfshCommand {
+public class DebugCommand extends OfflineGfshCommand {
@CliCommand(value = {CliStrings.DEBUG}, help = CliStrings.DEBUG__HELP)
@CliMetaData(shellOnly = true,
relatedTopic = {CliStrings.TOPIC_GFSH,
CliStrings.TOPIC_GEODE_DEBUG_UTIL})
- public Result debug(
+ public ResultModel debug(
@CliOption(key = CliStrings.DEBUG__STATE, unspecifiedDefaultValue =
"OFF", mandatory = true,
optionContext = "debug", help = CliStrings.DEBUG__STATE__HELP)
String state) {
Gfsh gfshInstance = Gfsh.getCurrentInstance();
@@ -40,15 +38,12 @@ public class DebugCommand extends InternalGfshCommand {
} else if (state.equalsIgnoreCase("OFF")) {
gfshInstance.setDebug(false);
} else {
- return ResultBuilder.createUserErrorResult(
+ return ResultModel.createError(
CliStrings.format(CliStrings.DEBUG__MSG_0_INVALID_STATE_VALUE,
state));
}
} else {
- ErrorResultData errorResultData =
-
ResultBuilder.createErrorResultData().setErrorCode(ResultBuilder.ERRORCODE_DEFAULT)
- .addLine(CliStrings.ECHO__MSG__NO_GFSH_INSTANCE);
- return ResultBuilder.buildResult(errorResultData);
+ return ResultModel.createError(CliStrings.ECHO__MSG__NO_GFSH_INSTANCE);
}
- return ResultBuilder.createInfoResult(CliStrings.DEBUG__MSG_DEBUG_STATE_IS
+ state);
+ return ResultModel.createInfo(CliStrings.DEBUG__MSG_DEBUG_STATE_IS +
state);
}
}
diff --git
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportStackTraceCommand.java
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportStackTraceCommand.java
index 3760349..7d1fe65 100644
---
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportStackTraceCommand.java
+++
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportStackTraceCommand.java
@@ -37,16 +37,16 @@ import
org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.internal.cache.InternalCache;
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.cli.GfshCommand;
import org.apache.geode.management.internal.cli.domain.StackTracesPerMember;
import
org.apache.geode.management.internal.cli.functions.GetStackTracesFunction;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
-import org.apache.geode.management.internal.cli.result.InfoResultData;
-import org.apache.geode.management.internal.cli.result.ResultBuilder;
+import org.apache.geode.management.internal.cli.result.model.InfoResultModel;
+import org.apache.geode.management.internal.cli.result.model.ResultModel;
import org.apache.geode.management.internal.security.ResourceOperation;
import org.apache.geode.security.ResourcePermission;
-public class ExportStackTraceCommand extends InternalGfshCommand {
+public class ExportStackTraceCommand extends GfshCommand {
public static final String STACK_TRACE_FOR_MEMBER = "*** Stack-trace for
member ";
private final GetStackTracesFunction getStackTracesFunction = new
GetStackTracesFunction();
@@ -58,7 +58,7 @@ public class ExportStackTraceCommand extends
InternalGfshCommand {
@CliMetaData(relatedTopic = {CliStrings.TOPIC_GEODE_DEBUG_UTIL})
@ResourceOperation(resource = ResourcePermission.Resource.CLUSTER,
operation = ResourcePermission.Operation.READ)
- public Result exportStackTrace(@CliOption(key = {CliStrings.MEMBER,
CliStrings.MEMBERS},
+ public ResultModel exportStackTrace(@CliOption(key = {CliStrings.MEMBER,
CliStrings.MEMBERS},
optionContext = ConverterHint.ALL_MEMBER_IDNAME,
help = CliStrings.EXPORT_STACKTRACE__HELP) String[] memberNameOrId,
@@ -80,14 +80,15 @@ public class ExportStackTraceCommand extends
InternalGfshCommand {
final File outFile = new File(fileName);
if (outFile.exists() && failIfFilePresent) {
- return ResultBuilder.createUserErrorResult(CliStrings
+ return ResultModel.createError(CliStrings
.format(CliStrings.EXPORT_STACKTRACE__ERROR__FILE__PRESENT,
outFile.getCanonicalPath()));
}
Map<String, byte[]> dumps = new HashMap<>();
Set<DistributedMember> targetMembers = getMembers(group, memberNameOrId);
- InfoResultData resultData = ResultBuilder.createInfoResultData();
+ ResultModel result = new ResultModel();
+ InfoResultModel resultData = result.addInfo();
ResultCollector<?, ?> rc = executeFunction(getStackTracesFunction, null,
targetMembers);
ArrayList<Object> resultList = (ArrayList<Object>) rc.getResult();
@@ -104,7 +105,7 @@ public class ExportStackTraceCommand extends
InternalGfshCommand {
resultData.addLine(CliStrings.format(CliStrings.EXPORT_STACKTRACE__SUCCESS,
filePath));
resultData.addLine(CliStrings.EXPORT_STACKTRACE__HOST +
ads.getDistributedMember().getHost());
- return ResultBuilder.buildResult(resultData);
+ return result;
}
diff --git
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/GfshHelpCommand.java
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/GfshHelpCommand.java
index d75cb6e..c6d2aba 100644
---
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/GfshHelpCommand.java
+++
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/GfshHelpCommand.java
@@ -20,13 +20,12 @@ import org.springframework.shell.core.annotation.CliOption;
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.CommandManager;
import org.apache.geode.management.internal.cli.CommandManagerAware;
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 GfshHelpCommand extends InternalGfshCommand implements
CommandManagerAware {
+public class GfshHelpCommand extends OfflineGfshCommand implements
CommandManagerAware {
private CommandManager commandManager = null;
@Override
@@ -36,11 +35,11 @@ public class GfshHelpCommand extends InternalGfshCommand
implements CommandManag
@CliCommand(value = CliStrings.HELP, help = CliStrings.HELP__HELP)
@CliMetaData(shellOnly = true, relatedTopic = {CliStrings.TOPIC_GEODE_HELP})
- public Result obtainHelp(
+ public ResultModel obtainHelp(
@CliOption(key = {"", CliStrings.SH__COMMAND}, optionContext =
ConverterHint.HELP,
help = "Command name to provide help for") String buffer) {
- return ResultBuilder.createInfoResult(commandManager.obtainHelp(buffer));
+ return ResultModel.createInfo(commandManager.obtainHelp(buffer));
}
}
diff --git
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/GfshHintCommand.java
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/GfshHintCommand.java
index 6be3cca..1be57ac 100644
---
a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/GfshHintCommand.java
+++
b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/GfshHintCommand.java
@@ -20,13 +20,12 @@ import org.springframework.shell.core.annotation.CliOption;
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.CommandManager;
import org.apache.geode.management.internal.cli.CommandManagerAware;
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 GfshHintCommand extends InternalGfshCommand implements
CommandManagerAware {
+public class GfshHintCommand extends OfflineGfshCommand implements
CommandManagerAware {
private CommandManager commandManager = null;
@Override
@@ -36,8 +35,8 @@ public class GfshHintCommand extends InternalGfshCommand
implements CommandManag
@CliCommand(value = CliStrings.HINT, help = CliStrings.HINT__HELP)
@CliMetaData(shellOnly = true, relatedTopic = {CliStrings.TOPIC_GEODE_HELP})
- public Result hint(@CliOption(key = {"", CliStrings.HINT__TOPICNAME},
+ public ResultModel hint(@CliOption(key = {"", CliStrings.HINT__TOPICNAME},
optionContext = ConverterHint.HINT, help = CliStrings.HINT__TOPICNAME)
String topicName) {
- return
ResultBuilder.createInfoResult(commandManager.obtainHint(topicName));
+ return ResultModel.createInfo(commandManager.obtainHint(topicName));
}
}
