Skip to content

Commit 9a7e07f

Browse files
committed
code review
1 parent d3c3727 commit 9a7e07f

File tree

25 files changed

+56
-45
lines changed

25 files changed

+56
-45
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,6 @@
3030
import java.util.Map;
3131
import java.util.Optional;
3232

33-
import static org.springdoc.core.Constants.SPRINGDOC_SORT_CONVERTER_ENABLED;
34-
import org.springframework.data.domain.Sort;
3533
import com.fasterxml.jackson.databind.node.ObjectNode;
3634
import io.swagger.v3.core.converter.ModelConverter;
3735
import io.swagger.v3.oas.annotations.Hidden;
@@ -94,6 +92,7 @@
9492
import org.springframework.core.LocalVariableTableParameterNameDiscoverer;
9593
import org.springframework.core.convert.support.GenericConversionService;
9694
import org.springframework.data.domain.Pageable;
95+
import org.springframework.data.domain.Sort;
9796
import org.springframework.data.rest.core.config.RepositoryRestConfiguration;
9897
import org.springframework.http.HttpStatus;
9998
import org.springframework.http.ResponseEntity;
@@ -110,6 +109,7 @@
110109
import static org.springdoc.core.Constants.SPRINGDOC_SCHEMA_RESOLVE_PROPERTIES;
111110
import static org.springdoc.core.Constants.SPRINGDOC_SHOW_ACTUATOR;
112111
import static org.springdoc.core.Constants.SPRINGDOC_SHOW_SPRING_CLOUD_FUNCTIONS;
112+
import static org.springdoc.core.Constants.SPRINGDOC_SORT_CONVERTER_ENABLED;
113113
import static org.springdoc.core.SpringDocUtils.getConfig;
114114

115115
/**

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424

2525
import java.net.URL;
2626
import java.util.Comparator;
27-
import java.util.HashSet;
2827
import java.util.LinkedHashSet;
2928
import java.util.Map;
3029
import java.util.Set;

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,17 +22,18 @@
2222

2323
package org.springdoc.core;
2424

25+
import java.util.LinkedHashSet;
26+
import java.util.Set;
27+
import java.util.stream.Collectors;
28+
2529
import org.apache.commons.lang3.StringUtils;
30+
2631
import org.springframework.boot.autoconfigure.condition.ConditionalOnBean;
2732
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
2833
import org.springframework.boot.context.properties.ConfigurationProperties;
2934
import org.springframework.context.annotation.Configuration;
3035
import org.springframework.context.annotation.Lazy;
3136

32-
import java.util.LinkedHashSet;
33-
import java.util.Set;
34-
import java.util.stream.Collectors;
35-
3637
import static org.springdoc.core.Constants.SPRINGDOC_SWAGGER_UI_ENABLED;
3738

3839

springdoc-openapi-common/src/main/java/org/springdoc/core/converters/SortOpenAPIConverter.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
package org.springdoc.core.converters;
2-
31
/*
42
*
53
* *
@@ -21,6 +19,9 @@
2119
* *
2220
*
2321
*/
22+
23+
package org.springdoc.core.converters;
24+
2425
import java.util.Iterator;
2526

2627
import com.fasterxml.jackson.databind.JavaType;

springdoc-openapi-common/src/main/java/org/springdoc/core/converters/models/Sort.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
package org.springdoc.core.converters.models;
2-
31
/*
42
*
53
* *
@@ -22,6 +20,8 @@
2220
*
2321
*/
2422

23+
package org.springdoc.core.converters.models;
24+
2525
import java.util.List;
2626
import java.util.Objects;
2727

springdoc-openapi-common/src/test/java/org/springdoc/api/AbstractOpenApiResourceTest.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
import java.util.Map;
3030
import java.util.Optional;
3131

32-
import io.swagger.v3.core.util.Json;
3332
import io.swagger.v3.oas.annotations.enums.ParameterIn;
3433
import io.swagger.v3.oas.models.OpenAPI;
3534
import io.swagger.v3.oas.models.Operation;

springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app31/HelloController.java

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@
1818

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

21+
import java.util.List;
22+
2123
import org.springdoc.api.annotations.ParameterObject;
24+
2225
import org.springframework.data.domain.Pageable;
2326
import org.springframework.data.domain.Sort;
2427
import org.springframework.data.domain.Sort.Direction;
@@ -27,8 +30,6 @@
2730
import org.springframework.web.bind.annotation.GetMapping;
2831
import org.springframework.web.bind.annotation.RestController;
2932

30-
import java.util.List;
31-
3233
@RestController
3334
public class HelloController {
3435

springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app31/SpringDocApp31Test.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,10 @@
2323

2424
package test.org.springdoc.api.app31;
2525

26-
import org.springframework.boot.autoconfigure.SpringBootApplication;
2726
import test.org.springdoc.api.AbstractSpringDocTest;
2827

28+
import org.springframework.boot.autoconfigure.SpringBootApplication;
29+
2930
public class SpringDocApp31Test extends AbstractSpringDocTest {
3031

3132
@SpringBootApplication

springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app32/HelloController.java

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

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

21+
import java.util.List;
22+
2123
import org.springdoc.api.annotations.ParameterObject;
24+
2225
import org.springframework.data.domain.Sort;
2326
import org.springframework.http.ResponseEntity;
2427
import org.springframework.web.bind.annotation.GetMapping;
2528
import org.springframework.web.bind.annotation.RestController;
2629

27-
import java.util.List;
28-
2930
@RestController
3031
public class HelloController {
3132

springdoc-openapi-data-rest/src/test/java/test/org/springdoc/api/app32/SpringDocApp32Test.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,21 +23,22 @@
2323

2424
package test.org.springdoc.api.app32;
2525

26+
import java.util.Optional;
27+
2628
import org.springdoc.core.customizers.DataRestDelegatingMethodParameterCustomizer;
2729
import org.springdoc.core.customizers.DelegatingMethodParameterCustomizer;
2830
import org.springdoc.core.providers.RepositoryRestConfigurationProvider;
2931
import org.springdoc.core.providers.SpringDataWebPropertiesProvider;
3032
import org.springdoc.data.rest.SpringDocDataRestConfiguration;
33+
import test.org.springdoc.api.AbstractSpringDocTest;
34+
3135
import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
3236
import org.springframework.boot.autoconfigure.SpringBootApplication;
3337
import org.springframework.boot.autoconfigure.condition.ConditionalOnMissingBean;
3438
import org.springframework.boot.autoconfigure.data.rest.RepositoryRestMvcAutoConfiguration;
3539
import org.springframework.context.annotation.Bean;
3640
import org.springframework.context.annotation.Lazy;
3741
import org.springframework.test.context.TestPropertySource;
38-
import test.org.springdoc.api.AbstractSpringDocTest;
39-
40-
import java.util.Optional;
4142

4243
@TestPropertySource(properties = "spring.data.web.sort.sort-parameter=sorts")
4344
@EnableAutoConfiguration(exclude = {

0 commit comments

Comments
 (0)