You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ji...@apache.org on 2019/04/09 05:56:31 UTC
[geode] branch develop updated: GEODE-5971: delete
InternalGfshCommand (#3421)
This is an automated email from the ASF dual-hosted git repository.
jinmeiliao 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 d8bda91 GEODE-5971: delete InternalGfshCommand (#3421)
d8bda91 is described below
commit d8bda91c51f4e9b21791301955dc8ad0949451ee
Author: jinmeiliao <ji...@pivotal.io>
AuthorDate: Mon Apr 8 22:56:17 2019 -0700
GEODE-5971: delete InternalGfshCommand (#3421)
---
.../internal/cli/DescribeDataSourceCommand.java | 4 +-
.../cli/ConnectionsCommandManagerJUnitTest.java | 6 +--
.../management/internal/cli/CommandManager.java | 6 +--
.../cli/commands/AlterRuntimeConfigCommand.java | 3 +-
.../cli/commands/ChangeLogLevelCommand.java | 3 +-
.../cli/commands/ClearDefinedIndexesCommand.java | 3 +-
.../internal/cli/commands/DefineIndexCommand.java | 3 +-
.../commands/DestroyAsyncEventQueueCommand.java | 7 ++-
.../internal/cli/commands/GCCommand.java | 3 +-
.../internal/cli/commands/InternalGfshCommand.java | 51 ----------------------
.../cli/commands/ListAsyncEventQueuesCommand.java | 3 +-
.../internal/cli/commands/ListClientCommand.java | 3 +-
.../internal/cli/commands/ListGatewayCommand.java | 3 +-
.../internal/cli/commands/ListMembersCommand.java | 3 +-
.../internal/cli/commands/ListRegionCommand.java | 3 +-
.../internal/cli/commands/NetstatCommand.java | 3 +-
.../internal/cli/commands/SleepCommand.java | 11 +++--
.../internal/cli/commands/VersionCommand.java | 15 +++----
.../cli/commands/GfshCommandJUnitTest.java | 23 ++--------
19 files changed, 49 insertions(+), 107 deletions(-)
diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeDataSourceCommand.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeDataSourceCommand.java
index 9b24bc7..01ee072 100644
--- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeDataSourceCommand.java
+++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeDataSourceCommand.java
@@ -30,8 +30,8 @@ import org.apache.geode.cache.configuration.RegionConfig;
import org.apache.geode.connectors.jdbc.internal.configuration.RegionMapping;
import org.apache.geode.distributed.internal.InternalConfigurationPersistenceService;
import org.apache.geode.management.cli.CliMetaData;
+import org.apache.geode.management.cli.GfshCommand;
import org.apache.geode.management.internal.cli.commands.CreateJndiBindingCommand.DATASOURCE_TYPE;
-import org.apache.geode.management.internal.cli.commands.InternalGfshCommand;
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.cli.result.model.TabularResultModel;
@@ -39,7 +39,7 @@ import org.apache.geode.management.internal.security.ResourceOperation;
import org.apache.geode.security.ResourcePermission;
@Experimental
-public class DescribeDataSourceCommand extends InternalGfshCommand {
+public class DescribeDataSourceCommand extends GfshCommand {
static final String DESCRIBE_DATA_SOURCE = "describe data-source";
private static final String DESCRIBE_DATA_SOURCE__HELP = EXPERIMENTAL +
"Describe the configuration of the given data source.";
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ConnectionsCommandManagerJUnitTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ConnectionsCommandManagerJUnitTest.java
index 5a325f9..ce2a035 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ConnectionsCommandManagerJUnitTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ConnectionsCommandManagerJUnitTest.java
@@ -28,7 +28,7 @@ import org.springframework.shell.core.CommandMarker;
import org.apache.geode.internal.ClassPathLoader;
import org.apache.geode.management.cli.GfshCommand;
import org.apache.geode.management.internal.cli.CommandManager;
-import org.apache.geode.management.internal.cli.commands.InternalGfshCommand;
+import org.apache.geode.management.internal.cli.commands.VersionCommand;
import org.apache.geode.management.internal.cli.util.ClasspathScanLoadHelper;
/**
@@ -50,7 +50,7 @@ public class ConnectionsCommandManagerJUnitTest {
public void testCommandManagerLoadCommands() {
Set<String> packagesToScan = new HashSet<>();
packagesToScan.add(GfshCommand.class.getPackage().getName());
- packagesToScan.add(InternalGfshCommand.class.getPackage().getName());
+ packagesToScan.add(VersionCommand.class.getPackage().getName());
ClasspathScanLoadHelper scanner = new ClasspathScanLoadHelper(packagesToScan);
ServiceLoader<CommandMarker> loader =
@@ -63,7 +63,7 @@ public class ConnectionsCommandManagerJUnitTest {
// geode's commands
foundClasses = scanner.scanPackagesForClassesImplementing(CommandMarker.class,
GfshCommand.class.getPackage().getName(),
- InternalGfshCommand.class.getPackage().getName());
+ VersionCommand.class.getPackage().getName());
while (iterator.hasNext()) {
foundClasses.add(iterator.next().getClass());
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/CommandManager.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/CommandManager.java
index 81bbcaf..dcbd793 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/CommandManager.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/CommandManager.java
@@ -42,7 +42,7 @@ import org.apache.geode.internal.ClassPathLoader;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.cli.Disabled;
import org.apache.geode.management.cli.GfshCommand;
-import org.apache.geode.management.internal.cli.commands.InternalGfshCommand;
+import org.apache.geode.management.internal.cli.commands.VersionCommand;
import org.apache.geode.management.internal.cli.help.Helper;
import org.apache.geode.management.internal.cli.shell.Gfsh;
import org.apache.geode.management.internal.cli.util.ClasspathScanLoadHelper;
@@ -179,7 +179,7 @@ public class CommandManager {
packagesToScan.add("org.apache.geode.management.internal.cli.converters");
packagesToScan.add("org.springframework.shell.converters");
packagesToScan.add(GfshCommand.class.getPackage().getName());
- packagesToScan.add(InternalGfshCommand.class.getPackage().getName());
+ packagesToScan.add(VersionCommand.class.getPackage().getName());
// Create one scanner to be used everywhere
try (ClasspathScanLoadHelper scanner = new ClasspathScanLoadHelper(packagesToScan)) {
@@ -235,7 +235,7 @@ public class CommandManager {
// geode's commands
foundClasses = scanner.scanPackagesForClassesImplementing(CommandMarker.class,
GfshCommand.class.getPackage().getName(),
- InternalGfshCommand.class.getPackage().getName());
+ VersionCommand.class.getPackage().getName());
for (Class<?> klass : foundClasses) {
try {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AlterRuntimeConfigCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AlterRuntimeConfigCommand.java
index aef0104..0b4880a 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AlterRuntimeConfigCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AlterRuntimeConfigCommand.java
@@ -36,6 +36,7 @@ import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LogLevel;
import org.apache.geode.management.cli.CliMetaData;
import org.apache.geode.management.cli.ConverterHint;
+import org.apache.geode.management.cli.GfshCommand;
import org.apache.geode.management.internal.cli.AbstractCliAroundInterceptor;
import org.apache.geode.management.internal.cli.CliUtil;
import org.apache.geode.management.internal.cli.GfshParseResult;
@@ -49,7 +50,7 @@ import org.apache.geode.management.internal.configuration.domain.XmlEntity;
import org.apache.geode.management.internal.security.ResourceOperation;
import org.apache.geode.security.ResourcePermission;
-public class AlterRuntimeConfigCommand extends InternalGfshCommand {
+public class AlterRuntimeConfigCommand extends GfshCommand {
private final AlterRuntimeConfigFunction alterRunTimeConfigFunction =
new AlterRuntimeConfigFunction();
private static final Logger logger = LogService.getLogger();
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ChangeLogLevelCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ChangeLogLevelCommand.java
index 3c7edb7..128626a 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ChangeLogLevelCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ChangeLogLevelCommand.java
@@ -34,6 +34,7 @@ import org.apache.geode.internal.logging.LogService;
import org.apache.geode.internal.logging.log4j.LogLevel;
import org.apache.geode.management.cli.CliMetaData;
import org.apache.geode.management.cli.ConverterHint;
+import org.apache.geode.management.cli.GfshCommand;
import org.apache.geode.management.internal.cli.AbstractCliAroundInterceptor;
import org.apache.geode.management.internal.cli.GfshParseResult;
import org.apache.geode.management.internal.cli.functions.ChangeLogLevelFunction;
@@ -46,7 +47,7 @@ import org.apache.geode.management.internal.cli.result.model.TabularResultModel;
import org.apache.geode.management.internal.security.ResourceOperation;
import org.apache.geode.security.ResourcePermission;
-public class ChangeLogLevelCommand extends InternalGfshCommand {
+public class ChangeLogLevelCommand extends GfshCommand {
private static final Logger logger = LogService.getLogger();
@CliCommand(value = CliStrings.CHANGE_LOGLEVEL, help = CliStrings.CHANGE_LOGLEVEL__HELP)
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ClearDefinedIndexesCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ClearDefinedIndexesCommand.java
index 5c27bd3..03d842e 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ClearDefinedIndexesCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ClearDefinedIndexesCommand.java
@@ -18,12 +18,13 @@ package org.apache.geode.management.internal.cli.commands;
import org.springframework.shell.core.annotation.CliCommand;
import org.apache.geode.management.cli.CliMetaData;
+import org.apache.geode.management.cli.GfshCommand;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
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 ClearDefinedIndexesCommand extends InternalGfshCommand {
+public class ClearDefinedIndexesCommand extends GfshCommand {
@CliCommand(value = CliStrings.CLEAR_DEFINED_INDEXES, help = CliStrings.CLEAR_DEFINED__HELP)
@CliMetaData(relatedTopic = {CliStrings.TOPIC_GEODE_REGION, CliStrings.TOPIC_GEODE_DATA})
@ResourceOperation(resource = ResourcePermission.Resource.CLUSTER,
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DefineIndexCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DefineIndexCommand.java
index 71782f3..347777a 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DefineIndexCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DefineIndexCommand.java
@@ -22,13 +22,14 @@ import org.apache.geode.cache.configuration.RegionConfig;
import org.apache.geode.cache.query.IndexType;
import org.apache.geode.management.cli.CliMetaData;
import org.apache.geode.management.cli.ConverterHint;
+import org.apache.geode.management.cli.GfshCommand;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
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 DefineIndexCommand extends InternalGfshCommand {
+public class DefineIndexCommand extends GfshCommand {
@CliCommand(value = CliStrings.DEFINE_INDEX, help = CliStrings.DEFINE_INDEX__HELP)
@CliMetaData(relatedTopic = {CliStrings.TOPIC_GEODE_REGION, CliStrings.TOPIC_GEODE_DATA})
@ResourceOperation(resource = ResourcePermission.Resource.CLUSTER,
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyAsyncEventQueueCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyAsyncEventQueueCommand.java
index ce0d9d7..b0d815e 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyAsyncEventQueueCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyAsyncEventQueueCommand.java
@@ -18,6 +18,7 @@ import static org.apache.geode.management.internal.cli.i18n.CliStrings.IFEXISTS;
import static org.apache.geode.management.internal.cli.i18n.CliStrings.IFEXISTS_HELP;
import java.util.List;
+import java.util.Objects;
import java.util.Set;
import org.springframework.shell.core.annotation.CliCommand;
@@ -26,6 +27,7 @@ import org.springframework.shell.core.annotation.CliOption;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.internal.InternalConfigurationPersistenceService;
import org.apache.geode.management.cli.ConverterHint;
+import org.apache.geode.management.cli.GfshCommand;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.management.internal.cli.functions.DestroyAsyncEventQueueFunction;
import org.apache.geode.management.internal.cli.functions.DestroyAsyncEventQueueFunctionArgs;
@@ -36,7 +38,7 @@ import org.apache.geode.management.internal.configuration.domain.XmlEntity;
import org.apache.geode.management.internal.security.ResourceOperation;
import org.apache.geode.security.ResourcePermission;
-public class DestroyAsyncEventQueueCommand extends InternalGfshCommand {
+public class DestroyAsyncEventQueueCommand extends GfshCommand {
public static final String DESTROY_ASYNC_EVENT_QUEUE = "destroy async-event-queue";
public static final String DESTROY_ASYNC_EVENT_QUEUE__HELP = "destroy an Async Event Queue";
public static final String DESTROY_ASYNC_EVENT_QUEUE__ID = "id";
@@ -70,7 +72,8 @@ public class DestroyAsyncEventQueueCommand extends InternalGfshCommand {
new DestroyAsyncEventQueueFunction(), asyncEventQueueDestoryFunctionArgs, members);
ResultModel result = ResultModel.createMemberStatusResult(functionResults);
- XmlEntity xmlEntity = findXmlEntity(functionResults);
+ XmlEntity xmlEntity = functionResults.stream().filter(CliFunctionResult::isSuccessful)
+ .map(CliFunctionResult::getXmlEntity).filter(Objects::nonNull).findFirst().orElse(null);
InternalConfigurationPersistenceService cps = getConfigurationPersistenceService();
if (xmlEntity != null) {
if (cps == null) {
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/GCCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/GCCommand.java
index fc269d4..91965ea 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/GCCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/GCCommand.java
@@ -28,6 +28,7 @@ import org.apache.geode.cache.execute.Function;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.management.cli.CliMetaData;
import org.apache.geode.management.cli.ConverterHint;
+import org.apache.geode.management.cli.GfshCommand;
import org.apache.geode.management.internal.cli.CliUtil;
import org.apache.geode.management.internal.cli.LogWrapper;
import org.apache.geode.management.internal.cli.functions.GarbageCollectionFunction;
@@ -38,7 +39,7 @@ import org.apache.geode.management.internal.cli.result.model.TabularResultModel;
import org.apache.geode.management.internal.security.ResourceOperation;
import org.apache.geode.security.ResourcePermission;
-public class GCCommand extends InternalGfshCommand {
+public class GCCommand extends GfshCommand {
@CliCommand(value = CliStrings.GC, help = CliStrings.GC__HELP)
@CliMetaData(relatedTopic = {CliStrings.TOPIC_GEODE_DEBUG_UTIL})
@ResourceOperation(resource = ResourcePermission.Resource.CLUSTER,
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/InternalGfshCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/InternalGfshCommand.java
deleted file mode 100644
index 9f065ae..0000000
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/InternalGfshCommand.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
- * agreements. See the NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License. You may obtain a
- * copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package org.apache.geode.management.internal.cli.commands;
-
-import java.util.List;
-import java.util.Objects;
-
-import org.apache.geode.management.cli.GfshCommand;
-import org.apache.geode.management.cli.Result;
-import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
-import org.apache.geode.management.internal.configuration.domain.XmlEntity;
-
-/**
- * Encapsulates common functionality for implementing command classes for the Geode shell (gfsh).
- * this provides wrapper around the static methods in CliUtils for easy mock of the commands
- *
- * this class should not have much implementation of its own other then those tested in
- * GfshCommandJUnitTest
- */
-@SuppressWarnings("unused")
-public abstract class InternalGfshCommand extends GfshCommand {
-
- public void persistClusterConfiguration(Result result, Runnable runnable) {
- if (result == null) {
- throw new IllegalArgumentException("Result should not be null");
- }
- if (getConfigurationPersistenceService() == null) {
- result.setCommandPersisted(false);
- } else {
- runnable.run();
- result.setCommandPersisted(true);
- }
- }
-
- public XmlEntity findXmlEntity(List<CliFunctionResult> functionResults) {
- return functionResults.stream().filter(CliFunctionResult::isSuccessful)
- .map(CliFunctionResult::getXmlEntity).filter(Objects::nonNull).findFirst().orElse(null);
- }
-}
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListAsyncEventQueuesCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListAsyncEventQueuesCommand.java
index c414307..7fe29d0 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListAsyncEventQueuesCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListAsyncEventQueuesCommand.java
@@ -25,6 +25,7 @@ import com.fasterxml.jackson.databind.ObjectMapper;
import org.springframework.shell.core.annotation.CliCommand;
import org.apache.geode.distributed.DistributedMember;
+import org.apache.geode.management.cli.GfshCommand;
import org.apache.geode.management.internal.cli.domain.AsyncEventQueueDetails;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.management.internal.cli.functions.ListAsyncEventQueuesFunction;
@@ -34,7 +35,7 @@ import org.apache.geode.management.internal.cli.result.model.TabularResultModel;
import org.apache.geode.management.internal.security.ResourceOperation;
import org.apache.geode.security.ResourcePermission;
-public class ListAsyncEventQueuesCommand extends InternalGfshCommand {
+public class ListAsyncEventQueuesCommand extends GfshCommand {
private static final String[] DETAILS_OUTPUT_COLUMNS =
{"Member", "ID", "Batch Size", "Persistent", "Disk Store", "Max Memory", "Listener"};
private static final String ASYNC_EVENT_QUEUES_TABLE_SECTION = "Async Event Queues";
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListClientCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListClientCommand.java
index 728887a..8871f42 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListClientCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListClientCommand.java
@@ -27,6 +27,7 @@ import org.springframework.shell.core.annotation.CliCommand;
import org.apache.geode.management.CacheServerMXBean;
import org.apache.geode.management.ManagementService;
import org.apache.geode.management.cli.CliMetaData;
+import org.apache.geode.management.cli.GfshCommand;
import org.apache.geode.management.internal.cli.LogWrapper;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.result.CompositeResultData;
@@ -36,7 +37,7 @@ import org.apache.geode.management.internal.cli.result.model.TabularResultModel;
import org.apache.geode.management.internal.security.ResourceOperation;
import org.apache.geode.security.ResourcePermission;
-public class ListClientCommand extends InternalGfshCommand {
+public class ListClientCommand extends GfshCommand {
@CliCommand(value = CliStrings.LIST_CLIENTS, help = CliStrings.LIST_CLIENT__HELP)
@CliMetaData(relatedTopic = {CliStrings.TOPIC_CLIENT})
@ResourceOperation(resource = ResourcePermission.Resource.CLUSTER,
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListGatewayCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListGatewayCommand.java
index be23163..6c2b1e3 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListGatewayCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListGatewayCommand.java
@@ -33,6 +33,7 @@ import org.apache.geode.management.GatewayReceiverMXBean;
import org.apache.geode.management.GatewaySenderMXBean;
import org.apache.geode.management.cli.CliMetaData;
import org.apache.geode.management.cli.ConverterHint;
+import org.apache.geode.management.cli.GfshCommand;
import org.apache.geode.management.internal.MBeanJMXAdapter;
import org.apache.geode.management.internal.SystemManagementService;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
@@ -41,7 +42,7 @@ import org.apache.geode.management.internal.cli.result.model.TabularResultModel;
import org.apache.geode.management.internal.security.ResourceOperation;
import org.apache.geode.security.ResourcePermission;
-public class ListGatewayCommand extends InternalGfshCommand {
+public class ListGatewayCommand extends GfshCommand {
@CliCommand(value = CliStrings.LIST_GATEWAY, help = CliStrings.LIST_GATEWAY__HELP)
@CliMetaData(relatedTopic = CliStrings.TOPIC_GEODE_WAN)
@ResourceOperation(resource = ResourcePermission.Resource.CLUSTER,
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListMembersCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListMembersCommand.java
index c32f105..ee9b4ac 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListMembersCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListMembersCommand.java
@@ -26,13 +26,14 @@ import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.distributed.internal.membership.MembershipManager;
import org.apache.geode.management.cli.CliMetaData;
import org.apache.geode.management.cli.ConverterHint;
+import org.apache.geode.management.cli.GfshCommand;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.result.model.ResultModel;
import org.apache.geode.management.internal.cli.result.model.TabularResultModel;
import org.apache.geode.management.internal.security.ResourceOperation;
import org.apache.geode.security.ResourcePermission;
-public class ListMembersCommand extends InternalGfshCommand {
+public class ListMembersCommand extends GfshCommand {
public static final String MEMBERS_SECTION = "members";
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListRegionCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListRegionCommand.java
index 33cc431..4e1f7df 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListRegionCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListRegionCommand.java
@@ -31,6 +31,7 @@ import org.apache.geode.cache.execute.ResultCollector;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.management.cli.CliMetaData;
import org.apache.geode.management.cli.ConverterHint;
+import org.apache.geode.management.cli.GfshCommand;
import org.apache.geode.management.internal.cli.CliUtil;
import org.apache.geode.management.internal.cli.domain.RegionInformation;
import org.apache.geode.management.internal.cli.functions.GetRegionsFunction;
@@ -40,7 +41,7 @@ import org.apache.geode.management.internal.cli.result.model.TabularResultModel;
import org.apache.geode.management.internal.security.ResourceOperation;
import org.apache.geode.security.ResourcePermission;
-public class ListRegionCommand extends InternalGfshCommand {
+public class ListRegionCommand extends GfshCommand {
@Immutable
private static final GetRegionsFunction getRegionsFunction = new GetRegionsFunction();
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/NetstatCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/NetstatCommand.java
index f58fbf8..a7a3080 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/NetstatCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/NetstatCommand.java
@@ -39,6 +39,7 @@ import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.internal.InternalDistributedSystem;
import org.apache.geode.management.cli.CliMetaData;
import org.apache.geode.management.cli.ConverterHint;
+import org.apache.geode.management.cli.GfshCommand;
import org.apache.geode.management.internal.cli.AbstractCliAroundInterceptor;
import org.apache.geode.management.internal.cli.CliUtil;
import org.apache.geode.management.internal.cli.GfshParseResult;
@@ -50,7 +51,7 @@ 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 NetstatCommand extends InternalGfshCommand {
+public class NetstatCommand extends GfshCommand {
private static final String NETSTAT_FILE_REQUIRED_EXTENSION = ".txt";
@CliCommand(value = CliStrings.NETSTAT, help = CliStrings.NETSTAT__HELP)
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/SleepCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/SleepCommand.java
index dc290b3..83188e5 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/SleepCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/SleepCommand.java
@@ -19,21 +19,20 @@ 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.LogWrapper;
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 SleepCommand extends InternalGfshCommand {
+public class SleepCommand extends OfflineGfshCommand {
@CliCommand(value = {CliStrings.SLEEP}, help = CliStrings.SLEEP__HELP)
@CliMetaData(shellOnly = true, relatedTopic = {CliStrings.TOPIC_GFSH})
- public Result sleep(@CliOption(key = {CliStrings.SLEEP__TIME}, unspecifiedDefaultValue = "3",
+ public ResultModel sleep(@CliOption(key = {CliStrings.SLEEP__TIME}, unspecifiedDefaultValue = "3",
help = CliStrings.SLEEP__TIME__HELP) double time) {
try {
- LogWrapper.getInstance(getCache()).fine("Sleeping for " + time + "seconds.");
+ LogWrapper.getInstance().fine("Sleeping for " + time + "seconds.");
Thread.sleep(Math.round(time * 1000));
} catch (InterruptedException ignored) {
}
- return ResultBuilder.createInfoResult("");
+ return ResultModel.createInfo("");
}
}
diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/VersionCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/VersionCommand.java
index 9b82e97..2a97f5a 100644
--- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/VersionCommand.java
+++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/VersionCommand.java
@@ -19,18 +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.ResultBuilder;
-import org.apache.geode.management.internal.cli.shell.Gfsh;
+import org.apache.geode.management.internal.cli.result.model.ResultModel;
-public class VersionCommand extends InternalGfshCommand {
+public class VersionCommand extends OfflineGfshCommand {
@CliCommand(value = {CliStrings.VERSION}, help = CliStrings.VERSION__HELP)
@CliMetaData(shellOnly = true, relatedTopic = {CliStrings.TOPIC_GFSH})
- public Result version(@CliOption(key = {CliStrings.VERSION__FULL}, specifiedDefaultValue = "true",
- unspecifiedDefaultValue = "false", help = CliStrings.VERSION__FULL__HELP) boolean full) {
- Gfsh gfsh = Gfsh.getCurrentInstance();
-
- return ResultBuilder.createInfoResult(gfsh.getVersion(full));
+ public ResultModel version(
+ @CliOption(key = {CliStrings.VERSION__FULL}, specifiedDefaultValue = "true",
+ unspecifiedDefaultValue = "false", help = CliStrings.VERSION__FULL__HELP) boolean full) {
+ return ResultModel.createInfo(getGfsh().getVersion(full));
}
}
diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GfshCommandJUnitTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GfshCommandJUnitTest.java
index 2e62d98..409e3fd 100644
--- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GfshCommandJUnitTest.java
+++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/GfshCommandJUnitTest.java
@@ -14,12 +14,10 @@
*/
package org.apache.geode.management.internal.cli.commands;
-import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
import static org.mockito.Mockito.doReturn;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.when;
import java.util.Collections;
@@ -27,39 +25,24 @@ import org.junit.Before;
import org.junit.Test;
import org.apache.geode.distributed.internal.InternalConfigurationPersistenceService;
-import org.apache.geode.management.cli.Result;
-import org.apache.geode.management.internal.cli.result.ResultBuilder;
+import org.apache.geode.management.cli.GfshCommand;
import org.apache.geode.management.internal.cli.shell.Gfsh;
import org.apache.geode.management.internal.exceptions.EntityNotFoundException;
public class GfshCommandJUnitTest {
- private InternalGfshCommand command;
+ private GfshCommand command;
private Gfsh gfsh;
private InternalConfigurationPersistenceService clusterConfigurationService;
@Before
public void before() throws Exception {
- command = spy(InternalGfshCommand.class);
+ command = spy(GfshCommand.class);
gfsh = mock(Gfsh.class);
clusterConfigurationService = mock(InternalConfigurationPersistenceService.class);
}
@Test
- public void persistClusterConfiguration() throws Exception {
- when(command.getConfigurationPersistenceService()).thenReturn(null);
- Result result = ResultBuilder.createInfoResult("info");
- Runnable runnable = mock(Runnable.class);
-
- command.persistClusterConfiguration(result, runnable);
- assertThat(result.failedToPersist()).isTrue();
-
- when(command.getConfigurationPersistenceService()).thenReturn(clusterConfigurationService);
- command.persistClusterConfiguration(result, runnable);
- assertThat(result.failedToPersist()).isFalse();
- }
-
- @Test
public void getMember() throws Exception {
doReturn(null).when(command).findMember("test");
assertThatThrownBy(() -> command.getMember("test")).isInstanceOf(EntityNotFoundException.class);