This is an automated email from the ASF dual-hosted git repository.
lgallinat pushed a commit to branch feature/GEODE-3781
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/feature/GEODE-3781 by this
push:
new 131c6de Update help strings, rename classes to be consistent with
gfsh command name
131c6de is described below
commit 131c6de257f4d014f5e03e99971ce5f54f70bb9c
Author: Lynn Gallinat <[email protected]>
AuthorDate: Fri Dec 15 10:49:06 2017 -0800
Update help strings, rename classes to be consistent with gfsh command name
---
.../geode/connectors/jdbc/internal/SqlHandler.java | 7 +++--
...appingCommand.java => AlterMappingCommand.java} | 6 ++--
...pingFunction.java => AlterMappingFunction.java} | 6 ++--
.../jdbc/internal/cli/CreateConnectionCommand.java | 2 +-
...ppingCommand.java => CreateMappingCommand.java} | 16 +++++------
...ingFunction.java => CreateMappingFunction.java} | 4 +--
...ingCommand.java => DescribeMappingCommand.java} | 22 +++++++--------
...gFunction.java => DescribeMappingFunction.java} | 4 +--
...pingCommand.java => DestroyMappingCommand.java} | 6 ++--
...ngFunction.java => DestroyMappingFunction.java} | 4 +--
...MappingCommand.java => ListMappingCommand.java} | 6 ++--
...ppingFunction.java => ListMappingFunction.java} | 4 +--
.../org.springframework.shell.core.CommandMarker | 10 +++----
.../geode/connectors/jdbc/JdbcDUnitTest.java | 18 +++++-------
...Test.java => AlterMappingCommandDUnitTest.java} | 32 +++++++++++-----------
...ava => AlterMappingCommandIntegrationTest.java} | 8 +++---
...tionTest.java => AlterMappingFunctionTest.java} | 13 ++++-----
.../CreateConnectionCommandIntegrationTest.java | 18 ++++++++++++
...est.java => CreateMappingCommandDUnitTest.java} | 18 ++++++------
...va => CreateMappingCommandIntegrationTest.java} | 6 ++--
...ionTest.java => CreateMappingFunctionTest.java} | 8 +++---
...t.java => DescribeMappingCommandDUnitTest.java} | 18 ++++++------
... => DescribeMappingCommandIntegrationTest.java} | 22 +++++++--------
...nTest.java => DescribeMappingFunctionTest.java} | 8 +++---
...st.java => DestroyMappingCommandDunitTest.java} | 6 ++--
...java => DestroyMappingCommandFunctionTest.java} | 8 +++---
...a => DestroyMappingCommandIntegrationTest.java} | 6 ++--
...tTest.java => ListMappingCommandDUnitTest.java} | 6 ++--
...java => ListMappingCommandIntegrationTest.java} | 2 +-
...ctionTest.java => ListMappingFunctionTest.java} | 8 +++---
30 files changed, 157 insertions(+), 145 deletions(-)
diff --git
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/SqlHandler.java
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/SqlHandler.java
index 240ff3f..f78d885 100644
---
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/SqlHandler.java
+++
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/SqlHandler.java
@@ -130,14 +130,15 @@ public class SqlHandler {
if (regionMapping == null) {
throw new IllegalStateException("JDBC write failed. JDBC mapping for
region " +
region.getFullPath() +
- " not found. Create mapping with gfsh command 'create
jdbc-mapping'.");
+ " not found. Create the mapping with the gfsh command 'create
jdbc-mapping'.");
}
ConnectionConfiguration connectionConfig =
manager.getConnectionConfig(regionMapping.getConnectionConfigName());
if (connectionConfig == null) {
throw new IllegalStateException(
- "JDBC write failed. JDBC Connection configuration for connection
name " +
- regionMapping.getConnectionConfigName() + " not found.");
+ "JDBC write failed. JDBC connection with name " +
+ regionMapping.getConnectionConfigName() +
+ " not found. Create the connection with the gfsh command 'create
jdbc-connection'");
}
List<ColumnValue> columnList =
diff --git
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterRegionMappingCommand.java
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommand.java
similarity index 97%
rename from
geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterRegionMappingCommand.java
rename to
geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommand.java
index bc3992f..0dc9c23 100644
---
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterRegionMappingCommand.java
+++
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommand.java
@@ -37,7 +37,7 @@ import
org.apache.geode.management.internal.security.ResourceOperation;
import org.apache.geode.security.ResourcePermission;
@Experimental
-public class AlterRegionMappingCommand implements GfshCommand {
+public class AlterMappingCommand implements GfshCommand {
static final String ALTER_MAPPING = "alter jdbc-mapping";
static final String ALTER_MAPPING__HELP =
EXPERIMENTAL + "Alter properties for an existing jdbc mapping.";
@@ -87,7 +87,7 @@ public class AlterRegionMappingCommand implements GfshCommand
{
// action
ResultCollector<CliFunctionResult, List<CliFunctionResult>>
resultCollector =
- execute(new AlterRegionMappingFunction(), mapping, targetMembers);
+ execute(new AlterMappingFunction(), mapping, targetMembers);
// output
TabularResultData tabularResultData =
ResultBuilder.createTabularResultData();
@@ -99,7 +99,7 @@ public class AlterRegionMappingCommand implements GfshCommand
{
}
ResultCollector<CliFunctionResult, List<CliFunctionResult>> execute(
- AlterRegionMappingFunction function, RegionMapping mapping,
+ AlterMappingFunction function, RegionMapping mapping,
Set<DistributedMember> targetMembers) {
return (ResultCollector<CliFunctionResult, List<CliFunctionResult>>)
executeFunction(function,
mapping, targetMembers);
diff --git
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterRegionMappingFunction.java
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingFunction.java
similarity index 95%
rename from
geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterRegionMappingFunction.java
rename to
geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingFunction.java
index 8082bc6..7ae9390 100644
---
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterRegionMappingFunction.java
+++
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingFunction.java
@@ -14,8 +14,6 @@
*/
package org.apache.geode.connectors.jdbc.internal.cli;
-import java.util.Collection;
-import java.util.Collections;
import java.util.Map;
import org.apache.geode.annotations.Experimental;
@@ -27,9 +25,9 @@ import
org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.management.internal.configuration.domain.XmlEntity;
@Experimental
-public class AlterRegionMappingFunction extends JdbcCliFunction<RegionMapping,
CliFunctionResult> {
+public class AlterMappingFunction extends JdbcCliFunction<RegionMapping,
CliFunctionResult> {
- AlterRegionMappingFunction() {
+ AlterMappingFunction() {
super(new FunctionContextArgumentProvider(), new ExceptionHandler());
}
diff --git
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommand.java
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommand.java
index e3a63c5..c17e2f9 100644
---
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommand.java
+++
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommand.java
@@ -57,7 +57,7 @@ public class CreateConnectionCommand implements GfshCommand {
"Password to use when connecting to database.";
static final String CREATE_CONNECTION__PARAMS = "params";
static final String CREATE_CONNECTION__PARAMS__HELP =
- "Additional parameters to use when connecting to the database.";
+ "Additional parameters to use when connecting to the database formatted
like \"key:value(,key:value)*\".";
private static final String ERROR_PREFIX = "ERROR: ";
diff --git
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateRegionMappingCommand.java
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommand.java
similarity index 91%
rename from
geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateRegionMappingCommand.java
rename to
geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommand.java
index f99b2d4..703ca7c 100644
---
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateRegionMappingCommand.java
+++
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommand.java
@@ -37,7 +37,7 @@ import
org.apache.geode.management.internal.security.ResourceOperation;
import org.apache.geode.security.ResourcePermission;
@Experimental
-public class CreateRegionMappingCommand implements GfshCommand {
+public class CreateMappingCommand implements GfshCommand {
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.";
@@ -46,18 +46,18 @@ public class CreateRegionMappingCommand implements
GfshCommand {
"Name of the region the mapping is being created for.";
static final String CREATE_MAPPING__PDX_CLASS_NAME = "pdx-class-name";
static final String CREATE_MAPPING__PDX_CLASS_NAME__HELP =
- "Name of pdx class for which values with be written to the database.";
+ "Name of pdx class for which values will be written to the database.";
static final String CREATE_MAPPING__TABLE_NAME = "table";
static final String CREATE_MAPPING__TABLE_NAME__HELP =
"Name of database table for values to be written to.";
static final String CREATE_MAPPING__CONNECTION_NAME = "connection";
static final String CREATE_MAPPING__CONNECTION_NAME__HELP = "Name of JDBC
connection to use.";
- static final String CREATE_MAPPING__PRIMARY_KEY_IN_VALUE =
"primary-key-in-value";
+ static final String CREATE_MAPPING__VALUE_CONTAINS_PRIMARY_KEY =
"value-contains-primary-key";
static final String CREATE_MAPPING__PRIMARY_KEY_IN_VALUE__HELP =
- "If false, the entry value does not contain the data used for the
database table's primary key, instead the entry key will be used for the
primary key column value.";
+ "If true, the primary key is contained in the PDX object, otherwise the
region entry key is used for the primary key column value.";
static final String CREATE_MAPPING__FIELD_MAPPING = "field-mapping";
static final String CREATE_MAPPING__FIELD_MAPPING__HELP =
- "Key value pairs of entry value fields to database columns.";
+ "Key value pairs of PDX field names to database column names formatted
like \"key:value(,key:value)*\".";
private static final String ERROR_PREFIX = "ERROR: ";
@@ -74,7 +74,7 @@ public class CreateRegionMappingCommand implements
GfshCommand {
help = CREATE_MAPPING__TABLE_NAME__HELP) String table,
@CliOption(key = CREATE_MAPPING__PDX_CLASS_NAME,
help = CREATE_MAPPING__PDX_CLASS_NAME__HELP) String pdxClassName,
- @CliOption(key = CREATE_MAPPING__PRIMARY_KEY_IN_VALUE,
+ @CliOption(key = CREATE_MAPPING__VALUE_CONTAINS_PRIMARY_KEY,
help = CREATE_MAPPING__PRIMARY_KEY_IN_VALUE__HELP,
unspecifiedDefaultValue = "true",
specifiedDefaultValue = "true") boolean keyInValue,
@CliOption(key = CREATE_MAPPING__FIELD_MAPPING,
@@ -87,7 +87,7 @@ public class CreateRegionMappingCommand implements
GfshCommand {
// action
ResultCollector<CliFunctionResult, List<CliFunctionResult>>
resultCollector =
- execute(new CreateRegionMappingFunction(), mapping, targetMembers);
+ execute(new CreateMappingFunction(), mapping, targetMembers);
// output
TabularResultData tabularResultData =
ResultBuilder.createTabularResultData();
@@ -108,7 +108,7 @@ public class CreateRegionMappingCommand implements
GfshCommand {
}
ResultCollector<CliFunctionResult, List<CliFunctionResult>> execute(
- CreateRegionMappingFunction function, RegionMapping regionMapping,
+ CreateMappingFunction function, RegionMapping regionMapping,
Set<DistributedMember> targetMembers) {
return (ResultCollector<CliFunctionResult, List<CliFunctionResult>>)
executeFunction(function,
regionMapping, targetMembers);
diff --git
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateRegionMappingFunction.java
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingFunction.java
similarity index 94%
rename from
geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateRegionMappingFunction.java
rename to
geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingFunction.java
index 174b04d..ad44d46 100644
---
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateRegionMappingFunction.java
+++
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingFunction.java
@@ -23,9 +23,9 @@ import
org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.management.internal.configuration.domain.XmlEntity;
@Experimental
-public class CreateRegionMappingFunction extends
JdbcCliFunction<RegionMapping, CliFunctionResult> {
+public class CreateMappingFunction extends JdbcCliFunction<RegionMapping,
CliFunctionResult> {
- CreateRegionMappingFunction() {
+ CreateMappingFunction() {
super(new FunctionContextArgumentProvider(), new ExceptionHandler());
}
diff --git
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeRegionMappingCommand.java
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommand.java
similarity index 87%
rename from
geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeRegionMappingCommand.java
rename to
geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommand.java
index 6114a59..1818491 100644
---
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeRegionMappingCommand.java
+++
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommand.java
@@ -14,11 +14,11 @@
*/
package org.apache.geode.connectors.jdbc.internal.cli;
-import static
org.apache.geode.connectors.jdbc.internal.cli.CreateRegionMappingCommand.CREATE_MAPPING__CONNECTION_NAME;
-import static
org.apache.geode.connectors.jdbc.internal.cli.CreateRegionMappingCommand.CREATE_MAPPING__PDX_CLASS_NAME;
-import static
org.apache.geode.connectors.jdbc.internal.cli.CreateRegionMappingCommand.CREATE_MAPPING__PRIMARY_KEY_IN_VALUE;
-import static
org.apache.geode.connectors.jdbc.internal.cli.CreateRegionMappingCommand.CREATE_MAPPING__REGION_NAME;
-import static
org.apache.geode.connectors.jdbc.internal.cli.CreateRegionMappingCommand.CREATE_MAPPING__TABLE_NAME;
+import static
org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand.CREATE_MAPPING__CONNECTION_NAME;
+import static
org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand.CREATE_MAPPING__PDX_CLASS_NAME;
+import static
org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand.CREATE_MAPPING__VALUE_CONTAINS_PRIMARY_KEY;
+import static
org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand.CREATE_MAPPING__REGION_NAME;
+import static
org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand.CREATE_MAPPING__TABLE_NAME;
import java.util.List;
import java.util.Set;
@@ -41,13 +41,13 @@ import
org.apache.geode.management.internal.security.ResourceOperation;
import org.apache.geode.security.ResourcePermission;
@Experimental
-public class DescribeRegionMappingCommand implements GfshCommand {
+public class DescribeMappingCommand implements 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__REGION_NAME = "name";
+ static final String DESCRIBE_MAPPING__REGION_NAME = "region";
static final String DESCRIBE_MAPPING__REGION_NAME__HELP =
- "Name of the jdbc mapping to be described.";
+ "Region name of the jdbc mapping to be described.";
static final String RESULT_SECTION_NAME = "MappingDescription";
static final String FIELD_TO_COLUMN_TABLE = "fieldToColumnTable";
@@ -68,7 +68,7 @@ public class DescribeRegionMappingCommand implements
GfshCommand {
// action
ResultCollector<RegionMapping, List<RegionMapping>> resultCollector =
- execute(new DescribeRegionMappingFunction(), regionName, targetMember);
+ execute(new DescribeMappingFunction(), regionName, targetMember);
// output
RegionMapping config = resultCollector.getResult().get(0);
@@ -84,7 +84,7 @@ public class DescribeRegionMappingCommand implements
GfshCommand {
}
ResultCollector<RegionMapping, List<RegionMapping>> execute(
- DescribeRegionMappingFunction function, String connectionName,
+ DescribeMappingFunction function, String connectionName,
DistributedMember targetMember) {
return (ResultCollector<RegionMapping, List<RegionMapping>>)
executeFunction(function,
connectionName, targetMember);
@@ -98,7 +98,7 @@ public class DescribeRegionMappingCommand implements
GfshCommand {
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__PRIMARY_KEY_IN_VALUE,
mapping.isPrimaryKeyInValue());
+ sectionResult.addData(CREATE_MAPPING__VALUE_CONTAINS_PRIMARY_KEY,
mapping.isPrimaryKeyInValue());
TabularResultData tabularResultData =
sectionResult.addTable(FIELD_TO_COLUMN_TABLE);
tabularResultData.setHeader("Field to Column Mappings:");
diff --git
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeRegionMappingFunction.java
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingFunction.java
similarity index 91%
rename from
geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeRegionMappingFunction.java
rename to
geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingFunction.java
index 56b410a..1faef67 100644
---
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeRegionMappingFunction.java
+++
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingFunction.java
@@ -20,9 +20,9 @@ import
org.apache.geode.connectors.jdbc.internal.InternalJdbcConnectorService;
import org.apache.geode.connectors.jdbc.internal.RegionMapping;
@Experimental
-public class DescribeRegionMappingFunction extends JdbcCliFunction<String,
RegionMapping> {
+public class DescribeMappingFunction extends JdbcCliFunction<String,
RegionMapping> {
- DescribeRegionMappingFunction() {
+ DescribeMappingFunction() {
super(new FunctionContextArgumentProvider(), new ExceptionHandler());
}
diff --git
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyRegionMappingCommand.java
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommand.java
similarity index 95%
rename from
geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyRegionMappingCommand.java
rename to
geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommand.java
index c181959..22ff9ea 100644
---
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyRegionMappingCommand.java
+++
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommand.java
@@ -35,7 +35,7 @@ import
org.apache.geode.management.internal.security.ResourceOperation;
import org.apache.geode.security.ResourcePermission;
@Experimental
-public class DestroyRegionMappingCommand implements GfshCommand {
+public class DestroyMappingCommand implements GfshCommand {
static final String DESTROY_MAPPING = "destroy jdbc-mapping";
static final String DESTROY_MAPPING__HELP = EXPERIMENTAL + "Destroy the
specified mapping.";
static final String DESTROY_MAPPING__REGION_NAME = "region";
@@ -55,7 +55,7 @@ public class DestroyRegionMappingCommand implements
GfshCommand {
// action
ResultCollector<CliFunctionResult, List<CliFunctionResult>>
resultCollector =
- execute(new DestroyRegionMappingFunction(), regionName, targetMembers);
+ execute(new DestroyMappingFunction(), regionName, targetMembers);
// output
TabularResultData tabularResultData =
ResultBuilder.createTabularResultData();
@@ -67,7 +67,7 @@ public class DestroyRegionMappingCommand implements
GfshCommand {
}
ResultCollector<CliFunctionResult, List<CliFunctionResult>> execute(
- DestroyRegionMappingFunction function, String regionName,
+ DestroyMappingFunction function, String regionName,
Set<DistributedMember> targetMembers) {
return (ResultCollector<CliFunctionResult, List<CliFunctionResult>>)
executeFunction(function,
regionName, targetMembers);
diff --git
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyRegionMappingFunction.java
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingFunction.java
similarity index 95%
rename from
geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyRegionMappingFunction.java
rename to
geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingFunction.java
index 0b0703f..0298871 100644
---
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyRegionMappingFunction.java
+++
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingFunction.java
@@ -22,9 +22,9 @@ import
org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.management.internal.configuration.domain.XmlEntity;
@Experimental
-public class DestroyRegionMappingFunction extends JdbcCliFunction<String,
CliFunctionResult> {
+public class DestroyMappingFunction extends JdbcCliFunction<String,
CliFunctionResult> {
- DestroyRegionMappingFunction() {
+ DestroyMappingFunction() {
super(new FunctionContextArgumentProvider(), new ExceptionHandler());
}
diff --git
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListRegionMappingCommand.java
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommand.java
similarity index 95%
rename from
geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListRegionMappingCommand.java
rename to
geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommand.java
index 793138d..c2c27d2 100644
---
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListRegionMappingCommand.java
+++
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommand.java
@@ -35,7 +35,7 @@ import
org.apache.geode.management.internal.security.ResourceOperation;
import org.apache.geode.security.ResourcePermission;
@Experimental
-public class ListRegionMappingCommand implements GfshCommand {
+public class ListMappingCommand implements GfshCommand {
static final String LIST_MAPPING = "list jdbc-mappings";
static final String LIST_MAPPING__HELP = EXPERIMENTAL + "Display jdbc
mappings for all members.";
@@ -56,7 +56,7 @@ public class ListRegionMappingCommand implements GfshCommand {
// action
ResultCollector<RegionMapping, List<RegionMapping[]>> resultCollector =
- execute(new ListRegionMappingFunction(),
targetMembers.iterator().next());
+ execute(new ListMappingFunction(), targetMembers.iterator().next());
// output
TabularResultData tabularResultData =
ResultBuilder.createTabularResultData();
@@ -64,7 +64,7 @@ public class ListRegionMappingCommand implements GfshCommand {
return createResult(tabularResultData, mappingsExist);
}
- ResultCollector<RegionMapping, List<RegionMapping[]>>
execute(ListRegionMappingFunction function,
+ ResultCollector<RegionMapping, List<RegionMapping[]>>
execute(ListMappingFunction function,
DistributedMember targetMember) {
return (ResultCollector<RegionMapping, List<RegionMapping[]>>)
executeFunction(function, null,
targetMember);
diff --git
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListRegionMappingFunction.java
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingFunction.java
similarity index 93%
rename from
geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListRegionMappingFunction.java
rename to
geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingFunction.java
index 80e4284..34cccda 100644
---
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListRegionMappingFunction.java
+++
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingFunction.java
@@ -22,9 +22,9 @@ import
org.apache.geode.connectors.jdbc.internal.InternalJdbcConnectorService;
import org.apache.geode.connectors.jdbc.internal.RegionMapping;
@Experimental
-public class ListRegionMappingFunction extends JdbcCliFunction<Void,
RegionMapping[]> {
+public class ListMappingFunction extends JdbcCliFunction<Void,
RegionMapping[]> {
- ListRegionMappingFunction() {
+ ListMappingFunction() {
super(new FunctionContextArgumentProvider(), new ExceptionHandler());
}
diff --git
a/geode-connectors/src/main/resources/META-INF/services/org.springframework.shell.core.CommandMarker
b/geode-connectors/src/main/resources/META-INF/services/org.springframework.shell.core.CommandMarker
index 858b0b6..9599986 100644
---
a/geode-connectors/src/main/resources/META-INF/services/org.springframework.shell.core.CommandMarker
+++
b/geode-connectors/src/main/resources/META-INF/services/org.springframework.shell.core.CommandMarker
@@ -20,8 +20,8 @@
org.apache.geode.connectors.jdbc.internal.cli.DestroyConnectionCommand
org.apache.geode.connectors.jdbc.internal.cli.ListConnectionCommand
org.apache.geode.connectors.jdbc.internal.cli.DescribeConnectionCommand
org.apache.geode.connectors.jdbc.internal.cli.AlterConnectionCommand
-org.apache.geode.connectors.jdbc.internal.cli.CreateRegionMappingCommand
-org.apache.geode.connectors.jdbc.internal.cli.AlterRegionMappingCommand
-org.apache.geode.connectors.jdbc.internal.cli.DestroyRegionMappingCommand
-org.apache.geode.connectors.jdbc.internal.cli.DescribeRegionMappingCommand
-org.apache.geode.connectors.jdbc.internal.cli.ListRegionMappingCommand
+org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand
+org.apache.geode.connectors.jdbc.internal.cli.AlterMappingCommand
+org.apache.geode.connectors.jdbc.internal.cli.DestroyMappingCommand
+org.apache.geode.connectors.jdbc.internal.cli.DescribeMappingCommand
+org.apache.geode.connectors.jdbc.internal.cli.ListMappingCommand
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcDUnitTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcDUnitTest.java
index a70531c..69acf2c 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcDUnitTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcDUnitTest.java
@@ -16,6 +16,7 @@ package org.apache.geode.connectors.jdbc;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
+
import java.io.Serializable;
import java.sql.Connection;
import java.sql.DriverManager;
@@ -30,11 +31,9 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.junit.rules.ExpectedException;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Region;
-import org.apache.geode.cache.TransactionException;
import org.apache.geode.pdx.PdxInstance;
import org.apache.geode.test.dunit.IgnoredException;
import org.apache.geode.test.dunit.rules.LocatorServerStartupRule;
@@ -43,7 +42,9 @@ import org.apache.geode.test.junit.categories.DistributedTest;
import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
-
+/** End-to-end dunits for jdbc connector
+ *
+ */
@Category(DistributedTest.class)
public class JdbcDUnitTest implements Serializable {
@@ -62,17 +63,14 @@ public class JdbcDUnitTest implements Serializable {
@Rule
public SerializableTestName testName = new SerializableTestName();
- private MemberVM locator;
private MemberVM server;
@Before
public void setup() throws Exception {
- locator = startupRule.startLocatorVM(0);
+ MemberVM locator = startupRule.startLocatorVM(0);
gfsh.connectAndVerify(locator);
server = startupRule.startServerVM(1, locator.getPort());
- server.invoke(()-> {
- createTable();
- });
+ server.invoke(()-> createTable());
}
private void createTable() throws SQLException {
@@ -100,9 +98,7 @@ public class JdbcDUnitTest implements Serializable {
statement.execute("Drop table " + TABLE_NAME);
statement.close();
- if (connection != null) {
- connection.close();
- }
+ connection.close();
} catch (SQLException ex) {
System.out.println("SQL Exception is thrown while closing the
database.");
}
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterRegionMappingCommandDUnitTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandDUnitTest.java
similarity index 88%
rename from
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterRegionMappingCommandDUnitTest.java
rename to
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandDUnitTest.java
index 150993b..d771f30 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterRegionMappingCommandDUnitTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandDUnitTest.java
@@ -14,20 +14,20 @@
*/
package org.apache.geode.connectors.jdbc.internal.cli;
-import static
org.apache.geode.connectors.jdbc.internal.cli.AlterRegionMappingCommand.ALTER_MAPPING;
-import static
org.apache.geode.connectors.jdbc.internal.cli.AlterRegionMappingCommand.ALTER_MAPPING__CONNECTION_NAME;
-import static
org.apache.geode.connectors.jdbc.internal.cli.AlterRegionMappingCommand.ALTER_MAPPING__FIELD_MAPPING;
-import static
org.apache.geode.connectors.jdbc.internal.cli.AlterRegionMappingCommand.ALTER_MAPPING__PDX_CLASS_NAME;
-import static
org.apache.geode.connectors.jdbc.internal.cli.AlterRegionMappingCommand.ALTER_MAPPING__PRIMARY_KEY_IN_VALUE;
-import static
org.apache.geode.connectors.jdbc.internal.cli.AlterRegionMappingCommand.ALTER_MAPPING__REGION_NAME;
-import static
org.apache.geode.connectors.jdbc.internal.cli.AlterRegionMappingCommand.ALTER_MAPPING__TABLE_NAME;
-import static
org.apache.geode.connectors.jdbc.internal.cli.CreateRegionMappingCommand.CREATE_MAPPING;
-import static
org.apache.geode.connectors.jdbc.internal.cli.CreateRegionMappingCommand.CREATE_MAPPING__CONNECTION_NAME;
-import static
org.apache.geode.connectors.jdbc.internal.cli.CreateRegionMappingCommand.CREATE_MAPPING__FIELD_MAPPING;
-import static
org.apache.geode.connectors.jdbc.internal.cli.CreateRegionMappingCommand.CREATE_MAPPING__PDX_CLASS_NAME;
-import static
org.apache.geode.connectors.jdbc.internal.cli.CreateRegionMappingCommand.CREATE_MAPPING__PRIMARY_KEY_IN_VALUE;
-import static
org.apache.geode.connectors.jdbc.internal.cli.CreateRegionMappingCommand.CREATE_MAPPING__REGION_NAME;
-import static
org.apache.geode.connectors.jdbc.internal.cli.CreateRegionMappingCommand.CREATE_MAPPING__TABLE_NAME;
+import static
org.apache.geode.connectors.jdbc.internal.cli.AlterMappingCommand.ALTER_MAPPING;
+import static
org.apache.geode.connectors.jdbc.internal.cli.AlterMappingCommand.ALTER_MAPPING__CONNECTION_NAME;
+import static
org.apache.geode.connectors.jdbc.internal.cli.AlterMappingCommand.ALTER_MAPPING__FIELD_MAPPING;
+import static
org.apache.geode.connectors.jdbc.internal.cli.AlterMappingCommand.ALTER_MAPPING__PDX_CLASS_NAME;
+import static
org.apache.geode.connectors.jdbc.internal.cli.AlterMappingCommand.ALTER_MAPPING__PRIMARY_KEY_IN_VALUE;
+import static
org.apache.geode.connectors.jdbc.internal.cli.AlterMappingCommand.ALTER_MAPPING__REGION_NAME;
+import static
org.apache.geode.connectors.jdbc.internal.cli.AlterMappingCommand.ALTER_MAPPING__TABLE_NAME;
+import static
org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand.CREATE_MAPPING;
+import static
org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand.CREATE_MAPPING__CONNECTION_NAME;
+import static
org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand.CREATE_MAPPING__FIELD_MAPPING;
+import static
org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand.CREATE_MAPPING__PDX_CLASS_NAME;
+import static
org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand.CREATE_MAPPING__VALUE_CONTAINS_PRIMARY_KEY;
+import static
org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand.CREATE_MAPPING__REGION_NAME;
+import static
org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand.CREATE_MAPPING__TABLE_NAME;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.entry;
@@ -48,7 +48,7 @@ import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
@Category(DistributedTest.class)
-public class AlterRegionMappingCommandDUnitTest {
+public class AlterMappingCommandDUnitTest {
@Rule
public transient GfshCommandRule gfsh = new GfshCommandRule();
@@ -73,7 +73,7 @@ public class AlterRegionMappingCommandDUnitTest {
csb.addOption(CREATE_MAPPING__CONNECTION_NAME, "connection");
csb.addOption(CREATE_MAPPING__TABLE_NAME, "myTable");
csb.addOption(CREATE_MAPPING__PDX_CLASS_NAME, "myPdxClass");
- csb.addOption(CREATE_MAPPING__PRIMARY_KEY_IN_VALUE, "true");
+ csb.addOption(CREATE_MAPPING__VALUE_CONTAINS_PRIMARY_KEY, "true");
csb.addOption(CREATE_MAPPING__FIELD_MAPPING,
"field1:column1,field2:column2");
gfsh.executeAndAssertThat(csb.toString()).statusIsSuccess();
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterRegionMappingCommandIntegrationTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandIntegrationTest.java
similarity index 91%
rename from
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterRegionMappingCommandIntegrationTest.java
rename to
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandIntegrationTest.java
index 57f19bd..768e313 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterRegionMappingCommandIntegrationTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandIntegrationTest.java
@@ -30,10 +30,10 @@ import org.apache.geode.management.cli.Result;
import org.apache.geode.test.junit.categories.IntegrationTest;
@Category(IntegrationTest.class)
-public class AlterRegionMappingCommandIntegrationTest {
+public class AlterMappingCommandIntegrationTest {
private InternalCache cache;
- private AlterRegionMappingCommand alterRegionMappingCommand;
+ private AlterMappingCommand alterRegionMappingCommand;
private String regionName;
@@ -48,10 +48,10 @@ public class AlterRegionMappingCommandIntegrationTest {
cache = (InternalCache) new CacheFactory().set("locators",
"").set("mcast-port", "0")
.set(ENABLE_CLUSTER_CONFIGURATION, "true").create();
- new CreateRegionMappingCommand().createMapping(regionName, connectionName,
tableName, pdxClass,
+ new CreateMappingCommand().createMapping(regionName, connectionName,
tableName, pdxClass,
keyInValue, fieldMappings);
- alterRegionMappingCommand = new AlterRegionMappingCommand();
+ alterRegionMappingCommand = new AlterMappingCommand();
}
@After
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterRegionMappingFunctionTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingFunctionTest.java
similarity index 95%
rename from
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterRegionMappingFunctionTest.java
rename to
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingFunctionTest.java
index 3360b76..07cc454 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterRegionMappingFunctionTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingFunctionTest.java
@@ -46,13 +46,12 @@ import
org.apache.geode.connectors.jdbc.internal.RegionMappingBuilder;
import
org.apache.geode.connectors.jdbc.internal.RegionMappingNotFoundException;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.DistributedSystem;
-import org.apache.geode.internal.cache.CacheConfig;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
-public class AlterRegionMappingFunctionTest {
+public class AlterMappingFunctionTest {
private static final String REGION_NAME = "testRegion";
@@ -63,7 +62,7 @@ public class AlterRegionMappingFunctionTest {
private ResultSender<Object> resultSender;
private InternalJdbcConnectorService service;
- private AlterRegionMappingFunction function;
+ private AlterMappingFunction function;
@Before
public void setUp() {
@@ -88,7 +87,7 @@ public class AlterRegionMappingFunctionTest {
when(system.getDistributedMember()).thenReturn(distributedMember);
when(context.getArguments()).thenReturn(regionMapping);
when(cache.getService(eq(InternalJdbcConnectorService.class))).thenReturn(service);
- function = new AlterRegionMappingFunction();
+ function = new AlterMappingFunction();
}
@Test
@@ -107,12 +106,12 @@ public class AlterRegionMappingFunctionTest {
Object copy = SerializationUtils.clone(original);
-
assertThat(copy).isNotSameAs(original).isInstanceOf(AlterRegionMappingFunction.class);
+
assertThat(copy).isNotSameAs(original).isInstanceOf(AlterMappingFunction.class);
}
@Test
public void alterMissingRegionMappingThrowsRegionMappingNotFound() {
- AlterRegionMappingFunction alterFunction =
mock(AlterRegionMappingFunction.class);
+ AlterMappingFunction alterFunction = mock(AlterMappingFunction.class);
doThrow(RegionMappingNotFoundException.class).when(alterFunction).alterRegionMapping(any(),
any());
@@ -124,7 +123,7 @@ public class AlterRegionMappingFunctionTest {
public void executeInvokesReplaceOnService() throws Exception {
when(service.getMappingForRegion(REGION_NAME)).thenReturn(existingMapping);
- AlterRegionMappingFunction function = spy(new
AlterRegionMappingFunction());
+ AlterMappingFunction function = spy(new AlterMappingFunction());
doReturn(null).when(function).createXmlEntity(context);
function.execute(context);
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommandIntegrationTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommandIntegrationTest.java
index b5e5b6e..0bc2e62 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommandIntegrationTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommandIntegrationTest.java
@@ -90,4 +90,22 @@ public class CreateConnectionCommandIntegrationTest {
assertThat(service.getConnectionConfig(name)).isSameAs(connectionConfig);
}
+
+ @Test
+ public void createsConnectionConfigurationWithMinimumParams() throws
Exception {
+ Result result = createConnectionCommand.createConnection(name, url, null,
null, null);
+
+ assertThat(result.getStatus()).isSameAs(Result.Status.OK);
+
+ InternalJdbcConnectorService service =
cache.getService(InternalJdbcConnectorService.class);
+ ConnectionConfiguration connectionConfig =
service.getConnectionConfig(name);
+
+ assertThat(connectionConfig).isNotNull();
+ assertThat(connectionConfig.getName()).isEqualTo(name);
+ assertThat(connectionConfig.getUrl()).isEqualTo(url);
+ assertThat(connectionConfig.getUser()).isNull();
+ assertThat(connectionConfig.getPassword()).isNull();
+ assertThat(connectionConfig.getConnectionProperties().size()).isEqualTo(0);
+ }
+
}
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateRegionMappingCommandDUnitTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandDUnitTest.java
similarity index 89%
rename from
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateRegionMappingCommandDUnitTest.java
rename to
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandDUnitTest.java
index 82b2156..75b42d1 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateRegionMappingCommandDUnitTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandDUnitTest.java
@@ -14,13 +14,13 @@
*/
package org.apache.geode.connectors.jdbc.internal.cli;
-import static
org.apache.geode.connectors.jdbc.internal.cli.CreateRegionMappingCommand.CREATE_MAPPING;
-import static
org.apache.geode.connectors.jdbc.internal.cli.CreateRegionMappingCommand.CREATE_MAPPING__CONNECTION_NAME;
-import static
org.apache.geode.connectors.jdbc.internal.cli.CreateRegionMappingCommand.CREATE_MAPPING__FIELD_MAPPING;
-import static
org.apache.geode.connectors.jdbc.internal.cli.CreateRegionMappingCommand.CREATE_MAPPING__PDX_CLASS_NAME;
-import static
org.apache.geode.connectors.jdbc.internal.cli.CreateRegionMappingCommand.CREATE_MAPPING__PRIMARY_KEY_IN_VALUE;
-import static
org.apache.geode.connectors.jdbc.internal.cli.CreateRegionMappingCommand.CREATE_MAPPING__REGION_NAME;
-import static
org.apache.geode.connectors.jdbc.internal.cli.CreateRegionMappingCommand.CREATE_MAPPING__TABLE_NAME;
+import static
org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand.CREATE_MAPPING;
+import static
org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand.CREATE_MAPPING__CONNECTION_NAME;
+import static
org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand.CREATE_MAPPING__FIELD_MAPPING;
+import static
org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand.CREATE_MAPPING__PDX_CLASS_NAME;
+import static
org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand.CREATE_MAPPING__VALUE_CONTAINS_PRIMARY_KEY;
+import static
org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand.CREATE_MAPPING__REGION_NAME;
+import static
org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand.CREATE_MAPPING__TABLE_NAME;
import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Before;
@@ -40,7 +40,7 @@ import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
@Category(DistributedTest.class)
-public class CreateRegionMappingCommandDUnitTest {
+public class CreateMappingCommandDUnitTest {
@Rule
public transient GfshCommandRule gfsh = new GfshCommandRule();
@@ -69,7 +69,7 @@ public class CreateRegionMappingCommandDUnitTest {
csb.addOption(CREATE_MAPPING__CONNECTION_NAME, "connection");
csb.addOption(CREATE_MAPPING__TABLE_NAME, "myTable");
csb.addOption(CREATE_MAPPING__PDX_CLASS_NAME, "myPdxClass");
- csb.addOption(CREATE_MAPPING__PRIMARY_KEY_IN_VALUE, "false");
+ csb.addOption(CREATE_MAPPING__VALUE_CONTAINS_PRIMARY_KEY, "false");
csb.addOption(CREATE_MAPPING__FIELD_MAPPING,
"field1:column1,field2:column2");
gfsh.executeAndAssertThat(csb.toString()).statusIsSuccess();
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateRegionMappingCommandIntegrationTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandIntegrationTest.java
similarity index 96%
rename from
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateRegionMappingCommandIntegrationTest.java
rename to
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandIntegrationTest.java
index 2f2d17e..6f4daca 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateRegionMappingCommandIntegrationTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandIntegrationTest.java
@@ -31,10 +31,10 @@ import org.apache.geode.management.cli.Result;
import org.apache.geode.test.junit.categories.IntegrationTest;
@Category(IntegrationTest.class)
-public class CreateRegionMappingCommandIntegrationTest {
+public class CreateMappingCommandIntegrationTest {
private InternalCache cache;
- private CreateRegionMappingCommand createRegionMappingCommand;
+ private CreateMappingCommand createRegionMappingCommand;
private String regionName;
private String connectionName;
@@ -55,7 +55,7 @@ public class CreateRegionMappingCommandIntegrationTest {
cache = (InternalCache) new CacheFactory().set("locators",
"").set("mcast-port", "0")
.set(ENABLE_CLUSTER_CONFIGURATION, "true").create();
- createRegionMappingCommand = new CreateRegionMappingCommand();
+ createRegionMappingCommand = new CreateMappingCommand();
}
@After
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateRegionMappingFunctionTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingFunctionTest.java
similarity index 95%
rename from
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateRegionMappingFunctionTest.java
rename to
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingFunctionTest.java
index 049148f..9d7a32f 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateRegionMappingFunctionTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingFunctionTest.java
@@ -45,7 +45,7 @@ import
org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
-public class CreateRegionMappingFunctionTest {
+public class CreateMappingFunctionTest {
private static final String REGION_NAME = "testRegion";
@@ -55,7 +55,7 @@ public class CreateRegionMappingFunctionTest {
private ResultSender<Object> resultSender;
private InternalJdbcConnectorService service;
- private CreateRegionMappingFunction function;
+ private CreateMappingFunction function;
@Before
public void setUp() {
@@ -75,7 +75,7 @@ public class CreateRegionMappingFunctionTest {
when(context.getArguments()).thenReturn(regionMapping);
when(cache.getService(eq(InternalJdbcConnectorService.class))).thenReturn(service);
- function = new CreateRegionMappingFunction();
+ function = new CreateMappingFunction();
}
@Test
@@ -94,7 +94,7 @@ public class CreateRegionMappingFunctionTest {
Object copy = SerializationUtils.clone(original);
-
assertThat(copy).isNotSameAs(original).isInstanceOf(CreateRegionMappingFunction.class);
+
assertThat(copy).isNotSameAs(original).isInstanceOf(CreateMappingFunction.class);
}
@Test
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeRegionMappingCommandDUnitTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandDUnitTest.java
similarity index 90%
rename from
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeRegionMappingCommandDUnitTest.java
rename to
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandDUnitTest.java
index 6bbb837..cc09523 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeRegionMappingCommandDUnitTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandDUnitTest.java
@@ -14,13 +14,13 @@
*/
package org.apache.geode.connectors.jdbc.internal.cli;
-import static
org.apache.geode.connectors.jdbc.internal.cli.CreateRegionMappingCommand.CREATE_MAPPING__CONNECTION_NAME;
-import static
org.apache.geode.connectors.jdbc.internal.cli.CreateRegionMappingCommand.CREATE_MAPPING__PDX_CLASS_NAME;
-import static
org.apache.geode.connectors.jdbc.internal.cli.CreateRegionMappingCommand.CREATE_MAPPING__PRIMARY_KEY_IN_VALUE;
-import static
org.apache.geode.connectors.jdbc.internal.cli.CreateRegionMappingCommand.CREATE_MAPPING__REGION_NAME;
-import static
org.apache.geode.connectors.jdbc.internal.cli.CreateRegionMappingCommand.CREATE_MAPPING__TABLE_NAME;
-import static
org.apache.geode.connectors.jdbc.internal.cli.DescribeRegionMappingCommand.DESCRIBE_MAPPING;
-import static
org.apache.geode.connectors.jdbc.internal.cli.DescribeRegionMappingCommand.DESCRIBE_MAPPING__REGION_NAME;
+import static
org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand.CREATE_MAPPING__CONNECTION_NAME;
+import static
org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand.CREATE_MAPPING__PDX_CLASS_NAME;
+import static
org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand.CREATE_MAPPING__VALUE_CONTAINS_PRIMARY_KEY;
+import static
org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand.CREATE_MAPPING__REGION_NAME;
+import static
org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand.CREATE_MAPPING__TABLE_NAME;
+import static
org.apache.geode.connectors.jdbc.internal.cli.DescribeMappingCommand.DESCRIBE_MAPPING;
+import static
org.apache.geode.connectors.jdbc.internal.cli.DescribeMappingCommand.DESCRIBE_MAPPING__REGION_NAME;
import static org.assertj.core.api.Assertions.assertThat;
import java.io.Serializable;
@@ -44,7 +44,7 @@ import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
@Category(DistributedTest.class)
-public class DescribeRegionMappingCommandDUnitTest implements Serializable {
+public class DescribeMappingCommandDUnitTest implements Serializable {
private static final String REGION_NAME = "testRegion";
@@ -80,7 +80,7 @@ public class DescribeRegionMappingCommandDUnitTest implements
Serializable {
commandResultAssert.containsKeyValuePair(CREATE_MAPPING__CONNECTION_NAME,
"connection");
commandResultAssert.containsKeyValuePair(CREATE_MAPPING__TABLE_NAME,
"testTable");
commandResultAssert.containsKeyValuePair(CREATE_MAPPING__PDX_CLASS_NAME,
"myPdxClass");
-
commandResultAssert.containsKeyValuePair(CREATE_MAPPING__PRIMARY_KEY_IN_VALUE,
"true");
+
commandResultAssert.containsKeyValuePair(CREATE_MAPPING__VALUE_CONTAINS_PRIMARY_KEY,
"true");
commandResultAssert.containsOutput("field1");
commandResultAssert.containsOutput("field2");
commandResultAssert.containsOutput("column1");
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeRegionMappingCommandIntegrationTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandIntegrationTest.java
similarity index 89%
rename from
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeRegionMappingCommandIntegrationTest.java
rename to
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandIntegrationTest.java
index d00ceee..b2c1ac6 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeRegionMappingCommandIntegrationTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandIntegrationTest.java
@@ -14,13 +14,13 @@
*/
package org.apache.geode.connectors.jdbc.internal.cli;
-import static
org.apache.geode.connectors.jdbc.internal.cli.CreateRegionMappingCommand.CREATE_MAPPING__CONNECTION_NAME;
-import static
org.apache.geode.connectors.jdbc.internal.cli.CreateRegionMappingCommand.CREATE_MAPPING__PDX_CLASS_NAME;
-import static
org.apache.geode.connectors.jdbc.internal.cli.CreateRegionMappingCommand.CREATE_MAPPING__PRIMARY_KEY_IN_VALUE;
-import static
org.apache.geode.connectors.jdbc.internal.cli.CreateRegionMappingCommand.CREATE_MAPPING__REGION_NAME;
-import static
org.apache.geode.connectors.jdbc.internal.cli.CreateRegionMappingCommand.CREATE_MAPPING__TABLE_NAME;
-import static
org.apache.geode.connectors.jdbc.internal.cli.DescribeRegionMappingCommand.FIELD_TO_COLUMN_TABLE;
-import static
org.apache.geode.connectors.jdbc.internal.cli.DescribeRegionMappingCommand.RESULT_SECTION_NAME;
+import static
org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand.CREATE_MAPPING__CONNECTION_NAME;
+import static
org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand.CREATE_MAPPING__PDX_CLASS_NAME;
+import static
org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand.CREATE_MAPPING__VALUE_CONTAINS_PRIMARY_KEY;
+import static
org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand.CREATE_MAPPING__REGION_NAME;
+import static
org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand.CREATE_MAPPING__TABLE_NAME;
+import static
org.apache.geode.connectors.jdbc.internal.cli.DescribeMappingCommand.FIELD_TO_COLUMN_TABLE;
+import static
org.apache.geode.connectors.jdbc.internal.cli.DescribeMappingCommand.RESULT_SECTION_NAME;
import static
org.apache.geode.distributed.ConfigurationProperties.ENABLE_CLUSTER_CONFIGURATION;
import static
org.apache.geode.management.internal.cli.result.AbstractResultData.SECTION_DATA_ACCESSOR;
import static
org.apache.geode.management.internal.cli.result.AbstractResultData.TABLE_DATA_ACCESSOR;
@@ -42,13 +42,13 @@ import
org.apache.geode.management.internal.cli.result.CommandResult;
import org.apache.geode.test.junit.categories.IntegrationTest;
@Category(IntegrationTest.class)
-public class DescribeRegionMappingCommandIntegrationTest {
+public class DescribeMappingCommandIntegrationTest {
private static final String REGION_NAME = "testRegion";
private InternalCache cache;
private InternalJdbcConnectorService service;
private RegionMapping regionMapping;
- private DescribeRegionMappingCommand command;
+ private DescribeMappingCommand command;
@Before
public void setup() {
@@ -61,7 +61,7 @@ public class DescribeRegionMappingCommandIntegrationTest {
.withConnectionConfigName("connection").withTableName("testTable")
.withPdxClassName("myPdxClass").withPrimaryKeyInValue(true)
.withFieldToColumnMappings(fieldMappings).build();
- command = new DescribeRegionMappingCommand();
+ command = new DescribeMappingCommand();
}
@After
@@ -99,7 +99,7 @@ public class DescribeRegionMappingCommandIntegrationTest {
.isEqualTo(regionMapping.getTableName());
assertThat(sectionContent.get(CREATE_MAPPING__PDX_CLASS_NAME))
.isEqualTo(regionMapping.getPdxClassName());
- assertThat(sectionContent.get(CREATE_MAPPING__PRIMARY_KEY_IN_VALUE))
+ assertThat(sectionContent.get(CREATE_MAPPING__VALUE_CONTAINS_PRIMARY_KEY))
.isEqualTo(regionMapping.isPrimaryKeyInValue());
GfJsonObject tableContent = sectionContent
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeRegionMappingFunctionTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingFunctionTest.java
similarity index 96%
rename from
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeRegionMappingFunctionTest.java
rename to
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingFunctionTest.java
index a4de40e..4d1b0e7 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeRegionMappingFunctionTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingFunctionTest.java
@@ -41,11 +41,11 @@ import
org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
-public class DescribeRegionMappingFunctionTest {
+public class DescribeMappingFunctionTest {
private static final String EXISTING_MAPPING = "existingMapping";
- private DescribeRegionMappingFunction function;
+ private DescribeMappingFunction function;
private InternalJdbcConnectorService service;
private FunctionContext<String> context;
private RegionMapping regionMapping;
@@ -53,7 +53,7 @@ public class DescribeRegionMappingFunctionTest {
@Before
public void setUp() {
- function = new DescribeRegionMappingFunction();
+ function = new DescribeMappingFunction();
InternalCache cache = mock(InternalCache.class);
context = mock(FunctionContext.class);
@@ -86,7 +86,7 @@ public class DescribeRegionMappingFunctionTest {
public void serializes() {
Serializable original = function;
Object copy = SerializationUtils.clone(original);
-
assertThat(copy).isNotSameAs(original).isInstanceOf(DescribeRegionMappingFunction.class);
+
assertThat(copy).isNotSameAs(original).isInstanceOf(DescribeMappingFunction.class);
}
@Test
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyRegionMappingCommandDunitTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandDunitTest.java
similarity index 95%
rename from
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyRegionMappingCommandDunitTest.java
rename to
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandDunitTest.java
index 84ac3c9..f5d3e7e 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyRegionMappingCommandDunitTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandDunitTest.java
@@ -14,8 +14,8 @@
*/
package org.apache.geode.connectors.jdbc.internal.cli;
-import static
org.apache.geode.connectors.jdbc.internal.cli.DestroyRegionMappingCommand.DESTROY_MAPPING;
-import static
org.apache.geode.connectors.jdbc.internal.cli.DestroyRegionMappingCommand.DESTROY_MAPPING__REGION_NAME;
+import static
org.apache.geode.connectors.jdbc.internal.cli.DestroyMappingCommand.DESTROY_MAPPING;
+import static
org.apache.geode.connectors.jdbc.internal.cli.DestroyMappingCommand.DESTROY_MAPPING__REGION_NAME;
import static org.assertj.core.api.Assertions.assertThat;
import java.io.Serializable;
@@ -39,7 +39,7 @@ import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
@Category(DistributedTest.class)
-public class DestroyRegionMappingCommandDunitTest implements Serializable {
+public class DestroyMappingCommandDunitTest implements Serializable {
@Rule
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyRegionMappingCommandFunctionTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandFunctionTest.java
similarity index 94%
rename from
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyRegionMappingCommandFunctionTest.java
rename to
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandFunctionTest.java
index 681a131..a1224c0 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyRegionMappingCommandFunctionTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandFunctionTest.java
@@ -41,11 +41,11 @@ import
org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
-public class DestroyRegionMappingCommandFunctionTest {
+public class DestroyMappingCommandFunctionTest {
private static final String regionName = "testRegion";
- private DestroyRegionMappingFunction function;
+ private DestroyMappingFunction function;
private FunctionContext<String> context;
private ResultSender<Object> resultSender;
private RegionMapping mapping;
@@ -69,7 +69,7 @@ public class DestroyRegionMappingCommandFunctionTest {
mapping = new RegionMappingBuilder().build();
- function = new DestroyRegionMappingFunction();
+ function = new DestroyMappingFunction();
}
@Test
@@ -88,7 +88,7 @@ public class DestroyRegionMappingCommandFunctionTest {
Object copy = SerializationUtils.clone(original);
-
assertThat(copy).isNotSameAs(original).isInstanceOf(DestroyRegionMappingFunction.class);
+
assertThat(copy).isNotSameAs(original).isInstanceOf(DestroyMappingFunction.class);
}
@Test
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyRegionMappingCommandIntegrationTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandIntegrationTest.java
similarity index 95%
rename from
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyRegionMappingCommandIntegrationTest.java
rename to
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandIntegrationTest.java
index 8ab4d3d..f02a076 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyRegionMappingCommandIntegrationTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandIntegrationTest.java
@@ -31,13 +31,13 @@ import org.apache.geode.management.cli.Result;
import org.apache.geode.test.junit.categories.IntegrationTest;
@Category(IntegrationTest.class)
-public class DestroyRegionMappingCommandIntegrationTest {
+public class DestroyMappingCommandIntegrationTest {
private String regionName;
private InternalCache cache;
private RegionMapping mapping;
- private DestroyRegionMappingCommand command;
+ private DestroyMappingCommand command;
@Before
public void setup() throws Exception {
@@ -49,7 +49,7 @@ public class DestroyRegionMappingCommandIntegrationTest {
cache = (InternalCache) new CacheFactory().set("locators",
"").set("mcast-port", "0")
.set(ENABLE_CLUSTER_CONFIGURATION, "true").create();
- command = new DestroyRegionMappingCommand();
+ command = new DestroyMappingCommand();
}
@After
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListRegionMappingCommandDUnitTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandDUnitTest.java
similarity index 97%
rename from
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListRegionMappingCommandDUnitTest.java
rename to
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandDUnitTest.java
index d0bc5c4..4641c87 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListRegionMappingCommandDUnitTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandDUnitTest.java
@@ -14,8 +14,8 @@
*/
package org.apache.geode.connectors.jdbc.internal.cli;
-import static
org.apache.geode.connectors.jdbc.internal.cli.ListRegionMappingCommand.LIST_MAPPING;
-import static
org.apache.geode.connectors.jdbc.internal.cli.ListRegionMappingCommand.LIST_OF_MAPPINGS;
+import static
org.apache.geode.connectors.jdbc.internal.cli.ListMappingCommand.LIST_MAPPING;
+import static
org.apache.geode.connectors.jdbc.internal.cli.ListMappingCommand.LIST_OF_MAPPINGS;
import static org.assertj.core.api.Assertions.assertThat;
import java.io.Serializable;
@@ -38,7 +38,7 @@ import org.apache.geode.test.junit.rules.GfshCommandRule;
import org.apache.geode.test.junit.rules.serializable.SerializableTestName;
@Category(DistributedTest.class)
-public class ListRegionMappingCommandDUnitTest implements Serializable {
+public class ListMappingCommandDUnitTest implements Serializable {
@Rule
public transient GfshCommandRule gfsh = new GfshCommandRule();
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListRegionMappingCommandIntegrationTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandIntegrationTest.java
similarity index 98%
rename from
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListRegionMappingCommandIntegrationTest.java
rename to
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandIntegrationTest.java
index cc98799..cfc7859 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListRegionMappingCommandIntegrationTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandIntegrationTest.java
@@ -34,7 +34,7 @@ import
org.apache.geode.management.internal.cli.result.CommandResult;
import org.apache.geode.test.junit.categories.IntegrationTest;
@Category(IntegrationTest.class)
-public class ListRegionMappingCommandIntegrationTest {
+public class ListMappingCommandIntegrationTest {
private InternalCache cache;
private InternalJdbcConnectorService service;
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListRegionMappingFunctionTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingFunctionTest.java
similarity index 96%
rename from
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListRegionMappingFunctionTest.java
rename to
geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingFunctionTest.java
index f40d132..dc03de5 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListRegionMappingFunctionTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingFunctionTest.java
@@ -42,7 +42,7 @@ import
org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
-public class ListRegionMappingFunctionTest {
+public class ListMappingFunctionTest {
private FunctionContext<Void> context;
private ResultSender<Object> resultSender;
@@ -54,7 +54,7 @@ public class ListRegionMappingFunctionTest {
private Set<RegionMapping> expected;
- private ListRegionMappingFunction function;
+ private ListMappingFunction function;
@Before
public void setUp() {
@@ -78,7 +78,7 @@ public class ListRegionMappingFunctionTest {
when(cache.getService(eq(InternalJdbcConnectorService.class))).thenReturn(service);
when(service.getRegionMappings()).thenReturn(expected);
- function = new ListRegionMappingFunction();
+ function = new ListMappingFunction();
}
@Test
@@ -97,7 +97,7 @@ public class ListRegionMappingFunctionTest {
Object copy = SerializationUtils.clone(original);
-
assertThat(copy).isNotSameAs(original).isInstanceOf(ListRegionMappingFunction.class);
+
assertThat(copy).isNotSameAs(original).isInstanceOf(ListMappingFunction.class);
}
@Test
--
To stop receiving notification emails like this one, please contact
['"[email protected]" <[email protected]>'].
