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

Merge branch '6.0.x' 

Closes gh-12621
This commit is contained in:
Marcus Da Coregio 2023-02-03 12:31:08 -03:00
parent e8c53ac72d 7409d14504
commit b237d7ee38
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/http/converter/HttpMessageConverters.java
View File

@ -27,6 +27,7 @@ import org.springframework.util.ClassUtils;
* Utility methods for {@link HttpMessageConverter}'s. * Utility methods for {@link HttpMessageConverter}'s.
* *
* @author Joe Grandja * @author Joe Grandja
* @author luamas
* @since 5.1 * @since 5.1
*/ */
final class HttpMessageConverters { final class HttpMessageConverters {
@ -42,7 +43,7 @@ final class HttpMessageConverters {
jackson2Present = ClassUtils.isPresent("com.fasterxml.jackson.databind.ObjectMapper", classLoader) jackson2Present = ClassUtils.isPresent("com.fasterxml.jackson.databind.ObjectMapper", classLoader)
&& ClassUtils.isPresent("com.fasterxml.jackson.core.JsonGenerator", classLoader); && ClassUtils.isPresent("com.fasterxml.jackson.core.JsonGenerator", classLoader);
gsonPresent = ClassUtils.isPresent("com.google.gson.Gson", classLoader); gsonPresent = ClassUtils.isPresent("com.google.gson.Gson", classLoader);
jsonbPresent = ClassUtils.isPresent("javax.json.bind.Jsonb", classLoader); jsonbPresent = ClassUtils.isPresent("jakarta.json.bind.Jsonb", classLoader);
} }
private HttpMessageConverters() { private HttpMessageConverters() {