Skip to content

Commit a0e6c17

Browse files
Do not log exception if CasJackson2Module is not present
Closes gh-15749
1 parent e251779 commit a0e6c17

File tree

1 file changed

+12
-1
lines changed

1 file changed

+12
-1
lines changed

core/src/main/java/org/springframework/security/jackson2/SecurityJackson2Modules.java

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,6 @@ public final class SecurityJackson2Modules {
7575

7676
private static final List<String> securityJackson2ModuleClasses = Arrays.asList(
7777
"org.springframework.security.jackson2.CoreJackson2Module",
78-
"org.springframework.security.cas.jackson2.CasJackson2Module",
7978
"org.springframework.security.web.jackson2.WebJackson2Module",
8079
"org.springframework.security.web.server.jackson2.WebServerJackson2Module");
8180

@@ -89,6 +88,15 @@ public final class SecurityJackson2Modules {
8988

9089
private static final String saml2Jackson2ModuleClass = "org.springframework.security.saml2.jackson2.Saml2Jackson2Module";
9190

91+
private static final String casJackson2ModuleClass = "org.springframework.security.cas.jackson2.CasJackson2Module";
92+
93+
private static final boolean casJacksonPresent;
94+
95+
static {
96+
ClassLoader classLoader = SecurityJackson2Modules.class.getClassLoader();
97+
casJacksonPresent = ClassUtils.isPresent(casJackson2ModuleClass, classLoader);
98+
}
99+
92100
private SecurityJackson2Modules() {
93101
}
94102

@@ -140,6 +148,9 @@ public static List<Module> getModules(ClassLoader loader) {
140148
if (ClassUtils.isPresent(saml2Jackson2ModuleClass, loader)) {
141149
addToModulesList(loader, modules, saml2Jackson2ModuleClass);
142150
}
151+
if (casJacksonPresent) {
152+
addToModulesList(loader, modules, casJackson2ModuleClass);
153+
}
143154
return modules;
144155
}
145156

0 commit comments

Comments
 (0)