Merge pull request #9054 from demonfiddler/issue-8849

Fixes #8988, #8849 New generator options and template improvements + required bug fix

Author: HugoMario

bin/javascript-override-default-config-petstore.sh

@@ -0,0 +1,41 @@
+#!/bin/sh
+
+SCRIPT="$0"
+echo "# START SCRIPT: $SCRIPT"
+
+while [ -h "$SCRIPT" ] ; do
+  ls=`ls -ld "$SCRIPT"`
+  link=`expr "$ls" : '.*-> \(.*\)$'`
+  if expr "$link" : '/.*' > /dev/null; then
+    SCRIPT="$link"
+  else
+    SCRIPT=`dirname "$SCRIPT"`/"$link"
+  fi
+done
+
+if [ ! -d "${APP_DIR}" ]; then
+  APP_DIR=`dirname "$SCRIPT"`/..
+  APP_DIR=`cd "${APP_DIR}"; pwd`
+fi
+
+executable="./modules/swagger-codegen-cli/target/swagger-codegen-cli.jar"
+
+if [ ! -f "$executable" ]
+then
+  mvn -B clean package
+fi
+
+# if you've executed sbt assembly previously it will use that instead.
+export JAVA_OPTS="${JAVA_OPTS} -XX:MaxPermSize=256M -Xmx1024M -DloggerPath=conf/log4j.properties"
+ags="generate \
+-t modules/swagger-codegen/src/main/resources/Javascript \
+-i modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml \
+-l javascript \
+-o samples/client/petstore/javascript-override-default-config \
+--invoker-package petstore \
+--api-package handler \
+--model-package mdl \
+--additional-properties sourceFolder=js \
+-DappName=PetstoreClient $@"
+
+java $JAVA_OPTS -jar $executable $ags

bin/javascript-petstore-all.sh

@@ -4,3 +4,4 @@
 ./bin/javascript-promise-petstore.sh
 ./bin/javascript-es6-petstore.sh
 ./bin/javascript-promise-es6-petstore.sh
+./bin/javascript-override-default-config-petstore.sh

bin/windows/javascript-es6-petstore.bat

@@ -4,6 +4,9 @@ If Not Exist %executable% (
   mvn clean package
 )
 
+REM Test spec files don't get overwritten, so delete them first.
+del /S samples\client\petstore\javascript-es6\test\*.spec.js
+
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
 set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -l javascript -o samples\client\petstore\javascript-es6 --additional-properties useES6=true
 

bin/windows/javascript-override-default-config-petstore.bat

@@ -0,0 +1,13 @@
+set executable=.\modules\swagger-codegen-cli\target\swagger-codegen-cli.jar
+
+If Not Exist %executable% (
+  mvn clean package
+)
+
+REM Test spec files don't get overwritten, so delete them first.
+del /S samples\client\petstore\javascript-override-default-config\test\*.spec.js
+
+REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
+set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -l javascript -o samples\client\petstore\javascript-override-default-config -t modules\swagger-codegen\src\main\resources\Javascript --invoker-package petstore --api-package handler --model-package mdl -DappName=PetstoreClient --additional-properties sourceFolder=js
+
+java %JAVA_OPTS% -jar %executable% %ags%

bin/windows/javascript-petstore-all.bat

@@ -2,3 +2,4 @@ call .\bin\windows\javascript-petstore.bat
 call .\bin\windows\javascript-promise-petstore.bat
 call .\bin\windows\javascript-es6-petstore.bat
 call .\bin\windows\javascript-promise-es6-petstore.bat
+call .\bin\windows\javascript-override-default-config-petstore.bat

bin/windows/javascript-petstore.bat

@@ -4,6 +4,9 @@ If Not Exist %executable% (
   mvn clean package
 )
 
+REM Test spec files don't get overwritten, so delete them first.
+del /S samples\client\petstore\javascript\test\*.spec.js
+
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
 set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -l javascript -o samples\client\petstore\javascript -DappName=PetstoreClient --additional-properties useES6=false
 

bin/windows/javascript-promise-es6-petstore.bat

@@ -4,6 +4,9 @@ If Not Exist %executable% (
   mvn clean package
 )
 
+REM Test spec files don't get overwritten, so delete them first.
+del /S samples\client\petstore\javascript-promise-es6\test\*.spec.js
+
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
 set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -l javascript -o samples\client\petstore\javascript-promise-es6 --additional-properties useES6=true,usePromises=true
 

bin/windows/javascript-promise-petstore.bat

@@ -4,6 +4,9 @@ If Not Exist %executable% (
   mvn clean package
 )
 
+REM Test spec files don't get overwritten, so delete them first.
+del /S samples\client\petstore\javascript-promise\test\*.spec.js
+
 REM set JAVA_OPTS=%JAVA_OPTS% -Xmx1024M
 set ags=generate -i modules\swagger-codegen\src\test\resources\2_0\petstore-with-fake-endpoints-models-for-testing.yaml -l javascript -o samples\client\petstore\javascript-promise --additional-properties usePromises=true,useES6=false -DappName=PetstoreClient
 

modules/swagger-codegen/src/main/java/io/swagger/codegen/DefaultCodegen.java

@@ -230,6 +230,7 @@ public Map<String, Object> postProcessModels(Map<String, Object> objs) {
      */
     public Map<String, Object> postProcessModelsEnum(Map<String, Object> objs) {
         List<Object> models = (List<Object>) objs.get("models");
+        Map<String, Integer> uniqueNames = new HashMap<>();
         for (Object _mo : models) {
             Map<String, Object> mo = (Map<String, Object>) _mo;
             CodegenModel cm = (CodegenModel) mo.get("model");
@@ -241,6 +242,7 @@ public Map<String, Object> postProcessModelsEnum(Map<String, Object> objs) {
                 List<Map<String, String>> enumVars = new ArrayList<Map<String, String>>();
                 String commonPrefix = findCommonPrefixOfVars(values);
                 int truncateIdx = commonPrefix.length();
+                uniqueNames.clear();
                 for (Object value : values) {
                     Map<String, String> enumVar = new HashMap<String, String>();
                     String enumName;
@@ -252,7 +254,8 @@ public Map<String, Object> postProcessModelsEnum(Map<String, Object> objs) {
                             enumName = value.toString();
                         }
                     }
-                    enumVar.put("name", toEnumVarName(enumName, cm.dataType));
+                    String varName = toEnumVarName(enumName, cm.dataType);
+                    enumVar.put("name", ensureUniqueName(uniqueNames, varName));
                     enumVar.put("value", toEnumValue(value.toString(), cm.dataType));
                     enumVars.add(enumVar);
                 }
@@ -264,7 +267,11 @@ public Map<String, Object> postProcessModelsEnum(Map<String, Object> objs) {
             for (CodegenProperty var : cm.vars) {
                 updateCodegenPropertyEnum(var);
             }
-
+            if (cm.vars != cm.allVars) {
+                for (CodegenProperty var : cm.allVars) {
+                    updateCodegenPropertyEnum(var);
+                }
+            }
         }
         return objs;
     }
@@ -291,6 +298,19 @@ public String findCommonPrefixOfVars(List<Object> vars) {
         return "";
     }
 
+    /**
+     * If necessary, appends a suffix to enforce uniqueness of names within a namespace.
+     * @param uniqueNames Counts name occurrences within a namespace.
+     * @param name The proposed name.
+     * @return <code>name</code>, uniquely suffixed as necessary.
+     */
+    protected String ensureUniqueName(Map<String, Integer> uniqueNames, String name) {
+        int count = uniqueNames.containsKey(name) ? uniqueNames.get(name) + 1 : 1;
+        if (uniqueNames.put(name, count) != null)
+            name = name + '_' + count;
+        return name;
+    }
+
     /**
      * Return the enum default value in the language specified format
      *
@@ -3594,10 +3614,9 @@ public String sanitizeName(String name) {
 
         // remove everything else other than word, number and _
         // $php_variable => php_variable
-        if (allowUnicodeIdentifiers) { //could be converted to a single line with ?: operator
+        if (allowUnicodeIdentifiers) { // could be converted to a single line with ?: operator
             name = Pattern.compile("\\W", Pattern.UNICODE_CHARACTER_CLASS).matcher(name).replaceAll("");
-        }
-        else {
+        } else {
             name = name.replaceAll("\\W", "");
         }
 
@@ -3733,6 +3752,7 @@ public void updateCodegenPropertyEnum(CodegenProperty var) {
         List<Map<String, String>> enumVars = new ArrayList<Map<String, String>>();
         String commonPrefix = findCommonPrefixOfVars(values);
         int truncateIdx = commonPrefix.length();
+        Map<String, Integer> uniqueNames = new HashMap<>();
         for (Object value : values) {
             Map<String, String> enumVar = new HashMap<String, String>();
             String enumName;
@@ -3744,7 +3764,8 @@ public void updateCodegenPropertyEnum(CodegenProperty var) {
                     enumName = value.toString();
                 }
             }
-            enumVar.put("name", toEnumVarName(enumName, var.datatype));
+            String varName = toEnumVarName(enumName, var.datatype);
+            enumVar.put("name", ensureUniqueName(uniqueNames, varName));
             enumVar.put("value", toEnumValue(value.toString(), var.datatype));
             enumVars.add(enumVar);
         }