liubao68 commented on a change in pull request #2600:
URL:
https://github.com/apache/servicecomb-java-chassis/pull/2600#discussion_r737116839
##########
File path:
swagger/swagger-generator/generator-core/src/main/java/org/apache/servicecomb/swagger/SwaggerUtils.java
##########
@@ -210,20 +211,30 @@ public static void addDefinitions(Swagger swagger, Type
paramType) {
if (javaType.isTypeOrSubTypeOf(DynamicEnum.class)) {
return;
}
-
Map<String, Model> models =
ModelConverters.getInstance().readAll(javaType);
for (Entry<String, Model> entry : models.entrySet()) {
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());
+ if (modelNotDuplicate(tempModel, entry.getValue())) {
+ swagger.addDefinition(entry.getKey(), tempModel);
+ continue;
+ } else {
+ LOGGER.warn("duplicate param model: " + entry.getKey());
+ throw new IllegalArgumentException("duplicate param model: " +
entry.getKey());
+ }
}
}
swagger.addDefinition(entry.getKey(), entry.getValue());
}
}
+ private static boolean modelNotDuplicate(Model tempModel, Model model){
+ String tempModelClass = (String)
tempModel.getVendorExtensions().get(SwaggerConst.EXT_JAVA_CLASS);
+ String modelClass = (String)
model.getVendorExtensions().get(SwaggerConst.EXT_JAVA_CLASS);
+ return tempModelClass.equals(modelClass);
+ }
+
Review comment:
```
for (Entry<String, Model> entry : models.entrySet()) {
if (modelNotDuplicate(swagger, entry) {
swagger.addDefinition(entry.getKey(), entry.getValue());
} else{
LOGGER.warn("duplicate param model: " + entry.getKey());
throw new IllegalArgumentException("duplicate param model: " +
entry.getKey());
}
}
/////////////////////
private static boolean modelNotDuplicate(swagger, entry){
if (null != swagger.getDefinitions()) {
return false;
}
....
Model tempModel = swagger.getDefinitions().get(entry.getKey());
if (null != tempModel && !tempModel.equals(entry.getValue()))
String tempModelClass = (String)
tempModel.getVendorExtensions().get(SwaggerConst.EXT_JAVA_CLASS);
String modelClass = (String)
model.getVendorExtensions().get(SwaggerConst.EXT_JAVA_CLASS);
return tempModelClass.equals(modelClass);
}
```
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
