You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@geode.apache.org by nr...@apache.org on 2017/11/13 19:20:25 UTC
[geode] branch feature/GEODE-3781 updated: Renaming and code cleanup
This is an automated email from the ASF dual-hosted git repository.
nreich pushed a commit to branch feature/GEODE-3781
in repository https://gitbox.apache.org/repos/asf/geode.git
The following commit(s) were added to refs/heads/feature/GEODE-3781 by this push:
new 1680078 Renaming and code cleanup
1680078 is described below
commit 1680078f55032a49bb4f97e3f72015c71bd1ab0d
Author: Nick Reich <nr...@pivotal.io>
AuthorDate: Mon Nov 13 11:19:57 2017 -0800
Renaming and code cleanup
---
.../{JDBCAsyncWriter.java => JdbcAsyncWriter.java} | 16 +-
.../jdbc/{JDBCLoader.java => JdbcLoader.java} | 16 +-
...onousWriter.java => JdbcSynchronousWriter.java} | 16 +-
...ationService.java => ConfigurationService.java} | 14 +-
...iguration.java => ConnectionConfiguration.java} | 4 +-
.../{JDBCManager.java => ConnectionManager.java} | 26 +--
.../{JDBCRegionMapping.java => RegionMapping.java} | 6 +-
.../internal/{SQLHandler.java => SqlHandler.java} | 18 +-
.../connectors/jdbc/JDBCLoaderIntegrationTest.java | 145 ----------------
...st.java => JdbcAsyncWriterIntegrationTest.java} | 182 +++++++++------------
.../connectors/jdbc/JdbcLoaderIntegrationTest.java | 104 ++++++++++++
...a => JdbcSynchronousWriterIntegrationTest.java} | 134 ++++++---------
...viceTest.java => ConfigurationServiceTest.java} | 12 +-
...nTest.java => ConnectionConfigurationTest.java} | 4 +-
...nitTest.java => ConnectionManagerUnitTest.java} | 26 +--
.../jdbc/internal/PreparedStatementCacheTest.java | 1 -
...gionMappingTest.java => RegionMappingTest.java} | 4 +-
.../{SQLHandlerTest.java => SqlHandlerTest.java} | 16 +-
.../jdbc/internal/TestConfigService.java | 12 +-
19 files changed, 326 insertions(+), 430 deletions(-)
diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JDBCAsyncWriter.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriter.java
similarity index 89%
rename from geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JDBCAsyncWriter.java
rename to geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriter.java
index 1050e92..a009658 100644
--- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JDBCAsyncWriter.java
+++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriter.java
@@ -21,8 +21,8 @@ import org.apache.geode.CopyHelper;
import org.apache.geode.cache.asyncqueue.AsyncEvent;
import org.apache.geode.cache.asyncqueue.AsyncEventListener;
import org.apache.geode.cache.query.internal.DefaultQuery;
-import org.apache.geode.connectors.jdbc.internal.JDBCManager;
-import org.apache.geode.connectors.jdbc.internal.SQLHandler;
+import org.apache.geode.connectors.jdbc.internal.ConnectionManager;
+import org.apache.geode.connectors.jdbc.internal.SqlHandler;
import org.apache.geode.internal.logging.LogService;
import org.apache.geode.pdx.PdxInstance;
import org.apache.logging.log4j.Logger;
@@ -32,17 +32,17 @@ import org.apache.logging.log4j.Logger;
*
* @since Geode 1.4
*/
-public class JDBCAsyncWriter implements AsyncEventListener {
+public class JdbcAsyncWriter implements AsyncEventListener {
static final Logger logger = LogService.getLogger();
private long totalEvents = 0;
private long successfulEvents = 0;
- private JDBCManager manager;
- private SQLHandler sqlHandler;
+ private ConnectionManager manager;
+ private SqlHandler sqlHandler;
// Constructor for test purposes only
- JDBCAsyncWriter(JDBCManager manager) {
+ JdbcAsyncWriter(ConnectionManager manager) {
this.manager = manager;
- sqlHandler = new SQLHandler(manager);
+ sqlHandler = new SqlHandler(manager);
}
@Override
@@ -92,7 +92,7 @@ public class JDBCAsyncWriter implements AsyncEventListener {
public void init(Properties props) {
/*
* JDBCConfiguration config = new JDBCConfiguration(props); this.manager = new
- * JDBCManager(config);
+ * ConnectionManager(config);
*/
}
diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JDBCLoader.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JdbcLoader.java
similarity index 83%
rename from geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JDBCLoader.java
rename to geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JdbcLoader.java
index 085272c..3dfad51 100644
--- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JDBCLoader.java
+++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JdbcLoader.java
@@ -15,27 +15,27 @@
package org.apache.geode.connectors.jdbc;
import org.apache.geode.cache.LoaderHelper;
-import org.apache.geode.connectors.jdbc.internal.JDBCManager;
+import org.apache.geode.connectors.jdbc.internal.ConnectionManager;
import java.util.Properties;
import org.apache.geode.cache.CacheLoader;
import org.apache.geode.cache.CacheLoaderException;
-import org.apache.geode.connectors.jdbc.internal.SQLHandler;
+import org.apache.geode.connectors.jdbc.internal.SqlHandler;
/*
* This class provides loading from a data source using JDBC.
*
* @since Geode 1.4
*/
-public class JDBCLoader<K, V> implements CacheLoader<K, V> {
- private JDBCManager manager;
- private SQLHandler sqlHandler;
+public class JdbcLoader<K, V> implements CacheLoader<K, V> {
+ private ConnectionManager manager;
+ private SqlHandler sqlHandler;
// Constructor for test purposes only
- JDBCLoader(JDBCManager manager) {
+ JdbcLoader(ConnectionManager manager) {
this.manager = manager;
- sqlHandler = new SQLHandler(manager);
+ sqlHandler = new SqlHandler(manager);
}
@Override
@@ -60,7 +60,7 @@ public class JDBCLoader<K, V> implements CacheLoader<K, V> {
public void init(Properties props) {
/*
* JDBCConfiguration config = new JDBCConfiguration(props); this.manager = new
- * JDBCManager(config);
+ * ConnectionManager(config);
*/
// TODO: make this get the ConfigurationService?
};
diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JDBCSynchronousWriter.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JdbcSynchronousWriter.java
similarity index 88%
rename from geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JDBCSynchronousWriter.java
rename to geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JdbcSynchronousWriter.java
index a77c95b..cf16152 100644
--- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JDBCSynchronousWriter.java
+++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/JdbcSynchronousWriter.java
@@ -23,8 +23,8 @@ import org.apache.geode.cache.EntryEvent;
import org.apache.geode.cache.RegionEvent;
import org.apache.geode.cache.SerializedCacheValue;
import org.apache.geode.cache.query.internal.DefaultQuery;
-import org.apache.geode.connectors.jdbc.internal.JDBCManager;
-import org.apache.geode.connectors.jdbc.internal.SQLHandler;
+import org.apache.geode.connectors.jdbc.internal.ConnectionManager;
+import org.apache.geode.connectors.jdbc.internal.SqlHandler;
import org.apache.geode.pdx.PdxInstance;
/*
@@ -32,21 +32,21 @@ import org.apache.geode.pdx.PdxInstance;
*
* @since Geode 1.4
*/
-public class JDBCSynchronousWriter<K, V> implements CacheWriter<K, V> {
- private JDBCManager manager;
- private SQLHandler sqlHandler;
+public class JdbcSynchronousWriter<K, V> implements CacheWriter<K, V> {
+ private ConnectionManager manager;
+ private SqlHandler sqlHandler;
// Constructor for test purposes only
- JDBCSynchronousWriter(JDBCManager manager) {
+ JdbcSynchronousWriter(ConnectionManager manager) {
this.manager = manager;
- sqlHandler = new SQLHandler(manager);
+ sqlHandler = new SqlHandler(manager);
}
@Override
public void init(Properties props) {
/*
* JDBCConfiguration config = new JDBCConfiguration(props); this.manager = new
- * JDBCManager(config);
+ * ConnectionManager(config);
*/
}
diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/JDBCConfigurationService.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/ConfigurationService.java
similarity index 71%
rename from geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/JDBCConfigurationService.java
rename to geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/ConfigurationService.java
index 0509566..d1f4d92 100644
--- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/JDBCConfigurationService.java
+++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/ConfigurationService.java
@@ -16,25 +16,25 @@ package org.apache.geode.connectors.jdbc.internal;
import java.util.Map;
import java.util.concurrent.ConcurrentHashMap;
-public class JDBCConfigurationService {
+public class ConfigurationService {
- private final Map<String, JDBCConnectionConfiguration> connectionsByName =
+ private final Map<String, ConnectionConfiguration> connectionsByName =
new ConcurrentHashMap<>();
- private final Map<String, JDBCRegionMapping> mappingsByRegion = new ConcurrentHashMap<>();
+ private final Map<String, RegionMapping> mappingsByRegion = new ConcurrentHashMap<>();
- JDBCConnectionConfiguration getConnectionConfig(String connectionName) {
+ ConnectionConfiguration getConnectionConfig(String connectionName) {
return connectionsByName.get(connectionName);
}
- JDBCRegionMapping getMappingForRegion(String regionName) {
+ RegionMapping getMappingForRegion(String regionName) {
return mappingsByRegion.get(regionName);
}
- void addOrUpdateConnectionConfig(JDBCConnectionConfiguration config) {
+ void addOrUpdateConnectionConfig(ConnectionConfiguration config) {
connectionsByName.put(config.getName(), config);
}
- void addOrUpdateRegionMapping(JDBCRegionMapping mapping) {
+ void addOrUpdateRegionMapping(RegionMapping mapping) {
mappingsByRegion.put(mapping.getRegionName(), mapping);
}
}
diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/JDBCConnectionConfiguration.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/ConnectionConfiguration.java
similarity index 92%
rename from geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/JDBCConnectionConfiguration.java
rename to geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/ConnectionConfiguration.java
index c75aefe..f1c937f 100644
--- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/JDBCConnectionConfiguration.java
+++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/ConnectionConfiguration.java
@@ -12,8 +12,8 @@
*
*/
package org.apache.geode.connectors.jdbc.internal;
-
-class JDBCConnectionConfiguration {
+//TODO consider providing a builder for this class and make everything final
+class ConnectionConfiguration {
private String name;
private String url;
diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/JDBCManager.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/ConnectionManager.java
similarity index 87%
rename from geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/JDBCManager.java
rename to geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/ConnectionManager.java
index 7f16ad3..6ce700d 100644
--- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/JDBCManager.java
+++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/ConnectionManager.java
@@ -31,25 +31,25 @@ import java.util.concurrent.ConcurrentMap;
import org.apache.geode.cache.Operation;
import org.apache.geode.pdx.PdxInstance;
-public class JDBCManager {
+public class ConnectionManager {
- private final JDBCConfigurationService configService;
+ private final ConfigurationService configService;
- private Map<String, Connection> connectionMap = new ConcurrentHashMap<>();
+ private final Map<String, Connection> connectionMap = new ConcurrentHashMap<>();
private final ConcurrentMap<String, String> tableToPrimaryKeyMap = new ConcurrentHashMap<>();
private final ThreadLocal<PreparedStatementCache> preparedStatementCache = new ThreadLocal<>();
- public JDBCManager(JDBCConfigurationService configService) {
+ public ConnectionManager(ConfigurationService configService) {
this.configService = configService;
}
- JDBCRegionMapping getMappingForRegion(String regionName) {
+ RegionMapping getMappingForRegion(String regionName) {
return configService.getMappingForRegion(regionName);
}
- Connection getConnection(JDBCConnectionConfiguration config) {
+ Connection getConnection(ConnectionConfiguration config) {
Connection connection = connectionMap.get(config.getName());
try {
if (connection != null && !connection.isClosed()) {
@@ -61,7 +61,7 @@ public class JDBCManager {
return getNewConnection(config);
}
- private synchronized Connection getNewConnection(JDBCConnectionConfiguration config) {
+ private synchronized Connection getNewConnection(ConnectionConfiguration config) {
Connection connection;
try {
connection = getSQLConnection(config);
@@ -74,12 +74,12 @@ public class JDBCManager {
}
// package protected for testing purposes only
- Connection getSQLConnection(JDBCConnectionConfiguration config) throws SQLException {
+ Connection getSQLConnection(ConnectionConfiguration config) throws SQLException {
return DriverManager.getConnection(config.getUrl(), config.getUser(), config.getPassword());
}
- List<ColumnValue> getColumnToValueList(JDBCConnectionConfiguration config,
- JDBCRegionMapping regionMapping, Object key, PdxInstance value, Operation operation) {
+ List<ColumnValue> getColumnToValueList(ConnectionConfiguration config,
+ RegionMapping regionMapping, Object key, PdxInstance value, Operation operation) {
String keyColumnName = getKeyColumnName(config, regionMapping.getTableName());
ColumnValue keyCV = new ColumnValue(true, keyColumnName, key);
if (operation.isDestroy() || operation.isGet()) {
@@ -106,13 +106,13 @@ public class JDBCManager {
return columnName.toLowerCase();
}
- String getKeyColumnName(JDBCConnectionConfiguration connectionConfig, String tableName) {
+ String getKeyColumnName(ConnectionConfiguration connectionConfig, String tableName) {
return tableToPrimaryKeyMap.computeIfAbsent(tableName, k -> {
return computeKeyColumnName(connectionConfig, k);
});
}
- private String computeKeyColumnName(JDBCConnectionConfiguration connectionConfig,
+ private String computeKeyColumnName(ConnectionConfiguration connectionConfig,
String tableName) {
// TODO: check config for key column
String key;
@@ -196,7 +196,7 @@ public class JDBCManager {
}
}
- JDBCConnectionConfiguration getConnectionConfig(String connectionConfigName) {
+ ConnectionConfiguration getConnectionConfig(String connectionConfigName) {
return configService.getConnectionConfig(connectionConfigName);
}
diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/JDBCRegionMapping.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/RegionMapping.java
similarity index 92%
rename from geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/JDBCRegionMapping.java
rename to geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/RegionMapping.java
index ba8fe6f..9fcc2f6 100644
--- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/JDBCRegionMapping.java
+++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/RegionMapping.java
@@ -15,14 +15,14 @@ package org.apache.geode.connectors.jdbc.internal;
import java.util.HashMap;
import java.util.Map;
-
-class JDBCRegionMapping {
+//TODO consider providing a builder for this class and make everything final
+class RegionMapping {
private String regionName;
private String pdxClassName;
private String tableName;
private String connectionConfigName;
private boolean primaryKeyInValue;
- private Map<String, String> fieldToColumnMap = new HashMap<>();
+ private final Map<String, String> fieldToColumnMap = new HashMap<>();
void setConnectionConfigName(String connectionConfigName) {
this.connectionConfigName = connectionConfigName;
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
similarity index 93%
rename from geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/SQLHandler.java
rename to geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/SqlHandler.java
index a214968..382cbd5 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
@@ -26,10 +26,10 @@ import org.apache.geode.pdx.PdxInstance;
import org.apache.geode.pdx.PdxInstanceFactory;
import org.apache.geode.pdx.internal.PdxInstanceImpl;
-public class SQLHandler {
- private JDBCManager manager;
+public class SqlHandler {
+ private ConnectionManager manager;
- public SQLHandler(JDBCManager manager) {
+ public SqlHandler(ConnectionManager manager) {
this.manager = manager;
}
@@ -38,8 +38,8 @@ public class SQLHandler {
throw new IllegalArgumentException("Key for query cannot be null");
}
- JDBCRegionMapping regionMapping = manager.getMappingForRegion(region.getName());
- JDBCConnectionConfiguration connectionConfig =
+ RegionMapping regionMapping = manager.getMappingForRegion(region.getName());
+ ConnectionConfiguration connectionConfig =
manager.getConnectionConfig(regionMapping.getConnectionConfigName());
List<ColumnValue> columnList =
@@ -52,7 +52,7 @@ public class SQLHandler {
return executeReadStatement(statement, columnList, factory, regionMapping, keyColumnName);
}
- private PdxInstanceFactory getPdxInstanceFactory(Region region, JDBCRegionMapping regionMapping) {
+ private PdxInstanceFactory getPdxInstanceFactory(Region region, RegionMapping regionMapping) {
InternalCache cache = (InternalCache) region.getRegionService();
String valueClassName = regionMapping.getPdxClassName();
PdxInstanceFactory factory;
@@ -65,7 +65,7 @@ public class SQLHandler {
}
private PdxInstance executeReadStatement(PreparedStatement statement,
- List<ColumnValue> columnList, PdxInstanceFactory factory, JDBCRegionMapping regionMapping,
+ List<ColumnValue> columnList, PdxInstanceFactory factory, RegionMapping regionMapping,
String keyColumnName) {
PdxInstance pdxInstance = null;
synchronized (statement) {
@@ -113,9 +113,9 @@ public class SQLHandler {
if (value == null && operation != Operation.DESTROY) {
throw new IllegalArgumentException("PdxInstance cannot be null for non-destroy operations");
}
- JDBCRegionMapping regionMapping = manager.getMappingForRegion(region.getName());
+ RegionMapping regionMapping = manager.getMappingForRegion(region.getName());
final String tableName = regionMapping.getTableName();
- JDBCConnectionConfiguration connectionConfig =
+ ConnectionConfiguration connectionConfig =
manager.getConnectionConfig(regionMapping.getConnectionConfigName());
List<ColumnValue> columnList =
manager.getColumnToValueList(connectionConfig, regionMapping, key, value, operation);
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JDBCLoaderIntegrationTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JDBCLoaderIntegrationTest.java
deleted file mode 100644
index ac9508c..0000000
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JDBCLoaderIntegrationTest.java
+++ /dev/null
@@ -1,145 +0,0 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
- * agreements. See the NOTICE file distributed with this work for additional information regarding
- * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance with the License. You may obtain a
- * copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software distributed under the License
- * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
- * or implied. See the License for the specific language governing permissions and limitations under
- * the License.
- */
-package org.apache.geode.connectors.jdbc;
-
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.assertj.core.api.Assertions.*;
-
-import java.sql.*;
-import java.util.Properties;
-
-import org.junit.*;
-import org.junit.experimental.categories.Category;
-import org.apache.geode.cache.Cache;
-import org.apache.geode.cache.CacheFactory;
-import org.apache.geode.cache.Region;
-import org.apache.geode.cache.RegionFactory;
-import org.apache.geode.cache.RegionShortcut;
-import org.apache.geode.connectors.jdbc.internal.JDBCManager;
-import org.apache.geode.connectors.jdbc.internal.TestConfigService;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
-import org.apache.geode.pdx.PdxInstance;
-import org.apache.geode.test.junit.categories.IntegrationTest;
-
-@Category(IntegrationTest.class)
-public class JDBCLoaderIntegrationTest {
- private JDBCLoader<String, String> jdbcLoader;
- private Cache cache;
- private Connection conn;
- private Statement stmt;
- private String dbName = "DerbyDB";
- private String regionTableName = "employees";
- private String connectionURL = "jdbc:derby:memory:" + dbName + ";create=true";
-
- @Before
- public void setup() throws Exception {
- try {
- cache = CacheFactory.getAnyInstance();
- } catch (Exception e) {
- // ignore
- }
- if (null == cache) {
- cache = (GemFireCacheImpl) new CacheFactory().setPdxReadSerialized(false).set(MCAST_PORT, "0")
- .create();
- }
- setupDB();
- }
-
- @After
- public void tearDown() throws Exception {
- if (cache != null && !cache.isClosed()) {
- cache.close();
- cache = null;
- }
- closeDB();
- }
-
- public void setupDB() throws Exception {
- conn = DriverManager.getConnection(connectionURL);
- stmt = conn.createStatement();
- stmt.execute("Create Table " + regionTableName
- + " (id varchar(10) primary key not null, name varchar(10), age int)");
- }
-
- public void closeDB() throws Exception {
- if (stmt == null) {
- stmt = conn.createStatement();
- }
- stmt.execute("Drop table " + regionTableName);
- stmt.close();
-
- if (conn != null) {
- conn.close();
- }
- }
-
- private Properties getRequiredProperties() {
- Properties props = new Properties();
- props.setProperty("url", this.connectionURL);
- return props;
- }
-
- private Region createRegionWithJDBCLoader(String regionName, Properties props) {
- this.jdbcLoader = new JDBCLoader<>(createManager());
- this.jdbcLoader.init(props);
- RegionFactory<String, String> rf = cache.createRegionFactory(RegionShortcut.REPLICATE);
- rf.setCacheLoader(jdbcLoader);
- return rf.create(regionName);
- }
-
- @Test
- public void verifySimpleGet() throws SQLException {
- stmt.execute("Insert into " + regionTableName + " values('1', 'Emp1', 21)");
- Region region = createRegionWithJDBCLoader(this.regionTableName, getRequiredProperties());
- Object result = region.get("1");
- assertThat(result).isNotNull();
- PdxInstance pdx = (PdxInstance) result;
- assertThat(pdx.getField("name")).isEqualTo("Emp1");
- assertThat(pdx.getField("age")).isEqualTo(21);
- }
-
- @Test
- public void verifySimpleMiss() throws SQLException {
- Region region = createRegionWithJDBCLoader(this.regionTableName, getRequiredProperties());
- Object result = region.get("1");
- assertThat(result).isNull();
- }
-
- private void validateTableRowCount(int expected) throws Exception {
- ResultSet rs = stmt.executeQuery("select count(*) from " + regionTableName);
- rs.next();
- int size = rs.getInt(1);
- assertThat(size).isEqualTo(expected);
- }
-
- private void printTable() throws Exception {
- ResultSet rs = stmt.executeQuery("select * from " + regionTableName);
- ResultSetMetaData rsmd = rs.getMetaData();
- int columnsNumber = rsmd.getColumnCount();
- while (rs.next()) {
- for (int i = 1; i <= columnsNumber; i++) {
- if (i > 1)
- System.out.print(", ");
- String columnValue = rs.getString(i);
- System.out.print(rsmd.getColumnName(i) + ": " + columnValue);
- }
- System.out.println("");
- }
- }
-
- private JDBCManager createManager() {
- return new JDBCManager(TestConfigService.getTestConfigService());
- }
-}
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JDBCAsyncWriterIntegrationTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterIntegrationTest.java
similarity index 70%
rename from geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JDBCAsyncWriterIntegrationTest.java
rename to geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterIntegrationTest.java
index 1a228a6..96e5328 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JDBCAsyncWriterIntegrationTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcAsyncWriterIntegrationTest.java
@@ -14,94 +14,75 @@
*/
package org.apache.geode.connectors.jdbc;
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
-import java.sql.*;
-import java.util.Properties;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
import java.util.concurrent.TimeUnit;
-import org.junit.*;
+import org.awaitility.Awaitility;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
import org.junit.experimental.categories.Category;
+
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionFactory;
import org.apache.geode.cache.RegionShortcut;
-import org.apache.geode.connectors.jdbc.JDBCAsyncWriter;
-import org.apache.geode.connectors.jdbc.internal.JDBCConfigurationService;
-import org.apache.geode.connectors.jdbc.internal.JDBCManager;
+import org.apache.geode.connectors.jdbc.internal.ConnectionManager;
import org.apache.geode.connectors.jdbc.internal.TestConfigService;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.pdx.PdxInstance;
import org.apache.geode.pdx.PdxReader;
import org.apache.geode.pdx.PdxSerializable;
import org.apache.geode.pdx.PdxSerializationException;
import org.apache.geode.pdx.PdxWriter;
import org.apache.geode.test.junit.categories.IntegrationTest;
-import org.awaitility.Awaitility;
@Category(IntegrationTest.class)
-public class JDBCAsyncWriterIntegrationTest {
+public class JdbcAsyncWriterIntegrationTest {
private Cache cache;
- private Connection conn;
- private Statement stmt;
- JDBCAsyncWriter jdbcWriter;
+ private Connection connection;
+ private Statement statement;
+ private JdbcAsyncWriter jdbcWriter;
private String dbName = "DerbyDB";
private String regionTableName = "employees";
private String connectionURL = "jdbc:derby:memory:" + dbName + ";create=true";
@Before
public void setup() throws Exception {
- try {
- cache = CacheFactory.getAnyInstance();
- } catch (Exception e) {
- // ignore
- }
- if (null == cache) {
- cache = (GemFireCacheImpl) new CacheFactory().setPdxReadSerialized(false).set(MCAST_PORT, "0")
- .create();
- }
- setupDB();
+ cache = new CacheFactory().setPdxReadSerialized(false).create();
+ connection = DriverManager.getConnection(connectionURL);
+ statement = connection.createStatement();
+ statement.execute("Create Table " + regionTableName
+ + " (id varchar(10) primary key not null, name varchar(10), age int)");
}
@After
public void tearDown() throws Exception {
- if (cache != null && !cache.isClosed()) {
- cache.close();
- cache = null;
- }
+ cache.close();
closeDB();
}
- public void setupDB() throws Exception {
- conn = DriverManager.getConnection(connectionURL);
- stmt = conn.createStatement();
- stmt.execute("Create Table " + regionTableName
- + " (id varchar(10) primary key not null, name varchar(10), age int)");
- }
-
- public void closeDB() throws Exception {
- if (stmt == null) {
- stmt = conn.createStatement();
+ private void closeDB() throws Exception {
+ if (statement == null) {
+ statement = connection.createStatement();
}
- stmt.execute("Drop table " + regionTableName);
- stmt.close();
+ statement.execute("Drop table " + regionTableName);
+ statement.close();
- if (conn != null) {
- conn.close();
+ if (connection != null) {
+ connection.close();
}
}
- private Properties getRequiredProperties() {
- Properties props = new Properties();
- props.setProperty("url", this.connectionURL);
- return props;
- }
-
@Test
public void validateJDBCAsyncWriterTotalEvents() {
- Region employees = createRegionWithJDBCAsyncWriter(regionTableName, getRequiredProperties());
+ Region<String, PdxInstance> employees = createRegionWithJDBCAsyncWriter(regionTableName);
PdxInstance pdx1 = cache.createPdxInstanceFactory("Employee").writeString("name", "Emp1")
.writeInt("age", 55).create();
PdxInstance pdx2 = cache.createPdxInstanceFactory("Employee").writeString("name", "Emp2")
@@ -115,7 +96,7 @@ public class JDBCAsyncWriterIntegrationTest {
@Test
public void canInsertIntoTable() throws Exception {
- Region employees = createRegionWithJDBCAsyncWriter(regionTableName, getRequiredProperties());
+ Region<String, PdxInstance> employees = createRegionWithJDBCAsyncWriter(regionTableName);
PdxInstance pdx1 = cache.createPdxInstanceFactory("Employee").writeString("name", "Emp1")
.writeInt("age", 55).create();
PdxInstance pdx2 = cache.createPdxInstanceFactory("Employee").writeString("name", "Emp2")
@@ -126,7 +107,7 @@ public class JDBCAsyncWriterIntegrationTest {
Awaitility.await().atMost(30, TimeUnit.SECONDS)
.until(() -> assertThat(jdbcWriter.getSuccessfulEvents()).isEqualTo(2));
- ResultSet rs = stmt.executeQuery("select * from " + regionTableName + " order by id asc");
+ ResultSet rs = statement.executeQuery("select * from " + regionTableName + " order by id asc");
assertThat(rs.next()).isTrue();
assertThat(rs.getString("id")).isEqualTo("1");
assertThat(rs.getString("name")).isEqualTo("Emp1");
@@ -140,7 +121,7 @@ public class JDBCAsyncWriterIntegrationTest {
@Test
public void verifyThatPdxFieldNamedSameAsPrimaryKeyIsIgnored() throws Exception {
- Region employees = createRegionWithJDBCAsyncWriter(regionTableName, getRequiredProperties());
+ Region<String, PdxInstance> employees = createRegionWithJDBCAsyncWriter(regionTableName);
PdxInstance pdx1 = cache.createPdxInstanceFactory("Employee").writeString("name", "Emp1")
.writeInt("age", 55).writeInt("id", 3).create();
employees.put("1", pdx1);
@@ -148,7 +129,7 @@ public class JDBCAsyncWriterIntegrationTest {
Awaitility.await().atMost(30, TimeUnit.SECONDS)
.until(() -> assertThat(jdbcWriter.getSuccessfulEvents()).isEqualTo(1));
- ResultSet rs = stmt.executeQuery("select * from " + regionTableName + " order by id asc");
+ ResultSet rs = statement.executeQuery("select * from " + regionTableName + " order by id asc");
assertThat(rs.next()).isTrue();
assertThat(rs.getString("id")).isEqualTo("1");
assertThat(rs.getString("name")).isEqualTo("Emp1");
@@ -158,7 +139,7 @@ public class JDBCAsyncWriterIntegrationTest {
@Test
public void putNonPdxInstanceFails() {
- Region employees = createRegionWithJDBCAsyncWriter(regionTableName, getRequiredProperties());
+ Region employees = createRegionWithJDBCAsyncWriter(regionTableName);
employees.put("1", "non pdx instance");
Awaitility.await().atMost(30, TimeUnit.SECONDS)
@@ -168,14 +149,14 @@ public class JDBCAsyncWriterIntegrationTest {
@Test
public void putNonPdxInstanceThatIsPdxSerializable() throws SQLException {
- Region employees = createRegionWithJDBCAsyncWriter(regionTableName, getRequiredProperties());
+ Region employees = createRegionWithJDBCAsyncWriter(regionTableName);
Object value = new TestEmployee("Emp2", 22);
employees.put("2", value);
Awaitility.await().atMost(30, TimeUnit.SECONDS)
.until(() -> assertThat(jdbcWriter.getSuccessfulEvents()).isEqualTo(1));
- ResultSet rs = stmt.executeQuery("select * from " + regionTableName + " order by id asc");
+ ResultSet rs = statement.executeQuery("select * from " + regionTableName + " order by id asc");
assertThat(rs.next()).isTrue();
assertThat(rs.getString("id")).isEqualTo("2");
assertThat(rs.getString("name")).isEqualTo("Emp2");
@@ -183,31 +164,9 @@ public class JDBCAsyncWriterIntegrationTest {
assertThat(rs.next()).isFalse();
}
- public static class TestEmployee implements PdxSerializable {
- private String name;
- private int age;
-
- public TestEmployee(String name, int age) {
- this.name = name;
- this.age = age;
- }
-
- @Override
- public void toData(PdxWriter writer) {
- writer.writeString("name", this.name);
- writer.writeInt("age", this.age);
- }
-
- @Override
- public void fromData(PdxReader reader) {
- this.name = reader.readString("name");
- this.age = reader.readInt("age");
- }
- }
-
@Test
public void canDestroyFromTable() throws Exception {
- Region employees = createRegionWithJDBCAsyncWriter(regionTableName, getRequiredProperties());
+ Region<String, PdxInstance> employees = createRegionWithJDBCAsyncWriter(regionTableName);
PdxInstance pdx1 = cache.createPdxInstanceFactory("Employee").writeString("name", "Emp1")
.writeInt("age", 55).create();
PdxInstance pdx2 = cache.createPdxInstanceFactory("Employee").writeString("name", "Emp2")
@@ -229,7 +188,7 @@ public class JDBCAsyncWriterIntegrationTest {
Awaitility.await().atMost(30, TimeUnit.SECONDS)
.until(() -> assertThat(jdbcWriter.getSuccessfulEvents()).isEqualTo(3));
- ResultSet rs = stmt.executeQuery("select * from " + regionTableName + " order by id asc");
+ ResultSet rs = statement.executeQuery("select * from " + regionTableName + " order by id asc");
assertThat(rs.next()).isTrue();
assertThat(rs.getString("id")).isEqualTo("2");
assertThat(rs.getString("name")).isEqualTo("Emp2");
@@ -239,7 +198,7 @@ public class JDBCAsyncWriterIntegrationTest {
@Test
public void canUpdateTable() throws Exception {
- Region employees = createRegionWithJDBCAsyncWriter(regionTableName, getRequiredProperties());
+ Region<String, PdxInstance> employees = createRegionWithJDBCAsyncWriter(regionTableName);
PdxInstance pdx1 = cache.createPdxInstanceFactory("Employee").writeString("name", "Emp1")
.writeInt("age", 55).create();
employees.put("1", pdx1);
@@ -260,7 +219,7 @@ public class JDBCAsyncWriterIntegrationTest {
Awaitility.await().atMost(30, TimeUnit.SECONDS)
.until(() -> assertThat(jdbcWriter.getSuccessfulEvents()).isEqualTo(2));
- ResultSet rs = stmt.executeQuery("select * from " + regionTableName + " order by id asc");
+ ResultSet rs = statement.executeQuery("select * from " + regionTableName + " order by id asc");
assertThat(rs.next()).isTrue();
assertThat(rs.getObject("age")).isEqualTo(72);
assertThat(rs.next()).isFalse();
@@ -268,7 +227,7 @@ public class JDBCAsyncWriterIntegrationTest {
@Test
public void canUpdateBecomeInsert() throws Exception {
- Region employees = createRegionWithJDBCAsyncWriter(regionTableName, getRequiredProperties());
+ Region<String, PdxInstance> employees = createRegionWithJDBCAsyncWriter(regionTableName);
PdxInstance pdx1 = cache.createPdxInstanceFactory("Employee").writeString("name", "Emp1")
.writeInt("age", 55).create();
employees.put("1", pdx1);
@@ -276,7 +235,7 @@ public class JDBCAsyncWriterIntegrationTest {
Awaitility.await().atMost(30, TimeUnit.SECONDS)
.until(() -> assertThat(jdbcWriter.getSuccessfulEvents()).isEqualTo(1));
- stmt.execute("delete from " + regionTableName + " where id = '1'");
+ statement.execute("delete from " + regionTableName + " where id = '1'");
validateTableRowCount(0);
PdxInstance pdx3 = cache.createPdxInstanceFactory("Employee").writeString("name", "Emp1")
@@ -292,7 +251,7 @@ public class JDBCAsyncWriterIntegrationTest {
Awaitility.await().atMost(10, TimeUnit.SECONDS)
.until(() -> assertThat(jdbcWriter.getSuccessfulEvents()).isEqualTo(2));
- ResultSet rs = stmt.executeQuery("select * from " + regionTableName + " order by id asc");
+ ResultSet rs = statement.executeQuery("select * from " + regionTableName + " order by id asc");
assertThat(rs.next()).isTrue();
assertThat(rs.getString("id")).isEqualTo("1");
assertThat(rs.getString("name")).isEqualTo("Emp1");
@@ -302,10 +261,10 @@ public class JDBCAsyncWriterIntegrationTest {
@Test
public void canInsertBecomeUpdate() throws Exception {
- stmt.execute("Insert into " + regionTableName + " values('1', 'bogus', 11)");
+ statement.execute("Insert into " + regionTableName + " values('1', 'bogus', 11)");
validateTableRowCount(1);
- Region employees = createRegionWithJDBCAsyncWriter(regionTableName, getRequiredProperties());
+ Region<String, PdxInstance> employees = createRegionWithJDBCAsyncWriter(regionTableName);
PdxInstance pdx1 = cache.createPdxInstanceFactory("Employee").writeString("name", "Emp1")
.writeInt("age", 55).create();
employees.put("1", pdx1);
@@ -313,7 +272,7 @@ public class JDBCAsyncWriterIntegrationTest {
Awaitility.await().atMost(30, TimeUnit.SECONDS)
.until(() -> assertThat(jdbcWriter.getSuccessfulEvents()).isEqualTo(1));
- ResultSet rs = stmt.executeQuery("select * from " + regionTableName + " order by id asc");
+ ResultSet rs = statement.executeQuery("select * from " + regionTableName + " order by id asc");
assertThat(rs.next()).isTrue();
assertThat(rs.getString("id")).isEqualTo("1");
assertThat(rs.getString("name")).isEqualTo("Emp1");
@@ -321,41 +280,48 @@ public class JDBCAsyncWriterIntegrationTest {
assertThat(rs.next()).isFalse();
}
- private Region createRegionWithJDBCAsyncWriter(String regionName, Properties props) {
- jdbcWriter = new JDBCAsyncWriter(createManager());
- // jdbcWriter.init(props);
+ private Region<String, PdxInstance> createRegionWithJDBCAsyncWriter(String regionName) {
+ jdbcWriter = new JdbcAsyncWriter(createManager());
cache.createAsyncEventQueueFactory().setBatchSize(1).setBatchTimeInterval(1)
.create("jdbcAsyncQueue", jdbcWriter);
- RegionFactory rf = cache.createRegionFactory(RegionShortcut.REPLICATE);
+ RegionFactory<String, PdxInstance> rf = cache.createRegionFactory(RegionShortcut.REPLICATE);
rf.addAsyncEventQueueId("jdbcAsyncQueue");
return rf.create(regionName);
}
private void validateTableRowCount(int expected) throws Exception {
- ResultSet rs = stmt.executeQuery("select count(*) from " + regionTableName);
+ ResultSet rs = statement.executeQuery("select count(*) from " + regionTableName);
rs.next();
int size = rs.getInt(1);
assertThat(size).isEqualTo(expected);
}
- private void printTable() throws Exception {
- ResultSet rs = stmt.executeQuery("select * from " + regionTableName);
- ResultSetMetaData rsmd = rs.getMetaData();
- int columnsNumber = rsmd.getColumnCount();
- while (rs.next()) {
- for (int i = 1; i <= columnsNumber; i++) {
- if (i > 1)
- System.out.print(", ");
- String columnValue = rs.getString(i);
- System.out.print(rsmd.getColumnName(i) + ": " + columnValue);
- }
- System.out.println("");
- }
+ private ConnectionManager createManager() {
+ return new ConnectionManager(TestConfigService.getTestConfigService());
}
- private JDBCManager createManager() {
- return new JDBCManager(TestConfigService.getTestConfigService());
+ public static class TestEmployee implements PdxSerializable {
+ private String name;
+ private int age;
+
+ TestEmployee(String name, int age) {
+ this.name = name;
+ this.age = age;
+ }
+
+ @Override
+ public void toData(PdxWriter writer) {
+ writer.writeString("name", this.name);
+ writer.writeInt("age", this.age);
+ }
+
+ @Override
+ public void fromData(PdxReader reader) {
+ this.name = reader.readString("name");
+ this.age = reader.readInt("age");
+ }
}
+
}
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcLoaderIntegrationTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcLoaderIntegrationTest.java
new file mode 100644
index 0000000..06e56d2
--- /dev/null
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcLoaderIntegrationTest.java
@@ -0,0 +1,104 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more contributor license
+ * agreements. See the NOTICE file distributed with this work for additional information regarding
+ * copyright ownership. The ASF licenses this file to You under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance with the License. You may obtain a
+ * copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software distributed under the License
+ * is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express
+ * or implied. See the License for the specific language governing permissions and limitations under
+ * the License.
+ */
+package org.apache.geode.connectors.jdbc;
+
+import static org.assertj.core.api.Assertions.assertThat;
+
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.SQLException;
+import java.sql.Statement;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.experimental.categories.Category;
+
+import org.apache.geode.cache.Cache;
+import org.apache.geode.cache.CacheFactory;
+import org.apache.geode.cache.Region;
+import org.apache.geode.cache.RegionFactory;
+import org.apache.geode.cache.RegionShortcut;
+import org.apache.geode.connectors.jdbc.internal.ConnectionManager;
+import org.apache.geode.connectors.jdbc.internal.TestConfigService;
+import org.apache.geode.pdx.PdxInstance;
+import org.apache.geode.test.junit.categories.IntegrationTest;
+
+@Category(IntegrationTest.class)
+public class JdbcLoaderIntegrationTest {
+ private JdbcLoader<String, String> jdbcLoader;
+ private Cache cache;
+ private Connection connection;
+ private Statement statement;
+ private String dbName = "DerbyDB";
+ private String regionTableName = "employees";
+ private String connectionURL = "jdbc:derby:memory:" + dbName + ";create=true";
+
+ @Before
+ public void setup() throws Exception {
+ cache = new CacheFactory().setPdxReadSerialized(false).create();
+ connection = DriverManager.getConnection(connectionURL);
+ statement = connection.createStatement();
+ statement.execute("Create Table " + regionTableName
+ + " (id varchar(10) primary key not null, name varchar(10), age int)");
+ }
+
+ @After
+ public void tearDown() throws Exception {
+ cache.close();
+ closeDB();
+ }
+
+ private void closeDB() throws Exception {
+ if (statement == null) {
+ statement = connection.createStatement();
+ }
+ statement.execute("Drop table " + regionTableName);
+ statement.close();
+
+ if (connection != null) {
+ connection.close();
+ }
+ }
+
+ private Region createRegionWithJDBCLoader(String regionName) {
+ this.jdbcLoader = new JdbcLoader<>(createManager());
+ RegionFactory<String, String> rf = cache.createRegionFactory(RegionShortcut.REPLICATE);
+ rf.setCacheLoader(jdbcLoader);
+ return rf.create(regionName);
+ }
+
+ @Test
+ public void verifySimpleGet() throws SQLException {
+ statement.execute("Insert into " + regionTableName + " values('1', 'Emp1', 21)");
+ Region region = createRegionWithJDBCLoader(this.regionTableName);
+ Object result = region.get("1");
+ assertThat(result).isNotNull();
+ PdxInstance pdx = (PdxInstance) result;
+ assertThat(pdx.getField("name")).isEqualTo("Emp1");
+ assertThat(pdx.getField("age")).isEqualTo(21);
+ }
+
+ @Test
+ public void verifySimpleMiss() throws SQLException {
+ Region region = createRegionWithJDBCLoader(this.regionTableName);
+ Object result = region.get("1");
+ assertThat(result).isNull();
+ }
+
+ private ConnectionManager createManager() {
+ return new ConnectionManager(TestConfigService.getTestConfigService());
+ }
+}
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JDBCSynchronousWriterIntegrationTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcSynchronousWriterIntegrationTest.java
similarity index 74%
rename from geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JDBCSynchronousWriterIntegrationTest.java
rename to geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcSynchronousWriterIntegrationTest.java
index a8162eb..fde2404 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JDBCSynchronousWriterIntegrationTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/JdbcSynchronousWriterIntegrationTest.java
@@ -16,26 +16,29 @@ package org.apache.geode.connectors.jdbc;
import static com.googlecode.catchexception.CatchException.catchException;
import static com.googlecode.catchexception.CatchException.caughtException;
-import static org.apache.geode.distributed.ConfigurationProperties.MCAST_PORT;
-import static org.assertj.core.api.Assertions.*;
+import static org.assertj.core.api.Assertions.assertThat;
-import java.sql.*;
+import java.sql.Connection;
+import java.sql.DriverManager;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Statement;
import java.util.HashMap;
+import java.util.Map;
import java.util.Properties;
-import org.junit.*;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
import org.junit.experimental.categories.Category;
-import com.sun.javafx.collections.MappingChange.Map;
-
import org.apache.geode.cache.Cache;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.cache.Region;
import org.apache.geode.cache.RegionFactory;
import org.apache.geode.cache.RegionShortcut;
-import org.apache.geode.connectors.jdbc.internal.JDBCManager;
+import org.apache.geode.connectors.jdbc.internal.ConnectionManager;
import org.apache.geode.connectors.jdbc.internal.TestConfigService;
-import org.apache.geode.internal.cache.GemFireCacheImpl;
import org.apache.geode.pdx.PdxInstance;
import org.apache.geode.pdx.PdxReader;
import org.apache.geode.pdx.PdxSerializable;
@@ -44,16 +47,15 @@ import org.apache.geode.pdx.PdxWriter;
import org.apache.geode.test.junit.categories.IntegrationTest;
@Category(IntegrationTest.class)
-public class JDBCSynchronousWriterIntegrationTest {
+public class JdbcSynchronousWriterIntegrationTest {
private Cache cache;
- private Connection conn;
+ private Connection connection;
- private Statement stmt;
+ private Statement statement;
- @SuppressWarnings("rawtypes")
- JDBCSynchronousWriter jdbcWriter;
+ private JdbcSynchronousWriter jdbcWriter;
private String dbName = "DerbyDB";
@@ -63,43 +65,28 @@ public class JDBCSynchronousWriterIntegrationTest {
@Before
public void setup() throws Exception {
- try {
- cache = CacheFactory.getAnyInstance();
- } catch (Exception e) {
- // ignore
- }
- if (null == cache) {
- cache = (GemFireCacheImpl) new CacheFactory().setPdxReadSerialized(false).set(MCAST_PORT, "0")
- .create();
- }
- setupDB();
+ cache = new CacheFactory().setPdxReadSerialized(false).create();
+ connection = DriverManager.getConnection(connectionURL);
+ statement = connection.createStatement();
+ statement.execute("Create Table " + regionTableName
+ + " (id varchar(10) primary key not null, name varchar(10), age int)");
}
@After
public void tearDown() throws Exception {
- if (cache != null && !cache.isClosed()) {
- cache.close();
- cache = null;
- }
+ cache.close();
closeDB();
}
- public void setupDB() throws Exception {
- conn = DriverManager.getConnection(connectionURL);
- stmt = conn.createStatement();
- stmt.execute("Create Table " + regionTableName
- + " (id varchar(10) primary key not null, name varchar(10), age int)");
- }
-
- public void closeDB() throws Exception {
- if (stmt == null) {
- stmt = conn.createStatement();
+ private void closeDB() throws Exception {
+ if (statement == null) {
+ statement = connection.createStatement();
}
- stmt.execute("Drop table " + regionTableName);
- stmt.close();
+ statement.execute("Drop table " + regionTableName);
+ statement.close();
- if (conn != null) {
- conn.close();
+ if (connection != null) {
+ connection.close();
}
}
@@ -111,7 +98,7 @@ public class JDBCSynchronousWriterIntegrationTest {
@Test
public void canInsertIntoTable() throws Exception {
- Region employees =
+ Region<String, PdxInstance> employees =
createRegionWithJDBCSynchronousWriter(regionTableName, getRequiredProperties());
PdxInstance pdx1 = cache.createPdxInstanceFactory("Employee").writeString("name", "Emp1")
.writeInt("age", 55).create();
@@ -120,7 +107,7 @@ public class JDBCSynchronousWriterIntegrationTest {
employees.put("1", pdx1);
employees.put("2", pdx2);
- ResultSet rs = stmt.executeQuery("select * from " + regionTableName + " order by id asc");
+ ResultSet rs = statement.executeQuery("select * from " + regionTableName + " order by id asc");
assertThat(rs.next()).isTrue();
assertThat(rs.getString("id")).isEqualTo("1");
assertThat(rs.getString("name")).isEqualTo("Emp1");
@@ -134,18 +121,18 @@ public class JDBCSynchronousWriterIntegrationTest {
@Test
public void canPutAllInsertIntoTable() throws Exception {
- Region employees =
+ Region<String, PdxInstance> employees =
createRegionWithJDBCSynchronousWriter(regionTableName, getRequiredProperties());
PdxInstance pdx1 = cache.createPdxInstanceFactory("Employee").writeString("name", "Emp1")
.writeInt("age", 55).create();
PdxInstance pdx2 = cache.createPdxInstanceFactory("Employee").writeString("name", "Emp2")
.writeInt("age", 21).create();
- HashMap putAllMap = new HashMap();
+ Map<String, PdxInstance> putAllMap = new HashMap<>();
putAllMap.put("1", pdx1);
putAllMap.put("2", pdx2);
employees.putAll(putAllMap);
- ResultSet rs = stmt.executeQuery("select * from " + regionTableName + " order by id asc");
+ ResultSet rs = statement.executeQuery("select * from " + regionTableName + " order by id asc");
assertThat(rs.next()).isTrue();
assertThat(rs.getString("id")).isEqualTo("1");
assertThat(rs.getString("name")).isEqualTo("Emp1");
@@ -159,13 +146,13 @@ public class JDBCSynchronousWriterIntegrationTest {
@Test
public void verifyThatPdxFieldNamedSameAsPrimaryKeyIsIgnored() throws Exception {
- Region employees =
+ Region<String, PdxInstance> employees =
createRegionWithJDBCSynchronousWriter(regionTableName, getRequiredProperties());
PdxInstance pdx1 = cache.createPdxInstanceFactory("Employee").writeString("name", "Emp1")
.writeInt("age", 55).writeInt("id", 3).create();
employees.put("1", pdx1);
- ResultSet rs = stmt.executeQuery("select * from " + regionTableName + " order by id asc");
+ ResultSet rs = statement.executeQuery("select * from " + regionTableName + " order by id asc");
assertThat(rs.next()).isTrue();
assertThat(rs.getString("id")).isEqualTo("1");
assertThat(rs.getString("name")).isEqualTo("Emp1");
@@ -190,7 +177,7 @@ public class JDBCSynchronousWriterIntegrationTest {
Object value = new TestEmployee("Emp2", 22);
employees.put("2", value);
- ResultSet rs = stmt.executeQuery("select * from " + regionTableName + " order by id asc");
+ ResultSet rs = statement.executeQuery("select * from " + regionTableName + " order by id asc");
assertThat(rs.next()).isTrue();
assertThat(rs.getString("id")).isEqualTo("2");
assertThat(rs.getString("name")).isEqualTo("Emp2");
@@ -202,7 +189,7 @@ public class JDBCSynchronousWriterIntegrationTest {
private String name;
private int age;
- public TestEmployee(String name, int age) {
+ TestEmployee(String name, int age) {
this.name = name;
this.age = age;
}
@@ -222,7 +209,7 @@ public class JDBCSynchronousWriterIntegrationTest {
@Test
public void canDestroyFromTable() throws Exception {
- Region employees =
+ Region<String, PdxInstance> employees =
createRegionWithJDBCSynchronousWriter(regionTableName, getRequiredProperties());
PdxInstance pdx1 = cache.createPdxInstanceFactory("Employee").writeString("name", "Emp1")
.writeInt("age", 55).create();
@@ -239,7 +226,7 @@ public class JDBCSynchronousWriterIntegrationTest {
// does not have a real class
}
- ResultSet rs = stmt.executeQuery("select * from " + regionTableName + " order by id asc");
+ ResultSet rs = statement.executeQuery("select * from " + regionTableName + " order by id asc");
assertThat(rs.next()).isTrue();
assertThat(rs.getString("id")).isEqualTo("2");
assertThat(rs.getString("name")).isEqualTo("Emp2");
@@ -249,7 +236,7 @@ public class JDBCSynchronousWriterIntegrationTest {
@Test
public void canUpdateTable() throws Exception {
- Region employees =
+ Region<String, PdxInstance> employees =
createRegionWithJDBCSynchronousWriter(regionTableName, getRequiredProperties());
PdxInstance pdx1 = cache.createPdxInstanceFactory("Employee").writeString("name", "Emp1")
.writeInt("age", 55).create();
@@ -265,7 +252,7 @@ public class JDBCSynchronousWriterIntegrationTest {
// does not have a real class
}
- ResultSet rs = stmt.executeQuery("select * from " + regionTableName + " order by id asc");
+ ResultSet rs = statement.executeQuery("select * from " + regionTableName + " order by id asc");
assertThat(rs.next()).isTrue();
assertThat(rs.getObject("age")).isEqualTo(72);
assertThat(rs.next()).isFalse();
@@ -273,13 +260,13 @@ public class JDBCSynchronousWriterIntegrationTest {
@Test
public void canUpdateBecomeInsert() throws Exception {
- Region employees =
+ Region<String, PdxInstance> employees =
createRegionWithJDBCSynchronousWriter(regionTableName, getRequiredProperties());
PdxInstance pdx1 = cache.createPdxInstanceFactory("Employee").writeString("name", "Emp1")
.writeInt("age", 55).create();
employees.put("1", pdx1);
- stmt.execute("delete from " + regionTableName + " where id = '1'");
+ statement.execute("delete from " + regionTableName + " where id = '1'");
validateTableRowCount(0);
PdxInstance pdx3 = cache.createPdxInstanceFactory("Employee").writeString("name", "Emp1")
@@ -292,7 +279,7 @@ public class JDBCSynchronousWriterIntegrationTest {
// does not have a real class
}
- ResultSet rs = stmt.executeQuery("select * from " + regionTableName + " order by id asc");
+ ResultSet rs = statement.executeQuery("select * from " + regionTableName + " order by id asc");
assertThat(rs.next()).isTrue();
assertThat(rs.getString("id")).isEqualTo("1");
assertThat(rs.getString("name")).isEqualTo("Emp1");
@@ -302,16 +289,16 @@ public class JDBCSynchronousWriterIntegrationTest {
@Test
public void canInsertBecomeUpdate() throws Exception {
- stmt.execute("Insert into " + regionTableName + " values('1', 'bogus', 11)");
+ statement.execute("Insert into " + regionTableName + " values('1', 'bogus', 11)");
validateTableRowCount(1);
- Region employees =
+ Region<String, PdxInstance> employees =
createRegionWithJDBCSynchronousWriter(regionTableName, getRequiredProperties());
PdxInstance pdx1 = cache.createPdxInstanceFactory("Employee").writeString("name", "Emp1")
.writeInt("age", 55).create();
employees.put("1", pdx1);
- ResultSet rs = stmt.executeQuery("select * from " + regionTableName + " order by id asc");
+ ResultSet rs = statement.executeQuery("select * from " + regionTableName + " order by id asc");
assertThat(rs.next()).isTrue();
assertThat(rs.getString("id")).isEqualTo("1");
assertThat(rs.getString("name")).isEqualTo("Emp1");
@@ -319,39 +306,24 @@ public class JDBCSynchronousWriterIntegrationTest {
assertThat(rs.next()).isFalse();
}
- private Region createRegionWithJDBCSynchronousWriter(String regionName, Properties props) {
- jdbcWriter = new JDBCSynchronousWriter(createManager());
+ private Region<String, PdxInstance> createRegionWithJDBCSynchronousWriter(String regionName, Properties props) {
+ jdbcWriter = new JdbcSynchronousWriter(createManager());
jdbcWriter.init(props);
- RegionFactory rf = cache.createRegionFactory(RegionShortcut.REPLICATE);
+ RegionFactory<String, PdxInstance> rf = cache.createRegionFactory(RegionShortcut.REPLICATE);
rf.setCacheWriter(jdbcWriter);
return rf.create(regionName);
}
private void validateTableRowCount(int expected) throws Exception {
- ResultSet rs = stmt.executeQuery("select count(*) from " + regionTableName);
+ ResultSet rs = statement.executeQuery("select count(*) from " + regionTableName);
rs.next();
int size = rs.getInt(1);
assertThat(size).isEqualTo(expected);
}
- private void printTable() throws Exception {
- ResultSet rs = stmt.executeQuery("select * from " + regionTableName);
- ResultSetMetaData rsmd = rs.getMetaData();
- int columnsNumber = rsmd.getColumnCount();
- while (rs.next()) {
- for (int i = 1; i <= columnsNumber; i++) {
- if (i > 1)
- System.out.print(", ");
- String columnValue = rs.getString(i);
- System.out.print(rsmd.getColumnName(i) + ": " + columnValue);
- }
- System.out.println("");
- }
- }
-
- private JDBCManager createManager() {
- return new JDBCManager(TestConfigService.getTestConfigService());
+ private ConnectionManager createManager() {
+ return new ConnectionManager(TestConfigService.getTestConfigService());
}
}
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/JDBCConfigurationServiceTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/ConfigurationServiceTest.java
similarity index 85%
rename from geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/JDBCConfigurationServiceTest.java
rename to geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/ConfigurationServiceTest.java
index ca1df04..cf8bbdb 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/JDBCConfigurationServiceTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/ConfigurationServiceTest.java
@@ -19,11 +19,11 @@ import static org.mockito.Mockito.when;
import org.junit.Test;
-public class JDBCConfigurationServiceTest {
+public class ConfigurationServiceTest {
private static final String TEST_CONFIG_NAME = "testConfig";
private static final String TEST_REGION_NAME = "testRegion";
- private JDBCConfigurationService service = new JDBCConfigurationService();
+ private ConfigurationService service = new ConfigurationService();
@Test
public void returnsNoConfigIfEmpty() {
@@ -37,7 +37,7 @@ public class JDBCConfigurationServiceTest {
@Test
public void returnsCorrectConfig() {
- JDBCConnectionConfiguration config = mock(JDBCConnectionConfiguration.class);
+ ConnectionConfiguration config = mock(ConnectionConfiguration.class);
when(config.getName()).thenReturn(TEST_CONFIG_NAME);
service.addOrUpdateConnectionConfig(config);
@@ -46,7 +46,7 @@ public class JDBCConfigurationServiceTest {
@Test
public void doesNotReturnConfigWithDifferentName() {
- JDBCConnectionConfiguration config = mock(JDBCConnectionConfiguration.class);
+ ConnectionConfiguration config = mock(ConnectionConfiguration.class);
when(config.getName()).thenReturn("theOtherConfig");
service.addOrUpdateConnectionConfig(config);
@@ -55,7 +55,7 @@ public class JDBCConfigurationServiceTest {
@Test
public void returnsCorrectMapping() {
- JDBCRegionMapping mapping = mock(JDBCRegionMapping.class);
+ RegionMapping mapping = mock(RegionMapping.class);
when(mapping.getRegionName()).thenReturn(TEST_REGION_NAME);
service.addOrUpdateRegionMapping(mapping);
@@ -64,7 +64,7 @@ public class JDBCConfigurationServiceTest {
@Test
public void doesNotReturnMappingForDifferentRegion() {
- JDBCRegionMapping mapping = mock(JDBCRegionMapping.class);
+ RegionMapping mapping = mock(RegionMapping.class);
when(mapping.getRegionName()).thenReturn("theOtherMapping");
service.addOrUpdateRegionMapping(mapping);
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/JDBCConnectionConfigurationTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/ConnectionConfigurationTest.java
similarity index 93%
rename from geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/JDBCConnectionConfigurationTest.java
rename to geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/ConnectionConfigurationTest.java
index 186ba13..c2f231b 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/JDBCConnectionConfigurationTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/ConnectionConfigurationTest.java
@@ -17,8 +17,8 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
-public class JDBCConnectionConfigurationTest {
- private JDBCConnectionConfiguration config = new JDBCConnectionConfiguration();
+public class ConnectionConfigurationTest {
+ private ConnectionConfiguration config = new ConnectionConfiguration();
@Test
public void initiatedWithNullValues() {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/JDBCManagerUnitTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/ConnectionManagerUnitTest.java
similarity index 93%
rename from geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/JDBCManagerUnitTest.java
rename to geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/ConnectionManagerUnitTest.java
index 73e78b0..9b2e8f4 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/JDBCManagerUnitTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/ConnectionManagerUnitTest.java
@@ -41,7 +41,7 @@ import org.apache.geode.pdx.PdxInstance;
import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
-public class JDBCManagerUnitTest {
+public class ConnectionManagerUnitTest {
private static final String REGION_NAME = "testRegion";
private static final String TABLE_NAME = "testTable";
private static final String CONFIG_NAME = "configName";
@@ -50,26 +50,26 @@ public class JDBCManagerUnitTest {
@Rule
public ExpectedException thrown = ExpectedException.none();
- private JDBCConfigurationService configService;
- private JDBCManager manager;
+ private ConfigurationService configService;
+ private ConnectionManager manager;
private Connection connection;
- private JDBCConnectionConfiguration connectionConfig;
- private JDBCRegionMapping mapping;
+ private ConnectionConfiguration connectionConfig;
+ private RegionMapping mapping;
private Object key = new Object();
private PdxInstance value = mock(PdxInstance.class);
@Before
public void setup() throws Exception {
- configService = mock(JDBCConfigurationService.class);
- manager = spy(new JDBCManager(configService));
+ configService = mock(ConfigurationService.class);
+ manager = spy(new ConnectionManager(configService));
connection = mock(Connection.class);
connectionConfig =
getTestConnectionConfig("name", "url", null, null);
doReturn(connection).when(manager).getSQLConnection(connectionConfig);
- mapping = mock(JDBCRegionMapping.class);
+ mapping = mock(RegionMapping.class);
when(mapping.getTableName()).thenReturn(TABLE_NAME);
}
@@ -102,7 +102,7 @@ public class JDBCManagerUnitTest {
@Test
public void retrievesDifferentConnectionForEachConfig() throws Exception {
Connection secondConnection = mock(Connection.class);
- JDBCConnectionConfiguration secondConnectionConfig =
+ ConnectionConfiguration secondConnectionConfig =
getTestConnectionConfig("newName", "url", null, null);
doReturn(secondConnection).when(manager).getSQLConnection(secondConnectionConfig);
@@ -127,7 +127,7 @@ public class JDBCManagerUnitTest {
@Test
public void closesAllConnections() throws Exception {
Connection secondConnection = mock(Connection.class);
- JDBCConnectionConfiguration secondConnectionConfig =
+ ConnectionConfiguration secondConnectionConfig =
getTestConnectionConfig("newName", "url", null, null);
doReturn(secondConnection).when(manager).getSQLConnection(secondConnectionConfig);
@@ -232,9 +232,9 @@ public class JDBCManagerUnitTest {
assertThat(columnValueList.get(1).getColumnName()).isEqualTo(KEY_COLUMN);
}
- private JDBCConnectionConfiguration getTestConnectionConfig(String name, String url, String user,
- String password) {
- JDBCConnectionConfiguration config = new JDBCConnectionConfiguration();
+ private ConnectionConfiguration getTestConnectionConfig(String name, String url, String user,
+ String password) {
+ ConnectionConfiguration config = new ConnectionConfiguration();
config.setName(name);
config.setUrl(url);
config.setUser(user);
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/PreparedStatementCacheTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/PreparedStatementCacheTest.java
index 55d4b0d..93dfbf6 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/PreparedStatementCacheTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/PreparedStatementCacheTest.java
@@ -13,7 +13,6 @@
*/
package org.apache.geode.connectors.jdbc.internal;
-import static org.assertj.core.api.Assertions.assertThat;
import static org.mockito.ArgumentMatchers.any;
import static org.mockito.Mockito.mock;
import static org.mockito.Mockito.times;
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/JDBCRegionMappingTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/RegionMappingTest.java
similarity index 96%
rename from geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/JDBCRegionMappingTest.java
rename to geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/RegionMappingTest.java
index e9a3ca7..f3c5907 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/JDBCRegionMappingTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/RegionMappingTest.java
@@ -17,8 +17,8 @@ import static org.assertj.core.api.Assertions.assertThat;
import org.junit.Test;
-public class JDBCRegionMappingTest {
- private JDBCRegionMapping mapping = new JDBCRegionMapping();
+public class RegionMappingTest {
+ private RegionMapping mapping = new RegionMapping();
@Test
public void initiatedWithNullValues() {
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
similarity index 97%
rename from geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SQLHandlerTest.java
rename to geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/SqlHandlerTest.java
index a31c880..10f0480 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
@@ -43,7 +43,7 @@ import org.apache.geode.pdx.PdxInstanceFactory;
import org.apache.geode.pdx.internal.PdxInstanceImpl;
import org.apache.geode.pdx.internal.PdxType;
-public class SQLHandlerTest {
+public class SqlHandlerTest {
private static final String REGION_NAME = "testRegion";
private static final String TABLE_NAME = "testTable";
private static final Object COLUMN_VALUE_1 = new Object();
@@ -54,21 +54,21 @@ public class SQLHandlerTest {
@Rule
public ExpectedException thrown = ExpectedException.none();
- private JDBCManager manager;
+ private ConnectionManager manager;
private Region region;
private InternalCache cache;
- private SQLHandler handler;
+ private SqlHandler handler;
private PreparedStatement statement;
- private JDBCRegionMapping regionMapping;
+ private RegionMapping regionMapping;
private PdxInstanceImpl value;
@Before
public void setup() throws Exception {
- manager = mock(JDBCManager.class);
+ manager = mock(ConnectionManager.class);
region = mock(Region.class);
cache = mock(InternalCache.class);
when(region.getRegionService()).thenReturn(cache);
- handler = new SQLHandler(manager);
+ handler = new SqlHandler(manager);
value = mock(PdxInstanceImpl.class);
when(value.getPdxType()).thenReturn(mock(PdxType.class));
setupManagerMock();
@@ -324,10 +324,10 @@ public class SQLHandlerTest {
}
private void setupManagerMock() throws SQLException {
- JDBCConnectionConfiguration connectionConfig = mock(JDBCConnectionConfiguration.class);
+ ConnectionConfiguration connectionConfig = mock(ConnectionConfiguration.class);
when(manager.getConnectionConfig(any())).thenReturn(connectionConfig);
- regionMapping = mock(JDBCRegionMapping.class);
+ regionMapping = mock(RegionMapping.class);
when(regionMapping.getRegionName()).thenReturn(REGION_NAME);
when(regionMapping.getTableName()).thenReturn(TABLE_NAME);
when(manager.getMappingForRegion(any())).thenReturn(regionMapping);
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/TestConfigService.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/TestConfigService.java
index 34efb6a..01cfe6d 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/TestConfigService.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/TestConfigService.java
@@ -20,15 +20,15 @@ public class TestConfigService {
private static final String CONNECTION_URL = "jdbc:derby:memory:" + DB_NAME + ";create=true";
private static final String CONNECTION_CONFIG_NAME = "testConnectionConfig";
- public static JDBCConfigurationService getTestConfigService() {
- JDBCConfigurationService service = new JDBCConfigurationService();
+ public static ConfigurationService getTestConfigService() {
+ ConfigurationService service = new ConfigurationService();
service.addOrUpdateConnectionConfig(createConnectionConfig());
service.addOrUpdateRegionMapping(createRegionMapping());
return service;
}
- private static JDBCRegionMapping createRegionMapping() {
- JDBCRegionMapping mapping = new JDBCRegionMapping();
+ private static RegionMapping createRegionMapping() {
+ RegionMapping mapping = new RegionMapping();
mapping.setConnectionConfigName(CONNECTION_CONFIG_NAME);
mapping.setTableName(REGION_TABLE_NAME);
mapping.setRegionName(REGION_NAME);
@@ -36,8 +36,8 @@ public class TestConfigService {
return mapping;
}
- private static JDBCConnectionConfiguration createConnectionConfig() {
- JDBCConnectionConfiguration config = new JDBCConnectionConfiguration();
+ private static ConnectionConfiguration createConnectionConfig() {
+ ConnectionConfiguration config = new ConnectionConfiguration();
config.setUrl(CONNECTION_URL);
config.setName(CONNECTION_CONFIG_NAME);
return config;
--
To stop receiving notification emails like this one, please contact
['"commits@geode.apache.org" <co...@geode.apache.org>'].