This is an automated email from the ASF dual-hosted git repository. dschneider pushed a commit to branch feature/GEODE-6151 in repository https://gitbox.apache.org/repos/asf/geode.git
commit f4de8eed44a0903cb07569b91ff0c0da55f6a191 Author: Darrel Schneider <[email protected]> AuthorDate: Wed Dec 5 16:02:12 2018 -0800 GEODE-6151: use same term for JDBC mapping --- .../jdbc/internal/cli/CreateMappingCommandDUnitTest.java | 2 +- .../jdbc/internal/cli/DescribeMappingCommandDUnitTest.java | 2 +- .../jdbc/internal/cli/ListMappingCommandDUnitTest.java | 2 +- .../geode/connectors/jdbc/internal/JdbcConnectorServiceImpl.java | 4 ++-- .../geode/connectors/jdbc/internal/cli/CreateMappingCommand.java | 6 +++--- .../connectors/jdbc/internal/cli/DescribeMappingCommand.java | 6 +++--- .../connectors/jdbc/internal/cli/DestroyMappingCommand.java | 5 +++-- .../connectors/jdbc/internal/cli/DestroyMappingFunction.java | 4 ++-- .../geode/connectors/jdbc/internal/cli/ListMappingCommand.java | 9 +++------ .../connectors/jdbc/internal/cli/CreateMappingCommandTest.java | 2 +- .../jdbc/internal/cli/DestroyMappingCommandFunctionTest.java | 6 +++--- .../connectors/jdbc/internal/cli/ListMappingCommandTest.java | 2 +- 12 files changed, 24 insertions(+), 26 deletions(-) diff --git a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandDUnitTest.java b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandDUnitTest.java index 6856fc7..d71f257 100644 --- a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandDUnitTest.java +++ b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandDUnitTest.java @@ -314,7 +314,7 @@ public class CreateMappingCommandDUnitTest { csb.addOption(CREATE_MAPPING__TABLE_NAME, "bogusTable"); gfsh.executeAndAssertThat(csb.toString()).statusIsError() .containsOutput( - "A jdbc-mapping for " + convertRegionPathToName(regionName) + " already exists"); + "A JDBC mapping for " + convertRegionPathToName(regionName) + " already exists"); server.invoke(() -> { RegionMapping mapping = getRegionMappingFromService(regionName); diff --git a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandDUnitTest.java b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandDUnitTest.java index a79a9ba..d21227e 100644 --- a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandDUnitTest.java +++ b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandDUnitTest.java @@ -116,7 +116,7 @@ public class DescribeMappingCommandDUnitTest implements Serializable { commandResultAssert.statusIsError(); commandResultAssert.containsOutput( - String.format("(Experimental) \n" + "mapping for region 'nonExisting' not found")); + String.format("(Experimental) \n" + "JDBC mapping for region 'nonExisting' not found")); } @Test diff --git a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandDUnitTest.java b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandDUnitTest.java index 2d90bdf..00cc454 100644 --- a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandDUnitTest.java +++ b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandDUnitTest.java @@ -107,7 +107,7 @@ public class ListMappingCommandDUnitTest implements Serializable { CommandResultAssert commandResultAssert = gfsh.executeAndAssertThat(csb.toString()); commandResultAssert.statusIsSuccess(); - commandResultAssert.containsOutput("No mappings found"); + commandResultAssert.containsOutput("No JDBC mappings found"); } private void createNRegionMappings(int N) throws RegionMappingExistsException { diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/JdbcConnectorServiceImpl.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/JdbcConnectorServiceImpl.java index faee0c5..5d2398e 100644 --- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/JdbcConnectorServiceImpl.java +++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/JdbcConnectorServiceImpl.java @@ -45,7 +45,7 @@ public class JdbcConnectorServiceImpl implements JdbcConnectorService { mappingsByRegion.putIfAbsent(mapping.getRegionName(), mapping); if (existing != null) { throw new RegionMappingExistsException( - "RegionMapping for region " + mapping.getRegionName() + " exists"); + "JDBC mapping for region " + mapping.getRegionName() + " exists"); } } @@ -56,7 +56,7 @@ public class JdbcConnectorServiceImpl implements JdbcConnectorService { mappingsByRegion.get(alteredMapping.getRegionName()); if (existingMapping == null) { throw new RegionMappingNotFoundException( - "RegionMapping for the region " + alteredMapping.getRegionName() + " was not found"); + "JDBC mapping for the region " + alteredMapping.getRegionName() + " was not found"); } mappingsByRegion.put(existingMapping.getRegionName(), alteredMapping); 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 8c70df9..dd47895 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 @@ -48,10 +48,10 @@ import org.apache.geode.security.ResourcePermission; public class CreateMappingCommand extends SingleGfshCommand { static final String CREATE_MAPPING = "create jdbc-mapping"; static final String CREATE_MAPPING__HELP = - EXPERIMENTAL + "Create a mapping for a region for use with a JDBC database connection."; + EXPERIMENTAL + "Create a JDBC mapping for a region for use with a JDBC database."; static final String CREATE_MAPPING__REGION_NAME = "region"; static final String CREATE_MAPPING__REGION_NAME__HELP = - "Name of the region the mapping is being created for."; + "Name of the region the JDBC mapping is being created for."; static final String CREATE_MAPPING__PDX_NAME = "pdx-name"; static final String CREATE_MAPPING__PDX_NAME__HELP = "Name of pdx class for which values will be written to the database."; @@ -141,7 +141,7 @@ public class CreateMappingCommand extends SingleGfshCommand { throws PreconditionException { if (regionConfig.getCustomRegionElements().stream() .anyMatch(element -> element instanceof RegionMapping)) { - throw new PreconditionException("A jdbc-mapping for " + regionName + " already exists."); + throw new PreconditionException("A JDBC mapping for " + regionName + " already exists."); } } 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 6d6f310..cb589c8 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 @@ -41,10 +41,10 @@ import org.apache.geode.security.ResourcePermission; @Experimental public class DescribeMappingCommand extends GfshCommand { static final String DESCRIBE_MAPPING = "describe jdbc-mapping"; - static final String DESCRIBE_MAPPING__HELP = EXPERIMENTAL + "Describe the specified jdbc mapping"; + static final String DESCRIBE_MAPPING__HELP = EXPERIMENTAL + "Describe the specified JDBC mapping"; static final String DESCRIBE_MAPPING__REGION_NAME = "region"; static final String DESCRIBE_MAPPING__REGION_NAME__HELP = - "Region name of the jdbc mapping to be described."; + "Region name of the JDBC mapping to be described."; static final String RESULT_SECTION_NAME = "MappingDescription"; @@ -74,7 +74,7 @@ public class DescribeMappingCommand extends GfshCommand { if (mapping == null) { throw new EntityNotFoundException( - EXPERIMENTAL + "\n" + "mapping for region '" + regionName + "' not found"); + EXPERIMENTAL + "\n" + "JDBC mapping for region '" + regionName + "' not found"); } ResultModel resultModel = new ResultModel(); 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 3de83b0..0f32a8f 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 @@ -46,9 +46,10 @@ import org.apache.geode.security.ResourcePermission; @Experimental public class DestroyMappingCommand extends SingleGfshCommand { static final String DESTROY_MAPPING = "destroy jdbc-mapping"; - static final String DESTROY_MAPPING__HELP = EXPERIMENTAL + "Destroy the specified mapping."; + static final String DESTROY_MAPPING__HELP = EXPERIMENTAL + "Destroy the specified JDBC mapping."; static final String DESTROY_MAPPING__REGION_NAME = "region"; - static final String DESTROY_MAPPING__REGION_NAME__HELP = "Name of the region mapping to destroy."; + static final String DESTROY_MAPPING__REGION_NAME__HELP = + "Name of the region whose JDBC mapping will be destroyed."; @CliCommand(value = DESTROY_MAPPING, help = DESTROY_MAPPING__HELP) @CliMetaData(relatedTopic = CliStrings.DEFAULT_TOPIC_GEODE) diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingFunction.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingFunction.java index a572e87..8d6b63c 100644 --- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingFunction.java +++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingFunction.java @@ -45,10 +45,10 @@ public class DestroyMappingFunction extends CliFunction<String> { if (mapping != null) { cleanupRegionAndQueue(cache, regionName); service.destroyRegionMapping(regionName); - String message = "Destroyed region mapping for region " + regionName + " on " + member; + String message = "Destroyed JDBC mapping for region " + regionName + " on " + member; return new CliFunctionResult(member, StatusState.OK, message); } else { - String message = "Region mapping for region \"" + regionName + "\" not found"; + String message = "JDBC mapping for region \"" + regionName + "\" not found"; return new CliFunctionResult(member, StatusState.ERROR, message); } } 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 fc0f627..437b8a4 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 @@ -37,12 +37,9 @@ import org.apache.geode.security.ResourcePermission; public class ListMappingCommand extends GfshCommand { public static final String JDBC_MAPPINGS_SECTION = "jdbc-mappings"; static final String LIST_MAPPING = "list jdbc-mappings"; - static final String LIST_MAPPING__HELP = EXPERIMENTAL + "Display jdbc mappings for all members."; - - static final String LIST_OF_MAPPINGS = "List of mappings"; - static final String NO_MAPPINGS_FOUND = "No mappings found"; - static final String LIST_MAPPINGS_MEMBER__HELP = - "Member from which the jdbc mappings are retrieved."; + static final String LIST_MAPPING__HELP = EXPERIMENTAL + "Display JDBC mappings for all members."; + static final String LIST_OF_MAPPINGS = "List of JDBC mappings"; + static final String NO_MAPPINGS_FOUND = "No JDBC mappings found"; @CliCommand(value = LIST_MAPPING, help = LIST_MAPPING__HELP) @CliMetaData(relatedTopic = CliStrings.DEFAULT_TOPIC_GEODE) 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 6038853..cded45f 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 @@ -221,7 +221,7 @@ public class CreateMappingCommandTest { tableName, pdxClass, false); assertThat(result.getStatus()).isSameAs(Result.Status.ERROR); - assertThat(result.toString()).contains("A jdbc-mapping for " + regionName + " already exists."); + assertThat(result.toString()).contains("A JDBC mapping for " + regionName + " already exists."); } @Test diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandFunctionTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandFunctionTest.java index 4913eb8..a06833c 100644 --- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandFunctionTest.java +++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandFunctionTest.java @@ -118,7 +118,7 @@ public class DestroyMappingCommandFunctionTest { assertThat(result.isSuccessful()).isTrue(); assertThat(result.toString()) - .contains("Destroyed region mapping for region " + regionName + " on myMemberName"); + .contains("Destroyed JDBC mapping for region " + regionName + " on myMemberName"); } @Test @@ -127,7 +127,7 @@ public class DestroyMappingCommandFunctionTest { assertThat(result.isSuccessful()).isFalse(); assertThat(result.toString()) - .contains("Region mapping for region \"" + regionName + "\" not found"); + .contains("JDBC mapping for region \"" + regionName + "\" not found"); } @Test @@ -222,6 +222,6 @@ public class DestroyMappingCommandFunctionTest { ArgumentCaptor<CliFunctionResult> argument = ArgumentCaptor.forClass(CliFunctionResult.class); verify(resultSender, times(1)).lastResult(argument.capture()); assertThat(argument.getValue().getStatusMessage()) - .contains("Region mapping for region \"" + regionName + "\" not found"); + .contains("JDBC mapping for region \"" + regionName + "\" not found"); } } diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandTest.java index 06f56d2..1ae457e 100644 --- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandTest.java +++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandTest.java @@ -86,6 +86,6 @@ public class ListMappingCommandTest { when(rc.getResult()).thenReturn(Collections.emptyList()); gfsh.executeAndAssertThat(command, COMMAND).statusIsSuccess() - .containsOutput("No mappings found"); + .containsOutput("No JDBC mappings found"); } }
