From ef2fee22cbdba5d209c8cd099d1c4c5a74c03ff4 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Wed, 7 Oct 2020 12:00:24 +0200
Subject: [PATCH] Make sure that the type used for discovery implements
 DataSource

See gh-23480
---
 .../java/org/springframework/boot/jdbc/DataSourceBuilder.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/DataSourceBuilder.java b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/DataSourceBuilder.java
index 6120db18df..7cd2524e0c 100644
--- a/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/DataSourceBuilder.java
+++ b/spring-boot-project/spring-boot/src/main/java/org/springframework/boot/jdbc/DataSourceBuilder.java
@@ -194,8 +194,8 @@ public final class DataSourceBuilder<T extends DataSource> {
 					create(classLoader, "org.springframework.jdbc.datasource.SimpleDriverDataSource",
 							(type) -> new DataSourceSettings(type,
 									(aliases) -> aliases.addAliases("driver-class-name", "driver-class"))));
-			addIfAvailable(this.allDataSourceSettings, create(classLoader,
-					"oracle.jdbc.datasource.OracleCommonDataSource", OracleCommonDataSourceSettings::new));
+			addIfAvailable(this.allDataSourceSettings, create(classLoader, "oracle.jdbc.datasource.OracleDataSource",
+					OracleCommonDataSourceSettings::new));
 		}
 
 		private static List<DataSourceSettings> resolveAvailableDataSourceSettings(ClassLoader classLoader) {