Fix model prefix/suffix with incorrect camelization (#4621)

* fix camelized name with suffix/prefix in java client

* fix php model name with prefix, suffix

* fix indentation in ts abstrat generator

* replace tab with spaces in ts abstract generator

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractJavaCodegen.java

@@ -502,11 +502,22 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
 
     @Override
     public String toModelName(final String name) {
-        final String sanitizedName = sanitizeName(modelNamePrefix + name + modelNameSuffix);
+        final String sanitizedName = sanitizeName(name);
+
+        String nameWithPrefixSuffix = sanitizedName;
+        if (!StringUtils.isEmpty(modelNamePrefix)) {
+            // add '_' so that model name can be camelized correctly
+            nameWithPrefixSuffix = modelNamePrefix + "_" + nameWithPrefixSuffix;
+        }
+
+        if (!StringUtils.isEmpty(modelNameSuffix)) {
+            // add '_' so that model name can be camelized correctly
+            nameWithPrefixSuffix = nameWithPrefixSuffix + "_" + modelNameSuffix;
+        }
 
         // camelize the model name
         // phone_number => PhoneNumber
-        final String camelizedName = camelize(sanitizedName);
+        final String camelizedName = camelize(nameWithPrefixSuffix);
 
         // model name cannot use reserved keyword, e.g. return
         if (isReservedWord(camelizedName)) {
@@ -516,7 +527,7 @@ public abstract class AbstractJavaCodegen extends DefaultCodegen implements Code
         }
 
         // model name starts with number
-        if (name.matches("^\\d.*")) {
+        if (camelizedName.matches("^\\d.*")) {
             final String modelName = "Model" + camelizedName; // e.g. 200Response => Model200Response (after camelize)
             LOGGER.warn(name + " (model name starts with number) cannot be used as model name. Renamed to " + modelName);
             return modelName;

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/AbstractTypeScriptClientCodegen.java

@@ -108,92 +108,91 @@ public abstract class AbstractTypeScriptClientCodegen extends DefaultCodegen imp
         }
     }
 
+    @Override
+    public CodegenType getTag() {
+        return CodegenType.CLIENT;
+    }
 
-	@Override
+    @Override
-	public CodegenType getTag() {
+    public String escapeReservedWord(String name) {           
-	    return CodegenType.CLIENT;
+        if(this.reservedWordsMappings().containsKey(name)) {
-	}
+            return this.reservedWordsMappings().get(name);
-
-        @Override
-        public String escapeReservedWord(String name) {           
-            if(this.reservedWordsMappings().containsKey(name)) {
-                return this.reservedWordsMappings().get(name);
-            }
-            return "_" + name;
         }
+        return "_" + name;
+    }
 
-	@Override
+    @Override
-	public String apiFileFolder() {
+    public String apiFileFolder() {
-		return outputFolder + "/" + apiPackage().replace('.', File.separatorChar);
+        return outputFolder + "/" + apiPackage().replace('.', File.separatorChar);
-	}
+    }
 
-	@Override
+    @Override
-	public String modelFileFolder() {
+    public String modelFileFolder() {
-		return outputFolder + "/" + modelPackage().replace('.', File.separatorChar);
+        return outputFolder + "/" + modelPackage().replace('.', File.separatorChar);
-	}
+    }
 
-	@Override
+    @Override
-        public String toParamName(String name) {
+    public String toParamName(String name) {
-            // replace - with _ e.g. created-at => created_at
+        // replace - with _ e.g. created-at => created_at
-            name = name.replaceAll("-", "_"); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
+        name = name.replaceAll("-", "_"); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
-
-            // if it's all uppper case, do nothing
-            if (name.matches("^[A-Z_]*$"))
-                return name;
-
-            // camelize the variable name
-            // pet_id => petId
-            name = camelize(name, true);
-
-            // for reserved word or word starting with number, append _
-            if (isReservedWord(name) || name.matches("^\\d.*"))
-                name = escapeReservedWord(name);
 
+        // if it's all uppper case, do nothing
+        if (name.matches("^[A-Z_]*$"))
             return name;
+
+        // camelize the variable name
+        // pet_id => petId
+        name = camelize(name, true);
+
+        // for reserved word or word starting with number, append _
+        if (isReservedWord(name) || name.matches("^\\d.*"))
+            name = escapeReservedWord(name);
+
+        return name;
+    }
+
+    @Override
+    public String toVarName(String name) {
+        // should be the same as variable name
+        return getNameUsingModelPropertyNaming(name);
+    }
+
+    @Override
+    public String toModelName(String name) {
+        name = sanitizeName(name); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
+
+        if (!StringUtils.isEmpty(modelNamePrefix)) {
+            name = modelNamePrefix + "_" + name;
         }
 
-	@Override
+        if (!StringUtils.isEmpty(modelNameSuffix)) {
-	public String toVarName(String name) {
+            name = name + "_" + modelNameSuffix;
-		// should be the same as variable name
-		return getNameUsingModelPropertyNaming(name);
-	}
-
-	@Override
-        public String toModelName(String name) {
-            name = sanitizeName(name); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
-
-            if (!StringUtils.isEmpty(modelNamePrefix)) {
-                name = modelNamePrefix + "_" + name;
-            }
-
-            if (!StringUtils.isEmpty(modelNameSuffix)) {
-                name = name + "_" + modelNameSuffix;
-            }
-
-            // model name cannot use reserved keyword, e.g. return
-            if (isReservedWord(name)) {
-                String modelName = camelize("model_" + name);
-                LOGGER.warn(name + " (reserved word) cannot be used as model name. Renamed to " + modelName);
-                return modelName;
-            }
-
-            // model name starts with number
-            if (name.matches("^\\d.*")) {
-                String modelName = camelize("model_" + name); // e.g. 200Response => Model200Response (after camelize)
-                LOGGER.warn(name + " (model name starts with number) cannot be used as model name. Renamed to " + modelName);
-                return modelName;
-            }
-
-            if (languageSpecificPrimitives.contains(name)) {
-                String modelName = camelize("model_" + name);
-                LOGGER.warn(name + " (model name matches existing language type) cannot be used as a model name. Renamed to " + modelName);
-                return modelName;
-            }
-            // camelize the model name
-            // phone_number => PhoneNumber
-            return camelize(name);
         }
 
+        // model name cannot use reserved keyword, e.g. return
+        if (isReservedWord(name)) {
+            String modelName = camelize("model_" + name);
+            LOGGER.warn(name + " (reserved word) cannot be used as model name. Renamed to " + modelName);
+            return modelName;
+        }
+
+        // model name starts with number
+        if (name.matches("^\\d.*")) {
+            String modelName = camelize("model_" + name); // e.g. 200Response => Model200Response (after camelize)
+            LOGGER.warn(name + " (model name starts with number) cannot be used as model name. Renamed to " + modelName);
+            return modelName;
+        }
+
+        if (languageSpecificPrimitives.contains(name)) {
+            String modelName = camelize("model_" + name);
+            LOGGER.warn(name + " (model name matches existing language type) cannot be used as a model name. Renamed to " + modelName);
+            return modelName;
+        }
+        // camelize the model name
+        // phone_number => PhoneNumber
+        return camelize(name);
+    }
+
     @Override
     public String toModelFilename(String name) {
         // should be the same as the model name

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/PhpClientCodegen.java

@@ -483,7 +483,13 @@ public class PhpClientCodegen extends DefaultCodegen implements CodegenConfig {
 
         // add prefix and/or suffic only if name does not start wth \ (e.g. \DateTime)
         if (!name.matches("^\\\\.*")) {
-            name = modelNamePrefix + name + modelNameSuffix;
+            if (!StringUtils.isEmpty(modelNamePrefix)) {
+                name = modelNamePrefix + "_" + name;
+            }
+
+            if (!StringUtils.isEmpty(modelNameSuffix)) {
+                name = name + "_" + modelNameSuffix;
+            }
         }
 
         // camelize the model name

modules/swagger-codegen/src/main/resources/php/model.mustache

@@ -26,11 +26,10 @@ use \ArrayAccess;
 /**
  * {{classname}} Class Doc Comment
  *
- * @category    Class */
+ * @category    Class
 {{#description}}
- // @description {{description}}
+ * @description {{description}}
 {{/description}}
-/**
  * @package     {{invokerPackage}}
  * @author      Swagger Codegen team
  * @link        https://github.com/swagger-api/swagger-codegen

samples/client/petstore/java/okhttp-gson/.gitignore

@@ -0,0 +1,21 @@
+*.class
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+
+# exclude jar for gradle wrapper
+!gradle/wrapper/*.jar
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
+# build files
+**/target
+target
+.gradle
+build

samples/client/petstore/java/okhttp-gson/.swagger-codegen-ignore

@@ -0,0 +1,23 @@
+# Swagger Codegen Ignore
+# Generated by swagger-codegen https://github.com/swagger-api/swagger-codegen
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell Swagger Codgen to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md

samples/client/petstore/java/okhttp-gson/.travis.yml

@@ -0,0 +1,17 @@
+#
+# Generated by: https://github.com/swagger-api/swagger-codegen.git
+#
+language: java
+jdk:
+  - oraclejdk8
+  - oraclejdk7
+before_install:
+  # ensure gradlew has proper permission
+  - chmod a+x ./gradlew
+script:
+  # test using maven
+  - mvn test
+  # uncomment below to test using gradle
+  # - gradle test
+  # uncomment below to test using sbt 
+  # - sbt test

samples/client/petstore/php/SwaggerClient-php/lib/Model/AdditionalPropertiesClass.php

@@ -34,8 +34,7 @@ use \ArrayAccess;
 /**
  * AdditionalPropertiesClass Class Doc Comment
  *
- * @category    Class */
+ * @category    Class
-/**
  * @package     Swagger\Client
  * @author      Swagger Codegen team
  * @link        https://github.com/swagger-api/swagger-codegen

samples/client/petstore/php/SwaggerClient-php/lib/Model/Animal.php

@@ -34,8 +34,7 @@ use \ArrayAccess;
 /**
  * Animal Class Doc Comment
  *
- * @category    Class */
+ * @category    Class
-/**
  * @package     Swagger\Client
  * @author      Swagger Codegen team
  * @link        https://github.com/swagger-api/swagger-codegen

samples/client/petstore/php/SwaggerClient-php/lib/Model/AnimalFarm.php

@@ -34,8 +34,7 @@ use \ArrayAccess;
 /**
  * AnimalFarm Class Doc Comment
  *
- * @category    Class */
+ * @category    Class
-/**
  * @package     Swagger\Client
  * @author      Swagger Codegen team
  * @link        https://github.com/swagger-api/swagger-codegen

samples/client/petstore/php/SwaggerClient-php/lib/Model/ApiResponse.php

@@ -34,8 +34,7 @@ use \ArrayAccess;
 /**
  * ApiResponse Class Doc Comment
  *
- * @category    Class */
+ * @category    Class
-/**
  * @package     Swagger\Client
  * @author      Swagger Codegen team
  * @link        https://github.com/swagger-api/swagger-codegen

samples/client/petstore/php/SwaggerClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php

@@ -34,8 +34,7 @@ use \ArrayAccess;
 /**
  * ArrayOfArrayOfNumberOnly Class Doc Comment
  *
- * @category    Class */
+ * @category    Class
-/**
  * @package     Swagger\Client
  * @author      Swagger Codegen team
  * @link        https://github.com/swagger-api/swagger-codegen

samples/client/petstore/php/SwaggerClient-php/lib/Model/ArrayOfNumberOnly.php

@@ -34,8 +34,7 @@ use \ArrayAccess;
 /**
  * ArrayOfNumberOnly Class Doc Comment
  *
- * @category    Class */
+ * @category    Class
-/**
  * @package     Swagger\Client
  * @author      Swagger Codegen team
  * @link        https://github.com/swagger-api/swagger-codegen

samples/client/petstore/php/SwaggerClient-php/lib/Model/ArrayTest.php

@@ -34,8 +34,7 @@ use \ArrayAccess;
 /**
  * ArrayTest Class Doc Comment
  *
- * @category    Class */
+ * @category    Class
-/**
  * @package     Swagger\Client
  * @author      Swagger Codegen team
  * @link        https://github.com/swagger-api/swagger-codegen

samples/client/petstore/php/SwaggerClient-php/lib/Model/Cat.php

@@ -34,8 +34,7 @@ use \ArrayAccess;
 /**
  * Cat Class Doc Comment
  *
- * @category    Class */
+ * @category    Class
-/**
  * @package     Swagger\Client
  * @author      Swagger Codegen team
  * @link        https://github.com/swagger-api/swagger-codegen

samples/client/petstore/php/SwaggerClient-php/lib/Model/Category.php

@@ -34,8 +34,7 @@ use \ArrayAccess;
 /**
  * Category Class Doc Comment
  *
- * @category    Class */
+ * @category    Class
-/**
  * @package     Swagger\Client
  * @author      Swagger Codegen team
  * @link        https://github.com/swagger-api/swagger-codegen

samples/client/petstore/php/SwaggerClient-php/lib/Model/ClassModel.php

@@ -34,9 +34,8 @@ use \ArrayAccess;
 /**
  * ClassModel Class Doc Comment
  *
- * @category    Class */
+ * @category    Class
- // @description Model for testing model with \"_class\" property
+ * @description Model for testing model with \"_class\" property
-/**
  * @package     Swagger\Client
  * @author      Swagger Codegen team
  * @link        https://github.com/swagger-api/swagger-codegen

samples/client/petstore/php/SwaggerClient-php/lib/Model/Client.php

@@ -34,8 +34,7 @@ use \ArrayAccess;
 /**
  * Client Class Doc Comment
  *
- * @category    Class */
+ * @category    Class
-/**
  * @package     Swagger\Client
  * @author      Swagger Codegen team
  * @link        https://github.com/swagger-api/swagger-codegen

samples/client/petstore/php/SwaggerClient-php/lib/Model/Dog.php

@@ -34,8 +34,7 @@ use \ArrayAccess;
 /**
  * Dog Class Doc Comment
  *
- * @category    Class */
+ * @category    Class
-/**
  * @package     Swagger\Client
  * @author      Swagger Codegen team
  * @link        https://github.com/swagger-api/swagger-codegen

samples/client/petstore/php/SwaggerClient-php/lib/Model/EnumArrays.php

@@ -34,8 +34,7 @@ use \ArrayAccess;
 /**
  * EnumArrays Class Doc Comment
  *
- * @category    Class */
+ * @category    Class
-/**
  * @package     Swagger\Client
  * @author      Swagger Codegen team
  * @link        https://github.com/swagger-api/swagger-codegen

samples/client/petstore/php/SwaggerClient-php/lib/Model/EnumClass.php

@@ -34,8 +34,7 @@ use \ArrayAccess;
 /**
  * EnumClass Class Doc Comment
  *
- * @category    Class */
+ * @category    Class
-/**
  * @package     Swagger\Client
  * @author      Swagger Codegen team
  * @link        https://github.com/swagger-api/swagger-codegen

samples/client/petstore/php/SwaggerClient-php/lib/Model/EnumTest.php

@@ -34,8 +34,7 @@ use \ArrayAccess;
 /**
  * EnumTest Class Doc Comment
  *
- * @category    Class */
+ * @category    Class
-/**
  * @package     Swagger\Client
  * @author      Swagger Codegen team
  * @link        https://github.com/swagger-api/swagger-codegen

samples/client/petstore/php/SwaggerClient-php/lib/Model/FormatTest.php

@@ -34,8 +34,7 @@ use \ArrayAccess;
 /**
  * FormatTest Class Doc Comment
  *
- * @category    Class */
+ * @category    Class
-/**
  * @package     Swagger\Client
  * @author      Swagger Codegen team
  * @link        https://github.com/swagger-api/swagger-codegen

samples/client/petstore/php/SwaggerClient-php/lib/Model/HasOnlyReadOnly.php

@@ -34,8 +34,7 @@ use \ArrayAccess;
 /**
  * HasOnlyReadOnly Class Doc Comment
  *
- * @category    Class */
+ * @category    Class
-/**
  * @package     Swagger\Client
  * @author      Swagger Codegen team
  * @link        https://github.com/swagger-api/swagger-codegen

samples/client/petstore/php/SwaggerClient-php/lib/Model/MapTest.php

@@ -34,8 +34,7 @@ use \ArrayAccess;
 /**
  * MapTest Class Doc Comment
  *
- * @category    Class */
+ * @category    Class
-/**
  * @package     Swagger\Client
  * @author      Swagger Codegen team
  * @link        https://github.com/swagger-api/swagger-codegen

samples/client/petstore/php/SwaggerClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php

@@ -34,8 +34,7 @@ use \ArrayAccess;
 /**
  * MixedPropertiesAndAdditionalPropertiesClass Class Doc Comment
  *
- * @category    Class */
+ * @category    Class
-/**
  * @package     Swagger\Client
  * @author      Swagger Codegen team
  * @link        https://github.com/swagger-api/swagger-codegen

samples/client/petstore/php/SwaggerClient-php/lib/Model/Model200Response.php

@@ -34,9 +34,8 @@ use \ArrayAccess;
 /**
  * Model200Response Class Doc Comment
  *
- * @category    Class */
+ * @category    Class
- // @description Model for testing model name starting with number
+ * @description Model for testing model name starting with number
-/**
  * @package     Swagger\Client
  * @author      Swagger Codegen team
  * @link        https://github.com/swagger-api/swagger-codegen

samples/client/petstore/php/SwaggerClient-php/lib/Model/ModelList.php

@@ -34,8 +34,7 @@ use \ArrayAccess;
 /**
  * ModelList Class Doc Comment
  *
- * @category    Class */
+ * @category    Class
-/**
  * @package     Swagger\Client
  * @author      Swagger Codegen team
  * @link        https://github.com/swagger-api/swagger-codegen

samples/client/petstore/php/SwaggerClient-php/lib/Model/ModelReturn.php

@@ -34,9 +34,8 @@ use \ArrayAccess;
 /**
  * ModelReturn Class Doc Comment
  *
- * @category    Class */
+ * @category    Class
- // @description Model for testing reserved words
+ * @description Model for testing reserved words
-/**
  * @package     Swagger\Client
  * @author      Swagger Codegen team
  * @link        https://github.com/swagger-api/swagger-codegen

samples/client/petstore/php/SwaggerClient-php/lib/Model/Name.php

@@ -34,9 +34,8 @@ use \ArrayAccess;
 /**
  * Name Class Doc Comment
  *
- * @category    Class */
+ * @category    Class
- // @description Model for testing model name same as property name
+ * @description Model for testing model name same as property name
-/**
  * @package     Swagger\Client
  * @author      Swagger Codegen team
  * @link        https://github.com/swagger-api/swagger-codegen

samples/client/petstore/php/SwaggerClient-php/lib/Model/NumberOnly.php

@@ -34,8 +34,7 @@ use \ArrayAccess;
 /**
  * NumberOnly Class Doc Comment
  *
- * @category    Class */
+ * @category    Class
-/**
  * @package     Swagger\Client
  * @author      Swagger Codegen team
  * @link        https://github.com/swagger-api/swagger-codegen

samples/client/petstore/php/SwaggerClient-php/lib/Model/Order.php

@@ -34,8 +34,7 @@ use \ArrayAccess;
 /**
  * Order Class Doc Comment
  *
- * @category    Class */
+ * @category    Class
-/**
  * @package     Swagger\Client
  * @author      Swagger Codegen team
  * @link        https://github.com/swagger-api/swagger-codegen

samples/client/petstore/php/SwaggerClient-php/lib/Model/OuterEnum.php

@@ -34,8 +34,7 @@ use \ArrayAccess;
 /**
  * OuterEnum Class Doc Comment
  *
- * @category    Class */
+ * @category    Class
-/**
  * @package     Swagger\Client
  * @author      Swagger Codegen team
  * @link        https://github.com/swagger-api/swagger-codegen

samples/client/petstore/php/SwaggerClient-php/lib/Model/Pet.php

@@ -34,8 +34,7 @@ use \ArrayAccess;
 /**
  * Pet Class Doc Comment
  *
- * @category    Class */
+ * @category    Class
-/**
  * @package     Swagger\Client
  * @author      Swagger Codegen team
  * @link        https://github.com/swagger-api/swagger-codegen

samples/client/petstore/php/SwaggerClient-php/lib/Model/ReadOnlyFirst.php

@@ -34,8 +34,7 @@ use \ArrayAccess;
 /**
  * ReadOnlyFirst Class Doc Comment
  *
- * @category    Class */
+ * @category    Class
-/**
  * @package     Swagger\Client
  * @author      Swagger Codegen team
  * @link        https://github.com/swagger-api/swagger-codegen

samples/client/petstore/php/SwaggerClient-php/lib/Model/SpecialModelName.php

@@ -34,8 +34,7 @@ use \ArrayAccess;
 /**
  * SpecialModelName Class Doc Comment
  *
- * @category    Class */
+ * @category    Class
-/**
  * @package     Swagger\Client
  * @author      Swagger Codegen team
  * @link        https://github.com/swagger-api/swagger-codegen

samples/client/petstore/php/SwaggerClient-php/lib/Model/Tag.php

@@ -34,8 +34,7 @@ use \ArrayAccess;
 /**
  * Tag Class Doc Comment
  *
- * @category    Class */
+ * @category    Class
-/**
  * @package     Swagger\Client
  * @author      Swagger Codegen team
  * @link        https://github.com/swagger-api/swagger-codegen

samples/client/petstore/php/SwaggerClient-php/lib/Model/User.php

@@ -34,8 +34,7 @@ use \ArrayAccess;
 /**
  * User Class Doc Comment
  *
- * @category    Class */
+ * @category    Class
-/**
  * @package     Swagger\Client
  * @author      Swagger Codegen team
  * @link        https://github.com/swagger-api/swagger-codegen