From 51bebad6517b713ceb9e31ec3187cbe65b6ca8a7 Mon Sep 17 00:00:00 2001
From: meyerg <meyerg@vmware.com>
Date: Thu, 28 Mar 2024 12:06:40 -0500
Subject: [PATCH 1/4] Support for R2DBC connections in DataSource processor.

---
 .../CfDataSourceEnvironmentPostProcessor.java | 92 +++++++++++++++++++
 .../cfenv/spring/boot/DataSourceTests.java    | 74 +++++++++++++++
 .../src/test/resources/vcap-services-tls.json | 25 +++++
 3 files changed, 191 insertions(+)
 create mode 100644 java-cfenv-boot/src/test/resources/vcap-services-tls.json

diff --git a/java-cfenv-boot/src/main/java/io/pivotal/cfenv/spring/boot/CfDataSourceEnvironmentPostProcessor.java b/java-cfenv-boot/src/main/java/io/pivotal/cfenv/spring/boot/CfDataSourceEnvironmentPostProcessor.java
index 6200a536..a7de0571 100644
--- a/java-cfenv-boot/src/main/java/io/pivotal/cfenv/spring/boot/CfDataSourceEnvironmentPostProcessor.java
+++ b/java-cfenv-boot/src/main/java/io/pivotal/cfenv/spring/boot/CfDataSourceEnvironmentPostProcessor.java
@@ -15,6 +15,8 @@
  */
 package io.pivotal.cfenv.spring.boot;
 
+import java.util.Collections;
+import java.util.HashMap;
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
@@ -38,6 +40,7 @@
 /**
  * @author Mark Pollack
  * @author David Turanski
+ * @author Greg Meyer
  */
 public class CfDataSourceEnvironmentPostProcessor implements CfServiceEnablingEnvironmentPostProcessor,
 		Ordered, ApplicationListener<ApplicationEvent> {
@@ -46,6 +49,16 @@ public class CfDataSourceEnvironmentPostProcessor implements CfServiceEnablingEn
 
 	private static int invocationCount;
 
+    /**
+     * MySQL connection protocol constant.
+     */
+    private static final String MYSQL_PROTOCOL = "mysql";
+    
+    /**
+     *  MariaDB connection protocol constant. 
+     */
+    private static final String MARIADB_PROTOCOL = "mariadb";
+	
 	// After ConfigFileApplicationListener so values from files can be used here
 	private int order = ConfigDataEnvironmentPostProcessor.ORDER + 1;
 
@@ -95,6 +108,42 @@ public void postProcessEnvironment(ConfigurableEnvironment environment,
 				if (driverClassName != null) {
 					properties.put("spring.datasource.driver-class-name", driverClassName);
 				}
+				
+				/* R2DBC processing
+				 * Split query param options and URL into two string
+				 * and move options to spring.r2dbc.properties.<option>
+				 */
+				
+				String[] splitJDBCUrl = cfJdbcService.getJdbcUrl().split("\\?");
+				
+				String r2dbcUrl = splitJDBCUrl[0].replaceFirst("jdbc:", "r2dbc:");
+				
+				// Case for MySQL where Maria DB protocol may be required
+				if (r2dbcUrl.contains(MYSQL_PROTOCOL))
+					r2dbcUrl = r2dbcUrl.replaceFirst(MYSQL_PROTOCOL, evalMySQLProtocol());
+				
+				properties.put("spring.r2dbc.url", r2dbcUrl);
+				properties.put("spring.r2dbc.username", cfJdbcService.getUsername());
+				properties.put("spring.r2dbc.password", cfJdbcService.getPassword());				
+				
+				if (splitJDBCUrl.length == 2)
+				{
+					Map<String, String> queryOptions = parseQueryString(splitJDBCUrl[1]); 
+					
+					if (queryOptions.size() > 0) {
+						queryOptions.forEach((key, value) -> {
+							
+							switch (key)
+							{						
+								case "enabledTLSProtocols":
+									properties.put("spring.r2dbc.properties.tlsVersion", value);
+									break;		
+								default:
+									properties.put(String.format("spring.r2dbc.properties.%s", key) , value);
+							}
+						});
+					};
+				}
 
 				MutablePropertySources propertySources = environment.getPropertySources();
 				if (propertySources.contains(
@@ -120,6 +169,49 @@ public void postProcessEnvironment(ConfigurableEnvironment environment,
 		}
 	}
 
+    private String evalMySQLProtocol()
+    {
+    	// Default to "mysql"
+    	String connectionProtocol = MYSQL_PROTOCOL;
+    	
+    	/* In Spring Boot 2.7.0, the previous MySQL r2dbc driver is no longer supported and 
+    	 * documentation suggests using the MariaDB R2DBC driver as an alternative.  Some versions
+    	 * of the MariaDB R2DBC driver do not support "mysql" as part of the connection
+    	 * protocol; "mariadb" should be used instead when the MariaDB R2DBC driver class is on
+    	 * the classpath.
+    	 */
+    	
+    	try {
+    		Class.forName("org.mariadb.r2dbc.MariadbConnection");
+    		connectionProtocol = MARIADB_PROTOCOL;
+    	}
+    	catch (ClassNotFoundException ignored) {
+        }
+    	
+    	return connectionProtocol; 
+    }	
+	
+	private Map<String, String> parseQueryString(String queryParams) {
+		
+		if (queryParams == null || queryParams.equals(""))
+			return Collections.emptyMap(); 
+		
+		Map<String, String> retVal = new HashMap<>();
+		
+		String[] options = queryParams.split("&");
+		for (String option : options) {
+			
+			String[] keyval = option.split("=");
+            if (keyval.length != 2 || keyval[0].length() == 0 || keyval[1].length() == 0) {
+                continue;
+            }
+            
+            retVal.put(keyval[0], keyval[1]);
+		}
+		
+		return retVal;
+	}
+	
 	@Override
 	public void onApplicationEvent(ApplicationEvent event) {
 		if (event instanceof ApplicationPreparedEvent) {
diff --git a/java-cfenv-boot/src/test/java/io/pivotal/cfenv/spring/boot/DataSourceTests.java b/java-cfenv-boot/src/test/java/io/pivotal/cfenv/spring/boot/DataSourceTests.java
index cae49ec8..f35e9f53 100644
--- a/java-cfenv-boot/src/test/java/io/pivotal/cfenv/spring/boot/DataSourceTests.java
+++ b/java-cfenv-boot/src/test/java/io/pivotal/cfenv/spring/boot/DataSourceTests.java
@@ -30,11 +30,14 @@
 
 /**
  * @author Mark Pollack
+ * @author Greg Meyer
  */
 public class DataSourceTests extends AbstractCfEnvTests {
 
 	private static final String mysqlJdbcUrl = "jdbc:mysql://10.0.4.35:3306/cf_2e23d10a_8738_8c3c_66cf_13e44422698c?user=mysql_username&password=mysql_password";
 
+	private static final String tlsMysqlJdbcUrl = "jdbc:mysql://10.0.4.35:3306/service_instance_db?permitMysqlScheme&user=mysql_username&password=mysql_password&sslMode=VERIFY_IDENTITY&useSSL=true&requireSSL=true&enabledTLSProtocols=TLSv1.2&serverSslCert=/etc/ssl/certs/ca-certificates.crt";
+	
 	private final CfDataSourceEnvironmentPostProcessor environmentPostProcessor = new CfDataSourceEnvironmentPostProcessor();
 
 	private final ConfigurableApplicationContext context = new AnnotationConfigApplicationContext();
@@ -62,9 +65,80 @@ public void testDataSource() throws Exception {
 			assertThat(
 					this.context.getEnvironment().getProperty("spring.datasource.password"))
 					.isEqualTo("mysql_password");
+			
+			assertThat(this.context.getEnvironment().getProperty("spring.r2dbc.url"))
+				.isEqualTo(mysqlJdbcUrl.replace("jdbc:", "r2dbc:").substring(0, mysqlJdbcUrl.indexOf("?") + 1));
+			assertThat(
+				this.context.getEnvironment().getProperty("spring.r2dbc.username"))
+				.isEqualTo("mysql_username");
+			assertThat(
+					this.context.getEnvironment().getProperty("spring.r2dbc.password"))
+				.isEqualTo("mysql_password");		
 
 		} finally {
 			System.clearProperty("VCAP_APPLICATION");
 		}
 	}
+	
+	@Test
+	public void testDataSource_r2dbcOptions() throws Exception {
+
+		// To make CloudPlatform test pass
+		try {
+			System.setProperty("VCAP_APPLICATION", "yes");
+
+			// To setup values used by CfEnv
+			File file = ResourceUtils.getFile("classpath:vcap-services-tls.json");
+			String fileContents = new String(Files.readAllBytes(file.toPath()));
+			mockVcapServices(fileContents);
+
+
+			environmentPostProcessor.postProcessEnvironment(this.context.getEnvironment(),
+					null);
+			assertThat(this.context.getEnvironment().getProperty("spring.datasource.url"))
+					.isEqualTo(tlsMysqlJdbcUrl);
+			assertThat(
+					this.context.getEnvironment().getProperty("spring.datasource.username"))
+					.isEqualTo("mysql_username");
+			assertThat(
+					this.context.getEnvironment().getProperty("spring.datasource.password"))
+					.isEqualTo("mysql_password");
+			
+			assertThat(this.context.getEnvironment().getProperty("spring.r2dbc.url"))
+				.isEqualTo(tlsMysqlJdbcUrl.replace("jdbc:", "r2dbc:").substring(0, tlsMysqlJdbcUrl.indexOf("?") + 1));
+			assertThat(
+				this.context.getEnvironment().getProperty("spring.r2dbc.username"))
+				.isEqualTo("mysql_username");
+			assertThat(
+					this.context.getEnvironment().getProperty("spring.r2dbc.password"))
+				.isEqualTo("mysql_password");		
+			assertThat(
+					this.context.getEnvironment().getProperty("spring.r2dbc.properties.user"))
+				.isEqualTo("mysql_username");		
+			assertThat(
+					this.context.getEnvironment().getProperty("spring.r2dbc.properties.password"))
+				.isEqualTo("mysql_password");	
+			assertThat(
+					this.context.getEnvironment().getProperty("spring.r2dbc.properties.sslMode"))
+				.isEqualTo("VERIFY_IDENTITY");				
+			assertThat(
+					this.context.getEnvironment().getProperty("spring.r2dbc.properties.useSSL"))
+				.isEqualTo("true");				
+			assertThat(
+					this.context.getEnvironment().getProperty("spring.r2dbc.properties.requireSSL"))
+				.isEqualTo("true");		
+			assertThat(
+					this.context.getEnvironment().getProperty("spring.r2dbc.properties.tlsVersion"))
+				.isEqualTo("TLSv1.2");				
+			assertThat(
+					this.context.getEnvironment().getProperty("spring.r2dbc.properties.serverSslCert"))
+				.isEqualTo("/etc/ssl/certs/ca-certificates.crt");
+			assertThat(
+					this.context.getEnvironment().getProperty("spring.r2dbc.properties.serverSslCert"))
+				.isEqualTo("/etc/ssl/certs/ca-certificates.crt");			
+			
+		} finally {
+			System.clearProperty("VCAP_APPLICATION");
+		}
+	}	
 }
diff --git a/java-cfenv-boot/src/test/resources/vcap-services-tls.json b/java-cfenv-boot/src/test/resources/vcap-services-tls.json
new file mode 100644
index 00000000..cf7966af
--- /dev/null
+++ b/java-cfenv-boot/src/test/resources/vcap-services-tls.json
@@ -0,0 +1,25 @@
+{
+  "p-mysql": [
+    {
+      "credentials": {
+        "hostname": "10.0.4.35",
+        "port": 3306,
+        "name": "mysql_name",
+        "username": "mysql_username",
+        "password": "mysql_password",
+        "uri": "mysql://mysql_username:mysql_password@10.0.4.35:3306/service_instance_db?reconnect=true",
+        "jdbcUrl": "jdbc:mysql://10.0.4.35:3306/service_instance_db?permitMysqlScheme&user=mysql_username&password=mysql_password&sslMode=VERIFY_IDENTITY&useSSL=true&requireSSL=true&enabledTLSProtocols=TLSv1.2&serverSslCert=/etc/ssl/certs/ca-certificates.crt"
+      },
+      "syslog_drain_url": null,
+      "volume_mounts": [],
+      "label": "p-mysql",
+      "provider": null,
+      "plan": "100mb",
+      "name": "mysql",
+      "tags": [
+        "mysql",
+        "relational"
+      ]
+    }
+  ]
+}

From d8532ebeda1dbe90e5008b2d40eed8b0ea0ed27a Mon Sep 17 00:00:00 2001
From: meyerg <meyerg@vmware.com>
Date: Thu, 28 Mar 2024 12:14:43 -0500
Subject: [PATCH 2/4] Cleaning up some formatting.

---
 .../CfDataSourceEnvironmentPostProcessor.java | 60 +++++++++----------
 .../cfenv/spring/boot/DataSourceTests.java    | 20 +++----
 2 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/java-cfenv-boot/src/main/java/io/pivotal/cfenv/spring/boot/CfDataSourceEnvironmentPostProcessor.java b/java-cfenv-boot/src/main/java/io/pivotal/cfenv/spring/boot/CfDataSourceEnvironmentPostProcessor.java
index a7de0571..33715cdb 100644
--- a/java-cfenv-boot/src/main/java/io/pivotal/cfenv/spring/boot/CfDataSourceEnvironmentPostProcessor.java
+++ b/java-cfenv-boot/src/main/java/io/pivotal/cfenv/spring/boot/CfDataSourceEnvironmentPostProcessor.java
@@ -49,15 +49,15 @@ public class CfDataSourceEnvironmentPostProcessor implements CfServiceEnablingEn
 
 	private static int invocationCount;
 
-    /**
-     * MySQL connection protocol constant.
-     */
-    private static final String MYSQL_PROTOCOL = "mysql";
+	/**
+	* MySQL connection protocol constant.
+	*/
+	private static final String MYSQL_PROTOCOL = "mysql";
     
-    /**
-     *  MariaDB connection protocol constant. 
-     */
-    private static final String MARIADB_PROTOCOL = "mariadb";
+	/**
+ 	*  MariaDB connection protocol constant. 
+ 	*/
+	private static final String MARIADB_PROTOCOL = "mariadb";
 	
 	// After ConfigFileApplicationListener so values from files can be used here
 	private int order = ConfigDataEnvironmentPostProcessor.ORDER + 1;
@@ -169,27 +169,27 @@ public void postProcessEnvironment(ConfigurableEnvironment environment,
 		}
 	}
 
-    private String evalMySQLProtocol()
-    {
-    	// Default to "mysql"
-    	String connectionProtocol = MYSQL_PROTOCOL;
+	private String evalMySQLProtocol()
+	{
+		// Default to "mysql"
+    		String connectionProtocol = MYSQL_PROTOCOL;
     	
-    	/* In Spring Boot 2.7.0, the previous MySQL r2dbc driver is no longer supported and 
-    	 * documentation suggests using the MariaDB R2DBC driver as an alternative.  Some versions
-    	 * of the MariaDB R2DBC driver do not support "mysql" as part of the connection
-    	 * protocol; "mariadb" should be used instead when the MariaDB R2DBC driver class is on
-    	 * the classpath.
-    	 */
+ 		/* In Spring Boot 2.7.0, the previous MySQL r2dbc driver is no longer supported and 
+		* documentation suggests using the MariaDB R2DBC driver as an alternative.  Some versions
+		* of the MariaDB R2DBC driver do not support "mysql" as part of the connection
+		* protocol; "mariadb" should be used instead when the MariaDB R2DBC driver class is on
+		* the classpath.
+		*/
     	
-    	try {
-    		Class.forName("org.mariadb.r2dbc.MariadbConnection");
-    		connectionProtocol = MARIADB_PROTOCOL;
-    	}
-    	catch (ClassNotFoundException ignored) {
-        }
+		try {
+			Class.forName("org.mariadb.r2dbc.MariadbConnection");
+			connectionProtocol = MARIADB_PROTOCOL;
+		}
+		catch (ClassNotFoundException ignored) {
+ 		}
     	
-    	return connectionProtocol; 
-    }	
+		return connectionProtocol; 
+	}	
 	
 	private Map<String, String> parseQueryString(String queryParams) {
 		
@@ -202,11 +202,11 @@ private Map<String, String> parseQueryString(String queryParams) {
 		for (String option : options) {
 			
 			String[] keyval = option.split("=");
-            if (keyval.length != 2 || keyval[0].length() == 0 || keyval[1].length() == 0) {
-                continue;
-            }
+			if (keyval.length != 2 || keyval[0].length() == 0 || keyval[1].length() == 0) {
+				continue;
+			}
             
-            retVal.put(keyval[0], keyval[1]);
+ 			retVal.put(keyval[0], keyval[1]);
 		}
 		
 		return retVal;
diff --git a/java-cfenv-boot/src/test/java/io/pivotal/cfenv/spring/boot/DataSourceTests.java b/java-cfenv-boot/src/test/java/io/pivotal/cfenv/spring/boot/DataSourceTests.java
index f35e9f53..f6ae4994 100644
--- a/java-cfenv-boot/src/test/java/io/pivotal/cfenv/spring/boot/DataSourceTests.java
+++ b/java-cfenv-boot/src/test/java/io/pivotal/cfenv/spring/boot/DataSourceTests.java
@@ -72,7 +72,7 @@ public void testDataSource() throws Exception {
 				this.context.getEnvironment().getProperty("spring.r2dbc.username"))
 				.isEqualTo("mysql_username");
 			assertThat(
-					this.context.getEnvironment().getProperty("spring.r2dbc.password"))
+				this.context.getEnvironment().getProperty("spring.r2dbc.password"))
 				.isEqualTo("mysql_password");		
 
 		} finally {
@@ -110,31 +110,31 @@ public void testDataSource_r2dbcOptions() throws Exception {
 				this.context.getEnvironment().getProperty("spring.r2dbc.username"))
 				.isEqualTo("mysql_username");
 			assertThat(
-					this.context.getEnvironment().getProperty("spring.r2dbc.password"))
+				this.context.getEnvironment().getProperty("spring.r2dbc.password"))
 				.isEqualTo("mysql_password");		
 			assertThat(
-					this.context.getEnvironment().getProperty("spring.r2dbc.properties.user"))
+				this.context.getEnvironment().getProperty("spring.r2dbc.properties.user"))
 				.isEqualTo("mysql_username");		
 			assertThat(
-					this.context.getEnvironment().getProperty("spring.r2dbc.properties.password"))
+				this.context.getEnvironment().getProperty("spring.r2dbc.properties.password"))
 				.isEqualTo("mysql_password");	
 			assertThat(
-					this.context.getEnvironment().getProperty("spring.r2dbc.properties.sslMode"))
+				this.context.getEnvironment().getProperty("spring.r2dbc.properties.sslMode"))
 				.isEqualTo("VERIFY_IDENTITY");				
 			assertThat(
-					this.context.getEnvironment().getProperty("spring.r2dbc.properties.useSSL"))
+				this.context.getEnvironment().getProperty("spring.r2dbc.properties.useSSL"))
 				.isEqualTo("true");				
 			assertThat(
-					this.context.getEnvironment().getProperty("spring.r2dbc.properties.requireSSL"))
+				this.context.getEnvironment().getProperty("spring.r2dbc.properties.requireSSL"))
 				.isEqualTo("true");		
 			assertThat(
-					this.context.getEnvironment().getProperty("spring.r2dbc.properties.tlsVersion"))
+				this.context.getEnvironment().getProperty("spring.r2dbc.properties.tlsVersion"))
 				.isEqualTo("TLSv1.2");				
 			assertThat(
-					this.context.getEnvironment().getProperty("spring.r2dbc.properties.serverSslCert"))
+				this.context.getEnvironment().getProperty("spring.r2dbc.properties.serverSslCert"))
 				.isEqualTo("/etc/ssl/certs/ca-certificates.crt");
 			assertThat(
-					this.context.getEnvironment().getProperty("spring.r2dbc.properties.serverSslCert"))
+				this.context.getEnvironment().getProperty("spring.r2dbc.properties.serverSslCert"))
 				.isEqualTo("/etc/ssl/certs/ca-certificates.crt");			
 			
 		} finally {

From 5b9bb69d905962abdb5dffa7c10ad6f19390f2a7 Mon Sep 17 00:00:00 2001
From: meyerg <meyerg@vmware.com>
Date: Mon, 1 Apr 2024 09:40:19 -0500
Subject: [PATCH 3/4] Resolved style formatting issues.

---
 .../CfDataSourceEnvironmentPostProcessor.java     | 15 +++++++--------
 1 file changed, 7 insertions(+), 8 deletions(-)

diff --git a/java-cfenv-boot/src/main/java/io/pivotal/cfenv/spring/boot/CfDataSourceEnvironmentPostProcessor.java b/java-cfenv-boot/src/main/java/io/pivotal/cfenv/spring/boot/CfDataSourceEnvironmentPostProcessor.java
index 33715cdb..28959a26 100644
--- a/java-cfenv-boot/src/main/java/io/pivotal/cfenv/spring/boot/CfDataSourceEnvironmentPostProcessor.java
+++ b/java-cfenv-boot/src/main/java/io/pivotal/cfenv/spring/boot/CfDataSourceEnvironmentPostProcessor.java
@@ -172,15 +172,14 @@ public void postProcessEnvironment(ConfigurableEnvironment environment,
 	private String evalMySQLProtocol()
 	{
 		// Default to "mysql"
-    		String connectionProtocol = MYSQL_PROTOCOL;
-    	
- 		/* In Spring Boot 2.7.0, the previous MySQL r2dbc driver is no longer supported and 
-		* documentation suggests using the MariaDB R2DBC driver as an alternative.  Some versions
-		* of the MariaDB R2DBC driver do not support "mysql" as part of the connection
-		* protocol; "mariadb" should be used instead when the MariaDB R2DBC driver class is on
-		* the classpath.
-		*/
+		String connectionProtocol = MYSQL_PROTOCOL;
     	
+		/* In Spring Boot 2.7.0, the previous MySQL r2dbc driver is no longer supported and 
+		 * documentation suggests using the MariaDB R2DBC driver as an alternative.  Some versions
+		 * of the MariaDB R2DBC driver do not support "mysql" as part of the connection
+		 * protocol; "mariadb" should be used instead when the MariaDB R2DBC driver class is on the classpath.
+    	 */
+		
 		try {
 			Class.forName("org.mariadb.r2dbc.MariadbConnection");
 			connectionProtocol = MARIADB_PROTOCOL;

From dfd3ad1ea5601ae38b897b734822f6e40097ad07 Mon Sep 17 00:00:00 2001
From: Anthony Dahanne <anthony.dahanne@gmail.com>
Date: Mon, 12 Aug 2024 18:52:35 -0400
Subject: [PATCH 4/4] Remove Greg MariadDB code * it's now handled directly in
 MySqlJdbcUrlCreator

---
 .../CfDataSourceEnvironmentPostProcessor.java | 74 +++++--------------
 1 file changed, 18 insertions(+), 56 deletions(-)

diff --git a/java-cfenv-boot/src/main/java/io/pivotal/cfenv/spring/boot/CfDataSourceEnvironmentPostProcessor.java b/java-cfenv-boot/src/main/java/io/pivotal/cfenv/spring/boot/CfDataSourceEnvironmentPostProcessor.java
index 28959a26..250e9d1f 100644
--- a/java-cfenv-boot/src/main/java/io/pivotal/cfenv/spring/boot/CfDataSourceEnvironmentPostProcessor.java
+++ b/java-cfenv-boot/src/main/java/io/pivotal/cfenv/spring/boot/CfDataSourceEnvironmentPostProcessor.java
@@ -20,7 +20,6 @@
 import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
-import java.util.stream.Collectors;
 
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.cloud.CloudPlatform;
@@ -49,16 +48,6 @@ public class CfDataSourceEnvironmentPostProcessor implements CfServiceEnablingEn
 
 	private static int invocationCount;
 
-	/**
-	* MySQL connection protocol constant.
-	*/
-	private static final String MYSQL_PROTOCOL = "mysql";
-    
-	/**
- 	*  MariaDB connection protocol constant. 
- 	*/
-	private static final String MARIADB_PROTOCOL = "mariadb";
-	
 	// After ConfigFileApplicationListener so values from files can be used here
 	private int order = ConfigDataEnvironmentPostProcessor.ORDER + 1;
 
@@ -85,7 +74,7 @@ public void postProcessEnvironment(ConfigurableEnvironment environment,
 
 				List<CfJdbcService> jdbcServices = cfJdbcEnv.findJdbcServices().stream()
 						.filter(service -> this.isEnabled(service, environment))
-						.collect(Collectors.toList());
+						.toList();
 
 				if (jdbcServices.size() > 1) {
 					if (invocationCount == 1) {
@@ -108,41 +97,35 @@ public void postProcessEnvironment(ConfigurableEnvironment environment,
 				if (driverClassName != null) {
 					properties.put("spring.datasource.driver-class-name", driverClassName);
 				}
-				
+
 				/* R2DBC processing
 				 * Split query param options and URL into two string
 				 * and move options to spring.r2dbc.properties.<option>
 				 */
-				
+
 				String[] splitJDBCUrl = cfJdbcService.getJdbcUrl().split("\\?");
-				
+
 				String r2dbcUrl = splitJDBCUrl[0].replaceFirst("jdbc:", "r2dbc:");
-				
-				// Case for MySQL where Maria DB protocol may be required
-				if (r2dbcUrl.contains(MYSQL_PROTOCOL))
-					r2dbcUrl = r2dbcUrl.replaceFirst(MYSQL_PROTOCOL, evalMySQLProtocol());
-				
+
 				properties.put("spring.r2dbc.url", r2dbcUrl);
 				properties.put("spring.r2dbc.username", cfJdbcService.getUsername());
-				properties.put("spring.r2dbc.password", cfJdbcService.getPassword());				
-				
-				if (splitJDBCUrl.length == 2)
-				{
-					Map<String, String> queryOptions = parseQueryString(splitJDBCUrl[1]); 
-					
+				properties.put("spring.r2dbc.password", cfJdbcService.getPassword());
+
+				if (splitJDBCUrl.length == 2) {
+					Map<String, String> queryOptions = parseQueryString(splitJDBCUrl[1]);
+
 					if (queryOptions.size() > 0) {
 						queryOptions.forEach((key, value) -> {
-							
-							switch (key)
-							{						
+
+							switch (key) {
 								case "enabledTLSProtocols":
 									properties.put("spring.r2dbc.properties.tlsVersion", value);
-									break;		
+									break;
 								default:
-									properties.put(String.format("spring.r2dbc.properties.%s", key) , value);
+									properties.put(String.format("spring.r2dbc.properties.%s", key), value);
 							}
 						});
-					};
+					}
 				}
 
 				MutablePropertySources propertySources = environment.getPropertySources();
@@ -169,27 +152,6 @@ public void postProcessEnvironment(ConfigurableEnvironment environment,
 		}
 	}
 
-	private String evalMySQLProtocol()
-	{
-		// Default to "mysql"
-		String connectionProtocol = MYSQL_PROTOCOL;
-    	
-		/* In Spring Boot 2.7.0, the previous MySQL r2dbc driver is no longer supported and 
-		 * documentation suggests using the MariaDB R2DBC driver as an alternative.  Some versions
-		 * of the MariaDB R2DBC driver do not support "mysql" as part of the connection
-		 * protocol; "mariadb" should be used instead when the MariaDB R2DBC driver class is on the classpath.
-    	 */
-		
-		try {
-			Class.forName("org.mariadb.r2dbc.MariadbConnection");
-			connectionProtocol = MARIADB_PROTOCOL;
-		}
-		catch (ClassNotFoundException ignored) {
- 		}
-    	
-		return connectionProtocol; 
-	}	
-	
 	private Map<String, String> parseQueryString(String queryParams) {
 		
 		if (queryParams == null || queryParams.equals(""))
@@ -200,12 +162,12 @@ private Map<String, String> parseQueryString(String queryParams) {
 		String[] options = queryParams.split("&");
 		for (String option : options) {
 			
-			String[] keyval = option.split("=");
-			if (keyval.length != 2 || keyval[0].length() == 0 || keyval[1].length() == 0) {
+			String[] keyValue = option.split("=");
+			if (keyValue.length != 2 || keyValue[0].length() == 0 || keyValue[1].length() == 0) {
 				continue;
 			}
             
- 			retVal.put(keyval[0], keyval[1]);
+ 			retVal.put(keyValue[0], keyValue[1]);
 		}
 		
 		return retVal;