This is an automated email from the ASF dual-hosted git repository.
dschneider pushed a commit to branch feature/GEODE-5969
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 5ba56739e73ede5fcd5175270e3c2f31a42c96e7
Author: Darrel Schneider <dschnei...@pivotal.io>
AuthorDate: Thu Nov 1 17:04:03 2018 -0700
removed value-contains-primary-key from jdbc-mapping
---
.../geode/connectors/jdbc/JdbcDistributedTest.java | 18 ++---
.../jdbc/internal/TestConfigService.java | 2 +-
.../internal/cli/AlterMappingCommandDUnitTest.java | 3 -
.../cli/CreateMappingCommandDUnitTest.java | 46 ------------
.../cli/DescribeMappingCommandDUnitTest.java | 6 +-
.../cli/DestroyMappingCommandDunitTest.java | 2 -
.../cli/JdbcClusterConfigDistributedTest.java | 3 +-
.../internal/cli/ListMappingCommandDUnitTest.java | 4 +-
.../cli/AlterMappingCommandIntegrationTest.java | 4 +-
.../cli/CreateMappingCommandIntegrationTest.java | 12 +--
.../cli/DestroyMappingCommandIntegrationTest.java | 2 +-
.../jdbc/internal/SqlToPdxInstanceCreator.java | 9 +--
.../jdbc/internal/cli/AlterMappingCommand.java | 2 +-
.../jdbc/internal/cli/AlterMappingFunction.java | 4 +-
.../jdbc/internal/cli/CreateMappingCommand.java | 8 +-
.../jdbc/internal/cli/DescribeMappingCommand.java | 2 -
.../jdbc/internal/configuration/RegionMapping.java | 24 +-----
.../connectors/jdbc/internal/xml/ElementType.java | 2 -
.../xml/JdbcConnectorServiceXmlParser.java | 1 -
.../geode.apache.org/schema/jdbc/jdbc-1.0.xsd | 1 -
.../jdbc/internal/RegionMappingTest.java | 85 ++++++++++------------
.../jdbc/internal/SqlToPdxInstanceCreatorTest.java | 25 +------
.../internal/cli/AlterMappingFunctionTest.java | 30 +++-----
.../internal/cli/CreateMappingFunctionTest.java | 2 +-
.../internal/cli/DescribeMappingCommandTest.java | 4 +-
.../jdbc/internal/cli/ListMappingCommandTest.java | 4 +-
.../jdbc/internal/xml/ElementTypeTest.java | 3 -
27 files changed, 81 insertions(+), 227 deletions(-)
diff --git
a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcDistributedTest.java
b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcDistributedTest.java
index eee9dda..b4c9318 100644
---
a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcDistributedTest.java
+++
b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/JdbcDistributedTest.java
@@ -474,7 +474,7 @@ public abstract class JdbcDistributedTest implements
Serializable {
createTable();
createRegionUsingGfsh(true, false, true);
createJdbcConnection();
- createMapping(REGION_NAME, CONNECTION_NAME, Employee.class.getName(),
false);
+ createMapping(REGION_NAME, CONNECTION_NAME, Employee.class.getName());
server.invoke(() -> {
String key = "id1";
Employee value = new Employee("Emp1", 55);
@@ -496,7 +496,7 @@ public abstract class JdbcDistributedTest implements
Serializable {
createRegionUsingGfsh(true, false, true);
createJdbcConnection();
- createMapping(REGION_NAME, CONNECTION_NAME,
ClassWithSupportedPdxFields.class.getName(), false);
+ createMapping(REGION_NAME, CONNECTION_NAME,
ClassWithSupportedPdxFields.class.getName());
client.invoke(() -> {
String key = "id1";
ClassWithSupportedPdxFields value = new
ClassWithSupportedPdxFields(true, (byte) 1, (short) 2,
@@ -519,7 +519,7 @@ public abstract class JdbcDistributedTest implements
Serializable {
createRegionUsingGfsh(true, false, true);
createJdbcConnection();
- createMapping(REGION_NAME, CONNECTION_NAME,
ClassWithSupportedPdxFields.class.getName(), false);
+ createMapping(REGION_NAME, CONNECTION_NAME,
ClassWithSupportedPdxFields.class.getName());
client.invoke(() -> {
String key = "id1";
ClassWithSupportedPdxFields value = new ClassWithSupportedPdxFields();
@@ -540,7 +540,7 @@ public abstract class JdbcDistributedTest implements
Serializable {
createClientRegion(client);
createRegionUsingGfsh(true, false, true);
createJdbcConnection();
- createMapping(REGION_NAME, CONNECTION_NAME,
ClassWithSupportedPdxFields.class.getName(), false);
+ createMapping(REGION_NAME, CONNECTION_NAME,
ClassWithSupportedPdxFields.class.getName());
String key = "id1";
ClassWithSupportedPdxFields value = new ClassWithSupportedPdxFields(true,
(byte) 1, (short) 2,
3, 4, 5.5f, 6.0, "BigEmp", new Date(0), "BigEmpObject", new byte[] {1,
2}, 'c');
@@ -568,7 +568,7 @@ public abstract class JdbcDistributedTest implements
Serializable {
createClientRegion(client);
createRegionUsingGfsh(true, false, true);
createJdbcConnection();
- createMapping(REGION_NAME, CONNECTION_NAME,
ClassWithSupportedPdxFields.class.getName(), false);
+ createMapping(REGION_NAME, CONNECTION_NAME,
ClassWithSupportedPdxFields.class.getName());
String key = "id1";
ClassWithSupportedPdxFields value = new ClassWithSupportedPdxFields();
@@ -640,14 +640,8 @@ public abstract class JdbcDistributedTest implements
Serializable {
}
private void createMapping(String regionName, String connectionName, String
pdxClassName) {
- createMapping(regionName, connectionName, pdxClassName, true);
- }
-
- private void createMapping(String regionName, String connectionName, String
pdxClassName,
- boolean valueContainsPrimaryKey) {
final String commandStr = "create jdbc-mapping --region=" + regionName + "
--connection="
- + connectionName + (valueContainsPrimaryKey ? "
--value-contains-primary-key" : "")
- + (pdxClassName != null ? " --pdx-class-name=" + pdxClassName : "");
+ + connectionName + (pdxClassName != null ? " --pdx-class-name=" +
pdxClassName : "");
gfsh.executeAndAssertThat(commandStr).statusIsSuccess();
}
diff --git
a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/internal/TestConfigService.java
b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/internal/TestConfigService.java
index 6cc1d16..714b3dd 100644
---
a/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/internal/TestConfigService.java
+++
b/geode-connectors/src/acceptanceTest/java/org/apache/geode/connectors/jdbc/internal/TestConfigService.java
@@ -53,6 +53,6 @@ public class TestConfigService {
private static RegionMapping createRegionMapping(String pdxClassName,
boolean primaryKeyInValue) {
return new RegionMapping(REGION_NAME, pdxClassName, REGION_TABLE_NAME,
- CONNECTION_CONFIG_NAME, primaryKeyInValue);
+ CONNECTION_CONFIG_NAME);
}
}
diff --git
a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandDUnitTest.java
b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandDUnitTest.java
index f93dc9d..0cdd2fb 100644
---
a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandDUnitTest.java
+++
b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandDUnitTest.java
@@ -27,7 +27,6 @@ import static
org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand
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__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.CreateMappingCommand.CREATE_MAPPING__VALUE_CONTAINS_PRIMARY_KEY;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.List;
@@ -77,7 +76,6 @@ public class AlterMappingCommandDUnitTest {
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__VALUE_CONTAINS_PRIMARY_KEY, "true");
csb.addOption(CREATE_MAPPING__FIELD_MAPPING,
"field1:column1,field2:column2");
gfsh.executeAndAssertThat(csb.toString()).statusIsSuccess();
@@ -108,7 +106,6 @@ public class AlterMappingCommandDUnitTest {
assertThat(mapping.getConnectionConfigName()).isEqualTo("newConnection");
assertThat(mapping.getTableName()).isEqualTo("newTable");
assertThat(mapping.getPdxClassName()).isEqualTo("newPdxClass");
- assertThat(mapping.isPrimaryKeyInValue()).isEqualTo(false);
List<RegionMapping.FieldMapping> fieldMappings =
mapping.getFieldMapping();
assertThat(fieldMappings).hasSize(2);
assertThat(fieldMappings.get(0).getFieldName()).isEqualTo("field3");
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 12cbf7f..4965aa2 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
@@ -20,7 +20,6 @@ import static
org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand
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__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.CreateMappingCommand.CREATE_MAPPING__VALUE_CONTAINS_PRIMARY_KEY;
import static org.assertj.core.api.Assertions.assertThat;
import java.util.List;
@@ -29,8 +28,6 @@ import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.w3c.dom.Element;
-import org.w3c.dom.NodeList;
import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
import org.apache.geode.connectors.jdbc.internal.configuration.RegionMapping;
@@ -79,7 +76,6 @@ public class CreateMappingCommandDUnitTest {
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__VALUE_CONTAINS_PRIMARY_KEY, "true");
csb.addOption(CREATE_MAPPING__FIELD_MAPPING,
"field1:column1,field2:column2");
gfsh.executeAndAssertThat(csb.toString()).statusIsSuccess();
@@ -97,47 +93,6 @@ public class CreateMappingCommandDUnitTest {
assertThat(mapping.getConnectionConfigName()).isEqualTo("connection");
assertThat(mapping.getTableName()).isEqualTo("myTable");
assertThat(mapping.getPdxClassName()).isEqualTo("myPdxClass");
- assertThat(mapping.isPrimaryKeyInValue()).isEqualTo(true);
- List<RegionMapping.FieldMapping> fieldMappings =
mapping.getFieldMapping();
- assertThat(fieldMappings).hasSize(2);
- assertThat(fieldMappings.get(0).getFieldName()).isEqualTo("field1");
- assertThat(fieldMappings.get(0).getColumnName()).isEqualTo("column1");
- assertThat(fieldMappings.get(1).getFieldName()).isEqualTo("field2");
- assertThat(fieldMappings.get(1).getColumnName()).isEqualTo("column2");
- });
- }
-
- @Test
- public void validateThatPrimaryKeyInValueDefaultsToFalse() {
- CommandStringBuilder csb = new CommandStringBuilder(CREATE_MAPPING);
- csb.addOption(CREATE_MAPPING__REGION_NAME, REGION_NAME);
- 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__FIELD_MAPPING,
"field1:column1,field2:column2");
-
- gfsh.executeAndAssertThat(csb.toString()).statusIsSuccess();
-
- locator.invoke(() -> {
- String xml =
InternalLocator.getLocator().getConfigurationPersistenceService()
- .getConfiguration("cluster").getCacheXmlContent();
- assertThat(xml).isNotNull().contains("primary-key-in-value=\"false\"");
- Element element =
InternalLocator.getLocator().getConfigurationPersistenceService()
- .getXmlElement(null, "region", "name", REGION_NAME);
- assertThat(element).isNotNull();
- NodeList list = element.getElementsByTagName("jdbc:mapping");
- assertThat(list).isNotNull();
- assertThat(list.getLength()).isEqualTo(1);
- });
-
- server.invoke(() -> {
- InternalCache cache = ClusterStartupRule.getCache();
- RegionMapping mapping =
-
cache.getService(JdbcConnectorService.class).getMappingForRegion(REGION_NAME);
- assertThat(mapping.getConnectionConfigName()).isEqualTo("connection");
- assertThat(mapping.getTableName()).isEqualTo("myTable");
- assertThat(mapping.getPdxClassName()).isEqualTo("myPdxClass");
- assertThat(mapping.isPrimaryKeyInValue()).isEqualTo(false);
List<RegionMapping.FieldMapping> fieldMappings =
mapping.getFieldMapping();
assertThat(fieldMappings).hasSize(2);
assertThat(fieldMappings.get(0).getFieldName()).isEqualTo("field1");
@@ -154,7 +109,6 @@ public class CreateMappingCommandDUnitTest {
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__VALUE_CONTAINS_PRIMARY_KEY, "false");
gfsh.executeAndAssertThat(csb.toString()).statusIsSuccess();
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 b11e0b4..67111c8 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
@@ -20,7 +20,6 @@ import static
org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand
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__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.CreateMappingCommand.CREATE_MAPPING__VALUE_CONTAINS_PRIMARY_KEY;
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;
@@ -75,7 +74,6 @@ public class DescribeMappingCommandDUnitTest implements
Serializable {
csb.addOption(CREATE_MAPPING__CONNECTION_NAME, "connection");
csb.addOption(CREATE_MAPPING__TABLE_NAME, "testTable");
csb.addOption(CREATE_MAPPING__PDX_CLASS_NAME, "myPdxClass");
- csb.addOption(CREATE_MAPPING__VALUE_CONTAINS_PRIMARY_KEY, "true");
csb.addOption(CREATE_MAPPING__FIELD_MAPPING,
"field1:column1,field2:column2");
gfsh.executeAndAssertThat(csb.toString()).statusIsSuccess();
@@ -90,7 +88,6 @@ public class DescribeMappingCommandDUnitTest 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__VALUE_CONTAINS_PRIMARY_KEY,
"true");
commandResultAssert.containsOutput("field1");
commandResultAssert.containsOutput("field2");
commandResultAssert.containsOutput("column1");
@@ -135,14 +132,13 @@ public class DescribeMappingCommandDUnitTest 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__VALUE_CONTAINS_PRIMARY_KEY,
"true");
}
private void createRegionMapping() throws RegionMappingExistsException {
InternalCache cache = ClusterStartupRule.getCache();
JdbcConnectorService service =
cache.getService(JdbcConnectorService.class);
service.createRegionMapping(new RegionMapping(REGION_NAME, "myPdxClass",
- "testTable", "connection", true));
+ "testTable", "connection"));
assertThat(service.getMappingForRegion(REGION_NAME)).isNotNull();
}
}
diff --git
a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandDunitTest.java
b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandDunitTest.java
index 9697532..a637a95 100644
---
a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandDunitTest.java
+++
b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandDunitTest.java
@@ -20,7 +20,6 @@ import static
org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand
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__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.CreateMappingCommand.CREATE_MAPPING__VALUE_CONTAINS_PRIMARY_KEY;
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;
@@ -76,7 +75,6 @@ public class DestroyMappingCommandDunitTest implements
Serializable {
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__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/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/JdbcClusterConfigDistributedTest.java
b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/JdbcClusterConfigDistributedTest.java
index bef158e..239a8b4 100644
---
a/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/JdbcClusterConfigDistributedTest.java
+++
b/geode-connectors/src/distributedTest/java/org/apache/geode/connectors/jdbc/internal/cli/JdbcClusterConfigDistributedTest.java
@@ -55,7 +55,7 @@ public class JdbcClusterConfigDistributedTest {
gfsh.executeAndAssertThat("create region --name=regionName
--type=PARTITION").statusIsSuccess();
gfsh.executeAndAssertThat(
- "create jdbc-mapping --region=regionName --connection=connection
--table=testTable --pdx-class-name=myPdxClass --value-contains-primary-key
--field-mapping=field1:column1,field2:column2")
+ "create jdbc-mapping --region=regionName --connection=connection
--table=testTable --pdx-class-name=myPdxClass
--field-mapping=field1:column1,field2:column2")
.statusIsSuccess();
server.invoke(() -> {
@@ -80,7 +80,6 @@ public class JdbcClusterConfigDistributedTest {
assertThat(regionMapping.getConnectionConfigName()).isEqualTo("connection");
assertThat(regionMapping.getTableName()).isEqualTo("testTable");
assertThat(regionMapping.getPdxClassName()).isEqualTo("myPdxClass");
- assertThat(regionMapping.isPrimaryKeyInValue()).isEqualTo(true);
assertThat(regionMapping.getColumnNameForField("field1",
mock(TableMetaDataView.class)))
.isEqualTo("column1");
assertThat(regionMapping.getColumnNameForField("field2",
mock(TableMetaDataView.class)))
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 2ffe403..770a0c1 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
@@ -62,7 +62,7 @@ public class ListMappingCommandDUnitTest implements
Serializable {
.statusIsSuccess();
String mapping = "create jdbc-mapping --region=testRegion
--connection=connection "
- + "--table=myTable --pdx-class-name=myPdxClass
--value-contains-primary-key=true "
+ + "--table=myTable --pdx-class-name=myPdxClass "
+ "--field-mapping=field1:column1,field2:column2";
gfsh.executeAndAssertThat(mapping).statusIsSuccess();
@@ -117,7 +117,7 @@ public class ListMappingCommandDUnitTest implements
Serializable {
for (int i = 1; i <= N; i++) {
String name = regionName + "-" + i;
service.createRegionMapping(
- new RegionMapping(name, "x.y.MyPdxClass", "table", "connection",
true));
+ new RegionMapping(name, "x.y.MyPdxClass", "table", "connection"));
assertThat(service.getMappingForRegion(name)).isNotNull();
}
}
diff --git
a/geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandIntegrationTest.java
b/geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandIntegrationTest.java
index f142b4f..38d25e3 100644
---
a/geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandIntegrationTest.java
+++
b/geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandIntegrationTest.java
@@ -45,7 +45,6 @@ public class AlterMappingCommandIntegrationTest {
String connectionName = "connection";
String tableName = "testTable";
String pdxClass = "myPdxClass";
- Boolean keyInValue = true;
String[] fieldMappings = new String[] {"field1:column1", "field2:column2"};
cache = (InternalCache) new CacheFactory().set("locators",
"").set("mcast-port", "0")
@@ -53,7 +52,7 @@ public class AlterMappingCommandIntegrationTest {
cache.createRegionFactory(RegionShortcut.LOCAL).create(regionName);
CreateMappingCommand create = new CreateMappingCommand();
create.setCache(cache);
- assertThat(create.createMapping(regionName, connectionName, tableName,
pdxClass, keyInValue,
+ assertThat(create.createMapping(regionName, connectionName, tableName,
pdxClass,
fieldMappings).isSuccessful()).isTrue();
alterRegionMappingCommand = new AlterMappingCommand();
@@ -80,7 +79,6 @@ public class AlterMappingCommandIntegrationTest {
assertThat(regionMapping.getConnectionConfigName()).isEqualTo("newConnection");
assertThat(regionMapping.getTableName()).isEqualTo("newTable");
assertThat(regionMapping.getPdxClassName()).isEqualTo("newPdxClass");
- assertThat(regionMapping.isPrimaryKeyInValue()).isFalse();
}
}
diff --git
a/geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandIntegrationTest.java
b/geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandIntegrationTest.java
index d47b6f4..cd3f2dd 100644
---
a/geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandIntegrationTest.java
+++
b/geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandIntegrationTest.java
@@ -45,7 +45,6 @@ public class CreateMappingCommandIntegrationTest {
private String connectionName;
private String tableName;
private String pdxClass;
- private boolean keyInValue;
private String[] fieldMappings;
@Before
@@ -54,7 +53,6 @@ public class CreateMappingCommandIntegrationTest {
connectionName = "connection";
tableName = "testTable";
pdxClass = "myPdxClass";
- keyInValue = true;
fieldMappings = new String[] {"field1:column1", "field2:column2"};
cache = (InternalCache) new CacheFactory().set("locators",
"").set("mcast-port", "0")
@@ -73,7 +71,7 @@ public class CreateMappingCommandIntegrationTest {
@Test
public void createsRegionMappingInService() {
ResultModel result = createRegionMappingCommand.createMapping(regionName,
connectionName,
- tableName, pdxClass, keyInValue, fieldMappings);
+ tableName, pdxClass, fieldMappings);
assertThat(result.getStatus()).isSameAs(Result.Status.OK);
@@ -85,7 +83,6 @@ public class CreateMappingCommandIntegrationTest {
assertThat(regionMapping.getConnectionConfigName()).isEqualTo(connectionName);
assertThat(regionMapping.getTableName()).isEqualTo(tableName);
assertThat(regionMapping.getPdxClassName()).isEqualTo(pdxClass);
- assertThat(regionMapping.isPrimaryKeyInValue()).isEqualTo(keyInValue);
assertThat(regionMapping.getColumnNameForField("field1",
mock(TableMetaDataView.class)))
.isEqualTo("column1");
assertThat(regionMapping.getColumnNameForField("field2",
mock(TableMetaDataView.class)))
@@ -98,7 +95,7 @@ public class CreateMappingCommandIntegrationTest {
ResultModel result;
result =
createRegionMappingCommand.createMapping(regionName, connectionName,
tableName, pdxClass,
- keyInValue, fieldMappings);
+ fieldMappings);
assertThat(result.getStatus()).isSameAs(Result.Status.OK);
IgnoredException ignoredException =
@@ -106,7 +103,7 @@ public class CreateMappingCommandIntegrationTest {
try {
result = createRegionMappingCommand.createMapping(regionName,
connectionName, tableName,
- pdxClass, keyInValue, fieldMappings);
+ pdxClass, fieldMappings);
} finally {
ignoredException.remove();
}
@@ -117,7 +114,7 @@ public class CreateMappingCommandIntegrationTest {
@Test
public void createsRegionMappingWithMinimumParams() {
ResultModel result = createRegionMappingCommand.createMapping(regionName,
connectionName, null,
- null, false, null);
+ null, null);
assertThat(result.getStatus()).isSameAs(Result.Status.OK);
@@ -129,7 +126,6 @@ public class CreateMappingCommandIntegrationTest {
assertThat(regionMapping.getConnectionConfigName()).isEqualTo(connectionName);
assertThat(regionMapping.getTableName()).isNull();
assertThat(regionMapping.getPdxClassName()).isNull();
- assertThat(regionMapping.isPrimaryKeyInValue()).isFalse();
assertThat(regionMapping.getFieldMapping()).isEmpty();
}
}
diff --git
a/geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandIntegrationTest.java
b/geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandIntegrationTest.java
index df08f1f..6f9896a 100644
---
a/geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandIntegrationTest.java
+++
b/geode-connectors/src/integrationTest/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandIntegrationTest.java
@@ -44,7 +44,7 @@ public class DestroyMappingCommandIntegrationTest {
regionName = "testRegion";
String[] params = new String[] {"param1:value1", "param2:value2"};
- mapping = new RegionMapping(regionName, null, null, null, null);
+ mapping = new RegionMapping(regionName, null, null, null);
cache = (InternalCache) new CacheFactory().set("locators",
"").set("mcast-port", "0")
.set(ENABLE_CLUSTER_CONFIGURATION, "true").create();
diff --git
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/SqlToPdxInstanceCreator.java
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/SqlToPdxInstanceCreator.java
index 126fdea..1f3ef78 100644
---
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/SqlToPdxInstanceCreator.java
+++
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/SqlToPdxInstanceCreator.java
@@ -55,12 +55,9 @@ class SqlToPdxInstanceCreator {
final int columnCount = metaData.getColumnCount();
for (int i = 1; i <= columnCount; i++) {
String columnName = metaData.getColumnName(i);
- if (regionMapping.isPrimaryKeyInValue()
- || !tableMetaData.getKeyColumnName().equals(columnName)) {
- String fieldName = regionMapping.getFieldNameForColumn(columnName,
typeRegistry);
- FieldType fieldType = getFieldType(typeRegistry, fieldName);
- writeField(columnName, i, fieldName, fieldType);
- }
+ String fieldName = regionMapping.getFieldNameForColumn(columnName,
typeRegistry);
+ FieldType fieldType = getFieldType(typeRegistry, fieldName);
+ writeField(columnName, i, fieldName, fieldType);
}
if (resultSet.next()) {
throw new JdbcConnectorException(
diff --git
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommand.java
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommand.java
index b095915..e3c425a 100644
---
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommand.java
+++
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommand.java
@@ -78,7 +78,7 @@ public class AlterMappingCommand extends SingleGfshCommand {
// input
Set<DistributedMember> targetMembers = getMembers(null, null);
RegionMapping newMapping = new RegionMapping(regionName,
- pdxClassName, table, connectionName, keyInValue);
+ pdxClassName, table, connectionName);
newMapping.setFieldMapping(fieldMappings);
// action
diff --git
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingFunction.java
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingFunction.java
index e0b182d..e555025 100644
---
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingFunction.java
+++
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingFunction.java
@@ -54,8 +54,6 @@ public class AlterMappingFunction extends
CliFunction<RegionMapping> {
String table = getValue(regionMapping.getTableName(),
existingMapping.getTableName());
String pdxClassName =
getValue(regionMapping.getPdxClassName(),
existingMapping.getPdxClassName());
- Boolean keyInValue = regionMapping.isPrimaryKeyInValue() == null
- ? existingMapping.isPrimaryKeyInValue() :
regionMapping.isPrimaryKeyInValue();
List<RegionMapping.FieldMapping> fieldMappings =
regionMapping.getFieldMapping();
@@ -63,7 +61,7 @@ public class AlterMappingFunction extends
CliFunction<RegionMapping> {
fieldMappings = existingMapping.getFieldMapping();
}
RegionMapping alteredMapping = new RegionMapping(
- existingMapping.getRegionName(), pdxClassName, table, connectionName,
keyInValue);
+ existingMapping.getRegionName(), pdxClassName, table, connectionName);
alteredMapping.getFieldMapping().addAll(fieldMappings);
return 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 e51893e..7ea6697 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,9 +48,6 @@ public class CreateMappingCommand extends SingleGfshCommand {
"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__VALUE_CONTAINS_PRIMARY_KEY =
"value-contains-primary-key";
- static final String CREATE_MAPPING__PRIMARY_KEY_IN_VALUE__HELP =
- "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 PDX field names to database column names formatted
like \"key:value(,key:value)*\".";
@@ -68,15 +65,12 @@ public class CreateMappingCommand extends SingleGfshCommand
{
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__VALUE_CONTAINS_PRIMARY_KEY,
- help = CREATE_MAPPING__PRIMARY_KEY_IN_VALUE__HELP,
unspecifiedDefaultValue = "false",
- specifiedDefaultValue = "true") boolean keyInValue,
@CliOption(key = CREATE_MAPPING__FIELD_MAPPING,
help = CREATE_MAPPING__FIELD_MAPPING__HELP) String[] fieldMappings) {
// input
Set<DistributedMember> targetMembers = getMembers(null, null);
RegionMapping mapping = new RegionMapping(regionName,
- pdxClassName, table, connectionName, keyInValue);
+ pdxClassName, table, connectionName);
mapping.setFieldMapping(fieldMappings);
// action
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 8905cbf..cc0e885 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
@@ -18,7 +18,6 @@ import static
org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand
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__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.CreateMappingCommand.CREATE_MAPPING__VALUE_CONTAINS_PRIMARY_KEY;
import java.util.Set;
@@ -87,7 +86,6 @@ public class DescribeMappingCommand extends GfshCommand {
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());
TabularResultModel tabularResultData =
resultModel.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/configuration/RegionMapping.java
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/configuration/RegionMapping.java
index bfd1280..e41be59 100644
---
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/configuration/RegionMapping.java
+++
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/configuration/RegionMapping.java
@@ -65,7 +65,6 @@ import org.apache.geode.pdx.internal.TypeRegistry;
* <attribute name="connection-name"
type="{http://www.w3.org/2001/XMLSchema}string"; />
* <attribute name="table"
type="{http://www.w3.org/2001/XMLSchema}string"; />
* <attribute name="pdx-class"
type="{http://www.w3.org/2001/XMLSchema}string"; />
- * <attribute name="primary-key-in-value"
type="{http://www.w3.org/2001/XMLSchema}string"; />
* </restriction>
* </complexContent>
* </complexType>
@@ -92,8 +91,6 @@ public class RegionMapping implements CacheElement {
protected String tableName;
@XmlAttribute(name = "pdx-class")
protected String pdxClassName;
- @XmlAttribute(name = "primary-key-in-value")
- protected Boolean primaryKeyInValue;
@XmlTransient
protected String regionName;
@@ -103,12 +100,11 @@ public class RegionMapping implements CacheElement {
public RegionMapping() {}
public RegionMapping(String regionName, String pdxClassName, String
tableName,
- String connectionConfigName, Boolean primaryKeyInValue) {
+ String connectionConfigName) {
this.regionName = regionName;
this.pdxClassName = pdxClassName;
this.tableName = tableName;
this.connectionConfigName = connectionConfigName;
- this.primaryKeyInValue = primaryKeyInValue;
}
public void setFieldMapping(String[] mappings) {
@@ -149,10 +145,6 @@ public class RegionMapping implements CacheElement {
this.pdxClassName = pdxClassName;
}
- public void setPrimaryKeyInValue(Boolean primaryKeyInValue) {
- this.primaryKeyInValue = primaryKeyInValue;
- }
-
public boolean isFieldMappingModified() {
return fieldMappingModified;
}
@@ -180,14 +172,6 @@ public class RegionMapping implements CacheElement {
return tableName;
}
- public Boolean getPrimaryKeyInValue() {
- return primaryKeyInValue;
- }
-
- public Boolean isPrimaryKeyInValue() {
- return primaryKeyInValue;
- }
-
public String getRegionToTableName() {
if (tableName == null) {
return regionName;
@@ -313,9 +297,6 @@ public class RegionMapping implements CacheElement {
RegionMapping that = (RegionMapping) o;
- if (primaryKeyInValue != that.primaryKeyInValue) {
- return false;
- }
if (regionName != null ? !regionName.equals(that.regionName) :
that.regionName != null) {
return false;
}
@@ -343,7 +324,6 @@ public class RegionMapping implements CacheElement {
result = 31 * result + (pdxClassName != null ? pdxClassName.hashCode() :
0);
result = 31 * result + (tableName != null ? tableName.hashCode() : 0);
result = 31 * result + (connectionConfigName != null ?
connectionConfigName.hashCode() : 0);
- result = 31 * result + (primaryKeyInValue ? 1 : 0);
return result;
}
@@ -351,7 +331,7 @@ public class RegionMapping implements CacheElement {
public String toString() {
return "RegionMapping{" + "regionName='" + regionName + '\'' + ",
pdxClassName='"
+ pdxClassName + '\'' + ", tableName='" + tableName + '\'' + ",
connectionConfigName='"
- + connectionConfigName + '\'' + ", primaryKeyInValue=" +
primaryKeyInValue + '}';
+ + connectionConfigName + '\'' + '}';
}
@Override
diff --git
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/xml/ElementType.java
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/xml/ElementType.java
index 9d262d9..2cef36c 100644
---
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/xml/ElementType.java
+++
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/xml/ElementType.java
@@ -37,8 +37,6 @@ public enum ElementType {
attributes.getValue(JdbcConnectorServiceXmlParser.CONNECTION_NAME));
mapping.setTableName(attributes.getValue(JdbcConnectorServiceXmlParser.TABLE));
mapping.setPdxClassName(attributes.getValue(JdbcConnectorServiceXmlParser.PDX_CLASS));
- mapping.setPrimaryKeyInValue(
-
Boolean.valueOf(attributes.getValue(JdbcConnectorServiceXmlParser.PRIMARY_KEY_IN_VALUE)));
stack.push(mapping);
}
diff --git
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlParser.java
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlParser.java
index dc379ac..f80476a 100644
---
a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlParser.java
+++
b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlParser.java
@@ -32,7 +32,6 @@ public class JdbcConnectorServiceXmlParser extends
AbstractXmlParser {
static final String PDX_CLASS = "pdx-class";
static final String FIELD_NAME = "field-name";
static final String COLUMN_NAME = "column-name";
- static final String PRIMARY_KEY_IN_VALUE = "primary-key-in-value";
@Override
public String getNamespaceUri() {
diff --git
a/geode-connectors/src/main/resources/META-INF/schemas/geode.apache.org/schema/jdbc/jdbc-1.0.xsd
b/geode-connectors/src/main/resources/META-INF/schemas/geode.apache.org/schema/jdbc/jdbc-1.0.xsd
index c48128d..10f4116 100644
---
a/geode-connectors/src/main/resources/META-INF/schemas/geode.apache.org/schema/jdbc/jdbc-1.0.xsd
+++
b/geode-connectors/src/main/resources/META-INF/schemas/geode.apache.org/schema/jdbc/jdbc-1.0.xsd
@@ -55,7 +55,6 @@ XML schema for JDBC Connector Service in Geode.
<xsd:attribute type="xsd:string" name="connection-name"
use="optional"/>
<xsd:attribute type="xsd:string" name="table" use="optional"/>
<xsd:attribute type="xsd:string" name="pdx-class"
use="optional"/>
- <xsd:attribute type="xsd:string" name="primary-key-in-value"
use="optional"/>
</xsd:complexType>
</xsd:element>
</xsd:schema>
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/RegionMappingTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/RegionMappingTest.java
index d231863..ec38620 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/RegionMappingTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/RegionMappingTest.java
@@ -57,7 +57,7 @@ public class RegionMappingTest {
@Test
public void emptyArrayFiledMapping() {
- mapping = new RegionMapping("region", "class", "table", "connection",
false);
+ mapping = new RegionMapping("region", "class", "table", "connection");
mapping.setFieldMapping(new String[0]);
assertThat(mapping.isFieldMappingModified()).isTrue();
assertThat(mapping.getFieldMapping()).isEmpty();
@@ -65,7 +65,7 @@ public class RegionMappingTest {
@Test
public void initiatedWithNullValues() {
- mapping = new RegionMapping(null, null, null, null, false);
+ mapping = new RegionMapping(null, null, null, null);
assertThat(mapping.getTableName()).isNull();
assertThat(mapping.getRegionName()).isNull();
@@ -80,7 +80,7 @@ public class RegionMappingTest {
@Test
public void hasCorrectTableName() {
- mapping = new RegionMapping(null, null, name, null, false);
+ mapping = new RegionMapping(null, null, name, null);
assertThat(mapping.getTableName()).isEqualTo(name);
assertThat(mapping.getRegionToTableName()).isEqualTo(name);
@@ -88,7 +88,7 @@ public class RegionMappingTest {
@Test
public void hasCorrectTableNameWhenRegionNameIsSet() {
- mapping = new RegionMapping("regionName", null, "tableName", null, false);
+ mapping = new RegionMapping("regionName", null, "tableName", null);
assertThat(mapping.getRegionName()).isEqualTo("regionName");
assertThat(mapping.getTableName()).isEqualTo("tableName");
@@ -97,7 +97,7 @@ public class RegionMappingTest {
@Test
public void hasCorrectRegionName() {
- mapping = new RegionMapping(name, null, null, null, false);
+ mapping = new RegionMapping(name, null, null, null);
assertThat(mapping.getRegionName()).isEqualTo(name);
assertThat(mapping.getRegionToTableName()).isEqualTo(name);
@@ -105,28 +105,21 @@ public class RegionMappingTest {
@Test
public void hasCorrectConfigName() {
- mapping = new RegionMapping(null, null, null, name, false);
+ mapping = new RegionMapping(null, null, null, name);
assertThat(mapping.getConnectionConfigName()).isEqualTo(name);
}
@Test
public void hasCorrectPdxClassName() {
- mapping = new RegionMapping(null, name, null, null, false);
+ mapping = new RegionMapping(null, name, null, null);
assertThat(mapping.getPdxClassName()).isEqualTo(name);
}
@Test
- public void primaryKeyInValueSetCorrectly() {
- mapping = new RegionMapping(null, null, null, null, true);
-
- assertThat(mapping.isPrimaryKeyInValue()).isTrue();
- }
-
- @Test
public void returnsColumnNameIfFieldNotMapped() {
- mapping = new RegionMapping(null, null, null, null, true);
+ mapping = new RegionMapping(null, null, null, null);
mapping.setFieldMapping(new String[] {"otherField:column"});
String columnName = mapping.getColumnNameForField(fieldName1,
mock(TableMetaDataView.class));
@@ -137,7 +130,7 @@ public class RegionMappingTest {
@Test
public void
returnsColumnNameFromTableMetaDataIfFieldNotMappedAndMetaDataMatchesWithCaseDiffering()
{
String metaDataColumnName = fieldName1.toUpperCase();
- mapping = new RegionMapping(null, null, null, null, true);
+ mapping = new RegionMapping(null, null, null, null);
mapping.setFieldMapping(new String[] {"otherField:column"});
TableMetaDataView tableMetaDataView = mock(TableMetaDataView.class);
when(tableMetaDataView.getColumnNames()).thenReturn(Collections.singleton(metaDataColumnName));
@@ -149,7 +142,7 @@ public class RegionMappingTest {
@Test
public void
returnsColumnNameFromTableMetaDataIfFieldNotMappedAndMetaDataMatchesExactly() {
String metaDataColumnName = fieldName1;
- mapping = new RegionMapping(null, null, null, null, true);
+ mapping = new RegionMapping(null, null, null, null);
mapping.setFieldMapping(new String[] {"otherField:column"});
TableMetaDataView tableMetaDataView = mock(TableMetaDataView.class);
when(tableMetaDataView.getColumnNames()).thenReturn(Collections.singleton(metaDataColumnName));
@@ -160,7 +153,7 @@ public class RegionMappingTest {
@Test
public void returnsColumnNameIfFieldNotMappedAndNotInMetaData() {
- mapping = new RegionMapping(null, null, null, null, true);
+ mapping = new RegionMapping(null, null, null, null);
mapping.setFieldMapping(new String[] {"otherField:column"});
TableMetaDataView tableMetaDataView = mock(TableMetaDataView.class);
when(tableMetaDataView.getColumnNames()).thenReturn(Collections.singleton("does
not match"));
@@ -170,7 +163,7 @@ public class RegionMappingTest {
@Test
public void getColumnNameForFieldThrowsIfTwoColumnsMatchField() {
- mapping = new RegionMapping(null, null, null, null, true);
+ mapping = new RegionMapping(null, null, null, null);
mapping.setFieldMapping(new String[] {"otherField:column"});
TableMetaDataView tableMetaDataView = mock(TableMetaDataView.class);
@@ -187,7 +180,7 @@ public class RegionMappingTest {
@Test
public void ifMixedCaseColumnNameNotMappedReturnsItAsFieldName() {
- mapping = new RegionMapping(null, null, null, null, true);
+ mapping = new RegionMapping(null, null, null, null);
mapping.setFieldMapping(new String[] {"otherField:column"});
assertThat(mapping.getFieldNameForColumn("columnName",
null)).isEqualTo("columnName");
@@ -195,7 +188,7 @@ public class RegionMappingTest {
@Test
public void ifLowerCaseColumnNameNotMappedReturnsItAsFieldName() {
- mapping = new RegionMapping(null, null, null, null, true);
+ mapping = new RegionMapping(null, null, null, null);
mapping.setFieldMapping(new String[] {"otherField:column"});
assertThat(mapping.getFieldNameForColumn("columnname",
null)).isEqualTo("columnname");
@@ -203,7 +196,7 @@ public class RegionMappingTest {
@Test
public void ifUpperCaseColumnNameNotMappedReturnsItLowerCasedAsFieldName() {
- mapping = new RegionMapping(null, null, null, null, true);
+ mapping = new RegionMapping(null, null, null, null);
mapping.setFieldMapping(new String[] {"otherField:column"});
assertThat(mapping.getFieldNameForColumn("COLUMNNAME",
null)).isEqualTo("columnname");
@@ -212,7 +205,7 @@ public class RegionMappingTest {
@Test
public void throwsIfColumnNotMappedAndPdxClassNameDoesNotExist() {
- mapping = new RegionMapping(null, "pdxClassName", null, null, true);
+ mapping = new RegionMapping(null, "pdxClassName", null, null);
TypeRegistry typeRegistry = mock(TypeRegistry.class);
when(typeRegistry.getPdxTypesForClassName("pdxClassName")).thenReturn(Collections.emptySet());
expectedException.expect(JdbcConnectorException.class);
@@ -225,7 +218,7 @@ public class RegionMappingTest {
public void
throwsIfColumnNotMappedAndPdxClassNameDoesExistButHasNoMatchingFields() {
String pdxClassName = "pdxClassName";
String columnName = "columnName";
- mapping = new RegionMapping(null, pdxClassName, null, null, true);
+ mapping = new RegionMapping(null, pdxClassName, null, null);
TypeRegistry typeRegistry = mock(TypeRegistry.class);
HashSet<PdxType> pdxTypes = new
HashSet<>(Arrays.asList(mock(PdxType.class)));
when(typeRegistry.getPdxTypesForClassName(pdxClassName)).thenReturn(pdxTypes);
@@ -240,7 +233,7 @@ public class RegionMappingTest {
public void
throwsIfColumnNotMappedAndPdxClassNameDoesExistButHasMoreThanOneMatchingFields()
{
String pdxClassName = "pdxClassName";
String columnName = "columnName";
- mapping = new RegionMapping(null, pdxClassName, null, null, true);
+ mapping = new RegionMapping(null, pdxClassName, null, null);
TypeRegistry typeRegistry = mock(TypeRegistry.class);
PdxType pdxType = mock(PdxType.class);
when(pdxType.getFieldNames())
@@ -258,7 +251,7 @@ public class RegionMappingTest {
public void
returnsIfColumnNotMappedAndPdxClassNameDoesExistAndHasOneFieldThatInexactlyMatches()
{
String pdxClassName = "pdxClassName";
String columnName = "columnName";
- mapping = new RegionMapping(null, pdxClassName, null, null, true);
+ mapping = new RegionMapping(null, pdxClassName, null, null);
TypeRegistry typeRegistry = mock(TypeRegistry.class);
PdxType pdxType = mock(PdxType.class);
when(pdxType.getFieldNames())
@@ -274,7 +267,7 @@ public class RegionMappingTest {
public void
returnsIfColumnNotMappedAndPdxClassNameDoesExistAndHasOneFieldThatExactlyMatches()
{
String pdxClassName = "pdxClassName";
String columnName = "columnName";
- mapping = new RegionMapping(null, pdxClassName, null, null, true);
+ mapping = new RegionMapping(null, pdxClassName, null, null);
TypeRegistry typeRegistry = mock(TypeRegistry.class);
PdxType pdxType = mock(PdxType.class);
when(pdxType.getPdxField(columnName)).thenReturn(mock(PdxField.class));
@@ -286,7 +279,7 @@ public class RegionMappingTest {
@Test
public void returnsMappedColumnNameForField() {
- mapping = new RegionMapping(null, null, null, null, true);
+ mapping = new RegionMapping(null, null, null, null);
mapping.setFieldMapping(new String[] {fieldName1 + ":" + columnName1});
assertThat(mapping.getColumnNameForField(fieldName1,
mock(TableMetaDataView.class)))
@@ -295,7 +288,7 @@ public class RegionMappingTest {
@Test
public void returnsMappedColumnNameForFieldEvenIfMetaDataMatches() {
- mapping = new RegionMapping(null, null, null, null, true);
+ mapping = new RegionMapping(null, null, null, null);
mapping.setFieldMapping(new String[] {fieldName1 + ":" + columnName1});
TableMetaDataView tableMetaDataView = mock(TableMetaDataView.class);
@@ -306,7 +299,7 @@ public class RegionMappingTest {
@Test
public void returnsMappedFieldNameForColumn() {
- mapping = new RegionMapping(null, null, null, null, true);
+ mapping = new RegionMapping(null, null, null, null);
mapping.setFieldMapping(new String[] {fieldName1 + ":" + columnName1});
assertThat(mapping.getFieldNameForColumn(columnName1,
null)).isEqualTo(fieldName1);
@@ -314,7 +307,7 @@ public class RegionMappingTest {
@Test
public void returnsCachedFieldNameForColumn() {
- mapping = new RegionMapping(null, null, null, null, true);
+ mapping = new RegionMapping(null, null, null, null);
mapping.setFieldMapping(new String[] {fieldName1 + ":" + columnName1});
TableMetaDataView tableMetaDataView = mock(TableMetaDataView.class);
@@ -326,7 +319,7 @@ public class RegionMappingTest {
@Test
public void returnsCachedColumnNameForField() {
- mapping = new RegionMapping(null, null, null, null, true);
+ mapping = new RegionMapping(null, null, null, null);
mapping.setFieldMapping(new String[] {fieldName1 + ":" + columnName1});
mapping.getFieldNameForColumn(columnName1, null);
@@ -338,7 +331,7 @@ public class RegionMappingTest {
@Test
public void returnsAllMappings() {
- mapping = new RegionMapping(null, null, null, null, true);
+ mapping = new RegionMapping(null, null, null, null);
mapping.setFieldMapping(
new String[] {fieldName1 + ":" + columnName1, fieldName2 + ":" +
columnName2});
@@ -352,12 +345,12 @@ public class RegionMappingTest {
@Test
public void verifyTwoNonDefaultInstancesAreEqual() {
RegionMapping rm1 = new RegionMapping("regionName",
- "pdxClassName", "tableName", "connectionName", true);
+ "pdxClassName", "tableName", "connectionName");
rm1.setFieldMapping(
new String[] {fieldName1 + ":" + columnName1, fieldName2 + ":" +
columnName2});
RegionMapping rm2 = new RegionMapping("regionName",
- "pdxClassName", "tableName", "connectionName", true);
+ "pdxClassName", "tableName", "connectionName");
rm2.setFieldMapping(
new String[] {fieldName1 + ":" + columnName1, fieldName2 + ":" +
columnName2});
@@ -367,9 +360,9 @@ public class RegionMappingTest {
@Test
public void verifyTwoDefaultInstancesAreEqual() {
RegionMapping rm1 =
- new RegionMapping("regionName", null, null, "connectionName", false);
+ new RegionMapping("regionName", null, null, "connectionName");
RegionMapping rm2 =
- new RegionMapping("regionName", null, null, "connectionName", false);
+ new RegionMapping("regionName", null, null, "connectionName");
assertThat(rm1).isEqualTo(rm2);
}
@@ -377,12 +370,12 @@ public class RegionMappingTest {
@Test
public void verifyTwoInstancesThatAreEqualHaveSameHashCode() {
RegionMapping rm1 = new RegionMapping("regionName",
- "pdxClassName", "tableName", "connectionName", true);
+ "pdxClassName", "tableName", "connectionName");
rm1.setFieldMapping(
new String[] {fieldName1 + ":" + columnName1, fieldName2 + ":" +
columnName2});
RegionMapping rm2 = new RegionMapping("regionName",
- "pdxClassName", "tableName", "connectionName", true);
+ "pdxClassName", "tableName", "connectionName");
rm1.setFieldMapping(
new String[] {fieldName1 + ":" + columnName1, fieldName2 + ":" +
columnName2});
@@ -391,7 +384,7 @@ public class RegionMappingTest {
@Test
public void verifyThatMappingIsEqualToItself() {
- mapping = new RegionMapping(null, null, null, null, false);
+ mapping = new RegionMapping(null, null, null, null);
boolean result = mapping.equals(mapping);
assertThat(mapping.hashCode()).isEqualTo(mapping.hashCode());
assertThat(result).isTrue();
@@ -399,14 +392,14 @@ public class RegionMappingTest {
@Test
public void verifyThatNullIsNotEqual() {
- mapping = new RegionMapping(null, null, null, null, false);
+ mapping = new RegionMapping(null, null, null, null);
boolean result = mapping.equals(null);
assertThat(result).isFalse();
}
@Test
public void verifyOtherClassIsNotEqual() {
- mapping = new RegionMapping(null, null, null, null, false);
+ mapping = new RegionMapping(null, null, null, null);
boolean result = mapping.equals("not equal");
assertThat(result).isFalse();
}
@@ -414,9 +407,9 @@ public class RegionMappingTest {
@Test
public void verifyMappingWithDifferentRegionNamesAreNotEqual() {
RegionMapping rm1 =
- new RegionMapping(null, null, null, null, false);
+ new RegionMapping(null, null, null, null);
RegionMapping rm2 =
- new RegionMapping("name", null, null, null, false);
+ new RegionMapping("name", null, null, null);
boolean result = rm1.equals(rm2);
assertThat(result).isFalse();
}
@@ -424,9 +417,9 @@ public class RegionMappingTest {
@Test
public void verifyMappingWithDifferentPdxClassNameAreNotEqual() {
RegionMapping rm1 =
- new RegionMapping(null, null, null, null, false);
+ new RegionMapping(null, null, null, null);
RegionMapping rm2 =
- new RegionMapping(null, "pdxClass", null, null, false);
+ new RegionMapping(null, "pdxClass", null, null);
boolean result = rm1.equals(rm2);
assertThat(result).isFalse();
}
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlToPdxInstanceCreatorTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlToPdxInstanceCreatorTest.java
index 7dd372e..51b7b84 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlToPdxInstanceCreatorTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlToPdxInstanceCreatorTest.java
@@ -20,7 +20,6 @@ import static org.mockito.ArgumentMatchers.anyBoolean;
import static org.mockito.ArgumentMatchers.anyString;
import static org.mockito.ArgumentMatchers.eq;
import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.times;
import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.verifyNoMoreInteractions;
import static org.mockito.Mockito.when;
@@ -111,33 +110,11 @@ public class SqlToPdxInstanceCreatorTest {
}
@Test
- public void readResultOmitsKeyColumnIfNotInValue() throws Exception {
+ public void readResultIncludesKeyColumnInPdxValue() throws Exception {
setupResultSetForTwoObjectColumns(resultSet);
when(resultSet.next()).thenReturn(true).thenReturn(false);
PdxInstanceFactory factory = mock(PdxInstanceFactory.class);
when(cache.createPdxInstanceFactory(anyString(),
anyBoolean())).thenReturn(factory);
- when(regionMapping.isPrimaryKeyInValue()).thenReturn(false);
- when(regionMapping.getFieldNameForColumn(eq(COLUMN_NAME_1), any()))
- .thenReturn(PDX_FIELD_NAME_1);
- when(regionMapping.getFieldNameForColumn(eq(COLUMN_NAME_2), any()))
- .thenReturn(PDX_FIELD_NAME_2);
- tableMetaDataView = mock(TableMetaDataView.class);
- when(tableMetaDataView.getKeyColumnName()).thenReturn(COLUMN_NAME_1);
-
- createPdxInstance();
-
- verify(factory).writeObject(PDX_FIELD_NAME_2, COLUMN_VALUE_2);
- verify(factory, times(1)).writeObject(any(), any());
- verify(factory).create();
- }
-
- @Test
- public void readResultIncludesKeyColumnIfPrimaryKeyInValue() throws
Exception {
- setupResultSetForTwoObjectColumns(resultSet);
- when(resultSet.next()).thenReturn(true).thenReturn(false);
- PdxInstanceFactory factory = mock(PdxInstanceFactory.class);
- when(cache.createPdxInstanceFactory(anyString(),
anyBoolean())).thenReturn(factory);
- when(regionMapping.isPrimaryKeyInValue()).thenReturn(true);
when(regionMapping.getFieldNameForColumn(eq(COLUMN_NAME_1), any()))
.thenReturn(PDX_FIELD_NAME_1);
when(regionMapping.getFieldNameForColumn(eq(COLUMN_NAME_2), any()))
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingFunctionTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingFunctionTest.java
index 7b94ad7..fb7a158 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingFunctionTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingFunctionTest.java
@@ -65,10 +65,10 @@ public class AlterMappingFunctionTest {
DistributedMember distributedMember = mock(DistributedMember.class);
service = mock(JdbcConnectorService.class);
- regionMapping = new RegionMapping(REGION_NAME, null, null, null, null);
- existingMapping = new RegionMapping(REGION_NAME, null, null, null, null);
+ regionMapping = new RegionMapping(REGION_NAME, null, null, null);
+ existingMapping = new RegionMapping(REGION_NAME, null, null, null);
mappingToAlter =
- new RegionMapping(REGION_NAME, "pdxClass", "myTable", "connection",
true);
+ new RegionMapping(REGION_NAME, "pdxClass", "myTable", "connection");
mappingToAlter.setFieldMapping(new String[] {"field1:column1",
"field2:column2"});
when(context.getResultSender()).thenReturn(resultSender);
@@ -138,7 +138,7 @@ public class AlterMappingFunctionTest {
@Test
public void alterMappingPdxClassName() {
RegionMapping newConfigValues =
- new RegionMapping(REGION_NAME, "newClassName", null, null, null);
+ new RegionMapping(REGION_NAME, "newClassName", null, null);
RegionMapping alteredConfig =
function.alterRegionMapping(newConfigValues, mappingToAlter);
@@ -147,7 +147,6 @@ public class AlterMappingFunctionTest {
assertThat(alteredConfig.getPdxClassName()).isEqualTo("newClassName");
assertThat(alteredConfig.getTableName()).isEqualTo("myTable");
assertThat(alteredConfig.getConnectionConfigName()).isEqualTo("connection");
- assertThat(alteredConfig.isPrimaryKeyInValue()).isTrue();
assertFieldMapping(alteredConfig);
}
@@ -165,7 +164,7 @@ public class AlterMappingFunctionTest {
@Test
public void alterRegionMappingTable() {
RegionMapping newConfigValues =
- new RegionMapping(REGION_NAME, null, "newTable", null, null);
+ new RegionMapping(REGION_NAME, null, "newTable", null);
RegionMapping alteredConfig =
function.alterRegionMapping(newConfigValues, mappingToAlter);
@@ -174,14 +173,13 @@ public class AlterMappingFunctionTest {
assertThat(alteredConfig.getPdxClassName()).isEqualTo("pdxClass");
assertThat(alteredConfig.getTableName()).isEqualTo("newTable");
assertThat(alteredConfig.getConnectionConfigName()).isEqualTo("connection");
- assertThat(alteredConfig.isPrimaryKeyInValue()).isTrue();
assertFieldMapping(alteredConfig);
}
@Test
public void alterRegionMappingPrimaryKeyInValue() {
RegionMapping newConfigValues =
- new RegionMapping(REGION_NAME, null, null, null, false);
+ new RegionMapping(REGION_NAME, null, null, null);
RegionMapping alteredConfig =
function.alterRegionMapping(newConfigValues, mappingToAlter);
@@ -190,14 +188,13 @@ public class AlterMappingFunctionTest {
assertThat(alteredConfig.getPdxClassName()).isEqualTo("pdxClass");
assertThat(alteredConfig.getTableName()).isEqualTo("myTable");
assertThat(alteredConfig.getConnectionConfigName()).isEqualTo("connection");
- assertThat(alteredConfig.isPrimaryKeyInValue()).isFalse();
assertFieldMapping(alteredConfig);
}
@Test
public void alterRegionMappingConnectionName() {
RegionMapping newConfigValues =
- new RegionMapping(REGION_NAME, null, null, "newConnection", null);
+ new RegionMapping(REGION_NAME, null, null, "newConnection");
RegionMapping alteredConfig =
function.alterRegionMapping(newConfigValues, mappingToAlter);
@@ -206,14 +203,13 @@ public class AlterMappingFunctionTest {
assertThat(alteredConfig.getPdxClassName()).isEqualTo("pdxClass");
assertThat(alteredConfig.getTableName()).isEqualTo("myTable");
assertThat(alteredConfig.getConnectionConfigName()).isEqualTo("newConnection");
- assertThat(alteredConfig.isPrimaryKeyInValue()).isTrue();
assertFieldMapping(alteredConfig);
}
@Test
public void alterRegionMappingFieldMappings() {
RegionMapping newConfigValues =
- new RegionMapping(REGION_NAME, null, null, null, null);
+ new RegionMapping(REGION_NAME, null, null, null);
newConfigValues.setFieldMapping(new String[] {"field5:column5",
"field6:column6"});
@@ -224,7 +220,6 @@ public class AlterMappingFunctionTest {
assertThat(alteredConfig.getPdxClassName()).isEqualTo("pdxClass");
assertThat(alteredConfig.getTableName()).isEqualTo("myTable");
assertThat(alteredConfig.getConnectionConfigName()).isEqualTo("connection");
- assertThat(alteredConfig.isPrimaryKeyInValue()).isTrue();
List<RegionMapping.FieldMapping> fieldMappings =
alteredConfig.getFieldMapping();
assertThat(fieldMappings).hasSize(2);
@@ -237,7 +232,7 @@ public class AlterMappingFunctionTest {
@Test
public void alterRegionMappingRemoveFieldMappings() {
RegionMapping newConfigValues =
- new RegionMapping(REGION_NAME, null, null, null, null);
+ new RegionMapping(REGION_NAME, null, null, null);
newConfigValues.setFieldMapping(new String[0]);
RegionMapping alteredConfig =
function.alterRegionMapping(newConfigValues, mappingToAlter);
@@ -246,7 +241,6 @@ public class AlterMappingFunctionTest {
assertThat(alteredConfig.getPdxClassName()).isEqualTo("pdxClass");
assertThat(alteredConfig.getTableName()).isEqualTo("myTable");
assertThat(alteredConfig.getConnectionConfigName()).isEqualTo("connection");
- assertThat(alteredConfig.isPrimaryKeyInValue()).isTrue();
List<RegionMapping.FieldMapping> fieldMappings =
alteredConfig.getFieldMapping();
assertThat(fieldMappings).hasSize(0);
@@ -255,7 +249,7 @@ public class AlterMappingFunctionTest {
@Test
public void alterRegionMappingWithEmptyString() {
RegionMapping newConfigValues =
- new RegionMapping(REGION_NAME, null, null, null, null);
+ new RegionMapping(REGION_NAME, null, null, null);
newConfigValues.setFieldMapping(new String[] {""});
RegionMapping alteredConfig =
function.alterRegionMapping(newConfigValues, mappingToAlter);
@@ -264,7 +258,6 @@ public class AlterMappingFunctionTest {
assertThat(alteredConfig.getPdxClassName()).isEqualTo("pdxClass");
assertThat(alteredConfig.getTableName()).isEqualTo("myTable");
assertThat(alteredConfig.getConnectionConfigName()).isEqualTo("connection");
- assertThat(alteredConfig.isPrimaryKeyInValue()).isTrue();
List<RegionMapping.FieldMapping> fieldMappings =
alteredConfig.getFieldMapping();
assertThat(fieldMappings).hasSize(0);
@@ -273,7 +266,7 @@ public class AlterMappingFunctionTest {
@Test
public void alterRegionMappingWithNothingToAlter() {
RegionMapping newConfigValues =
- new RegionMapping(REGION_NAME, null, null, null, null);
+ new RegionMapping(REGION_NAME, null, null, null);
RegionMapping alteredConfig =
function.alterRegionMapping(newConfigValues, mappingToAlter);
@@ -282,7 +275,6 @@ public class AlterMappingFunctionTest {
assertThat(alteredConfig.getPdxClassName()).isEqualTo("pdxClass");
assertThat(alteredConfig.getTableName()).isEqualTo("myTable");
assertThat(alteredConfig.getConnectionConfigName()).isEqualTo("connection");
- assertThat(alteredConfig.isPrimaryKeyInValue()).isTrue();
assertFieldMapping(alteredConfig);
}
}
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingFunctionTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingFunctionTest.java
index 5250419..eac2343 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingFunctionTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingFunctionTest.java
@@ -66,7 +66,7 @@ public class CreateMappingFunctionTest {
distributedMember = mock(DistributedMember.class);
service = mock(JdbcConnectorService.class);
- regionMapping = new RegionMapping(REGION_NAME, null, null, null, null);
+ regionMapping = new RegionMapping(REGION_NAME, null, null, null);
when(context.getResultSender()).thenReturn(resultSender);
when(context.getCache()).thenReturn(cache);
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandTest.java
index aa94d2e..c8695b4 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandTest.java
@@ -66,7 +66,7 @@ public class DescribeMappingCommandTest {
null);
RegionMapping mapping =
- new RegionMapping("region", "class1", "table1", "name1", true);
+ new RegionMapping("region", "class1", "table1", "name1");
mapping.getFieldMapping()
.add(new RegionMapping.FieldMapping("field1", "value1"));
mapping.getFieldMapping()
@@ -80,7 +80,7 @@ public class DescribeMappingCommandTest {
gfsh.executeAndAssertThat(command,
COMMAND).statusIsSuccess().containsOutput("region", "region")
.containsOutput("connection", "name1").containsOutput("table",
"table1")
.containsOutput("pdx-class-name", "class1")
- .containsOutput("value-contains-primary-key",
"true").containsOutput("field1", "value1")
+ .containsOutput("field1", "value1")
.containsOutput("field2", "value2");
}
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 678d4d3..3097a7a 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
@@ -62,14 +62,14 @@ public class ListMappingCommandTest {
null);
RegionMapping mapping1 =
- new RegionMapping("region1", "class1", "table1", "name1", true);
+ new RegionMapping("region1", "class1", "table1", "name1");
mapping1.getFieldMapping()
.add(new RegionMapping.FieldMapping("field1", "value1"));
mapping1.getFieldMapping()
.add(new RegionMapping.FieldMapping("field2", "value2"));
RegionMapping mapping2 =
- new RegionMapping("region2", "class2", "table2", "name2", true);
+ new RegionMapping("region2", "class2", "table2", "name2");
mapping2.getFieldMapping()
.add(new RegionMapping.FieldMapping("field3", "value3"));
mapping2.getFieldMapping()
diff --git
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/ElementTypeTest.java
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/ElementTypeTest.java
index 49a53b3..c372582 100644
---
a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/ElementTypeTest.java
+++
b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/ElementTypeTest.java
@@ -21,7 +21,6 @@ import static
org.apache.geode.connectors.jdbc.internal.xml.JdbcConnectorService
import static
org.apache.geode.connectors.jdbc.internal.xml.JdbcConnectorServiceXmlParser.CONNECTION_NAME;
import static
org.apache.geode.connectors.jdbc.internal.xml.JdbcConnectorServiceXmlParser.FIELD_NAME;
import static
org.apache.geode.connectors.jdbc.internal.xml.JdbcConnectorServiceXmlParser.PDX_CLASS;
-import static
org.apache.geode.connectors.jdbc.internal.xml.JdbcConnectorServiceXmlParser.PRIMARY_KEY_IN_VALUE;
import static
org.apache.geode.connectors.jdbc.internal.xml.JdbcConnectorServiceXmlParser.TABLE;
import static org.assertj.core.api.Assertions.assertThat;
import static org.assertj.core.api.Assertions.assertThatThrownBy;
@@ -79,7 +78,6 @@ public class ElementTypeTest {
when(attributes.getValue(CONNECTION_NAME)).thenReturn("connectionName");
when(attributes.getValue(TABLE)).thenReturn("table");
when(attributes.getValue(PDX_CLASS)).thenReturn("pdxClass");
- when(attributes.getValue(PRIMARY_KEY_IN_VALUE)).thenReturn("true");
when(regionCreation.getFullPath()).thenReturn("/region");
stack.push(regionCreation);
@@ -90,7 +88,6 @@ public class ElementTypeTest {
assertThat(regionMapping.getConnectionConfigName()).isEqualTo("connectionName");
assertThat(regionMapping.getTableName()).isEqualTo("table");
assertThat(regionMapping.getPdxClassName()).isEqualTo("pdxClass");
- assertThat(regionMapping.isPrimaryKeyInValue()).isEqualTo(true);
}
@Test
