This is an automated email from the ASF dual-hosted git repository. sai_boorlagadda pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/develop by this push: new 112cd71 GEODE-4858 refactor jdbc describe & list commands to use result model (#1939) 112cd71 is described below commit 112cd71de3e0e498b7243022d34fad3083bef317 Author: Sai Boorlagadda <sai.boorlaga...@gmail.com> AuthorDate: Thu May 10 09:39:56 2018 -0700 GEODE-4858 refactor jdbc describe & list commands to use result model (#1939) --- .../internal/cli/DescribeConnectionCommand.java | 42 ++++++++++------------ .../jdbc/internal/cli/DescribeMappingCommand.java | 39 +++++++++----------- .../jdbc/internal/cli/ListConnectionCommand.java | 27 ++++++-------- .../jdbc/internal/cli/ListMappingCommand.java | 27 ++++++-------- 4 files changed, 58 insertions(+), 77 deletions(-) diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionCommand.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionCommand.java index fb47ea9..23e80b5 100644 --- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionCommand.java +++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionCommand.java @@ -35,13 +35,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.GfshCommand; -import org.apache.geode.management.cli.Result; import org.apache.geode.management.internal.cli.exceptions.EntityNotFoundException; 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.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.internal.cli.result.model.DataResultModel; +import org.apache.geode.management.internal.cli.result.model.ResultModel; +import org.apache.geode.management.internal.cli.result.model.TabularResultModel; import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; @@ -62,8 +61,8 @@ public class DescribeConnectionCommand extends GfshCommand { @CliMetaData(relatedTopic = CliStrings.DEFAULT_TOPIC_GEODE) @ResourceOperation(resource = ResourcePermission.Resource.CLUSTER, operation = ResourcePermission.Operation.MANAGE) - public Result describeConnection(@CliOption(key = DESCRIBE_CONNECTION__NAME, mandatory = true, - help = DESCRIBE_CONNECTION__NAME__HELP) String name) { + public ResultModel describeConnection(@CliOption(key = DESCRIBE_CONNECTION__NAME, + mandatory = true, help = DESCRIBE_CONNECTION__NAME__HELP) String name) { ConnectorService.Connection connection = null; // check if CC is available and use it to describe the connection @@ -95,30 +94,27 @@ public class DescribeConnectionCommand extends GfshCommand { EXPERIMENTAL + "\n" + "connection named '" + name + "' not found"); } - CompositeResultData resultData = ResultBuilder.createCompositeResultData(); - fillResultData(connection, resultData); - resultData.setHeader(EXPERIMENTAL); - return ResultBuilder.buildResult(resultData); + ResultModel resultModel = new ResultModel(); + fillResultData(connection, resultModel); + resultModel.setHeader(EXPERIMENTAL); + return resultModel; } - private void fillResultData(ConnectorService.Connection connection, - CompositeResultData resultData) { - CompositeResultData.SectionResultData sectionResult = - resultData.addSection(RESULT_SECTION_NAME); - sectionResult.addSeparator('-'); - sectionResult.addData(CREATE_CONNECTION__NAME, connection.getName()); - sectionResult.addData(CREATE_CONNECTION__URL, connection.getUrl()); + private void fillResultData(ConnectorService.Connection connection, ResultModel resultModel) { + DataResultModel sectionModel = resultModel.addData(RESULT_SECTION_NAME); + sectionModel.addData(CREATE_CONNECTION__NAME, connection.getName()); + sectionModel.addData(CREATE_CONNECTION__URL, connection.getUrl()); if (connection.getUser() != null) { - sectionResult.addData(CREATE_CONNECTION__USER, connection.getUser()); + sectionModel.addData(CREATE_CONNECTION__USER, connection.getUser()); } if (connection.getPassword() != null) { - sectionResult.addData(CREATE_CONNECTION__PASSWORD, OBSCURED_PASSWORD); + sectionModel.addData(CREATE_CONNECTION__PASSWORD, OBSCURED_PASSWORD); } - TabularResultData tabularResultData = sectionResult.addTable(CREATE_CONNECTION__PARAMS); - tabularResultData.setHeader("Additional connection parameters:"); + TabularResultModel tabularResultModel = resultModel.addTable(CREATE_CONNECTION__PARAMS); + tabularResultModel.setHeader("Additional connection parameters:"); connection.getParameterMap().entrySet().forEach((entry) -> { - tabularResultData.accumulate("Param Name", entry.getKey()); - tabularResultData.accumulate("Value", entry.getValue()); + tabularResultModel.accumulate("Param Name", entry.getKey()); + tabularResultModel.accumulate("Value", entry.getValue()); }); } } 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 89a82e0..74ae5b3 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 @@ -33,13 +33,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.GfshCommand; -import org.apache.geode.management.cli.Result; import org.apache.geode.management.internal.cli.exceptions.EntityNotFoundException; 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.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.internal.cli.result.model.DataResultModel; +import org.apache.geode.management.internal.cli.result.model.ResultModel; +import org.apache.geode.management.internal.cli.result.model.TabularResultModel; import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; @@ -58,8 +57,8 @@ public class DescribeMappingCommand extends GfshCommand { @CliMetaData(relatedTopic = CliStrings.DEFAULT_TOPIC_GEODE) @ResourceOperation(resource = ResourcePermission.Resource.CLUSTER, operation = ResourcePermission.Operation.MANAGE) - public Result describeMapping(@CliOption(key = DESCRIBE_MAPPING__REGION_NAME, mandatory = true, - help = DESCRIBE_MAPPING__REGION_NAME__HELP) String regionName) { + public ResultModel describeMapping(@CliOption(key = DESCRIBE_MAPPING__REGION_NAME, + mandatory = true, help = DESCRIBE_MAPPING__REGION_NAME__HELP) String regionName) { ConnectorService.RegionMapping mapping = null; // check if CC is available and use it to describe the connection @@ -91,25 +90,21 @@ public class DescribeMappingCommand extends GfshCommand { EXPERIMENTAL + "\n" + "mapping for region '" + regionName + "' not found"); } - CompositeResultData resultData = ResultBuilder.createCompositeResultData(); - fillResultData(mapping, resultData); - resultData.setHeader(EXPERIMENTAL); - return ResultBuilder.buildResult(resultData); + ResultModel resultModel = new ResultModel(); + fillResultData(mapping, resultModel); + resultModel.setHeader(EXPERIMENTAL); + return resultModel; } - private void fillResultData(ConnectorService.RegionMapping mapping, - CompositeResultData resultData) { - CompositeResultData.SectionResultData sectionResult = - resultData.addSection(RESULT_SECTION_NAME); - sectionResult.addSeparator('-'); - sectionResult.addData(CREATE_MAPPING__REGION_NAME, mapping.getRegionName()); - sectionResult.addData(CREATE_MAPPING__CONNECTION_NAME, mapping.getConnectionConfigName()); - sectionResult.addData(CREATE_MAPPING__TABLE_NAME, mapping.getTableName()); - sectionResult.addData(CREATE_MAPPING__PDX_CLASS_NAME, mapping.getPdxClassName()); - sectionResult.addData(CREATE_MAPPING__VALUE_CONTAINS_PRIMARY_KEY, - mapping.isPrimaryKeyInValue()); + private void fillResultData(ConnectorService.RegionMapping mapping, ResultModel resultModel) { + DataResultModel sectionModel = resultModel.addData(RESULT_SECTION_NAME); + sectionModel.addData(CREATE_MAPPING__REGION_NAME, mapping.getRegionName()); + sectionModel.addData(CREATE_MAPPING__CONNECTION_NAME, mapping.getConnectionConfigName()); + sectionModel.addData(CREATE_MAPPING__TABLE_NAME, mapping.getTableName()); + sectionModel.addData(CREATE_MAPPING__PDX_CLASS_NAME, mapping.getPdxClassName()); + sectionModel.addData(CREATE_MAPPING__VALUE_CONTAINS_PRIMARY_KEY, mapping.isPrimaryKeyInValue()); - TabularResultData tabularResultData = sectionResult.addTable(FIELD_TO_COLUMN_TABLE); + TabularResultModel tabularResultData = resultModel.addTable(FIELD_TO_COLUMN_TABLE); tabularResultData.setHeader("Field to Column Mappings:"); if (mapping.getFieldMapping() != null) { mapping.getFieldMapping().forEach((entry) -> { diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionCommand.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionCommand.java index c44056b..ddcdd89 100644 --- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionCommand.java +++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionCommand.java @@ -28,11 +28,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.GfshCommand; -import org.apache.geode.management.cli.Result; 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.result.ResultBuilder; -import org.apache.geode.management.internal.cli.result.TabularResultData; +import org.apache.geode.management.internal.cli.result.model.ResultModel; +import org.apache.geode.management.internal.cli.result.model.TabularResultModel; import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; @@ -49,7 +48,7 @@ public class ListConnectionCommand extends GfshCommand { @CliMetaData(relatedTopic = CliStrings.DEFAULT_TOPIC_GEODE) @ResourceOperation(resource = ResourcePermission.Resource.CLUSTER, operation = ResourcePermission.Operation.MANAGE) - public Result listConnection() { + public ResultModel listConnection() { Collection<ConnectorService.Connection> connections = null; @@ -78,21 +77,17 @@ public class ListConnectionCommand extends GfshCommand { } if (connections == null) { - return ResultBuilder.createInfoResult(EXPERIMENTAL + "\n" + NO_CONNECTIONS_FOUND); + return ResultModel.createInfo(EXPERIMENTAL + "\n" + "No connections found"); } // output - TabularResultData tabularResultData = ResultBuilder.createTabularResultData(); - boolean connectionsExist = fillTabularResultData(connections, tabularResultData); - return createResult(tabularResultData, connectionsExist); - } - - private Result createResult(TabularResultData tabularResultData, boolean connectionsExist) { + ResultModel resultModel = new ResultModel(); + boolean connectionsExist = fillTabularResultData(connections, resultModel.addTable()); if (connectionsExist) { - tabularResultData.setHeader(EXPERIMENTAL); - return ResultBuilder.buildResult(tabularResultData); + resultModel.setHeader(EXPERIMENTAL); + return resultModel; } else { - return ResultBuilder.createInfoResult(EXPERIMENTAL + "\n" + NO_CONNECTIONS_FOUND); + return ResultModel.createInfo(EXPERIMENTAL + "\n" + NO_CONNECTIONS_FOUND); } } @@ -100,9 +95,9 @@ public class ListConnectionCommand extends GfshCommand { * Returns true if any connections exist */ private boolean fillTabularResultData(Collection<ConnectorService.Connection> connections, - TabularResultData tabularResultData) { + TabularResultModel tableModel) { for (ConnectorService.Connection connectionConfig : connections) { - tabularResultData.accumulate(LIST_OF_CONNECTIONS, connectionConfig.getName()); + tableModel.accumulate(LIST_OF_CONNECTIONS, connectionConfig.getName()); } return !connections.isEmpty(); } 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 b37f65e..c37236d 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 @@ -28,11 +28,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.GfshCommand; -import org.apache.geode.management.cli.Result; 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.result.ResultBuilder; -import org.apache.geode.management.internal.cli.result.TabularResultData; +import org.apache.geode.management.internal.cli.result.model.ResultModel; +import org.apache.geode.management.internal.cli.result.model.TabularResultModel; import org.apache.geode.management.internal.security.ResourceOperation; import org.apache.geode.security.ResourcePermission; @@ -50,7 +49,7 @@ public class ListMappingCommand extends GfshCommand { @CliMetaData(relatedTopic = CliStrings.DEFAULT_TOPIC_GEODE) @ResourceOperation(resource = ResourcePermission.Resource.CLUSTER, operation = ResourcePermission.Operation.MANAGE) - public Result listMapping() { + public ResultModel listMapping() { Collection<ConnectorService.RegionMapping> mappings = null; // check if CC is available and use it to describe the connection @@ -78,21 +77,17 @@ public class ListMappingCommand extends GfshCommand { } if (mappings == null) { - return ResultBuilder.createInfoResult(EXPERIMENTAL + "\n" + NO_MAPPINGS_FOUND); + return ResultModel.createInfo(EXPERIMENTAL + "\n" + "No mappings found"); } // output - TabularResultData tabularResultData = ResultBuilder.createTabularResultData(); - boolean mappingsExist = fillTabularResultData(mappings, tabularResultData); - return createResult(tabularResultData, mappingsExist); - } - - private Result createResult(TabularResultData tabularResultData, boolean mappingsExist) { + ResultModel resultModel = new ResultModel(); + boolean mappingsExist = fillTabularResultData(mappings, resultModel.addTable()); if (mappingsExist) { - tabularResultData.setHeader(EXPERIMENTAL); - return ResultBuilder.buildResult(tabularResultData); + resultModel.setHeader(EXPERIMENTAL); + return resultModel; } else { - return ResultBuilder.createInfoResult(EXPERIMENTAL + "\n" + NO_MAPPINGS_FOUND); + return ResultModel.createInfo(EXPERIMENTAL + "\n" + NO_MAPPINGS_FOUND); } } @@ -100,9 +95,9 @@ public class ListMappingCommand extends GfshCommand { * Returns true if any connections exist */ private boolean fillTabularResultData(Collection<ConnectorService.RegionMapping> mappings, - TabularResultData tabularResultData) { + TabularResultModel tableModel) { for (ConnectorService.RegionMapping mapping : mappings) { - tabularResultData.accumulate(LIST_OF_MAPPINGS, mapping.getRegionName()); + tableModel.accumulate(LIST_OF_MAPPINGS, mapping.getRegionName()); } return !mappings.isEmpty(); } -- To stop receiving notification emails like this one, please contact sai_boorlaga...@apache.org.