Merge pull request #3177 from wing328/fix_java_class_property

[Java] fix property name "class"

Author: wing328

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

@@ -471,6 +471,10 @@ public String toVarName(String name) {
         // sanitize name
         name = sanitizeName(name); // FIXME: a parameter should not be assigned. Also declare the methods parameters as 'final'.
 
+        if ("class".equals(name.toLowerCase())) {
+            return "PropertyClass";
+        }
+
         if("_".equals(name)) {
           name = "_u";
         }

modules/swagger-codegen/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml

@@ -834,6 +834,8 @@ definitions:
       name:
         type: integer
         format: int32
+      class:
+        type: string 
     xml:
       name: Name
   Dog:

samples/client/petstore/java/default/.gitignore

@@ -13,3 +13,9 @@
 
 # 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/default/.swagger-codegen-ignore

@@ -14,7 +14,7 @@
 
 # You can recursively match patterns against a directory, file or extension with a double asterisk (**):
 #foo/**/qux
-# Thsi matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/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:

samples/client/petstore/java/default/docs/Model200Response.md

@@ -5,6 +5,7 @@
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
 **name** | **Integer** |  |  [optional]
+**PropertyClass** | **String** |  |  [optional]
 
 
 

samples/client/petstore/java/default/hello.txt

@@ -15,6 +15,7 @@
 public class Model200Response   {
 
   private Integer name = null;
+  private String PropertyClass = null;
 
 
   /**
@@ -34,6 +35,23 @@ public void setName(Integer name) {
   }
 
 
+  /**
+   **/
+  public Model200Response PropertyClass(String PropertyClass) {
+    this.PropertyClass = PropertyClass;
+    return this;
+  }
+  
+  @ApiModelProperty(example = "null", value = "")
+  @JsonProperty("class")
+  public String getPropertyClass() {
+    return PropertyClass;
+  }
+  public void setPropertyClass(String PropertyClass) {
+    this.PropertyClass = PropertyClass;
+  }
+
+
   @Override
   public boolean equals(java.lang.Object o) {
     if (this == o) {
@@ -43,12 +61,13 @@ public boolean equals(java.lang.Object o) {
       return false;
     }
     Model200Response _200Response = (Model200Response) o;
-    return Objects.equals(this.name, _200Response.name);
+    return Objects.equals(this.name, _200Response.name) &&
+        Objects.equals(this.PropertyClass, _200Response.PropertyClass);
   }
 
   @Override
   public int hashCode() {
-    return Objects.hash(name);
+    return Objects.hash(name, PropertyClass);
   }
 
   @Override
@@ -57,6 +76,7 @@ public String toString() {
     sb.append("class Model200Response {\n");
 
     sb.append("    name: ").append(toIndentedString(name)).append("\n");
+    sb.append("    PropertyClass: ").append(toIndentedString(PropertyClass)).append("\n");
     sb.append("}");
     return sb.toString();
   }

samples/client/petstore/java/default/src/main/java/io/swagger/client/model/Model200Response.java

@@ -13,3 +13,9 @@
 
 # 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/feign/.gitignore

@@ -41,10 +41,10 @@ public ApiClient(String[] authNames) {
     this();
     for(String authName : authNames) { 
       RequestInterceptor auth;
-      if (authName == "petstore_auth") { 
-        auth = new OAuth(OAuthFlow.implicit, "http://petstore.swagger.io/api/oauth/dialog", "", "write:pets, read:pets");
-      } else if (authName == "api_key") { 
+      if (authName == "api_key") { 
         auth = new ApiKeyAuth("header", "api_key");
+      } else if (authName == "petstore_auth") { 
+        auth = new OAuth(OAuthFlow.implicit, "http://petstore.swagger.io/api/oauth/dialog", "", "write:pets, read:pets");
       } else {
         throw new RuntimeException("auth name \"" + authName + "\" not found in available auth names");
       }

samples/client/petstore/java/feign/src/main/java/io/swagger/client/ApiClient.java

@@ -1,3 +1,28 @@
+/**
+ * Swagger Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\ 
+ *
+ * OpenAPI spec version: 1.0.0
+ * Contact: [email protected]
+ *
+ * NOTE: This class is auto generated by the swagger code generator program.
+ * https://github.com/swagger-api/swagger-codegen.git
+ * Do not edit the class manually.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
 package io.swagger.client;