Spring/spring-boot
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow ConnectionDetailsFactories to use context class loader

Browse Source 
Update `ConnectionDetailsFactories` so that the context classloader
can be used to load factories.

See gh-45014

Signed-off-by: lengors <24527258+lengors@users.noreply.github.com>
This commit is contained in:
lengors
2025-04-06 17:03:45 +01:00
committed by Phillip Webb
parent 2e8999e21c
commit cc1e1cc92a
3 changed files with 61 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
spring-boot-project/spring-boot-autoconfigure/src/main/java/org/springframework/boot/autoconfigure/service/connection/ConnectionDetailsFactories.java
View File

@@ -47,8 +47,26 @@ public class ConnectionDetailsFactories {
private final List<Registration<?, ?>> registrations = new ArrayList<>();
/**
* Create a new {@link ConnectionDetailsFactories} instance. This constructor uses the
* class loader of {@link ConnectionDetailsFactory} class to load the factories.
*/
public ConnectionDetailsFactories() {
this(SpringFactoriesLoader.forDefaultResourceLocation(ConnectionDetailsFactory.class.getClassLoader()));
this(false);
}
/**
* Create a new {@link ConnectionDetailsFactories} instance. This constructor takes a
* boolean argument to determine whether the context class loader should be used to
* load the factories. If {@code true} and the context class loader is available it
* will be used otherwise the class loader of {@link ConnectionDetailsFactory} class
* will be used.
* @param useContextClassLoader if {@code true} and the context class loader is
* available it will be used otherwise the class loader of
* {@link ConnectionDetailsFactory} class will be used.
*/
public ConnectionDetailsFactories(boolean useContextClassLoader) {
this(SpringFactoriesLoader.forDefaultResourceLocation(getClassLoader(useContextClassLoader)));
}
@SuppressWarnings({ "rawtypes", "unchecked" })
@@ -107,6 +125,24 @@ public class ConnectionDetailsFactories {
return List.copyOf(result);
}
/**
* Return the {@link ClassLoader} to use for loading factories.
* <p>
* The default implementation returns the context class loader of the current thread
* or the class loader of this class if the context class loader is {@code null}.
* @param useContextClassLoader if {@code true} and the context class loader is
* available it will be used otherwise the class loader of
* {@link ConnectionDetailsFactory} class will be used
* @return the class loader to use for loading factories
*/
private static ClassLoader getClassLoader(boolean useContextClassLoader) {
if (!useContextClassLoader) {
return ConnectionDetailsFactory.class.getClassLoader();
}
final ClassLoader classLoader = Thread.currentThread().getContextClassLoader();
return (classLoader != null) ? classLoader : getClassLoader(false);
}
/**
* A {@link ConnectionDetailsFactory} registration.
*