Skip to content

Commit 50b5dfa

Browse files
author
bnasslahsen
committed
ClassNotFoundException: DefaultedPageable. Fixes #729
1 parent 39f67df commit 50b5dfa

File tree

2 files changed

+10
-5
lines changed

2 files changed

+10
-5
lines changed

springdoc-openapi-data-rest/src/main/java/org/springdoc/data/rest/SpringDocDataRestConfiguration.java

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -75,10 +75,7 @@ public class SpringDocDataRestConfiguration {
7575

7676
static {
7777
getConfig().replaceWithClass(org.springframework.data.domain.Pageable.class, Pageable.class)
78-
.replaceWithClass(org.springframework.data.domain.PageRequest.class, Pageable.class)
79-
.replaceWithClass(DefaultedPageable.class, DefaultPageable.class)
80-
.addRequestWrapperToIgnore(RootResourceInformation.class, PersistentEntityResourceAssembler.class, ETag.class, Sort.class)
81-
.addResponseWrapperToIgnore(RootResourceInformation.class);
78+
.replaceWithClass(org.springframework.data.domain.PageRequest.class, Pageable.class);
8279
}
8380

8481
/**
@@ -127,7 +124,13 @@ QuerydslPredicateOperationCustomizer queryDslQuerydslPredicateOperationCustomize
127124
*/
128125
@Configuration
129126
@ConditionalOnClass(RepositoryRestHandlerMapping.class)
130-
class SpringRepositoryRestResourceProviderConfiguration {
127+
static class SpringRepositoryRestResourceProviderConfiguration {
128+
129+
static {
130+
getConfig().replaceWithClass(DefaultedPageable.class, DefaultPageable.class)
131+
.addRequestWrapperToIgnore(RootResourceInformation.class, PersistentEntityResourceAssembler.class, ETag.class, Sort.class)
132+
.addResponseWrapperToIgnore(RootResourceInformation.class);
133+
}
131134

132135
/**
133136
* Spring repository rest resource provider spring repository rest resource provider.

springdoc-openapi-hateoas/src/main/java/org/springdoc/hateoas/SpringDocHateoasConfiguration.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import org.springdoc.hateoas.converters.CollectionModelContentConverter;
3535
import org.springdoc.hateoas.converters.RepresentationModelLinksOASMixin;
3636

37+
import org.springframework.boot.autoconfigure.condition.ConditionalOnClass;
3738
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
3839
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
3940
import org.springframework.context.annotation.Bean;
@@ -52,6 +53,7 @@
5253
*/
5354
@Configuration
5455
@ConditionalOnProperty(name = SPRINGDOC_ENABLED, matchIfMissing = true)
56+
@ConditionalOnClass(LinkRelationProvider.class)
5557
public class SpringDocHateoasConfiguration {
5658

5759
/**

0 commit comments

Comments
 (0)