[SCB-1511]when use method override, the generated swagger body is wrong (missed sorting)

liubao68 · yhs0092 · commit 06b7cb8f95c7 · 2019-10-25T21:16:01.000+08:00
diff --git a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/utils/MethodUtils.java b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/utils/MethodUtils.java
@@ -36,7 +36,7 @@ public static List<Method> findProducerMethods(Class<?> cls) {
       }
     }
 
-    producerMethods.sort(Comparator.comparing(Method::getName));
+    producerMethods.sort(Comparator.comparing(ParamUtils::findSwaggerMethodName));
     return producerMethods;
   }
 
diff --git a/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/utils/ParamUtils.java b/swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/generator/core/utils/ParamUtils.java
@@ -163,7 +163,7 @@ public static String generateBodyParameterName(Method method) {
     return findSwaggerMethodName(method)  + "Body";
   }
 
-  protected static String findSwaggerMethodName(Method consumerMethod) {
+  public static String findSwaggerMethodName(Method consumerMethod) {
     ApiOperation apiOperationAnnotation = consumerMethod.getAnnotation(ApiOperation.class);
     if (apiOperationAnnotation == null || StringUtils.isEmpty(apiOperationAnnotation.nickname())) {
       return consumerMethod.getName();

Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,7 @@ public static List<Method> findProducerMethods(Class<?> cls) {`
`36`	`36`	`}`
`37`	`37`	`}`
`38`	`38`
`39`		`- producerMethods.sort(Comparator.comparing(Method::getName));`
	`39`	`+ producerMethods.sort(Comparator.comparing(ParamUtils::findSwaggerMethodName));`
`40`	`40`	`return producerMethods;`
`41`	`41`	`}`
`42`	`42`
Original file line number	Diff line number	Diff line change
`@@ -163,7 +163,7 @@ public static String generateBodyParameterName(Method method) {`
`163`	`163`	`return findSwaggerMethodName(method) + "Body";`
`164`	`164`	`}`
`165`	`165`
`166`		`- protected static String findSwaggerMethodName(Method consumerMethod) {`
	`166`	`+ public static String findSwaggerMethodName(Method consumerMethod) {`
`167`	`167`	`ApiOperation apiOperationAnnotation = consumerMethod.getAnnotation(ApiOperation.class);`
`168`	`168`	`if (apiOperationAnnotation == null \|\| StringUtils.isEmpty(apiOperationAnnotation.nickname())) {`
`169`	`169`	`return consumerMethod.getName();`