This is an automated email from the ASF dual-hosted git repository.
hanicz pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/knox.git
The following commit(s) were added to refs/heads/master by this push:
new 8d5cbdd57 KNOX-3235: Renamed DB factory classes. Fixed PMD suppress
for switch-case (#1136)
8d5cbdd57 is described below
commit 8d5cbdd57d020f1b53e3f2dd5546db75d4257760
Author: hanicz <[email protected]>
AuthorDate: Wed Jan 7 15:19:58 2026 +0100
KNOX-3235: Renamed DB factory classes. Fixed PMD suppress for switch-case
(#1136)
---
...aSource.java => AbstractDataSourceFactory.java} | 2 +-
...aSourceFactory.java => DataSourceProvider.java} | 21 ++++----
.../apache/knox/gateway/database/DatabaseType.java | 48 +++++++++---------
...DataSource.java => DerbyDataSourceFactory.java} | 2 +-
...lDataSource.java => HsqlDataSourceFactory.java} | 2 +-
...taSource.java => MariaDBDataSourceFactory.java} | 2 +-
...DataSource.java => MysqlDataSourceFactory.java} | 2 +-
...ataSource.java => OracleDataSourceFactory.java} | 2 +-
...aSource.java => PostgresDataSourceFactory.java} | 2 +-
.../token/impl/DerbyDBTokenStateService.java | 4 +-
.../services/token/impl/JDBCTokenStateService.java | 4 +-
.../RemoteConfigurationMonitorServiceFactory.java | 4 +-
...actoryTest.java => DataSourceProviderTest.java} | 58 +++++++++++-----------
.../services/factory/ServiceFactoryTest.java | 10 ++--
.../token/impl/JDBCTokenStateServiceTest.java | 6 +--
15 files changed, 83 insertions(+), 86 deletions(-)
diff --git
a/gateway-server/src/main/java/org/apache/knox/gateway/database/AbstractDataSource.java
b/gateway-server/src/main/java/org/apache/knox/gateway/database/AbstractDataSourceFactory.java
similarity index 98%
rename from
gateway-server/src/main/java/org/apache/knox/gateway/database/AbstractDataSource.java
rename to
gateway-server/src/main/java/org/apache/knox/gateway/database/AbstractDataSourceFactory.java
index 32edee732..b9b1bf960 100644
---
a/gateway-server/src/main/java/org/apache/knox/gateway/database/AbstractDataSource.java
+++
b/gateway-server/src/main/java/org/apache/knox/gateway/database/AbstractDataSourceFactory.java
@@ -24,7 +24,7 @@ import
org.apache.knox.gateway.services.security.AliasServiceException;
import javax.sql.DataSource;
import java.sql.SQLException;
-public abstract class AbstractDataSource {
+public abstract class AbstractDataSourceFactory {
public static final String TOKENS_TABLE_CREATE_SQL_FILE_NAME =
"createKnoxTokenDatabaseTable.sql";
public static final String TOKEN_METADATA_TABLE_CREATE_SQL_FILE_NAME =
"createKnoxTokenMetadataDatabaseTable.sql";
diff --git
a/gateway-server/src/main/java/org/apache/knox/gateway/database/DataSourceFactory.java
b/gateway-server/src/main/java/org/apache/knox/gateway/database/DataSourceProvider.java
similarity index 68%
rename from
gateway-server/src/main/java/org/apache/knox/gateway/database/DataSourceFactory.java
rename to
gateway-server/src/main/java/org/apache/knox/gateway/database/DataSourceProvider.java
index 63d2aae15..6b62b2134 100644
---
a/gateway-server/src/main/java/org/apache/knox/gateway/database/DataSourceFactory.java
+++
b/gateway-server/src/main/java/org/apache/knox/gateway/database/DataSourceProvider.java
@@ -24,22 +24,19 @@ import
org.apache.knox.gateway.services.security.AliasServiceException;
import javax.sql.DataSource;
import java.sql.SQLException;
-public class DataSourceFactory {
+public class DataSourceProvider {
- @SuppressWarnings("PMD.ExhaustiveSwitchHasDefault")
public static DataSource getDataSource(GatewayConfig gatewayConfig,
AliasService aliasService) throws AliasServiceException, SQLException {
DatabaseType dbType =
DatabaseType.fromString(gatewayConfig.getDatabaseType());
- AbstractDataSource dsFactory;
- switch (dbType) {
- case POSTGRESQL -> dsFactory = new PostgresDataSource();
- case MYSQL -> dsFactory = new MysqlDataSource();
- case MARIADB -> dsFactory = new MariaDBDataSource();
- case DERBY -> dsFactory = new DerbyDataSource();
- case HSQL -> dsFactory = new HsqlDataSource();
- case ORACLE -> dsFactory = new OracleDataSource();
- default -> throw new IllegalArgumentException("Invalid database
type: " + gatewayConfig.getDatabaseType());
- }
+ AbstractDataSourceFactory dsFactory = switch (dbType) {
+ case POSTGRESQL -> new PostgresDataSourceFactory();
+ case MYSQL -> new MysqlDataSourceFactory();
+ case MARIADB -> new MariaDBDataSourceFactory();
+ case DERBY -> new DerbyDataSourceFactory();
+ case HSQL -> new HsqlDataSourceFactory();
+ case ORACLE -> new OracleDataSourceFactory();
+ };
return dsFactory.createDataSource(gatewayConfig, aliasService);
}
diff --git
a/gateway-server/src/main/java/org/apache/knox/gateway/database/DatabaseType.java
b/gateway-server/src/main/java/org/apache/knox/gateway/database/DatabaseType.java
index ba17ffcc3..f6b6a9a09 100644
---
a/gateway-server/src/main/java/org/apache/knox/gateway/database/DatabaseType.java
+++
b/gateway-server/src/main/java/org/apache/knox/gateway/database/DatabaseType.java
@@ -19,40 +19,40 @@ package org.apache.knox.gateway.database;
public enum DatabaseType {
POSTGRESQL("postgresql",
- AbstractDataSource.TOKENS_TABLE_CREATE_SQL_FILE_NAME,
- AbstractDataSource.TOKEN_METADATA_TABLE_CREATE_SQL_FILE_NAME,
- AbstractDataSource.KNOX_PROVIDERS_TABLE_CREATE_SQL_FILE_NAME,
- AbstractDataSource.KNOX_DESCRIPTORS_TABLE_CREATE_SQL_FILE_NAME
+ AbstractDataSourceFactory.TOKENS_TABLE_CREATE_SQL_FILE_NAME,
+
AbstractDataSourceFactory.TOKEN_METADATA_TABLE_CREATE_SQL_FILE_NAME,
+
AbstractDataSourceFactory.KNOX_PROVIDERS_TABLE_CREATE_SQL_FILE_NAME,
+
AbstractDataSourceFactory.KNOX_DESCRIPTORS_TABLE_CREATE_SQL_FILE_NAME
),
MYSQL("mysql",
- AbstractDataSource.TOKENS_TABLE_CREATE_SQL_FILE_NAME,
- AbstractDataSource.TOKEN_METADATA_TABLE_CREATE_SQL_FILE_NAME,
- AbstractDataSource.KNOX_PROVIDERS_TABLE_CREATE_SQL_FILE_NAME,
- AbstractDataSource.KNOX_DESCRIPTORS_TABLE_CREATE_SQL_FILE_NAME
+ AbstractDataSourceFactory.TOKENS_TABLE_CREATE_SQL_FILE_NAME,
+
AbstractDataSourceFactory.TOKEN_METADATA_TABLE_CREATE_SQL_FILE_NAME,
+
AbstractDataSourceFactory.KNOX_PROVIDERS_TABLE_CREATE_SQL_FILE_NAME,
+
AbstractDataSourceFactory.KNOX_DESCRIPTORS_TABLE_CREATE_SQL_FILE_NAME
),
MARIADB("mariadb",
- AbstractDataSource.TOKENS_TABLE_CREATE_SQL_FILE_NAME,
- AbstractDataSource.TOKEN_METADATA_TABLE_CREATE_SQL_FILE_NAME,
- AbstractDataSource.KNOX_PROVIDERS_TABLE_CREATE_SQL_FILE_NAME,
- AbstractDataSource.KNOX_DESCRIPTORS_TABLE_CREATE_SQL_FILE_NAME
+ AbstractDataSourceFactory.TOKENS_TABLE_CREATE_SQL_FILE_NAME,
+
AbstractDataSourceFactory.TOKEN_METADATA_TABLE_CREATE_SQL_FILE_NAME,
+
AbstractDataSourceFactory.KNOX_PROVIDERS_TABLE_CREATE_SQL_FILE_NAME,
+
AbstractDataSourceFactory.KNOX_DESCRIPTORS_TABLE_CREATE_SQL_FILE_NAME
),
HSQL("hsql",
- AbstractDataSource.TOKENS_TABLE_CREATE_SQL_FILE_NAME,
- AbstractDataSource.TOKEN_METADATA_TABLE_CREATE_SQL_FILE_NAME,
- AbstractDataSource.KNOX_PROVIDERS_TABLE_CREATE_SQL_FILE_NAME,
- AbstractDataSource.KNOX_DESCRIPTORS_TABLE_CREATE_SQL_FILE_NAME
+ AbstractDataSourceFactory.TOKENS_TABLE_CREATE_SQL_FILE_NAME,
+
AbstractDataSourceFactory.TOKEN_METADATA_TABLE_CREATE_SQL_FILE_NAME,
+
AbstractDataSourceFactory.KNOX_PROVIDERS_TABLE_CREATE_SQL_FILE_NAME,
+
AbstractDataSourceFactory.KNOX_DESCRIPTORS_TABLE_CREATE_SQL_FILE_NAME
),
DERBY("derbydb",
- AbstractDataSource.DERBY_TOKENS_TABLE_CREATE_SQL_FILE_NAME,
- AbstractDataSource.DERBY_TOKEN_METADATA_TABLE_CREATE_SQL_FILE_NAME,
- AbstractDataSource.DERBY_KNOX_PROVIDERS_TABLE_CREATE_SQL_FILE_NAME,
-
AbstractDataSource.DERBY_KNOX_DESCRIPTORS_TABLE_CREATE_SQL_FILE_NAME
+ AbstractDataSourceFactory.DERBY_TOKENS_TABLE_CREATE_SQL_FILE_NAME,
+
AbstractDataSourceFactory.DERBY_TOKEN_METADATA_TABLE_CREATE_SQL_FILE_NAME,
+
AbstractDataSourceFactory.DERBY_KNOX_PROVIDERS_TABLE_CREATE_SQL_FILE_NAME,
+
AbstractDataSourceFactory.DERBY_KNOX_DESCRIPTORS_TABLE_CREATE_SQL_FILE_NAME
),
ORACLE("oracle",
- AbstractDataSource.ORACLE_TOKENS_TABLE_CREATE_SQL_FILE_NAME,
-
AbstractDataSource.ORACLE_TOKEN_METADATA_TABLE_CREATE_SQL_FILE_NAME,
-
AbstractDataSource.ORACLE_KNOX_PROVIDERS_TABLE_CREATE_SQL_FILE_NAME,
-
AbstractDataSource.ORACLE_KNOX_DESCRIPTORS_TABLE_CREATE_SQL_FILE_NAME
+ AbstractDataSourceFactory.ORACLE_TOKENS_TABLE_CREATE_SQL_FILE_NAME,
+
AbstractDataSourceFactory.ORACLE_TOKEN_METADATA_TABLE_CREATE_SQL_FILE_NAME,
+
AbstractDataSourceFactory.ORACLE_KNOX_PROVIDERS_TABLE_CREATE_SQL_FILE_NAME,
+
AbstractDataSourceFactory.ORACLE_KNOX_DESCRIPTORS_TABLE_CREATE_SQL_FILE_NAME
);
private final String type;
diff --git
a/gateway-server/src/main/java/org/apache/knox/gateway/database/DerbyDataSource.java
b/gateway-server/src/main/java/org/apache/knox/gateway/database/DerbyDataSourceFactory.java
similarity index 95%
rename from
gateway-server/src/main/java/org/apache/knox/gateway/database/DerbyDataSource.java
rename to
gateway-server/src/main/java/org/apache/knox/gateway/database/DerbyDataSourceFactory.java
index d796a1c18..3d6358070 100644
---
a/gateway-server/src/main/java/org/apache/knox/gateway/database/DerbyDataSource.java
+++
b/gateway-server/src/main/java/org/apache/knox/gateway/database/DerbyDataSourceFactory.java
@@ -25,7 +25,7 @@ import
org.apache.knox.gateway.services.security.AliasServiceException;
import javax.sql.DataSource;
import java.sql.SQLException;
-public class DerbyDataSource extends AbstractDataSource {
+public class DerbyDataSourceFactory extends AbstractDataSourceFactory {
@Override
public DataSource createDataSource(GatewayConfig gatewayConfig,
AliasService aliasService) throws AliasServiceException, SQLException {
diff --git
a/gateway-server/src/main/java/org/apache/knox/gateway/database/HsqlDataSource.java
b/gateway-server/src/main/java/org/apache/knox/gateway/database/HsqlDataSourceFactory.java
similarity index 95%
rename from
gateway-server/src/main/java/org/apache/knox/gateway/database/HsqlDataSource.java
rename to
gateway-server/src/main/java/org/apache/knox/gateway/database/HsqlDataSourceFactory.java
index 756770f17..a46ac4396 100644
---
a/gateway-server/src/main/java/org/apache/knox/gateway/database/HsqlDataSource.java
+++
b/gateway-server/src/main/java/org/apache/knox/gateway/database/HsqlDataSourceFactory.java
@@ -25,7 +25,7 @@ import org.hsqldb.jdbc.JDBCDataSource;
import javax.sql.DataSource;
import java.sql.SQLException;
-public class HsqlDataSource extends AbstractDataSource {
+public class HsqlDataSourceFactory extends AbstractDataSourceFactory {
@Override
public DataSource createDataSource(GatewayConfig gatewayConfig,
AliasService aliasService) throws AliasServiceException, SQLException {
diff --git
a/gateway-server/src/main/java/org/apache/knox/gateway/database/MariaDBDataSource.java
b/gateway-server/src/main/java/org/apache/knox/gateway/database/MariaDBDataSourceFactory.java
similarity index 95%
rename from
gateway-server/src/main/java/org/apache/knox/gateway/database/MariaDBDataSource.java
rename to
gateway-server/src/main/java/org/apache/knox/gateway/database/MariaDBDataSourceFactory.java
index 1b011a16e..629ca705c 100644
---
a/gateway-server/src/main/java/org/apache/knox/gateway/database/MariaDBDataSource.java
+++
b/gateway-server/src/main/java/org/apache/knox/gateway/database/MariaDBDataSourceFactory.java
@@ -25,7 +25,7 @@ import org.mariadb.jdbc.MariaDbDataSource;
import javax.sql.DataSource;
import java.sql.SQLException;
-public class MariaDBDataSource extends AbstractDataSource {
+public class MariaDBDataSourceFactory extends AbstractDataSourceFactory {
@Override
public DataSource createDataSource(GatewayConfig gatewayConfig,
AliasService aliasService) throws AliasServiceException, SQLException {
diff --git
a/gateway-server/src/main/java/org/apache/knox/gateway/database/MysqlDataSource.java
b/gateway-server/src/main/java/org/apache/knox/gateway/database/MysqlDataSourceFactory.java
similarity index 97%
rename from
gateway-server/src/main/java/org/apache/knox/gateway/database/MysqlDataSource.java
rename to
gateway-server/src/main/java/org/apache/knox/gateway/database/MysqlDataSourceFactory.java
index c56b135b9..55c003f3c 100644
---
a/gateway-server/src/main/java/org/apache/knox/gateway/database/MysqlDataSource.java
+++
b/gateway-server/src/main/java/org/apache/knox/gateway/database/MysqlDataSourceFactory.java
@@ -25,7 +25,7 @@ import
org.apache.knox.gateway.services.security.AliasServiceException;
import javax.sql.DataSource;
import java.sql.SQLException;
-public class MysqlDataSource extends AbstractDataSource {
+public class MysqlDataSourceFactory extends AbstractDataSourceFactory {
@Override
public DataSource createDataSource(GatewayConfig gatewayConfig,
AliasService aliasService) throws AliasServiceException, SQLException {
diff --git
a/gateway-server/src/main/java/org/apache/knox/gateway/database/OracleDataSource.java
b/gateway-server/src/main/java/org/apache/knox/gateway/database/OracleDataSourceFactory.java
similarity index 97%
rename from
gateway-server/src/main/java/org/apache/knox/gateway/database/OracleDataSource.java
rename to
gateway-server/src/main/java/org/apache/knox/gateway/database/OracleDataSourceFactory.java
index 6a039c9b8..f9f86764f 100644
---
a/gateway-server/src/main/java/org/apache/knox/gateway/database/OracleDataSource.java
+++
b/gateway-server/src/main/java/org/apache/knox/gateway/database/OracleDataSourceFactory.java
@@ -25,7 +25,7 @@ import
org.apache.knox.gateway.services.security.AliasServiceException;
import javax.sql.DataSource;
import java.sql.SQLException;
-public class OracleDataSource extends AbstractDataSource {
+public class OracleDataSourceFactory extends AbstractDataSourceFactory {
private static final String THIN_DRIVER = "thin";
diff --git
a/gateway-server/src/main/java/org/apache/knox/gateway/database/PostgresDataSource.java
b/gateway-server/src/main/java/org/apache/knox/gateway/database/PostgresDataSourceFactory.java
similarity index 97%
rename from
gateway-server/src/main/java/org/apache/knox/gateway/database/PostgresDataSource.java
rename to
gateway-server/src/main/java/org/apache/knox/gateway/database/PostgresDataSourceFactory.java
index 834436adf..944133887 100644
---
a/gateway-server/src/main/java/org/apache/knox/gateway/database/PostgresDataSource.java
+++
b/gateway-server/src/main/java/org/apache/knox/gateway/database/PostgresDataSourceFactory.java
@@ -28,7 +28,7 @@ import org.postgresql.ssl.NonValidatingFactory;
import javax.sql.DataSource;
import java.sql.SQLException;
-public class PostgresDataSource extends AbstractDataSource {
+public class PostgresDataSourceFactory extends AbstractDataSourceFactory {
@Override
public DataSource createDataSource(GatewayConfig gatewayConfig,
AliasService aliasService) throws AliasServiceException, SQLException {
diff --git
a/gateway-server/src/main/java/org/apache/knox/gateway/services/token/impl/DerbyDBTokenStateService.java
b/gateway-server/src/main/java/org/apache/knox/gateway/services/token/impl/DerbyDBTokenStateService.java
index d333eb571..471542b32 100644
---
a/gateway-server/src/main/java/org/apache/knox/gateway/services/token/impl/DerbyDBTokenStateService.java
+++
b/gateway-server/src/main/java/org/apache/knox/gateway/services/token/impl/DerbyDBTokenStateService.java
@@ -19,8 +19,8 @@ package org.apache.knox.gateway.services.token.impl;
import static
org.apache.knox.gateway.config.impl.GatewayConfigImpl.GATEWAY_DATABASE_NAME;
import static
org.apache.knox.gateway.config.impl.GatewayConfigImpl.GATEWAY_DATABASE_TYPE;
import static
org.apache.knox.gateway.services.security.AliasService.NO_CLUSTER_NAME;
-import static
org.apache.knox.gateway.database.AbstractDataSource.DATABASE_PASSWORD_ALIAS_NAME;
-import static
org.apache.knox.gateway.database.AbstractDataSource.DATABASE_USER_ALIAS_NAME;
+import static
org.apache.knox.gateway.database.AbstractDataSourceFactory.DATABASE_PASSWORD_ALIAS_NAME;
+import static
org.apache.knox.gateway.database.AbstractDataSourceFactory.DATABASE_USER_ALIAS_NAME;
import static org.apache.knox.gateway.database.DatabaseType.DERBY;
import java.nio.file.Files;
diff --git
a/gateway-server/src/main/java/org/apache/knox/gateway/services/token/impl/JDBCTokenStateService.java
b/gateway-server/src/main/java/org/apache/knox/gateway/services/token/impl/JDBCTokenStateService.java
index cd08c531b..4dfc46d29 100644
---
a/gateway-server/src/main/java/org/apache/knox/gateway/services/token/impl/JDBCTokenStateService.java
+++
b/gateway-server/src/main/java/org/apache/knox/gateway/services/token/impl/JDBCTokenStateService.java
@@ -19,7 +19,7 @@ package org.apache.knox.gateway.services.token.impl;
import org.apache.commons.lang3.StringUtils;
import org.apache.knox.gateway.config.GatewayConfig;
-import org.apache.knox.gateway.database.DataSourceFactory;
+import org.apache.knox.gateway.database.DataSourceProvider;
import org.apache.knox.gateway.services.ServiceLifecycleException;
import org.apache.knox.gateway.services.security.AliasService;
import org.apache.knox.gateway.services.security.token.KnoxToken;
@@ -72,7 +72,7 @@ public class JDBCTokenStateService extends
AbstractPersistentTokenStateService i
throw new ServiceLifecycleException("The required AliasService
reference has not been set.");
}
try {
- this.tokenDatabase = new
TokenStateDatabase(DataSourceFactory.getDataSource(config, aliasService),
config.getDatabaseType());
+ this.tokenDatabase = new
TokenStateDatabase(DataSourceProvider.getDataSource(config, aliasService),
config.getDatabaseType());
initialized.set(true);
} catch (Exception e) {
throw new ServiceLifecycleException("Error while initiating
JDBCTokenStateService: " + e, e);
diff --git
a/gateway-server/src/main/java/org/apache/knox/gateway/topology/monitor/RemoteConfigurationMonitorServiceFactory.java
b/gateway-server/src/main/java/org/apache/knox/gateway/topology/monitor/RemoteConfigurationMonitorServiceFactory.java
index 75c71e0c8..f8a954982 100644
---
a/gateway-server/src/main/java/org/apache/knox/gateway/topology/monitor/RemoteConfigurationMonitorServiceFactory.java
+++
b/gateway-server/src/main/java/org/apache/knox/gateway/topology/monitor/RemoteConfigurationMonitorServiceFactory.java
@@ -18,7 +18,7 @@ package org.apache.knox.gateway.topology.monitor;
import org.apache.commons.lang3.StringUtils;
import org.apache.knox.gateway.config.GatewayConfig;
-import org.apache.knox.gateway.database.DataSourceFactory;
+import org.apache.knox.gateway.database.DataSourceProvider;
import org.apache.knox.gateway.services.GatewayServices;
import org.apache.knox.gateway.services.ServiceLifecycleException;
import org.apache.knox.gateway.services.ServiceType;
@@ -59,7 +59,7 @@ public class RemoteConfigurationMonitorServiceFactory extends
AbstractServiceFac
private DbRemoteConfigurationMonitorService
createDbBasedMonitor(GatewayConfig config, AliasService aliasService) throws
ServiceLifecycleException {
try {
- RemoteConfigDatabase db = new
RemoteConfigDatabase(DataSourceFactory.getDataSource(config, aliasService),
config.getDatabaseType());
+ RemoteConfigDatabase db = new
RemoteConfigDatabase(DataSourceProvider.getDataSource(config, aliasService),
config.getDatabaseType());
LocalDirectory descriptorDir = new LocalDirectory(new
File(config.getGatewayDescriptorsDir()));
LocalDirectory providerDir = new LocalDirectory(new
File(config.getGatewayProvidersConfigDir()));
return new DbRemoteConfigurationMonitorService(
diff --git
a/gateway-server/src/test/java/org/apache/knox/gateway/database/DataSourceFactoryTest.java
b/gateway-server/src/test/java/org/apache/knox/gateway/database/DataSourceProviderTest.java
similarity index 85%
rename from
gateway-server/src/test/java/org/apache/knox/gateway/database/DataSourceFactoryTest.java
rename to
gateway-server/src/test/java/org/apache/knox/gateway/database/DataSourceProviderTest.java
index efaae22e0..2eead1652 100644
---
a/gateway-server/src/test/java/org/apache/knox/gateway/database/DataSourceFactoryTest.java
+++
b/gateway-server/src/test/java/org/apache/knox/gateway/database/DataSourceProviderTest.java
@@ -34,7 +34,7 @@ import static org.junit.Assert.assertFalse;
import static org.junit.Assert.assertNull;
import static org.junit.Assert.assertTrue;
-public class DataSourceFactoryTest {
+public class DataSourceProviderTest {
@Test
public void shouldReturnPostgresDataSource() throws Exception {
@@ -43,7 +43,7 @@ public class DataSourceFactoryTest {
final AliasService aliasService =
EasyMock.createNiceMock(AliasService.class);
EasyMock.expect(aliasService.getPasswordFromAliasForGateway(EasyMock.anyString())).andReturn(null).anyTimes();
EasyMock.replay(gatewayConfig, aliasService);
- assertTrue(DataSourceFactory.getDataSource(gatewayConfig, aliasService)
instanceof PGSimpleDataSource);
+ assertTrue(DataSourceProvider.getDataSource(gatewayConfig, aliasService)
instanceof PGSimpleDataSource);
}
@Test
@@ -52,7 +52,7 @@ public class DataSourceFactoryTest {
final AliasService aliasService =
EasyMock.createNiceMock(AliasService.class);
setBasicPostgresExpectations(gatewayConfig, aliasService);
EasyMock.replay(gatewayConfig, aliasService);
- final PGSimpleDataSource dataSource = (PGSimpleDataSource)
DataSourceFactory.getDataSource(gatewayConfig, aliasService);
+ final PGSimpleDataSource dataSource = (PGSimpleDataSource)
DataSourceProvider.getDataSource(gatewayConfig, aliasService);
assertEquals("localhost", dataSource.getServerNames()[0]);
assertEquals(5432, dataSource.getPortNumbers()[0]);
assertEquals("sampleDatabase", dataSource.getDatabaseName());
@@ -66,8 +66,8 @@ public class DataSourceFactoryTest {
EasyMock.expect(gatewayConfig.getDatabaseHost()).andReturn("localhost").anyTimes();
EasyMock.expect(gatewayConfig.getDatabasePort()).andReturn(5432).anyTimes();
EasyMock.expect(gatewayConfig.getDatabaseName()).andReturn("sampleDatabase");
-
EasyMock.expect(aliasService.getPasswordFromAliasForGateway(AbstractDataSource.DATABASE_USER_ALIAS_NAME)).andReturn("user".toCharArray()).anyTimes();
-
EasyMock.expect(aliasService.getPasswordFromAliasForGateway(AbstractDataSource.DATABASE_PASSWORD_ALIAS_NAME)).andReturn("password".toCharArray()).anyTimes();
+
EasyMock.expect(aliasService.getPasswordFromAliasForGateway(AbstractDataSourceFactory.DATABASE_USER_ALIAS_NAME)).andReturn("user".toCharArray()).anyTimes();
+
EasyMock.expect(aliasService.getPasswordFromAliasForGateway(AbstractDataSourceFactory.DATABASE_PASSWORD_ALIAS_NAME)).andReturn("password".toCharArray()).anyTimes();
}
@Test
@@ -81,7 +81,7 @@ public class DataSourceFactoryTest {
EasyMock.expect(gatewayConfig.verifyDatabaseSslServerCertificate()).andReturn(false).anyTimes();
EasyMock.replay(gatewayConfig, aliasService);
- final PGSimpleDataSource dataSource = (PGSimpleDataSource)
DataSourceFactory.getDataSource(gatewayConfig, aliasService);
+ final PGSimpleDataSource dataSource = (PGSimpleDataSource)
DataSourceProvider.getDataSource(gatewayConfig, aliasService);
assertTrue(dataSource.isSsl());
assertNull(dataSource.getSslRootCert());
assertEquals(dataSource.getSslfactory(),
NonValidatingFactory.class.getCanonicalName());
@@ -98,10 +98,10 @@ public class DataSourceFactoryTest {
EasyMock.expect(gatewayConfig.isDatabaseSslEnabled()).andReturn(true).anyTimes();
EasyMock.expect(gatewayConfig.verifyDatabaseSslServerCertificate()).andReturn(true).anyTimes();
EasyMock.expect(gatewayConfig.getDatabaseSslTruststoreFileName()).andReturn("/sample/file/path").anyTimes();
-
EasyMock.expect(aliasService.getPasswordFromAliasForGateway(AbstractDataSource.DATABASE_TRUSTSTORE_PASSWORD_ALIAS_NAME)).andReturn("password".toCharArray()).anyTimes();
+
EasyMock.expect(aliasService.getPasswordFromAliasForGateway(AbstractDataSourceFactory.DATABASE_TRUSTSTORE_PASSWORD_ALIAS_NAME)).andReturn("password".toCharArray()).anyTimes();
EasyMock.replay(gatewayConfig, aliasService);
- final PGSimpleDataSource dataSource = (PGSimpleDataSource)
DataSourceFactory.getDataSource(gatewayConfig, aliasService);
+ final PGSimpleDataSource dataSource = (PGSimpleDataSource)
DataSourceProvider.getDataSource(gatewayConfig, aliasService);
assertTrue(dataSource.isSsl());
assertEquals(dataSource.getSslRootCert(), "/sample/file/path");
EasyMock.verify(gatewayConfig, aliasService);
@@ -112,12 +112,12 @@ public class DataSourceFactoryTest {
final String connectionUrl =
"jdbc:postgresql://postgresql_host:1234/testDb?user=smolnar&password=secret&ssl=true&sslmode=verify-ca&sslrootcert=/var/lib/knox/gateway/conf/postgresql/root.crt";
final GatewayConfig gatewayConfig =
EasyMock.createNiceMock(GatewayConfig.class);
final AliasService aliasService =
EasyMock.createNiceMock(AliasService.class);
-
EasyMock.expect(aliasService.getPasswordFromAliasForGateway(AbstractDataSource.DATABASE_USER_ALIAS_NAME)).andReturn(null).anyTimes();
-
EasyMock.expect(aliasService.getPasswordFromAliasForGateway(AbstractDataSource.DATABASE_PASSWORD_ALIAS_NAME)).andReturn(null).anyTimes();
+
EasyMock.expect(aliasService.getPasswordFromAliasForGateway(AbstractDataSourceFactory.DATABASE_USER_ALIAS_NAME)).andReturn(null).anyTimes();
+
EasyMock.expect(aliasService.getPasswordFromAliasForGateway(AbstractDataSourceFactory.DATABASE_PASSWORD_ALIAS_NAME)).andReturn(null).anyTimes();
EasyMock.expect(gatewayConfig.getDatabaseType()).andReturn(DatabaseType.POSTGRESQL.type()).anyTimes();
EasyMock.expect(gatewayConfig.getDatabaseConnectionUrl()).andReturn(connectionUrl).anyTimes();
EasyMock.replay(gatewayConfig, aliasService);
- final PGSimpleDataSource dataSource = (PGSimpleDataSource)
DataSourceFactory.getDataSource(gatewayConfig, aliasService);
+ final PGSimpleDataSource dataSource = (PGSimpleDataSource)
DataSourceProvider.getDataSource(gatewayConfig, aliasService);
assertEquals("postgresql_host", dataSource.getServerNames()[0]);
assertEquals(1234, dataSource.getPortNumbers()[0]);
assertEquals("testDb", dataSource.getDatabaseName());
@@ -135,7 +135,7 @@ public class DataSourceFactoryTest {
final AliasService aliasService =
EasyMock.createNiceMock(AliasService.class);
EasyMock.expect(aliasService.getPasswordFromAliasForGateway(EasyMock.anyString())).andReturn(null).anyTimes();
EasyMock.replay(gatewayConfig, aliasService);
- assertTrue(DataSourceFactory.getDataSource(gatewayConfig, aliasService)
instanceof EmbeddedDataSource);
+ assertTrue(DataSourceProvider.getDataSource(gatewayConfig, aliasService)
instanceof EmbeddedDataSource);
}
@Test
@@ -144,10 +144,10 @@ public class DataSourceFactoryTest {
EasyMock.expect(gatewayConfig.getDatabaseType()).andReturn(DatabaseType.DERBY.type()).anyTimes();
EasyMock.expect(gatewayConfig.getDatabaseName()).andReturn("sampleDatabase");
final AliasService aliasService =
EasyMock.createNiceMock(AliasService.class);
-
EasyMock.expect(aliasService.getPasswordFromAliasForGateway(AbstractDataSource.DATABASE_USER_ALIAS_NAME)).andReturn("user".toCharArray()).anyTimes();
-
EasyMock.expect(aliasService.getPasswordFromAliasForGateway(AbstractDataSource.DATABASE_PASSWORD_ALIAS_NAME)).andReturn("password".toCharArray()).anyTimes();
+
EasyMock.expect(aliasService.getPasswordFromAliasForGateway(AbstractDataSourceFactory.DATABASE_USER_ALIAS_NAME)).andReturn("user".toCharArray()).anyTimes();
+
EasyMock.expect(aliasService.getPasswordFromAliasForGateway(AbstractDataSourceFactory.DATABASE_PASSWORD_ALIAS_NAME)).andReturn("password".toCharArray()).anyTimes();
EasyMock.replay(gatewayConfig, aliasService);
- final EmbeddedDataSource dataSource = (EmbeddedDataSource)
DataSourceFactory.getDataSource(gatewayConfig, aliasService);
+ final EmbeddedDataSource dataSource = (EmbeddedDataSource)
DataSourceProvider.getDataSource(gatewayConfig, aliasService);
assertEquals("sampleDatabase", dataSource.getDatabaseName());
assertEquals("user", dataSource.getUser());
assertEquals("password", dataSource.getPassword());
@@ -160,7 +160,7 @@ public class DataSourceFactoryTest {
final AliasService aliasService =
EasyMock.createNiceMock(AliasService.class);
EasyMock.expect(aliasService.getPasswordFromAliasForGateway(EasyMock.anyString())).andReturn(null).anyTimes();
EasyMock.replay(gatewayConfig, aliasService);
- assertTrue(DataSourceFactory.getDataSource(gatewayConfig, aliasService)
instanceof MysqlDataSource);
+ assertTrue(DataSourceProvider.getDataSource(gatewayConfig, aliasService)
instanceof MysqlDataSource);
}
@Test
@@ -171,10 +171,10 @@ public class DataSourceFactoryTest {
EasyMock.expect(gatewayConfig.getDatabaseHost()).andReturn("localhost").anyTimes();
EasyMock.expect(gatewayConfig.getDatabasePort()).andReturn(5432).anyTimes();
EasyMock.expect(gatewayConfig.getDatabaseName()).andReturn("sampleDatabase");
-
EasyMock.expect(aliasService.getPasswordFromAliasForGateway(AbstractDataSource.DATABASE_USER_ALIAS_NAME)).andReturn("user".toCharArray()).anyTimes();
-
EasyMock.expect(aliasService.getPasswordFromAliasForGateway(AbstractDataSource.DATABASE_PASSWORD_ALIAS_NAME)).andReturn("password".toCharArray()).anyTimes();
+
EasyMock.expect(aliasService.getPasswordFromAliasForGateway(AbstractDataSourceFactory.DATABASE_USER_ALIAS_NAME)).andReturn("user".toCharArray()).anyTimes();
+
EasyMock.expect(aliasService.getPasswordFromAliasForGateway(AbstractDataSourceFactory.DATABASE_PASSWORD_ALIAS_NAME)).andReturn("password".toCharArray()).anyTimes();
EasyMock.replay(gatewayConfig, aliasService);
- MysqlDataSource dataSource = (MysqlDataSource)
DataSourceFactory.getDataSource(gatewayConfig, aliasService);
+ MysqlDataSource dataSource = (MysqlDataSource)
DataSourceProvider.getDataSource(gatewayConfig, aliasService);
assertEquals("localhost", dataSource.getServerName());
assertEquals(5432, dataSource.getPortNumber());
assertEquals("sampleDatabase", dataSource.getDatabaseName());
@@ -191,7 +191,7 @@ public class DataSourceFactoryTest {
EasyMock.expect(gatewayConfig.getDatabaseType()).andReturn(DatabaseType.MYSQL.type()).anyTimes();
EasyMock.expect(gatewayConfig.getDatabaseConnectionUrl()).andReturn(connectionUrl).anyTimes();
EasyMock.replay(gatewayConfig);
- MysqlDataSource dataSource = (MysqlDataSource)
DataSourceFactory.getDataSource(gatewayConfig, null);
+ MysqlDataSource dataSource = (MysqlDataSource)
DataSourceProvider.getDataSource(gatewayConfig, null);
assertEquals(connectionUrl, dataSource.getUrl());
EasyMock.verify(gatewayConfig);
}
@@ -202,7 +202,7 @@ public class DataSourceFactoryTest {
EasyMock.expect(gatewayConfig.getDatabaseType()).andReturn(DatabaseType.MARIADB.type()).anyTimes();
EasyMock.expect(gatewayConfig.getDatabaseConnectionUrl()).andReturn("jdbc:mariadb://localhost:1234").anyTimes();
EasyMock.replay(gatewayConfig);
- assertTrue(DataSourceFactory.getDataSource(gatewayConfig, null) instanceof
MariaDbDataSource);
+ assertTrue(DataSourceProvider.getDataSource(gatewayConfig, null)
instanceof MariaDbDataSource);
}
@Test
@@ -225,7 +225,7 @@ public class DataSourceFactoryTest {
EasyMock.expect(gatewayConfig.getDatabaseConnectionUrl()).andReturn(connectionUrl).anyTimes();
}
EasyMock.replay(gatewayConfig);
- DataSourceFactory.getDataSource(gatewayConfig, null);
+ DataSourceProvider.getDataSource(gatewayConfig, null);
} catch (Exception e) {
error = true;
assertEquals(expectedError, e.getMessage());
@@ -240,7 +240,7 @@ public class DataSourceFactoryTest {
final AliasService aliasService =
EasyMock.createNiceMock(AliasService.class);
EasyMock.expect(aliasService.getPasswordFromAliasForGateway(EasyMock.anyString())).andReturn(null).anyTimes();
EasyMock.replay(gatewayConfig, aliasService);
- assertTrue(DataSourceFactory.getDataSource(gatewayConfig, aliasService)
instanceof OracleDataSource);
+ assertTrue(DataSourceProvider.getDataSource(gatewayConfig, aliasService)
instanceof OracleDataSource);
}
@Test
@@ -249,7 +249,7 @@ public class DataSourceFactoryTest {
final AliasService aliasService =
EasyMock.createNiceMock(AliasService.class);
setBasicOracleExpectations(gatewayConfig, aliasService);
EasyMock.replay(gatewayConfig, aliasService);
- final OracleDataSource dataSource = (OracleDataSource)
DataSourceFactory.getDataSource(gatewayConfig, aliasService);
+ final OracleDataSource dataSource = (OracleDataSource)
DataSourceProvider.getDataSource(gatewayConfig, aliasService);
assertEquals("localhost", dataSource.getServerName());
assertEquals(1521, dataSource.getPortNumber());
assertEquals("sampleDatabase", dataSource.getServiceName());
@@ -261,12 +261,12 @@ public class DataSourceFactoryTest {
final String connectionUrl =
"jdbc:oracle:thin:testuser/testpw@oracle_host:1521/TESTDB";
final GatewayConfig gatewayConfig =
EasyMock.createNiceMock(GatewayConfig.class);
final AliasService aliasService =
EasyMock.createNiceMock(AliasService.class);
-
EasyMock.expect(aliasService.getPasswordFromAliasForGateway(AbstractDataSource.DATABASE_USER_ALIAS_NAME)).andReturn(null).anyTimes();
-
EasyMock.expect(aliasService.getPasswordFromAliasForGateway(AbstractDataSource.DATABASE_PASSWORD_ALIAS_NAME)).andReturn(null).anyTimes();
+
EasyMock.expect(aliasService.getPasswordFromAliasForGateway(AbstractDataSourceFactory.DATABASE_USER_ALIAS_NAME)).andReturn(null).anyTimes();
+
EasyMock.expect(aliasService.getPasswordFromAliasForGateway(AbstractDataSourceFactory.DATABASE_PASSWORD_ALIAS_NAME)).andReturn(null).anyTimes();
EasyMock.expect(gatewayConfig.getDatabaseType()).andReturn(DatabaseType.ORACLE.type()).anyTimes();
EasyMock.expect(gatewayConfig.getDatabaseConnectionUrl()).andReturn(connectionUrl).anyTimes();
EasyMock.replay(gatewayConfig, aliasService);
- final OracleDataSource dataSource = (OracleDataSource)
DataSourceFactory.getDataSource(gatewayConfig, aliasService);
+ final OracleDataSource dataSource = (OracleDataSource)
DataSourceProvider.getDataSource(gatewayConfig, aliasService);
assertNull(dataSource.getUser());
assertEquals(0, dataSource.getPortNumber());
assertNull(dataSource.getServerName());
@@ -280,7 +280,7 @@ public class DataSourceFactoryTest {
EasyMock.expect(gatewayConfig.getDatabaseHost()).andReturn("localhost").anyTimes();
EasyMock.expect(gatewayConfig.getDatabasePort()).andReturn(1521).anyTimes();
EasyMock.expect(gatewayConfig.getDatabaseName()).andReturn("sampleDatabase");
-
EasyMock.expect(aliasService.getPasswordFromAliasForGateway(AbstractDataSource.DATABASE_USER_ALIAS_NAME)).andReturn("user".toCharArray()).anyTimes();
-
EasyMock.expect(aliasService.getPasswordFromAliasForGateway(AbstractDataSource.DATABASE_PASSWORD_ALIAS_NAME)).andReturn("password".toCharArray()).anyTimes();
+
EasyMock.expect(aliasService.getPasswordFromAliasForGateway(AbstractDataSourceFactory.DATABASE_USER_ALIAS_NAME)).andReturn("user".toCharArray()).anyTimes();
+
EasyMock.expect(aliasService.getPasswordFromAliasForGateway(AbstractDataSourceFactory.DATABASE_PASSWORD_ALIAS_NAME)).andReturn("password".toCharArray()).anyTimes();
}
}
diff --git
a/gateway-server/src/test/java/org/apache/knox/gateway/services/factory/ServiceFactoryTest.java
b/gateway-server/src/test/java/org/apache/knox/gateway/services/factory/ServiceFactoryTest.java
index e75c7613a..213370f3e 100644
---
a/gateway-server/src/test/java/org/apache/knox/gateway/services/factory/ServiceFactoryTest.java
+++
b/gateway-server/src/test/java/org/apache/knox/gateway/services/factory/ServiceFactoryTest.java
@@ -20,7 +20,7 @@ package org.apache.knox.gateway.services.factory;
import org.apache.commons.io.FileUtils;
import org.apache.commons.lang3.reflect.FieldUtils;
import org.apache.knox.gateway.config.impl.GatewayConfigImpl;
-import org.apache.knox.gateway.database.AbstractDataSource;
+import org.apache.knox.gateway.database.AbstractDataSourceFactory;
import org.apache.knox.gateway.database.DatabaseType;
import org.apache.knox.gateway.services.GatewayServices;
import org.apache.knox.gateway.services.Service;
@@ -82,12 +82,12 @@ class ServiceFactoryTest {
final AliasService aliasService =
EasyMock.createNiceMock(AliasService.class);
if (expectDbCredentialLookup) {
try {
- aliasService.addAliasForCluster(NO_CLUSTER_NAME,
AbstractDataSource.DATABASE_USER_ALIAS_NAME,
DerbyDBTokenStateService.DEFAULT_TOKEN_DB_USER_NAME);
+ aliasService.addAliasForCluster(NO_CLUSTER_NAME,
AbstractDataSourceFactory.DATABASE_USER_ALIAS_NAME,
DerbyDBTokenStateService.DEFAULT_TOKEN_DB_USER_NAME);
EasyMock.expectLastCall().anyTimes();
- aliasService.addAliasForCluster(NO_CLUSTER_NAME,
AbstractDataSource.DATABASE_PASSWORD_ALIAS_NAME, masterSecret);
+ aliasService.addAliasForCluster(NO_CLUSTER_NAME,
AbstractDataSourceFactory.DATABASE_PASSWORD_ALIAS_NAME, masterSecret);
EasyMock.expectLastCall().anyTimes();
-
expect(aliasService.getPasswordFromAliasForGateway(AbstractDataSource.DATABASE_USER_ALIAS_NAME)).andReturn(DerbyDBTokenStateService.DEFAULT_TOKEN_DB_USER_NAME.toCharArray()).anyTimes();
-
expect(aliasService.getPasswordFromAliasForGateway(AbstractDataSource.DATABASE_PASSWORD_ALIAS_NAME)).andReturn(masterSecret.toCharArray()).anyTimes();
+
expect(aliasService.getPasswordFromAliasForGateway(AbstractDataSourceFactory.DATABASE_USER_ALIAS_NAME)).andReturn(DerbyDBTokenStateService.DEFAULT_TOKEN_DB_USER_NAME.toCharArray()).anyTimes();
+
expect(aliasService.getPasswordFromAliasForGateway(AbstractDataSourceFactory.DATABASE_PASSWORD_ALIAS_NAME)).andReturn(masterSecret.toCharArray()).anyTimes();
// prepare GatewayConfig
expect(gatewayConfig.getDatabaseType()).andReturn(DatabaseType.DERBY.type()).anyTimes();
diff --git
a/gateway-server/src/test/java/org/apache/knox/gateway/services/token/impl/JDBCTokenStateServiceTest.java
b/gateway-server/src/test/java/org/apache/knox/gateway/services/token/impl/JDBCTokenStateServiceTest.java
index b42ebe8f1..17983c77b 100644
---
a/gateway-server/src/test/java/org/apache/knox/gateway/services/token/impl/JDBCTokenStateServiceTest.java
+++
b/gateway-server/src/test/java/org/apache/knox/gateway/services/token/impl/JDBCTokenStateServiceTest.java
@@ -21,7 +21,7 @@ import org.apache.commons.codec.binary.Base64;
import org.apache.commons.codec.digest.HmacAlgorithms;
import org.apache.commons.lang3.reflect.FieldUtils;
import org.apache.knox.gateway.config.GatewayConfig;
-import org.apache.knox.gateway.database.AbstractDataSource;
+import org.apache.knox.gateway.database.AbstractDataSourceFactory;
import org.apache.knox.gateway.database.DatabaseType;
import org.apache.knox.gateway.services.security.AliasService;
import org.apache.knox.gateway.services.security.token.KnoxToken;
@@ -78,8 +78,8 @@ public class JDBCTokenStateServiceTest {
EasyMock.expect(gatewayConfig.getDatabaseConnectionUrl()).andReturn(CONNECTION_URL).anyTimes();
EasyMock.expect(gatewayConfig.getDatabaseName()).andReturn(DB_NAME).anyTimes();
final AliasService aliasService =
EasyMock.createNiceMock(AliasService.class);
-
EasyMock.expect(aliasService.getPasswordFromAliasForGateway(AbstractDataSource.DATABASE_USER_ALIAS_NAME)).andReturn(USERNAME.toCharArray()).anyTimes();
-
EasyMock.expect(aliasService.getPasswordFromAliasForGateway(AbstractDataSource.DATABASE_PASSWORD_ALIAS_NAME)).andReturn(PASSWORD.toCharArray()).anyTimes();
+
EasyMock.expect(aliasService.getPasswordFromAliasForGateway(AbstractDataSourceFactory.DATABASE_USER_ALIAS_NAME)).andReturn(USERNAME.toCharArray()).anyTimes();
+
EasyMock.expect(aliasService.getPasswordFromAliasForGateway(AbstractDataSourceFactory.DATABASE_PASSWORD_ALIAS_NAME)).andReturn(PASSWORD.toCharArray()).anyTimes();
EasyMock.replay(gatewayConfig, aliasService);
jdbcTokenStateService = new JDBCTokenStateService();
jdbcTokenStateService.setAliasService(aliasService);
