Skip to content

Commit f24f0d8

Browse files
author
springdoc
committed
project review
1 parent 31a9842 commit f24f0d8

File tree

20 files changed

+35
-38
lines changed

20 files changed

+35
-38
lines changed

springdoc-openapi-common/pom.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
1+
<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://maven.apache.org/POM/4.0.0"
2+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
23
<modelVersion>4.0.0</modelVersion>
34
<artifactId>springdoc-openapi-common</artifactId>
45
<name>${project.artifactId}</name>

springdoc-openapi-common/src/main/java/org/springdoc/api/AbstractOpenApiResource.java

Lines changed: 4 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3,20 +3,12 @@
33
import com.fasterxml.jackson.annotation.JsonView;
44
import io.swagger.v3.core.util.ReflectionUtils;
55
import io.swagger.v3.oas.annotations.Hidden;
6-
import io.swagger.v3.oas.models.Components;
7-
import io.swagger.v3.oas.models.OpenAPI;
8-
import io.swagger.v3.oas.models.Operation;
9-
import io.swagger.v3.oas.models.PathItem;
6+
import io.swagger.v3.oas.models.*;
107
import io.swagger.v3.oas.models.PathItem.HttpMethod;
11-
import io.swagger.v3.oas.models.Paths;
128
import io.swagger.v3.oas.models.responses.ApiResponses;
139
import org.slf4j.Logger;
1410
import org.slf4j.LoggerFactory;
15-
import org.springdoc.core.AbstractRequestBuilder;
16-
import org.springdoc.core.AbstractResponseBuilder;
17-
import org.springdoc.core.MethodAttributes;
18-
import org.springdoc.core.OpenAPIBuilder;
19-
import org.springdoc.core.OperationBuilder;
11+
import org.springdoc.core.*;
2012
import org.springframework.core.annotation.AnnotationUtils;
2113
import org.springframework.util.CollectionUtils;
2214
import org.springframework.web.bind.annotation.RequestMapping;
@@ -42,7 +34,7 @@ public abstract class AbstractOpenApiResource {
4234

4335
protected AbstractOpenApiResource(OpenAPIBuilder openAPIBuilder, AbstractRequestBuilder requestBuilder,
4436
AbstractResponseBuilder responseBuilder, OperationBuilder operationParser,
45-
Optional<List<OpenApiCustomiser>> openApiCustomisers) {
37+
Optional<List<OpenApiCustomiser>> openApiCustomisers) {
4638
super();
4739
this.openAPIBuilder = openAPIBuilder;
4840
this.requestBuilder = requestBuilder;
@@ -87,7 +79,7 @@ protected OpenAPI getOpenApi() {
8779
protected abstract void getPaths(Map<String, Object> findRestControllers);
8880

8981
protected void calculatePath(OpenAPIBuilder openAPIBuilder, HandlerMethod handlerMethod, String operationPath,
90-
Set<RequestMethod> requestMethods) {
82+
Set<RequestMethod> requestMethods) {
9183
OpenAPI openAPI = openAPIBuilder.getOpenAPI();
9284
Components components = openAPIBuilder.getComponents();
9385
Paths paths = openAPIBuilder.getPaths();

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
public class SpringDocConfiguration {
1111

1212
@Bean
13-
LocalVariableTableParameterNameDiscoverer localSpringDocParameterNameDiscoverer(){
13+
LocalVariableTableParameterNameDiscoverer localSpringDocParameterNameDiscoverer() {
1414
return new LocalVariableTableParameterNameDiscoverer();
1515
}
1616
}

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,8 @@ public Operation build(Components components, HandlerMethod handlerMethod, Reque
4646
LocalVariableTableParameterNameDiscoverer d = parameterBuilder.getLocalSpringDocParameterNameDiscoverer();
4747
String[] pNames = d.getParameterNames(handlerMethod.getMethod());
4848
java.lang.reflect.Parameter[] parameters = handlerMethod.getMethod().getParameters();
49-
if(pNames == null){
50-
pNames = Arrays.stream(parameters).map(java.lang.reflect.Parameter::getName).toArray(String[]::new);
49+
if (pNames == null) {
50+
pNames = Arrays.stream(parameters).map(java.lang.reflect.Parameter::getName).toArray(String[]::new);
5151
}
5252
RequestBodyInfo requestBodyInfo = new RequestBodyInfo(methodAttributes);
5353
List<Parameter> operationParameters = (operation.getParameters() != null) ? operation.getParameters()

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,8 @@ public MethodAttributes(String[] methodProducesNew) {
2323
this.methodProduces = methodProducesNew;
2424
}
2525

26-
public MethodAttributes() { }
26+
public MethodAttributes() {
27+
}
2728

2829
public String[] getClassProduces() {
2930
return classProduces;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
import java.util.Iterator;
1313

1414
@SuppressWarnings("rawtypes")
15-
class ObjectNodeConverter implements ModelConverter {
15+
class ObjectNodeConverter implements ModelConverter {
1616

1717
@Override
1818
public Schema resolve(AnnotatedType type, ModelConverterContext context, Iterator<ModelConverter> chain) {

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,11 +41,11 @@ public class OpenAPIBuilder {
4141
private final OpenAPI openAPI;
4242
private final ApplicationContext context;
4343
private final SecurityParser securityParser;
44-
private String serverBaseUrl;
4544
private final Map<HandlerMethod, String> springdocTags = new HashMap<>();
45+
private String serverBaseUrl;
4646

47-
@SuppressWarnings("WeakerAccess")
48-
OpenAPIBuilder(Optional<OpenAPI> openAPI, ApplicationContext context, SecurityParser securityParser) {
47+
@SuppressWarnings("WeakerAccess")
48+
OpenAPIBuilder(Optional<OpenAPI> openAPI, ApplicationContext context, SecurityParser securityParser) {
4949
if (openAPI.isPresent()) {
5050
this.openAPI = openAPI.get();
5151
if (this.openAPI.getComponents() == null)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,8 @@
44

55
class ParameterInfo {
66

7-
private String pName;
87
private final java.lang.reflect.Parameter parameter;
8+
private String pName;
99
private io.swagger.v3.oas.annotations.Parameter parameterDoc;
1010
private io.swagger.v3.oas.models.parameters.Parameter parameterModel;
1111
private int index;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import java.util.Arrays;
99

1010
@SuppressWarnings("rawtypes")
11-
class RequestBodyInfo {
11+
class RequestBodyInfo {
1212

1313
private RequestBody requestBody;
1414
private Schema mergedSchema;

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,11 @@ public String type() {
3333
public enum ParameterType {
3434
QUERY_PARAM("query"), HEADER_PARAM("header"), PATH_PARAM("path");
3535
private final String value;
36+
3637
ParameterType(String s) {
3738
value = s;
3839
}
40+
3941
@Override
4042
public String toString() {
4143
return value;

0 commit comments

Comments
 (0)