You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by il...@apache.org on 2019/11/14 14:42:14 UTC
[cxf] branch 3.2.x-fixes updated: [CXF-8158] Fixing checkstyle
This is an automated email from the ASF dual-hosted git repository.
ilgrosso pushed a commit to branch 3.2.x-fixes
in repository https://gitbox.apache.org/repos/asf/cxf.git
The following commit(s) were added to refs/heads/3.2.x-fixes by this push:
new e125a55 [CXF-8158] Fixing checkstyle
e125a55 is described below
commit e125a552b02c4b7cbf3d6603b18f20e1be78380d
Author: Francesco Chicchiriccò <il...@apache.org>
AuthorDate: Thu Nov 14 15:41:23 2019 +0100
[CXF-8158] Fixing checkstyle
---
.../cxf/jaxrs/openapi/OpenApiCustomizer.java | 33 +++++++++++-----------
1 file changed, 17 insertions(+), 16 deletions(-)
diff --git a/rt/rs/description-openapi-v3/src/main/java/org/apache/cxf/jaxrs/openapi/OpenApiCustomizer.java b/rt/rs/description-openapi-v3/src/main/java/org/apache/cxf/jaxrs/openapi/OpenApiCustomizer.java
index f987b25..719ecc1 100644
--- a/rt/rs/description-openapi-v3/src/main/java/org/apache/cxf/jaxrs/openapi/OpenApiCustomizer.java
+++ b/rt/rs/description-openapi-v3/src/main/java/org/apache/cxf/jaxrs/openapi/OpenApiCustomizer.java
@@ -25,6 +25,7 @@ import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
+import java.util.Objects;
import java.util.Optional;
import javax.ws.rs.ApplicationPath;
@@ -48,7 +49,6 @@ import io.swagger.v3.oas.models.parameters.Parameter;
import io.swagger.v3.oas.models.responses.ApiResponse;
import io.swagger.v3.oas.models.servers.Server;
import io.swagger.v3.oas.models.tags.Tag;
-import java.util.Objects;
public class OpenApiCustomizer {
@@ -136,26 +136,27 @@ public class OpenApiCustomizer {
List<Parameter> parameters = new ArrayList<>();
addParameters(parameters);
operation.setParameters(parameters);
- } else {
- for (int i = 0; i < operation.getParameters().size(); i++) {
- if (StringUtils.isBlank(operation.getParameters().get(i).getDescription())) {
- String javadoc = null;
- if (operation.getParameters().size() == ori.getParameters().size()) {
- javadoc = javadocProvider.getMethodParameterDoc(ori, i);
- } else {
- for (int j = 0; j < ori.getParameters().size(); j++) {
- if (Objects.equals(
- operation.getParameters().get(i).getName(),
- ori.getParameters().get(j).getName())) {
-
- javadoc = javadocProvider.getMethodParameterDoc(ori, j);
- }
+ }
+
+ for (int i = 0; i < operation.getParameters().size(); i++) {
+ if (StringUtils.isBlank(operation.getParameters().get(i).getDescription())) {
+ String javadoc = null;
+ if (operation.getParameters().size() == ori.getParameters().size()) {
+ javadoc = javadocProvider.getMethodParameterDoc(ori, i);
+ } else {
+ for (int j = 0; j < ori.getParameters().size(); j++) {
+ if (Objects.equals(
+ operation.getParameters().get(i).getName(),
+ ori.getParameters().get(j).getName())) {
+
+ javadoc = javadocProvider.getMethodParameterDoc(ori, j);
}
}
- operation.getParameters().get(i).setDescription(javadoc);
}
+ operation.getParameters().get(i).setDescription(javadoc);
}
}
+
addParameters(operation.getParameters());
customizeResponses(operation, ori);