Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '6.2.x' into 6.3.x 

Closes gh-15767
This commit is contained in:
Marcus Hert Da Coregio 2024-09-09 08:54:00 -03:00
parent 6139f0986e a268b78473
commit aeae740926
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
core/src/main/java/org/springframework/security/jackson2/SecurityJackson2Modules.java
View File

@ -75,7 +75,6 @@ public final class SecurityJackson2Modules {
private static final List<String> securityJackson2ModuleClasses = Arrays.asList( private static final List<String> securityJackson2ModuleClasses = Arrays.asList(
"org.springframework.security.jackson2.CoreJackson2Module", "org.springframework.security.jackson2.CoreJackson2Module",
"org.springframework.security.cas.jackson2.CasJackson2Module",
"org.springframework.security.web.jackson2.WebJackson2Module", "org.springframework.security.web.jackson2.WebJackson2Module",
"org.springframework.security.web.server.jackson2.WebServerJackson2Module"); "org.springframework.security.web.server.jackson2.WebServerJackson2Module");
@ -89,6 +88,8 @@ public final class SecurityJackson2Modules {
private static final String saml2Jackson2ModuleClass = "org.springframework.security.saml2.jackson2.Saml2Jackson2Module"; private static final String saml2Jackson2ModuleClass = "org.springframework.security.saml2.jackson2.Saml2Jackson2Module";
private static final String casJackson2ModuleClass = "org.springframework.security.cas.jackson2.CasJackson2Module";
private static final boolean webServletPresent; private static final boolean webServletPresent;
private static final boolean oauth2ClientPresent; private static final boolean oauth2ClientPresent;
@ -99,6 +100,8 @@ public final class SecurityJackson2Modules {
private static final boolean saml2JacksonPresent; private static final boolean saml2JacksonPresent;
private static final boolean casJacksonPresent;
static { static {
ClassLoader classLoader = SecurityJackson2Modules.class.getClassLoader(); ClassLoader classLoader = SecurityJackson2Modules.class.getClassLoader();
webServletPresent = ClassUtils.isPresent("jakarta.servlet.http.Cookie", classLoader); webServletPresent = ClassUtils.isPresent("jakarta.servlet.http.Cookie", classLoader);
@ -107,6 +110,7 @@ public final class SecurityJackson2Modules {
javaTimeJacksonPresent = ClassUtils.isPresent(javaTimeJackson2ModuleClass, classLoader); javaTimeJacksonPresent = ClassUtils.isPresent(javaTimeJackson2ModuleClass, classLoader);
ldapJacksonPresent = ClassUtils.isPresent(ldapJackson2ModuleClass, classLoader); ldapJacksonPresent = ClassUtils.isPresent(ldapJackson2ModuleClass, classLoader);
saml2JacksonPresent = ClassUtils.isPresent(saml2Jackson2ModuleClass, classLoader); saml2JacksonPresent = ClassUtils.isPresent(saml2Jackson2ModuleClass, classLoader);
casJacksonPresent = ClassUtils.isPresent(casJackson2ModuleClass, classLoader);
} }
private SecurityJackson2Modules() { private SecurityJackson2Modules() {
@ -160,6 +164,9 @@ public final class SecurityJackson2Modules {
if (saml2JacksonPresent) { if (saml2JacksonPresent) {
addToModulesList(loader, modules, saml2Jackson2ModuleClass); addToModulesList(loader, modules, saml2Jackson2ModuleClass);
} }
if (casJacksonPresent) {
addToModulesList(loader, modules, casJackson2ModuleClass);
}
return modules; return modules;
} }