You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by ds...@apache.org on 2018/11/02 00:51:55 UTC
[geode] 01/01: removed field-mapping from jdbc:mapping
This is an automated email from the ASF dual-hosted git repository.
dschneider pushed a commit to branch feature/GEODE-5970
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 08349b682073c9559fee0f63d2b67d9847b319a2
Author: Darrel Schneider <ds...@pivotal.io>
AuthorDate: Thu Nov 1 17:50:49 2018 -0700
removed field-mapping from jdbc:mapping
---
.../internal/cli/AlterMappingCommandDUnitTest.java | 11 --
.../cli/CreateMappingCommandDUnitTest.java | 22 +--
.../cli/DescribeMappingCommandDUnitTest.java | 2 -
.../cli/DestroyMappingCommandDunitTest.java | 2 -
.../cli/JdbcClusterConfigDistributedTest.java | 2 +-
.../internal/cli/ListMappingCommandDUnitTest.java | 3 +-
.../cli/AlterMappingCommandIntegrationTest.java | 5 +-
.../cli/CreateMappingCommandIntegrationTest.java | 11 +-
.../apache/geode/codeAnalysis/excludedClasses.txt | 1 -
.../jdbc/internal/cli/AlterMappingCommand.java | 1 -
.../jdbc/internal/cli/AlterMappingFunction.java | 7 -
.../jdbc/internal/cli/CreateMappingCommand.java | 8 +-
.../jdbc/internal/cli/DescribeMappingCommand.java | 11 --
.../jdbc/internal/configuration/RegionMapping.java | 152 +--------------------
.../connectors/jdbc/internal/xml/ElementType.java | 17 ---
.../geode.apache.org/schema/jdbc/jdbc-1.0.xsd | 12 --
.../jdbc/internal/RegionMappingTest.java | 53 -------
.../internal/cli/AlterMappingFunctionTest.java | 63 ---------
.../internal/cli/DescribeMappingCommandTest.java | 4 -
.../jdbc/internal/cli/ListMappingCommandTest.java | 9 --
.../jdbc/internal/xml/ElementTypeTest.java | 40 ------
21 files changed, 12 insertions(+), 424 deletions(-)
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..5723724 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
@@ -23,15 +23,12 @@ import static org.apache.geode.connectors.jdbc.internal.cli.AlterMappingCommand.
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__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;
-
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -78,7 +75,6 @@ public class AlterMappingCommandDUnitTest {
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();
}
@@ -109,12 +105,6 @@ public class AlterMappingCommandDUnitTest {
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");
- assertThat(fieldMappings.get(0).getColumnName()).isEqualTo("column3");
- assertThat(fieldMappings.get(1).getFieldName()).isEqualTo("field4");
- assertThat(fieldMappings.get(1).getColumnName()).isEqualTo("column4");
});
}
@@ -141,7 +131,6 @@ public class AlterMappingCommandDUnitTest {
assertThat(mapping.getConnectionConfigName()).isEqualTo("connection");
assertThat(mapping.getTableName()).isNull();
assertThat(mapping.getPdxClassName()).isNull();
- assertThat(mapping.getFieldMapping()).isEmpty();
});
}
}
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..8814489 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
@@ -16,15 +16,12 @@ package org.apache.geode.connectors.jdbc.internal.cli;
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__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;
-
import org.junit.Before;
import org.junit.Rule;
import org.junit.Test;
@@ -80,14 +77,13 @@ public class CreateMappingCommandDUnitTest {
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();
locator.invoke(() -> {
String xml = InternalLocator.getLocator().getConfigurationPersistenceService()
.getConfiguration("cluster").getCacheXmlContent();
- assertThat(xml).isNotNull().contains("jdbc:mapping").contains("jdbc:field-mapping");
+ assertThat(xml).isNotNull().contains("jdbc:mapping");
});
server.invoke(() -> {
@@ -98,12 +94,6 @@ public class CreateMappingCommandDUnitTest {
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");
});
}
@@ -114,7 +104,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__FIELD_MAPPING, "field1:column1,field2:column2");
gfsh.executeAndAssertThat(csb.toString()).statusIsSuccess();
@@ -138,17 +127,11 @@ public class CreateMappingCommandDUnitTest {
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");
- assertThat(fieldMappings.get(0).getColumnName()).isEqualTo("column1");
- assertThat(fieldMappings.get(1).getFieldName()).isEqualTo("field2");
- assertThat(fieldMappings.get(1).getColumnName()).isEqualTo("column2");
});
}
@Test
- public void createsRegionMappingWithoutFieldMap() {
+ public void createsRegionMappingUpdatesClusterConfig() {
CommandStringBuilder csb = new CommandStringBuilder(CREATE_MAPPING);
csb.addOption(CREATE_MAPPING__REGION_NAME, REGION_NAME);
csb.addOption(CREATE_MAPPING__CONNECTION_NAME, "connection");
@@ -162,7 +145,6 @@ public class CreateMappingCommandDUnitTest {
String xml = InternalLocator.getLocator().getConfigurationPersistenceService()
.getConfiguration("cluster").getCacheXmlContent();
assertThat(xml).isNotNull().contains("jdbc:mapping");
- assertThat(xml).isNotNull().doesNotContain("jdbc:field-mapping");
});
}
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..d99225e 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
@@ -16,7 +16,6 @@ package org.apache.geode.connectors.jdbc.internal.cli;
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__REGION_NAME;
import static org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand.CREATE_MAPPING__TABLE_NAME;
@@ -76,7 +75,6 @@ public class DescribeMappingCommandDUnitTest implements Serializable {
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();
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..883ad23 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
@@ -16,7 +16,6 @@ package org.apache.geode.connectors.jdbc.internal.cli;
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__REGION_NAME;
import static org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand.CREATE_MAPPING__TABLE_NAME;
@@ -77,7 +76,6 @@ public class DestroyMappingCommandDunitTest implements Serializable {
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..5ba21eb 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 --value-contains-primary-key")
.statusIsSuccess();
server.invoke(() -> {
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..193d780 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,8 +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 "
- + "--field-mapping=field1:column1,field2:column2";
+ + "--table=myTable --pdx-class-name=myPdxClass --value-contains-primary-key=true";
gfsh.executeAndAssertThat(mapping).statusIsSuccess();
CommandStringBuilder csb = new CommandStringBuilder(LIST_MAPPING);
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..4c31dfb 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
@@ -46,15 +46,14 @@ public class AlterMappingCommandIntegrationTest {
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")
.set(ENABLE_CLUSTER_CONFIGURATION, "true").create();
cache.createRegionFactory(RegionShortcut.LOCAL).create(regionName);
CreateMappingCommand create = new CreateMappingCommand();
create.setCache(cache);
- assertThat(create.createMapping(regionName, connectionName, tableName, pdxClass, keyInValue,
- fieldMappings).isSuccessful()).isTrue();
+ assertThat(create.createMapping(regionName, connectionName, tableName, pdxClass, keyInValue)
+ .isSuccessful()).isTrue();
alterRegionMappingCommand = new AlterMappingCommand();
alterRegionMappingCommand.setCache(cache);
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..34c4242 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
@@ -46,7 +46,6 @@ public class CreateMappingCommandIntegrationTest {
private String tableName;
private String pdxClass;
private boolean keyInValue;
- private String[] fieldMappings;
@Before
public void setup() {
@@ -55,7 +54,6 @@ public class CreateMappingCommandIntegrationTest {
tableName = "testTable";
pdxClass = "myPdxClass";
keyInValue = true;
- fieldMappings = new String[] {"field1:column1", "field2:column2"};
cache = (InternalCache) new CacheFactory().set("locators", "").set("mcast-port", "0")
.set(ENABLE_CLUSTER_CONFIGURATION, "true").create();
@@ -73,7 +71,7 @@ public class CreateMappingCommandIntegrationTest {
@Test
public void createsRegionMappingInService() {
ResultModel result = createRegionMappingCommand.createMapping(regionName, connectionName,
- tableName, pdxClass, keyInValue, fieldMappings);
+ tableName, pdxClass, keyInValue);
assertThat(result.getStatus()).isSameAs(Result.Status.OK);
@@ -98,7 +96,7 @@ public class CreateMappingCommandIntegrationTest {
ResultModel result;
result =
createRegionMappingCommand.createMapping(regionName, connectionName, tableName, pdxClass,
- keyInValue, fieldMappings);
+ keyInValue);
assertThat(result.getStatus()).isSameAs(Result.Status.OK);
IgnoredException ignoredException =
@@ -106,7 +104,7 @@ public class CreateMappingCommandIntegrationTest {
try {
result = createRegionMappingCommand.createMapping(regionName, connectionName, tableName,
- pdxClass, keyInValue, fieldMappings);
+ pdxClass, keyInValue);
} finally {
ignoredException.remove();
}
@@ -117,7 +115,7 @@ public class CreateMappingCommandIntegrationTest {
@Test
public void createsRegionMappingWithMinimumParams() {
ResultModel result = createRegionMappingCommand.createMapping(regionName, connectionName, null,
- null, false, null);
+ null, false);
assertThat(result.getStatus()).isSameAs(Result.Status.OK);
@@ -130,6 +128,5 @@ public class CreateMappingCommandIntegrationTest {
assertThat(regionMapping.getTableName()).isNull();
assertThat(regionMapping.getPdxClassName()).isNull();
assertThat(regionMapping.isPrimaryKeyInValue()).isFalse();
- assertThat(regionMapping.getFieldMapping()).isEmpty();
}
}
diff --git a/geode-connectors/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt b/geode-connectors/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
index 386bcf3..c55b76e 100644
--- a/geode-connectors/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
+++ b/geode-connectors/src/integrationTest/resources/org/apache/geode/codeAnalysis/excludedClasses.txt
@@ -1,3 +1,2 @@
org/apache/geode/connectors/jdbc/internal/xml/ElementType
org/apache/geode/connectors/jdbc/internal/xml/ElementType$1
-org/apache/geode/connectors/jdbc/internal/xml/ElementType$2
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..e67ce30 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
@@ -79,7 +79,6 @@ public class AlterMappingCommand extends SingleGfshCommand {
Set<DistributedMember> targetMembers = getMembers(null, null);
RegionMapping newMapping = new RegionMapping(regionName,
pdxClassName, table, connectionName, keyInValue);
- newMapping.setFieldMapping(fieldMappings);
// action
List<CliFunctionResult> results =
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..45a3599 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
@@ -14,7 +14,6 @@
*/
package org.apache.geode.connectors.jdbc.internal.cli;
-import java.util.List;
import org.apache.geode.annotations.Experimental;
import org.apache.geode.cache.execute.FunctionContext;
@@ -57,14 +56,8 @@ public class AlterMappingFunction extends CliFunction<RegionMapping> {
Boolean keyInValue = regionMapping.isPrimaryKeyInValue() == null
? existingMapping.isPrimaryKeyInValue() : regionMapping.isPrimaryKeyInValue();
- List<RegionMapping.FieldMapping> fieldMappings =
- regionMapping.getFieldMapping();
- if (!regionMapping.isFieldMappingModified()) {
- fieldMappings = existingMapping.getFieldMapping();
- }
RegionMapping alteredMapping = new RegionMapping(
existingMapping.getRegionName(), pdxClassName, table, connectionName, keyInValue);
- 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..401963f 100644
--- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommand.java
+++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommand.java
@@ -51,9 +51,6 @@ public class CreateMappingCommand extends SingleGfshCommand {
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)*\".";
@CliCommand(value = CREATE_MAPPING, help = CREATE_MAPPING__HELP)
@CliMetaData(relatedTopic = CliStrings.DEFAULT_TOPIC_GEODE)
@@ -70,14 +67,11 @@ public class CreateMappingCommand extends SingleGfshCommand {
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) {
+ specifiedDefaultValue = "true") boolean keyInValue) {
// input
Set<DistributedMember> targetMembers = getMembers(null, null);
RegionMapping mapping = new RegionMapping(regionName,
pdxClassName, table, connectionName, keyInValue);
- mapping.setFieldMapping(fieldMappings);
// action
List<CliFunctionResult> results =
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..aa3150a 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
@@ -35,7 +35,6 @@ import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.management.internal.cli.i18n.CliStrings;
import org.apache.geode.management.internal.cli.result.model.DataResultModel;
import org.apache.geode.management.internal.cli.result.model.ResultModel;
-import org.apache.geode.management.internal.cli.result.model.TabularResultModel;
import org.apache.geode.management.internal.security.ResourceOperation;
import org.apache.geode.security.ResourcePermission;
@@ -48,7 +47,6 @@ public class DescribeMappingCommand extends GfshCommand {
"Region name of the jdbc mapping to be described.";
static final String RESULT_SECTION_NAME = "MappingDescription";
- static final String FIELD_TO_COLUMN_TABLE = "fieldToColumnTable";
@CliCommand(value = DESCRIBE_MAPPING, help = DESCRIBE_MAPPING__HELP)
@CliMetaData(relatedTopic = CliStrings.DEFAULT_TOPIC_GEODE)
@@ -88,14 +86,5 @@ public class DescribeMappingCommand extends GfshCommand {
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:");
- if (mapping.getFieldMapping() != null) {
- mapping.getFieldMapping().forEach((entry) -> {
- tabularResultData.accumulate("Field", entry.getFieldName());
- tabularResultData.accumulate("Column", entry.getColumnName());
- });
- }
}
}
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..a534236 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
@@ -14,19 +14,14 @@
*/
package org.apache.geode.connectors.jdbc.internal.configuration;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.Arrays;
import java.util.HashSet;
import java.util.List;
-import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
import javax.xml.bind.annotation.XmlAccessType;
import javax.xml.bind.annotation.XmlAccessorType;
import javax.xml.bind.annotation.XmlAttribute;
-import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
@@ -50,18 +45,6 @@ import org.apache.geode.pdx.internal.TypeRegistry;
* <complexType>
* <complexContent>
* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <sequence>
- * <element name="field-mapping" maxOccurs="unbounded" minOccurs="0">
- * <complexType>
- * <simpleContent>
- * <extension base="<http://www.w3.org/2001/XMLSchema>string">
- * <attribute name="field-name" type="{http://www.w3.org/2001/XMLSchema}string" />
- * <attribute name="column-name" type="{http://www.w3.org/2001/XMLSchema}string" />
- * </extension>
- * </simpleContent>
- * </complexType>
- * </element>
- * </sequence>
* <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" />
@@ -75,17 +58,13 @@ import org.apache.geode.pdx.internal.TypeRegistry;
*/
@Experimental
@XmlAccessorType(XmlAccessType.FIELD)
-@XmlType(name = "", propOrder = {"fieldMapping"})
+@XmlType(name = "")
@XmlRootElement(name = "mapping", namespace = "http://geode.apache.org/schema/jdbc")
@XSDRootElement(namespace = "http://geode.apache.org/schema/jdbc",
schemaLocation = "http://geode.apache.org/schema/jdbc/jdbc-1.0.xsd")
public class RegionMapping implements CacheElement {
private static final String MAPPINGS_DELIMITER = ":";
- @XmlElement(name = "field-mapping", namespace = "http://geode.apache.org/schema/jdbc")
- protected List<FieldMapping> fieldMapping;
- @XmlTransient
- protected boolean fieldMappingModified = false;
@XmlAttribute(name = "connection-name")
protected String connectionConfigName;
@XmlAttribute(name = "table")
@@ -111,28 +90,6 @@ public class RegionMapping implements CacheElement {
this.primaryKeyInValue = primaryKeyInValue;
}
- public void setFieldMapping(String[] mappings) {
- if (mappings != null) {
- this.fieldMapping =
- Arrays.stream(mappings).filter(Objects::nonNull).filter(s -> !s.isEmpty()).map(s -> {
- String[] keyValuePair = s.split(MAPPINGS_DELIMITER);
- validateParam(keyValuePair, s);
- return new FieldMapping(keyValuePair[0],
- keyValuePair[1]);
- }).collect(Collectors.toList());
- fieldMappingModified = true;
- }
- }
-
- private void validateParam(String[] paramKeyValue, String mapping) {
- // paramKeyValue is produced by split which will never give us
- // an empty second element
- if (paramKeyValue.length != 2 || paramKeyValue[0].isEmpty()) {
- throw new IllegalArgumentException("Field to column mapping '" + mapping
- + "' is not of the form 'Field" + MAPPINGS_DELIMITER + "Column'");
- }
- }
-
public void setConnectionConfigName(String connectionConfigName) {
this.connectionConfigName = connectionConfigName;
}
@@ -153,17 +110,6 @@ public class RegionMapping implements CacheElement {
this.primaryKeyInValue = primaryKeyInValue;
}
- public boolean isFieldMappingModified() {
- return fieldMappingModified;
- }
-
- public List<FieldMapping> getFieldMapping() {
- if (fieldMapping == null) {
- fieldMapping = new ArrayList<>();
- }
- return fieldMapping;
- }
-
public String getConnectionConfigName() {
return connectionConfigName;
}
@@ -196,12 +142,6 @@ public class RegionMapping implements CacheElement {
}
public String getColumnNameForField(String fieldName, TableMetaDataView tableMetaDataView) {
- FieldMapping configured = getFieldMapping().stream()
- .filter(m -> m.getFieldName().equals(fieldName)).findAny().orElse(null);
- if (configured != null) {
- return configured.getColumnName();
- }
-
Set<String> columnNames = tableMetaDataView.getColumnNames();
if (columnNames.contains(fieldName)) {
return fieldName;
@@ -224,14 +164,6 @@ public class RegionMapping implements CacheElement {
public String getFieldNameForColumn(String columnName, TypeRegistry typeRegistry) {
String fieldName = null;
-
- FieldMapping configured = getFieldMapping().stream()
- .filter(m -> m.getColumnName().equals(columnName)).findAny().orElse(null);
-
- if (configured != null) {
- return configured.getFieldName();
- }
-
if (getPdxClassName() == null) {
if (columnName.equals(columnName.toUpperCase())) {
fieldName = columnName.toLowerCase();
@@ -330,10 +262,6 @@ public class RegionMapping implements CacheElement {
: that.connectionConfigName != null) {
return false;
}
- if (fieldMapping != null ? !fieldMapping.equals(that.fieldMapping)
- : that.fieldMapping != null) {
- return false;
- }
return true;
}
@@ -358,82 +286,4 @@ public class RegionMapping implements CacheElement {
public String getId() {
return ELEMENT_ID;
}
-
- @XmlAccessorType(XmlAccessType.FIELD)
- public static class FieldMapping implements Serializable {
- @XmlAttribute(name = "field-name")
- protected String fieldName;
- @XmlAttribute(name = "column-name")
- protected String columnName;
-
- public FieldMapping() {}
-
- public FieldMapping(String fieldName, String columnName) {
- this.fieldName = fieldName;
- this.columnName = columnName;
- }
-
- /**
- * Gets the value of the fieldName property.
- *
- * possible object is
- * {@link String }
- *
- */
- public String getFieldName() {
- return fieldName;
- }
-
- /**
- * Sets the value of the fieldName property.
- *
- * allowed object is
- * {@link String }
- *
- */
- public void setFieldName(String value) {
- this.fieldName = value;
- }
-
- /**
- * Gets the value of the columnName property.
- *
- * possible object is
- * {@link String }
- *
- */
- public String getColumnName() {
- return columnName;
- }
-
- /**
- * Sets the value of the columnName property.
- *
- * allowed object is
- * {@link String }
- *
- */
- public void setColumnName(String value) {
- this.columnName = value;
- }
-
- @Override
- public boolean equals(Object o) {
- if (this == o)
- return true;
- if (o == null || getClass() != o.getClass())
- return false;
- FieldMapping that = (FieldMapping) o;
- return Objects.equals(fieldName, that.fieldName)
- && Objects.equals(columnName, that.columnName);
- }
-
- @Override
- public int hashCode() {
- int result = fieldName != null ? fieldName.hashCode() : 0;
- result = 31 * result + (columnName != null ? columnName.hashCode() : 0);
-
- return result;
- }
- }
}
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..192ef76 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
@@ -48,23 +48,6 @@ public enum ElementType {
RegionCreation regionCreation = (RegionCreation) stack.peek();
regionCreation.getExtensionPoint().addExtension(new RegionMappingConfiguration(mapping));
}
- },
- FIELD_MAPPING("field-mapping") {
- @Override
- void startElement(Stack<Object> stack, Attributes attributes) {
- if (!(stack.peek() instanceof RegionMapping)) {
- throw new CacheXmlException(
- "<jdbc:field-mapping> elements must occur within <jdbc:mapping> elements");
- }
- RegionMapping mapping = (RegionMapping) stack.peek();
- mapping.getFieldMapping()
- .add(new RegionMapping.FieldMapping(
- attributes.getValue(JdbcConnectorServiceXmlParser.FIELD_NAME),
- attributes.getValue(JdbcConnectorServiceXmlParser.COLUMN_NAME)));
- }
-
- @Override
- void endElement(Stack<Object> stack) {}
};
private String typeName;
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..191b059 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
@@ -40,18 +40,6 @@ XML schema for JDBC Connector Service in Geode.
</xsd:annotation>
<xsd:element name="mapping">
<xsd:complexType>
- <xsd:sequence>
- <xsd:element name="field-mapping" maxOccurs="unbounded" minOccurs="0">
- <xsd:complexType>
- <xsd:simpleContent>
- <xsd:extension base="xsd:string">
- <xsd:attribute type="xsd:string" name="field-name" use="optional"/>
- <xsd:attribute type="xsd:string" name="column-name" use="optional"/>
- </xsd:extension>
- </xsd:simpleContent>
- </xsd:complexType>
- </xsd:element>
- </xsd:sequence>
<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"/>
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..bb5fb86 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
@@ -56,14 +56,6 @@ public class RegionMappingTest {
}
@Test
- public void emptyArrayFiledMapping() {
- mapping = new RegionMapping("region", "class", "table", "connection", false);
- mapping.setFieldMapping(new String[0]);
- assertThat(mapping.isFieldMappingModified()).isTrue();
- assertThat(mapping.getFieldMapping()).isEmpty();
- }
-
- @Test
public void initiatedWithNullValues() {
mapping = new RegionMapping(null, null, null, null, false);
@@ -127,7 +119,6 @@ public class RegionMappingTest {
@Test
public void returnsColumnNameIfFieldNotMapped() {
mapping = new RegionMapping(null, null, null, null, true);
- mapping.setFieldMapping(new String[] {"otherField:column"});
String columnName = mapping.getColumnNameForField(fieldName1, mock(TableMetaDataView.class));
@@ -138,7 +129,6 @@ public class RegionMappingTest {
public void returnsColumnNameFromTableMetaDataIfFieldNotMappedAndMetaDataMatchesWithCaseDiffering() {
String metaDataColumnName = fieldName1.toUpperCase();
mapping = new RegionMapping(null, null, null, null, true);
- mapping.setFieldMapping(new String[] {"otherField:column"});
TableMetaDataView tableMetaDataView = mock(TableMetaDataView.class);
when(tableMetaDataView.getColumnNames()).thenReturn(Collections.singleton(metaDataColumnName));
@@ -150,7 +140,6 @@ public class RegionMappingTest {
public void returnsColumnNameFromTableMetaDataIfFieldNotMappedAndMetaDataMatchesExactly() {
String metaDataColumnName = fieldName1;
mapping = new RegionMapping(null, null, null, null, true);
- mapping.setFieldMapping(new String[] {"otherField:column"});
TableMetaDataView tableMetaDataView = mock(TableMetaDataView.class);
when(tableMetaDataView.getColumnNames()).thenReturn(Collections.singleton(metaDataColumnName));
@@ -161,7 +150,6 @@ public class RegionMappingTest {
@Test
public void returnsColumnNameIfFieldNotMappedAndNotInMetaData() {
mapping = new RegionMapping(null, null, null, null, true);
- mapping.setFieldMapping(new String[] {"otherField:column"});
TableMetaDataView tableMetaDataView = mock(TableMetaDataView.class);
when(tableMetaDataView.getColumnNames()).thenReturn(Collections.singleton("does not match"));
@@ -171,7 +159,6 @@ public class RegionMappingTest {
@Test
public void getColumnNameForFieldThrowsIfTwoColumnsMatchField() {
mapping = new RegionMapping(null, null, null, null, true);
- mapping.setFieldMapping(new String[] {"otherField:column"});
TableMetaDataView tableMetaDataView = mock(TableMetaDataView.class);
HashSet<String> columnNames =
@@ -188,7 +175,6 @@ public class RegionMappingTest {
@Test
public void ifMixedCaseColumnNameNotMappedReturnsItAsFieldName() {
mapping = new RegionMapping(null, null, null, null, true);
- mapping.setFieldMapping(new String[] {"otherField:column"});
assertThat(mapping.getFieldNameForColumn("columnName", null)).isEqualTo("columnName");
}
@@ -196,7 +182,6 @@ public class RegionMappingTest {
@Test
public void ifLowerCaseColumnNameNotMappedReturnsItAsFieldName() {
mapping = new RegionMapping(null, null, null, null, true);
- mapping.setFieldMapping(new String[] {"otherField:column"});
assertThat(mapping.getFieldNameForColumn("columnname", null)).isEqualTo("columnname");
}
@@ -204,7 +189,6 @@ public class RegionMappingTest {
@Test
public void ifUpperCaseColumnNameNotMappedReturnsItLowerCasedAsFieldName() {
mapping = new RegionMapping(null, null, null, null, true);
- mapping.setFieldMapping(new String[] {"otherField:column"});
assertThat(mapping.getFieldNameForColumn("COLUMNNAME", null)).isEqualTo("columnname");
}
@@ -287,7 +271,6 @@ public class RegionMappingTest {
@Test
public void returnsMappedColumnNameForField() {
mapping = new RegionMapping(null, null, null, null, true);
- mapping.setFieldMapping(new String[] {fieldName1 + ":" + columnName1});
assertThat(mapping.getColumnNameForField(fieldName1, mock(TableMetaDataView.class)))
.isEqualTo(columnName1);
@@ -296,7 +279,6 @@ public class RegionMappingTest {
@Test
public void returnsMappedColumnNameForFieldEvenIfMetaDataMatches() {
mapping = new RegionMapping(null, null, null, null, true);
- mapping.setFieldMapping(new String[] {fieldName1 + ":" + columnName1});
TableMetaDataView tableMetaDataView = mock(TableMetaDataView.class);
when(tableMetaDataView.getColumnNames()).thenReturn(Collections.singleton(fieldName1));
@@ -307,7 +289,6 @@ public class RegionMappingTest {
@Test
public void returnsMappedFieldNameForColumn() {
mapping = new RegionMapping(null, null, null, null, true);
- mapping.setFieldMapping(new String[] {fieldName1 + ":" + columnName1});
assertThat(mapping.getFieldNameForColumn(columnName1, null)).isEqualTo(fieldName1);
}
@@ -315,7 +296,6 @@ public class RegionMappingTest {
@Test
public void returnsCachedFieldNameForColumn() {
mapping = new RegionMapping(null, null, null, null, true);
- mapping.setFieldMapping(new String[] {fieldName1 + ":" + columnName1});
TableMetaDataView tableMetaDataView = mock(TableMetaDataView.class);
@@ -327,7 +307,6 @@ public class RegionMappingTest {
@Test
public void returnsCachedColumnNameForField() {
mapping = new RegionMapping(null, null, null, null, true);
- mapping.setFieldMapping(new String[] {fieldName1 + ":" + columnName1});
mapping.getFieldNameForColumn(columnName1, null);
@@ -337,34 +316,6 @@ public class RegionMappingTest {
}
@Test
- public void returnsAllMappings() {
- mapping = new RegionMapping(null, null, null, null, true);
- mapping.setFieldMapping(
- new String[] {fieldName1 + ":" + columnName1, fieldName2 + ":" + columnName2});
-
- assertThat(mapping.getFieldMapping()).hasSize(2);
- assertThat(mapping.getFieldMapping().get(0).getFieldName()).isEqualTo("myField1");
- assertThat(mapping.getFieldMapping().get(0).getColumnName()).isEqualTo("myColumn1");
- assertThat(mapping.getFieldMapping().get(1).getFieldName()).isEqualTo("myField2");
- assertThat(mapping.getFieldMapping().get(1).getColumnName()).isEqualTo("myColumn2");
- }
-
- @Test
- public void verifyTwoNonDefaultInstancesAreEqual() {
- RegionMapping rm1 = new RegionMapping("regionName",
- "pdxClassName", "tableName", "connectionName", true);
- rm1.setFieldMapping(
- new String[] {fieldName1 + ":" + columnName1, fieldName2 + ":" + columnName2});
-
- RegionMapping rm2 = new RegionMapping("regionName",
- "pdxClassName", "tableName", "connectionName", true);
- rm2.setFieldMapping(
- new String[] {fieldName1 + ":" + columnName1, fieldName2 + ":" + columnName2});
-
- assertThat(rm1).isEqualTo(rm2);
- }
-
- @Test
public void verifyTwoDefaultInstancesAreEqual() {
RegionMapping rm1 =
new RegionMapping("regionName", null, null, "connectionName", false);
@@ -378,13 +329,9 @@ public class RegionMappingTest {
public void verifyTwoInstancesThatAreEqualHaveSameHashCode() {
RegionMapping rm1 = new RegionMapping("regionName",
"pdxClassName", "tableName", "connectionName", true);
- rm1.setFieldMapping(
- new String[] {fieldName1 + ":" + columnName1, fieldName2 + ":" + columnName2});
RegionMapping rm2 = new RegionMapping("regionName",
"pdxClassName", "tableName", "connectionName", true);
- rm1.setFieldMapping(
- new String[] {fieldName1 + ":" + columnName1, fieldName2 + ":" + columnName2});
assertThat(rm1.hashCode()).isEqualTo(rm2.hashCode());
}
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..e123035 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
@@ -26,7 +26,6 @@ import static org.mockito.Mockito.verify;
import static org.mockito.Mockito.when;
import java.io.Serializable;
-import java.util.List;
import org.apache.commons.lang.SerializationUtils;
import org.junit.Before;
@@ -69,7 +68,6 @@ public class AlterMappingFunctionTest {
existingMapping = new RegionMapping(REGION_NAME, null, null, null, null);
mappingToAlter =
new RegionMapping(REGION_NAME, "pdxClass", "myTable", "connection", true);
- mappingToAlter.setFieldMapping(new String[] {"field1:column1", "field2:column2"});
when(context.getResultSender()).thenReturn(resultSender);
when(context.getCache()).thenReturn(cache);
@@ -148,19 +146,8 @@ public class AlterMappingFunctionTest {
assertThat(alteredConfig.getTableName()).isEqualTo("myTable");
assertThat(alteredConfig.getConnectionConfigName()).isEqualTo("connection");
assertThat(alteredConfig.isPrimaryKeyInValue()).isTrue();
-
- assertFieldMapping(alteredConfig);
}
- private void assertFieldMapping(RegionMapping alteredConfig) {
- List<RegionMapping.FieldMapping> fieldMappings =
- alteredConfig.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 alterRegionMappingTable() {
@@ -175,7 +162,6 @@ public class AlterMappingFunctionTest {
assertThat(alteredConfig.getTableName()).isEqualTo("newTable");
assertThat(alteredConfig.getConnectionConfigName()).isEqualTo("connection");
assertThat(alteredConfig.isPrimaryKeyInValue()).isTrue();
- assertFieldMapping(alteredConfig);
}
@Test
@@ -191,7 +177,6 @@ public class AlterMappingFunctionTest {
assertThat(alteredConfig.getTableName()).isEqualTo("myTable");
assertThat(alteredConfig.getConnectionConfigName()).isEqualTo("connection");
assertThat(alteredConfig.isPrimaryKeyInValue()).isFalse();
- assertFieldMapping(alteredConfig);
}
@Test
@@ -207,56 +192,12 @@ public class AlterMappingFunctionTest {
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);
- newConfigValues.setFieldMapping(new String[] {"field5:column5", "field6:column6"});
-
-
- RegionMapping alteredConfig =
- function.alterRegionMapping(newConfigValues, mappingToAlter);
-
- assertThat(alteredConfig.getRegionName()).isEqualTo(REGION_NAME);
- 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);
- assertThat(fieldMappings)
- .contains(new RegionMapping.FieldMapping("field5", "column5"));
- assertThat(fieldMappings)
- .contains(new RegionMapping.FieldMapping("field6", "column6"));
- }
-
- @Test
- public void alterRegionMappingRemoveFieldMappings() {
- RegionMapping newConfigValues =
- new RegionMapping(REGION_NAME, null, null, null, null);
- newConfigValues.setFieldMapping(new String[0]);
- RegionMapping alteredConfig =
- function.alterRegionMapping(newConfigValues, mappingToAlter);
-
- assertThat(alteredConfig.getRegionName()).isEqualTo(REGION_NAME);
- 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);
}
@Test
public void alterRegionMappingWithEmptyString() {
RegionMapping newConfigValues =
new RegionMapping(REGION_NAME, null, null, null, null);
- newConfigValues.setFieldMapping(new String[] {""});
RegionMapping alteredConfig =
function.alterRegionMapping(newConfigValues, mappingToAlter);
@@ -265,9 +206,6 @@ public class AlterMappingFunctionTest {
assertThat(alteredConfig.getTableName()).isEqualTo("myTable");
assertThat(alteredConfig.getConnectionConfigName()).isEqualTo("connection");
assertThat(alteredConfig.isPrimaryKeyInValue()).isTrue();
- List<RegionMapping.FieldMapping> fieldMappings =
- alteredConfig.getFieldMapping();
- assertThat(fieldMappings).hasSize(0);
}
@Test
@@ -283,6 +221,5 @@ public class AlterMappingFunctionTest {
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/DescribeMappingCommandTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandTest.java
index aa94d2e..428ae3e 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
@@ -67,10 +67,6 @@ public class DescribeMappingCommandTest {
RegionMapping mapping =
new RegionMapping("region", "class1", "table1", "name1", true);
- mapping.getFieldMapping()
- .add(new RegionMapping.FieldMapping("field1", "value1"));
- mapping.getFieldMapping()
- .add(new RegionMapping.FieldMapping("field2", "value2"));
ResultCollector rc = mock(ResultCollector.class);
doReturn(rc).when(command).executeFunction(any(), any(), any(Set.class));
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..622f4ea 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
@@ -63,17 +63,8 @@ public class ListMappingCommandTest {
RegionMapping mapping1 =
new RegionMapping("region1", "class1", "table1", "name1", true);
- 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);
- mapping2.getFieldMapping()
- .add(new RegionMapping.FieldMapping("field3", "value3"));
- mapping2.getFieldMapping()
- .add(new RegionMapping.FieldMapping("field4", "value4"));
ResultCollector rc = mock(ResultCollector.class);
doReturn(rc).when(command).executeFunction(any(), any(), any(Set.class));
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..074f16f 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
@@ -15,18 +15,14 @@
package org.apache.geode.connectors.jdbc.internal.xml;
-import static org.apache.geode.connectors.jdbc.internal.xml.ElementType.FIELD_MAPPING;
import static org.apache.geode.connectors.jdbc.internal.xml.ElementType.JDBC_MAPPING;
-import static org.apache.geode.connectors.jdbc.internal.xml.JdbcConnectorServiceXmlParser.COLUMN_NAME;
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;
import static org.mockito.Mockito.mock;
-import static org.mockito.Mockito.verifyZeroInteractions;
import static org.mockito.Mockito.when;
import java.util.Stack;
@@ -37,7 +33,6 @@ import org.xml.sax.Attributes;
import org.apache.geode.cache.CacheXmlException;
import org.apache.geode.cache.Region;
-import org.apache.geode.connectors.jdbc.internal.TableMetaDataView;
import org.apache.geode.connectors.jdbc.internal.configuration.RegionMapping;
import org.apache.geode.internal.cache.extension.ExtensionPoint;
import org.apache.geode.internal.cache.xmlcache.RegionCreation;
@@ -103,39 +98,4 @@ public class ElementTypeTest {
assertThat(stack.size()).isEqualTo(1);
}
-
- @Test
- public void startElementFieldMappingThrowsWithoutRegionMappingBuilder() {
- stack.push(new Object());
-
- assertThatThrownBy(() -> FIELD_MAPPING.startElement(stack, attributes))
- .isInstanceOf(CacheXmlException.class);
- }
-
- @Test
- public void startElementFieldMapping() {
- RegionMapping mapping = new RegionMapping();
- stack.push(mapping);
- when(attributes.getValue(FIELD_NAME)).thenReturn("fieldName");
- when(attributes.getValue(COLUMN_NAME)).thenReturn("columnName");
-
- ElementType.FIELD_MAPPING.startElement(stack, attributes);
-
- RegionMapping mapping1 = (RegionMapping) stack.pop();
- assertThat(mapping1.getColumnNameForField("fieldName", mock(TableMetaDataView.class)))
- .isEqualTo("columnName");
- }
-
- @Test
- public void endElementFieldMapping() {
- RegionMapping mapping = mock(RegionMapping.class);
- RegionMappingConfiguration regionMappingConfiguration = mock(RegionMappingConfiguration.class);
- stack.push(regionMappingConfiguration);
- stack.push(mapping);
-
- ElementType.FIELD_MAPPING.endElement(stack);
-
- assertThat(stack.size()).isEqualTo(2);
- verifyZeroInteractions(mapping);
- }
}