File tree Expand file tree Collapse file tree 1 file changed +8
-6
lines changed
springdoc-openapi-starter-common/src/main/java/org/springdoc/core/configuration Expand file tree Collapse file tree 1 file changed +8
-6
lines changed Original file line number Diff line number Diff line change 4343import org .springframework .context .annotation .Configuration ;
4444import org .springframework .context .annotation .Lazy ;
4545import org .springframework .data .domain .Pageable ;
46+ import org .springframework .data .web .PagedModel ;
4647import org .springframework .data .web .config .EnableSpringDataWebSupport ;
4748import org .springframework .data .web .config .SpringDataWebSettings ;
4849
@@ -85,15 +86,16 @@ PageableOpenAPIConverter pageableOpenAPIConverter(ObjectMapperProvider objectMap
8586 */
8687 @ Bean
8788 @ ConditionalOnMissingBean
88- @ ConditionalOnBean ( SpringDataWebSettings .class )
89+ @ ConditionalOnClass ({ PagedModel . class , SpringDataWebSettings .class } )
8990 @ Lazy (false )
90- PageOpenAPIConverter pageOpenAPIConverter (SpringDataWebSettings settings ,
91+ PageOpenAPIConverter pageOpenAPIConverter (Optional < SpringDataWebSettings > settings ,
9192 ObjectMapperProvider objectMapperProvider ) {
92- return new PageOpenAPIConverter (
93- settings .pageSerializationMode () == EnableSpringDataWebSupport .PageSerializationMode .VIA_DTO ,
94- objectMapperProvider );
93+ boolean replacePageWithPagedModel = settings .map (SpringDataWebSettings ::pageSerializationMode )
94+ .map (EnableSpringDataWebSupport .PageSerializationMode .VIA_DTO ::equals )
95+ .orElse (false );
96+ return new PageOpenAPIConverter (replacePageWithPagedModel , objectMapperProvider );
9597 }
96-
98+
9799 /**
98100 * Delegating method parameter customizer delegating method parameter customizer.
99101 *
You can’t perform that action at this time.
0 commit comments