Merge remote-tracking branch 'origin/master' into 7.0.x

samples/client/petstore/java/okhttp-gson-group-parameter/README.md

@@ -139,9 +139,12 @@ Class | Method | HTTP request | Description
  - [User](docs/User.md)
 
 
+<a id="documentation-for-authorization"></a>
 ## Documentation for Authorization
 
+
 Authentication schemes defined for the API:
+<a id="petstore_auth"></a>
 ### petstore_auth
 
 - **Type**: OAuth
@@ -151,6 +154,7 @@ Authentication schemes defined for the API:
   - write:pets: modify pets in your account
   - read:pets: read your pets
 
+<a id="api_key"></a>
 ### api_key
 
 - **Type**: API key

samples/client/petstore/java/okhttp-gson-group-parameter/docs/PetApi.md

@@ -14,7 +14,7 @@ All URIs are relative to *http://petstore.swagger.io/v2*
 | [**uploadFile**](PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image |
 
 
-<a name="addPet"></a>
+<a id="addPet"></a>
 # **addPet**
 > Pet addPet(pet).execute();
 
@@ -83,7 +83,7 @@ public class Example {
 | **200** | successful operation |  -  |
 | **405** | Invalid input |  -  |
 
-<a name="deletePet"></a>
+<a id="deletePet"></a>
 # **deletePet**
 > deletePet(petId).apiKey(apiKey).execute();
 
@@ -153,7 +153,7 @@ null (empty response body)
 |-------------|-------------|------------------|
 | **400** | Invalid pet value |  -  |
 
-<a name="findPetsByStatus"></a>
+<a id="findPetsByStatus"></a>
 # **findPetsByStatus**
 > List&lt;Pet&gt; findPetsByStatus(status).execute();
 
@@ -222,7 +222,7 @@ public class Example {
 | **200** | successful operation |  -  |
 | **400** | Invalid status value |  -  |
 
-<a name="findPetsByTags"></a>
+<a id="findPetsByTags"></a>
 # **findPetsByTags**
 > List&lt;Pet&gt; findPetsByTags(tags).execute();
 
@@ -291,7 +291,7 @@ public class Example {
 | **200** | successful operation |  -  |
 | **400** | Invalid tag value |  -  |
 
-<a name="getPetById"></a>
+<a id="getPetById"></a>
 # **getPetById**
 > Pet getPetById(petId).execute();
 
@@ -363,7 +363,7 @@ public class Example {
 | **400** | Invalid ID supplied |  -  |
 | **404** | Pet not found |  -  |
 
-<a name="updatePet"></a>
+<a id="updatePet"></a>
 # **updatePet**
 > Pet updatePet(pet).execute();
 
@@ -434,7 +434,7 @@ public class Example {
 | **404** | Pet not found |  -  |
 | **405** | Validation exception |  -  |
 
-<a name="updatePetWithForm"></a>
+<a id="updatePetWithForm"></a>
 # **updatePetWithForm**
 > updatePetWithForm(petId, name, status)
 
@@ -504,7 +504,7 @@ null (empty response body)
 |-------------|-------------|------------------|
 | **405** | Invalid input |  -  |
 
-<a name="uploadFile"></a>
+<a id="uploadFile"></a>
 # **uploadFile**
 > ModelApiResponse uploadFile(petId).additionalMetadata(additionalMetadata)._file(_file).execute();
 

samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/Configuration.java

@@ -15,6 +15,8 @@ package org.openapitools.client;
 
 @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
 public class Configuration {
+    public static final String VERSION = "1.0.0";
+
     private static ApiClient defaultApiClient = new ApiClient();
 
     /**

samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/Category.java

@@ -32,6 +32,10 @@ import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
 import com.google.gson.TypeAdapterFactory;
 import com.google.gson.reflect.TypeToken;
+import com.google.gson.TypeAdapter;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import java.io.IOException;
 
 import java.lang.reflect.Type;
 import java.util.HashMap;
@@ -70,7 +74,6 @@ public class Category {
    * @return id
   **/
   @javax.annotation.Nullable
-
   public Long getId() {
     return id;
   }
@@ -92,7 +95,6 @@ public class Category {
    * @return name
   **/
   @javax.annotation.Nullable
-
   public String getName() {
     return name;
   }

samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/ModelApiResponse.java

@@ -32,6 +32,10 @@ import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
 import com.google.gson.TypeAdapterFactory;
 import com.google.gson.reflect.TypeToken;
+import com.google.gson.TypeAdapter;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import java.io.IOException;
 
 import java.lang.reflect.Type;
 import java.util.HashMap;
@@ -74,7 +78,6 @@ public class ModelApiResponse {
    * @return code
   **/
   @javax.annotation.Nullable
-
   public Integer getCode() {
     return code;
   }
@@ -96,7 +99,6 @@ public class ModelApiResponse {
    * @return type
   **/
   @javax.annotation.Nullable
-
   public String getType() {
     return type;
   }
@@ -118,7 +120,6 @@ public class ModelApiResponse {
    * @return message
   **/
   @javax.annotation.Nullable
-
   public String getMessage() {
     return message;
   }

samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/Order.java

@@ -33,6 +33,10 @@ import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
 import com.google.gson.TypeAdapterFactory;
 import com.google.gson.reflect.TypeToken;
+import com.google.gson.TypeAdapter;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import java.io.IOException;
 
 import java.lang.reflect.Type;
 import java.util.HashMap;
@@ -136,7 +140,6 @@ public class Order {
    * @return id
   **/
   @javax.annotation.Nullable
-
   public Long getId() {
     return id;
   }
@@ -158,7 +161,6 @@ public class Order {
    * @return petId
   **/
   @javax.annotation.Nullable
-
   public Long getPetId() {
     return petId;
   }
@@ -180,7 +182,6 @@ public class Order {
    * @return quantity
   **/
   @javax.annotation.Nullable
-
   public Integer getQuantity() {
     return quantity;
   }
@@ -202,7 +203,6 @@ public class Order {
    * @return shipDate
   **/
   @javax.annotation.Nullable
-
   public OffsetDateTime getShipDate() {
     return shipDate;
   }
@@ -224,7 +224,6 @@ public class Order {
    * @return status
   **/
   @javax.annotation.Nullable
-
   public StatusEnum getStatus() {
     return status;
   }
@@ -246,7 +245,6 @@ public class Order {
    * @return complete
   **/
   @javax.annotation.Nullable
-
   public Boolean getComplete() {
     return complete;
   }

samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/Pet.java

@@ -36,6 +36,10 @@ import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
 import com.google.gson.TypeAdapterFactory;
 import com.google.gson.reflect.TypeToken;
+import com.google.gson.TypeAdapter;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import java.io.IOException;
 
 import java.lang.reflect.Type;
 import java.util.HashMap;
@@ -122,6 +126,7 @@ public class Pet {
   }
 
   public static final String SERIALIZED_NAME_STATUS = "status";
+  @Deprecated
   @SerializedName(SERIALIZED_NAME_STATUS)
   private StatusEnum status;
 
@@ -139,7 +144,6 @@ public class Pet {
    * @return id
   **/
   @javax.annotation.Nullable
-
   public Long getId() {
     return id;
   }
@@ -161,7 +165,6 @@ public class Pet {
    * @return category
   **/
   @javax.annotation.Nullable
-
   public Category getCategory() {
     return category;
   }
@@ -183,7 +186,6 @@ public class Pet {
    * @return name
   **/
   @javax.annotation.Nonnull
-
   public String getName() {
     return name;
   }
@@ -213,7 +215,6 @@ public class Pet {
    * @return photoUrls
   **/
   @javax.annotation.Nonnull
-
   public List<String> getPhotoUrls() {
     return photoUrls;
   }
@@ -243,7 +244,6 @@ public class Pet {
    * @return tags
   **/
   @javax.annotation.Nullable
-
   public List<Tag> getTags() {
     return tags;
   }
@@ -254,6 +254,7 @@ public class Pet {
   }
 
 
+  @Deprecated
   public Pet status(StatusEnum status) {
     
     this.status = status;
@@ -267,12 +268,12 @@ public class Pet {
   **/
   @Deprecated
   @javax.annotation.Nullable
-
   public StatusEnum getStatus() {
     return status;
   }
 
 
+  @Deprecated
   public void setStatus(StatusEnum status) {
     this.status = status;
   }

samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/Tag.java

@@ -32,6 +32,10 @@ import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
 import com.google.gson.TypeAdapterFactory;
 import com.google.gson.reflect.TypeToken;
+import com.google.gson.TypeAdapter;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import java.io.IOException;
 
 import java.lang.reflect.Type;
 import java.util.HashMap;
@@ -70,7 +74,6 @@ public class Tag {
    * @return id
   **/
   @javax.annotation.Nullable
-
   public Long getId() {
     return id;
   }
@@ -92,7 +95,6 @@ public class Tag {
    * @return name
   **/
   @javax.annotation.Nullable
-
   public String getName() {
     return name;
   }

samples/client/petstore/java/okhttp-gson-group-parameter/src/main/java/org/openapitools/client/model/User.java

@@ -32,6 +32,10 @@ import com.google.gson.JsonObject;
 import com.google.gson.JsonParseException;
 import com.google.gson.TypeAdapterFactory;
 import com.google.gson.reflect.TypeToken;
+import com.google.gson.TypeAdapter;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import java.io.IOException;
 
 import java.lang.reflect.Type;
 import java.util.HashMap;
@@ -94,7 +98,6 @@ public class User {
    * @return id
   **/
   @javax.annotation.Nullable
-
   public Long getId() {
     return id;
   }
@@ -116,7 +119,6 @@ public class User {
    * @return username
   **/
   @javax.annotation.Nullable
-
   public String getUsername() {
     return username;
   }
@@ -138,7 +140,6 @@ public class User {
    * @return firstName
   **/
   @javax.annotation.Nullable
-
   public String getFirstName() {
     return firstName;
   }
@@ -160,7 +161,6 @@ public class User {
    * @return lastName
   **/
   @javax.annotation.Nullable
-
   public String getLastName() {
     return lastName;
   }
@@ -182,7 +182,6 @@ public class User {
    * @return email
   **/
   @javax.annotation.Nullable
-
   public String getEmail() {
     return email;
   }
@@ -204,7 +203,6 @@ public class User {
    * @return password
   **/
   @javax.annotation.Nullable
-
   public String getPassword() {
     return password;
   }
@@ -226,7 +224,6 @@ public class User {
    * @return phone
   **/
   @javax.annotation.Nullable
-
   public String getPhone() {
     return phone;
   }
@@ -248,7 +245,6 @@ public class User {
    * @return userStatus
   **/
   @javax.annotation.Nullable
-
   public Integer getUserStatus() {
     return userStatus;
   }