Merge branch '3.0.0' into 3.0.0

Author: SlavchoArsovski

modules/swagger-codegen/src/main/java/io/swagger/codegen/v3/CodegenConstants.java

@@ -251,6 +251,7 @@ public static enum ENUM_PROPERTY_NAMING_TYPE {camelCase, PascalCase, snake_case,
     public static final String HAS_INNER_OBJECT_NAME = PREFIX_HAS + "inner-object";
 
     public static final String IS_SIMPLE_TYPE_EXT_NAME = PREFIX_IS + "simple-type";
+    public static final String IS_NULLABLE_EXT_NAME = PREFIX_IS + "nullable";
     public static final String IS_PRIMITIVE_TYPE_EXT_NAME = PREFIX_IS + "primitive-type";
     public static final String IS_OBJECT_EXT_NAME = PREFIX_IS + "object";
     public static final String IS_CONTAINER_EXT_NAME = PREFIX_IS + "container";

modules/swagger-codegen/src/main/java/io/swagger/codegen/v3/CodegenObject.java

@@ -136,6 +136,10 @@ public Boolean getIsReadOnly() {
         return getBooleanValue(CodegenConstants.IS_READ_ONLY_EXT_NAME);
     }
 
+    public Boolean getIsNullable() {
+        return getBooleanValue(CodegenConstants.IS_NULLABLE_EXT_NAME);
+    }
+
     public Boolean getIsCollectionFormatMulti() {
         return getBooleanValue(CodegenConstants.IS_COLLECTION_FORMAT_MULTI_EXT_NAME);
     }

samples/client/petstore/kotlin/.swagger-codegen/VERSION

@@ -1 +1 @@
-3.0.19-SNAPSHOT
+3.0.25-SNAPSHOT

samples/client/petstore/kotlin/README.md

@@ -2,8 +2,8 @@
 
 ## Requires
 
-* Kotlin 1.1.2
-* Gradle 3.3
+* Kotlin 1.4.30
+* Gradle 5.3
 
 ## Build
 
@@ -38,6 +38,7 @@ Class | Method | HTTP request | Description
 *DefaultApi* | [**testMethod**](docs/DefaultApi.md#testmethod) | **GET** /test | 
 *PetApi* | [**addPet**](docs/PetApi.md#addpet) | **POST** /pet | Add a new pet to the store
 *PetApi* | [**deletePet**](docs/PetApi.md#deletepet) | **DELETE** /pet/{petId} | Deletes a pet
+*PetApi* | [**doCategoryStuff**](docs/PetApi.md#docategorystuff) | **POST** /pet/category | 
 *PetApi* | [**findPetsByStatus**](docs/PetApi.md#findpetsbystatus) | **GET** /pet/findByStatus | Finds Pets by status
 *PetApi* | [**findPetsByTags**](docs/PetApi.md#findpetsbytags) | **GET** /pet/findByTags | Finds Pets by tags
 *PetApi* | [**getAllPets**](docs/PetApi.md#getallpets) | **GET** /allPets | 
@@ -62,6 +63,8 @@ Class | Method | HTTP request | Description
 <a name="documentation-for-models"></a>
 ## Documentation for Models
 
+ - [io.swagger.client.models.AllOfSubCategoryCategory](docs/AllOfSubCategoryCategory.md)
+ - [io.swagger.client.models.AllOfSubCategoryPetsItems](docs/AllOfSubCategoryPetsItems.md)
  - [io.swagger.client.models.AllPetsResponse](docs/AllPetsResponse.md)
  - [io.swagger.client.models.ApiResponse](docs/ApiResponse.md)
  - [io.swagger.client.models.Body](docs/Body.md)
@@ -74,6 +77,7 @@ Class | Method | HTTP request | Description
  - [io.swagger.client.models.Order](docs/Order.md)
  - [io.swagger.client.models.Pet](docs/Pet.md)
  - [io.swagger.client.models.SinglePetResponse](docs/SinglePetResponse.md)
+ - [io.swagger.client.models.SubCategory](docs/SubCategory.md)
  - [io.swagger.client.models.Tag](docs/Tag.md)
  - [io.swagger.client.models.Test](docs/Test.md)
  - [io.swagger.client.models.User](docs/User.md)
@@ -96,5 +100,6 @@ Class | Method | HTTP request | Description
 - **Flow**: implicit
 - **Authorization URL**: http://petstore.swagger.io/oauth/dialog
 - **Scopes**: 
-  - : 
+  - write:pets: modify pets in your account
+  - read:pets: read your pets
 

samples/client/petstore/kotlin/build.gradle

@@ -1,16 +1,16 @@
 group 'io.swagger'
 version '1.0.0'
 
-task wrapper(type: Wrapper) {
-    gradleVersion = '3.3'
+wrapper {
+    gradleVersion = '5.3'
     distributionUrl = "https://services.gradle.org/distributions/gradle-$gradleVersion-all.zip"
 }
 
 buildscript {
-    ext.kotlin_version = '1.1.2'
+    ext.kotlin_version = '1.4.30'
 
     repositories {
-        mavenCentral()
+        maven { url "https://repo1.maven.org/maven2" }
     }
     dependencies {
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
@@ -20,14 +20,14 @@ buildscript {
 apply plugin: 'kotlin'
 
 repositories {
-    mavenCentral()
+    maven { url "https://repo1.maven.org/maven2" }
 }
 
 dependencies {
-    compile "org.jetbrains.kotlin:kotlin-stdlib-jre8:$kotlin_version"
-    compile "com.squareup.moshi:moshi-kotlin:1.5.0"
-    compile "com.squareup.moshi:moshi-adapters:1.5.0"
-    compile "com.squareup.okhttp3:okhttp:3.8.0"
-    compile "org.threeten:threetenbp:1.3.6"
-    testCompile "io.kotlintest:kotlintest:2.0.2"
-}
+    compile "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
+    compile "org.jetbrains.kotlin:kotlin-reflect:$kotlin_version"
+    compile "com.squareup.moshi:moshi-kotlin:1.11.0"
+    compile "com.squareup.moshi:moshi-adapters:1.11.0"
+    compile "com.squareup.okhttp3:okhttp:4.9.0"
+    testCompile "io.kotlintest:kotlintest:2.0.7"
+}

samples/client/petstore/kotlin/docs/AllOfSubCategoryCategory.md

@@ -0,0 +1,9 @@
+# AllOfSubCategoryCategory
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**foo** | [**kotlin.Boolean**](.md) |  |  [optional]
+**bar** | [**kotlin.Int**](.md) |  |  [optional]
+**beer** | [**kotlin.String**](.md) |  |  [optional]
+**drunk** | [**User**](User.md) |  |  [optional]

samples/client/petstore/kotlin/docs/AllOfSubCategoryPetsItems.md

@@ -0,0 +1,5 @@
+# AllOfSubCategoryPetsItems
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------

samples/client/petstore/kotlin/docs/PetApi.md

@@ -6,6 +6,7 @@ Method | HTTP request | Description
 ------------- | ------------- | -------------
 [**addPet**](PetApi.md#addPet) | **POST** /pet | Add a new pet to the store
 [**deletePet**](PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet
+[**doCategoryStuff**](PetApi.md#doCategoryStuff) | **POST** /pet/category | 
 [**findPetsByStatus**](PetApi.md#findPetsByStatus) | **GET** /pet/findByStatus | Finds Pets by status
 [**findPetsByTags**](PetApi.md#findPetsByTags) | **GET** /pet/findByTags | Finds Pets by tags
 [**getAllPets**](PetApi.md#getAllPets) | **GET** /allPets | 
@@ -105,6 +106,51 @@ null (empty response body)
  - **Content-Type**: Not defined
  - **Accept**: Not defined
 
+<a name="doCategoryStuff"></a>
+# **doCategoryStuff**
+> ApiResponse doCategoryStuff(body)
+
+
+
+### Example
+```kotlin
+// Import classes:
+//import io.swagger.client.infrastructure.*
+//import io.swagger.client.models.*;
+
+val apiInstance = PetApi()
+val body : SubCategory =  // SubCategory | 
+try {
+    val result : ApiResponse = apiInstance.doCategoryStuff(body)
+    println(result)
+} catch (e: ClientException) {
+    println("4xx response calling PetApi#doCategoryStuff")
+    e.printStackTrace()
+} catch (e: ServerException) {
+    println("5xx response calling PetApi#doCategoryStuff")
+    e.printStackTrace()
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**SubCategory**](SubCategory.md)|  | [optional]
+
+### Return type
+
+[**ApiResponse**](ApiResponse.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: application/json
+ - **Accept**: application/json
+
 <a name="findPetsByStatus"></a>
 # **findPetsByStatus**
 > kotlin.Array&lt;Pet&gt; findPetsByStatus(status)

samples/client/petstore/kotlin/docs/SubCategory.md

@@ -0,0 +1,8 @@
+# SubCategory
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**category** | [**AllOfSubCategoryCategory**](AllOfSubCategoryCategory.md) |  |  [optional]
+**category2** | [**Category**](Category.md) |  |  [optional]
+**pets** | [**kotlin.Array<AllOfSubCategoryPetsItems>**](.md) |  |  [optional]