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/01/02 19:41:47 UTC
[geode] branch feature/GEODE-4009 updated (b35c6f0 -> 6ad6c7d)
This is an automated email from the ASF dual-hosted git repository.
dschneider pushed a change to branch feature/GEODE-4009
in repository https://gitbox.apache.org/repos/asf/geode.git.
from b35c6f0 Merge remote-tracking branch 'origin/develop' into feature/GEODE-4009
new bd95f06 renamed JdbcConnectorService to JdbcConnectorServiceImpl
new 6ad6c7d renamed InternalJdbcConnectorService to JdbcConnectorService
The 2 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.
Summary of changes:
.../jdbc/internal/AbstractJdbcCallback.java | 2 +-
.../internal/InternalJdbcConnectorService.java | 49 --------
.../jdbc/internal/JdbcConnectorService.java | 138 +++------------------
...rService.java => JdbcConnectorServiceImpl.java} | 4 +-
.../geode/connectors/jdbc/internal/SqlHandler.java | 6 +-
.../jdbc/internal/cli/AlterConnectionFunction.java | 4 +-
.../jdbc/internal/cli/AlterMappingFunction.java | 4 +-
.../internal/cli/CreateConnectionFunction.java | 6 +-
.../jdbc/internal/cli/CreateMappingFunction.java | 6 +-
.../internal/cli/DescribeConnectionFunction.java | 4 +-
.../jdbc/internal/cli/DescribeMappingFunction.java | 5 +-
.../internal/cli/DestroyConnectionFunction.java | 6 +-
.../jdbc/internal/cli/DestroyMappingFunction.java | 8 +-
.../cli/FunctionContextArgumentProvider.java | 6 +-
.../jdbc/internal/cli/JdbcCliFunction.java | 6 +-
.../jdbc/internal/cli/ListConnectionFunction.java | 8 +-
.../jdbc/internal/cli/ListMappingFunction.java | 9 +-
.../internal/xml/JdbcServiceConfiguration.java | 10 +-
.../jdbc/internal/AbstractJdbcCallbackTest.java | 2 +-
.../jdbc/internal/JdbcConnectorServiceTest.java | 4 +-
.../connectors/jdbc/internal/SqlHandlerTest.java | 4 +-
.../jdbc/internal/TestConfigService.java | 4 +-
.../cli/AlterConnectionCommandDUnitTest.java | 6 +-
.../cli/AlterConnectionCommandIntegrationTest.java | 4 +-
.../internal/cli/AlterConnectionFunctionTest.java | 8 +-
.../internal/cli/AlterMappingCommandDUnitTest.java | 6 +-
.../cli/AlterMappingCommandIntegrationTest.java | 4 +-
.../internal/cli/AlterMappingFunctionTest.java | 8 +-
.../cli/CreateConnectionCommandDUnitTest.java | 4 +-
.../CreateConnectionCommandIntegrationTest.java | 8 +-
.../internal/cli/CreateConnectionFunctionTest.java | 8 +-
.../cli/CreateMappingCommandDUnitTest.java | 4 +-
.../cli/CreateMappingCommandIntegrationTest.java | 8 +-
.../internal/cli/CreateMappingFunctionTest.java | 8 +-
.../cli/DescribeConnectionCommandDUnitTest.java | 4 +-
.../DescribeConnectionCommandIntegrationTest.java | 6 +-
.../cli/DescribeConnectionFunctionTest.java | 8 +-
.../cli/DescribeMappingCommandDUnitTest.java | 4 +-
.../cli/DescribeMappingCommandIntegrationTest.java | 6 +-
.../internal/cli/DescribeMappingFunctionTest.java | 8 +-
.../cli/DestroyConnectionCommandDUnitTest.java | 6 +-
.../DestroyConnectionCommandIntegrationTest.java | 6 +-
.../cli/DestroyConnectionFunctionTest.java | 8 +-
.../cli/DestroyMappingCommandDunitTest.java | 6 +-
.../cli/DestroyMappingCommandFunctionTest.java | 8 +-
.../cli/DestroyMappingCommandIntegrationTest.java | 6 +-
.../cli/FunctionContextArgumentProviderTest.java | 8 +-
.../jdbc/internal/cli/JdbcCliFunctionTest.java | 4 +-
.../cli/ListConnectionCommandDUnitTest.java | 6 +-
.../cli/ListConnectionCommandIntegrationTest.java | 6 +-
.../internal/cli/ListConnectionFunctionTest.java | 8 +-
.../internal/cli/ListMappingCommandDUnitTest.java | 6 +-
.../cli/ListMappingCommandIntegrationTest.java | 6 +-
.../jdbc/internal/cli/ListMappingFunctionTest.java | 8 +-
...onnectorServiceXmlGeneratorIntegrationTest.java | 22 ++--
.../JdbcConnectorServiceXmlIntegrationTest.java | 8 +-
.../internal/xml/JdbcServiceConfigurationTest.java | 8 +-
57 files changed, 187 insertions(+), 350 deletions(-)
delete mode 100644 geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/InternalJdbcConnectorService.java
copy geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/{JdbcConnectorService.java => JdbcConnectorServiceImpl.java} (97%)
--
To stop receiving notification emails like this one, please contact
['"commits@geode.apache.org" <co...@geode.apache.org>'].
[geode] 01/02: renamed JdbcConnectorService to
JdbcConnectorServiceImpl
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-4009
in repository https://gitbox.apache.org/repos/asf/geode.git
commit bd95f06cd4e343f1313f430cae1945c6011819be
Author: Darrel Schneider <ds...@pivotal.io>
AuthorDate: Tue Jan 2 11:33:32 2018 -0800
renamed JdbcConnectorService to JdbcConnectorServiceImpl
---
.../{JdbcConnectorService.java => JdbcConnectorServiceImpl.java} | 2 +-
.../geode/connectors/jdbc/internal/JdbcConnectorServiceTest.java | 4 ++--
.../apache/geode/connectors/jdbc/internal/TestConfigService.java | 4 ++--
.../jdbc/internal/xml/JdbcConnectorServiceXmlIntegrationTest.java | 6 +++---
4 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/JdbcConnectorService.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/JdbcConnectorServiceImpl.java
similarity index 98%
rename from geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/JdbcConnectorService.java
rename to geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/JdbcConnectorServiceImpl.java
index 7bf513b..11d15a6 100644
--- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/JdbcConnectorService.java
+++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/JdbcConnectorServiceImpl.java
@@ -29,7 +29,7 @@ import org.apache.geode.internal.cache.xmlcache.XmlGenerator;
import org.apache.geode.management.internal.beans.CacheServiceMBeanBase;
@Experimental
-public class JdbcConnectorService implements InternalJdbcConnectorService {
+public class JdbcConnectorServiceImpl implements InternalJdbcConnectorService {
private final Map<String, ConnectionConfiguration> connectionsByName = new ConcurrentHashMap<>();
private final Map<String, RegionMapping> mappingsByRegion = new ConcurrentHashMap<>();
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/JdbcConnectorServiceTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/JdbcConnectorServiceTest.java
index cbefbb0..7f1bb38 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/JdbcConnectorServiceTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/JdbcConnectorServiceTest.java
@@ -41,7 +41,7 @@ public class JdbcConnectorServiceTest {
private ConnectionConfiguration configToAlter;
private RegionMapping mapping;
- private JdbcConnectorService service;
+ private JdbcConnectorServiceImpl service;
@Before
public void setUp() throws Exception {
@@ -60,7 +60,7 @@ public class JdbcConnectorServiceTest {
when(config2.getName()).thenReturn(TEST_CONFIG_NAME);
when(mapping.getRegionName()).thenReturn(TEST_REGION_NAME);
- service = new JdbcConnectorService();
+ service = new JdbcConnectorServiceImpl();
service.init(cache);
}
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 09421a7..ec0e64e 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
@@ -32,12 +32,12 @@ 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 JdbcConnectorService getTestConfigService()
+ public static JdbcConnectorServiceImpl getTestConfigService()
throws ConnectionConfigExistsException, RegionMappingExistsException {
InternalCache cache = mock(InternalCache.class);
when(cache.getExtensionPoint()).thenReturn(mock(ExtensionPoint.class));
- JdbcConnectorService service = new JdbcConnectorService();
+ JdbcConnectorServiceImpl service = new JdbcConnectorServiceImpl();
service.init(cache);
service.createConnectionConfig(createConnectionConfig());
service.createRegionMapping(createRegionMapping());
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlIntegrationTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlIntegrationTest.java
index 796b706..6c29c52 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlIntegrationTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlIntegrationTest.java
@@ -35,7 +35,7 @@ import org.apache.geode.connectors.jdbc.internal.ConnectionConfigBuilder;
import org.apache.geode.connectors.jdbc.internal.ConnectionConfigExistsException;
import org.apache.geode.connectors.jdbc.internal.ConnectionConfiguration;
import org.apache.geode.connectors.jdbc.internal.InternalJdbcConnectorService;
-import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
+import org.apache.geode.connectors.jdbc.internal.JdbcConnectorServiceImpl;
import org.apache.geode.connectors.jdbc.internal.RegionMapping;
import org.apache.geode.connectors.jdbc.internal.RegionMappingBuilder;
import org.apache.geode.connectors.jdbc.internal.RegionMappingExistsException;
@@ -72,8 +72,8 @@ public class JdbcConnectorServiceXmlIntegrationTest {
@Test
public void canRecreateJdbcConnectorServiceFromXml() throws Exception {
createCacheUsingXml();
- JdbcConnectorService service =
- (JdbcConnectorService) cache.getExtensionPoint().getExtensions().iterator().next();
+ JdbcConnectorServiceImpl service =
+ (JdbcConnectorServiceImpl) cache.getExtensionPoint().getExtensions().iterator().next();
assertThat(service.getConnectionConfig(config1.getName())).isEqualTo(config1);
assertThat(service.getConnectionConfig(config2.getName())).isEqualTo(config2);
assertThat(service.getMappingForRegion(regionMapping1.getRegionName()))
--
To stop receiving notification emails like this one, please contact
"commits@geode.apache.org" <co...@geode.apache.org>.
[geode] 02/02: renamed InternalJdbcConnectorService to
JdbcConnectorService
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-4009
in repository https://gitbox.apache.org/repos/asf/geode.git
commit 6ad6c7dc17303f538e62c49b79c0209fbf427bc2
Author: Darrel Schneider <ds...@pivotal.io>
AuthorDate: Tue Jan 2 11:41:17 2018 -0800
renamed InternalJdbcConnectorService to JdbcConnectorService
---
.../jdbc/internal/AbstractJdbcCallback.java | 2 +-
...ectorService.java => JdbcConnectorService.java} | 2 +-
.../jdbc/internal/JdbcConnectorServiceImpl.java | 4 ++--
.../geode/connectors/jdbc/internal/SqlHandler.java | 6 +++---
.../jdbc/internal/cli/AlterConnectionFunction.java | 4 ++--
.../jdbc/internal/cli/AlterMappingFunction.java | 4 ++--
.../internal/cli/CreateConnectionFunction.java | 6 +++---
.../jdbc/internal/cli/CreateMappingFunction.java | 6 +++---
.../internal/cli/DescribeConnectionFunction.java | 4 ++--
.../jdbc/internal/cli/DescribeMappingFunction.java | 5 ++---
.../internal/cli/DestroyConnectionFunction.java | 6 +++---
.../jdbc/internal/cli/DestroyMappingFunction.java | 8 ++++----
.../cli/FunctionContextArgumentProvider.java | 6 +++---
.../jdbc/internal/cli/JdbcCliFunction.java | 6 +++---
.../jdbc/internal/cli/ListConnectionFunction.java | 8 ++++----
.../jdbc/internal/cli/ListMappingFunction.java | 9 ++++-----
.../internal/xml/JdbcServiceConfiguration.java | 10 ++++------
.../jdbc/internal/AbstractJdbcCallbackTest.java | 2 +-
.../connectors/jdbc/internal/SqlHandlerTest.java | 4 ++--
.../cli/AlterConnectionCommandDUnitTest.java | 6 +++---
.../cli/AlterConnectionCommandIntegrationTest.java | 4 ++--
.../internal/cli/AlterConnectionFunctionTest.java | 8 ++++----
.../internal/cli/AlterMappingCommandDUnitTest.java | 6 +++---
.../cli/AlterMappingCommandIntegrationTest.java | 4 ++--
.../internal/cli/AlterMappingFunctionTest.java | 8 ++++----
.../cli/CreateConnectionCommandDUnitTest.java | 4 ++--
.../CreateConnectionCommandIntegrationTest.java | 8 ++++----
.../internal/cli/CreateConnectionFunctionTest.java | 8 ++++----
.../cli/CreateMappingCommandDUnitTest.java | 4 ++--
.../cli/CreateMappingCommandIntegrationTest.java | 8 ++++----
.../internal/cli/CreateMappingFunctionTest.java | 8 ++++----
.../cli/DescribeConnectionCommandDUnitTest.java | 4 ++--
.../DescribeConnectionCommandIntegrationTest.java | 6 +++---
.../cli/DescribeConnectionFunctionTest.java | 8 ++++----
.../cli/DescribeMappingCommandDUnitTest.java | 4 ++--
.../cli/DescribeMappingCommandIntegrationTest.java | 6 +++---
.../internal/cli/DescribeMappingFunctionTest.java | 8 ++++----
.../cli/DestroyConnectionCommandDUnitTest.java | 6 +++---
.../DestroyConnectionCommandIntegrationTest.java | 6 +++---
.../cli/DestroyConnectionFunctionTest.java | 8 ++++----
.../cli/DestroyMappingCommandDunitTest.java | 6 +++---
.../cli/DestroyMappingCommandFunctionTest.java | 8 ++++----
.../cli/DestroyMappingCommandIntegrationTest.java | 6 +++---
.../cli/FunctionContextArgumentProviderTest.java | 8 ++++----
.../jdbc/internal/cli/JdbcCliFunctionTest.java | 4 ++--
.../cli/ListConnectionCommandDUnitTest.java | 6 +++---
.../cli/ListConnectionCommandIntegrationTest.java | 6 +++---
.../internal/cli/ListConnectionFunctionTest.java | 8 ++++----
.../internal/cli/ListMappingCommandDUnitTest.java | 6 +++---
.../cli/ListMappingCommandIntegrationTest.java | 6 +++---
.../jdbc/internal/cli/ListMappingFunctionTest.java | 8 ++++----
...onnectorServiceXmlGeneratorIntegrationTest.java | 22 +++++++++++-----------
.../JdbcConnectorServiceXmlIntegrationTest.java | 4 ++--
.../internal/xml/JdbcServiceConfigurationTest.java | 8 ++++----
54 files changed, 168 insertions(+), 172 deletions(-)
diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/AbstractJdbcCallback.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/AbstractJdbcCallback.java
index aaba82b..8f28d67 100644
--- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/AbstractJdbcCallback.java
+++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/AbstractJdbcCallback.java
@@ -57,7 +57,7 @@ public abstract class AbstractJdbcCallback implements CacheCallback {
private synchronized void initialize(InternalCache cache) {
if (sqlHandler == null) {
- InternalJdbcConnectorService service = cache.getService(InternalJdbcConnectorService.class);
+ JdbcConnectorService service = cache.getService(JdbcConnectorService.class);
DataSourceManager manager = new DataSourceManager(new HikariJdbcDataSourceFactory());
sqlHandler = new SqlHandler(manager, service);
}
diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/InternalJdbcConnectorService.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/JdbcConnectorService.java
similarity index 95%
rename from geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/InternalJdbcConnectorService.java
rename to geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/JdbcConnectorService.java
index 223bf1f..9dc40d4 100644
--- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/InternalJdbcConnectorService.java
+++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/JdbcConnectorService.java
@@ -22,7 +22,7 @@ import org.apache.geode.internal.cache.CacheService;
import org.apache.geode.internal.cache.extension.Extension;
@Experimental
-public interface InternalJdbcConnectorService extends Extension<Cache>, CacheService {
+public interface JdbcConnectorService extends Extension<Cache>, CacheService {
void createConnectionConfig(ConnectionConfiguration config)
throws ConnectionConfigExistsException;
diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/JdbcConnectorServiceImpl.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/JdbcConnectorServiceImpl.java
index 11d15a6..b9c5c0b 100644
--- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/JdbcConnectorServiceImpl.java
+++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/JdbcConnectorServiceImpl.java
@@ -29,7 +29,7 @@ import org.apache.geode.internal.cache.xmlcache.XmlGenerator;
import org.apache.geode.management.internal.beans.CacheServiceMBeanBase;
@Experimental
-public class JdbcConnectorServiceImpl implements InternalJdbcConnectorService {
+public class JdbcConnectorServiceImpl implements JdbcConnectorService {
private final Map<String, ConnectionConfiguration> connectionsByName = new ConcurrentHashMap<>();
private final Map<String, RegionMapping> mappingsByRegion = new ConcurrentHashMap<>();
@@ -133,7 +133,7 @@ public class JdbcConnectorServiceImpl implements InternalJdbcConnectorService {
@Override
public Class<? extends CacheService> getInterface() {
- return InternalJdbcConnectorService.class;
+ return JdbcConnectorService.class;
}
@Override
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 b728226..65f9240 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
@@ -33,16 +33,16 @@ import org.apache.geode.pdx.internal.PdxInstanceImpl;
@Experimental
public class SqlHandler {
- private final InternalJdbcConnectorService configService;
+ private final JdbcConnectorService configService;
private final DataSourceManager manager;
private final TableKeyColumnManager tableKeyColumnManager;
- public SqlHandler(DataSourceManager manager, InternalJdbcConnectorService configService) {
+ public SqlHandler(DataSourceManager manager, JdbcConnectorService configService) {
this(manager, new TableKeyColumnManager(), configService);
}
SqlHandler(DataSourceManager manager, TableKeyColumnManager tableKeyColumnManager,
- InternalJdbcConnectorService configService) {
+ JdbcConnectorService configService) {
this.manager = manager;
this.tableKeyColumnManager = tableKeyColumnManager;
this.configService = configService;
diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionFunction.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionFunction.java
index e2d6056..7ac8240 100644
--- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionFunction.java
+++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionFunction.java
@@ -20,7 +20,7 @@ import org.apache.geode.annotations.Experimental;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.connectors.jdbc.internal.ConnectionConfigNotFoundException;
import org.apache.geode.connectors.jdbc.internal.ConnectionConfiguration;
-import org.apache.geode.connectors.jdbc.internal.InternalJdbcConnectorService;
+import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.management.internal.configuration.domain.XmlEntity;
@@ -33,7 +33,7 @@ public class AlterConnectionFunction
}
@Override
- CliFunctionResult getFunctionResult(InternalJdbcConnectorService service,
+ CliFunctionResult getFunctionResult(JdbcConnectorService service,
FunctionContext<ConnectionConfiguration> context) throws Exception {
ConnectionConfiguration connectionConfig = context.getArguments();
ConnectionConfiguration existingConfig =
diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingFunction.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingFunction.java
index 7ae9390..f7f0045 100644
--- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingFunction.java
+++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingFunction.java
@@ -18,7 +18,7 @@ import java.util.Map;
import org.apache.geode.annotations.Experimental;
import org.apache.geode.cache.execute.FunctionContext;
-import org.apache.geode.connectors.jdbc.internal.InternalJdbcConnectorService;
+import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
import org.apache.geode.connectors.jdbc.internal.RegionMapping;
import org.apache.geode.connectors.jdbc.internal.RegionMappingNotFoundException;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
@@ -32,7 +32,7 @@ public class AlterMappingFunction extends JdbcCliFunction<RegionMapping, CliFunc
}
@Override
- CliFunctionResult getFunctionResult(InternalJdbcConnectorService service,
+ CliFunctionResult getFunctionResult(JdbcConnectorService service,
FunctionContext<RegionMapping> context) throws Exception {
RegionMapping mapping = context.getArguments();
RegionMapping existingMapping = service.getMappingForRegion(mapping.getRegionName());
diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionFunction.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionFunction.java
index e50342b..55b4358 100644
--- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionFunction.java
+++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionFunction.java
@@ -18,7 +18,7 @@ import org.apache.geode.annotations.Experimental;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.connectors.jdbc.internal.ConnectionConfigExistsException;
import org.apache.geode.connectors.jdbc.internal.ConnectionConfiguration;
-import org.apache.geode.connectors.jdbc.internal.InternalJdbcConnectorService;
+import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.management.internal.configuration.domain.XmlEntity;
@@ -31,7 +31,7 @@ public class CreateConnectionFunction
}
@Override
- CliFunctionResult getFunctionResult(InternalJdbcConnectorService service,
+ CliFunctionResult getFunctionResult(JdbcConnectorService service,
FunctionContext<ConnectionConfiguration> context) throws Exception {
ConnectionConfiguration connectionConfig = context.getArguments();
createConnectionConfig(service, connectionConfig);
@@ -43,7 +43,7 @@ public class CreateConnectionFunction
/**
* Creates the named connection configuration
*/
- void createConnectionConfig(InternalJdbcConnectorService service,
+ void createConnectionConfig(JdbcConnectorService service,
ConnectionConfiguration connectionConfig) throws ConnectionConfigExistsException {
service.createConnectionConfig(connectionConfig);
}
diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingFunction.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingFunction.java
index ad44d46..a7fb1a5 100644
--- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingFunction.java
+++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingFunction.java
@@ -16,7 +16,7 @@ package org.apache.geode.connectors.jdbc.internal.cli;
import org.apache.geode.annotations.Experimental;
import org.apache.geode.cache.execute.FunctionContext;
-import org.apache.geode.connectors.jdbc.internal.InternalJdbcConnectorService;
+import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
import org.apache.geode.connectors.jdbc.internal.RegionMapping;
import org.apache.geode.connectors.jdbc.internal.RegionMappingExistsException;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
@@ -30,7 +30,7 @@ public class CreateMappingFunction extends JdbcCliFunction<RegionMapping, CliFun
}
@Override
- CliFunctionResult getFunctionResult(InternalJdbcConnectorService service,
+ CliFunctionResult getFunctionResult(JdbcConnectorService service,
FunctionContext<RegionMapping> context) throws Exception {
// input
RegionMapping regionMapping = context.getArguments();
@@ -47,7 +47,7 @@ public class CreateMappingFunction extends JdbcCliFunction<RegionMapping, CliFun
/**
* Creates the named connection configuration
*/
- void createRegionMapping(InternalJdbcConnectorService service, RegionMapping regionMapping)
+ void createRegionMapping(JdbcConnectorService service, RegionMapping regionMapping)
throws RegionMappingExistsException {
service.createRegionMapping(regionMapping);
}
diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionFunction.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionFunction.java
index af9cd52..73c1cb8 100644
--- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionFunction.java
+++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionFunction.java
@@ -17,7 +17,7 @@ package org.apache.geode.connectors.jdbc.internal.cli;
import org.apache.geode.annotations.Experimental;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.connectors.jdbc.internal.ConnectionConfiguration;
-import org.apache.geode.connectors.jdbc.internal.InternalJdbcConnectorService;
+import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
@Experimental
public class DescribeConnectionFunction extends JdbcCliFunction<String, ConnectionConfiguration> {
@@ -27,7 +27,7 @@ public class DescribeConnectionFunction extends JdbcCliFunction<String, Connecti
}
@Override
- ConnectionConfiguration getFunctionResult(InternalJdbcConnectorService service,
+ ConnectionConfiguration getFunctionResult(JdbcConnectorService service,
FunctionContext<String> context) {
return service.getConnectionConfig(context.getArguments());
}
diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingFunction.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingFunction.java
index 1faef67..49c56a3 100644
--- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingFunction.java
+++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingFunction.java
@@ -16,7 +16,7 @@ package org.apache.geode.connectors.jdbc.internal.cli;
import org.apache.geode.annotations.Experimental;
import org.apache.geode.cache.execute.FunctionContext;
-import org.apache.geode.connectors.jdbc.internal.InternalJdbcConnectorService;
+import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
import org.apache.geode.connectors.jdbc.internal.RegionMapping;
@Experimental
@@ -27,8 +27,7 @@ public class DescribeMappingFunction extends JdbcCliFunction<String, RegionMappi
}
@Override
- RegionMapping getFunctionResult(InternalJdbcConnectorService service,
- FunctionContext<String> context) {
+ RegionMapping getFunctionResult(JdbcConnectorService service, FunctionContext<String> context) {
return service.getMappingForRegion(context.getArguments());
}
}
diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionFunction.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionFunction.java
index 6a5e135..e69710d 100644
--- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionFunction.java
+++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionFunction.java
@@ -17,7 +17,7 @@ package org.apache.geode.connectors.jdbc.internal.cli;
import org.apache.geode.annotations.Experimental;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.connectors.jdbc.internal.ConnectionConfiguration;
-import org.apache.geode.connectors.jdbc.internal.InternalJdbcConnectorService;
+import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.management.internal.configuration.domain.XmlEntity;
@@ -29,7 +29,7 @@ public class DestroyConnectionFunction extends JdbcCliFunction<String, CliFuncti
}
@Override
- CliFunctionResult getFunctionResult(InternalJdbcConnectorService service,
+ CliFunctionResult getFunctionResult(JdbcConnectorService service,
FunctionContext<String> context) {
String connectionName = context.getArguments();
boolean success = destroyConnectionConfig(service, connectionName);
@@ -44,7 +44,7 @@ public class DestroyConnectionFunction extends JdbcCliFunction<String, CliFuncti
*
* @return true if the connection was found and destroyed
*/
- boolean destroyConnectionConfig(InternalJdbcConnectorService service, String connectionName) {
+ boolean destroyConnectionConfig(JdbcConnectorService service, String connectionName) {
ConnectionConfiguration connectionConfig = service.getConnectionConfig(connectionName);
if (connectionConfig != null) {
service.destroyConnectionConfig(connectionName);
diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingFunction.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingFunction.java
index 0298871..643aea6 100644
--- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingFunction.java
+++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingFunction.java
@@ -16,7 +16,7 @@ package org.apache.geode.connectors.jdbc.internal.cli;
import org.apache.geode.annotations.Experimental;
import org.apache.geode.cache.execute.FunctionContext;
-import org.apache.geode.connectors.jdbc.internal.InternalJdbcConnectorService;
+import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
import org.apache.geode.connectors.jdbc.internal.RegionMapping;
import org.apache.geode.management.internal.cli.functions.CliFunctionResult;
import org.apache.geode.management.internal.configuration.domain.XmlEntity;
@@ -29,8 +29,8 @@ public class DestroyMappingFunction extends JdbcCliFunction<String, CliFunctionR
}
@Override
- CliFunctionResult getFunctionResult(InternalJdbcConnectorService service,
- FunctionContext<String> context) throws Exception {
+ CliFunctionResult getFunctionResult(JdbcConnectorService service, FunctionContext<String> context)
+ throws Exception {
// input
String regionName = context.getArguments();
@@ -45,7 +45,7 @@ public class DestroyMappingFunction extends JdbcCliFunction<String, CliFunctionR
/**
* Destroys the named region mapping
*/
- boolean destroyRegionMapping(InternalJdbcConnectorService service, String regionName) {
+ boolean destroyRegionMapping(JdbcConnectorService service, String regionName) {
RegionMapping mapping = service.getMappingForRegion(regionName);
if (mapping != null) {
service.destroyRegionMapping(regionName);
diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/FunctionContextArgumentProvider.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/FunctionContextArgumentProvider.java
index 062f854..922ea3a 100644
--- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/FunctionContextArgumentProvider.java
+++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/FunctionContextArgumentProvider.java
@@ -22,7 +22,7 @@ import static org.apache.geode.internal.cache.xmlcache.CacheXml.CACHE;
import java.io.Serializable;
import org.apache.geode.cache.execute.FunctionContext;
-import org.apache.geode.connectors.jdbc.internal.InternalJdbcConnectorService;
+import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.CliUtil;
import org.apache.geode.management.internal.configuration.domain.XmlEntity;
@@ -44,8 +44,8 @@ class FunctionContextArgumentProvider implements Serializable {
/**
* Returns the JdbcConnectorService
*/
- InternalJdbcConnectorService getJdbcConnectorService(FunctionContext<?> context) {
- return getCacheFromContext(context).getService(InternalJdbcConnectorService.class);
+ JdbcConnectorService getJdbcConnectorService(FunctionContext<?> context) {
+ return getCacheFromContext(context).getService(JdbcConnectorService.class);
}
/**
diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/JdbcCliFunction.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/JdbcCliFunction.java
index ab667a3..3cc583d 100644
--- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/JdbcCliFunction.java
+++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/JdbcCliFunction.java
@@ -17,7 +17,7 @@ package org.apache.geode.connectors.jdbc.internal.cli;
import org.apache.geode.annotations.Experimental;
import org.apache.geode.cache.execute.Function;
import org.apache.geode.cache.execute.FunctionContext;
-import org.apache.geode.connectors.jdbc.internal.InternalJdbcConnectorService;
+import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
import org.apache.geode.internal.InternalEntity;
import org.apache.geode.management.internal.configuration.domain.XmlEntity;
@@ -46,7 +46,7 @@ public abstract class JdbcCliFunction<T1, T2> implements Function<T1>, InternalE
@Override
public void execute(FunctionContext<T1> context) {
try {
- InternalJdbcConnectorService service = argumentProvider.getJdbcConnectorService(context);
+ JdbcConnectorService service = argumentProvider.getJdbcConnectorService(context);
T2 result = getFunctionResult(service, context);
context.getResultSender().lastResult(result);
} catch (Exception e) {
@@ -62,6 +62,6 @@ public abstract class JdbcCliFunction<T1, T2> implements Function<T1>, InternalE
return argumentProvider.createXmlEntity(context);
}
- abstract T2 getFunctionResult(InternalJdbcConnectorService service, FunctionContext<T1> context)
+ abstract T2 getFunctionResult(JdbcConnectorService service, FunctionContext<T1> context)
throws Exception;
}
diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionFunction.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionFunction.java
index 20fdb53..58866a6 100644
--- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionFunction.java
+++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionFunction.java
@@ -19,7 +19,7 @@ import java.util.Set;
import org.apache.geode.annotations.Experimental;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.connectors.jdbc.internal.ConnectionConfiguration;
-import org.apache.geode.connectors.jdbc.internal.InternalJdbcConnectorService;
+import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
@Experimental
public class ListConnectionFunction extends JdbcCliFunction<Void, ConnectionConfiguration[]> {
@@ -29,17 +29,17 @@ public class ListConnectionFunction extends JdbcCliFunction<Void, ConnectionConf
}
@Override
- ConnectionConfiguration[] getFunctionResult(InternalJdbcConnectorService service,
+ ConnectionConfiguration[] getFunctionResult(JdbcConnectorService service,
FunctionContext<Void> context) {
return getConnectionConfigAsArray(service);
}
- ConnectionConfiguration[] getConnectionConfigAsArray(InternalJdbcConnectorService service) {
+ ConnectionConfiguration[] getConnectionConfigAsArray(JdbcConnectorService service) {
Set<ConnectionConfiguration> connectionConfigs = getConnectionConfigs(service);
return connectionConfigs.toArray(new ConnectionConfiguration[connectionConfigs.size()]);
}
- private Set<ConnectionConfiguration> getConnectionConfigs(InternalJdbcConnectorService service) {
+ private Set<ConnectionConfiguration> getConnectionConfigs(JdbcConnectorService service) {
return service.getConnectionConfigs();
}
}
diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingFunction.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingFunction.java
index 34cccda..7b472e1 100644
--- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingFunction.java
+++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingFunction.java
@@ -18,7 +18,7 @@ import java.util.Set;
import org.apache.geode.annotations.Experimental;
import org.apache.geode.cache.execute.FunctionContext;
-import org.apache.geode.connectors.jdbc.internal.InternalJdbcConnectorService;
+import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
import org.apache.geode.connectors.jdbc.internal.RegionMapping;
@Experimental
@@ -29,17 +29,16 @@ public class ListMappingFunction extends JdbcCliFunction<Void, RegionMapping[]>
}
@Override
- RegionMapping[] getFunctionResult(InternalJdbcConnectorService service,
- FunctionContext<Void> context) {
+ RegionMapping[] getFunctionResult(JdbcConnectorService service, FunctionContext<Void> context) {
return getRegionMappingsAsArray(service);
}
- RegionMapping[] getRegionMappingsAsArray(InternalJdbcConnectorService service) {
+ RegionMapping[] getRegionMappingsAsArray(JdbcConnectorService service) {
Set<RegionMapping> regionMappings = getRegionMappings(service);
return regionMappings.toArray(new RegionMapping[regionMappings.size()]);
}
- private Set<RegionMapping> getRegionMappings(InternalJdbcConnectorService service) {
+ private Set<RegionMapping> getRegionMappings(JdbcConnectorService service) {
return service.getRegionMappings();
}
}
diff --git a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcServiceConfiguration.java b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcServiceConfiguration.java
index b88cc8c..3426c81 100644
--- a/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcServiceConfiguration.java
+++ b/geode-connectors/src/main/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcServiceConfiguration.java
@@ -21,7 +21,7 @@ import org.apache.geode.InternalGemFireException;
import org.apache.geode.cache.Cache;
import org.apache.geode.connectors.jdbc.internal.ConnectionConfigExistsException;
import org.apache.geode.connectors.jdbc.internal.ConnectionConfiguration;
-import org.apache.geode.connectors.jdbc.internal.InternalJdbcConnectorService;
+import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
import org.apache.geode.connectors.jdbc.internal.RegionMapping;
import org.apache.geode.connectors.jdbc.internal.RegionMappingExistsException;
import org.apache.geode.internal.cache.InternalCache;
@@ -55,13 +55,12 @@ public class JdbcServiceConfiguration implements Extension<Cache> {
@Override
public void onCreate(Extensible<Cache> source, Extensible<Cache> target) {
InternalCache internalCache = (InternalCache) target;
- InternalJdbcConnectorService service =
- internalCache.getService(InternalJdbcConnectorService.class);
+ JdbcConnectorService service = internalCache.getService(JdbcConnectorService.class);
connections.forEach(connection -> createConnectionConfig(service, connection));
mappings.forEach(mapping -> createRegionMapping(service, mapping));
}
- private void createConnectionConfig(InternalJdbcConnectorService service,
+ private void createConnectionConfig(JdbcConnectorService service,
ConnectionConfiguration connectionConfig) {
try {
service.createConnectionConfig(connectionConfig);
@@ -70,8 +69,7 @@ public class JdbcServiceConfiguration implements Extension<Cache> {
}
}
- private void createRegionMapping(InternalJdbcConnectorService service,
- RegionMapping regionMapping) {
+ private void createRegionMapping(JdbcConnectorService service, RegionMapping regionMapping) {
try {
service.createRegionMapping(regionMapping);
} catch (RegionMappingExistsException e) {
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/AbstractJdbcCallbackTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/AbstractJdbcCallbackTest.java
index 2199ebc..95fcdf0 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/AbstractJdbcCallbackTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/AbstractJdbcCallbackTest.java
@@ -62,7 +62,7 @@ public class AbstractJdbcCallbackTest {
public void initializedSqlHandlerIfNoneExists() {
jdbcCallback = new AbstractJdbcCallback() {};
InternalCache cache = mock(InternalCache.class);
- InternalJdbcConnectorService service = mock(InternalJdbcConnectorService.class);
+ JdbcConnectorService service = mock(JdbcConnectorService.class);
when(cache.getService(any())).thenReturn(service);
assertThat(jdbcCallback.getSqlHandler()).isNull();
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 bd1462f..e915a4e 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
@@ -66,7 +66,7 @@ public class SqlHandlerTest {
private DataSourceManager manager;
private JdbcDataSource dataSource;
private ConnectionConfiguration connectionConfig;
- private InternalJdbcConnectorService connectorService;
+ private JdbcConnectorService connectorService;
private TableKeyColumnManager tableKeyColumnManager;
private Connection connection;
private Region region;
@@ -89,7 +89,7 @@ public class SqlHandlerTest {
when(region.getRegionService()).thenReturn(cache);
tableKeyColumnManager = mock(TableKeyColumnManager.class);
when(tableKeyColumnManager.getKeyColumnName(connection, TABLE_NAME)).thenReturn(KEY_COLUMN);
- connectorService = mock(InternalJdbcConnectorService.class);
+ connectorService = mock(JdbcConnectorService.class);
handler = new SqlHandler(manager, tableKeyColumnManager, connectorService);
key = "key";
value = mock(PdxInstanceImpl.class);
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommandDUnitTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommandDUnitTest.java
index ea2da1f..1f1dbe2 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommandDUnitTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommandDUnitTest.java
@@ -34,7 +34,7 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.connectors.jdbc.internal.ConnectionConfiguration;
-import org.apache.geode.connectors.jdbc.internal.InternalJdbcConnectorService;
+import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
import org.apache.geode.distributed.internal.InternalLocator;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
@@ -96,7 +96,7 @@ public class AlterConnectionCommandDUnitTest {
server.invoke(() -> {
InternalCache cache = ClusterStartupRule.getCache();
ConnectionConfiguration config =
- cache.getService(InternalJdbcConnectorService.class).getConnectionConfig("name");
+ cache.getService(JdbcConnectorService.class).getConnectionConfig("name");
assertThat(config.getUrl()).isEqualTo("newUrl");
assertThat(config.getUser()).isEqualTo("newUsername");
assertThat(config.getPassword()).isEqualTo("newPassword");
@@ -125,7 +125,7 @@ public class AlterConnectionCommandDUnitTest {
server.invoke(() -> {
InternalCache cache = ClusterStartupRule.getCache();
ConnectionConfiguration config =
- cache.getService(InternalJdbcConnectorService.class).getConnectionConfig("name");
+ cache.getService(JdbcConnectorService.class).getConnectionConfig("name");
assertThat(config.getUrl()).isNull();
assertThat(config.getUser()).isNull();
assertThat(config.getPassword()).isNull();
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommandIntegrationTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommandIntegrationTest.java
index 961b59a..14d30cd 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommandIntegrationTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionCommandIntegrationTest.java
@@ -24,7 +24,7 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.connectors.jdbc.internal.ConnectionConfiguration;
-import org.apache.geode.connectors.jdbc.internal.InternalJdbcConnectorService;
+import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.cli.Result;
import org.apache.geode.test.junit.categories.IntegrationTest;
@@ -65,7 +65,7 @@ public class AlterConnectionCommandIntegrationTest {
assertThat(result.getStatus()).isSameAs(Result.Status.OK);
- InternalJdbcConnectorService service = cache.getService(InternalJdbcConnectorService.class);
+ JdbcConnectorService service = cache.getService(JdbcConnectorService.class);
ConnectionConfiguration connectionConfig = service.getConnectionConfig(name);
assertThat(connectionConfig).isNotNull();
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionFunctionTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionFunctionTest.java
index 4f36931..7ca2a31 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionFunctionTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterConnectionFunctionTest.java
@@ -40,7 +40,7 @@ import org.apache.geode.cache.execute.ResultSender;
import org.apache.geode.connectors.jdbc.internal.ConnectionConfigBuilder;
import org.apache.geode.connectors.jdbc.internal.ConnectionConfigNotFoundException;
import org.apache.geode.connectors.jdbc.internal.ConnectionConfiguration;
-import org.apache.geode.connectors.jdbc.internal.InternalJdbcConnectorService;
+import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.InternalCache;
@@ -57,7 +57,7 @@ public class AlterConnectionFunctionTest {
private ConnectionConfiguration configToAlter;
private FunctionContext<ConnectionConfiguration> context;
private ResultSender<Object> resultSender;
- private InternalJdbcConnectorService service;
+ private JdbcConnectorService service;
private AlterConnectionFunction function;
@@ -68,7 +68,7 @@ public class AlterConnectionFunctionTest {
InternalCache cache = mock(InternalCache.class);
DistributedSystem system = mock(DistributedSystem.class);
DistributedMember distributedMember = mock(DistributedMember.class);
- service = mock(InternalJdbcConnectorService.class);
+ service = mock(JdbcConnectorService.class);
connectionConfig = new ConnectionConfigBuilder().withName(CONNECTION_NAME).build();
existingConfig = new ConnectionConfigBuilder().withName(CONNECTION_NAME).build();
@@ -83,7 +83,7 @@ public class AlterConnectionFunctionTest {
when(cache.getDistributedSystem()).thenReturn(system);
when(system.getDistributedMember()).thenReturn(distributedMember);
when(context.getArguments()).thenReturn(connectionConfig);
- when(cache.getService(eq(InternalJdbcConnectorService.class))).thenReturn(service);
+ when(cache.getService(eq(JdbcConnectorService.class))).thenReturn(service);
function = new AlterConnectionFunction();
}
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandDUnitTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandDUnitTest.java
index e4f4c62..4c7d52c 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandDUnitTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandDUnitTest.java
@@ -36,7 +36,7 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.apache.geode.connectors.jdbc.internal.InternalJdbcConnectorService;
+import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
import org.apache.geode.connectors.jdbc.internal.RegionMapping;
import org.apache.geode.distributed.internal.InternalLocator;
import org.apache.geode.internal.cache.InternalCache;
@@ -100,7 +100,7 @@ public class AlterMappingCommandDUnitTest {
server.invoke(() -> {
InternalCache cache = ClusterStartupRule.getCache();
RegionMapping mapping =
- cache.getService(InternalJdbcConnectorService.class).getMappingForRegion("testRegion");
+ cache.getService(JdbcConnectorService.class).getMappingForRegion("testRegion");
assertThat(mapping.getConnectionConfigName()).isEqualTo("newConnection");
assertThat(mapping.getTableName()).isEqualTo("newTable");
assertThat(mapping.getPdxClassName()).isEqualTo("newPdxClass");
@@ -129,7 +129,7 @@ public class AlterMappingCommandDUnitTest {
server.invoke(() -> {
InternalCache cache = ClusterStartupRule.getCache();
RegionMapping mapping =
- cache.getService(InternalJdbcConnectorService.class).getMappingForRegion("testRegion");
+ cache.getService(JdbcConnectorService.class).getMappingForRegion("testRegion");
assertThat(mapping.getConnectionConfigName()).isEqualTo("connection");
assertThat(mapping.getTableName()).isNull();
assertThat(mapping.getPdxClassName()).isNull();
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandIntegrationTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandIntegrationTest.java
index 768e313..66c2aa9 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandIntegrationTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingCommandIntegrationTest.java
@@ -23,7 +23,7 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheFactory;
-import org.apache.geode.connectors.jdbc.internal.InternalJdbcConnectorService;
+import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
import org.apache.geode.connectors.jdbc.internal.RegionMapping;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.cli.Result;
@@ -67,7 +67,7 @@ public class AlterMappingCommandIntegrationTest {
assertThat(result.getStatus()).isSameAs(Result.Status.OK);
- InternalJdbcConnectorService service = cache.getService(InternalJdbcConnectorService.class);
+ JdbcConnectorService service = cache.getService(JdbcConnectorService.class);
RegionMapping regionMapping = service.getMappingForRegion(regionName);
assertThat(regionMapping).isNotNull();
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingFunctionTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingFunctionTest.java
index d4b8a6c..5d59a02 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingFunctionTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/AlterMappingFunctionTest.java
@@ -40,7 +40,7 @@ import org.mockito.ArgumentCaptor;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.cache.execute.ResultSender;
import org.apache.geode.connectors.jdbc.internal.ConnectionConfigNotFoundException;
-import org.apache.geode.connectors.jdbc.internal.InternalJdbcConnectorService;
+import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
import org.apache.geode.connectors.jdbc.internal.RegionMapping;
import org.apache.geode.connectors.jdbc.internal.RegionMappingBuilder;
import org.apache.geode.connectors.jdbc.internal.RegionMappingNotFoundException;
@@ -60,7 +60,7 @@ public class AlterMappingFunctionTest {
private RegionMapping mappingToAlter;
private FunctionContext<RegionMapping> context;
private ResultSender<Object> resultSender;
- private InternalJdbcConnectorService service;
+ private JdbcConnectorService service;
private AlterMappingFunction function;
@@ -71,7 +71,7 @@ public class AlterMappingFunctionTest {
InternalCache cache = mock(InternalCache.class);
DistributedSystem system = mock(DistributedSystem.class);
DistributedMember distributedMember = mock(DistributedMember.class);
- service = mock(InternalJdbcConnectorService.class);
+ service = mock(JdbcConnectorService.class);
regionMapping = new RegionMappingBuilder().withRegionName(REGION_NAME).build();
existingMapping = new RegionMappingBuilder().withRegionName(REGION_NAME).build();
@@ -86,7 +86,7 @@ public class AlterMappingFunctionTest {
when(cache.getDistributedSystem()).thenReturn(system);
when(system.getDistributedMember()).thenReturn(distributedMember);
when(context.getArguments()).thenReturn(regionMapping);
- when(cache.getService(eq(InternalJdbcConnectorService.class))).thenReturn(service);
+ when(cache.getService(eq(JdbcConnectorService.class))).thenReturn(service);
function = new AlterMappingFunction();
}
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommandDUnitTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommandDUnitTest.java
index 7db2e51..76c6bab 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommandDUnitTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommandDUnitTest.java
@@ -28,7 +28,7 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.connectors.jdbc.internal.ConnectionConfiguration;
-import org.apache.geode.connectors.jdbc.internal.InternalJdbcConnectorService;
+import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
import org.apache.geode.distributed.internal.InternalLocator;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
@@ -81,7 +81,7 @@ public class CreateConnectionCommandDUnitTest {
server.invoke(() -> {
InternalCache cache = ClusterStartupRule.getCache();
ConnectionConfiguration config =
- cache.getService(InternalJdbcConnectorService.class).getConnectionConfig("name");
+ cache.getService(JdbcConnectorService.class).getConnectionConfig("name");
assertThat(config.getUrl()).isEqualTo("url");
assertThat(config.getUser()).isEqualTo("username");
assertThat(config.getPassword()).isEqualTo("secret");
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommandIntegrationTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommandIntegrationTest.java
index 0bc2e62..116454f 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommandIntegrationTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionCommandIntegrationTest.java
@@ -24,7 +24,7 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.connectors.jdbc.internal.ConnectionConfiguration;
-import org.apache.geode.connectors.jdbc.internal.InternalJdbcConnectorService;
+import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.cli.Result;
import org.apache.geode.test.junit.categories.IntegrationTest;
@@ -66,7 +66,7 @@ public class CreateConnectionCommandIntegrationTest {
assertThat(result.getStatus()).isSameAs(Result.Status.OK);
- InternalJdbcConnectorService service = cache.getService(InternalJdbcConnectorService.class);
+ JdbcConnectorService service = cache.getService(JdbcConnectorService.class);
ConnectionConfiguration connectionConfig = service.getConnectionConfig(name);
assertThat(connectionConfig).isNotNull();
@@ -81,7 +81,7 @@ public class CreateConnectionCommandIntegrationTest {
@Test
public void createsConnectionOnceOnly() throws Exception {
createConnectionCommand.createConnection(name, url, user, password, params);
- InternalJdbcConnectorService service = cache.getService(InternalJdbcConnectorService.class);
+ JdbcConnectorService service = cache.getService(JdbcConnectorService.class);
ConnectionConfiguration connectionConfig = service.getConnectionConfig(name);
@@ -97,7 +97,7 @@ public class CreateConnectionCommandIntegrationTest {
assertThat(result.getStatus()).isSameAs(Result.Status.OK);
- InternalJdbcConnectorService service = cache.getService(InternalJdbcConnectorService.class);
+ JdbcConnectorService service = cache.getService(JdbcConnectorService.class);
ConnectionConfiguration connectionConfig = service.getConnectionConfig(name);
assertThat(connectionConfig).isNotNull();
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionFunctionTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionFunctionTest.java
index 3cb78d1..78e735b 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionFunctionTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateConnectionFunctionTest.java
@@ -36,7 +36,7 @@ import org.apache.geode.cache.execute.ResultSender;
import org.apache.geode.connectors.jdbc.internal.ConnectionConfigBuilder;
import org.apache.geode.connectors.jdbc.internal.ConnectionConfigExistsException;
import org.apache.geode.connectors.jdbc.internal.ConnectionConfiguration;
-import org.apache.geode.connectors.jdbc.internal.InternalJdbcConnectorService;
+import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.InternalCache;
@@ -51,7 +51,7 @@ public class CreateConnectionFunctionTest {
private ConnectionConfiguration connectionConfig;
private FunctionContext<ConnectionConfiguration> context;
private ResultSender<Object> resultSender;
- private InternalJdbcConnectorService service;
+ private JdbcConnectorService service;
private CreateConnectionFunction function;
@@ -62,7 +62,7 @@ public class CreateConnectionFunctionTest {
InternalCache cache = mock(InternalCache.class);
DistributedSystem system = mock(DistributedSystem.class);
DistributedMember distributedMember = mock(DistributedMember.class);
- service = mock(InternalJdbcConnectorService.class);
+ service = mock(JdbcConnectorService.class);
connectionConfig = new ConnectionConfigBuilder().withName(CONNECTION_NAME).build();
@@ -71,7 +71,7 @@ public class CreateConnectionFunctionTest {
when(cache.getDistributedSystem()).thenReturn(system);
when(system.getDistributedMember()).thenReturn(distributedMember);
when(context.getArguments()).thenReturn(connectionConfig);
- when(cache.getService(eq(InternalJdbcConnectorService.class))).thenReturn(service);
+ when(cache.getService(eq(JdbcConnectorService.class))).thenReturn(service);
function = new CreateConnectionFunction();
}
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandDUnitTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandDUnitTest.java
index c9c1cb2..4ac9f67 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandDUnitTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandDUnitTest.java
@@ -28,7 +28,7 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.apache.geode.connectors.jdbc.internal.InternalJdbcConnectorService;
+import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
import org.apache.geode.connectors.jdbc.internal.RegionMapping;
import org.apache.geode.distributed.internal.InternalLocator;
import org.apache.geode.internal.cache.InternalCache;
@@ -83,7 +83,7 @@ public class CreateMappingCommandDUnitTest {
server.invoke(() -> {
InternalCache cache = ClusterStartupRule.getCache();
RegionMapping mapping =
- cache.getService(InternalJdbcConnectorService.class).getMappingForRegion("testRegion");
+ cache.getService(JdbcConnectorService.class).getMappingForRegion("testRegion");
assertThat(mapping.getConnectionConfigName()).isEqualTo("connection");
assertThat(mapping.getTableName()).isEqualTo("myTable");
assertThat(mapping.getPdxClassName()).isEqualTo("myPdxClass");
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandIntegrationTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandIntegrationTest.java
index 6f4daca..2d5d3c1 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandIntegrationTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingCommandIntegrationTest.java
@@ -24,7 +24,7 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.connectors.jdbc.internal.ConnectionConfiguration;
-import org.apache.geode.connectors.jdbc.internal.InternalJdbcConnectorService;
+import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
import org.apache.geode.connectors.jdbc.internal.RegionMapping;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.cli.Result;
@@ -70,7 +70,7 @@ public class CreateMappingCommandIntegrationTest {
assertThat(result.getStatus()).isSameAs(Result.Status.OK);
- InternalJdbcConnectorService service = cache.getService(InternalJdbcConnectorService.class);
+ JdbcConnectorService service = cache.getService(JdbcConnectorService.class);
RegionMapping regionMapping = service.getMappingForRegion(regionName);
assertThat(regionMapping).isNotNull();
@@ -87,7 +87,7 @@ public class CreateMappingCommandIntegrationTest {
public void createsRegionMappingOnceOnly() {
createRegionMappingCommand.createMapping(regionName, connectionName, tableName, pdxClass,
keyInValue, fieldMappings);
- InternalJdbcConnectorService service = cache.getService(InternalJdbcConnectorService.class);
+ JdbcConnectorService service = cache.getService(JdbcConnectorService.class);
ConnectionConfiguration connectionConfig = service.getConnectionConfig(regionName);
@@ -106,7 +106,7 @@ public class CreateMappingCommandIntegrationTest {
assertThat(result.getStatus()).isSameAs(Result.Status.OK);
- InternalJdbcConnectorService service = cache.getService(InternalJdbcConnectorService.class);
+ JdbcConnectorService service = cache.getService(JdbcConnectorService.class);
RegionMapping regionMapping = service.getMappingForRegion(regionName);
assertThat(regionMapping).isNotNull();
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingFunctionTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingFunctionTest.java
index ffb9b9d..b913e95 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingFunctionTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/CreateMappingFunctionTest.java
@@ -34,7 +34,7 @@ import org.mockito.ArgumentCaptor;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.cache.execute.ResultSender;
import org.apache.geode.connectors.jdbc.internal.ConnectionConfigExistsException;
-import org.apache.geode.connectors.jdbc.internal.InternalJdbcConnectorService;
+import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
import org.apache.geode.connectors.jdbc.internal.RegionMapping;
import org.apache.geode.connectors.jdbc.internal.RegionMappingBuilder;
import org.apache.geode.connectors.jdbc.internal.RegionMappingExistsException;
@@ -53,7 +53,7 @@ public class CreateMappingFunctionTest {
private FunctionContext<RegionMapping> context;
private DistributedMember distributedMember;
private ResultSender<Object> resultSender;
- private InternalJdbcConnectorService service;
+ private JdbcConnectorService service;
private CreateMappingFunction function;
@@ -64,7 +64,7 @@ public class CreateMappingFunctionTest {
InternalCache cache = mock(InternalCache.class);
DistributedSystem system = mock(DistributedSystem.class);
distributedMember = mock(DistributedMember.class);
- service = mock(InternalJdbcConnectorService.class);
+ service = mock(JdbcConnectorService.class);
regionMapping = new RegionMappingBuilder().withRegionName(REGION_NAME).build();
@@ -73,7 +73,7 @@ public class CreateMappingFunctionTest {
when(cache.getDistributedSystem()).thenReturn(system);
when(system.getDistributedMember()).thenReturn(distributedMember);
when(context.getArguments()).thenReturn(regionMapping);
- when(cache.getService(eq(InternalJdbcConnectorService.class))).thenReturn(service);
+ when(cache.getService(eq(JdbcConnectorService.class))).thenReturn(service);
function = new CreateMappingFunction();
}
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionCommandDUnitTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionCommandDUnitTest.java
index a62db11..30ab08e 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionCommandDUnitTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionCommandDUnitTest.java
@@ -27,7 +27,7 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.connectors.jdbc.internal.ConnectionConfigBuilder;
import org.apache.geode.connectors.jdbc.internal.ConnectionConfigExistsException;
-import org.apache.geode.connectors.jdbc.internal.InternalJdbcConnectorService;
+import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
import org.apache.geode.test.dunit.rules.ClusterStartupRule;
@@ -95,7 +95,7 @@ public class DescribeConnectionCommandDUnitTest implements Serializable {
private void createConnection() throws ConnectionConfigExistsException {
InternalCache cache = ClusterStartupRule.getCache();
- InternalJdbcConnectorService service = cache.getService(InternalJdbcConnectorService.class);
+ JdbcConnectorService service = cache.getService(JdbcConnectorService.class);
String[] params = new String[] {"key1:value1", "key2:value2"};
service.createConnectionConfig(
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionCommandIntegrationTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionCommandIntegrationTest.java
index 3ad310d..05b5051 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionCommandIntegrationTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionCommandIntegrationTest.java
@@ -34,7 +34,7 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.connectors.jdbc.internal.ConnectionConfigBuilder;
import org.apache.geode.connectors.jdbc.internal.ConnectionConfiguration;
-import org.apache.geode.connectors.jdbc.internal.InternalJdbcConnectorService;
+import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.json.GfJsonObject;
@@ -46,7 +46,7 @@ public class DescribeConnectionCommandIntegrationTest {
private static final String CONNECTION = "connection";
private InternalCache cache;
- private InternalJdbcConnectorService service;
+ private JdbcConnectorService service;
private ConnectionConfiguration connectionConfig;
private DescribeConnectionCommand command;
@@ -59,7 +59,7 @@ public class DescribeConnectionCommandIntegrationTest {
cache = (InternalCache) new CacheFactory().set("locators", "").set("mcast-port", "0")
.set(ENABLE_CLUSTER_CONFIGURATION, "true").create();
- service = cache.getService(InternalJdbcConnectorService.class);
+ service = cache.getService(JdbcConnectorService.class);
command = new DescribeConnectionCommand();
}
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionFunctionTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionFunctionTest.java
index c877349..1aa0c89 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionFunctionTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeConnectionFunctionTest.java
@@ -33,7 +33,7 @@ import org.mockito.ArgumentCaptor;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.cache.execute.ResultSender;
import org.apache.geode.connectors.jdbc.internal.ConnectionConfiguration;
-import org.apache.geode.connectors.jdbc.internal.InternalJdbcConnectorService;
+import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.InternalCache;
@@ -46,7 +46,7 @@ public class DescribeConnectionFunctionTest {
private static final String EXISTING_CONFIG = "existingConfig";
private DescribeConnectionFunction function;
- private InternalJdbcConnectorService service;
+ private JdbcConnectorService service;
private FunctionContext<String> context;
private ConnectionConfiguration connectionConfig;
private ResultSender<Object> resultSender;
@@ -57,7 +57,7 @@ public class DescribeConnectionFunctionTest {
InternalCache cache = mock(InternalCache.class);
context = mock(FunctionContext.class);
- service = mock(InternalJdbcConnectorService.class);
+ service = mock(JdbcConnectorService.class);
connectionConfig = mock(ConnectionConfiguration.class);
resultSender = mock(ResultSender.class);
@@ -66,7 +66,7 @@ public class DescribeConnectionFunctionTest {
when(context.getResultSender()).thenReturn(resultSender);
when(context.getCache()).thenReturn(cache);
- when(cache.getService(eq(InternalJdbcConnectorService.class))).thenReturn(service);
+ when(cache.getService(eq(JdbcConnectorService.class))).thenReturn(service);
when(service.getConnectionConfig(EXISTING_CONFIG)).thenReturn(connectionConfig);
when(cache.getDistributedSystem()).thenReturn(system);
when(system.getDistributedMember()).thenReturn(member);
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandDUnitTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandDUnitTest.java
index df9d50a..736eb26 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandDUnitTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandDUnitTest.java
@@ -30,7 +30,7 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.apache.geode.connectors.jdbc.internal.InternalJdbcConnectorService;
+import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
import org.apache.geode.connectors.jdbc.internal.RegionMapping;
import org.apache.geode.connectors.jdbc.internal.RegionMappingBuilder;
import org.apache.geode.connectors.jdbc.internal.RegionMappingExistsException;
@@ -101,7 +101,7 @@ public class DescribeMappingCommandDUnitTest implements Serializable {
private void createMapping() throws RegionMappingExistsException {
InternalCache cache = ClusterStartupRule.getCache();
- InternalJdbcConnectorService service = cache.getService(InternalJdbcConnectorService.class);
+ JdbcConnectorService service = cache.getService(JdbcConnectorService.class);
String[] fieldMappings = new String[] {"field1:column1", "field2:column2"};
RegionMapping regionMapping = new RegionMappingBuilder().withRegionName(REGION_NAME)
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandIntegrationTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandIntegrationTest.java
index 251b017..fcc366f 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandIntegrationTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingCommandIntegrationTest.java
@@ -32,7 +32,7 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheFactory;
-import org.apache.geode.connectors.jdbc.internal.InternalJdbcConnectorService;
+import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
import org.apache.geode.connectors.jdbc.internal.RegionMapping;
import org.apache.geode.connectors.jdbc.internal.RegionMappingBuilder;
import org.apache.geode.internal.cache.InternalCache;
@@ -46,7 +46,7 @@ public class DescribeMappingCommandIntegrationTest {
private static final String REGION_NAME = "testRegion";
private InternalCache cache;
- private InternalJdbcConnectorService service;
+ private JdbcConnectorService service;
private RegionMapping regionMapping;
private DescribeMappingCommand command;
@@ -56,7 +56,7 @@ public class DescribeMappingCommandIntegrationTest {
cache = (InternalCache) new CacheFactory().set("locators", "").set("mcast-port", "0")
.set(ENABLE_CLUSTER_CONFIGURATION, "true").create();
- service = cache.getService(InternalJdbcConnectorService.class);
+ service = cache.getService(JdbcConnectorService.class);
regionMapping = new RegionMappingBuilder().withRegionName(REGION_NAME)
.withConnectionConfigName("connection").withTableName("testTable")
.withPdxClassName("myPdxClass").withPrimaryKeyInValue(true)
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingFunctionTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingFunctionTest.java
index 4d1b0e7..1cd423c 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingFunctionTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DescribeMappingFunctionTest.java
@@ -32,7 +32,7 @@ import org.mockito.ArgumentCaptor;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.cache.execute.ResultSender;
-import org.apache.geode.connectors.jdbc.internal.InternalJdbcConnectorService;
+import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
import org.apache.geode.connectors.jdbc.internal.RegionMapping;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.DistributedSystem;
@@ -46,7 +46,7 @@ public class DescribeMappingFunctionTest {
private static final String EXISTING_MAPPING = "existingMapping";
private DescribeMappingFunction function;
- private InternalJdbcConnectorService service;
+ private JdbcConnectorService service;
private FunctionContext<String> context;
private RegionMapping regionMapping;
private ResultSender<Object> resultSender;
@@ -57,7 +57,7 @@ public class DescribeMappingFunctionTest {
InternalCache cache = mock(InternalCache.class);
context = mock(FunctionContext.class);
- service = mock(InternalJdbcConnectorService.class);
+ service = mock(JdbcConnectorService.class);
regionMapping = mock(RegionMapping.class);
resultSender = mock(ResultSender.class);
@@ -66,7 +66,7 @@ public class DescribeMappingFunctionTest {
when(context.getResultSender()).thenReturn(resultSender);
when(context.getCache()).thenReturn(cache);
- when(cache.getService(eq(InternalJdbcConnectorService.class))).thenReturn(service);
+ when(cache.getService(eq(JdbcConnectorService.class))).thenReturn(service);
when(service.getMappingForRegion(EXISTING_MAPPING)).thenReturn(regionMapping);
when(cache.getDistributedSystem()).thenReturn(system);
when(system.getDistributedMember()).thenReturn(member);
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionCommandDUnitTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionCommandDUnitTest.java
index 5f422ca..4d05314 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionCommandDUnitTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionCommandDUnitTest.java
@@ -28,7 +28,7 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.connectors.jdbc.internal.ConnectionConfigBuilder;
import org.apache.geode.connectors.jdbc.internal.ConnectionConfigExistsException;
import org.apache.geode.connectors.jdbc.internal.ConnectionConfiguration;
-import org.apache.geode.connectors.jdbc.internal.InternalJdbcConnectorService;
+import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
import org.apache.geode.distributed.internal.InternalLocator;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
@@ -83,14 +83,14 @@ public class DestroyConnectionCommandDUnitTest implements Serializable {
server.invoke(() -> {
InternalCache cache = ClusterStartupRule.getCache();
ConnectionConfiguration config =
- cache.getService(InternalJdbcConnectorService.class).getConnectionConfig("name");
+ cache.getService(JdbcConnectorService.class).getConnectionConfig("name");
assertThat(config).isNull();
});
}
private void createConnection() throws ConnectionConfigExistsException {
InternalCache cache = ClusterStartupRule.getCache();
- InternalJdbcConnectorService service = cache.getService(InternalJdbcConnectorService.class);
+ JdbcConnectorService service = cache.getService(JdbcConnectorService.class);
service.createConnectionConfig(new ConnectionConfigBuilder().withName(connectionName).build());
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionCommandIntegrationTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionCommandIntegrationTest.java
index e573872..1068870 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionCommandIntegrationTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionCommandIntegrationTest.java
@@ -25,7 +25,7 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.connectors.jdbc.internal.ConnectionConfigBuilder;
import org.apache.geode.connectors.jdbc.internal.ConnectionConfiguration;
-import org.apache.geode.connectors.jdbc.internal.InternalJdbcConnectorService;
+import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.cli.Result;
import org.apache.geode.test.junit.categories.IntegrationTest;
@@ -60,7 +60,7 @@ public class DestroyConnectionCommandIntegrationTest {
@Test
public void destroysNamedConnection() throws Exception {
- InternalJdbcConnectorService service = cache.getService(InternalJdbcConnectorService.class);
+ JdbcConnectorService service = cache.getService(JdbcConnectorService.class);
service.createConnectionConfig(connectionConfig);
assertThat(service.getConnectionConfig(connectionName)).isSameAs(connectionConfig);
@@ -72,7 +72,7 @@ public class DestroyConnectionCommandIntegrationTest {
@Test
public void returnsErrorIfNamedConnectionNotFound() throws Exception {
- InternalJdbcConnectorService service = cache.getService(InternalJdbcConnectorService.class);
+ JdbcConnectorService service = cache.getService(JdbcConnectorService.class);
assertThat(service.getConnectionConfig(connectionName)).isNull();
Result result = command.destroyConnection(connectionName);
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionFunctionTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionFunctionTest.java
index 17284ea..3994b94 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionFunctionTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyConnectionFunctionTest.java
@@ -33,7 +33,7 @@ import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.cache.execute.ResultSender;
import org.apache.geode.connectors.jdbc.internal.ConnectionConfigBuilder;
import org.apache.geode.connectors.jdbc.internal.ConnectionConfiguration;
-import org.apache.geode.connectors.jdbc.internal.InternalJdbcConnectorService;
+import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.InternalCache;
@@ -49,7 +49,7 @@ public class DestroyConnectionFunctionTest {
private FunctionContext<String> context;
private ResultSender<Object> resultSender;
private ConnectionConfiguration configuration;
- private InternalJdbcConnectorService service;
+ private JdbcConnectorService service;
@Before
public void setUp() {
@@ -57,7 +57,7 @@ public class DestroyConnectionFunctionTest {
context = mock(FunctionContext.class);
DistributedMember member = mock(DistributedMember.class);
resultSender = mock(ResultSender.class);
- service = mock(InternalJdbcConnectorService.class);
+ service = mock(JdbcConnectorService.class);
DistributedSystem system = mock(DistributedSystem.class);
when(context.getResultSender()).thenReturn(resultSender);
@@ -65,7 +65,7 @@ public class DestroyConnectionFunctionTest {
when(cache.getDistributedSystem()).thenReturn(system);
when(system.getDistributedMember()).thenReturn(member);
when(context.getArguments()).thenReturn(connectionName);
- when(cache.getService(eq(InternalJdbcConnectorService.class))).thenReturn(service);
+ when(cache.getService(eq(JdbcConnectorService.class))).thenReturn(service);
configuration = new ConnectionConfigBuilder().build();
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandDunitTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandDunitTest.java
index c9caafa..23c200a 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandDunitTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandDunitTest.java
@@ -25,7 +25,7 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.apache.geode.connectors.jdbc.internal.InternalJdbcConnectorService;
+import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
import org.apache.geode.connectors.jdbc.internal.RegionMapping;
import org.apache.geode.connectors.jdbc.internal.RegionMappingBuilder;
import org.apache.geode.connectors.jdbc.internal.RegionMappingExistsException;
@@ -84,14 +84,14 @@ public class DestroyMappingCommandDunitTest implements Serializable {
server.invoke(() -> {
InternalCache cache = ClusterStartupRule.getCache();
RegionMapping mapping =
- cache.getService(InternalJdbcConnectorService.class).getMappingForRegion("testRegion");
+ cache.getService(JdbcConnectorService.class).getMappingForRegion("testRegion");
assertThat(mapping).isNull();
});
}
private void createRegionMapping() throws RegionMappingExistsException {
InternalCache cache = ClusterStartupRule.getCache();
- InternalJdbcConnectorService service = cache.getService(InternalJdbcConnectorService.class);
+ JdbcConnectorService service = cache.getService(JdbcConnectorService.class);
service.createRegionMapping(new RegionMappingBuilder().withRegionName(regionName).build());
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandFunctionTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandFunctionTest.java
index bc1b163..f23e6b7 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandFunctionTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandFunctionTest.java
@@ -31,7 +31,7 @@ import org.mockito.ArgumentCaptor;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.cache.execute.ResultSender;
-import org.apache.geode.connectors.jdbc.internal.InternalJdbcConnectorService;
+import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
import org.apache.geode.connectors.jdbc.internal.RegionMapping;
import org.apache.geode.connectors.jdbc.internal.RegionMappingBuilder;
import org.apache.geode.distributed.DistributedMember;
@@ -49,7 +49,7 @@ public class DestroyMappingCommandFunctionTest {
private FunctionContext<String> context;
private ResultSender<Object> resultSender;
private RegionMapping mapping;
- private InternalJdbcConnectorService service;
+ private JdbcConnectorService service;
@Before
public void setUp() {
@@ -57,7 +57,7 @@ public class DestroyMappingCommandFunctionTest {
context = mock(FunctionContext.class);
DistributedMember member = mock(DistributedMember.class);
resultSender = mock(ResultSender.class);
- service = mock(InternalJdbcConnectorService.class);
+ service = mock(JdbcConnectorService.class);
DistributedSystem system = mock(DistributedSystem.class);
when(context.getResultSender()).thenReturn(resultSender);
@@ -65,7 +65,7 @@ public class DestroyMappingCommandFunctionTest {
when(cache.getDistributedSystem()).thenReturn(system);
when(system.getDistributedMember()).thenReturn(member);
when(context.getArguments()).thenReturn(regionName);
- when(cache.getService(eq(InternalJdbcConnectorService.class))).thenReturn(service);
+ when(cache.getService(eq(JdbcConnectorService.class))).thenReturn(service);
mapping = new RegionMappingBuilder().build();
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandIntegrationTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandIntegrationTest.java
index f02a076..fcaa509 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandIntegrationTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/DestroyMappingCommandIntegrationTest.java
@@ -23,7 +23,7 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheFactory;
-import org.apache.geode.connectors.jdbc.internal.InternalJdbcConnectorService;
+import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
import org.apache.geode.connectors.jdbc.internal.RegionMapping;
import org.apache.geode.connectors.jdbc.internal.RegionMappingBuilder;
import org.apache.geode.internal.cache.InternalCache;
@@ -59,7 +59,7 @@ public class DestroyMappingCommandIntegrationTest {
@Test
public void destroysNamedMapping() throws Exception {
- InternalJdbcConnectorService service = cache.getService(InternalJdbcConnectorService.class);
+ JdbcConnectorService service = cache.getService(JdbcConnectorService.class);
service.createRegionMapping(mapping);
assertThat(service.getMappingForRegion(regionName)).isSameAs(mapping);
@@ -71,7 +71,7 @@ public class DestroyMappingCommandIntegrationTest {
@Test
public void returnsErrorIfNamedMappingNotFound() throws Exception {
- InternalJdbcConnectorService service = cache.getService(InternalJdbcConnectorService.class);
+ JdbcConnectorService service = cache.getService(JdbcConnectorService.class);
assertThat(service.getMappingForRegion(regionName)).isNull();
Result result = command.destroyMapping(regionName);
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/FunctionContextArgumentProviderTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/FunctionContextArgumentProviderTest.java
index 6e86cdf..198577a 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/FunctionContextArgumentProviderTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/FunctionContextArgumentProviderTest.java
@@ -25,7 +25,7 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.cache.execute.ResultSender;
-import org.apache.geode.connectors.jdbc.internal.InternalJdbcConnectorService;
+import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.InternalCache;
@@ -37,7 +37,7 @@ public class FunctionContextArgumentProviderTest {
private FunctionContext<?> context;
private DistributedMember distributedMember;
private ResultSender<Object> resultSender;
- private InternalJdbcConnectorService service;
+ private JdbcConnectorService service;
private FunctionContextArgumentProvider jdbcCommandFunctionContext;
@@ -48,13 +48,13 @@ public class FunctionContextArgumentProviderTest {
InternalCache cache = mock(InternalCache.class);
DistributedSystem system = mock(DistributedSystem.class);
distributedMember = mock(DistributedMember.class);
- service = mock(InternalJdbcConnectorService.class);
+ service = mock(JdbcConnectorService.class);
when(context.getResultSender()).thenReturn(resultSender);
when(context.getCache()).thenReturn(cache);
when(cache.getDistributedSystem()).thenReturn(system);
when(system.getDistributedMember()).thenReturn(distributedMember);
- when(cache.getService(eq(InternalJdbcConnectorService.class))).thenReturn(service);
+ when(cache.getService(eq(JdbcConnectorService.class))).thenReturn(service);
jdbcCommandFunctionContext = new FunctionContextArgumentProvider();
}
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/JdbcCliFunctionTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/JdbcCliFunctionTest.java
index b966ced..6ada61e 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/JdbcCliFunctionTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/JdbcCliFunctionTest.java
@@ -22,7 +22,7 @@ import org.junit.Test;
import org.junit.experimental.categories.Category;
import org.apache.geode.cache.execute.FunctionContext;
-import org.apache.geode.connectors.jdbc.internal.InternalJdbcConnectorService;
+import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
import org.apache.geode.test.junit.categories.UnitTest;
@Category(UnitTest.class)
@@ -36,7 +36,7 @@ public class JdbcCliFunctionTest {
ExceptionHandler exceptionHandler = mock(ExceptionHandler.class);
function = new JdbcCliFunction<Void, Void>(argumentProvider, exceptionHandler) {
@Override
- Void getFunctionResult(InternalJdbcConnectorService service, FunctionContext<Void> context) {
+ Void getFunctionResult(JdbcConnectorService service, FunctionContext<Void> context) {
return null;
}
};
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionCommandDUnitTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionCommandDUnitTest.java
index b27126d..e8bd92f 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionCommandDUnitTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionCommandDUnitTest.java
@@ -27,7 +27,7 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.connectors.jdbc.internal.ConnectionConfigBuilder;
import org.apache.geode.connectors.jdbc.internal.ConnectionConfigExistsException;
-import org.apache.geode.connectors.jdbc.internal.InternalJdbcConnectorService;
+import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.internal.cli.util.CommandStringBuilder;
import org.apache.geode.test.dunit.rules.ClusterStartupRule;
@@ -101,7 +101,7 @@ public class ListConnectionCommandDUnitTest implements Serializable {
private void createOneConnection() throws ConnectionConfigExistsException {
InternalCache cache = ClusterStartupRule.getCache();
- InternalJdbcConnectorService service = cache.getService(InternalJdbcConnectorService.class);
+ JdbcConnectorService service = cache.getService(JdbcConnectorService.class);
service.createConnectionConfig(new ConnectionConfigBuilder().withName(connectionName).build());
@@ -110,7 +110,7 @@ public class ListConnectionCommandDUnitTest implements Serializable {
private void createNConnections(int N) throws ConnectionConfigExistsException {
InternalCache cache = ClusterStartupRule.getCache();
- InternalJdbcConnectorService service = cache.getService(InternalJdbcConnectorService.class);
+ JdbcConnectorService service = cache.getService(JdbcConnectorService.class);
for (int i = 1; i <= N; i++) {
String name = connectionName + "-" + i;
service.createConnectionConfig(new ConnectionConfigBuilder().withName(name).build());
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionCommandIntegrationTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionCommandIntegrationTest.java
index 0f0771c..5bc9409 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionCommandIntegrationTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionCommandIntegrationTest.java
@@ -27,7 +27,7 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.connectors.jdbc.internal.ConnectionConfigBuilder;
import org.apache.geode.connectors.jdbc.internal.ConnectionConfiguration;
-import org.apache.geode.connectors.jdbc.internal.InternalJdbcConnectorService;
+import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.result.CommandResult;
@@ -37,7 +37,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
public class ListConnectionCommandIntegrationTest {
private InternalCache cache;
- private InternalJdbcConnectorService service;
+ private JdbcConnectorService service;
private ConnectionConfiguration connectionConfig1;
private ConnectionConfiguration connectionConfig2;
@@ -58,7 +58,7 @@ public class ListConnectionCommandIntegrationTest {
cache = (InternalCache) new CacheFactory().set("locators", "").set("mcast-port", "0")
.set(ENABLE_CLUSTER_CONFIGURATION, "true").create();
- service = cache.getService(InternalJdbcConnectorService.class);
+ service = cache.getService(JdbcConnectorService.class);
command = new ListConnectionCommand();
}
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionFunctionTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionFunctionTest.java
index 5976094..9c66d2a 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionFunctionTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListConnectionFunctionTest.java
@@ -34,7 +34,7 @@ import org.mockito.ArgumentCaptor;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.cache.execute.ResultSender;
import org.apache.geode.connectors.jdbc.internal.ConnectionConfiguration;
-import org.apache.geode.connectors.jdbc.internal.InternalJdbcConnectorService;
+import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.DistributedSystem;
import org.apache.geode.internal.cache.InternalCache;
@@ -46,7 +46,7 @@ public class ListConnectionFunctionTest {
private FunctionContext<Void> context;
private ResultSender<Object> resultSender;
- private InternalJdbcConnectorService service;
+ private JdbcConnectorService service;
private ConnectionConfiguration connectionConfig1;
private ConnectionConfiguration connectionConfig2;
@@ -62,7 +62,7 @@ public class ListConnectionFunctionTest {
context = mock(FunctionContext.class);
DistributedMember member = mock(DistributedMember.class);
resultSender = mock(ResultSender.class);
- service = mock(InternalJdbcConnectorService.class);
+ service = mock(JdbcConnectorService.class);
DistributedSystem system = mock(DistributedSystem.class);
connectionConfig1 = mock(ConnectionConfiguration.class);
@@ -75,7 +75,7 @@ public class ListConnectionFunctionTest {
when(context.getCache()).thenReturn(cache);
when(cache.getDistributedSystem()).thenReturn(system);
when(system.getDistributedMember()).thenReturn(member);
- when(cache.getService(eq(InternalJdbcConnectorService.class))).thenReturn(service);
+ when(cache.getService(eq(JdbcConnectorService.class))).thenReturn(service);
when(service.getConnectionConfigs()).thenReturn(expected);
function = new ListConnectionFunction();
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandDUnitTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandDUnitTest.java
index b4f455b..598b69b 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandDUnitTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandDUnitTest.java
@@ -25,7 +25,7 @@ import org.junit.Rule;
import org.junit.Test;
import org.junit.experimental.categories.Category;
-import org.apache.geode.connectors.jdbc.internal.InternalJdbcConnectorService;
+import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
import org.apache.geode.connectors.jdbc.internal.RegionMappingBuilder;
import org.apache.geode.connectors.jdbc.internal.RegionMappingExistsException;
import org.apache.geode.internal.cache.InternalCache;
@@ -101,7 +101,7 @@ public class ListMappingCommandDUnitTest implements Serializable {
private void createOneRegionMapping() throws RegionMappingExistsException {
InternalCache cache = ClusterStartupRule.getCache();
- InternalJdbcConnectorService service = cache.getService(InternalJdbcConnectorService.class);
+ JdbcConnectorService service = cache.getService(JdbcConnectorService.class);
service.createRegionMapping(new RegionMappingBuilder().withRegionName(regionName)
.withPdxClassName("x.y.MyPdxClass").withPrimaryKeyInValue(true).build());
@@ -111,7 +111,7 @@ public class ListMappingCommandDUnitTest implements Serializable {
private void createNRegionMappings(int N) throws RegionMappingExistsException {
InternalCache cache = ClusterStartupRule.getCache();
- InternalJdbcConnectorService service = cache.getService(InternalJdbcConnectorService.class);
+ JdbcConnectorService service = cache.getService(JdbcConnectorService.class);
for (int i = 1; i <= N; i++) {
String name = regionName + "-" + i;
service.createRegionMapping(new RegionMappingBuilder().withRegionName(name)
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandIntegrationTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandIntegrationTest.java
index cfc7859..2ec165c 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandIntegrationTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingCommandIntegrationTest.java
@@ -27,7 +27,7 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.connectors.jdbc.internal.ConnectionConfigBuilder;
import org.apache.geode.connectors.jdbc.internal.ConnectionConfiguration;
-import org.apache.geode.connectors.jdbc.internal.InternalJdbcConnectorService;
+import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.management.cli.Result;
import org.apache.geode.management.internal.cli.result.CommandResult;
@@ -37,7 +37,7 @@ import org.apache.geode.test.junit.categories.IntegrationTest;
public class ListMappingCommandIntegrationTest {
private InternalCache cache;
- private InternalJdbcConnectorService service;
+ private JdbcConnectorService service;
private ConnectionConfiguration connectionConfig1;
private ConnectionConfiguration connectionConfig2;
@@ -58,7 +58,7 @@ public class ListMappingCommandIntegrationTest {
cache = (InternalCache) new CacheFactory().set("locators", "").set("mcast-port", "0")
.set(ENABLE_CLUSTER_CONFIGURATION, "true").create();
- service = cache.getService(InternalJdbcConnectorService.class);
+ service = cache.getService(JdbcConnectorService.class);
command = new ListConnectionCommand();
}
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingFunctionTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingFunctionTest.java
index dc03de5..f82b0cc 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingFunctionTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/cli/ListMappingFunctionTest.java
@@ -33,7 +33,7 @@ import org.mockito.ArgumentCaptor;
import org.apache.geode.cache.execute.FunctionContext;
import org.apache.geode.cache.execute.ResultSender;
-import org.apache.geode.connectors.jdbc.internal.InternalJdbcConnectorService;
+import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
import org.apache.geode.connectors.jdbc.internal.RegionMapping;
import org.apache.geode.distributed.DistributedMember;
import org.apache.geode.distributed.DistributedSystem;
@@ -46,7 +46,7 @@ public class ListMappingFunctionTest {
private FunctionContext<Void> context;
private ResultSender<Object> resultSender;
- private InternalJdbcConnectorService service;
+ private JdbcConnectorService service;
private RegionMapping regionMapping1;
private RegionMapping regionMapping2;
@@ -62,7 +62,7 @@ public class ListMappingFunctionTest {
context = mock(FunctionContext.class);
DistributedMember member = mock(DistributedMember.class);
resultSender = mock(ResultSender.class);
- service = mock(InternalJdbcConnectorService.class);
+ service = mock(JdbcConnectorService.class);
DistributedSystem system = mock(DistributedSystem.class);
regionMapping1 = mock(RegionMapping.class);
@@ -75,7 +75,7 @@ public class ListMappingFunctionTest {
when(context.getCache()).thenReturn(cache);
when(cache.getDistributedSystem()).thenReturn(system);
when(system.getDistributedMember()).thenReturn(member);
- when(cache.getService(eq(InternalJdbcConnectorService.class))).thenReturn(service);
+ when(cache.getService(eq(JdbcConnectorService.class))).thenReturn(service);
when(service.getRegionMappings()).thenReturn(expected);
function = new ListMappingFunction();
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlGeneratorIntegrationTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlGeneratorIntegrationTest.java
index 8ed6f71..e4cf332 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlGeneratorIntegrationTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlGeneratorIntegrationTest.java
@@ -55,7 +55,7 @@ import org.xml.sax.SAXException;
import org.apache.geode.cache.CacheFactory;
import org.apache.geode.connectors.jdbc.internal.ConnectionConfigBuilder;
import org.apache.geode.connectors.jdbc.internal.ConnectionConfiguration;
-import org.apache.geode.connectors.jdbc.internal.InternalJdbcConnectorService;
+import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
import org.apache.geode.connectors.jdbc.internal.RegionMapping;
import org.apache.geode.connectors.jdbc.internal.RegionMappingBuilder;
import org.apache.geode.internal.cache.InternalCache;
@@ -85,12 +85,12 @@ public class JdbcConnectorServiceXmlGeneratorIntegrationTest {
@Test
public void cacheGetServiceReturnsJdbcConnectorService() {
- assertThat(cache.getService(InternalJdbcConnectorService.class)).isNotNull();
+ assertThat(cache.getService(JdbcConnectorService.class)).isNotNull();
}
@Test
public void serviceWithoutInformationDoesNotPersist() throws Exception {
- cache.getService(InternalJdbcConnectorService.class);
+ cache.getService(JdbcConnectorService.class);
generateXml();
@@ -101,7 +101,7 @@ public class JdbcConnectorServiceXmlGeneratorIntegrationTest {
@Test
public void serviceWithConnectionsHasCorrectXml() throws Exception {
- InternalJdbcConnectorService service = cache.getService(InternalJdbcConnectorService.class);
+ JdbcConnectorService service = cache.getService(JdbcConnectorService.class);
ConnectionConfiguration config = new ConnectionConfigBuilder().withName("name").withUrl("url")
.withUser("username").withPassword("secret").build();
service.createConnectionConfig(config);
@@ -127,7 +127,7 @@ public class JdbcConnectorServiceXmlGeneratorIntegrationTest {
@Test
public void generatesXmlContainingRegionMapping() throws Exception {
- InternalJdbcConnectorService service = cache.getService(InternalJdbcConnectorService.class);
+ JdbcConnectorService service = cache.getService(JdbcConnectorService.class);
RegionMappingBuilder regionMappingBuilder = new RegionMappingBuilder()
.withRegionName("regionName").withPdxClassName("pdxClassName").withTableName("tableName")
.withConnectionConfigName("connectionConfigName").withPrimaryKeyInValue("true");
@@ -160,7 +160,7 @@ public class JdbcConnectorServiceXmlGeneratorIntegrationTest {
@Test
public void generatedXmlWithConnectionConfigurationCanBeParsed() throws Exception {
- InternalJdbcConnectorService service = cache.getService(InternalJdbcConnectorService.class);
+ JdbcConnectorService service = cache.getService(JdbcConnectorService.class);
ConnectionConfiguration config = new ConnectionConfigBuilder().withName("name").withUrl("url")
.withUser("username").withPassword("secret").build();
service.createConnectionConfig(config);
@@ -168,13 +168,13 @@ public class JdbcConnectorServiceXmlGeneratorIntegrationTest {
cache.close();
createCacheUsingXml();
- service = cache.getService(InternalJdbcConnectorService.class);
+ service = cache.getService(JdbcConnectorService.class);
assertThat(service.getConnectionConfig("name")).isEqualTo(config);
}
@Test
public void generatedXmlWithRegionMappingCanBeParsed() throws Exception {
- InternalJdbcConnectorService service = cache.getService(InternalJdbcConnectorService.class);
+ JdbcConnectorService service = cache.getService(JdbcConnectorService.class);
RegionMapping mapping = new RegionMappingBuilder().withRegionName("region")
.withPdxClassName("class").withTableName("table").withConnectionConfigName("connection")
.withPrimaryKeyInValue(true).withFieldToColumnMapping("field1", "columnMapping1")
@@ -184,13 +184,13 @@ public class JdbcConnectorServiceXmlGeneratorIntegrationTest {
cache.close();
createCacheUsingXml();
- service = cache.getService(InternalJdbcConnectorService.class);
+ service = cache.getService(JdbcConnectorService.class);
assertThat(service.getMappingForRegion("region")).isEqualTo(mapping);
}
@Test
public void generatedXmlWithEverythingCanBeParsed() throws Exception {
- InternalJdbcConnectorService service = cache.getService(InternalJdbcConnectorService.class);
+ JdbcConnectorService service = cache.getService(JdbcConnectorService.class);
ConnectionConfiguration config = new ConnectionConfigBuilder().withName("name").withUrl("url")
.withUser("username").withPassword("secret").build();
service.createConnectionConfig(config);
@@ -203,7 +203,7 @@ public class JdbcConnectorServiceXmlGeneratorIntegrationTest {
cache.close();
createCacheUsingXml();
- service = cache.getService(InternalJdbcConnectorService.class);
+ service = cache.getService(JdbcConnectorService.class);
assertThat(service.getConnectionConfig("name")).isEqualTo(config);
assertThat(service.getMappingForRegion("region")).isEqualTo(mapping);
}
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlIntegrationTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlIntegrationTest.java
index 6c29c52..0b33d71 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlIntegrationTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcConnectorServiceXmlIntegrationTest.java
@@ -34,7 +34,7 @@ import org.apache.geode.cache.CacheFactory;
import org.apache.geode.connectors.jdbc.internal.ConnectionConfigBuilder;
import org.apache.geode.connectors.jdbc.internal.ConnectionConfigExistsException;
import org.apache.geode.connectors.jdbc.internal.ConnectionConfiguration;
-import org.apache.geode.connectors.jdbc.internal.InternalJdbcConnectorService;
+import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
import org.apache.geode.connectors.jdbc.internal.JdbcConnectorServiceImpl;
import org.apache.geode.connectors.jdbc.internal.RegionMapping;
import org.apache.geode.connectors.jdbc.internal.RegionMappingBuilder;
@@ -84,7 +84,7 @@ public class JdbcConnectorServiceXmlIntegrationTest {
private void configureService()
throws ConnectionConfigExistsException, RegionMappingExistsException {
- InternalJdbcConnectorService service = cache.getService(InternalJdbcConnectorService.class);
+ JdbcConnectorService service = cache.getService(JdbcConnectorService.class);
config1 = new ConnectionConfigBuilder().withName("connection1").withUrl("url1")
.withUser("username1").withPassword("secret1")
.withParameters(new String[] {"param1:value1", "param2:value2"}).build();
diff --git a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcServiceConfigurationTest.java b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcServiceConfigurationTest.java
index 363811b..3fd9e97 100644
--- a/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcServiceConfigurationTest.java
+++ b/geode-connectors/src/test/java/org/apache/geode/connectors/jdbc/internal/xml/JdbcServiceConfigurationTest.java
@@ -28,7 +28,7 @@ import org.junit.experimental.categories.Category;
import org.apache.geode.cache.Cache;
import org.apache.geode.connectors.jdbc.internal.ConnectionConfiguration;
-import org.apache.geode.connectors.jdbc.internal.InternalJdbcConnectorService;
+import org.apache.geode.connectors.jdbc.internal.JdbcConnectorService;
import org.apache.geode.connectors.jdbc.internal.RegionMapping;
import org.apache.geode.internal.cache.InternalCache;
import org.apache.geode.internal.cache.xmlcache.XmlGenerator;
@@ -38,7 +38,7 @@ import org.apache.geode.test.junit.categories.UnitTest;
public class JdbcServiceConfigurationTest {
private InternalCache cache;
- private InternalJdbcConnectorService service;
+ private JdbcConnectorService service;
private ConnectionConfiguration connection1;
private ConnectionConfiguration connection2;
private RegionMapping mapping1;
@@ -52,10 +52,10 @@ public class JdbcServiceConfigurationTest {
connection2 = mock(ConnectionConfiguration.class);
mapping1 = mock(RegionMapping.class);
mapping2 = mock(RegionMapping.class);
- service = mock(InternalJdbcConnectorService.class);
+ service = mock(JdbcConnectorService.class);
cache = mock(InternalCache.class);
- when(cache.getService(InternalJdbcConnectorService.class)).thenReturn(service);
+ when(cache.getService(JdbcConnectorService.class)).thenReturn(service);
configuration = new JdbcServiceConfiguration();
}
--
To stop receiving notification emails like this one, please contact
"commits@geode.apache.org" <co...@geode.apache.org>.