Browse Source

fix(GH-3447) Add mixin annotation support for SimplePageImpl in Spring Data Jackson configuration

pull/3448/head
Marcus Voltolim 2 weeks ago
parent
commit
930a4b786f
No known key found for this signature in database
GPG Key ID: C4011C065304F6D5
  1. 3
      src/main/java/org/springframework/data/web/config/SpringDataJackson3Configuration.java
  2. 5
      src/main/java/org/springframework/data/web/config/SpringDataJacksonConfiguration.java

3
src/main/java/org/springframework/data/web/config/SpringDataJackson3Configuration.java

@ -43,6 +43,7 @@ import org.springframework.util.ClassUtils; @@ -43,6 +43,7 @@ import org.springframework.util.ClassUtils;
*
* @author Oliver Gierke
* @author Mark Paluch
* @author Marcus Voltolim
* @since 4.0
*/
public class SpringDataJackson3Configuration implements SpringDataJackson3Modules {
@ -95,6 +96,8 @@ public class SpringDataJackson3Configuration implements SpringDataJackson3Module @@ -95,6 +96,8 @@ public class SpringDataJackson3Configuration implements SpringDataJackson3Module
} else {
setMixInAnnotation(PageImpl.class, WrappingMixing.class);
org.springframework.data.util.ClassUtils.ifPresent("org.springframework.cloud.openfeign.support.PageJacksonModule$SimplePageImpl", null,
targetType -> setMixInAnnotation(targetType, WrappingMixing.class));
}
}

5
src/main/java/org/springframework/data/web/config/SpringDataJacksonConfiguration.java

@ -46,6 +46,7 @@ import com.fasterxml.jackson.databind.util.StdConverter; @@ -46,6 +46,7 @@ import com.fasterxml.jackson.databind.util.StdConverter;
*
* @author Oliver Gierke
* @author Mark Paluch
* @author Marcus Voltolim
* @deprecated since 4.0, in favor of {@link SpringDataJackson3Configuration} which uses Jackson 3.
*/
@SuppressWarnings("removal")
@ -99,7 +100,9 @@ public class SpringDataJacksonConfiguration implements SpringDataJacksonModules @@ -99,7 +100,9 @@ public class SpringDataJacksonConfiguration implements SpringDataJacksonModules
} else {
setMixInAnnotation(PageImpl.class, WrappingMixing.class);
}
org.springframework.data.util.ClassUtils.ifPresent("org.springframework.cloud.openfeign.support.PageJacksonModule$SimplePageImpl", null,
targetType -> setMixInAnnotation(targetType, WrappingMixing.class));
}
}
/**

Loading…
Cancel
Save