From a19f8f8dadb0fc79d397caf04a5bee02cd3e307d Mon Sep 17 00:00:00 2001
From: Titouan Compiegne <titouancompiegne@grvtfr1033.home>
Date: Tue, 30 May 2023 09:17:02 +0200
Subject: [PATCH] feat(idp): support Oracle database for JDBC IdP

closes AM-586
---
 .../gravitee-am-identityprovider-jdbc/pom.xml | 88 ++++++++-----------
 .../JdbcIdentityProviderConfiguration.java    |  7 +-
 .../jdbc/user/JdbcUserProvider.java           | 11 ++-
 .../jdbc/utils/ColumnMapRowMapper.java        |  7 +-
 .../jdbc/utils/ParametersUtils.java           |  4 +-
 .../src/main/resources/database/oracle.schema |  7 ++
 .../main/resources/schemas/schema-form.json   | 10 ++-
 ...JdbcAuthenticationProvider_OracleTest.java | 28 ++++++
 ...ationProviderConfigurationTest_Oracle.java | 35 ++++++++
 .../user/JdbcUserProvider_OracleTest.java     | 28 ++++++
 .../gravitee-am-reporter-jdbc/pom.xml         |  8 +-
 .../jdbc/JdbcReporterConfiguration.java       |  4 +-
 .../audit/JdbcReporterJUnitConfiguration.java | 15 ++--
 .../gravitee-am-repository-jdbc-api/pom.xml   |  9 +-
 .../impl/ConnectionFactoryProvider.java       | 20 +++--
 .../gravitee-am-repository-jdbc/pom.xml       | 54 +++---------
 .../AbstractTestRepositoryConfiguration.java  |  4 +-
 17 files changed, 203 insertions(+), 136 deletions(-)
 create mode 100644 gravitee-am-identityprovider/gravitee-am-identityprovider-jdbc/src/main/resources/database/oracle.schema
 create mode 100644 gravitee-am-identityprovider/gravitee-am-identityprovider-jdbc/src/test/java/io/gravitee/am/identityprovider/jdbc/authentication/JdbcAuthenticationProvider_OracleTest.java
 create mode 100644 gravitee-am-identityprovider/gravitee-am-identityprovider-jdbc/src/test/java/io/gravitee/am/identityprovider/jdbc/configuration/JdbcAuthenticationProviderConfigurationTest_Oracle.java
 create mode 100644 gravitee-am-identityprovider/gravitee-am-identityprovider-jdbc/src/test/java/io/gravitee/am/identityprovider/jdbc/user/JdbcUserProvider_OracleTest.java

diff --git a/gravitee-am-identityprovider/gravitee-am-identityprovider-jdbc/pom.xml b/gravitee-am-identityprovider/gravitee-am-identityprovider-jdbc/pom.xml
index 74eead03a5a..7d24e3a6218 100644
--- a/gravitee-am-identityprovider/gravitee-am-identityprovider-jdbc/pom.xml
+++ b/gravitee-am-identityprovider/gravitee-am-identityprovider-jdbc/pom.xml
@@ -33,15 +33,23 @@
     <name>Gravitee IO - Access Management - Identity Provider - JDBC</name>
 
     <properties>
-        <r2dbc-pool.version>0.8.6.RELEASE</r2dbc-pool.version>
-        <r2dbc-postgresql.version>0.8.11.RELEASE</r2dbc-postgresql.version>
-        <r2dbc-mssql.version>0.8.7.RELEASE</r2dbc-mssql.version>
-        <r2dbc-mysql.version>0.8.2.RELEASE</r2dbc-mysql.version>
-        <r2dbc-mariadb.version>1.0.0</r2dbc-mariadb.version>
-        <r2dbc-spi.version>0.8.4.RELEASE</r2dbc-spi.version>
+        <r2dbc-releasetrain.version>Borca-SR2</r2dbc-releasetrain.version>
+        <r2dbc-mysql.version>0.9.3</r2dbc-mysql.version>
         <spring-data-r2dbc.version>1.4.1</spring-data-r2dbc.version>
     </properties>
 
+    <dependencyManagement>
+        <dependencies>
+            <dependency>
+                <groupId>io.r2dbc</groupId>
+                <artifactId>r2dbc-bom</artifactId>
+                <version>${r2dbc-releasetrain.version}</version>
+                <type>pom</type>
+                <scope>import</scope>
+            </dependency>
+        </dependencies>
+    </dependencyManagement>
+
     <dependencies>
         <!-- Gravitee.io -->
         <dependency>
@@ -86,64 +94,30 @@
 
         <!-- R2DBC -->
         <dependency>
-            <groupId>io.r2dbc</groupId>
+            <groupId>org.postgresql</groupId>
             <artifactId>r2dbc-postgresql</artifactId>
-            <version>${r2dbc-postgresql.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>r2dbc-spi</artifactId>
-                    <groupId>io.r2dbc</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>reactor-core</artifactId>
-                    <groupId>io.projectreactor</groupId>
-                </exclusion>
-            </exclusions>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>io.r2dbc</groupId>
             <artifactId>r2dbc-mssql</artifactId>
-            <version>${r2dbc-mssql.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>r2dbc-spi</artifactId>
-                    <groupId>io.r2dbc</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>reactor-core</artifactId>
-                    <groupId>io.projectreactor</groupId>
-                </exclusion>
-            </exclusions>
+            <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>dev.miku</groupId>
+            <groupId>io.asyncer</groupId>
             <artifactId>r2dbc-mysql</artifactId>
             <version>${r2dbc-mysql.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>r2dbc-spi</artifactId>
-                    <groupId>io.r2dbc</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>reactor-core</artifactId>
-                    <groupId>io.projectreactor</groupId>
-                </exclusion>
-            </exclusions>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.mariadb</groupId>
             <artifactId>r2dbc-mariadb</artifactId>
-            <version>${r2dbc-mariadb.version}</version>
-            <exclusions>
-                <exclusion>
-                    <artifactId>r2dbc-spi</artifactId>
-                    <groupId>io.r2dbc</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>reactor-core</artifactId>
-                    <groupId>io.projectreactor</groupId>
-                </exclusion>
-            </exclusions>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.oracle.database.r2dbc</groupId>
+            <artifactId>oracle-r2dbc</artifactId>
+            <scope>provided</scope>
         </dependency>
 
         <!-- Spring -->
@@ -214,6 +188,18 @@
             <version>${test-container.version}</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+            <groupId>org.testcontainers</groupId>
+            <artifactId>oracle-xe</artifactId>
+            <version>1.18.1</version>
+            <scope>test</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.oracle.database.jdbc</groupId>
+            <artifactId>ojdbc11</artifactId>
+            <version>21.7.0.0</version>
+            <scope>test</scope>
+        </dependency>
 
         <dependency>
             <!--
diff --git a/gravitee-am-identityprovider/gravitee-am-identityprovider-jdbc/src/main/java/io/gravitee/am/identityprovider/jdbc/configuration/JdbcIdentityProviderConfiguration.java b/gravitee-am-identityprovider/gravitee-am-identityprovider-jdbc/src/main/java/io/gravitee/am/identityprovider/jdbc/configuration/JdbcIdentityProviderConfiguration.java
index d530926012a..de80c93f9de 100644
--- a/gravitee-am-identityprovider/gravitee-am-identityprovider-jdbc/src/main/java/io/gravitee/am/identityprovider/jdbc/configuration/JdbcIdentityProviderConfiguration.java
+++ b/gravitee-am-identityprovider/gravitee-am-identityprovider-jdbc/src/main/java/io/gravitee/am/identityprovider/jdbc/configuration/JdbcIdentityProviderConfiguration.java
@@ -45,6 +45,7 @@ public class JdbcIdentityProviderConfiguration implements IdentityProviderConfig
     private String selectUserByEmailQuery;
     private String identifierAttribute = FIELD_ID;
     private String emailAttribute = FIELD_EMAIL;
+    private String metadataAttribute = FIELD_METADATA;
     private String usernameAttribute = FIELD_USERNAME;
     private String passwordAttribute = FIELD_PASSWORD;
     private String passwordEncoder = PasswordEncoder.BCRYPT;
@@ -227,7 +228,11 @@ public void setEmailAttribute(String emailAttribute) {
     }
 
     public String getMetadataAttribute() {
-        return FIELD_METADATA;
+        return metadataAttribute;
+    }
+
+    public void setMetadataAttribute(String metadataAttribute) {
+        this.metadataAttribute = metadataAttribute;
     }
 
     public boolean getAutoProvisioning() {
diff --git a/gravitee-am-identityprovider/gravitee-am-identityprovider-jdbc/src/main/java/io/gravitee/am/identityprovider/jdbc/user/JdbcUserProvider.java b/gravitee-am-identityprovider/gravitee-am-identityprovider-jdbc/src/main/java/io/gravitee/am/identityprovider/jdbc/user/JdbcUserProvider.java
index 047e12d530a..6c0f7c45d91 100644
--- a/gravitee-am-identityprovider/gravitee-am-identityprovider-jdbc/src/main/java/io/gravitee/am/identityprovider/jdbc/user/JdbcUserProvider.java
+++ b/gravitee-am-identityprovider/gravitee-am-identityprovider-jdbc/src/main/java/io/gravitee/am/identityprovider/jdbc/user/JdbcUserProvider.java
@@ -169,10 +169,13 @@ public Single<UserProvider> asyncStart() {
     }
 
     private String tableExists(String protocol, String table) {
-        if ("sqlserver".equalsIgnoreCase(protocol)) {
-            return "SELECT 1 FROM sysobjects WHERE name = '" + table + "' AND xtype = 'U'";
-        } else {
-            return "SELECT 1 FROM information_schema.tables WHERE table_name = '" + table + "'";
+        switch (protocol) {
+            case "sqlserver" :
+                return "SELECT 1 FROM sysobjects WHERE name = '" + table + "' AND xtype = 'U'";
+            case "oracle":
+                return "SELECT 1 from user_tables where table_name = '" + table + "'";
+            default:
+                return "SELECT 1 FROM information_schema.tables WHERE table_name = '" + table + "'";
         }
     }
 
diff --git a/gravitee-am-identityprovider/gravitee-am-identityprovider-jdbc/src/main/java/io/gravitee/am/identityprovider/jdbc/utils/ColumnMapRowMapper.java b/gravitee-am-identityprovider/gravitee-am-identityprovider-jdbc/src/main/java/io/gravitee/am/identityprovider/jdbc/utils/ColumnMapRowMapper.java
index b39a729a430..e9f011832ab 100644
--- a/gravitee-am-identityprovider/gravitee-am-identityprovider-jdbc/src/main/java/io/gravitee/am/identityprovider/jdbc/utils/ColumnMapRowMapper.java
+++ b/gravitee-am-identityprovider/gravitee-am-identityprovider-jdbc/src/main/java/io/gravitee/am/identityprovider/jdbc/utils/ColumnMapRowMapper.java
@@ -29,10 +29,9 @@
 public final class ColumnMapRowMapper {
 
     public static Map<String, Object> mapRow(Row row, RowMetadata rowMetadata) {
-        Map<String, Object> claims = new HashMap<>(rowMetadata.getColumnNames()
+        return new HashMap<>(rowMetadata.getColumnMetadatas()
                 .stream()
-                .filter(c -> row.get(c) != null)
-                .collect(Collectors.toMap(c -> c, c -> row.get(c))));
-        return claims;
+                .filter(c -> row.get(c.getName()) != null)
+                .collect(Collectors.toMap(c -> c.getName(), c -> row.get(c.getName()))));
     }
 }
diff --git a/gravitee-am-identityprovider/gravitee-am-identityprovider-jdbc/src/main/java/io/gravitee/am/identityprovider/jdbc/utils/ParametersUtils.java b/gravitee-am-identityprovider/gravitee-am-identityprovider-jdbc/src/main/java/io/gravitee/am/identityprovider/jdbc/utils/ParametersUtils.java
index b941f73b51d..e8cfa6752b0 100644
--- a/gravitee-am-identityprovider/gravitee-am-identityprovider-jdbc/src/main/java/io/gravitee/am/identityprovider/jdbc/utils/ParametersUtils.java
+++ b/gravitee-am-identityprovider/gravitee-am-identityprovider-jdbc/src/main/java/io/gravitee/am/identityprovider/jdbc/utils/ParametersUtils.java
@@ -15,8 +15,6 @@
  */
 package io.gravitee.am.identityprovider.jdbc.utils;
 
-import io.r2dbc.spi.Statement;
-
 /**
  * @author Titouan COMPIEGNE (titouan.compiegne at graviteesource.com)
  * @author GraviteeSource Team
@@ -32,6 +30,8 @@ public static String getIndexParameter(String database, int index, String field)
                 return "$" + index;
             case "sqlserver":
                 return "@" + field;
+            case "oracle":
+                return ":" + field;
             default:
                 return "" + index;
         }
diff --git a/gravitee-am-identityprovider/gravitee-am-identityprovider-jdbc/src/main/resources/database/oracle.schema b/gravitee-am-identityprovider/gravitee-am-identityprovider-jdbc/src/main/resources/database/oracle.schema
new file mode 100644
index 00000000000..6b852841fa5
--- /dev/null
+++ b/gravitee-am-identityprovider/gravitee-am-identityprovider-jdbc/src/main/resources/database/oracle.schema
@@ -0,0 +1,7 @@
+--
+-- Script to create Oracle schema
+-- Table & index names are suffixed by 3 underscores to define a
+-- pattern to replace with the domain name
+--
+CREATE TABLE idp_users___ (id NVARCHAR2(64) NOT NULL, username NVARCHAR2(320) NOT NULL, password NVARCHAR2(255) NULL, email NVARCHAR2(320) NULL, metadata CLOB NULL, PRIMARY KEY (id))
+CREATE INDEX idp_users____username_idx ON users(username)
\ No newline at end of file
diff --git a/gravitee-am-identityprovider/gravitee-am-identityprovider-jdbc/src/main/resources/schemas/schema-form.json b/gravitee-am-identityprovider/gravitee-am-identityprovider-jdbc/src/main/resources/schemas/schema-form.json
index 20c6fd715b6..389315ceb11 100644
--- a/gravitee-am-identityprovider/gravitee-am-identityprovider-jdbc/src/main/resources/schemas/schema-form.json
+++ b/gravitee-am-identityprovider/gravitee-am-identityprovider-jdbc/src/main/resources/schemas/schema-form.json
@@ -14,9 +14,9 @@
     },
     "protocol" : {
       "type": "string",
-      "enum": ["postgresql", "mysql", "sqlserver", "mariadb"],
+      "enum": ["postgresql", "mysql", "sqlserver", "mariadb", "oracle"],
       "title": "Database driver identifier",
-      "description": "Type of your relational database (RDBMS). PostgreSQL, MySQL, SQL Server, MariaDB, ..."
+      "description": "Type of your relational database (RDBMS). PostgreSQL, MySQL, SQL Server, MariaDB, Oracle"
     },
     "database" : {
       "type" : "string",
@@ -79,6 +79,12 @@
       "title": "User email attribute",
       "description": "Email field of your users"
     },
+    "metadataAttribute" : {
+      "type" : "string",
+      "default": "metadata",
+      "title": "User metadata attribute",
+      "description": "Additional information field of your users"
+    },
     "passwordAttribute" : {
       "type" : "string",
       "default": "password",
diff --git a/gravitee-am-identityprovider/gravitee-am-identityprovider-jdbc/src/test/java/io/gravitee/am/identityprovider/jdbc/authentication/JdbcAuthenticationProvider_OracleTest.java b/gravitee-am-identityprovider/gravitee-am-identityprovider-jdbc/src/test/java/io/gravitee/am/identityprovider/jdbc/authentication/JdbcAuthenticationProvider_OracleTest.java
new file mode 100644
index 00000000000..6963d987a64
--- /dev/null
+++ b/gravitee-am-identityprovider/gravitee-am-identityprovider-jdbc/src/test/java/io/gravitee/am/identityprovider/jdbc/authentication/JdbcAuthenticationProvider_OracleTest.java
@@ -0,0 +1,28 @@
+/**
+ * Copyright (C) 2015 The Gravitee team (http://gravitee.io)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.gravitee.am.identityprovider.jdbc.authentication;
+
+import io.gravitee.am.identityprovider.jdbc.authentication.spring.JdbcAuthenticationProviderConfiguration;
+import io.gravitee.am.identityprovider.jdbc.configuration.JdbcAuthenticationProviderConfigurationTest_Oracle;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+
+/**
+ * @author Titouan COMPIEGNE (titouan.compiegne at graviteesource.com)
+ * @author GraviteeSource Team
+ */
+@ContextConfiguration(classes = { JdbcAuthenticationProviderConfigurationTest_Oracle.class, JdbcAuthenticationProviderConfiguration.class }, loader = AnnotationConfigContextLoader.class)
+public class JdbcAuthenticationProvider_OracleTest extends JdbcAuthenticationProviderTest { }
diff --git a/gravitee-am-identityprovider/gravitee-am-identityprovider-jdbc/src/test/java/io/gravitee/am/identityprovider/jdbc/configuration/JdbcAuthenticationProviderConfigurationTest_Oracle.java b/gravitee-am-identityprovider/gravitee-am-identityprovider-jdbc/src/test/java/io/gravitee/am/identityprovider/jdbc/configuration/JdbcAuthenticationProviderConfigurationTest_Oracle.java
new file mode 100644
index 00000000000..edbbdc4cb8f
--- /dev/null
+++ b/gravitee-am-identityprovider/gravitee-am-identityprovider-jdbc/src/test/java/io/gravitee/am/identityprovider/jdbc/configuration/JdbcAuthenticationProviderConfigurationTest_Oracle.java
@@ -0,0 +1,35 @@
+/**
+ * Copyright (C) 2015 The Gravitee team (http://gravitee.io)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.gravitee.am.identityprovider.jdbc.configuration;
+
+import org.springframework.context.annotation.Configuration;
+
+/**
+ * @author Titouan COMPIEGNE (titouan.compiegne at graviteesource.com)
+ * @author GraviteeSource Team
+ */
+@Configuration
+public class JdbcAuthenticationProviderConfigurationTest_Oracle extends JdbcAuthenticationProviderConfigurationTest {
+
+    public String url() {
+        return "r2dbc:tc:oracle:///db?TC_IMAGE_TAG=21-slim-faststart";
+    }
+
+    @Override
+    public String protocol() {
+        return "oracle";
+    }
+}
diff --git a/gravitee-am-identityprovider/gravitee-am-identityprovider-jdbc/src/test/java/io/gravitee/am/identityprovider/jdbc/user/JdbcUserProvider_OracleTest.java b/gravitee-am-identityprovider/gravitee-am-identityprovider-jdbc/src/test/java/io/gravitee/am/identityprovider/jdbc/user/JdbcUserProvider_OracleTest.java
new file mode 100644
index 00000000000..4cb43bccd3c
--- /dev/null
+++ b/gravitee-am-identityprovider/gravitee-am-identityprovider-jdbc/src/test/java/io/gravitee/am/identityprovider/jdbc/user/JdbcUserProvider_OracleTest.java
@@ -0,0 +1,28 @@
+/**
+ * Copyright (C) 2015 The Gravitee team (http://gravitee.io)
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *         http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package io.gravitee.am.identityprovider.jdbc.user;
+
+import io.gravitee.am.identityprovider.jdbc.configuration.JdbcAuthenticationProviderConfigurationTest_Oracle;
+import io.gravitee.am.identityprovider.jdbc.user.spring.JdbcUserProviderConfiguration;
+import org.springframework.test.context.ContextConfiguration;
+import org.springframework.test.context.support.AnnotationConfigContextLoader;
+
+/**
+ * @author Titouan COMPIEGNE (titouan.compiegne at graviteesource.com)
+ * @author GraviteeSource Team
+ */
+@ContextConfiguration(classes = { JdbcAuthenticationProviderConfigurationTest_Oracle.class, JdbcUserProviderConfiguration.class }, loader = AnnotationConfigContextLoader.class)
+public class JdbcUserProvider_OracleTest extends JdbcUserProvider_Test { }
diff --git a/gravitee-am-reporter/gravitee-am-reporter-jdbc/pom.xml b/gravitee-am-reporter/gravitee-am-reporter-jdbc/pom.xml
index 9608210d911..5333c08e5f8 100644
--- a/gravitee-am-reporter/gravitee-am-reporter-jdbc/pom.xml
+++ b/gravitee-am-reporter/gravitee-am-reporter-jdbc/pom.xml
@@ -32,7 +32,8 @@
     <name>Gravitee IO - Access Management - Reporter JDBC</name>
 
     <properties>
-        <r2dbc-releasetrain.version>Arabba-SR11</r2dbc-releasetrain.version>
+        <r2dbc-releasetrain.version>Borca-SR2</r2dbc-releasetrain.version>
+        <r2dbc-mysql.version>0.9.3</r2dbc-mysql.version>
 
         <jdbc-mssql.version>7.4.1.jre8</jdbc-mssql.version>
         <jdbc-mysql.version>8.0.29</jdbc-mysql.version>
@@ -110,7 +111,7 @@
         </dependency>
 
         <dependency>
-            <groupId>io.r2dbc</groupId>
+            <groupId>org.postgresql</groupId>
             <artifactId>r2dbc-postgresql</artifactId>
             <scope>provided</scope>
         </dependency>
@@ -120,8 +121,9 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>dev.miku</groupId>
+            <groupId>io.asyncer</groupId>
             <artifactId>r2dbc-mysql</artifactId>
+            <version>${r2dbc-mysql.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
diff --git a/gravitee-am-reporter/gravitee-am-reporter-jdbc/src/main/java/io/gravitee/am/reporter/jdbc/JdbcReporterConfiguration.java b/gravitee-am-reporter/gravitee-am-reporter-jdbc/src/main/java/io/gravitee/am/reporter/jdbc/JdbcReporterConfiguration.java
index 0e61ea5d21e..79e516f42a5 100644
--- a/gravitee-am-reporter/gravitee-am-reporter-jdbc/src/main/java/io/gravitee/am/reporter/jdbc/JdbcReporterConfiguration.java
+++ b/gravitee-am-reporter/gravitee-am-reporter-jdbc/src/main/java/io/gravitee/am/reporter/jdbc/JdbcReporterConfiguration.java
@@ -35,8 +35,8 @@ public class JdbcReporterConfiguration implements ReporterConfiguration {
     private Integer maxSize = 10;
     private Integer maxIdleTime = 30000;
     private Integer maxLifeTime = 30000;
-    private Integer maxAcquireTime = 0 ;
-    private Integer maxCreateConnectionTime = 0;
+    private Integer maxAcquireTime = -1;
+    private Integer maxCreateConnectionTime = -1;
     private String validationQuery = "SELECT 1";
     private String tableSuffix;
     private Integer bulkActions = 1000;
diff --git a/gravitee-am-reporter/gravitee-am-reporter-jdbc/src/test/java/io/gravitee/am/reporter/jdbc/audit/JdbcReporterJUnitConfiguration.java b/gravitee-am-reporter/gravitee-am-reporter-jdbc/src/test/java/io/gravitee/am/reporter/jdbc/audit/JdbcReporterJUnitConfiguration.java
index a06730e9f2d..3db9dfafbff 100644
--- a/gravitee-am-reporter/gravitee-am-reporter-jdbc/src/test/java/io/gravitee/am/reporter/jdbc/audit/JdbcReporterJUnitConfiguration.java
+++ b/gravitee-am-reporter/gravitee-am-reporter-jdbc/src/test/java/io/gravitee/am/reporter/jdbc/audit/JdbcReporterJUnitConfiguration.java
@@ -70,7 +70,7 @@ public ConnectionFactory connectionFactory() {
             options = ConnectionFactoryOptions.builder()
                     .from(options)
                     .option(DRIVER, "pool")
-                    .option(PROTOCOL, options.getValue(DRIVER))
+                    .option(PROTOCOL, options.getValue(DRIVER).toString())
                     .build();
             this.connectionFactory = ConnectionFactories.get(options);
     }
@@ -81,13 +81,12 @@ public ConnectionFactory connectionFactory() {
     public JdbcReporterConfiguration reporterConfiguration(R2dbcDatabaseContainer dbContainer) {
         ConnectionFactoryOptions options = dbContainer.getOptions();
         JdbcReporterConfiguration config = new JdbcReporterConfiguration();
-        config.setDriver(options.getValue(DRIVER));
-        config.setDatabase(options.getValue(DATABASE));
-        config.setHost(options.getValue(HOST));
-        config.setPort(options.getValue(PORT));
-        config.setUsername(options.getValue(USER));
-        CharSequence value = options.getValue(PASSWORD);
-        config.setPassword(String.join("", value));
+        config.setDriver(options.getValue(DRIVER).toString());
+        config.setDatabase(options.getValue(DATABASE).toString());
+        config.setHost(options.getValue(HOST).toString());
+        config.setPort(Integer.valueOf(options.getValue(PORT).toString()));
+        config.setUsername(options.getValue(USER).toString());
+        config.setPassword(options.getValue(PASSWORD).toString());
 
         config.setTableSuffix("junit");
         config.setFlushInterval(1);
diff --git a/gravitee-am-repository/gravitee-am-repository-jdbc-api/pom.xml b/gravitee-am-repository/gravitee-am-repository-jdbc-api/pom.xml
index eb922d70b5c..7234ce49d8b 100644
--- a/gravitee-am-repository/gravitee-am-repository-jdbc-api/pom.xml
+++ b/gravitee-am-repository/gravitee-am-repository-jdbc-api/pom.xml
@@ -30,7 +30,7 @@
     <name>Gravitee IO - Access Management - Repository JDBC API</name>
 
     <properties>
-        <r2dbc-releasetrain.version>Arabba-SR13</r2dbc-releasetrain.version>
+        <r2dbc-releasetrain.version>Borca-SR2</r2dbc-releasetrain.version>
         <reactor-adapter.version>3.4.9</reactor-adapter.version>
         <reactor-core.version>3.4.13</reactor-core.version>
         <spring-data-r2dbc.version>1.4.1</spring-data-r2dbc.version>
@@ -91,7 +91,6 @@
         <dependency>
             <groupId>io.r2dbc</groupId>
             <artifactId>r2dbc-spi</artifactId>
-            <scope>compile</scope>
         </dependency>
 
         <dependency>
@@ -109,12 +108,6 @@
             </exclusions>
         </dependency>
 
-        <dependency>
-            <groupId>io.r2dbc</groupId>
-            <artifactId>r2dbc-spi</artifactId>
-            <scope>compile</scope>
-        </dependency>
-
         <dependency>
             <groupId>io.projectreactor.netty</groupId>
             <artifactId>reactor-netty-core</artifactId>
diff --git a/gravitee-am-repository/gravitee-am-repository-jdbc-api/src/main/java/io/gravitee/am/repository/jdbc/provider/impl/ConnectionFactoryProvider.java b/gravitee-am-repository/gravitee-am-repository-jdbc-api/src/main/java/io/gravitee/am/repository/jdbc/provider/impl/ConnectionFactoryProvider.java
index 7838e6cf500..3381124f35a 100644
--- a/gravitee-am-repository/gravitee-am-repository-jdbc-api/src/main/java/io/gravitee/am/repository/jdbc/provider/impl/ConnectionFactoryProvider.java
+++ b/gravitee-am-repository/gravitee-am-repository-jdbc-api/src/main/java/io/gravitee/am/repository/jdbc/provider/impl/ConnectionFactoryProvider.java
@@ -24,6 +24,7 @@
 import io.micrometer.core.instrument.Tag;
 import io.micrometer.core.instrument.Tags;
 import io.r2dbc.pool.ConnectionPool;
+import io.r2dbc.pool.ConnectionPoolConfiguration;
 import io.r2dbc.pool.PoolingConnectionFactoryProvider;
 import io.r2dbc.spi.ConnectionFactories;
 import io.r2dbc.spi.ConnectionFactory;
@@ -91,8 +92,8 @@ public static ConnectionFactory createClient(R2DBCConnectionConfiguration config
                 .option(PoolingConnectionFactoryProvider.MAX_SIZE, 10)
                 .option(PoolingConnectionFactoryProvider.MAX_IDLE_TIME, Duration.of(30000l, ChronoUnit.MILLIS))
                 .option(PoolingConnectionFactoryProvider.MAX_LIFE_TIME, Duration.of(30000l, ChronoUnit.MILLIS))
-                .option(PoolingConnectionFactoryProvider.MAX_ACQUIRE_TIME, Duration.of(0, ChronoUnit.MILLIS))
-                .option(PoolingConnectionFactoryProvider.MAX_CREATE_CONNECTION_TIME, Duration.of(0, ChronoUnit.MILLIS))
+                .option(PoolingConnectionFactoryProvider.MAX_ACQUIRE_TIME, ConnectionPoolConfiguration.NO_TIMEOUT)
+                .option(PoolingConnectionFactoryProvider.MAX_CREATE_CONNECTION_TIME, ConnectionPoolConfiguration.NO_TIMEOUT)
                 .option(PoolingConnectionFactoryProvider.VALIDATION_DEPTH, ValidationDepth.LOCAL);
 
         List<Map<String, String>> options = configuration.getOptions();
@@ -104,7 +105,16 @@ public static ConnectionFactory createClient(R2DBCConnectionConfiguration config
             });
         }
 
-        ConnectionPool connectionPool = (ConnectionPool) ConnectionFactories.get(builder.build());
+        ConnectionPool connectionPool;
+        // TCCL has been introduced to support mix database configuration (Mongodb repository / JDBC IdP)
+        ClassLoader origLoader = Thread.currentThread().getContextClassLoader();
+        try {
+            ClassLoader goldenLoader = R2DBCConnectionProvider.class.getClassLoader();
+            Thread.currentThread().setContextClassLoader(goldenLoader);
+            connectionPool = (ConnectionPool) ConnectionFactories.get(builder.build());
+        } finally {
+            Thread.currentThread().setContextClassLoader(origLoader);
+        }
         LOGGER.info("Connection pool created for database server {} on host {}", configuration.getProtocol(), configuration.getHost());
 
         final Tags tags = Tags.of(
@@ -149,8 +159,8 @@ public ConnectionFactory factory() {
                     .option(PoolingConnectionFactoryProvider.MAX_SIZE, Integer.parseInt(environment.getProperty(prefix+"maxSize", "10")))
                     .option(PoolingConnectionFactoryProvider.MAX_IDLE_TIME, Duration.of(Long.parseLong(environment.getProperty(prefix+"maxIdleTime", "30000")), ChronoUnit.MILLIS))
                     .option(PoolingConnectionFactoryProvider.MAX_LIFE_TIME, Duration.of(Long.parseLong(environment.getProperty(prefix+"maxLifeTime", "30000")), ChronoUnit.MILLIS))
-                    .option(PoolingConnectionFactoryProvider.MAX_ACQUIRE_TIME, Duration.of(Long.parseLong(environment.getProperty(prefix+"maxAcquireTime", "0")), ChronoUnit.MILLIS))
-                    .option(PoolingConnectionFactoryProvider.MAX_CREATE_CONNECTION_TIME, Duration.of(Long.parseLong(environment.getProperty(prefix+"maxCreateConnectionTime", "0")), ChronoUnit.MILLIS));
+                    .option(PoolingConnectionFactoryProvider.MAX_ACQUIRE_TIME, Duration.of(Long.parseLong(environment.getProperty(prefix+"maxAcquireTime", "-1")), ChronoUnit.MILLIS))
+                    .option(PoolingConnectionFactoryProvider.MAX_CREATE_CONNECTION_TIME, Duration.of(Long.parseLong(environment.getProperty(prefix+"maxCreateConnectionTime", "-1")), ChronoUnit.MILLIS));
 
             if (port != null) {
                 builder.option(PORT, Integer.parseInt(port));
diff --git a/gravitee-am-repository/gravitee-am-repository-jdbc/pom.xml b/gravitee-am-repository/gravitee-am-repository-jdbc/pom.xml
index 9ec66787820..9ba66e30bf0 100644
--- a/gravitee-am-repository/gravitee-am-repository-jdbc/pom.xml
+++ b/gravitee-am-repository/gravitee-am-repository-jdbc/pom.xml
@@ -31,7 +31,8 @@
     <name>Gravitee IO - Access Management - Repository JDBC</name>
 
     <properties>
-        <r2dbc-releasetrain.version>Arabba-SR13</r2dbc-releasetrain.version>
+        <r2dbc-releasetrain.version>Borca-SR2</r2dbc-releasetrain.version>
+        <r2dbc-mysql.version>0.9.3</r2dbc-mysql.version>
 
         <jdbc-postgresql.version>42.2.25</jdbc-postgresql.version>
         <jdbc-mssql.version>7.4.1.jre8</jdbc-mssql.version>
@@ -130,64 +131,30 @@
 
         <!-- R2DBC -->
         <dependency>
-            <groupId>io.r2dbc</groupId>
+            <groupId>org.postgresql</groupId>
             <artifactId>r2dbc-postgresql</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>reactor-core</artifactId>
-                    <groupId>io.projectreactor</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>r2dbc-spi</artifactId>
-                    <groupId>io.r2dbc</groupId>
-                </exclusion>
-            </exclusions>
             <scope>provided</scope>
         </dependency>
 
         <dependency>
             <groupId>io.r2dbc</groupId>
             <artifactId>r2dbc-mssql</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>reactor-core</artifactId>
-                    <groupId>io.projectreactor</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>r2dbc-spi</artifactId>
-                    <groupId>io.r2dbc</groupId>
-                </exclusion>
-            </exclusions>
             <scope>provided</scope>
         </dependency>
         <dependency>
-            <groupId>dev.miku</groupId>
+            <groupId>io.asyncer</groupId>
             <artifactId>r2dbc-mysql</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>reactor-core</artifactId>
-                    <groupId>io.projectreactor</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>r2dbc-spi</artifactId>
-                    <groupId>io.r2dbc</groupId>
-                </exclusion>
-            </exclusions>
+            <version>${r2dbc-mysql.version}</version>
             <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.mariadb</groupId>
             <artifactId>r2dbc-mariadb</artifactId>
-            <exclusions>
-                <exclusion>
-                    <artifactId>reactor-core</artifactId>
-                    <groupId>io.projectreactor</groupId>
-                </exclusion>
-                <exclusion>
-                    <artifactId>r2dbc-spi</artifactId>
-                    <groupId>io.r2dbc</groupId>
-                </exclusion>
-            </exclusions>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>com.oracle.database.r2dbc</groupId>
+            <artifactId>oracle-r2dbc</artifactId>
             <scope>provided</scope>
         </dependency>
 
@@ -224,7 +191,6 @@
             <scope>provided</scope>
         </dependency>
 
-
         <!-- bean mapper -->
         <dependency>
             <groupId>com.github.dozermapper</groupId>
diff --git a/gravitee-am-repository/gravitee-am-repository-jdbc/src/test/java/io/gravitee/am/repository/jdbc/common/AbstractTestRepositoryConfiguration.java b/gravitee-am-repository/gravitee-am-repository-jdbc/src/test/java/io/gravitee/am/repository/jdbc/common/AbstractTestRepositoryConfiguration.java
index 1b95acd5324..1d8e77644a5 100644
--- a/gravitee-am-repository/gravitee-am-repository-jdbc/src/test/java/io/gravitee/am/repository/jdbc/common/AbstractTestRepositoryConfiguration.java
+++ b/gravitee-am-repository/gravitee-am-repository-jdbc/src/test/java/io/gravitee/am/repository/jdbc/common/AbstractTestRepositoryConfiguration.java
@@ -64,7 +64,7 @@ protected void initializeDatabaseSchema(ConnectionFactoryOptions options, Enviro
             final String jdbcUrl = container.getJdbcUrl();
 
             try (Connection connection = DriverManager.getConnection(jdbcUrl,
-                    options.getValue(USER), options.getValue(PASSWORD).toString())) {
+                    options.getValue(USER).toString(), options.getValue(PASSWORD).toString())) {
                 LOGGER.debug("Running Liquibase on {}", jdbcUrl);
                 runLiquibase(connection);
                 runLiquibase_addSpecificTestIndexes(connection);
@@ -124,7 +124,7 @@ public ConnectionFactory connectionFactory() {
         options = ConnectionFactoryOptions.builder()
                 .from(options)
                 .option(DRIVER, "pool")
-                .option(PROTOCOL, options.getValue(DRIVER))
+                .option(PROTOCOL, options.getValue(DRIVER).toString())
                 .build();
         return ConnectionFactories.get(options);
     }