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
2017-01-23 01:29:11 +08:00
parent 2e50a65a1c
commit 8e71dfb512
38 changed files with 193 additions and 148 deletions
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/AdditionalPropertiesClass.php
+++ b/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
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Animal.php
+++ b/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
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/AnimalFarm.php
+++ b/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
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/ApiResponse.php
+++ b/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
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/ArrayOfArrayOfNumberOnly.php
+++ b/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
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/ArrayOfNumberOnly.php
+++ b/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
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/ArrayTest.php
+++ b/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
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Cat.php
+++ b/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
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Category.php
+++ b/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
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/ClassModel.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/ClassModel.php
@@ -34,9 +34,8 @@ use \ArrayAccess;
 /**
 * ClassModel Class Doc Comment
 *
- * @category    Class */
- // @description Model for testing model with \&quot;_class\&quot; property
-/**
+ * @category    Class
+ * @description Model for testing model with \&quot;_class\&quot; property
 * @package     Swagger\Client
 * @author      Swagger Codegen team
 * @link        https://github.com/swagger-api/swagger-codegen
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Client.php
+++ b/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
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Dog.php
+++ b/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
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/EnumArrays.php
+++ b/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
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/EnumClass.php
+++ b/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
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/EnumTest.php
+++ b/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
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/FormatTest.php
+++ b/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
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/HasOnlyReadOnly.php
+++ b/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
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/MapTest.php
+++ b/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
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/MixedPropertiesAndAdditionalPropertiesClass.php
+++ b/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
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Model200Response.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Model200Response.php
@@ -34,9 +34,8 @@ use \ArrayAccess;
 /**
 * Model200Response Class Doc Comment
 *
- * @category    Class */
- // @description Model for testing model name starting with number
-/**
+ * @category    Class
+ * @description Model for testing model name starting with number
 * @package     Swagger\Client
 * @author      Swagger Codegen team
 * @link        https://github.com/swagger-api/swagger-codegen
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/ModelList.php
+++ b/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
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/ModelReturn.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/ModelReturn.php
@@ -34,9 +34,8 @@ use \ArrayAccess;
 /**
 * ModelReturn Class Doc Comment
 *
- * @category    Class */
- // @description Model for testing reserved words
-/**
+ * @category    Class
+ * @description Model for testing reserved words
 * @package     Swagger\Client
 * @author      Swagger Codegen team
 * @link        https://github.com/swagger-api/swagger-codegen
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Name.php
+++ b/samples/client/petstore/php/SwaggerClient-php/lib/Model/Name.php
@@ -34,9 +34,8 @@ use \ArrayAccess;
 /**
 * Name Class Doc Comment
 *
- * @category    Class */
- // @description Model for testing model name same as property name
-/**
+ * @category    Class
+ * @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
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/NumberOnly.php
+++ b/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
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Order.php
+++ b/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
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/OuterEnum.php
+++ b/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
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Pet.php
+++ b/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
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/ReadOnlyFirst.php
+++ b/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
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/SpecialModelName.php
+++ b/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
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/Tag.php
+++ b/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
--- a/samples/client/petstore/php/SwaggerClient-php/lib/Model/User.php
+++ b/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