[GitHub] [servicecomb-java-chassis] fanjiwang1992 commented on a change in pull request #2600: [SCB-2344] fix swagger generator duplicate param model exception bug

[GitBox <gi...@apache.org>]

fanjiwang1992 commented on a change in pull request #2600:
URL: https://github.com/apache/servicecomb-java-chassis/pull/2600#discussion_r725480944



##########
File path: demo/demo-jaxrs/jaxrs-client/src/main/java/org/apache/servicecomb/demo/jaxrs/client/validation/ValidationServiceClient.java
##########
@@ -81,5 +82,15 @@ private static void testValidation() {
       TestMgr.check(Status.BAD_REQUEST, e.getReasonPhrase());
       TestMgr.check(e.getErrorData().toString().contains("Parameter is not valid for operation"), true);
     }
+
+    try {
+      Teacher teacher = new Teacher();
+      teacher.setAge("20");
+      template.postForObject(urlPrefix + "/sayTeacherInfo", teacher, Teacher.class);

Review comment:
       done

##########
File path: swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/SwaggerUtils.java
##########
@@ -76,6 +76,8 @@
 
   private static final Logger LOGGER = LoggerFactory.getLogger(SwaggerUtils.class);
 
+  private static String X_JAVA_CLASS = "x-java-class";

Review comment:
       done

##########
File path: swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/SwaggerUtils.java
##########
@@ -216,8 +218,14 @@ public static void addDefinitions(Swagger swagger, Type paramType) {
       if (null != swagger.getDefinitions()) {
         Model tempModel = swagger.getDefinitions().get(entry.getKey());
         if (null != tempModel && !tempModel.equals(entry.getValue())) {
-          LOGGER.warn("duplicate param model: " + entry.getKey());
-          throw new IllegalArgumentException("duplicate param model: " + entry.getKey());
+          String tempModelClass = (String) tempModel.getVendorExtensions().get(X_JAVA_CLASS);
+          if (tempModelClass.equals(entry.getValue().getVendorExtensions().get(X_JAVA_CLASS))) {
+            swagger.addDefinition(entry.getKey(), tempModel);
+            continue;
+          } else {
+            LOGGER.warn("duplicate param model: " + entry.getKey());
+            throw new IllegalArgumentException("duplicate param model: " + entry.getKey());
+          }
         }

Review comment:
       done




-- 
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.

To unsubscribe, e-mail: commits-unsubscribe@servicecomb.apache.org

For queries about this service, please contact Infrastructure at:
users@infra.apache.org