fix models.'x' | 'x' & null<string, number> bug

gogoyqj · Nov 2, 2020 · 43c7104 · 43c7104
1 parent 27f0e1f
commit 43c7104
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 2 deletions.
diff --git a/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java b/modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java
@@ -2424,6 +2424,9 @@ public int compare(CodegenParameter one, CodegenParameter another) {
  }
  op.hasRequiredParams = op.requiredParams.size() > 0;
 
+ // only body
+ op.hasOnlyBodyParams = op.bodyParams.size() > 0 && op.pathParams.size() == 0 && op.queryParams.size() == 0 && op.headerParams.size() == 0 && op.formParams.size() == 0;
+
  // set Restful Flag
  op.isRestfulShow = op.isRestfulShow();
  op.isRestfulIndex = op.isRestfulIndex();

diff --git a/...r-codegen/src/main/java/io/swagger/codegen/languages/AbstractTypeScriptClientCodegen.java b/...r-codegen/src/main/java/io/swagger/codegen/languages/AbstractTypeScriptClientCodegen.java
@@ -30,7 +30,7 @@ public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen imp
  private static final String X_DISCRIMINATOR_TYPE = "x-discriminator-value";
  private static final String UNDEFINED_VALUE = "undefined";
 
- protected String modelPropertyNaming= "camelCase";
+ protected String modelPropertyNaming= "original";
  protected Boolean supportsES6 = true;
  protected HashSet<String> languageGenericTypes;
 
@@ -73,6 +73,8 @@ public AbstractTypeScriptClientCodegen() {
  ));
 
  instantiationTypes.put("array", "Array");
+ // fix null<x, y> bug
+ instantiationTypes.put("map", "Map");
 
  typeMapping = new HashMap<String, String>();
  typeMapping.put("Array", "Array");

diff --git a/...-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngularJsClientCodegen.java b/...-codegen/src/main/java/io/swagger/codegen/languages/TypeScriptAngularJsClientCodegen.java
@@ -69,7 +69,12 @@ private String addModelPrefix(String swaggerType) {
  }
 
  if (!isLanguagePrimitive(type) && !isLanguageGenericType(type)) {
- type = "models." + swaggerType;
+ // fix bug
+ if (swaggerType.matches("^[a-zA-Z_$]\\S*$")) {
+ type = "models." + swaggerType;
+ } else {
+ type = swaggerType;
+ }
  }
  return type;
  }