[Java] add tests when field is nullable and required

Author: fanqiewanzi

modules/openapi-generator/src/test/resources/3_0/java/petstore-with-fake-endpoints-models-for-testing-okhttp-gson.yaml

@@ -1369,6 +1369,19 @@ paths:
                 $ref: '#/components/schemas/Variable'
         '400':
           description: Invalid Value
+  /fake/required-nullable-body:
+    get:
+      tags:
+        - fake
+      summary: fields in the response body, required and nullable are both true
+      description: ''
+      responses:
+        '200':
+          description: success
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RequiredNullableBody'
 servers:
   - url: 'http://{server}.swagger.io:{port}/v2'
     description: petstore server
@@ -2768,6 +2781,38 @@ components:
           $ref: '#/components/schemas/ArrayOneOf'
         anyof_prop:
           $ref: '#/components/schemas/ArrayAnyOf'
+    NullableEnum:
+      type: string
+      nullable: true
+      enum:
+        - custom
+    RequiredNullableBody:
+      allOf:
+        - $ref: '#/components/schemas/NullableClass'
+        - type: object
+          required:
+            - custom_ref_enum
+            - custom_enum
+            - integer_prop
+            - number_prop
+            - boolean_prop
+            - string_prop
+            - date_prop
+            - datetime_prop
+            - array_nullable_prop
+            - array_and_items_nullable_prop
+            - array_items_nullable
+            - object_nullable_prop
+            - object_and_items_nullable_prop
+            - object_items_nullable
+          properties:
+            custom_ref_enum:
+              $ref: "#/components/schemas/NullableEnum"
+            custom_enum:
+              type: string
+              nullable: true
+              enum:
+                - custom
     NestedArrayWithDefaultValues:
       type: object
       properties:

samples/client/petstore/java/okhttp-gson/.openapi-generator/FILES

@@ -79,6 +79,7 @@ docs/NewPet.md
 docs/NewPetCategoryInlineAllof.md
 docs/NewPetCategoryInlineAllofAllOfCategoryTag.md
 docs/NullableClass.md
+docs/NullableEnum.md
 docs/NullableShape.md
 docs/NumberOnly.md
 docs/ObjectWithDeprecatedFields.md
@@ -100,6 +101,7 @@ docs/PropertyNameCollision.md
 docs/Quadrilateral.md
 docs/QuadrilateralInterface.md
 docs/ReadOnlyFirst.md
+docs/RequiredNullableBody.md
 docs/Scalar.md
 docs/ScalarAnyOf.md
 docs/ScaleneTriangle.md
@@ -228,6 +230,7 @@ src/main/java/org/openapitools/client/model/NewPet.java
 src/main/java/org/openapitools/client/model/NewPetCategoryInlineAllof.java
 src/main/java/org/openapitools/client/model/NewPetCategoryInlineAllofAllOfCategoryTag.java
 src/main/java/org/openapitools/client/model/NullableClass.java
+src/main/java/org/openapitools/client/model/NullableEnum.java
 src/main/java/org/openapitools/client/model/NullableShape.java
 src/main/java/org/openapitools/client/model/NumberOnly.java
 src/main/java/org/openapitools/client/model/ObjectWithDeprecatedFields.java
@@ -248,6 +251,7 @@ src/main/java/org/openapitools/client/model/PropertyNameCollision.java
 src/main/java/org/openapitools/client/model/Quadrilateral.java
 src/main/java/org/openapitools/client/model/QuadrilateralInterface.java
 src/main/java/org/openapitools/client/model/ReadOnlyFirst.java
+src/main/java/org/openapitools/client/model/RequiredNullableBody.java
 src/main/java/org/openapitools/client/model/Scalar.java
 src/main/java/org/openapitools/client/model/ScalarAnyOf.java
 src/main/java/org/openapitools/client/model/ScaleneTriangle.java
@@ -265,3 +269,5 @@ src/main/java/org/openapitools/client/model/Value.java
 src/main/java/org/openapitools/client/model/Variable.java
 src/main/java/org/openapitools/client/model/Whale.java
 src/main/java/org/openapitools/client/model/Zebra.java
+src/test/java/org/openapitools/client/model/NullableEnumTest.java
+src/test/java/org/openapitools/client/model/RequiredNullableBodyTest.java

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

@@ -127,6 +127,7 @@ Class | Method | HTTP request | Description
 *FakeApi* | [**fakeOuterNumberSerialize**](docs/FakeApi.md#fakeOuterNumberSerialize) | **POST** /fake/outer/number | 
 *FakeApi* | [**fakeOuterStringSerialize**](docs/FakeApi.md#fakeOuterStringSerialize) | **POST** /fake/outer/string | 
 *FakeApi* | [**fakeRefParameter**](docs/FakeApi.md#fakeRefParameter) | **POST** /fake/pet/{petId}/reference/parameter | fake reference parameter
+*FakeApi* | [**fakeRequiredNullableBodyGet**](docs/FakeApi.md#fakeRequiredNullableBodyGet) | **GET** /fake/required-nullable-body | fields in the response body, required and nullable are both true
 *FakeApi* | [**fakeUploadRefRequestBodies**](docs/FakeApi.md#fakeUploadRefRequestBodies) | **POST** /fake/pet/{petId}/uploadImage | fake reference parameter
 *FakeApi* | [**getFakeArrayofenums**](docs/FakeApi.md#getFakeArrayofenums) | **GET** /fake/array-of-enums | Array of Enums
 *FakeApi* | [**getFakeHealth**](docs/FakeApi.md#getFakeHealth) | **GET** /fake/health | Health check endpoint
@@ -240,6 +241,7 @@ Class | Method | HTTP request | Description
  - [NewPetCategoryInlineAllof](docs/NewPetCategoryInlineAllof.md)
  - [NewPetCategoryInlineAllofAllOfCategoryTag](docs/NewPetCategoryInlineAllofAllOfCategoryTag.md)
  - [NullableClass](docs/NullableClass.md)
+ - [NullableEnum](docs/NullableEnum.md)
  - [NullableShape](docs/NullableShape.md)
  - [NumberOnly](docs/NumberOnly.md)
  - [ObjectWithDeprecatedFields](docs/ObjectWithDeprecatedFields.md)
@@ -260,6 +262,7 @@ Class | Method | HTTP request | Description
  - [Quadrilateral](docs/Quadrilateral.md)
  - [QuadrilateralInterface](docs/QuadrilateralInterface.md)
  - [ReadOnlyFirst](docs/ReadOnlyFirst.md)
+ - [RequiredNullableBody](docs/RequiredNullableBody.md)
  - [Scalar](docs/Scalar.md)
  - [ScalarAnyOf](docs/ScalarAnyOf.md)
  - [ScaleneTriangle](docs/ScaleneTriangle.md)

samples/client/petstore/java/okhttp-gson/api/openapi.yaml

@@ -1494,6 +1494,21 @@ paths:
       x-internal: true
       x-accepts:
       - application/json
+  /fake/required-nullable-body:
+    get:
+      description: ""
+      responses:
+        "200":
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/RequiredNullableBody'
+          description: success
+      summary: "fields in the response body, required and nullable are both true"
+      tags:
+      - fake
+      x-accepts:
+      - application/json
 components:
   parameters:
     pet_id:
@@ -2927,6 +2942,62 @@ components:
           - $ref: "#/components/schemas/Height"
           default: 32.1
       type: object
+    NullableEnum:
+      enum:
+      - custom
+      nullable: true
+      type: string
+    RequiredNullableBody:
+      allOf:
+      - $ref: '#/components/schemas/NullableClass'
+      - properties:
+          custom_ref_enum:
+            $ref: '#/components/schemas/NullableEnum'
+          custom_enum:
+            enum:
+            - custom
+            nullable: true
+            type: string
+        required:
+        - array_and_items_nullable_prop
+        - array_items_nullable
+        - array_nullable_prop
+        - boolean_prop
+        - custom_enum
+        - custom_ref_enum
+        - date_prop
+        - datetime_prop
+        - integer_prop
+        - number_prop
+        - object_and_items_nullable_prop
+        - object_items_nullable
+        - object_nullable_prop
+        - string_prop
+        type: object
+      example:
+        number_prop: 6.027456183070403
+        datetime_prop: 2000-01-23T04:56:07.000+00:00
+        custom_ref_enum: custom
+        boolean_prop: true
+        string_prop: string_prop
+        array_nullable_prop:
+        - "{}"
+        - "{}"
+        custom_enum: custom
+        integer_prop: 0
+        array_and_items_nullable_prop:
+        - "{}"
+        - "{}"
+        object_items_nullable:
+          key: "{}"
+        object_nullable_prop:
+          key: "{}"
+        object_and_items_nullable_prop:
+          key: "{}"
+        date_prop: 2000-01-23
+        array_items_nullable:
+        - "{}"
+        - "{}"
     _foo_get_default_response:
       example:
         string:

samples/client/petstore/java/okhttp-gson/docs/FakeApi.md

@@ -9,6 +9,7 @@ All URIs are relative to *http://petstore.swagger.io:80/v2*
 | [**fakeOuterCompositeSerialize**](FakeApi.md#fakeOuterCompositeSerialize) | **POST** /fake/outer/composite |  |
 | [**fakeOuterNumberSerialize**](FakeApi.md#fakeOuterNumberSerialize) | **POST** /fake/outer/number |  |
 | [**fakeOuterStringSerialize**](FakeApi.md#fakeOuterStringSerialize) | **POST** /fake/outer/string |  |
+| [**fakeRequiredNullableBodyGet**](FakeApi.md#fakeRequiredNullableBodyGet) | **GET** /fake/required-nullable-body | fields in the response body, required and nullable are both true |
 | [**fakeRefParameter**](FakeApi.md#fakeRefParameter) | **POST** /fake/pet/{petId}/reference/parameter | fake reference parameter |
 | [**fakeUploadRefRequestBodies**](FakeApi.md#fakeUploadRefRequestBodies) | **POST** /fake/pet/{petId}/uploadImage | fake reference parameter |
 | [**getFakeArrayofenums**](FakeApi.md#getFakeArrayofenums) | **GET** /fake/array-of-enums | Array of Enums |
@@ -395,6 +396,64 @@ No authorization required
 |-------------|-------------|------------------|
 | **200** | successful operation |  -  |
 
+<a id="fakeRequiredNullableBodyGet"></a>
+# **fakeRequiredNullableBodyGet**
+> RequiredNullableBody fakeRequiredNullableBodyGet()
+
+fields in the response body, required and nullable are both true
+
+
+
+### Example
+```java
+// Import classes:
+import org.openapitools.client.ApiClient;
+import org.openapitools.client.ApiException;
+import org.openapitools.client.Configuration;
+import org.openapitools.client.models.*;
+import org.openapitools.client.api.FakeApi;
+
+public class Example {
+  public static void main(String[] args) {
+    ApiClient defaultClient = Configuration.getDefaultApiClient();
+    defaultClient.setBasePath("http://petstore.swagger.io:80/v2");
+
+    FakeApi apiInstance = new FakeApi(defaultClient);
+    try {
+      RequiredNullableBody result = apiInstance.fakeRequiredNullableBodyGet();
+      System.out.println(result);
+    } catch (ApiException e) {
+      System.err.println("Exception when calling FakeApi#fakeRequiredNullableBodyGet");
+      System.err.println("Status code: " + e.getCode());
+      System.err.println("Reason: " + e.getResponseBody());
+      System.err.println("Response headers: " + e.getResponseHeaders());
+      e.printStackTrace();
+    }
+  }
+}
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+[**RequiredNullableBody**](RequiredNullableBody.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+- **Content-Type**: Not defined
+- **Accept**: application/json
+
+### HTTP response details
+| Status code | Description | Response headers |
+|-------------|-------------|------------------|
+| **200** | success |  -  |
+
 <a id="fakeUploadRefRequestBodies"></a>
 # **fakeUploadRefRequestBodies**
 > ModelApiResponse fakeUploadRefRequestBodies(petId, additionalMetadata, _file)

samples/client/petstore/java/okhttp-gson/docs/NullableEnum.md

@@ -0,0 +1,11 @@
+
+
+# NullableEnum
+
+## Enum
+
+
+* `CUSTOM` (value: `"custom"`)
+
+
+

samples/client/petstore/java/okhttp-gson/docs/RequiredNullableBody.md

@@ -0,0 +1,34 @@
+
+
+# RequiredNullableBody
+
+
+## Properties
+
+| Name | Type | Description | Notes |
+|------------ | ------------- | ------------- | -------------|
+|**integerProp** | **Integer** |  |  |
+|**numberProp** | **BigDecimal** |  |  |
+|**booleanProp** | **Boolean** |  |  |
+|**stringProp** | **String** |  |  |
+|**dateProp** | **LocalDate** |  |  |
+|**datetimeProp** | **OffsetDateTime** |  |  |
+|**arrayNullableProp** | **List<Object>** |  |  |
+|**arrayAndItemsNullableProp** | **List<Object>** |  |  |
+|**arrayItemsNullable** | **List<Object>** |  |  |
+|**objectNullableProp** | **Map<String, Object>** |  |  |
+|**objectAndItemsNullableProp** | **Map<String, Object>** |  |  |
+|**objectItemsNullable** | **Map<String, Object>** |  |  |
+|**customRefEnum** | **NullableEnum** |  |  |
+|**customEnum** | [**CustomEnumEnum**](#CustomEnumEnum) |  |  |
+
+
+
+## Enum: CustomEnumEnum
+
+| Name | Value |
+|---- | -----|
+| CUSTOM | "custom" |
+
+
+

samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/JSON.java

@@ -327,6 +327,7 @@ private static Class getClassByDiscriminator(Map classByDiscriminatorValue, Stri
         gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.Quadrilateral.CustomTypeAdapterFactory());
         gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.QuadrilateralInterface.CustomTypeAdapterFactory());
         gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.ReadOnlyFirst.CustomTypeAdapterFactory());
+        gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.RequiredNullableBody.CustomTypeAdapterFactory());
         gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.Scalar.CustomTypeAdapterFactory());
         gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.ScalarAnyOf.CustomTypeAdapterFactory());
         gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.ScaleneTriangle.CustomTypeAdapterFactory());