Skip to content

Commit e8b1b1c

Browse files
author
Marcin Zarebski
committed
Fix formatting issues
1 parent 5b9643f commit e8b1b1c

File tree

5 files changed

+69
-42
lines changed

5 files changed

+69
-42
lines changed

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

Lines changed: 38 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,29 @@
1818

1919
package org.springdoc.core;
2020

21+
import java.lang.annotation.Annotation;
22+
import java.lang.reflect.Method;
23+
import java.math.BigDecimal;
24+
import java.util.ArrayList;
25+
import java.util.Arrays;
26+
import java.util.HashMap;
27+
import java.util.LinkedHashMap;
28+
import java.util.List;
29+
import java.util.Map;
30+
import java.util.Objects;
31+
import java.util.Optional;
32+
import java.util.Set;
33+
import java.util.stream.Collectors;
34+
import java.util.stream.Stream;
35+
36+
import javax.validation.constraints.DecimalMax;
37+
import javax.validation.constraints.DecimalMin;
38+
import javax.validation.constraints.Max;
39+
import javax.validation.constraints.Min;
40+
import javax.validation.constraints.NotNull;
41+
import javax.validation.constraints.Pattern;
42+
import javax.validation.constraints.Size;
43+
2144
import com.fasterxml.jackson.annotation.JsonView;
2245
import io.swagger.v3.oas.annotations.enums.ParameterIn;
2346
import io.swagger.v3.oas.models.Components;
@@ -34,28 +57,27 @@
3457
import org.springdoc.core.converters.AdditionalModelsConverter;
3558
import org.springdoc.core.customizers.OperationCustomizer;
3659
import org.springdoc.core.customizers.ParameterCustomizer;
60+
3761
import org.springframework.core.LocalVariableTableParameterNameDiscoverer;
3862
import org.springframework.core.MethodParameter;
3963
import org.springframework.core.annotation.AnnotatedElementUtils;
4064
import org.springframework.http.HttpMethod;
4165
import org.springframework.util.CollectionUtils;
4266
import org.springframework.validation.BindingResult;
4367
import org.springframework.validation.Errors;
44-
import org.springframework.web.bind.annotation.*;
68+
import org.springframework.web.bind.annotation.CookieValue;
69+
import org.springframework.web.bind.annotation.PathVariable;
70+
import org.springframework.web.bind.annotation.RequestAttribute;
71+
import org.springframework.web.bind.annotation.RequestHeader;
72+
import org.springframework.web.bind.annotation.RequestMethod;
73+
import org.springframework.web.bind.annotation.RequestParam;
74+
import org.springframework.web.bind.annotation.ValueConstants;
4575
import org.springframework.web.bind.support.SessionStatus;
4676
import org.springframework.web.context.request.NativeWebRequest;
4777
import org.springframework.web.context.request.WebRequest;
4878
import org.springframework.web.method.HandlerMethod;
4979
import org.springframework.web.util.UriComponentsBuilder;
5080

51-
import javax.validation.constraints.*;
52-
import java.lang.annotation.Annotation;
53-
import java.lang.reflect.Method;
54-
import java.math.BigDecimal;
55-
import java.util.*;
56-
import java.util.stream.Collectors;
57-
import java.util.stream.Stream;
58-
5981
import static org.springdoc.core.Constants.OPENAPI_ARRAY_TYPE;
6082
import static org.springdoc.core.Constants.OPENAPI_STRING_TYPE;
6183
import static org.springdoc.core.Constants.QUERY_PARAM;
@@ -150,7 +172,8 @@ public Operation build(HandlerMethod handlerMethod, RequestMethod requestMethod,
150172
.map(f -> DelegatingMethodParameter.fromGetterOfField(paramClass, f))
151173
.filter(Objects::nonNull)
152174
.forEach(explodedParameters::add);
153-
} else {
175+
}
176+
else {
154177
String name = pNames != null ? pNames[i] : p.getParameterName();
155178
explodedParameters.add(new DelegatingMethodParameter(p, name, null));
156179
}
@@ -166,14 +189,12 @@ public Operation build(HandlerMethod handlerMethod, RequestMethod requestMethod,
166189
// check if query param
167190
Parameter parameter = null;
168191
io.swagger.v3.oas.annotations.Parameter parameterDoc = methodParameter.getParameterAnnotation(io.swagger.v3.oas.annotations.Parameter.class);
169-
if (parameterDoc == null) {
192+
if (parameterDoc == null)
170193
parameterDoc = parametersDocMap.get(methodParameter.getParameterName());
171-
}
172194
// use documentation as reference
173195
if (parameterDoc != null) {
174-
if (parameterDoc.hidden()) {
196+
if (parameterDoc.hidden())
175197
continue;
176-
}
177198
parameter = parameterBuilder.buildParameterFromDoc(parameterDoc, null,
178199
methodAttributes.getJsonViewAnnotation());
179200
}
@@ -185,12 +206,11 @@ public Operation build(HandlerMethod handlerMethod, RequestMethod requestMethod,
185206
// Merge with the operation parameters
186207
parameter = parameterBuilder.mergeParameter(operationParameters, parameter);
187208
List<Annotation> parameterAnnotations = Arrays.asList(methodParameter.getParameterAnnotations());
188-
if (isValidParameter(parameter)) {
209+
if (isValidParameter(parameter))
189210
applyBeanValidatorAnnotations(parameter, parameterAnnotations);
190-
} else if (!RequestMethod.GET.equals(requestMethod)) {
191-
if (operation.getRequestBody() != null) {
211+
else if (!RequestMethod.GET.equals(requestMethod)) {
212+
if (operation.getRequestBody() != null)
192213
requestBodyInfo.setRequestBody(operation.getRequestBody());
193-
}
194214
requestBodyBuilder.calculateRequestBodyInfo(components, methodAttributes,
195215
parameterInfo, requestBodyInfo);
196216
applyBeanValidatorAnnotations(requestBodyInfo.getRequestBody(), parameterAnnotations);

‎springdoc-openapi-common/src/main/java/org/springdoc/core/DelegatingMethodParameter.java

Lines changed: 21 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,22 +1,34 @@
11
package org.springdoc.core;
22

3-
import org.apache.commons.lang3.ArrayUtils;
4-
import org.springframework.core.MethodParameter;
5-
import org.springframework.core.ParameterNameDiscoverer;
6-
import org.springframework.lang.NonNull;
7-
import org.springframework.lang.Nullable;
8-
93
import java.beans.IntrospectionException;
104
import java.beans.Introspector;
115
import java.beans.PropertyDescriptor;
126
import java.lang.annotation.Annotation;
13-
import java.lang.reflect.*;
7+
import java.lang.reflect.AnnotatedElement;
8+
import java.lang.reflect.Constructor;
9+
import java.lang.reflect.Executable;
10+
import java.lang.reflect.Field;
11+
import java.lang.reflect.Member;
12+
import java.lang.reflect.Method;
13+
import java.lang.reflect.Type;
1414
import java.util.Objects;
1515
import java.util.stream.Stream;
1616

17+
import org.apache.commons.lang3.ArrayUtils;
18+
19+
import org.springframework.core.MethodParameter;
20+
import org.springframework.core.ParameterNameDiscoverer;
21+
import org.springframework.lang.NonNull;
22+
import org.springframework.lang.Nullable;
23+
24+
/**
25+
* @author zarebski.m
26+
*/
1727
class DelegatingMethodParameter extends MethodParameter {
1828
private volatile MethodParameter delegate;
29+
1930
private Annotation[] additionalParameterAnnotations;
31+
2032
private String parameterName;
2133

2234
DelegatingMethodParameter(MethodParameter delegate, String parameterName, Annotation[] additionalParameterAnnotations) {
@@ -37,7 +49,8 @@ static MethodParameter fromGetterOfField(Class<?> paramClass, Field field) {
3749
.map(method -> new MethodParameter(method, -1))
3850
.map(param -> new DelegatingMethodParameter(param, field.getName(), field.getDeclaredAnnotations()))
3951
.orElse(null);
40-
} catch (IntrospectionException e) {
52+
}
53+
catch (IntrospectionException e) {
4154
return null;
4255
}
4356
}

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

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -18,17 +18,17 @@
1818

1919
package org.springdoc.core.converters;
2020

21+
import java.util.HashMap;
22+
import java.util.Iterator;
23+
import java.util.Map;
24+
2125
import com.fasterxml.jackson.databind.JavaType;
2226
import io.swagger.v3.core.converter.AnnotatedType;
2327
import io.swagger.v3.core.converter.ModelConverter;
2428
import io.swagger.v3.core.converter.ModelConverterContext;
2529
import io.swagger.v3.core.util.Json;
2630
import io.swagger.v3.oas.models.media.Schema;
2731

28-
import java.util.HashMap;
29-
import java.util.Iterator;
30-
import java.util.Map;
31-
3232
public class AdditionalModelsConverter implements ModelConverter {
3333

3434
private static final Map<Class, Class> modelToClassMap = new HashMap();
@@ -52,12 +52,10 @@ public Schema resolve(AnnotatedType type, ModelConverterContext context, Iterato
5252
JavaType javaType = Json.mapper().constructType(type.getType());
5353
if (javaType != null) {
5454
Class<?> cls = javaType.getRawClass();
55-
if (modelToSchemaMap.containsKey(cls)) {
55+
if (modelToSchemaMap.containsKey(cls))
5656
return modelToSchemaMap.get(cls);
57-
}
58-
if (modelToClassMap.containsKey(cls)) {
57+
if (modelToClassMap.containsKey(cls))
5958
type = new AnnotatedType(modelToClassMap.get(cls)).resolveAsRef(true);
60-
}
6159
}
6260
return (chain.hasNext()) ? chain.next().resolve(type, context, chain) : null;
6361
}

‎springdoc-openapi-data-rest/src/main/java/org/springdoc/core/converters/Pageable.java

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -87,12 +87,8 @@ public void addSort(String sort) {
8787

8888
@Override
8989
public boolean equals(Object o) {
90-
if (this == o) {
91-
return true;
92-
}
93-
if (o == null || getClass() != o.getClass()) {
94-
return false;
95-
}
90+
if (this == o) return true;
91+
if (o == null || getClass() != o.getClass()) return false;
9692
Pageable pageable = (Pageable) o;
9793
return Objects.equals(page, pageable.page) &&
9894
Objects.equals(size, pageable.size) &&

‎springdoc-openapi-data-rest/src/main/java/org/springdoc/core/converters/PageableAsQueryParam.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@
3131

3232
/**
3333
* @deprecated Use {@link org.springdoc.api.annotations.ParameterObject} annotation
34-
* on {@link org.springframework.data.domain.Pageable} method parameter instead.
34+
* on {@link org.springframework.data.domain.Pageable} method parameter instead.
3535
*/
3636
@Deprecated
37-
@Target({ ElementType.METHOD, ElementType.ANNOTATION_TYPE })
37+
@Target({ElementType.METHOD, ElementType.ANNOTATION_TYPE})
3838
@Retention(RetentionPolicy.RUNTIME)
3939
@Parameter(in = ParameterIn.QUERY
4040
, description = "Zero-based page index (0..N)"

0 commit comments

Comments
 (0)