From commits-return-31137-archive-asf-public=cust-asf.ponee.io@geode.apache.org Wed Mar 20 19:19:20 2019 Return-Path: X-Original-To: archive-asf-public@cust-asf.ponee.io Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by mx-eu-01.ponee.io (Postfix) with SMTP id 625AA18062C for ; Wed, 20 Mar 2019 20:19:17 +0100 (CET) Received: (qmail 51064 invoked by uid 500); 20 Mar 2019 19:19:16 -0000 Mailing-List: contact commits-help@geode.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@geode.apache.org Delivered-To: mailing list commits@geode.apache.org Received: (qmail 51050 invoked by uid 99); 20 Mar 2019 19:19:16 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 20 Mar 2019 19:19:16 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 3F1AD8506B; Wed, 20 Mar 2019 19:19:15 +0000 (UTC) Date: Wed, 20 Mar 2019 19:19:14 +0000 To: "commits@geode.apache.org" Subject: [geode] branch feature/GEODE-5176 updated: spotless MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <155310955253.28075.3279197654620727701@gitbox.apache.org> From: bschuchardt@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: geode X-Git-Refname: refs/heads/feature/GEODE-5176 X-Git-Reftype: branch X-Git-Oldrev: 0c3c9c3240a6927a63095a5e210c32c0f13569e7 X-Git-Newrev: c6e23a37b78d1556682b8bee72e6ed6ab01749bb X-Git-Rev: c6e23a37b78d1556682b8bee72e6ed6ab01749bb X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. bschuchardt pushed a commit to branch feature/GEODE-5176 in repository https://gitbox.apache.org/repos/asf/geode.git The following commit(s) were added to refs/heads/feature/GEODE-5176 by this push: new c6e23a3 spotless c6e23a3 is described below commit c6e23a37b78d1556682b8bee72e6ed6ab01749bb Author: Bruce Schuchardt AuthorDate: Wed Mar 20 12:18:34 2019 -0700 spotless --- .../geode/connectors/jdbc/internal/cli/CreateDataSourceCommand.java | 2 +- .../geode/connectors/jdbc/internal/cli/CreateDataSourceInterceptor.java | 2 +- .../apache/geode/connectors/jdbc/internal/cli/CreateMappingCommand.java | 2 +- .../geode/connectors/jdbc/internal/cli/DescribeDataSourceCommand.java | 2 +- .../geode/connectors/jdbc/internal/cli/DescribeMappingCommand.java | 2 +- .../geode/connectors/jdbc/internal/cli/DestroyDataSourceCommand.java | 2 +- .../geode/connectors/jdbc/internal/cli/DestroyMappingCommand.java | 2 +- .../geode/connectors/jdbc/internal/cli/ListDataSourceCommand.java | 2 +- .../apache/geode/connectors/jdbc/internal/cli/ListMappingCommand.java | 2 +- .../connectors/jdbc/internal/cli/CreateDataSourceInterceptorTest.java | 2 +- .../geode/connectors/jdbc/internal/cli/CreateMappingCommandTest.java | 2 +- .../connectors/jdbc/internal/cli/DescribeDataSourceCommandTest.java | 2 +- .../geode/connectors/jdbc/internal/cli/DestroyMappingCommandTest.java | 2 +- .../geode/connectors/jdbc/internal/cli/ListDataSourceCommandTest.java | 2 +- .../internal/cli/commands/ShowMissingDiskStoreCommandDUnitTest.java | 2 +- .../internal/cli/functions/DataCommandFunctionWithPDXJUnitTest.java | 2 +- .../org/apache/geode/management/internal/beans/MemberMBeanBridge.java | 2 +- .../org/apache/geode/management/internal/cli/CliAroundInterceptor.java | 2 +- .../apache/geode/management/internal/cli/CommandResponseBuilder.java | 2 +- .../management/internal/cli/commands/AlterAsyncEventQueueCommand.java | 2 +- .../management/internal/cli/commands/AlterOfflineDiskStoreCommand.java | 2 +- .../geode/management/internal/cli/commands/AlterRegionCommand.java | 2 +- .../management/internal/cli/commands/AlterRuntimeConfigCommand.java | 2 +- .../geode/management/internal/cli/commands/BackupDiskStoreCommand.java | 2 +- .../geode/management/internal/cli/commands/ChangeLogLevelCommand.java | 2 +- .../management/internal/cli/commands/ClearDefinedIndexesCommand.java | 2 +- .../geode/management/internal/cli/commands/CloseDurableCQsCommand.java | 2 +- .../management/internal/cli/commands/CloseDurableClientCommand.java | 2 +- .../geode/management/internal/cli/commands/CompactDiskStoreCommand.java | 2 +- .../internal/cli/commands/CompactOfflineDiskStoreCommand.java | 2 +- .../geode/management/internal/cli/commands/ConfigurePDXCommand.java | 2 +- .../apache/geode/management/internal/cli/commands/ConnectCommand.java | 2 +- .../management/internal/cli/commands/CountDurableCQEventsCommand.java | 2 +- .../management/internal/cli/commands/CreateAsyncEventQueueCommand.java | 2 +- .../management/internal/cli/commands/CreateDefinedIndexesCommand.java | 2 +- .../geode/management/internal/cli/commands/CreateDiskStoreCommand.java | 2 +- .../management/internal/cli/commands/CreateGatewayReceiverCommand.java | 2 +- .../management/internal/cli/commands/CreateGatewaySenderCommand.java | 2 +- .../geode/management/internal/cli/commands/CreateIndexCommand.java | 2 +- .../management/internal/cli/commands/CreateJndiBindingCommand.java | 2 +- .../geode/management/internal/cli/commands/CreateRegionCommand.java | 2 +- .../geode/management/internal/cli/commands/DefineIndexCommand.java | 2 +- .../apache/geode/management/internal/cli/commands/DeployCommand.java | 2 +- .../geode/management/internal/cli/commands/DescribeClientCommand.java | 2 +- .../geode/management/internal/cli/commands/DescribeConfigCommand.java | 2 +- .../management/internal/cli/commands/DescribeConnectionCommand.java | 2 +- .../management/internal/cli/commands/DescribeDiskStoreCommand.java | 2 +- .../geode/management/internal/cli/commands/DescribeMemberCommand.java | 2 +- .../internal/cli/commands/DescribeOfflineDiskStoreCommand.java | 2 +- .../management/internal/cli/commands/DestroyAsyncEventQueueCommand.java | 2 +- .../geode/management/internal/cli/commands/DestroyDiskStoreCommand.java | 2 +- .../geode/management/internal/cli/commands/DestroyFunctionCommand.java | 2 +- .../management/internal/cli/commands/DestroyGatewayReceiverCommand.java | 2 +- .../management/internal/cli/commands/DestroyGatewaySenderCommand.java | 2 +- .../geode/management/internal/cli/commands/DestroyIndexCommand.java | 2 +- .../management/internal/cli/commands/DestroyJndiBindingCommand.java | 2 +- .../geode/management/internal/cli/commands/DestroyRegionCommand.java | 2 +- .../geode/management/internal/cli/commands/DisconnectCommand.java | 2 +- .../org/apache/geode/management/internal/cli/commands/EchoCommand.java | 2 +- .../geode/management/internal/cli/commands/ExecuteFunctionCommand.java | 2 +- .../geode/management/internal/cli/commands/ExecuteScriptCommand.java | 2 +- .../internal/cli/commands/ExportClusterConfigurationCommand.java | 2 +- .../geode/management/internal/cli/commands/ExportConfigCommand.java | 2 +- .../geode/management/internal/cli/commands/ExportDataCommand.java | 2 +- .../geode/management/internal/cli/commands/ExportLogsCommand.java | 2 +- .../geode/management/internal/cli/commands/ExportLogsInterceptor.java | 2 +- .../management/internal/cli/commands/ExportOfflineDiskStoreCommand.java | 2 +- .../org/apache/geode/management/internal/cli/commands/GCCommand.java | 2 +- .../org/apache/geode/management/internal/cli/commands/GetCommand.java | 2 +- .../internal/cli/commands/ImportClusterConfigurationCommand.java | 2 +- .../geode/management/internal/cli/commands/ImportDataCommand.java | 2 +- .../management/internal/cli/commands/ListAsyncEventQueuesCommand.java | 2 +- .../geode/management/internal/cli/commands/ListClientCommand.java | 2 +- .../geode/management/internal/cli/commands/ListDeployedCommand.java | 2 +- .../geode/management/internal/cli/commands/ListDiskStoresCommand.java | 2 +- .../management/internal/cli/commands/ListDurableClientCQsCommand.java | 2 +- .../geode/management/internal/cli/commands/ListFunctionCommand.java | 2 +- .../geode/management/internal/cli/commands/ListGatewayCommand.java | 2 +- .../geode/management/internal/cli/commands/ListJndiBindingCommand.java | 2 +- .../geode/management/internal/cli/commands/ListMembersCommand.java | 2 +- .../geode/management/internal/cli/commands/ListRegionCommand.java | 2 +- .../internal/cli/commands/LoadBalanceGatewaySenderCommand.java | 2 +- .../geode/management/internal/cli/commands/LocateEntryCommand.java | 2 +- .../apache/geode/management/internal/cli/commands/NetstatCommand.java | 2 +- .../management/internal/cli/commands/PauseGatewaySenderCommand.java | 2 +- .../org/apache/geode/management/internal/cli/commands/PutCommand.java | 2 +- .../org/apache/geode/management/internal/cli/commands/QueryCommand.java | 2 +- .../apache/geode/management/internal/cli/commands/QueryInterceptor.java | 2 +- .../apache/geode/management/internal/cli/commands/RemoveCommand.java | 2 +- .../management/internal/cli/commands/ResumeGatewaySenderCommand.java | 2 +- .../management/internal/cli/commands/RevokeMissingDiskStoreCommand.java | 2 +- .../geode/management/internal/cli/commands/ShowDeadlockCommand.java | 2 +- .../apache/geode/management/internal/cli/commands/ShowLogCommand.java | 2 +- .../geode/management/internal/cli/commands/ShowMetricsCommand.java | 2 +- .../geode/management/internal/cli/commands/ShowMetricsInterceptor.java | 2 +- .../management/internal/cli/commands/ShowMissingDiskStoreCommand.java | 2 +- .../management/internal/cli/commands/StartGatewayReceiverCommand.java | 2 +- .../management/internal/cli/commands/StartGatewaySenderCommand.java | 2 +- .../geode/management/internal/cli/commands/StartLocatorCommand.java | 2 +- .../geode/management/internal/cli/commands/StartServerCommand.java | 2 +- .../internal/cli/commands/StatusClusterConfigServiceCommand.java | 2 +- .../management/internal/cli/commands/StatusGatewayReceiverCommand.java | 2 +- .../management/internal/cli/commands/StatusGatewaySenderCommand.java | 2 +- .../management/internal/cli/commands/StopGatewayReceiverCommand.java | 2 +- .../management/internal/cli/commands/StopGatewaySenderCommand.java | 2 +- .../apache/geode/management/internal/cli/commands/UndeployCommand.java | 2 +- .../internal/cli/commands/UpgradeOfflineDiskStoreCommand.java | 2 +- .../management/internal/cli/commands/UsernamePasswordInterceptor.java | 2 +- .../management/internal/cli/commands/ValidateDiskStoreCommand.java | 2 +- .../internal/cli/commands/lifecycle/StartJConsoleCommand.java | 2 +- .../internal/cli/commands/lifecycle/StartJVisualVMCommand.java | 2 +- .../internal/cli/commands/lifecycle/StatusLocatorCommand.java | 2 +- .../management/internal/cli/commands/lifecycle/StatusServerCommand.java | 2 +- .../management/internal/cli/commands/lifecycle/StopLocatorCommand.java | 2 +- .../management/internal/cli/commands/lifecycle/StopServerCommand.java | 2 +- .../apache/geode/management/internal/cli/domain/DataCommandResult.java | 2 +- .../apache/geode/management/internal/cli/remote/CommandExecutor.java | 2 +- .../apache/geode/management/internal/cli/result/ModelCommandResult.java | 2 +- .../org/apache/geode/management/internal/cli/result/ResultBuilder.java | 2 +- .../geode/management/internal/cli/result/model/DataResultModel.java | 2 +- .../geode/management/internal/cli/result/model/InfoResultModel.java | 2 +- .../geode/management/internal/cli/result/model/TabularResultModel.java | 2 +- .../main/java/org/apache/geode/management/internal/cli/shell/Gfsh.java | 2 +- .../geode/management/internal/cli/shell/GfshExecutionStrategy.java | 2 +- .../geode/management/internal/cli/shell/ScriptExecutionDetails.java | 2 +- .../geode/management/internal/cli/commands/ConnectCommandTest.java | 2 +- .../internal/cli/commands/CreateGatewaySenderCommandTest.java | 2 +- .../geode/management/internal/cli/commands/ExportLogsCommandTest.java | 2 +- .../management/internal/cli/commands/ExportLogsInterceptorTest.java | 2 +- .../geode/management/internal/cli/commands/ListGatewayCommandTest.java | 2 +- .../geode/management/internal/cli/commands/LogLevelInterceptorTest.java | 2 +- .../geode/management/internal/cli/remote/CommandExecutorTest.java | 2 +- .../geode/management/internal/cli/shell/GfshExecutionStrategyTest.java | 2 +- .../internal/cli/commands/GemfireDataCommandsDUnitTestBase.java | 2 +- .../internal/cli/commands/IndexCommandsIntegrationTestBase.java | 2 +- .../management/internal/cli/commands/QueryCommandDUnitTestBase.java | 2 +- .../org/apache/geode/test/junit/assertions/CommandResultAssert.java | 2 +- .../java/org/apache/geode/test/junit/assertions/ResultModelAssert.java | 2 +- .../src/main/java/org/apache/geode/test/junit/rules/GfshParserRule.java | 2 +- .../src/main/java/org/apache/geode/redis/internal/RegionProvider.java | 2 +- .../cache/wan/wancommand/PauseGatewaySenderCommandDUnitTest.java | 2 +- .../cache/wan/wancommand/ResumeGatewaySenderCommandDUnitTest.java | 2 +- .../cache/wan/wancommand/StartGatewayReceiverCommandDUnitTest.java | 2 +- .../cache/wan/wancommand/StartGatewaySenderCommandDUnitTest.java | 2 +- .../cache/wan/wancommand/StatusGatewayReceiverCommandDUnitTest.java | 2 +- .../cache/wan/wancommand/StatusGatewaySenderCommandDUnitTest.java | 2 +- .../cache/wan/wancommand/StopGatewayReceiverCommandDUnitTest.java | 2 +- .../cache/wan/wancommand/StopGatewaySenderCommandDUnitTest.java | 2 +- 148 files changed, 148 insertions(+), 148 deletions(-) diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateDataSourceCommand.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateDataSourceCommand.java index 8c47ca4..6e98899 100644 --- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateDataSourceCommand.java +++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateDataSourceCommand.java @@ -29,12 +29,12 @@ import org.apache.geode.cache.configuration.JndiBindingsType.JndiBinding.ConfigP import org.apache.geode.distributed.DistributedMember; import org.apache.geode.distributed.internal.InternalConfigurationPersistenceService; import org.apache.geode.management.cli.CliMetaData; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.cli.SingleGfshCommand; import org.apache.geode.management.internal.cli.commands.CreateJndiBindingCommand.DATASOURCE_TYPE; import org.apache.geode.management.internal.cli.functions.CliFunctionResult; import org.apache.geode.management.internal.cli.functions.CreateJndiBindingFunction; import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateDataSourceInterceptor.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateDataSourceInterceptor.java index de84229..e9e03c5 100644 --- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateDataSourceInterceptor.java +++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateDataSourceInterceptor.java @@ -16,9 +16,9 @@ */ package org.apache.geode.connectors.jdbc.internal.cli; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.GfshParseResult; import org.apache.geode.management.internal.cli.commands.UsernamePasswordInterceptor; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.shell.Gfsh; public class CreateDataSourceInterceptor extends UsernamePasswordInterceptor { diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommand.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommand.java index ff8ed3e..f79baa3 100644 --- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommand.java +++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommand.java @@ -51,6 +51,7 @@ 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.Result; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.cli.SingleGfshCommand; import org.apache.geode.management.internal.ManagementAgent; import org.apache.geode.management.internal.SystemManagementService; @@ -62,7 +63,6 @@ import org.apache.geode.management.internal.cli.remote.CommandExecutionContext; import org.apache.geode.management.internal.cli.result.FileResult; import org.apache.geode.management.internal.cli.result.ModelCommandResult; import org.apache.geode.management.internal.cli.result.ResultBuilder; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; 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 9cbba92..eb379c0 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,10 +30,10 @@ 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.ResultModel; 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.cli.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; diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommand.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommand.java index 5e3930b..149587f 100644 --- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommand.java +++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommand.java @@ -43,9 +43,9 @@ import org.apache.geode.distributed.ConfigurationPersistenceService; 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.cli.ResultModel; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.model.DataResultModel; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.result.model.TabularResultModel; import org.apache.geode.management.internal.exceptions.EntityNotFoundException; import org.apache.geode.management.internal.security.ResourceOperation; diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyDataSourceCommand.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyDataSourceCommand.java index 7f68ff1..041a355 100644 --- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyDataSourceCommand.java +++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyDataSourceCommand.java @@ -29,12 +29,12 @@ import org.apache.geode.connectors.jdbc.internal.configuration.RegionMapping; import org.apache.geode.distributed.DistributedMember; import org.apache.geode.distributed.internal.InternalConfigurationPersistenceService; import org.apache.geode.management.cli.CliMetaData; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.cli.SingleGfshCommand; import org.apache.geode.management.internal.cli.commands.CreateJndiBindingCommand; import org.apache.geode.management.internal.cli.functions.CliFunctionResult; import org.apache.geode.management.internal.cli.functions.DestroyJndiBindingFunction; import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.exceptions.EntityNotFoundException; import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommand.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommand.java index 4aea23b..1138842 100644 --- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommand.java +++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommand.java @@ -41,10 +41,10 @@ import org.apache.geode.distributed.ConfigurationPersistenceService; 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.ResultModel; import org.apache.geode.management.cli.SingleGfshCommand; import org.apache.geode.management.internal.cli.functions.CliFunctionResult; import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListDataSourceCommand.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListDataSourceCommand.java index 52b9924..9fdfa92 100644 --- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListDataSourceCommand.java +++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListDataSourceCommand.java @@ -27,8 +27,8 @@ import org.apache.geode.connectors.jdbc.internal.configuration.RegionMapping; import org.apache.geode.distributed.ConfigurationPersistenceService; 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.cli.ResultModel; +import org.apache.geode.management.internal.cli.commands.CreateJndiBindingCommand.DATASOURCE_TYPE; import org.apache.geode.management.internal.cli.result.model.TabularResultModel; import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommand.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommand.java index 4bc99ae..73cf61b 100644 --- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommand.java +++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommand.java @@ -30,8 +30,8 @@ import org.apache.geode.distributed.ConfigurationPersistenceService; 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.cli.ResultModel; +import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.model.TabularResultModel; import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateDataSourceInterceptorTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateDataSourceInterceptorTest.java index ee7e28d..295d8404 100644 --- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateDataSourceInterceptorTest.java +++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateDataSourceInterceptorTest.java @@ -22,8 +22,8 @@ import org.junit.Before; import org.junit.Test; import org.apache.geode.management.cli.Result.Status; -import org.apache.geode.management.internal.cli.GfshParseResult; import org.apache.geode.management.cli.ResultModel; +import org.apache.geode.management.internal.cli.GfshParseResult; import org.apache.geode.management.internal.cli.shell.Gfsh; public class CreateDataSourceInterceptorTest { diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandTest.java index 2db01cb..61f2313 100644 --- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandTest.java +++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandTest.java @@ -56,10 +56,10 @@ import org.apache.geode.distributed.internal.DistributionManager; import org.apache.geode.distributed.internal.membership.InternalDistributedMember; import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.management.cli.Result; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.ManagementAgent; import org.apache.geode.management.internal.SystemManagementService; import org.apache.geode.management.internal.cli.functions.CliFunctionResult; -import org.apache.geode.management.cli.ResultModel; public class CreateMappingCommandTest { diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeDataSourceCommandTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeDataSourceCommandTest.java index ee5a85e..eb48389 100644 --- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeDataSourceCommandTest.java +++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeDataSourceCommandTest.java @@ -38,9 +38,9 @@ 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.Result.Status; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.commands.CreateJndiBindingCommand.DATASOURCE_TYPE; import org.apache.geode.management.internal.cli.result.model.InfoResultModel; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.result.model.TabularResultModel; import org.apache.geode.test.junit.rules.GfshParserRule; diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandTest.java index 6950aa3..61681b1 100644 --- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandTest.java +++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandTest.java @@ -48,8 +48,8 @@ import org.apache.geode.distributed.ConfigurationPersistenceService; import org.apache.geode.distributed.internal.membership.InternalDistributedMember; import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.management.cli.Result; -import org.apache.geode.management.internal.cli.functions.CliFunctionResult; import org.apache.geode.management.cli.ResultModel; +import org.apache.geode.management.internal.cli.functions.CliFunctionResult; public class DestroyMappingCommandTest { diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListDataSourceCommandTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListDataSourceCommandTest.java index 044eb73..331bf5b 100644 --- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListDataSourceCommandTest.java +++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListDataSourceCommandTest.java @@ -38,8 +38,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.Result.Status; -import org.apache.geode.management.internal.cli.commands.CreateJndiBindingCommand.DATASOURCE_TYPE; import org.apache.geode.management.cli.ResultModel; +import org.apache.geode.management.internal.cli.commands.CreateJndiBindingCommand.DATASOURCE_TYPE; import org.apache.geode.management.internal.cli.result.model.TabularResultModel; import org.apache.geode.test.junit.rules.GfshParserRule; diff --git a/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ShowMissingDiskStoreCommandDUnitTest.java b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ShowMissingDiskStoreCommandDUnitTest.java index 09f003c..e5790df 100644 --- a/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ShowMissingDiskStoreCommandDUnitTest.java +++ b/geode-core/src/distributedTest/java/org/apache/geode/management/internal/cli/commands/ShowMissingDiskStoreCommandDUnitTest.java @@ -28,9 +28,9 @@ import org.junit.rules.TestName; import org.apache.geode.cache.CacheFactory; import org.apache.geode.cache.Region; import org.apache.geode.cache.RegionShortcut; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.CommandResult; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.result.model.TabularResultModel; import org.apache.geode.management.internal.cli.util.CommandStringBuilder; import org.apache.geode.test.dunit.rules.ClusterStartupRule; diff --git a/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/functions/DataCommandFunctionWithPDXJUnitTest.java b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/functions/DataCommandFunctionWithPDXJUnitTest.java index 6399805..168285d 100644 --- a/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/functions/DataCommandFunctionWithPDXJUnitTest.java +++ b/geode-core/src/integrationTest/java/org/apache/geode/management/internal/cli/functions/DataCommandFunctionWithPDXJUnitTest.java @@ -29,9 +29,9 @@ import org.junit.experimental.categories.Category; import org.apache.geode.cache.Region; import org.apache.geode.cache.RegionShortcut; import org.apache.geode.internal.cache.InternalCache; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.domain.DataCommandRequest; import org.apache.geode.management.internal.cli.domain.DataCommandResult; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.result.model.TabularResultModel; import org.apache.geode.pdx.PdxReader; import org.apache.geode.pdx.PdxSerializable; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/beans/MemberMBeanBridge.java b/geode-core/src/main/java/org/apache/geode/management/internal/beans/MemberMBeanBridge.java index d534026..8b9e32b 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/beans/MemberMBeanBridge.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/beans/MemberMBeanBridge.java @@ -96,6 +96,7 @@ import org.apache.geode.internal.tcp.ConnectionTable; import org.apache.geode.management.GemFireProperties; import org.apache.geode.management.JVMMetrics; import org.apache.geode.management.OSMetrics; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.ManagementConstants; import org.apache.geode.management.internal.SystemManagementService; import org.apache.geode.management.internal.beans.stats.AggregateRegionStatsMonitor; @@ -111,7 +112,6 @@ import org.apache.geode.management.internal.beans.stats.VMStatsMonitor; import org.apache.geode.management.internal.cli.CommandResponseBuilder; import org.apache.geode.management.internal.cli.remote.OnlineCommandProcessor; import org.apache.geode.management.internal.cli.result.CommandResult; -import org.apache.geode.management.cli.ResultModel; /** * This class acts as an Bridge between MemberMBean and GemFire Cache and Distributed System diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/CliAroundInterceptor.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/CliAroundInterceptor.java index 94941eb..6558a4d 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/CliAroundInterceptor.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/CliAroundInterceptor.java @@ -16,8 +16,8 @@ package org.apache.geode.management.internal.cli; import java.nio.file.Path; -import org.apache.geode.management.internal.cli.result.CommandResult; import org.apache.geode.management.cli.ResultModel; +import org.apache.geode.management.internal.cli.result.CommandResult; import org.apache.geode.management.internal.cli.shell.GfshExecutionStrategy; /** diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/CommandResponseBuilder.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/CommandResponseBuilder.java index f36d68f..ed6df84 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/CommandResponseBuilder.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/CommandResponseBuilder.java @@ -19,11 +19,11 @@ import com.fasterxml.jackson.databind.ObjectMapper; import org.apache.commons.lang3.exception.ExceptionUtils; import org.apache.geode.management.cli.CliMetaData; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.json.GfJsonException; import org.apache.geode.management.internal.cli.json.GfJsonObject; import org.apache.geode.management.internal.cli.remote.CommandExecutionContext; import org.apache.geode.management.internal.cli.result.CommandResult; -import org.apache.geode.management.cli.ResultModel; /** * diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AlterAsyncEventQueueCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AlterAsyncEventQueueCommand.java index 8170951..2161a66 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AlterAsyncEventQueueCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AlterAsyncEventQueueCommand.java @@ -37,11 +37,11 @@ import org.apache.geode.cache.configuration.CacheConfig; import org.apache.geode.cache.configuration.CacheElement; import org.apache.geode.distributed.internal.InternalConfigurationPersistenceService; import org.apache.geode.management.cli.CliMetaData; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.cli.SingleGfshCommand; import org.apache.geode.management.cli.UpdateAllConfigurationGroupsMarker; import org.apache.geode.management.internal.cli.AbstractCliAroundInterceptor; import org.apache.geode.management.internal.cli.GfshParseResult; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.exceptions.EntityNotFoundException; import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AlterOfflineDiskStoreCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AlterOfflineDiskStoreCommand.java index 37688f8..f2eadc4 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AlterOfflineDiskStoreCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AlterOfflineDiskStoreCommand.java @@ -23,9 +23,9 @@ import org.apache.geode.cache.CacheExistsException; import org.apache.geode.cache.Region; import org.apache.geode.internal.cache.DiskStoreImpl; import org.apache.geode.management.cli.CliMetaData; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.cli.SingleGfshCommand; import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.management.cli.ResultModel; public class AlterOfflineDiskStoreCommand extends SingleGfshCommand { @CliCommand(value = CliStrings.ALTER_DISK_STORE, help = CliStrings.ALTER_DISK_STORE__HELP) diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AlterRegionCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AlterRegionCommand.java index 5c43af3..17b18a2 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AlterRegionCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/AlterRegionCommand.java @@ -39,12 +39,12 @@ import org.apache.geode.distributed.ConfigurationPersistenceService; 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.ResultModel; import org.apache.geode.management.cli.SingleGfshCommand; import org.apache.geode.management.internal.cli.domain.ClassName; import org.apache.geode.management.internal.cli.functions.CliFunctionResult; import org.apache.geode.management.internal.cli.functions.RegionAlterFunction; import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.exceptions.EntityNotFoundException; import org.apache.geode.security.ResourcePermission.Operation; import org.apache.geode.security.ResourcePermission.Resource; 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 a00bb0b..811c8e1 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.ResultModel; import org.apache.geode.management.internal.cli.AbstractCliAroundInterceptor; import org.apache.geode.management.internal.cli.CliUtil; import org.apache.geode.management.internal.cli.GfshParseResult; @@ -44,7 +45,6 @@ import org.apache.geode.management.internal.cli.functions.CliFunctionResult; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.remote.CommandExecutor; import org.apache.geode.management.internal.cli.result.model.InfoResultModel; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.configuration.domain.XmlEntity; import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/BackupDiskStoreCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/BackupDiskStoreCommand.java index c7e19b3..c6eb04b 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/BackupDiskStoreCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/BackupDiskStoreCommand.java @@ -29,8 +29,8 @@ import org.apache.geode.internal.cache.backup.BackupOperation; import org.apache.geode.management.BackupStatus; 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.cli.ResultModel; +import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.model.TabularResultModel; import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; 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 31a0321..b2d7606 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.ResultModel; 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; @@ -41,7 +42,6 @@ import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.CompositeResultData; import org.apache.geode.management.internal.cli.result.ResultBuilder; import org.apache.geode.management.internal.cli.result.TabularResultData; -import org.apache.geode.management.cli.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; 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 83ffcbe..2219186 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,8 +18,8 @@ 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.internal.cli.i18n.CliStrings; import org.apache.geode.management.cli.ResultModel; +import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CloseDurableCQsCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CloseDurableCQsCommand.java index f124bee..097035d 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CloseDurableCQsCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CloseDurableCQsCommand.java @@ -26,10 +26,10 @@ 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.cli.ResultModel; import org.apache.geode.management.internal.cli.functions.CliFunctionResult; import org.apache.geode.management.internal.cli.functions.CloseDurableCqFunction; import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CloseDurableClientCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CloseDurableClientCommand.java index 67914c2..d873edc 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CloseDurableClientCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CloseDurableClientCommand.java @@ -26,10 +26,10 @@ 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.cli.ResultModel; import org.apache.geode.management.internal.cli.functions.CliFunctionResult; import org.apache.geode.management.internal.cli.functions.CloseDurableClientFunction; import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CompactDiskStoreCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CompactDiskStoreCommand.java index 3c52041..99382df 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CompactDiskStoreCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CompactDiskStoreCommand.java @@ -37,10 +37,10 @@ import org.apache.geode.management.ManagementService; 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.cli.ResultModel; 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.model.DataResultModel; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.messages.CompactRequest; import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CompactOfflineDiskStoreCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CompactOfflineDiskStoreCommand.java index fa08e5a..ed78bcd 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CompactOfflineDiskStoreCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CompactOfflineDiskStoreCommand.java @@ -28,11 +28,11 @@ 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.cli.ResultModel; import org.apache.geode.management.cli.SingleGfshCommand; 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.model.InfoResultModel; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.util.DiskStoreCompacter; public class CompactOfflineDiskStoreCommand extends SingleGfshCommand { diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ConfigurePDXCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ConfigurePDXCommand.java index 2bd29e6..a59cea6 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ConfigurePDXCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ConfigurePDXCommand.java @@ -24,12 +24,12 @@ import org.apache.geode.cache.configuration.CacheConfig; import org.apache.geode.cache.configuration.DeclarableType; import org.apache.geode.cache.configuration.PdxType; import org.apache.geode.management.cli.CliMetaData; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.cli.SingleGfshCommand; import org.apache.geode.management.internal.cli.AbstractCliAroundInterceptor; import org.apache.geode.management.internal.cli.GfshParseResult; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.model.InfoResultModel; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.pdx.ReflectionBasedAutoSerializer; import org.apache.geode.security.ResourcePermission; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ConnectCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ConnectCommand.java index e9a3ae0..c16dad0 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ConnectCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ConnectCommand.java @@ -43,6 +43,7 @@ import org.apache.geode.internal.net.SSLConfigurationFactory; import org.apache.geode.internal.security.SecurableCommunicationChannel; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.ConverterHint; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.JmxManagerLocatorRequest; import org.apache.geode.management.internal.JmxManagerLocatorResponse; import org.apache.geode.management.internal.SSLUtil; @@ -52,7 +53,6 @@ import org.apache.geode.management.internal.cli.converters.ConnectionEndpointCon import org.apache.geode.management.internal.cli.domain.ConnectToLocatorResult; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.model.InfoResultModel; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.shell.Gfsh; import org.apache.geode.management.internal.cli.shell.JmxOperationInvoker; import org.apache.geode.management.internal.cli.shell.OperationInvoker; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CountDurableCQEventsCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CountDurableCQEventsCommand.java index ce88b84..b54141b 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CountDurableCQEventsCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CountDurableCQEventsCommand.java @@ -27,10 +27,10 @@ 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.cli.Result; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.functions.CliFunctionResult; import org.apache.geode.management.internal.cli.functions.GetSubscriptionQueueSizeFunction; import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.management.cli.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; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAsyncEventQueueCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAsyncEventQueueCommand.java index d9b3ea0..e2e838a 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAsyncEventQueueCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateAsyncEventQueueCommand.java @@ -29,11 +29,11 @@ import org.apache.geode.cache.configuration.CacheConfig; import org.apache.geode.cache.configuration.DeclarableType; import org.apache.geode.distributed.DistributedMember; import org.apache.geode.management.cli.ConverterHint; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.cli.SingleGfshCommand; import org.apache.geode.management.internal.cli.functions.CliFunctionResult; import org.apache.geode.management.internal.cli.functions.CreateAsyncEventQueueFunction; import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateDefinedIndexesCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateDefinedIndexesCommand.java index 32583c1..f03cc03 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateDefinedIndexesCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateDefinedIndexesCommand.java @@ -27,11 +27,11 @@ import org.apache.geode.cache.configuration.RegionConfig; 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.ResultModel; import org.apache.geode.management.cli.SingleGfshCommand; import org.apache.geode.management.internal.cli.functions.CliFunctionResult; import org.apache.geode.management.internal.cli.functions.CreateDefinedIndexesFunction; import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateDiskStoreCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateDiskStoreCommand.java index ec0ef6b..b4b1a41 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateDiskStoreCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateDiskStoreCommand.java @@ -30,11 +30,11 @@ import org.apache.geode.distributed.DistributedMember; import org.apache.geode.internal.cache.DiskStoreAttributes; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.ConverterHint; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.cli.SingleGfshCommand; import org.apache.geode.management.internal.cli.functions.CliFunctionResult; import org.apache.geode.management.internal.cli.functions.CreateDiskStoreFunction; import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateGatewayReceiverCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateGatewayReceiverCommand.java index bfcb22b..db1d924 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateGatewayReceiverCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateGatewayReceiverCommand.java @@ -29,6 +29,7 @@ import org.apache.geode.cache.wan.GatewayReceiver; 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.ResultModel; import org.apache.geode.management.cli.SingleGfshCommand; import org.apache.geode.management.internal.cli.AbstractCliAroundInterceptor; import org.apache.geode.management.internal.cli.GfshParseResult; @@ -36,7 +37,6 @@ import org.apache.geode.management.internal.cli.functions.CliFunctionResult; import org.apache.geode.management.internal.cli.functions.GatewayReceiverCreateFunction; import org.apache.geode.management.internal.cli.functions.GatewayReceiverFunctionArgs; import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateGatewaySenderCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateGatewaySenderCommand.java index 8355121..81a3e10 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateGatewaySenderCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateGatewaySenderCommand.java @@ -33,6 +33,7 @@ import org.apache.geode.internal.Version; 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.ResultModel; import org.apache.geode.management.cli.SingleGfshCommand; import org.apache.geode.management.internal.cli.AbstractCliAroundInterceptor; import org.apache.geode.management.internal.cli.GfshParseResult; @@ -41,7 +42,6 @@ import org.apache.geode.management.internal.cli.functions.GatewaySenderCreateFun import org.apache.geode.management.internal.cli.functions.GatewaySenderFunctionArgs; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.ResultBuilder; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateIndexCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateIndexCommand.java index aa58312..817ccc2 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateIndexCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateIndexCommand.java @@ -28,11 +28,11 @@ import org.apache.geode.cache.query.IndexType; 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.ResultModel; import org.apache.geode.management.cli.SingleGfshCommand; import org.apache.geode.management.internal.cli.functions.CliFunctionResult; import org.apache.geode.management.internal.cli.functions.CreateIndexFunction; import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.exceptions.EntityNotFoundException; import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateJndiBindingCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateJndiBindingCommand.java index 963281e..c2ba257 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateJndiBindingCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateJndiBindingCommand.java @@ -30,11 +30,11 @@ import org.apache.geode.distributed.DistributedMember; import org.apache.geode.distributed.internal.InternalConfigurationPersistenceService; import org.apache.geode.internal.logging.LogService; import org.apache.geode.management.cli.CliMetaData; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.cli.SingleGfshCommand; import org.apache.geode.management.internal.cli.functions.CliFunctionResult; import org.apache.geode.management.internal.cli.functions.CreateJndiBindingFunction; import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateRegionCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateRegionCommand.java index 31844dc..f708d5d 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateRegionCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/CreateRegionCommand.java @@ -53,6 +53,7 @@ import org.apache.geode.management.DistributedSystemMXBean; import org.apache.geode.management.ManagementService; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.ConverterHint; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.cli.SingleGfshCommand; import org.apache.geode.management.internal.cli.AbstractCliAroundInterceptor; import org.apache.geode.management.internal.cli.GfshParseResult; @@ -62,7 +63,6 @@ import org.apache.geode.management.internal.cli.functions.CreateRegionFunctionAr import org.apache.geode.management.internal.cli.functions.FetchRegionAttributesFunction; import org.apache.geode.management.internal.cli.functions.RegionCreateFunction; import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.util.RegionPath; import org.apache.geode.management.internal.exceptions.EntityExistsException; import org.apache.geode.management.internal.security.ResourceOperation; 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 cc0cf77..156e3bc 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,9 +22,9 @@ 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.ResultModel; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.model.InfoResultModel; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DeployCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DeployCommand.java index d04faf2..b669899 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DeployCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DeployCommand.java @@ -42,6 +42,7 @@ 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.cli.Result; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.ManagementAgent; import org.apache.geode.management.internal.SystemManagementService; import org.apache.geode.management.internal.cli.AbstractCliAroundInterceptor; @@ -54,7 +55,6 @@ import org.apache.geode.management.internal.cli.remote.CommandExecutionContext; import org.apache.geode.management.internal.cli.remote.CommandExecutor; import org.apache.geode.management.internal.cli.result.FileResult; import org.apache.geode.management.internal.cli.result.ResultBuilder; -import org.apache.geode.management.cli.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; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeClientCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeClientCommand.java index 937011e..1cd024d 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeClientCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeClientCommand.java @@ -33,12 +33,12 @@ import org.apache.geode.management.ClientHealthStatus; 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.cli.ResultModel; import org.apache.geode.management.internal.cli.CliUtil; import org.apache.geode.management.internal.cli.LogWrapper; import org.apache.geode.management.internal.cli.functions.ContinuousQueryFunction; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.model.DataResultModel; -import org.apache.geode.management.cli.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; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeConfigCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeConfigCommand.java index b207386..51d5121 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeConfigCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeConfigCommand.java @@ -27,12 +27,12 @@ import org.apache.geode.internal.util.ArgumentRedactor; 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.cli.ResultModel; import org.apache.geode.management.internal.cli.domain.MemberConfigurationInfo; import org.apache.geode.management.internal.cli.functions.CliFunctionResult; import org.apache.geode.management.internal.cli.functions.GetMemberConfigInformationFunction; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.model.DataResultModel; -import org.apache.geode.management.cli.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; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeConnectionCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeConnectionCommand.java index 8d9c21c..596ca2e 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeConnectionCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeConnectionCommand.java @@ -18,8 +18,8 @@ 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.internal.cli.i18n.CliStrings; import org.apache.geode.management.cli.ResultModel; +import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.model.TabularResultModel; import org.apache.geode.management.internal.cli.shell.Gfsh; import org.apache.geode.management.internal.cli.shell.OperationInvoker; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeDiskStoreCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeDiskStoreCommand.java index 2ece3a2..b3e6204 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeDiskStoreCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeDiskStoreCommand.java @@ -27,11 +27,11 @@ import org.apache.geode.internal.lang.ClassUtils; 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.cli.ResultModel; import org.apache.geode.management.internal.cli.domain.DiskStoreDetails; import org.apache.geode.management.internal.cli.functions.DescribeDiskStoreFunction; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.model.DataResultModel; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.result.model.TabularResultModel; import org.apache.geode.management.internal.exceptions.EntityNotFoundException; import org.apache.geode.management.internal.security.ResourceOperation; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeMemberCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeMemberCommand.java index a386872..83c0708 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeMemberCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeMemberCommand.java @@ -29,12 +29,12 @@ 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.cli.ResultModel; import org.apache.geode.management.internal.cli.domain.CacheServerInfo; import org.apache.geode.management.internal.cli.domain.MemberInformation; import org.apache.geode.management.internal.cli.functions.GetMemberInformationFunction; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.model.DataResultModel; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeOfflineDiskStoreCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeOfflineDiskStoreCommand.java index 39ebba2..6c6b000 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeOfflineDiskStoreCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DescribeOfflineDiskStoreCommand.java @@ -25,9 +25,9 @@ import org.apache.geode.SystemFailure; import org.apache.geode.cache.Region; import org.apache.geode.internal.cache.DiskStoreImpl; import org.apache.geode.management.cli.CliMetaData; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.cli.SingleGfshCommand; import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.management.cli.ResultModel; public class DescribeOfflineDiskStoreCommand extends SingleGfshCommand { @CliCommand(value = CliStrings.DESCRIBE_OFFLINE_DISK_STORE, 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 86d6cf3..c92c8a4 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 @@ -26,12 +26,12 @@ 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.ResultModel; 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; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.remote.CommandExecutor; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.configuration.domain.XmlEntity; import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyDiskStoreCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyDiskStoreCommand.java index dea68b4..d5cd4cc 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyDiskStoreCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyDiskStoreCommand.java @@ -26,12 +26,12 @@ import org.apache.geode.cache.configuration.CacheElement; 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.ResultModel; import org.apache.geode.management.cli.SingleGfshCommand; import org.apache.geode.management.internal.cli.functions.CliFunctionResult; import org.apache.geode.management.internal.cli.functions.DestroyDiskStoreFunction; import org.apache.geode.management.internal.cli.functions.DestroyDiskStoreFunctionArgs; import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyFunctionCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyFunctionCommand.java index ac15529..90d9ac4 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyFunctionCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyFunctionCommand.java @@ -33,12 +33,12 @@ 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.cli.Result; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.AbstractCliAroundInterceptor; import org.apache.geode.management.internal.cli.GfshParseResult; import org.apache.geode.management.internal.cli.functions.UnregisterFunction; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.ResultBuilder; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyGatewayReceiverCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyGatewayReceiverCommand.java index a0f6181..d7caa2e 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyGatewayReceiverCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyGatewayReceiverCommand.java @@ -24,11 +24,11 @@ import org.apache.geode.cache.configuration.CacheConfig; 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.ResultModel; import org.apache.geode.management.cli.SingleGfshCommand; import org.apache.geode.management.internal.cli.functions.CliFunctionResult; import org.apache.geode.management.internal.cli.functions.DestroyGatewayReceiverFunction; import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyGatewaySenderCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyGatewaySenderCommand.java index 855b1d2..0f2355e 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyGatewaySenderCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyGatewaySenderCommand.java @@ -27,12 +27,12 @@ import org.apache.geode.distributed.DistributedMember; import org.apache.geode.internal.logging.LogService; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.ConverterHint; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.cli.SingleGfshCommand; import org.apache.geode.management.internal.cli.functions.CliFunctionResult; import org.apache.geode.management.internal.cli.functions.GatewaySenderDestroyFunction; import org.apache.geode.management.internal.cli.functions.GatewaySenderDestroyFunctionArgs; import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyIndexCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyIndexCommand.java index 24a0380..2caf2e5 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyIndexCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyIndexCommand.java @@ -31,11 +31,11 @@ import org.apache.geode.distributed.DistributedMember; import org.apache.geode.internal.lang.StringUtils; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.ConverterHint; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.cli.SingleGfshCommand; import org.apache.geode.management.internal.cli.functions.CliFunctionResult; import org.apache.geode.management.internal.cli.functions.DestroyIndexFunction; import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.exceptions.EntityNotFoundException; import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyJndiBindingCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyJndiBindingCommand.java index ec913df..b1a0cd3 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyJndiBindingCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyJndiBindingCommand.java @@ -27,11 +27,11 @@ import org.apache.geode.cache.configuration.JndiBindingsType; import org.apache.geode.distributed.DistributedMember; import org.apache.geode.distributed.internal.InternalConfigurationPersistenceService; import org.apache.geode.management.cli.CliMetaData; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.cli.SingleGfshCommand; import org.apache.geode.management.internal.cli.functions.CliFunctionResult; import org.apache.geode.management.internal.cli.functions.DestroyJndiBindingFunction; import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.exceptions.EntityNotFoundException; import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyRegionCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyRegionCommand.java index dea4e0e..34987c4 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyRegionCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DestroyRegionCommand.java @@ -30,11 +30,11 @@ import org.apache.geode.distributed.internal.InternalConfigurationPersistenceSer 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.cli.ResultModel; import org.apache.geode.management.internal.cli.functions.CliFunctionResult; import org.apache.geode.management.internal.cli.functions.RegionDestroyFunction; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.remote.CommandExecutor; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.configuration.domain.XmlEntity; import org.apache.geode.management.internal.exceptions.EntityNotFoundException; import org.apache.geode.management.internal.security.ResourceOperation; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DisconnectCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DisconnectCommand.java index 258ae6b..1f0a12b 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DisconnectCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/DisconnectCommand.java @@ -18,10 +18,10 @@ 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.ResultModel; 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.model.InfoResultModel; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.shell.Gfsh; import org.apache.geode.management.internal.cli.shell.OperationInvoker; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/EchoCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/EchoCommand.java index 022fe3d..4e1e895 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/EchoCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/EchoCommand.java @@ -22,8 +22,8 @@ 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.internal.cli.i18n.CliStrings; import org.apache.geode.management.cli.ResultModel; +import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.model.TabularResultModel; import org.apache.geode.management.internal.cli.shell.Gfsh; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExecuteFunctionCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExecuteFunctionCommand.java index c8d8bf8..d460885 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExecuteFunctionCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExecuteFunctionCommand.java @@ -30,12 +30,12 @@ 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.cli.ResultModel; import org.apache.geode.management.internal.cli.CliAroundInterceptor; import org.apache.geode.management.internal.cli.GfshParseResult; import org.apache.geode.management.internal.cli.functions.CliFunctionResult; import org.apache.geode.management.internal.cli.functions.UserFunctionExecution; import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.result.model.TabularResultModel; public class ExecuteFunctionCommand extends GfshCommand { diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExecuteScriptCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExecuteScriptCommand.java index c3ab4c3..d681f9c 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExecuteScriptCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExecuteScriptCommand.java @@ -22,8 +22,8 @@ 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.internal.cli.i18n.CliStrings; import org.apache.geode.management.cli.ResultModel; +import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.shell.Gfsh; public class ExecuteScriptCommand extends OfflineGfshCommand { diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportClusterConfigurationCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportClusterConfigurationCommand.java index e97333d..028bd91 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportClusterConfigurationCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportClusterConfigurationCommand.java @@ -37,13 +37,13 @@ import org.apache.geode.internal.logging.LogService; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.GfshCommand; import org.apache.geode.management.cli.Result; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.AbstractCliAroundInterceptor; import org.apache.geode.management.internal.cli.GfshParseResult; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.model.DataResultModel; import org.apache.geode.management.internal.cli.result.model.FileResultModel; import org.apache.geode.management.internal.cli.result.model.InfoResultModel; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.configuration.domain.Configuration; import org.apache.geode.management.internal.configuration.utils.ZipUtils; import org.apache.geode.management.internal.security.ResourceOperation; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportConfigCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportConfigCommand.java index 5126d74..2e4f8e9 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportConfigCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportConfigCommand.java @@ -29,6 +29,7 @@ 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.cli.ResultModel; import org.apache.geode.management.internal.cli.AbstractCliAroundInterceptor; import org.apache.geode.management.internal.cli.CliUtil; import org.apache.geode.management.internal.cli.GfshParseResult; @@ -36,7 +37,6 @@ import org.apache.geode.management.internal.cli.functions.CliFunctionResult; import org.apache.geode.management.internal.cli.functions.ExportConfigFunction; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.model.InfoResultModel; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportDataCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportDataCommand.java index a513f92..52afeab 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportDataCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportDataCommand.java @@ -30,10 +30,10 @@ 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.cli.ResultModel; import org.apache.geode.management.internal.cli.functions.CliFunctionResult; import org.apache.geode.management.internal.cli.functions.ExportDataFunction; import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.security.ResourcePermission.Operation; import org.apache.geode.security.ResourcePermission.Resource; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportLogsCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportLogsCommand.java index 9004a0c..e1642ff 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportLogsCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportLogsCommand.java @@ -39,10 +39,10 @@ import org.apache.geode.management.ManagementException; 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.cli.ResultModel; import org.apache.geode.management.internal.cli.functions.ExportLogsFunction; import org.apache.geode.management.internal.cli.functions.SizeExportLogsFunction; import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.util.ExportLogsCacheWriter; import org.apache.geode.management.internal.configuration.utils.ZipUtils; import org.apache.geode.management.internal.security.ResourceOperation; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportLogsInterceptor.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportLogsInterceptor.java index da92117..d72e680 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportLogsInterceptor.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportLogsInterceptor.java @@ -27,10 +27,10 @@ import org.apache.logging.log4j.Logger; import org.apache.geode.internal.logging.LogService; import org.apache.geode.internal.logging.log4j.LogLevel; import org.apache.geode.management.cli.Result; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.AbstractCliAroundInterceptor; import org.apache.geode.management.internal.cli.GfshParseResult; import org.apache.geode.management.internal.cli.functions.ExportLogsFunction; -import org.apache.geode.management.cli.ResultModel; /** * after the export logs, will need to copy the tempFile to the desired location and delete the temp diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportOfflineDiskStoreCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportOfflineDiskStoreCommand.java index ece044b..bb508ec 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportOfflineDiskStoreCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ExportOfflineDiskStoreCommand.java @@ -23,10 +23,10 @@ import org.springframework.shell.core.annotation.CliOption; import org.apache.geode.SystemFailure; import org.apache.geode.internal.cache.DiskStoreImpl; import org.apache.geode.management.cli.CliMetaData; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.cli.SingleGfshCommand; import org.apache.geode.management.internal.cli.LogWrapper; import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.management.cli.ResultModel; public class ExportOfflineDiskStoreCommand extends SingleGfshCommand { @CliCommand(value = CliStrings.EXPORT_OFFLINE_DISK_STORE, 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 c0625fb..aece502 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,12 +28,12 @@ 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.ResultModel; 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; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.model.InfoResultModel; -import org.apache.geode.management.cli.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; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/GetCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/GetCommand.java index f9f4ec0..8998444 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/GetCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/GetCommand.java @@ -31,11 +31,11 @@ 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.GfshCommand; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.domain.DataCommandRequest; import org.apache.geode.management.internal.cli.domain.DataCommandResult; import org.apache.geode.management.internal.cli.functions.DataCommandFunction; import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.security.ResourcePermission.Operation; import org.apache.geode.security.ResourcePermission.Resource; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ImportClusterConfigurationCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ImportClusterConfigurationCommand.java index 17d1835..d5d9ce2 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ImportClusterConfigurationCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ImportClusterConfigurationCommand.java @@ -43,6 +43,7 @@ import org.apache.geode.distributed.internal.InternalConfigurationPersistenceSer import org.apache.geode.internal.logging.LogService; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.GfshCommand; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.AbstractCliAroundInterceptor; import org.apache.geode.management.internal.cli.GfshParseResult; import org.apache.geode.management.internal.cli.functions.CliFunctionResult; @@ -50,7 +51,6 @@ import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.remote.CommandExecutionContext; import org.apache.geode.management.internal.cli.result.FileResult; import org.apache.geode.management.internal.cli.result.model.InfoResultModel; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.result.model.TabularResultModel; import org.apache.geode.management.internal.configuration.domain.Configuration; import org.apache.geode.management.internal.configuration.functions.GetRegionNamesFunction; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ImportDataCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ImportDataCommand.java index 1ddad44..86b79c4 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ImportDataCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ImportDataCommand.java @@ -28,10 +28,10 @@ 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.cli.ResultModel; import org.apache.geode.management.internal.cli.functions.CliFunctionResult; import org.apache.geode.management.internal.cli.functions.ImportDataFunction; import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.security.ResourcePermission.Operation; import org.apache.geode.security.ResourcePermission.Resource; 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 2c9bfc8..4aa8ace 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,11 +25,11 @@ 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.ResultModel; 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; import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.management.cli.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; 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 5c06a89..782ac4c 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,11 +27,11 @@ 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.ResultModel; 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; import org.apache.geode.management.internal.cli.result.ResultBuilder; -import org.apache.geode.management.cli.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; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListDeployedCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListDeployedCommand.java index 78f0ece..3d30355 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListDeployedCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListDeployedCommand.java @@ -25,10 +25,10 @@ import org.springframework.shell.core.annotation.CliOption; import org.apache.geode.distributed.DistributedMember; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.GfshCommand; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.functions.CliFunctionResult; import org.apache.geode.management.internal.cli.functions.ListDeployedFunction; import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.management.cli.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; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListDiskStoresCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListDiskStoresCommand.java index 8cc94f3..c170a30 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListDiskStoresCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListDiskStoresCommand.java @@ -29,11 +29,11 @@ import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.internal.cache.execute.AbstractExecution; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.GfshCommand; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.domain.DiskStoreDetails; import org.apache.geode.management.internal.cli.functions.ListDiskStoresFunction; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.ResultDataException; -import org.apache.geode.management.cli.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; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListDurableClientCQsCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListDurableClientCQsCommand.java index 7701428..d9a7534 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListDurableClientCQsCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListDurableClientCQsCommand.java @@ -27,10 +27,10 @@ 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.cli.Result; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.functions.CliFunctionResult; import org.apache.geode.management.internal.cli.functions.ListDurableCqNamesFunction; import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.management.cli.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; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListFunctionCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListFunctionCommand.java index fa3b945..c1de6db 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListFunctionCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListFunctionCommand.java @@ -26,10 +26,10 @@ 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.cli.ResultModel; import org.apache.geode.management.internal.cli.functions.CliFunctionResult; import org.apache.geode.management.internal.cli.functions.ListFunctionFunction; import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.management.cli.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; 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 7759b1a..f7813c5 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,10 +33,10 @@ 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.ResultModel; import org.apache.geode.management.internal.MBeanJMXAdapter; import org.apache.geode.management.internal.SystemManagementService; import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.management.cli.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; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListJndiBindingCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListJndiBindingCommand.java index c0f9b72..9a66091 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListJndiBindingCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ListJndiBindingCommand.java @@ -30,9 +30,9 @@ import org.apache.geode.distributed.DistributedMember; import org.apache.geode.distributed.internal.InternalConfigurationPersistenceService; import org.apache.geode.internal.logging.LogService; import org.apache.geode.management.cli.GfshCommand; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.functions.CliFunctionResult; import org.apache.geode.management.internal.cli.functions.ListJndiBindingFunction; -import org.apache.geode.management.cli.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; 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 940c500..f518fca 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,8 +26,8 @@ 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.internal.cli.i18n.CliStrings; import org.apache.geode.management.cli.ResultModel; +import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.model.TabularResultModel; import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; 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 58ff9b8..30c7dec 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,11 +31,11 @@ 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.ResultModel; 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; import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.management.cli.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; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LoadBalanceGatewaySenderCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LoadBalanceGatewaySenderCommand.java index e13204f..15e03c5 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LoadBalanceGatewaySenderCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LoadBalanceGatewaySenderCommand.java @@ -27,10 +27,10 @@ import org.apache.geode.distributed.DistributedMember; 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.ResultModel; import org.apache.geode.management.cli.SingleGfshCommand; import org.apache.geode.management.internal.SystemManagementService; import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.management.cli.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; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LocateEntryCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LocateEntryCommand.java index ee4ccac..8f5af7b 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LocateEntryCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/LocateEntryCommand.java @@ -27,11 +27,11 @@ 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.cli.ResultModel; import org.apache.geode.management.internal.cli.domain.DataCommandRequest; import org.apache.geode.management.internal.cli.domain.DataCommandResult; import org.apache.geode.management.internal.cli.functions.DataCommandFunction; import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.security.ResourcePermission.Operation; import org.apache.geode.security.ResourcePermission.Resource; 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 0ed5703..fad1169 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.ResultModel; import org.apache.geode.management.internal.cli.AbstractCliAroundInterceptor; import org.apache.geode.management.internal.cli.CliUtil; import org.apache.geode.management.internal.cli.GfshParseResult; @@ -46,7 +47,6 @@ import org.apache.geode.management.internal.cli.GfshParser; import org.apache.geode.management.internal.cli.functions.NetstatFunction; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.remote.CommandExecutionContext; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/PauseGatewaySenderCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/PauseGatewaySenderCommand.java index 22606bf..179a844 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/PauseGatewaySenderCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/PauseGatewaySenderCommand.java @@ -27,10 +27,10 @@ import org.apache.geode.distributed.DistributedMember; 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.ResultModel; import org.apache.geode.management.cli.SingleGfshCommand; import org.apache.geode.management.internal.SystemManagementService; import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.management.cli.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; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/PutCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/PutCommand.java index e6e98da..f017ccb 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/PutCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/PutCommand.java @@ -31,11 +31,11 @@ import org.apache.geode.internal.logging.LogService; 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.cli.ResultModel; import org.apache.geode.management.internal.cli.domain.DataCommandRequest; import org.apache.geode.management.internal.cli.domain.DataCommandResult; import org.apache.geode.management.internal.cli.functions.DataCommandFunction; import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.security.ResourcePermission.Operation; import org.apache.geode.security.ResourcePermission.Resource; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/QueryCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/QueryCommand.java index cdfc4c2..7de34fa 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/QueryCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/QueryCommand.java @@ -39,13 +39,13 @@ import org.apache.geode.internal.logging.LogService; 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.cli.ResultModel; import org.apache.geode.management.internal.cli.CliUtil; import org.apache.geode.management.internal.cli.domain.DataCommandRequest; import org.apache.geode.management.internal.cli.domain.DataCommandResult; import org.apache.geode.management.internal.cli.functions.DataCommandFunction; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.remote.CommandExecutionContext; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.security.ResourcePermission.Operation; import org.apache.geode.security.ResourcePermission.Resource; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/QueryInterceptor.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/QueryInterceptor.java index ea88145..6f78703 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/QueryInterceptor.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/QueryInterceptor.java @@ -25,13 +25,13 @@ import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.SystemUtils; import org.springframework.shell.event.ParseResult; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.AbstractCliAroundInterceptor; import org.apache.geode.management.internal.cli.GfshParseResult; import org.apache.geode.management.internal.cli.domain.DataCommandResult; import org.apache.geode.management.internal.cli.result.CommandResult; import org.apache.geode.management.internal.cli.result.ModelCommandResult; import org.apache.geode.management.internal.cli.result.model.DataResultModel; -import org.apache.geode.management.cli.ResultModel; public class QueryInterceptor extends AbstractCliAroundInterceptor { public static final String FILE_ALREADY_EXISTS_MESSAGE = diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/RemoveCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/RemoveCommand.java index 965113a..2600594 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/RemoveCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/RemoveCommand.java @@ -30,11 +30,11 @@ 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.GfshCommand; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.domain.DataCommandRequest; import org.apache.geode.management.internal.cli.domain.DataCommandResult; import org.apache.geode.management.internal.cli.functions.DataCommandFunction; import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.security.ResourcePermission.Operation; import org.apache.geode.security.ResourcePermission.Resource; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ResumeGatewaySenderCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ResumeGatewaySenderCommand.java index f27854b..5b2899e 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ResumeGatewaySenderCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ResumeGatewaySenderCommand.java @@ -27,10 +27,10 @@ import org.apache.geode.distributed.DistributedMember; 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.ResultModel; import org.apache.geode.management.cli.SingleGfshCommand; import org.apache.geode.management.internal.SystemManagementService; import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.management.cli.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; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/RevokeMissingDiskStoreCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/RevokeMissingDiskStoreCommand.java index 08e11d0..18cdf42 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/RevokeMissingDiskStoreCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/RevokeMissingDiskStoreCommand.java @@ -22,8 +22,8 @@ import org.apache.geode.management.DistributedSystemMXBean; 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.i18n.CliStrings; import org.apache.geode.management.cli.ResultModel; +import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowDeadlockCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowDeadlockCommand.java index 2b19956..08bd534 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowDeadlockCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowDeadlockCommand.java @@ -33,12 +33,12 @@ import org.apache.geode.distributed.internal.deadlock.GemFireDeadlockDetector; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.GfshCommand; import org.apache.geode.management.cli.Result; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.CliAroundInterceptor; import org.apache.geode.management.internal.cli.GfshParseResult; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.model.FileResultModel; import org.apache.geode.management.internal.cli.result.model.InfoResultModel; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowLogCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowLogCommand.java index 5232b3c..cbcff1a 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowLogCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowLogCommand.java @@ -25,11 +25,11 @@ 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.GfshCommand; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.ManagementConstants; import org.apache.geode.management.internal.SystemManagementService; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.model.InfoResultModel; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowMetricsCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowMetricsCommand.java index 0ac14d9..291c61f 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowMetricsCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowMetricsCommand.java @@ -42,11 +42,11 @@ import org.apache.geode.management.RegionMXBean; 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.cli.ResultModel; import org.apache.geode.management.internal.MBeanJMXAdapter; import org.apache.geode.management.internal.SystemManagementService; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.ResultDataException; -import org.apache.geode.management.cli.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; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowMetricsInterceptor.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowMetricsInterceptor.java index e0d2384..cb61f7e 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowMetricsInterceptor.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowMetricsInterceptor.java @@ -24,6 +24,7 @@ import java.util.Set; import java.util.stream.Collectors; import org.apache.geode.management.cli.Result; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.AbstractCliAroundInterceptor; import org.apache.geode.management.internal.cli.GfshParseResult; import org.apache.geode.management.internal.cli.commands.ShowMetricsCommand.Category; @@ -31,7 +32,6 @@ import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.CommandResult; import org.apache.geode.management.internal.cli.result.ResultBuilder; import org.apache.geode.management.internal.cli.result.model.FileResultModel; -import org.apache.geode.management.cli.ResultModel; public class ShowMetricsInterceptor extends AbstractCliAroundInterceptor { @Override diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowMissingDiskStoreCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowMissingDiskStoreCommand.java index 8eb46aa..b8b3919 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowMissingDiskStoreCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ShowMissingDiskStoreCommand.java @@ -32,10 +32,10 @@ import org.apache.geode.management.ManagementService; import org.apache.geode.management.PersistentMemberDetails; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.GfshCommand; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.functions.ShowMissingDiskStoresFunction; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.ResultDataException; -import org.apache.geode.management.cli.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; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartGatewayReceiverCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartGatewayReceiverCommand.java index 57d37af..1ccf1bd 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartGatewayReceiverCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartGatewayReceiverCommand.java @@ -26,11 +26,11 @@ import org.apache.geode.distributed.DistributedMember; import org.apache.geode.management.GatewayReceiverMXBean; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.ConverterHint; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.cli.SingleGfshCommand; import org.apache.geode.management.internal.MBeanJMXAdapter; import org.apache.geode.management.internal.SystemManagementService; import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.management.cli.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; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartGatewaySenderCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartGatewaySenderCommand.java index e97c0a5..ee3bac2 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartGatewaySenderCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartGatewaySenderCommand.java @@ -35,10 +35,10 @@ import org.apache.geode.internal.logging.LoggingExecutors; 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.ResultModel; import org.apache.geode.management.cli.SingleGfshCommand; import org.apache.geode.management.internal.SystemManagementService; import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.management.cli.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; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartLocatorCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartLocatorCommand.java index d60a561..e218e48 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartLocatorCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartLocatorCommand.java @@ -43,11 +43,11 @@ import org.apache.geode.internal.process.ProcessType; import org.apache.geode.internal.util.IOUtils; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.ConverterHint; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.GfshParser; import org.apache.geode.management.internal.cli.domain.ConnectToLocatorResult; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.model.InfoResultModel; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.shell.Gfsh; import org.apache.geode.management.internal.cli.shell.JmxOperationInvoker; import org.apache.geode.management.internal.cli.util.CommandStringBuilder; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartServerCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartServerCommand.java index f3715a6..779bf0a 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartServerCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StartServerCommand.java @@ -41,10 +41,10 @@ import org.apache.geode.internal.process.ProcessType; import org.apache.geode.internal.util.IOUtils; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.ConverterHint; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.CliUtil; import org.apache.geode.management.internal.cli.GfshParser; import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.shell.Gfsh; import org.apache.geode.management.internal.security.ResourceConstants; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StatusClusterConfigServiceCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StatusClusterConfigServiceCommand.java index cff3dbf..45175d8 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StatusClusterConfigServiceCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StatusClusterConfigServiceCommand.java @@ -26,11 +26,11 @@ import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.GfshCommand; import org.apache.geode.management.cli.Result.Status; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.CliUtil; import org.apache.geode.management.internal.cli.functions.CliFunctionResult; import org.apache.geode.management.internal.cli.functions.FetchSharedConfigurationStatusFunction; import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.result.model.TabularResultModel; import org.apache.geode.management.internal.configuration.domain.SharedConfigurationStatus; import org.apache.geode.management.internal.security.ResourceOperation; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StatusGatewayReceiverCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StatusGatewayReceiverCommand.java index 672cd59..48d23e7 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StatusGatewayReceiverCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StatusGatewayReceiverCommand.java @@ -26,11 +26,11 @@ import org.apache.geode.distributed.DistributedMember; import org.apache.geode.management.GatewayReceiverMXBean; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.ConverterHint; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.cli.SingleGfshCommand; import org.apache.geode.management.internal.MBeanJMXAdapter; import org.apache.geode.management.internal.SystemManagementService; import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.management.cli.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; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StatusGatewaySenderCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StatusGatewaySenderCommand.java index 6632736..0583f94 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StatusGatewaySenderCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StatusGatewaySenderCommand.java @@ -27,10 +27,10 @@ import org.apache.geode.distributed.DistributedMember; 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.ResultModel; import org.apache.geode.management.cli.SingleGfshCommand; import org.apache.geode.management.internal.SystemManagementService; import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.management.cli.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; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StopGatewayReceiverCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StopGatewayReceiverCommand.java index 430cc5f..5df5aa6 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StopGatewayReceiverCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StopGatewayReceiverCommand.java @@ -26,11 +26,11 @@ import org.apache.geode.distributed.DistributedMember; import org.apache.geode.management.GatewayReceiverMXBean; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.ConverterHint; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.cli.SingleGfshCommand; import org.apache.geode.management.internal.MBeanJMXAdapter; import org.apache.geode.management.internal.SystemManagementService; import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.management.cli.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; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StopGatewaySenderCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StopGatewaySenderCommand.java index 2f34062..12543b0 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StopGatewaySenderCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/StopGatewaySenderCommand.java @@ -27,10 +27,10 @@ import org.apache.geode.internal.cache.InternalCache; 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.ResultModel; import org.apache.geode.management.cli.SingleGfshCommand; import org.apache.geode.management.internal.SystemManagementService; import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.management.cli.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; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/UndeployCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/UndeployCommand.java index e1faff3..b472480 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/UndeployCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/UndeployCommand.java @@ -28,11 +28,11 @@ 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.cli.Result; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.functions.CliFunctionResult; import org.apache.geode.management.internal.cli.functions.UndeployFunction; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.remote.CommandExecutor; -import org.apache.geode.management.cli.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; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/UpgradeOfflineDiskStoreCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/UpgradeOfflineDiskStoreCommand.java index 128a05d..88d7f0e 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/UpgradeOfflineDiskStoreCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/UpgradeOfflineDiskStoreCommand.java @@ -28,11 +28,11 @@ 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.cli.ResultModel; import org.apache.geode.management.cli.SingleGfshCommand; 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.model.InfoResultModel; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.util.DiskStoreUpgrader; public class UpgradeOfflineDiskStoreCommand extends SingleGfshCommand { diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/UsernamePasswordInterceptor.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/UsernamePasswordInterceptor.java index 582ab0a..7978907 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/UsernamePasswordInterceptor.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/UsernamePasswordInterceptor.java @@ -16,10 +16,10 @@ package org.apache.geode.management.internal.cli.commands; import org.apache.commons.lang3.StringUtils; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.AbstractCliAroundInterceptor; import org.apache.geode.management.internal.cli.GfshParseResult; import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.shell.Gfsh; public class UsernamePasswordInterceptor extends AbstractCliAroundInterceptor { diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ValidateDiskStoreCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ValidateDiskStoreCommand.java index fb80242..ac20765 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ValidateDiskStoreCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/ValidateDiskStoreCommand.java @@ -29,10 +29,10 @@ import org.springframework.shell.core.annotation.CliOption; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.GfshCommand; import org.apache.geode.management.cli.Result; +import org.apache.geode.management.cli.ResultModel; 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.model.InfoResultModel; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.util.DiskStoreValidater; public class ValidateDiskStoreCommand extends GfshCommand { diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartJConsoleCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartJConsoleCommand.java index 9dbeee5..46ea1ee 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartJConsoleCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartJConsoleCommand.java @@ -31,11 +31,11 @@ import org.springframework.shell.core.annotation.CliOption; import org.apache.geode.internal.util.IOUtils; import org.apache.geode.management.cli.CliMetaData; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.GfshParser; import org.apache.geode.management.internal.cli.commands.OfflineGfshCommand; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.model.InfoResultModel; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.util.JdkTool; public class StartJConsoleCommand extends OfflineGfshCommand { diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartJVisualVMCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartJVisualVMCommand.java index 6d4ea9e..118a307 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartJVisualVMCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StartJVisualVMCommand.java @@ -26,11 +26,11 @@ 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.ResultModel; import org.apache.geode.management.internal.cli.GfshParser; import org.apache.geode.management.internal.cli.commands.OfflineGfshCommand; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.model.InfoResultModel; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.util.JdkTool; public class StartJVisualVMCommand extends OfflineGfshCommand { diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StatusLocatorCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StatusLocatorCommand.java index 4b4fda7..f1f56c4 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StatusLocatorCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StatusLocatorCommand.java @@ -28,10 +28,10 @@ import org.apache.geode.distributed.LocatorLauncher; 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.ResultModel; import org.apache.geode.management.internal.cli.commands.OfflineGfshCommand; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.model.InfoResultModel; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.configuration.utils.ClusterConfigurationStatusRetriever; public class StatusLocatorCommand extends OfflineGfshCommand { 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 176471b..0b9078d 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,9 +27,9 @@ import org.apache.geode.distributed.ServerLauncher; 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.ResultModel; import org.apache.geode.management.internal.cli.commands.OfflineGfshCommand; import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.management.cli.ResultModel; public class StatusServerCommand extends OfflineGfshCommand { diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StopLocatorCommand.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StopLocatorCommand.java index ca3c31c..f5f1ff2 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StopLocatorCommand.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/commands/lifecycle/StopLocatorCommand.java @@ -29,9 +29,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.ResultModel; import org.apache.geode.management.internal.cli.commands.OfflineGfshCommand; import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.shell.Gfsh; public class StopLocatorCommand extends OfflineGfshCommand { 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 695c406..12489c3 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,9 +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.ResultModel; import org.apache.geode.management.internal.cli.commands.OfflineGfshCommand; import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.shell.Gfsh; public class StopServerCommand extends OfflineGfshCommand { diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/DataCommandResult.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/DataCommandResult.java index 6fa3f7d..381a673 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/DataCommandResult.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/domain/DataCommandResult.java @@ -31,10 +31,10 @@ import org.apache.geode.cache.query.Struct; import org.apache.geode.cache.query.internal.StructImpl; import org.apache.geode.cache.query.internal.Undefined; import org.apache.geode.management.cli.Result; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.GfshParser; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.model.DataResultModel; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.result.model.TabularResultModel; import org.apache.geode.pdx.JSONFormatter; import org.apache.geode.pdx.PdxInstance; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/remote/CommandExecutor.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/remote/CommandExecutor.java index 851bbdf..56476b2 100755 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/remote/CommandExecutor.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/remote/CommandExecutor.java @@ -28,12 +28,12 @@ import org.apache.geode.SystemFailure; import org.apache.geode.distributed.internal.InternalConfigurationPersistenceService; import org.apache.geode.internal.logging.LogService; import org.apache.geode.management.cli.Result; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.cli.SingleGfshCommand; import org.apache.geode.management.cli.UpdateAllConfigurationGroupsMarker; import org.apache.geode.management.internal.cli.GfshParseResult; import org.apache.geode.management.internal.cli.exceptions.UserErrorException; import org.apache.geode.management.internal.cli.result.model.InfoResultModel; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.result.model.TabularResultModel; import org.apache.geode.management.internal.exceptions.EntityNotFoundException; import org.apache.geode.security.NotAuthorizedException; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/ModelCommandResult.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/ModelCommandResult.java index db0ed90..85c34b3 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/ModelCommandResult.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/ModelCommandResult.java @@ -29,12 +29,12 @@ import java.util.stream.Collectors; import org.apache.commons.lang3.NotImplementedException; import org.apache.geode.annotations.Immutable; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.GfshParser; import org.apache.geode.management.internal.cli.json.GfJsonObject; import org.apache.geode.management.internal.cli.result.model.AbstractResultModel; import org.apache.geode.management.internal.cli.result.model.DataResultModel; import org.apache.geode.management.internal.cli.result.model.InfoResultModel; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.result.model.TabularResultModel; public class ModelCommandResult implements CommandResult { diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/ResultBuilder.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/ResultBuilder.java index a9a5614..f91ad9c 100755 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/ResultBuilder.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/ResultBuilder.java @@ -20,10 +20,10 @@ import java.util.List; import org.apache.commons.lang3.StringUtils; import org.apache.geode.management.cli.Result; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.functions.CliFunctionResult; import org.apache.geode.management.internal.cli.json.GfJsonException; import org.apache.geode.management.internal.cli.json.GfJsonObject; -import org.apache.geode.management.cli.ResultModel; /** * Provides methods for creating {@link Result} objects to return from Gfsh command functions diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/model/DataResultModel.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/model/DataResultModel.java index 06889d2..d656ef0 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/model/DataResultModel.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/model/DataResultModel.java @@ -23,7 +23,7 @@ public class DataResultModel extends AbstractResultModel { private Map data = new LinkedHashMap<>(); - DataResultModel() {} + public DataResultModel() {} @Override public Map getContent() { diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/model/InfoResultModel.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/model/InfoResultModel.java index 8c4a0d8..fb1b24d 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/model/InfoResultModel.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/model/InfoResultModel.java @@ -24,7 +24,7 @@ public class InfoResultModel extends AbstractResultModel { private List messages = new ArrayList<>(); - InfoResultModel() {} + public InfoResultModel() {} @Override public List getContent() { diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/model/TabularResultModel.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/model/TabularResultModel.java index 47e2d19..8511958 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/model/TabularResultModel.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/result/model/TabularResultModel.java @@ -29,7 +29,7 @@ public class TabularResultModel extends AbstractResultModel { */ private Map> table = new LinkedHashMap<>(); - TabularResultModel() {} + public TabularResultModel() {} public TabularResultModel accumulate(String column, String value) { if (table.containsKey(column)) { diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/Gfsh.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/Gfsh.java index 075df97..79b817e 100755 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/Gfsh.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/Gfsh.java @@ -55,6 +55,7 @@ import org.apache.geode.internal.util.HostName; import org.apache.geode.internal.util.SunAPINotFoundException; import org.apache.geode.management.cli.CommandProcessingException; import org.apache.geode.management.cli.Result; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.CliUtil; import org.apache.geode.management.internal.cli.CommandManager; import org.apache.geode.management.internal.cli.GfshParser; @@ -62,7 +63,6 @@ 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.CommandResult; import org.apache.geode.management.internal.cli.result.LegacyCommandResult; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.shell.jline.ANSIHandler; import org.apache.geode.management.internal.cli.shell.jline.ANSIHandler.ANSIStyle; import org.apache.geode.management.internal.cli.shell.jline.GfshHistory; diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/GfshExecutionStrategy.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/GfshExecutionStrategy.java index 4af7a3a..8b4d977 100755 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/GfshExecutionStrategy.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/GfshExecutionStrategy.java @@ -30,6 +30,7 @@ import org.apache.geode.internal.ClassPathLoader; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.Result; import org.apache.geode.management.cli.Result.Status; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.CliAroundInterceptor; import org.apache.geode.management.internal.cli.CommandRequest; import org.apache.geode.management.internal.cli.CommandResponse; @@ -42,7 +43,6 @@ import org.apache.geode.management.internal.cli.result.CommandResult; import org.apache.geode.management.internal.cli.result.FileResult; import org.apache.geode.management.internal.cli.result.ModelCommandResult; import org.apache.geode.management.internal.cli.result.ResultBuilder; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.security.NotAuthorizedException; /** diff --git a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/ScriptExecutionDetails.java b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/ScriptExecutionDetails.java index e0d2374..af4ab6f 100644 --- a/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/ScriptExecutionDetails.java +++ b/geode-core/src/main/java/org/apache/geode/management/internal/cli/shell/ScriptExecutionDetails.java @@ -18,11 +18,11 @@ import java.util.ArrayList; import java.util.List; import org.apache.geode.management.cli.Result; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.LogWrapper; import org.apache.geode.management.internal.cli.result.ModelCommandResult; import org.apache.geode.management.internal.cli.result.ResultBuilder; import org.apache.geode.management.internal.cli.result.model.DataResultModel; -import org.apache.geode.management.cli.ResultModel; class ScriptExecutionDetails { private final String filePath; diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandTest.java index 25b5166..5b66212 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ConnectCommandTest.java @@ -40,9 +40,9 @@ import org.junit.Test; import org.mockito.ArgumentCaptor; import org.apache.geode.management.cli.Result; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.CommandResult; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.shell.Gfsh; import org.apache.geode.management.internal.cli.shell.OperationInvoker; import org.apache.geode.test.junit.rules.GfshParserRule; diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateGatewaySenderCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateGatewaySenderCommandTest.java index 0444478..84c4006 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateGatewaySenderCommandTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/CreateGatewaySenderCommandTest.java @@ -40,10 +40,10 @@ import org.apache.geode.distributed.DistributedMember; import org.apache.geode.distributed.internal.membership.InternalDistributedMember; import org.apache.geode.internal.Version; import org.apache.geode.internal.cache.InternalCache; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.functions.CliFunctionResult; import org.apache.geode.management.internal.cli.functions.GatewaySenderFunctionArgs; import org.apache.geode.management.internal.cli.i18n.CliStrings; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.test.junit.rules.GfshParserRule; diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsCommandTest.java index 443779f..1ff7f60 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsCommandTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsCommandTest.java @@ -44,8 +44,8 @@ import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.internal.cache.InternalCacheForClientAccess; import org.apache.geode.management.ManagementException; import org.apache.geode.management.cli.Result; -import org.apache.geode.management.internal.cli.functions.SizeExportLogsFunction; import org.apache.geode.management.cli.ResultModel; +import org.apache.geode.management.internal.cli.functions.SizeExportLogsFunction; import org.apache.geode.management.internal.cli.util.BytesToString; import org.apache.geode.test.junit.categories.GfshTest; import org.apache.geode.test.junit.categories.LoggingTest; diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsInterceptorTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsInterceptorTest.java index 4d293f8..e8d67b7 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsInterceptorTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ExportLogsInterceptorTest.java @@ -22,8 +22,8 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.mockito.Mockito; -import org.apache.geode.management.internal.cli.GfshParseResult; import org.apache.geode.management.cli.ResultModel; +import org.apache.geode.management.internal.cli.GfshParseResult; import org.apache.geode.test.junit.categories.GfshTest; import org.apache.geode.test.junit.categories.LoggingTest; diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListGatewayCommandTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListGatewayCommandTest.java index 48eb8b6..794fd70 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListGatewayCommandTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/ListGatewayCommandTest.java @@ -31,10 +31,10 @@ import org.junit.Test; import org.apache.geode.distributed.DistributedMember; import org.apache.geode.management.GatewayReceiverMXBean; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.SystemManagementService; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.ModelCommandResult; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.test.junit.assertions.CommandResultAssert; import org.apache.geode.test.junit.rules.GfshParserRule; diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/LogLevelInterceptorTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/LogLevelInterceptorTest.java index 5cc1440..2a69e8b 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/LogLevelInterceptorTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/commands/LogLevelInterceptorTest.java @@ -25,9 +25,9 @@ import org.junit.Test; import org.junit.experimental.categories.Category; import org.mockito.Mockito; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.AbstractCliAroundInterceptor; import org.apache.geode.management.internal.cli.GfshParseResult; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.test.junit.categories.GfshTest; import org.apache.geode.test.junit.categories.LoggingTest; diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/remote/CommandExecutorTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/remote/CommandExecutorTest.java index beacc35..209280d 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/remote/CommandExecutorTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/remote/CommandExecutorTest.java @@ -40,11 +40,11 @@ import org.apache.geode.cache.Region; import org.apache.geode.distributed.internal.InternalConfigurationPersistenceService; import org.apache.geode.internal.cache.AbstractRegion; import org.apache.geode.management.cli.Result; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.cli.SingleGfshCommand; import org.apache.geode.management.cli.UpdateAllConfigurationGroupsMarker; import org.apache.geode.management.internal.cli.GfshParseResult; import org.apache.geode.management.internal.cli.exceptions.UserErrorException; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.exceptions.EntityNotFoundException; import org.apache.geode.security.NotAuthorizedException; diff --git a/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshExecutionStrategyTest.java b/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshExecutionStrategyTest.java index dae0c00..7c0e8e8 100644 --- a/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshExecutionStrategyTest.java +++ b/geode-core/src/test/java/org/apache/geode/management/internal/cli/shell/GfshExecutionStrategyTest.java @@ -27,6 +27,7 @@ import org.springframework.shell.core.CommandMarker; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.Result; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.AbstractCliAroundInterceptor; import org.apache.geode.management.internal.cli.CommandRequest; import org.apache.geode.management.internal.cli.CommandResponseBuilder; @@ -34,7 +35,6 @@ import org.apache.geode.management.internal.cli.GfshParseResult; import org.apache.geode.management.internal.cli.LogWrapper; import org.apache.geode.management.internal.cli.result.CommandResult; import org.apache.geode.management.internal.cli.result.ResultBuilder; -import org.apache.geode.management.cli.ResultModel; /** * GfshExecutionStrategyTest - Includes tests to for GfshExecutionStrategyTest diff --git a/geode-dunit/src/main/java/org/apache/geode/management/internal/cli/commands/GemfireDataCommandsDUnitTestBase.java b/geode-dunit/src/main/java/org/apache/geode/management/internal/cli/commands/GemfireDataCommandsDUnitTestBase.java index 4ae9c9b..f35885e 100644 --- a/geode-dunit/src/main/java/org/apache/geode/management/internal/cli/commands/GemfireDataCommandsDUnitTestBase.java +++ b/geode-dunit/src/main/java/org/apache/geode/management/internal/cli/commands/GemfireDataCommandsDUnitTestBase.java @@ -41,13 +41,13 @@ import org.apache.geode.internal.AvailablePortHelper; import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.management.DistributedRegionMXBean; import org.apache.geode.management.ManagementService; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.domain.DataCommandResult; import org.apache.geode.management.internal.cli.dto.Value1; import org.apache.geode.management.internal.cli.dto.Value2; import org.apache.geode.management.internal.cli.result.CommandResult; import org.apache.geode.management.internal.cli.result.ResultData; import org.apache.geode.management.internal.cli.result.model.DataResultModel; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.test.dunit.SerializableRunnableIF; import org.apache.geode.test.dunit.rules.ClusterStartupRule; import org.apache.geode.test.dunit.rules.MemberVM; diff --git a/geode-dunit/src/main/java/org/apache/geode/management/internal/cli/commands/IndexCommandsIntegrationTestBase.java b/geode-dunit/src/main/java/org/apache/geode/management/internal/cli/commands/IndexCommandsIntegrationTestBase.java index 97671de..5d39718 100644 --- a/geode-dunit/src/main/java/org/apache/geode/management/internal/cli/commands/IndexCommandsIntegrationTestBase.java +++ b/geode-dunit/src/main/java/org/apache/geode/management/internal/cli/commands/IndexCommandsIntegrationTestBase.java @@ -36,10 +36,10 @@ import org.apache.geode.cache.RegionFactory; import org.apache.geode.cache.query.Index; import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.management.cli.Result; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.domain.Stock; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.CommandResult; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.util.CommandStringBuilder; import org.apache.geode.test.junit.categories.GfshTest; import org.apache.geode.test.junit.rules.GfshCommandRule; diff --git a/geode-dunit/src/main/java/org/apache/geode/management/internal/cli/commands/QueryCommandDUnitTestBase.java b/geode-dunit/src/main/java/org/apache/geode/management/internal/cli/commands/QueryCommandDUnitTestBase.java index 521c027..88fd455 100644 --- a/geode-dunit/src/main/java/org/apache/geode/management/internal/cli/commands/QueryCommandDUnitTestBase.java +++ b/geode-dunit/src/main/java/org/apache/geode/management/internal/cli/commands/QueryCommandDUnitTestBase.java @@ -47,11 +47,11 @@ import org.apache.geode.internal.cache.InternalCache; import org.apache.geode.management.ManagementService; import org.apache.geode.management.MemberMXBean; import org.apache.geode.management.cli.Result; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.domain.DataCommandResult; import org.apache.geode.management.internal.cli.dto.Value1; import org.apache.geode.management.internal.cli.result.CommandResult; import org.apache.geode.management.internal.cli.result.ResultData; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.test.dunit.IgnoredException; import org.apache.geode.test.dunit.rules.ClusterStartupRule; import org.apache.geode.test.dunit.rules.MemberVM; diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/assertions/CommandResultAssert.java b/geode-junit/src/main/java/org/apache/geode/test/junit/assertions/CommandResultAssert.java index d02d824..4bfc0c0 100644 --- a/geode-junit/src/main/java/org/apache/geode/test/junit/assertions/CommandResultAssert.java +++ b/geode-junit/src/main/java/org/apache/geode/test/junit/assertions/CommandResultAssert.java @@ -29,11 +29,11 @@ import org.assertj.core.api.Assertions; import org.junit.Assert; import org.apache.geode.management.cli.Result; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.result.CommandResult; import org.apache.geode.management.internal.cli.result.ModelCommandResult; import org.apache.geode.management.internal.cli.result.model.DataResultModel; import org.apache.geode.management.internal.cli.result.model.InfoResultModel; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.result.model.TabularResultModel; public class CommandResultAssert diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/assertions/ResultModelAssert.java b/geode-junit/src/main/java/org/apache/geode/test/junit/assertions/ResultModelAssert.java index dfce2b1..ca9d22c 100644 --- a/geode-junit/src/main/java/org/apache/geode/test/junit/assertions/ResultModelAssert.java +++ b/geode-junit/src/main/java/org/apache/geode/test/junit/assertions/ResultModelAssert.java @@ -19,9 +19,9 @@ import static org.assertj.core.api.Assertions.assertThat; import org.assertj.core.api.AbstractAssert; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.result.model.DataResultModel; import org.apache.geode.management.internal.cli.result.model.InfoResultModel; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.result.model.TabularResultModel; public class ResultModelAssert extends AbstractAssert { diff --git a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/GfshParserRule.java b/geode-junit/src/main/java/org/apache/geode/test/junit/rules/GfshParserRule.java index 3325221..f2ba93b 100644 --- a/geode-junit/src/main/java/org/apache/geode/test/junit/rules/GfshParserRule.java +++ b/geode-junit/src/main/java/org/apache/geode/test/junit/rules/GfshParserRule.java @@ -27,6 +27,7 @@ import org.springframework.shell.core.Converter; import org.apache.geode.internal.ClassPathLoader; import org.apache.geode.management.cli.CliMetaData; import org.apache.geode.management.cli.Result; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.CliAroundInterceptor; import org.apache.geode.management.internal.cli.CommandManager; import org.apache.geode.management.internal.cli.GfshParseResult; @@ -35,7 +36,6 @@ import org.apache.geode.management.internal.cli.remote.CommandExecutor; import org.apache.geode.management.internal.cli.result.CommandResult; import org.apache.geode.management.internal.cli.result.ModelCommandResult; import org.apache.geode.management.internal.cli.result.ResultBuilder; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.test.junit.assertions.CommandResultAssert; public class GfshParserRule extends ExternalResource { diff --git a/geode-redis/src/main/java/org/apache/geode/redis/internal/RegionProvider.java b/geode-redis/src/main/java/org/apache/geode/redis/internal/RegionProvider.java index 680464f..932fe26 100644 --- a/geode-redis/src/main/java/org/apache/geode/redis/internal/RegionProvider.java +++ b/geode-redis/src/main/java/org/apache/geode/redis/internal/RegionProvider.java @@ -43,8 +43,8 @@ import org.apache.geode.cache.query.RegionNotFoundException; import org.apache.geode.internal.cache.GemFireCacheImpl; import org.apache.geode.internal.hll.HyperLogLogPlus; import org.apache.geode.management.cli.Result.Status; -import org.apache.geode.management.internal.cli.commands.CreateRegionCommand; import org.apache.geode.management.cli.ResultModel; +import org.apache.geode.management.internal.cli.commands.CreateRegionCommand; import org.apache.geode.redis.GeodeRedisServer; import org.apache.geode.redis.internal.executor.ExpirationExecutor; import org.apache.geode.redis.internal.executor.ListQuery; diff --git a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/PauseGatewaySenderCommandDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/PauseGatewaySenderCommandDUnitTest.java index 693e7f0..20d8c1a 100644 --- a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/PauseGatewaySenderCommandDUnitTest.java +++ b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/PauseGatewaySenderCommandDUnitTest.java @@ -35,9 +35,9 @@ import org.junit.experimental.categories.Category; import org.apache.geode.distributed.DistributedMember; import org.apache.geode.management.cli.Result; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.CommandResult; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.result.model.TabularResultModel; import org.apache.geode.test.dunit.rules.ClusterStartupRule; import org.apache.geode.test.dunit.rules.MemberVM; diff --git a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/ResumeGatewaySenderCommandDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/ResumeGatewaySenderCommandDUnitTest.java index 8688a75..ccd2d57 100644 --- a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/ResumeGatewaySenderCommandDUnitTest.java +++ b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/ResumeGatewaySenderCommandDUnitTest.java @@ -36,9 +36,9 @@ import org.junit.experimental.categories.Category; import org.apache.geode.distributed.DistributedMember; import org.apache.geode.management.cli.Result; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.CommandResult; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.result.model.TabularResultModel; import org.apache.geode.test.dunit.rules.ClusterStartupRule; import org.apache.geode.test.dunit.rules.MemberVM; diff --git a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/StartGatewayReceiverCommandDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/StartGatewayReceiverCommandDUnitTest.java index 5a562b8..2236623 100644 --- a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/StartGatewayReceiverCommandDUnitTest.java +++ b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/StartGatewayReceiverCommandDUnitTest.java @@ -34,9 +34,9 @@ import org.junit.experimental.categories.Category; import org.apache.geode.distributed.DistributedMember; import org.apache.geode.management.cli.Result; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.CommandResult; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.result.model.TabularResultModel; import org.apache.geode.test.dunit.rules.ClusterStartupRule; import org.apache.geode.test.dunit.rules.MemberVM; diff --git a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/StartGatewaySenderCommandDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/StartGatewaySenderCommandDUnitTest.java index f3d884a..d45d4a6 100644 --- a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/StartGatewaySenderCommandDUnitTest.java +++ b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/StartGatewaySenderCommandDUnitTest.java @@ -34,9 +34,9 @@ import org.junit.experimental.categories.Category; import org.apache.geode.distributed.DistributedMember; import org.apache.geode.management.cli.Result; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.CommandResult; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.result.model.TabularResultModel; import org.apache.geode.test.dunit.IgnoredException; import org.apache.geode.test.dunit.rules.ClusterStartupRule; diff --git a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/StatusGatewayReceiverCommandDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/StatusGatewayReceiverCommandDUnitTest.java index ba76c6c..e301472 100644 --- a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/StatusGatewayReceiverCommandDUnitTest.java +++ b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/StatusGatewayReceiverCommandDUnitTest.java @@ -33,9 +33,9 @@ import org.junit.experimental.categories.Category; import org.apache.geode.distributed.DistributedMember; import org.apache.geode.management.cli.Result; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.CommandResult; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.result.model.TabularResultModel; import org.apache.geode.test.dunit.rules.ClusterStartupRule; import org.apache.geode.test.dunit.rules.MemberVM; diff --git a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/StatusGatewaySenderCommandDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/StatusGatewaySenderCommandDUnitTest.java index c9c3cfc..8235654 100644 --- a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/StatusGatewaySenderCommandDUnitTest.java +++ b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/StatusGatewaySenderCommandDUnitTest.java @@ -35,9 +35,9 @@ import org.junit.experimental.categories.Category; import org.apache.geode.distributed.DistributedMember; import org.apache.geode.management.cli.Result; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.CommandResult; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.result.model.TabularResultModel; import org.apache.geode.test.dunit.rules.ClusterStartupRule; import org.apache.geode.test.dunit.rules.MemberVM; diff --git a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/StopGatewayReceiverCommandDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/StopGatewayReceiverCommandDUnitTest.java index c6dd7cb..bf1b658 100644 --- a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/StopGatewayReceiverCommandDUnitTest.java +++ b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/StopGatewayReceiverCommandDUnitTest.java @@ -35,9 +35,9 @@ import org.junit.experimental.categories.Category; import org.apache.geode.distributed.DistributedMember; import org.apache.geode.management.cli.Result; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.CommandResult; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.result.model.TabularResultModel; import org.apache.geode.test.dunit.rules.ClusterStartupRule; import org.apache.geode.test.dunit.rules.MemberVM; diff --git a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/StopGatewaySenderCommandDUnitTest.java b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/StopGatewaySenderCommandDUnitTest.java index c57db72..9b656cd 100644 --- a/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/StopGatewaySenderCommandDUnitTest.java +++ b/geode-wan/src/distributedTest/java/org/apache/geode/internal/cache/wan/wancommand/StopGatewaySenderCommandDUnitTest.java @@ -35,9 +35,9 @@ import org.junit.experimental.categories.Category; import org.apache.geode.distributed.DistributedMember; import org.apache.geode.management.cli.Result; +import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.i18n.CliStrings; import org.apache.geode.management.internal.cli.result.CommandResult; -import org.apache.geode.management.cli.ResultModel; import org.apache.geode.management.internal.cli.result.model.TabularResultModel; import org.apache.geode.test.dunit.IgnoredException; import org.apache.geode.test.dunit.rules.ClusterStartupRule;