Browse Source

Merge pull request #1929 in CORE/base-third from bugfix/10.0 to feature/10.0

* commit '0da59dccccaa18ecbaee2e974b44ab5fbd962d1b':
  DEC-17331 fix: 裁掉spring对jackson的部分支持
feature/10.0
superman 4 years ago
parent
commit
2d1c8f476d
  1. 7
      fine-spring/readme.md
  2. 10
      fine-spring/src/main/java/com/fr/third/springframework/http/converter/support/AllEncompassingFormHttpMessageConverter.java

7
fine-spring/readme.md

@ -1,3 +1,4 @@
1 spring版本4.3.29.RELEASE 1 spring版本4.3.29.RELEASE<br>
2 fine-spring内容见https://kms.fineres.com/pages/viewpage.action?pageId=152798513 2 fine-spring内容见https://kms.fineres.com/pages/viewpage.action?pageId=152798513<br>
3 定制内容处均有"// 定制"注释 3 定制内容处均有"// 定制"注释<br>
4 去除对jackson的ObjectMapper的支持:DEC-17331<br>

10
fine-spring/src/main/java/com/fr/third/springframework/http/converter/support/AllEncompassingFormHttpMessageConverter.java

@ -40,11 +40,11 @@ public class AllEncompassingFormHttpMessageConverter extends FormHttpMessageConv
ClassUtils.isPresent("javax.xml.bind.Binder", ClassUtils.isPresent("javax.xml.bind.Binder",
AllEncompassingFormHttpMessageConverter.class.getClassLoader()); AllEncompassingFormHttpMessageConverter.class.getClassLoader());
private static final boolean jackson2Present = private static final boolean jackson2Present = false;
ClassUtils.isPresent("com.fasterxml.jackson.databind.ObjectMapper", // ClassUtils.isPresent("com.fasterxml.jackson.databind.ObjectMapper",
AllEncompassingFormHttpMessageConverter.class.getClassLoader()) && // AllEncompassingFormHttpMessageConverter.class.getClassLoader()) &&
ClassUtils.isPresent("com.fasterxml.jackson.core.JsonGenerator", // ClassUtils.isPresent("com.fasterxml.jackson.core.JsonGenerator",
AllEncompassingFormHttpMessageConverter.class.getClassLoader()); // AllEncompassingFormHttpMessageConverter.class.getClassLoader());
private static final boolean jackson2XmlPresent = private static final boolean jackson2XmlPresent =
ClassUtils.isPresent("com.fasterxml.jackson.dataformat.xml.XmlMapper", ClassUtils.isPresent("com.fasterxml.jackson.dataformat.xml.XmlMapper",

Loading…
Cancel
Save