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 23:56:42 UTC
[geode] branch feature/GEODE-5977 created (now 2a2e1cc)
This is an automated email from the ASF dual-hosted git repository.
dschneider pushed a change to branch feature/GEODE-5977
in repository https://gitbox.apache.org/repos/asf/geode.git.
at 2a2e1cc renamed --connection to --data-source
This branch includes the following new commits:
new 2a2e1cc renamed --connection to --data-source
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
[geode] 01/01: renamed --connection to --data-source
Posted by ds...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
dschneider pushed a commit to branch feature/GEODE-5977
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 2a2e1ccd350b995cad2b4514fc73c4b34465154d
Author: Darrel Schneider <ds...@pivotal.io>
AuthorDate: Fri Nov 2 16:55:49 2018 -0700
renamed --connection to --data-source
---
.../geode/connectors/jdbc/JdbcDistributedTest.java | 34 +++++++++++-----------
.../cli/CreateMappingCommandDUnitTest.java | 12 ++++----
.../cli/DescribeMappingCommandDUnitTest.java | 8 ++---
.../cli/DestroyMappingCommandDunitTest.java | 4 +--
.../cli/JdbcClusterConfigDistributedTest.java | 4 +--
.../internal/cli/ListMappingCommandDUnitTest.java | 2 +-
.../cli/CreateMappingCommandIntegrationTest.java | 16 +++++-----
.../geode/connectors/jdbc/internal/SqlHandler.java | 4 +--
.../jdbc/internal/cli/CreateMappingCommand.java | 10 +++----
.../jdbc/internal/cli/DescribeMappingCommand.java | 4 +--
.../jdbc/internal/configuration/RegionMapping.java | 28 +++++++++---------
.../connectors/jdbc/internal/xml/ElementType.java | 4 +--
.../xml/JdbcConnectorServiceXmlParser.java | 10 +------
.../geode.apache.org/schema/jdbc/jdbc-1.0.xsd | 2 +-
.../jdbc/internal/RegionMappingTest.java | 4 +--
.../connectors/jdbc/internal/SqlHandlerTest.java | 4 +--
.../jdbc/internal/xml/ElementTypeTest.java | 6 ++--
17 files changed, 74 insertions(+), 82 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 e199bfa..184bf5c 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
@@ -58,7 +58,7 @@ public abstract class JdbcDistributedTest implements Serializable {
static final String DB_NAME = "test";
private static final String TABLE_NAME = "employees";
private static final String REGION_NAME = "employees";
- private static final String CONNECTION_NAME = "TestConnection";
+ private static final String DATA_SOURCE_NAME = "TestDataSource";
@Rule
public transient GfshCommandRule gfsh = new GfshCommandRule();
@@ -237,7 +237,7 @@ public abstract class JdbcDistributedTest implements Serializable {
public void throwsExceptionWhenNoConnectionExists() throws Exception {
createTable();
createRegionUsingGfsh(true, false, false);
- createMapping(REGION_NAME, CONNECTION_NAME);
+ createMapping(REGION_NAME, DATA_SOURCE_NAME);
server.invoke(() -> {
PdxInstance pdxEmployee1 =
@@ -261,7 +261,7 @@ public abstract class JdbcDistributedTest implements Serializable {
});
createRegionUsingGfsh(true, false, true);
createJdbcConnection();
- createMapping(REGION_NAME, CONNECTION_NAME);
+ createMapping(REGION_NAME, DATA_SOURCE_NAME);
final String key = "emp1";
final java.sql.Date sqlDate = java.sql.Date.valueOf("1982-09-11");
final Date jdkDate = new Date(sqlDate.getTime());
@@ -296,7 +296,7 @@ public abstract class JdbcDistributedTest implements Serializable {
});
createRegionUsingGfsh(true, false, true);
createJdbcConnection();
- createMapping(REGION_NAME, CONNECTION_NAME);
+ createMapping(REGION_NAME, DATA_SOURCE_NAME);
final String key = "emp1";
final java.sql.Time sqlTime = java.sql.Time.valueOf("23:59:59");
final Date jdkDate = new Date(sqlTime.getTime());
@@ -327,7 +327,7 @@ public abstract class JdbcDistributedTest implements Serializable {
createRegionUsingGfsh(true, false, true);
createJdbcConnection();
- createMapping(REGION_NAME, CONNECTION_NAME);
+ createMapping(REGION_NAME, DATA_SOURCE_NAME);
final String key = "emp1";
final java.sql.Timestamp sqlTimestamp = java.sql.Timestamp.valueOf("1982-09-11 23:59:59.123");
final Date jdkDate = new Date(sqlTimestamp.getTime());
@@ -365,7 +365,7 @@ public abstract class JdbcDistributedTest implements Serializable {
createTable();
createRegionUsingGfsh(true, false, false);
createJdbcConnection();
- createMapping(REGION_NAME, CONNECTION_NAME);
+ createMapping(REGION_NAME, DATA_SOURCE_NAME);
server.invoke(() -> {
PdxInstance pdxEmployee1 =
ClusterStartupRule.getCache().createPdxInstanceFactory(Employee.class.getName())
@@ -382,7 +382,7 @@ public abstract class JdbcDistributedTest implements Serializable {
createTable();
createRegionUsingGfsh(true, false, false);
createJdbcConnection();
- createMapping(REGION_NAME, CONNECTION_NAME);
+ createMapping(REGION_NAME, DATA_SOURCE_NAME);
server.invoke(() -> {
PdxInstance pdxEmployee1 =
ClusterStartupRule.getCache().createPdxInstanceFactory(Employee.class.getName())
@@ -399,7 +399,7 @@ public abstract class JdbcDistributedTest implements Serializable {
createTable();
createRegionUsingGfsh(false, false, true);
createJdbcConnection();
- createMapping(REGION_NAME, CONNECTION_NAME);
+ createMapping(REGION_NAME, DATA_SOURCE_NAME);
server.invoke(() -> {
String key = "emp1";
Region<Object, Object> region = ClusterStartupRule.getCache().getRegion(REGION_NAME);
@@ -414,7 +414,7 @@ public abstract class JdbcDistributedTest implements Serializable {
createTable();
createRegionUsingGfsh(true, false, true);
createJdbcConnection();
- createMapping(REGION_NAME, CONNECTION_NAME);
+ createMapping(REGION_NAME, DATA_SOURCE_NAME);
server.invoke(() -> {
PdxInstance pdxEmployee1 =
ClusterStartupRule.getCache().createPdxInstanceFactory(Employee.class.getName())
@@ -443,7 +443,7 @@ public abstract class JdbcDistributedTest implements Serializable {
createTable();
createRegionUsingGfsh(false, true, true);
createJdbcConnection();
- createMapping(REGION_NAME, CONNECTION_NAME);
+ createMapping(REGION_NAME, DATA_SOURCE_NAME);
server.invoke(() -> {
PdxInstance pdxEmployee1 =
ClusterStartupRule.getCache().createPdxInstanceFactory(Employee.class.getName())
@@ -474,7 +474,7 @@ public abstract class JdbcDistributedTest implements Serializable {
createTable();
createRegionUsingGfsh(true, false, true);
createJdbcConnection();
- createMapping(REGION_NAME, CONNECTION_NAME, Employee.class.getName());
+ createMapping(REGION_NAME, DATA_SOURCE_NAME, Employee.class.getName());
server.invoke(() -> {
String key = "id1";
Employee value = new Employee(key, "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());
+ createMapping(REGION_NAME, DATA_SOURCE_NAME, ClassWithSupportedPdxFields.class.getName());
client.invoke(() -> {
String key = "id1";
ClassWithSupportedPdxFields value =
@@ -520,7 +520,7 @@ public abstract class JdbcDistributedTest implements Serializable {
createRegionUsingGfsh(true, false, true);
createJdbcConnection();
- createMapping(REGION_NAME, CONNECTION_NAME, ClassWithSupportedPdxFields.class.getName());
+ createMapping(REGION_NAME, DATA_SOURCE_NAME, ClassWithSupportedPdxFields.class.getName());
client.invoke(() -> {
String key = "id1";
ClassWithSupportedPdxFields value = new ClassWithSupportedPdxFields(key);
@@ -541,7 +541,7 @@ public abstract class JdbcDistributedTest implements Serializable {
createClientRegion(client);
createRegionUsingGfsh(true, false, true);
createJdbcConnection();
- createMapping(REGION_NAME, CONNECTION_NAME, ClassWithSupportedPdxFields.class.getName());
+ createMapping(REGION_NAME, DATA_SOURCE_NAME, ClassWithSupportedPdxFields.class.getName());
String key = "id1";
ClassWithSupportedPdxFields value =
new ClassWithSupportedPdxFields(key, true, (byte) 1, (short) 2,
@@ -570,7 +570,7 @@ public abstract class JdbcDistributedTest implements Serializable {
createClientRegion(client);
createRegionUsingGfsh(true, false, true);
createJdbcConnection();
- createMapping(REGION_NAME, CONNECTION_NAME, ClassWithSupportedPdxFields.class.getName());
+ createMapping(REGION_NAME, DATA_SOURCE_NAME, ClassWithSupportedPdxFields.class.getName());
String key = "id1";
ClassWithSupportedPdxFields value = new ClassWithSupportedPdxFields(key);
@@ -608,7 +608,7 @@ public abstract class JdbcDistributedTest implements Serializable {
private void createJdbcConnection() {
final String commandStr =
- "create jndi-binding --type=POOLED --name=" + CONNECTION_NAME + " --url=" + connectionUrl;
+ "create jndi-binding --type=POOLED --name=" + DATA_SOURCE_NAME + " --url=" + connectionUrl;
gfsh.executeAndAssertThat(commandStr).statusIsSuccess();
}
@@ -642,7 +642,7 @@ public abstract class JdbcDistributedTest implements Serializable {
}
private void createMapping(String regionName, String connectionName, String pdxClassName) {
- final String commandStr = "create jdbc-mapping --region=" + regionName + " --connection="
+ final String commandStr = "create jdbc-mapping --region=" + regionName + " --data-source="
+ connectionName + (pdxClassName != null ? " --pdx-name=" + pdxClassName : "");
gfsh.executeAndAssertThat(commandStr).statusIsSuccess();
}
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 9dc947d..aea0d6e 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
@@ -15,7 +15,7 @@
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__DATA_SOURCE_NAME;
import static org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand.CREATE_MAPPING__PDX_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;
@@ -70,7 +70,7 @@ public class CreateMappingCommandDUnitTest {
public void createsMappingWithAllOptions() {
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__DATA_SOURCE_NAME, "connection");
csb.addOption(CREATE_MAPPING__TABLE_NAME, "myTable");
csb.addOption(CREATE_MAPPING__PDX_NAME, "myPdxClass");
@@ -86,7 +86,7 @@ public class CreateMappingCommandDUnitTest {
InternalCache cache = ClusterStartupRule.getCache();
RegionMapping mapping =
cache.getService(JdbcConnectorService.class).getMappingForRegion(REGION_NAME);
- assertThat(mapping.getConnectionConfigName()).isEqualTo("connection");
+ assertThat(mapping.getDataSourceName()).isEqualTo("connection");
assertThat(mapping.getTableName()).isEqualTo("myTable");
assertThat(mapping.getPdxName()).isEqualTo("myPdxClass");
});
@@ -96,7 +96,7 @@ public class CreateMappingCommandDUnitTest {
public void createsRegionMappingUpdatesClusterConfig() {
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__DATA_SOURCE_NAME, "connection");
csb.addOption(CREATE_MAPPING__TABLE_NAME, "myTable");
csb.addOption(CREATE_MAPPING__PDX_NAME, "myPdxClass");
@@ -113,13 +113,13 @@ public class CreateMappingCommandDUnitTest {
public void createExistingRegionMappingFails() {
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__DATA_SOURCE_NAME, "connection");
csb.addOption(CREATE_MAPPING__TABLE_NAME, "myTable");
gfsh.executeAndAssertThat(csb.toString()).statusIsSuccess();
csb = new CommandStringBuilder(CREATE_MAPPING);
csb.addOption(CREATE_MAPPING__REGION_NAME, REGION_NAME);
- csb.addOption(CREATE_MAPPING__CONNECTION_NAME, "connection");
+ csb.addOption(CREATE_MAPPING__DATA_SOURCE_NAME, "connection");
csb.addOption(CREATE_MAPPING__TABLE_NAME, "bogus");
gfsh.executeAndAssertThat(csb.toString()).statusIsError();
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 14640e2..06896f7 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
@@ -15,7 +15,7 @@
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__DATA_SOURCE_NAME;
import static org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand.CREATE_MAPPING__PDX_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;
@@ -70,7 +70,7 @@ public class DescribeMappingCommandDUnitTest implements Serializable {
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__DATA_SOURCE_NAME, "connection");
csb.addOption(CREATE_MAPPING__TABLE_NAME, "testTable");
csb.addOption(CREATE_MAPPING__PDX_NAME, "myPdxClass");
@@ -83,7 +83,7 @@ public class DescribeMappingCommandDUnitTest implements Serializable {
commandResultAssert.statusIsSuccess();
commandResultAssert.containsKeyValuePair(CREATE_MAPPING__REGION_NAME, REGION_NAME);
- commandResultAssert.containsKeyValuePair(CREATE_MAPPING__CONNECTION_NAME, "connection");
+ commandResultAssert.containsKeyValuePair(CREATE_MAPPING__DATA_SOURCE_NAME, "connection");
commandResultAssert.containsKeyValuePair(CREATE_MAPPING__TABLE_NAME, "testTable");
commandResultAssert.containsKeyValuePair(CREATE_MAPPING__PDX_NAME, "myPdxClass");
}
@@ -123,7 +123,7 @@ public class DescribeMappingCommandDUnitTest implements Serializable {
gfsh.executeAndAssertThat(DESCRIBE_MAPPING + " --region=" + REGION_NAME).statusIsSuccess();
commandResultAssert.containsKeyValuePair(CREATE_MAPPING__REGION_NAME, REGION_NAME);
- commandResultAssert.containsKeyValuePair(CREATE_MAPPING__CONNECTION_NAME, "connection");
+ commandResultAssert.containsKeyValuePair(CREATE_MAPPING__DATA_SOURCE_NAME, "connection");
commandResultAssert.containsKeyValuePair(CREATE_MAPPING__TABLE_NAME, "testTable");
commandResultAssert.containsKeyValuePair(CREATE_MAPPING__PDX_NAME, "myPdxClass");
}
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 1b99045..cb42dcb 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
@@ -15,7 +15,7 @@
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__DATA_SOURCE_NAME;
import static org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand.CREATE_MAPPING__PDX_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;
@@ -71,7 +71,7 @@ public class DestroyMappingCommandDunitTest implements Serializable {
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__DATA_SOURCE_NAME, "connection");
csb.addOption(CREATE_MAPPING__TABLE_NAME, "myTable");
csb.addOption(CREATE_MAPPING__PDX_NAME, "myPdxClass");
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 d6d266f..bfd4e54 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
@@ -53,7 +53,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-name=myPdxClass")
+ "create jdbc-mapping --region=regionName --data-source=myDataSource --table=testTable --pdx-name=myPdxClass")
.statusIsSuccess();
server.invoke(() -> {
@@ -75,7 +75,7 @@ public class JdbcClusterConfigDistributedTest {
private static void validateRegionMapping(RegionMapping regionMapping) {
assertThat(regionMapping).isNotNull();
assertThat(regionMapping.getRegionName()).isEqualTo("regionName");
- assertThat(regionMapping.getConnectionConfigName()).isEqualTo("connection");
+ assertThat(regionMapping.getDataSourceName()).isEqualTo("myDataSource");
assertThat(regionMapping.getTableName()).isEqualTo("testTable");
assertThat(regionMapping.getPdxName()).isEqualTo("myPdxClass");
}
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 f5a2115..2d90bdf 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
@@ -61,7 +61,7 @@ public class ListMappingCommandDUnitTest implements Serializable {
gfsh.executeAndAssertThat("create region --name=" + regionName + " --type=REPLICATE")
.statusIsSuccess();
- String mapping = "create jdbc-mapping --region=testRegion --connection=connection "
+ String mapping = "create jdbc-mapping --region=testRegion --data-source=connection "
+ "--table=myTable --pdx-name=myPdxClass";
gfsh.executeAndAssertThat(mapping).statusIsSuccess();
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 9111624..20d5598 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
@@ -40,14 +40,14 @@ public class CreateMappingCommandIntegrationTest {
private CreateMappingCommand createRegionMappingCommand;
private String regionName;
- private String connectionName;
+ private String dataSourceName;
private String tableName;
private String pdxClass;
@Before
public void setup() {
regionName = "regionName";
- connectionName = "connection";
+ dataSourceName = "connection";
tableName = "testTable";
pdxClass = "myPdxClass";
@@ -66,7 +66,7 @@ public class CreateMappingCommandIntegrationTest {
@Test
public void createsRegionMappingInService() {
- ResultModel result = createRegionMappingCommand.createMapping(regionName, connectionName,
+ ResultModel result = createRegionMappingCommand.createMapping(regionName, dataSourceName,
tableName, pdxClass);
assertThat(result.getStatus()).isSameAs(Result.Status.OK);
@@ -76,7 +76,7 @@ public class CreateMappingCommandIntegrationTest {
assertThat(regionMapping).isNotNull();
assertThat(regionMapping.getRegionName()).isEqualTo(regionName);
- assertThat(regionMapping.getConnectionConfigName()).isEqualTo(connectionName);
+ assertThat(regionMapping.getDataSourceName()).isEqualTo(dataSourceName);
assertThat(regionMapping.getTableName()).isEqualTo(tableName);
assertThat(regionMapping.getPdxName()).isEqualTo(pdxClass);
}
@@ -86,7 +86,7 @@ public class CreateMappingCommandIntegrationTest {
JdbcConnectorService service = cache.getService(JdbcConnectorService.class);
ResultModel result;
result =
- createRegionMappingCommand.createMapping(regionName, connectionName, tableName, pdxClass);
+ createRegionMappingCommand.createMapping(regionName, dataSourceName, tableName, pdxClass);
assertThat(result.getStatus()).isSameAs(Result.Status.OK);
IgnoredException ignoredException =
@@ -94,7 +94,7 @@ public class CreateMappingCommandIntegrationTest {
try {
result =
- createRegionMappingCommand.createMapping(regionName, connectionName, tableName, pdxClass);
+ createRegionMappingCommand.createMapping(regionName, dataSourceName, tableName, pdxClass);
} finally {
ignoredException.remove();
}
@@ -105,7 +105,7 @@ public class CreateMappingCommandIntegrationTest {
@Test
public void createsRegionMappingWithMinimumParams() {
ResultModel result =
- createRegionMappingCommand.createMapping(regionName, connectionName, null, null);
+ createRegionMappingCommand.createMapping(regionName, dataSourceName, null, null);
assertThat(result.getStatus()).isSameAs(Result.Status.OK);
@@ -114,7 +114,7 @@ public class CreateMappingCommandIntegrationTest {
assertThat(regionMapping).isNotNull();
assertThat(regionMapping.getRegionName()).isEqualTo(regionName);
- assertThat(regionMapping.getConnectionConfigName()).isEqualTo(connectionName);
+ assertThat(regionMapping.getDataSourceName()).isEqualTo(dataSourceName);
assertThat(regionMapping.getTableName()).isNull();
assertThat(regionMapping.getPdxName()).isNull();
}
diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/SqlHandler.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/SqlHandler.java
index 36cc53b..4d47af8 100644
--- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/SqlHandler.java
+++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/SqlHandler.java
@@ -73,7 +73,7 @@ public class SqlHandler {
RegionMapping regionMapping = getMappingForRegion(region.getName());
PdxInstance result;
- try (Connection connection = getConnection(regionMapping.getConnectionConfigName())) {
+ try (Connection connection = getConnection(regionMapping.getDataSourceName())) {
TableMetaDataView tableMetaData = this.tableMetaDataManager.getTableMetaDataView(connection,
regionMapping.getRegionToTableName());
EntryColumnData entryColumnData =
@@ -160,7 +160,7 @@ public class SqlHandler {
}
RegionMapping regionMapping = getMappingForRegion(region.getName());
- try (Connection connection = getConnection(regionMapping.getConnectionConfigName())) {
+ try (Connection connection = getConnection(regionMapping.getDataSourceName())) {
TableMetaDataView tableMetaData = this.tableMetaDataManager.getTableMetaDataView(connection,
regionMapping.getRegionToTableName());
EntryColumnData entryColumnData =
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 ff1fa15..5356c85 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
@@ -46,8 +46,8 @@ public class CreateMappingCommand extends SingleGfshCommand {
static final String CREATE_MAPPING__TABLE_NAME = "table";
static final String CREATE_MAPPING__TABLE_NAME__HELP =
"Name of database table for values to be written to.";
- static final String CREATE_MAPPING__CONNECTION_NAME = "connection";
- static final String CREATE_MAPPING__CONNECTION_NAME__HELP = "Name of JDBC connection to use.";
+ static final String CREATE_MAPPING__DATA_SOURCE_NAME = "data-source";
+ static final String CREATE_MAPPING__DATA_SOURCE_NAME__HELP = "Name of JDBC data source to use.";
@CliCommand(value = CREATE_MAPPING, help = CREATE_MAPPING__HELP)
@CliMetaData(relatedTopic = CliStrings.DEFAULT_TOPIC_GEODE)
@@ -56,8 +56,8 @@ public class CreateMappingCommand extends SingleGfshCommand {
public ResultModel createMapping(
@CliOption(key = CREATE_MAPPING__REGION_NAME, mandatory = true,
help = CREATE_MAPPING__REGION_NAME__HELP) String regionName,
- @CliOption(key = CREATE_MAPPING__CONNECTION_NAME, mandatory = true,
- help = CREATE_MAPPING__CONNECTION_NAME__HELP) String connectionName,
+ @CliOption(key = CREATE_MAPPING__DATA_SOURCE_NAME, mandatory = true,
+ help = CREATE_MAPPING__DATA_SOURCE_NAME__HELP) String dataSourceName,
@CliOption(key = CREATE_MAPPING__TABLE_NAME,
help = CREATE_MAPPING__TABLE_NAME__HELP) String table,
@CliOption(key = CREATE_MAPPING__PDX_NAME,
@@ -65,7 +65,7 @@ public class CreateMappingCommand extends SingleGfshCommand {
// input
Set<DistributedMember> targetMembers = getMembers(null, null);
RegionMapping mapping = new RegionMapping(regionName,
- pdxName, table, connectionName);
+ pdxName, table, dataSourceName);
// 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 0df2f6e..2a9ac67 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
@@ -14,7 +14,7 @@
*/
package org.apache.geode.connectors.jdbc.internal.cli;
-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__DATA_SOURCE_NAME;
import static org.apache.geode.connectors.jdbc.internal.cli.CreateMappingCommand.CREATE_MAPPING__PDX_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;
@@ -81,7 +81,7 @@ public class DescribeMappingCommand extends GfshCommand {
private void fillResultData(RegionMapping mapping, ResultModel resultModel) {
DataResultModel sectionModel = resultModel.addData(RESULT_SECTION_NAME);
sectionModel.addData(CREATE_MAPPING__REGION_NAME, mapping.getRegionName());
- sectionModel.addData(CREATE_MAPPING__CONNECTION_NAME, mapping.getConnectionConfigName());
+ sectionModel.addData(CREATE_MAPPING__DATA_SOURCE_NAME, mapping.getDataSourceName());
sectionModel.addData(CREATE_MAPPING__TABLE_NAME, mapping.getTableName());
sectionModel.addData(CREATE_MAPPING__PDX_NAME, mapping.getPdxName());
}
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 b0fd5d0..8217e7f 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
@@ -45,7 +45,7 @@ import org.apache.geode.pdx.internal.TypeRegistry;
* <complexType>
* <complexContent>
* <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- * <attribute name="connection-name" type="{http://www.w3.org/2001/XMLSchema}string" />
+ * <attribute name="data-source" type="{http://www.w3.org/2001/XMLSchema}string" />
* <attribute name="table" type="{http://www.w3.org/2001/XMLSchema}string" />
* <attribute name="pdx-name" type="{http://www.w3.org/2001/XMLSchema}string" />
* </restriction>
@@ -64,8 +64,8 @@ import org.apache.geode.pdx.internal.TypeRegistry;
public class RegionMapping implements CacheElement {
private static final String MAPPINGS_DELIMITER = ":";
- @XmlAttribute(name = "connection-name")
- protected String connectionConfigName;
+ @XmlAttribute(name = "data-source")
+ protected String dataSourceName;
@XmlAttribute(name = "table")
protected String tableName;
@XmlAttribute(name = "pdx-name")
@@ -79,15 +79,15 @@ public class RegionMapping implements CacheElement {
public RegionMapping() {}
public RegionMapping(String regionName, String pdxName, String tableName,
- String connectionConfigName) {
+ String dataSourceName) {
this.regionName = regionName;
this.pdxName = pdxName;
this.tableName = tableName;
- this.connectionConfigName = connectionConfigName;
+ this.dataSourceName = dataSourceName;
}
- public void setConnectionConfigName(String connectionConfigName) {
- this.connectionConfigName = connectionConfigName;
+ public void setDataSourceName(String dataSourceName) {
+ this.dataSourceName = dataSourceName;
}
public void setRegionName(String regionName) {
@@ -102,8 +102,8 @@ public class RegionMapping implements CacheElement {
this.pdxName = pdxName;
}
- public String getConnectionConfigName() {
- return connectionConfigName;
+ public String getDataSourceName() {
+ return dataSourceName;
}
public String getRegionName() {
@@ -239,8 +239,8 @@ public class RegionMapping implements CacheElement {
if (tableName != null ? !tableName.equals(that.tableName) : that.tableName != null) {
return false;
}
- if (connectionConfigName != null ? !connectionConfigName.equals(that.connectionConfigName)
- : that.connectionConfigName != null) {
+ if (dataSourceName != null ? !dataSourceName.equals(that.dataSourceName)
+ : that.dataSourceName != null) {
return false;
}
return true;
@@ -251,15 +251,15 @@ public class RegionMapping implements CacheElement {
int result = regionName != null ? regionName.hashCode() : 0;
result = 31 * result + (pdxName != null ? pdxName.hashCode() : 0);
result = 31 * result + (tableName != null ? tableName.hashCode() : 0);
- result = 31 * result + (connectionConfigName != null ? connectionConfigName.hashCode() : 0);
+ result = 31 * result + (dataSourceName != null ? dataSourceName.hashCode() : 0);
return result;
}
@Override
public String toString() {
return "RegionMapping{" + "regionName='" + regionName + '\'' + ", pdxName='"
- + pdxName + '\'' + ", tableName='" + tableName + '\'' + ", connectionConfigName='"
- + connectionConfigName + '\'' + '}';
+ + pdxName + '\'' + ", tableName='" + tableName + '\'' + ", dataSourceName='"
+ + dataSourceName + '\'' + '}';
}
@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 c5fb509..7379d61 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
@@ -33,8 +33,8 @@ public enum ElementType {
RegionCreation regionCreation = (RegionCreation) stack.peek();
RegionMapping mapping = new RegionMapping();
mapping.setRegionName(regionCreation.getFullPath().substring(1));
- mapping.setConnectionConfigName(
- attributes.getValue(JdbcConnectorServiceXmlParser.CONNECTION_NAME));
+ mapping.setDataSourceName(
+ attributes.getValue(JdbcConnectorServiceXmlParser.DATA_SOURCE));
mapping.setTableName(attributes.getValue(JdbcConnectorServiceXmlParser.TABLE));
mapping.setPdxName(attributes.getValue(JdbcConnectorServiceXmlParser.PDX_NAME));
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 742e0dc..c2e7d36 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
@@ -21,17 +21,9 @@ import org.apache.geode.internal.cache.xmlcache.AbstractXmlParser;
public class JdbcConnectorServiceXmlParser extends AbstractXmlParser {
public static final String NAMESPACE = "http://geode.apache.org/schema/jdbc";
- public static final String PARAMS_DELIMITER = ":";
- public static final String NAME = "name";
- static final String URL = "url";
- static final String USER = "user";
- static final String PASSWORD = "password";
- static final String PARAMETERS = "parameters";
- static final String CONNECTION_NAME = "connection-name";
+ static final String DATA_SOURCE = "data-source";
static final String TABLE = "table";
static final String PDX_NAME = "pdx-name";
- static final String FIELD_NAME = "field-name";
- static final String COLUMN_NAME = "column-name";
@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 48eca12..56f0559 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,7 +40,7 @@ XML schema for JDBC Connector Service in Geode.
</xsd:annotation>
<xsd:element name="mapping">
<xsd:complexType>
- <xsd:attribute type="xsd:string" name="connection-name" use="optional"/>
+ <xsd:attribute type="xsd:string" name="data-source" use="required"/>
<xsd:attribute type="xsd:string" name="table" use="optional"/>
<xsd:attribute type="xsd:string" name="pdx-name" use="optional"/>
</xsd:complexType>
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 c927b45..c25e21b 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
@@ -61,7 +61,7 @@ public class RegionMappingTest {
assertThat(mapping.getTableName()).isNull();
assertThat(mapping.getRegionName()).isNull();
- assertThat(mapping.getConnectionConfigName()).isNull();
+ assertThat(mapping.getDataSourceName()).isNull();
assertThat(mapping.getPdxName()).isNull();
assertThat(mapping.getRegionToTableName()).isNull();
assertThat(mapping.getColumnNameForField("fieldName", mock(TableMetaDataView.class)))
@@ -99,7 +99,7 @@ public class RegionMappingTest {
public void hasCorrectConfigName() {
mapping = new RegionMapping(null, null, null, name);
- assertThat(mapping.getConnectionConfigName()).isEqualTo(name);
+ assertThat(mapping.getDataSourceName()).isEqualTo(name);
}
@Test
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlHandlerTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlHandlerTest.java
index 642a01b..4600886 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlHandlerTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlHandlerTest.java
@@ -102,7 +102,7 @@ public class SqlHandlerTest {
when(value.getPdxType()).thenReturn(mock(PdxType.class));
regionMapping = mock(RegionMapping.class);
- when(regionMapping.getConnectionConfigName()).thenReturn(DATA_SOURCE_NAME);
+ when(regionMapping.getDataSourceName()).thenReturn(DATA_SOURCE_NAME);
when(regionMapping.getRegionName()).thenReturn(REGION_NAME);
when(regionMapping.getTableName()).thenReturn(TABLE_NAME);
when(regionMapping.getRegionToTableName()).thenReturn(TABLE_NAME);
@@ -133,7 +133,7 @@ public class SqlHandlerTest {
Region<Object, Object> region2 = mock(Region.class);
when(region2.getName()).thenReturn("region2");
RegionMapping regionMapping2 = mock(RegionMapping.class);
- when(regionMapping2.getConnectionConfigName()).thenReturn("bogus connection name");
+ when(regionMapping2.getDataSourceName()).thenReturn("bogus data source name");
when(regionMapping2.getRegionName()).thenReturn("region2");
when(connectorService.getMappingForRegion("region2")).thenReturn(regionMapping2);
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 97ccf37..295a27b 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
@@ -16,7 +16,7 @@ package org.apache.geode.connectors.jdbc.internal.xml;
import static org.apache.geode.connectors.jdbc.internal.xml.ElementType.JDBC_MAPPING;
-import static org.apache.geode.connectors.jdbc.internal.xml.JdbcConnectorServiceXmlParser.CONNECTION_NAME;
+import static org.apache.geode.connectors.jdbc.internal.xml.JdbcConnectorServiceXmlParser.DATA_SOURCE;
import static org.apache.geode.connectors.jdbc.internal.xml.JdbcConnectorServiceXmlParser.PDX_NAME;
import static org.apache.geode.connectors.jdbc.internal.xml.JdbcConnectorServiceXmlParser.TABLE;
import static org.assertj.core.api.Assertions.assertThat;
@@ -70,7 +70,7 @@ public class ElementTypeTest {
@Test
public void startElementRegionMapping() {
- when(attributes.getValue(CONNECTION_NAME)).thenReturn("connectionName");
+ when(attributes.getValue(DATA_SOURCE)).thenReturn("connectionName");
when(attributes.getValue(TABLE)).thenReturn("table");
when(attributes.getValue(PDX_NAME)).thenReturn("pdxClass");
when(regionCreation.getFullPath()).thenReturn("/region");
@@ -80,7 +80,7 @@ public class ElementTypeTest {
RegionMapping regionMapping = (RegionMapping) stack.pop();
assertThat(regionMapping.getRegionName()).isEqualTo("region");
- assertThat(regionMapping.getConnectionConfigName()).isEqualTo("connectionName");
+ assertThat(regionMapping.getDataSourceName()).isEqualTo("connectionName");
assertThat(regionMapping.getTableName()).isEqualTo("table");
assertThat(regionMapping.getPdxName()).isEqualTo("pdxClass");
}