Skip to content

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

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
marcusvoltolim wants to merge 1 commit into from
+7 −1
Closed

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/main/java/org/springframework/data/web/config/SpringDataJackson3Configuration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,6 +43,7 @@
*
* @author Oliver Gierke
* @author Mark Paluch
* @author Marcus Voltolim
* @since 4.0
*/
public class SpringDataJackson3Configuration implements SpringDataJackson3Modules {
Expand Down Expand Up @@ -95,6 +96,8 @@ public PageModule(@Nullable SpringDataWebSettings settings) {

} 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));
}
}

Expand Down
5 changes: 4 additions & 1 deletion src/main/java/org/springframework/data/web/config/SpringDataJacksonConfiguration.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,7 @@
*
* @author Oliver Gierke
* @author Mark Paluch
* @author Marcus Voltolim
* @deprecated since 4.0, in favor of {@link SpringDataJackson3Configuration} which uses Jackson 3.
*/
@SuppressWarnings("removal")
Expand Down Expand Up @@ -99,7 +100,9 @@ public PageModule(@Nullable SpringDataWebSettings settings) {

} 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));
}
}

/**
Expand Down