Skip to content

Commit 1c138d6

Browse files
author
bnasslahsen
committed
code review
1 parent 7f29389 commit 1c138d6

File tree

3 files changed

+8
-23
lines changed

3 files changed

+8
-23
lines changed

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

+4-5
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,6 @@
4949
import io.swagger.v3.oas.models.media.Schema;
5050
import io.swagger.v3.oas.models.parameters.Parameter;
5151
import org.apache.commons.lang3.StringUtils;
52-
import org.springdoc.core.RequestInfo.ParameterType;
5352
import org.springdoc.core.customizers.OperationCustomizer;
5453
import org.springdoc.core.customizers.ParameterCustomizer;
5554

@@ -266,14 +265,14 @@ private Parameter buildParams(ParameterInfo parameterInfo, Components components
266265
RequestInfo requestInfo;
267266

268267
if (requestHeader != null) {
269-
requestInfo = new RequestInfo(ParameterType.HEADER_PARAM, requestHeader.value(), requestHeader.required(),
268+
requestInfo = new RequestInfo(ParameterIn.HEADER.toString(), requestHeader.value(), requestHeader.required(),
270269
requestHeader.defaultValue());
271270
parameter = buildParam(parameterInfo, components, requestInfo, jsonView);
272271

273272
}
274273
else if (requestParam != null && !parameterBuilder.isFile(parameterInfo.getParameter())) {
275274
boolean isOptional = Optional.class.equals(parameters.getType());
276-
requestInfo = new RequestInfo(ParameterType.QUERY_PARAM, requestParam.value(), requestParam.required() && !isOptional,
275+
requestInfo = new RequestInfo(ParameterIn.QUERY.toString(), requestParam.value(), requestParam.required() && !isOptional,
277276
requestParam.defaultValue());
278277
parameter = buildParam(parameterInfo, components, requestInfo, jsonView);
279278
}
@@ -282,10 +281,10 @@ else if (pathVar != null) {
282281
String name = StringUtils.isBlank(pathVar.value()) ? pName : pathVar.value();
283282
parameterInfo.setpName(name);
284283
// check if PATH PARAM
285-
requestInfo = new RequestInfo(ParameterType.PATH_PARAM, pathVar.value(), Boolean.TRUE, null);
284+
requestInfo = new RequestInfo(ParameterIn.PATH.toString(), pathVar.value(), Boolean.TRUE, null);
286285
parameter = buildParam(parameterInfo, components, requestInfo, jsonView);
287286
} else if (cookieValue != null) {
288-
requestInfo = new RequestInfo(ParameterType.COOKIE, cookieValue.value(), cookieValue.required(),
287+
requestInfo = new RequestInfo(ParameterIn.COOKIE.toString(), cookieValue.value(), cookieValue.required(),
289288
cookieValue.defaultValue());
290289
parameter = buildParam(parameterInfo, components, requestInfo, jsonView);
291290
}

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

+2-17
Original file line numberDiff line numberDiff line change
@@ -26,9 +26,9 @@ public class RequestInfo {
2626

2727
private final String defaultValue;
2828

29-
private final ParameterType paramType;
29+
private final String paramType;
3030

31-
public RequestInfo(ParameterType paramType, String value, boolean required, String defaultValue) {
31+
public RequestInfo(String paramType, String value, boolean required, String defaultValue) {
3232
this.value = value;
3333
this.required = required;
3434
this.defaultValue = defaultValue;
@@ -51,19 +51,4 @@ public String type() {
5151
return paramType.toString();
5252
}
5353

54-
public enum ParameterType {
55-
QUERY_PARAM("query"), HEADER_PARAM("header"), PATH_PARAM("path"), COOKIE("cookie");
56-
57-
private final String value;
58-
59-
ParameterType(String s) {
60-
value = s;
61-
}
62-
63-
@Override
64-
public String toString() {
65-
return value;
66-
}
67-
}
68-
6954
}

Diff for: springdoc-openapi-data-rest/src/main/java/org/springdoc/core/SpringDocDataRestConfiguration.java

+2-1
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,7 @@
3030
import io.swagger.v3.oas.models.media.StringSchema;
3131
import org.springdoc.core.converters.PageableSupportConverter;
3232
import org.springdoc.core.customizers.OpenApiCustomiser;
33+
3334
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
3435
import org.springframework.context.annotation.Bean;
3536
import org.springframework.context.annotation.Configuration;
@@ -76,7 +77,7 @@ public OpenApiCustomiser linksSchemaCustomiser(RepositoryRestConfiguration repos
7677
.additionalProperties(new ObjectSchema().$ref("#/components/schemas/Link")));
7778
}
7879

79-
static abstract class RepresentationModelLinksOASMixin extends RepresentationModelMixin {
80+
abstract static class RepresentationModelLinksOASMixin extends RepresentationModelMixin {
8081
@Override
8182
@Schema(ref = "#/components/schemas/Links")
8283
public abstract Links getLinks();

0 commit comments

Comments
 (0)