#921: remove (unused) SchemaMultiTenantConnectionProvider(s) for h2/p…

…gsql

(SchemaMultiTenantConnectionProvider is no longer abstract)

backend/src/main/java/ch/puzzle/okr/multitenancy/AbstractSchemaMultiTenantConnectionProvider.java → backend/src/main/java/ch/puzzle/okr/multitenancy/SchemaMultiTenantConnectionProvider.java

@@ -16,13 +16,13 @@
 
 import static ch.puzzle.okr.multitenancy.TenantContext.DEFAULT_TENANT_ID;
 
-public class AbstractSchemaMultiTenantConnectionProvider extends AbstractMultiTenantConnectionProvider<String> {
+public class SchemaMultiTenantConnectionProvider extends AbstractMultiTenantConnectionProvider<String> {
 
-    private static final Logger logger = LoggerFactory.getLogger(AbstractSchemaMultiTenantConnectionProvider.class);
+    private static final Logger logger = LoggerFactory.getLogger(SchemaMultiTenantConnectionProvider.class);
 
     final Map<String, ConnectionProvider> connectionProviderMap;
 
-    public AbstractSchemaMultiTenantConnectionProvider() {
+    public SchemaMultiTenantConnectionProvider() {
         this.connectionProviderMap = new HashMap<>();
     }
 

backend/src/main/resources/application-integration-test.properties

@@ -41,5 +41,3 @@ [email protected],[email protected]
 okr.tenants.acme.security.oauth2.resourceserver.jwt.jwk-set-uri=http://localhost:8544/realms/pitc/protocol/openid-connect/certs
 okr.tenants.acme.security.oauth2.frontend.issuer-url=http://localhost:8544/realms/pitc
 okr.tenants.acme.security.oauth2.frontend.client-id=acme_okr_staging
-
-spring.jpa.properties.hibernate.multi_tenant_connection_provider=ch.puzzle.okr.multitenancy.SchemaMultiTenantConnectionProviderH2

backend/src/main/resources/application.properties

@@ -46,7 +46,7 @@ okr.jwt.claim.email=email
 
 spring.jpa.properties.hibernate.multiTenancy=SCHEMA
 spring.jpa.properties.hibernate.tenant_identifier_resolver=ch.puzzle.okr.multitenancy.CurrentTenantIdentifierResolverImpl
-spring.jpa.properties.hibernate.multi_tenant_connection_provider=ch.puzzle.okr.multitenancy.SchemaMultiTenantConnectionProviderPGSQL
+spring.jpa.properties.hibernate.multi_tenant_connection_provider=ch.puzzle.okr.multitenancy.SchemaMultiTenantConnectionProvider
 
 okr.clientcustomization.favicon=assets/favicon.png
 okr.clientcustomization.logo=assets/images/okr-logo.svg

backend/src/test/java/ch/puzzle/okr/multitenancy/SchemaMultiTenantConnectionProviderInternalsTest.java

@@ -14,7 +14,7 @@ public class SchemaMultiTenantConnectionProviderInternalsTest {
 
     private static final String TENANT_ID = "pitc";
 
-    private static class ConfigurableConnectionProviderMock extends AbstractSchemaMultiTenantConnectionProvider {
+    private static class ConfigurableConnectionProviderMock extends SchemaMultiTenantConnectionProvider {
 
         @Override
         protected Properties getHibernateProperties() {

backend/src/test/java/ch/puzzle/okr/multitenancy/SchemaMultiTenantConnectionProviderTest.java

@@ -8,7 +8,6 @@
 import java.sql.Connection;
 import java.sql.SQLException;
 import java.sql.Statement;
-import java.util.Properties;
 
 import static org.mockito.Mockito.verify;
 import static org.mockito.Mockito.when;
@@ -27,8 +26,7 @@ public class SchemaMultiTenantConnectionProviderTest {
     void getConnectionShouldSetSchemaWithOkrPrefix() throws SQLException {
         // arrange
         when(connection.createStatement()).thenReturn(statement);
-        AbstractSchemaMultiTenantConnectionProvider provider = new AbstractSchemaMultiTenantConnectionProvider() {
-        };
+        SchemaMultiTenantConnectionProvider provider = new SchemaMultiTenantConnectionProvider();
 
         // act
         provider.getConnection(TENANT_ID, connection);
@@ -42,8 +40,7 @@ void getConnectionShouldSetSchemaWithOkrPrefix() throws SQLException {
     void getConnectionShouldSetSchemaWithoutOkrPrefixIfTenantIdIsDefaultTenantId() throws SQLException {
         // arrange
         when(connection.createStatement()).thenReturn(statement);
-        AbstractSchemaMultiTenantConnectionProvider provider = new AbstractSchemaMultiTenantConnectionProvider() {
-        };
+        SchemaMultiTenantConnectionProvider provider = new SchemaMultiTenantConnectionProvider();
 
         // act
         provider.getConnection(TenantContext.DEFAULT_TENANT_ID, connection);