Skip to content

Commit

Permalink
Do not log exception if CasJackson2Module is not present
Browse files Browse the repository at this point in the history
Closes gh-15749
  • Loading branch information
marcusdacoregio committed Sep 9, 2024
1 parent e251779 commit a0e6c17
Showing 1 changed file with 12 additions and 1 deletion.
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,6 @@ public final class SecurityJackson2Modules {

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

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

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 casJacksonPresent;

static {
ClassLoader classLoader = SecurityJackson2Modules.class.getClassLoader();
casJacksonPresent = ClassUtils.isPresent(casJackson2ModuleClass, classLoader);
}

private SecurityJackson2Modules() {
}

Expand Down Expand Up @@ -140,6 +148,9 @@ public static List<Module> getModules(ClassLoader loader) {
if (ClassUtils.isPresent(saml2Jackson2ModuleClass, loader)) {
addToModulesList(loader, modules, saml2Jackson2ModuleClass);
}
if (casJacksonPresent) {
addToModulesList(loader, modules, casJackson2ModuleClass);
}
return modules;
}

Expand Down

0 comments on commit a0e6c17

Please sign in to comment.