Skip to content

Commit 459c190

Browse files
committed
Change default behavior of pageable reoslution, outside of spring data rest. Fixes #1215.
1 parent 97655d7 commit 459c190

File tree

3 files changed

+17
-9
lines changed

3 files changed

+17
-9
lines changed

springdoc-openapi-common/src/main/java/org/springdoc/core/SpringDocConfiguration.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -177,7 +177,7 @@ SchemaPropertyDeprecatingConverter schemaPropertyDeprecatingConverter() {
177177
*/
178178
@Bean
179179
@ConditionalOnMissingBean
180-
@ConditionalOnProperty(name = SPRINGDOC_PAGEABLE_CONVERTER_ENABLED, matchIfMissing = true)
180+
@ConditionalOnProperty(name = SPRINGDOC_PAGEABLE_CONVERTER_ENABLED)
181181
@Lazy(false)
182182
PageableOpenAPIConverter pageableOpenAPIConverter() {
183183
return new PageableOpenAPIConverter();

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

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
import org.springdoc.core.OperationService;
3535
import org.springdoc.core.RequestBodyService;
3636
import org.springdoc.core.SpringDocConfigProperties;
37+
import org.springdoc.core.converters.PageableOpenAPIConverter;
3738
import org.springdoc.core.converters.models.DefaultPageable;
3839
import org.springdoc.core.converters.models.Pageable;
3940
import org.springdoc.core.customizers.DelegatingMethodParameterCustomizer;
@@ -72,6 +73,7 @@
7273
import org.springframework.hateoas.server.LinkRelationProvider;
7374

7475
import static org.springdoc.core.Constants.SPRINGDOC_ENABLED;
76+
import static org.springdoc.core.Constants.SPRINGDOC_PAGEABLE_CONVERTER_ENABLED;
7577
import static org.springdoc.core.SpringDocUtils.getConfig;
7678

7779
/**
@@ -88,6 +90,18 @@ public class SpringDocDataRestConfiguration {
8890
.replaceParameterObjectWithClass(org.springframework.data.domain.PageRequest.class, Pageable.class);
8991
}
9092

93+
/**
94+
* Pageable open api converter pageable open api converter.
95+
*
96+
* @return the pageable open api converter
97+
*/
98+
@Bean
99+
@ConditionalOnMissingBean
100+
@ConditionalOnProperty(name = SPRINGDOC_PAGEABLE_CONVERTER_ENABLED, matchIfMissing = true)
101+
@Lazy(false)
102+
PageableOpenAPIConverter pageableOpenAPIConverter() {
103+
return new PageableOpenAPIConverter();
104+
}
91105

92106
/**
93107
* Delegating method parameter customizer delegating method parameter customizer.

springdoc-openapi-hateoas/src/test/java/test/org/springdoc/api/app2/SpringDocApp2Test.java

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,14 @@
1818

1919
package test.org.springdoc.api.app2;
2020

21-
import org.springdoc.core.converters.models.Pageable;
2221
import test.org.springdoc.api.AbstractSpringDocTest;
2322

2423
import org.springframework.boot.autoconfigure.SpringBootApplication;
24+
import org.springframework.test.context.TestPropertySource;
2525

26-
import static org.springdoc.core.SpringDocUtils.getConfig;
27-
26+
@TestPropertySource(properties = "springdoc.model-converters.pageable-converter.enabled=true")
2827
public class SpringDocApp2Test extends AbstractSpringDocTest {
2928

30-
static {
31-
getConfig().replaceParameterObjectWithClass(org.springframework.data.domain.Pageable.class, Pageable.class)
32-
.replaceParameterObjectWithClass(org.springframework.data.domain.PageRequest.class, Pageable.class);
33-
}
34-
3529
@SpringBootApplication
3630
static class SpringDocTestApp {}
3731

0 commit comments

Comments
 (0)