diff --git a/modules/openapi-generator/pom.xml b/modules/openapi-generator/pom.xml index 9b17a2cf69e65cb4af479738924b66a7aaeab1a7..2d8a8eb4eeded0b89cbe0eaf07f0225709ac2570 100644 --- a/modules/openapi-generator/pom.xml +++ b/modules/openapi-generator/pom.xml @@ -247,11 +247,6 @@ </plugins> </reporting> <dependencies> - <dependency> - <groupId>io.swagger.core.v3</groupId> - <artifactId>swagger-core</artifactId> - <version>${swagger-core.version}</version> - </dependency> <dependency> <groupId>${swagger-parser-groupid.version}</groupId> <artifactId>swagger-parser</artifactId> diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java index 1efd6b2502ff5a13fde9aad70a02dec92685f894..9e576655bfbacc892d3456cc2be5a81c6d906c9a 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java @@ -388,7 +388,10 @@ public class CodegenConstants { public static final String DISALLOW_ADDITIONAL_PROPERTIES_IF_NOT_PRESENT_DESC = "If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. " + "If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default."; - + public static final String UNSUPPORTED_V310_SPEC_MSG = + "Generation using 3.1.0 specs is in development and is not officially supported yet. " + + "If you would like to expedite development, please consider woking on the open issues in the 3.1.0 project: https://github.com/orgs/OpenAPITools/projects/4/views/1 " + + "and reach out to our team on Slack at https://join.slack.com/t/openapi-generator/shared_invite/zt-12jxxd7p2-XUeQM~4pzsU9x~eGLQqX2g"; public static final String ENUM_UNKNOWN_DEFAULT_CASE = "enumUnknownDefaultCase"; public static final String ENUM_UNKNOWN_DEFAULT_CASE_DESC = "If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response." + diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java index f6a26a8dfe958bcc0c395c506568e4905ea9e436..6c97430515a7052e5edd576c847a1fca0631d179 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java @@ -79,6 +79,7 @@ import io.swagger.v3.oas.models.servers.Server; import io.swagger.v3.oas.models.servers.ServerVariable; import io.swagger.v3.parser.util.SchemaTypeUtil; +import static org.openapitools.codegen.CodegenConstants.UNSUPPORTED_V310_SPEC_MSG; import static org.openapitools.codegen.utils.OnceLogger.once; import static org.openapitools.codegen.utils.StringUtils.*; @@ -820,6 +821,19 @@ public class DefaultCodegen implements CodegenConfig { */ @Override public void setOpenAPI(OpenAPI openAPI) { + String originalSpecVersion; + String xOriginalSwaggerVersion = "x-original-swagger-version"; + if (openAPI.getExtensions() != null && !openAPI.getExtensions().isEmpty() && openAPI.getExtensions().containsValue(xOriginalSwaggerVersion)) { + originalSpecVersion = (String) openAPI.getExtensions().get(xOriginalSwaggerVersion); + } else { + originalSpecVersion = openAPI.getOpenapi(); + } + Integer specMajorVersion = Integer.parseInt(originalSpecVersion.substring(0, 1)); + Integer specMinorVersion = Integer.parseInt(originalSpecVersion.substring(2, 3)); + boolean specVersionGreaterThanOrEqualTo310 = (specMajorVersion == 3 && specMinorVersion >= 1); + if (specVersionGreaterThanOrEqualTo310) { + LOGGER.warn(UNSUPPORTED_V310_SPEC_MSG); + } this.openAPI = openAPI; // Set global settings such that helper functions in ModelUtils can lookup the value // of the CLI option. diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java index ef0b59a12bc02117df83a126ef6cc10f3e18b9e3..f1d1d182d1329c8f28bc63ad1f684e5ce4847869 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java @@ -4245,4 +4245,12 @@ public class DefaultCodegenTest { Assert.assertEquals(fooOptional.vars.get(0).name, "foo"); Assert.assertEquals(fooOptional.requiredVars.size(), 0); } + + @Test + public void testAssigning310SpecWorks() { + final OpenAPI openAPI = TestUtils.parseFlattenSpec("src/test/resources/3_1/petstore.yaml"); + final DefaultCodegen codegen = new DefaultCodegen(); + codegen.setOpenAPI(openAPI); + assertEquals(openAPI, codegen.openAPI); + } } diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/confluencewiki/ConfluenceWikiTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/confluencewiki/ConfluenceWikiTest.java index 5352c9aa0f885981d245137577fd5f9d1e10d2de..5d2dbff5573d68d83707324a4c24ad91eb8a54a3 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/confluencewiki/ConfluenceWikiTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/confluencewiki/ConfluenceWikiTest.java @@ -147,8 +147,8 @@ public class ConfluenceWikiTest { discriminator.setPropertyName("model_type"); parentModel.setDiscriminator(discriminator); - final ComposedSchema composedSchema = new ComposedSchema() - .addAllOfItem(new Schema().$ref(parentModel.getName())); + final ComposedSchema composedSchema = new ComposedSchema(); + composedSchema.addAllOfItem(new Schema().$ref(parentModel.getName())); composedSchema.setName("sample"); final ConfluenceWikiCodegen codegen = new ConfluenceWikiCodegen(); diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelEnumTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelEnumTest.java index eb263d353014e705bf640e9b6d68b00eff07f3ca..1f3f48e8a614ffa0f0464581805ca7e6ff2847f2 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelEnumTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/java/JavaModelEnumTest.java @@ -146,8 +146,8 @@ public class JavaModelEnumTest { discriminator.setPropertyName("model_type"); parentModel.setDiscriminator(discriminator); - final ComposedSchema composedSchema = new ComposedSchema() - .addAllOfItem(new Schema().$ref(parentModel.getName())); + final ComposedSchema composedSchema = new ComposedSchema(); + composedSchema.addAllOfItem(new Schema().$ref(parentModel.getName())); composedSchema.setName("sample"); final JavaClientCodegen codegen = new JavaClientCodegen(); diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/utils/ModelUtilsTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/utils/ModelUtilsTest.java index f962efee4eb405e8815e72c12a74e01bf874521e..23ffd0090e9685690a4c8935073f92afbaba1264 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/utils/ModelUtilsTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/utils/ModelUtilsTest.java @@ -206,7 +206,8 @@ public class ModelUtilsTest { */ @Test public void testComposedSchemasAreNotUnaliased() { - ComposedSchema composedSchema = new ComposedSchema().allOf(Arrays.asList( + ComposedSchema composedSchema = new ComposedSchema(); + composedSchema.allOf(Arrays.asList( new Schema<>().$ref("#/components/schemas/SomeSchema"), new ObjectSchema() )); diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/validations/oas/OpenApiSchemaValidationsTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/validations/oas/OpenApiSchemaValidationsTest.java index b2b2070ebef1ee97310dc034c855ce70ff5c00c2..7ac2fc746b6cd326c4f9c049cfe11a9bd934367d 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/validations/oas/OpenApiSchemaValidationsTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/validations/oas/OpenApiSchemaValidationsTest.java @@ -84,7 +84,8 @@ public class OpenApiSchemaValidationsTest { } private ComposedSchema getOneOfSample(boolean withProperties) { - ComposedSchema schema = new ComposedSchema().oneOf(Arrays.asList( + ComposedSchema schema = new ComposedSchema(); + schema.oneOf(Arrays.asList( new StringSchema(), new IntegerSchema().format("int64")) ); @@ -99,7 +100,8 @@ public class OpenApiSchemaValidationsTest { private ComposedSchema getAllOfSample(boolean withProperties) { // This doesn't matter if it's realistic; it's a structural check - ComposedSchema schema = new ComposedSchema().allOf(Arrays.asList( + ComposedSchema schema = new ComposedSchema(); + schema.allOf(Arrays.asList( new StringSchema(), new IntegerSchema().format("int64")) ); @@ -113,7 +115,8 @@ public class OpenApiSchemaValidationsTest { } private ComposedSchema getAnyOfSample(boolean withProperties) { - ComposedSchema schema = new ComposedSchema().anyOf(Arrays.asList( + ComposedSchema schema = new ComposedSchema(); + schema.anyOf(Arrays.asList( new StringSchema(), new IntegerSchema().format("int64")) ); diff --git a/modules/openapi-generator/src/test/resources/3_1/petstore.yaml b/modules/openapi-generator/src/test/resources/3_1/petstore.yaml new file mode 100644 index 0000000000000000000000000000000000000000..6e83b7fdc24e511d7288a56e2e34ca90fc4adc58 --- /dev/null +++ b/modules/openapi-generator/src/test/resources/3_1/petstore.yaml @@ -0,0 +1,738 @@ +openapi: 3.1.0 +servers: + - url: 'http://petstore.swagger.io/v2' +info: + description: >- + This is a sample server Petstore server. For this sample, you can use the api key + `special-key` to test the authorization filters. + version: 1.0.0 + title: OpenAPI Petstore + license: + name: Apache-2.0 + url: 'https://www.apache.org/licenses/LICENSE-2.0.html' +tags: + - name: pet + description: Everything about your Pets + - name: store + description: Access to Petstore orders + - name: user + description: Operations about user +paths: + /pet: + post: + tags: + - pet + summary: Add a new pet to the store + description: '' + operationId: addPet + responses: + '200': + description: successful operation + content: + application/xml: + schema: + $ref: '#/components/schemas/Pet' + application/json: + schema: + $ref: '#/components/schemas/Pet' + '405': + description: Invalid input + security: + - petstore_auth: + - 'write:pets' + - 'read:pets' + requestBody: + $ref: '#/components/requestBodies/Pet' + put: + tags: + - pet + summary: Update an existing pet + description: '' + operationId: updatePet + responses: + '200': + description: successful operation + content: + application/xml: + schema: + $ref: '#/components/schemas/Pet' + application/json: + schema: + $ref: '#/components/schemas/Pet' + '400': + description: Invalid ID supplied + '404': + description: Pet not found + '405': + description: Validation exception + security: + - petstore_auth: + - 'write:pets' + - 'read:pets' + requestBody: + $ref: '#/components/requestBodies/Pet' + /pet/findByStatus: + get: + tags: + - pet + summary: Finds Pets by status + description: Multiple status values can be provided with comma separated strings + operationId: findPetsByStatus + parameters: + - name: status + in: query + description: Status values that need to be considered for filter + required: true + style: form + explode: false + deprecated: true + schema: + type: array + items: + type: string + enum: + - available + - pending + - sold + default: available + responses: + '200': + description: successful operation + content: + application/xml: + schema: + type: array + items: + $ref: '#/components/schemas/Pet' + application/json: + schema: + type: array + items: + $ref: '#/components/schemas/Pet' + '400': + description: Invalid status value + security: + - petstore_auth: + - 'read:pets' + /pet/findByTags: + get: + tags: + - pet + summary: Finds Pets by tags + description: >- + Multiple tags can be provided with comma separated strings. Use tag1, + tag2, tag3 for testing. + operationId: findPetsByTags + parameters: + - name: tags + in: query + description: Tags to filter by + required: true + style: form + explode: false + schema: + type: array + items: + type: string + responses: + '200': + description: successful operation + content: + application/xml: + schema: + type: array + items: + $ref: '#/components/schemas/Pet' + application/json: + schema: + type: array + items: + $ref: '#/components/schemas/Pet' + '400': + description: Invalid tag value + security: + - petstore_auth: + - 'read:pets' + deprecated: true + '/pet/{petId}': + get: + tags: + - pet + summary: Find pet by ID + description: Returns a single pet + operationId: getPetById + parameters: + - name: petId + in: path + description: ID of pet to return + required: true + schema: + type: integer + format: int64 + responses: + '200': + description: successful operation + content: + application/xml: + schema: + $ref: '#/components/schemas/Pet' + application/json: + schema: + $ref: '#/components/schemas/Pet' + '400': + description: Invalid ID supplied + '404': + description: Pet not found + security: + - api_key: [] + post: + tags: + - pet + summary: Updates a pet in the store with form data + description: '' + operationId: updatePetWithForm + parameters: + - name: petId + in: path + description: ID of pet that needs to be updated + required: true + schema: + type: integer + format: int64 + responses: + '405': + description: Invalid input + security: + - petstore_auth: + - 'write:pets' + - 'read:pets' + requestBody: + content: + application/x-www-form-urlencoded: + schema: + type: object + properties: + name: + description: Updated name of the pet + type: string + status: + description: Updated status of the pet + type: string + delete: + tags: + - pet + summary: Deletes a pet + description: '' + operationId: deletePet + parameters: + - name: api_key + in: header + required: false + schema: + type: string + - name: petId + in: path + description: Pet id to delete + required: true + schema: + type: integer + format: int64 + responses: + '400': + description: Invalid pet value + security: + - petstore_auth: + - 'write:pets' + - 'read:pets' + '/pet/{petId}/uploadImage': + post: + tags: + - pet + summary: uploads an image + description: '' + operationId: uploadFile + parameters: + - name: petId + in: path + description: ID of pet to update + required: true + schema: + type: integer + format: int64 + responses: + '200': + description: successful operation + content: + application/json: + schema: + $ref: '#/components/schemas/ApiResponse' + security: + - petstore_auth: + - 'write:pets' + - 'read:pets' + requestBody: + content: + multipart/form-data: + schema: + type: object + properties: + additionalMetadata: + description: Additional data to pass to server + type: string + file: + description: file to upload + type: string + format: binary + /store/inventory: + get: + tags: + - store + summary: Returns pet inventories by status + description: Returns a map of status codes to quantities + operationId: getInventory + responses: + '200': + description: successful operation + content: + application/json: + schema: + type: object + additionalProperties: + type: integer + format: int32 + security: + - api_key: [] + /store/order: + post: + tags: + - store + summary: Place an order for a pet + description: '' + operationId: placeOrder + responses: + '200': + description: successful operation + content: + application/xml: + schema: + $ref: '#/components/schemas/Order' + application/json: + schema: + $ref: '#/components/schemas/Order' + '400': + description: Invalid Order + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/Order' + description: order placed for purchasing the pet + required: true + '/store/order/{orderId}': + get: + tags: + - store + summary: Find purchase order by ID + description: >- + For valid response try integer IDs with value <= 5 or > 10. Other values + will generated exceptions + operationId: getOrderById + parameters: + - name: orderId + in: path + description: ID of pet that needs to be fetched + required: true + schema: + type: integer + format: int64 + minimum: 1 + maximum: 5 + responses: + '200': + description: successful operation + content: + application/xml: + schema: + $ref: '#/components/schemas/Order' + application/json: + schema: + $ref: '#/components/schemas/Order' + '400': + description: Invalid ID supplied + '404': + description: Order not found + delete: + tags: + - store + summary: Delete purchase order by ID + description: >- + For valid response try integer IDs with value < 1000. Anything above + 1000 or nonintegers will generate API errors + operationId: deleteOrder + parameters: + - name: orderId + in: path + description: ID of the order that needs to be deleted + required: true + schema: + type: string + responses: + '400': + description: Invalid ID supplied + '404': + description: Order not found + /user: + post: + tags: + - user + summary: Create user + description: This can only be done by the logged in user. + operationId: createUser + responses: + default: + description: successful operation + security: + - api_key: [] + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/User' + description: Created user object + required: true + /user/createWithArray: + post: + tags: + - user + summary: Creates list of users with given input array + description: '' + operationId: createUsersWithArrayInput + responses: + default: + description: successful operation + security: + - api_key: [] + requestBody: + $ref: '#/components/requestBodies/UserArray' + /user/createWithList: + post: + tags: + - user + summary: Creates list of users with given input array + description: '' + operationId: createUsersWithListInput + responses: + default: + description: successful operation + security: + - api_key: [] + requestBody: + $ref: '#/components/requestBodies/UserArray' + /user/login: + get: + tags: + - user + summary: Logs user into the system + description: '' + operationId: loginUser + parameters: + - name: username + in: query + description: The user name for login + required: true + schema: + type: string + pattern: '^[a-zA-Z0-9]+[a-zA-Z0-9\.\-_]*[a-zA-Z0-9]+$' + - name: password + in: query + description: The password for login in clear text + required: true + schema: + type: string + responses: + '200': + description: successful operation + headers: + Set-Cookie: + description: >- + Cookie authentication key for use with the `api_key` + apiKey authentication. + schema: + type: string + example: AUTH_KEY=abcde12345; Path=/; HttpOnly + X-Rate-Limit: + description: calls per hour allowed by the user + schema: + type: integer + format: int32 + X-Expires-After: + description: date in UTC when token expires + schema: + type: string + format: date-time + content: + application/xml: + schema: + type: string + application/json: + schema: + type: string + '400': + description: Invalid username/password supplied + /user/logout: + get: + tags: + - user + summary: Logs out current logged in user session + description: '' + operationId: logoutUser + responses: + default: + description: successful operation + security: + - api_key: [] + '/user/{username}': + get: + tags: + - user + summary: Get user by user name + description: '' + operationId: getUserByName + parameters: + - name: username + in: path + description: The name that needs to be fetched. Use user1 for testing. + required: true + schema: + type: string + responses: + '200': + description: successful operation + content: + application/xml: + schema: + $ref: '#/components/schemas/User' + application/json: + schema: + $ref: '#/components/schemas/User' + '400': + description: Invalid username supplied + '404': + description: User not found + put: + tags: + - user + summary: Updated user + description: This can only be done by the logged in user. + operationId: updateUser + parameters: + - name: username + in: path + description: name that need to be deleted + required: true + schema: + type: string + responses: + '400': + description: Invalid user supplied + '404': + description: User not found + security: + - api_key: [] + requestBody: + content: + application/json: + schema: + $ref: '#/components/schemas/User' + description: Updated user object + required: true + delete: + tags: + - user + summary: Delete user + description: This can only be done by the logged in user. + operationId: deleteUser + parameters: + - name: username + in: path + description: The name that needs to be deleted + required: true + schema: + type: string + responses: + '400': + description: Invalid username supplied + '404': + description: User not found + security: + - api_key: [] +externalDocs: + description: Find out more about Swagger + url: 'http://swagger.io' +components: + requestBodies: + UserArray: + content: + application/json: + schema: + type: array + items: + $ref: '#/components/schemas/User' + description: List of user object + required: true + Pet: + content: + application/json: + schema: + $ref: '#/components/schemas/Pet' + application/xml: + schema: + $ref: '#/components/schemas/Pet' + description: Pet object that needs to be added to the store + required: true + securitySchemes: + petstore_auth: + type: oauth2 + flows: + implicit: + authorizationUrl: 'http://petstore.swagger.io/api/oauth/dialog' + scopes: + 'write:pets': modify pets in your account + 'read:pets': read your pets + api_key: + type: apiKey + name: api_key + in: header + schemas: + Order: + title: Pet Order + description: An order for a pets from the pet store + type: object + properties: + id: + type: integer + format: int64 + petId: + type: integer + format: int64 + quantity: + type: integer + format: int32 + shipDate: + type: string + format: date-time + status: + type: string + description: Order Status + enum: + - placed + - approved + - delivered + complete: + type: boolean + default: false + xml: + name: Order + Category: + title: Pet category + description: A category for a pet + type: object + properties: + id: + type: integer + format: int64 + name: + type: string + pattern: '^[a-zA-Z0-9]+[a-zA-Z0-9\.\-_]*[a-zA-Z0-9]+$' + xml: + name: Category + User: + title: a User + description: A User who is purchasing from the pet store + type: object + properties: + id: + type: integer + format: int64 + username: + type: string + firstName: + type: string + lastName: + type: string + email: + type: string + password: + type: string + phone: + type: string + userStatus: + type: integer + format: int32 + description: User Status + xml: + name: User + Tag: + title: Pet Tag + description: A tag for a pet + type: object + properties: + id: + type: integer + format: int64 + name: + type: string + xml: + name: Tag + Pet: + title: a Pet + description: A pet for sale in the pet store + type: object + required: + - name + - photoUrls + properties: + id: + type: integer + format: int64 + category: + $ref: '#/components/schemas/Category' + name: + type: string + example: doggie + photoUrls: + type: array + xml: + name: photoUrl + wrapped: true + items: + type: string + tags: + type: array + xml: + name: tag + wrapped: true + items: + $ref: '#/components/schemas/Tag' + status: + type: string + description: pet status in the store + deprecated: true + enum: + - available + - pending + - sold + xml: + name: Pet + ApiResponse: + title: An uploaded response + description: Describes the result of uploading an image resource + type: object + properties: + code: + type: integer + format: int32 + type: + type: string + message: + type: string diff --git a/pom.xml b/pom.xml index 5759297d6aa9cd056f6363b89f331cf0e21433db..96d5b44a8e710da1e1c40c4b0cab6886fdab132d 100644 --- a/pom.xml +++ b/pom.xml @@ -1494,9 +1494,8 @@ <spotbugs-plugin.version>3.1.12.2</spotbugs-plugin.version> <maven-surefire-plugin.version>3.0.0-M6</maven-surefire-plugin.version> <openrewrite.version>7.22.0</openrewrite.version> - <swagger-core.version>2.1.12</swagger-core.version> <swagger-parser-groupid.version>io.swagger.parser.v3</swagger-parser-groupid.version> - <swagger-parser.version>2.0.31</swagger-parser.version> + <swagger-parser.version>2.1.1</swagger-parser.version> <testng.version>7.5</testng.version> <violations-maven-plugin.version>1.34</violations-maven-plugin.version> <wagon-ssh-external.version>3.4.3</wagon-ssh-external.version> diff --git a/samples/client/petstore/go/go-petstore/api/openapi.yaml b/samples/client/petstore/go/go-petstore/api/openapi.yaml index 0f760ad7305f6e382311029e0ad0c65efa3ec8f0..80c1125f22e52246167784874637c401649b3137 100644 --- a/samples/client/petstore/go/go-petstore/api/openapi.yaml +++ b/samples/client/petstore/go/go-petstore/api/openapi.yaml @@ -2103,11 +2103,13 @@ components: breed: type: string type: object + example: null Cat_allOf: properties: declawed: type: boolean type: object + example: null BigCat_allOf: properties: kind: @@ -2118,6 +2120,7 @@ components: - jaguars type: string type: object + example: null securitySchemes: petstore_auth: flows: diff --git a/samples/client/petstore/haskell-http-client/openapi.yaml b/samples/client/petstore/haskell-http-client/openapi.yaml index 0f760ad7305f6e382311029e0ad0c65efa3ec8f0..80c1125f22e52246167784874637c401649b3137 100644 --- a/samples/client/petstore/haskell-http-client/openapi.yaml +++ b/samples/client/petstore/haskell-http-client/openapi.yaml @@ -2103,11 +2103,13 @@ components: breed: type: string type: object + example: null Cat_allOf: properties: declawed: type: boolean type: object + example: null BigCat_allOf: properties: kind: @@ -2118,6 +2120,7 @@ components: - jaguars type: string type: object + example: null securitySchemes: petstore_auth: flows: diff --git a/samples/client/petstore/java/apache-httpclient/api/openapi.yaml b/samples/client/petstore/java/apache-httpclient/api/openapi.yaml index 3ded94aeafc25dcdf38c11567cfc8e8cf4f49172..151c0e7627d3cf0d34ece85ff6f72f0d799203a4 100644 --- a/samples/client/petstore/java/apache-httpclient/api/openapi.yaml +++ b/samples/client/petstore/java/apache-httpclient/api/openapi.yaml @@ -2164,11 +2164,13 @@ components: breed: type: string type: object + example: null Cat_allOf: properties: declawed: type: boolean type: object + example: null BigCat_allOf: properties: kind: @@ -2179,6 +2181,7 @@ components: - jaguars type: string type: object + example: null securitySchemes: petstore_auth: flows: diff --git a/samples/client/petstore/java/feign-no-nullable/api/openapi.yaml b/samples/client/petstore/java/feign-no-nullable/api/openapi.yaml index 3ded94aeafc25dcdf38c11567cfc8e8cf4f49172..151c0e7627d3cf0d34ece85ff6f72f0d799203a4 100644 --- a/samples/client/petstore/java/feign-no-nullable/api/openapi.yaml +++ b/samples/client/petstore/java/feign-no-nullable/api/openapi.yaml @@ -2164,11 +2164,13 @@ components: breed: type: string type: object + example: null Cat_allOf: properties: declawed: type: boolean type: object + example: null BigCat_allOf: properties: kind: @@ -2179,6 +2181,7 @@ components: - jaguars type: string type: object + example: null securitySchemes: petstore_auth: flows: diff --git a/samples/client/petstore/java/feign/api/openapi.yaml b/samples/client/petstore/java/feign/api/openapi.yaml index 6715cdabc8fcb9a0d4aebca323599b94d60f57f4..f54c98c7f7bfbada24fdf788068552c7d0eb8f5b 100644 --- a/samples/client/petstore/java/feign/api/openapi.yaml +++ b/samples/client/petstore/java/feign/api/openapi.yaml @@ -2132,11 +2132,13 @@ components: breed: type: string type: object + example: null Cat_allOf: properties: declawed: type: boolean type: object + example: null securitySchemes: petstore_auth: flows: diff --git a/samples/client/petstore/java/google-api-client/api/openapi.yaml b/samples/client/petstore/java/google-api-client/api/openapi.yaml index 3ded94aeafc25dcdf38c11567cfc8e8cf4f49172..151c0e7627d3cf0d34ece85ff6f72f0d799203a4 100644 --- a/samples/client/petstore/java/google-api-client/api/openapi.yaml +++ b/samples/client/petstore/java/google-api-client/api/openapi.yaml @@ -2164,11 +2164,13 @@ components: breed: type: string type: object + example: null Cat_allOf: properties: declawed: type: boolean type: object + example: null BigCat_allOf: properties: kind: @@ -2179,6 +2181,7 @@ components: - jaguars type: string type: object + example: null securitySchemes: petstore_auth: flows: diff --git a/samples/client/petstore/java/jersey1/api/openapi.yaml b/samples/client/petstore/java/jersey1/api/openapi.yaml index 3ded94aeafc25dcdf38c11567cfc8e8cf4f49172..151c0e7627d3cf0d34ece85ff6f72f0d799203a4 100644 --- a/samples/client/petstore/java/jersey1/api/openapi.yaml +++ b/samples/client/petstore/java/jersey1/api/openapi.yaml @@ -2164,11 +2164,13 @@ components: breed: type: string type: object + example: null Cat_allOf: properties: declawed: type: boolean type: object + example: null BigCat_allOf: properties: kind: @@ -2179,6 +2181,7 @@ components: - jaguars type: string type: object + example: null securitySchemes: petstore_auth: flows: diff --git a/samples/client/petstore/java/jersey2-java8-localdatetime/api/openapi.yaml b/samples/client/petstore/java/jersey2-java8-localdatetime/api/openapi.yaml index 3ded94aeafc25dcdf38c11567cfc8e8cf4f49172..151c0e7627d3cf0d34ece85ff6f72f0d799203a4 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/api/openapi.yaml +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/api/openapi.yaml @@ -2164,11 +2164,13 @@ components: breed: type: string type: object + example: null Cat_allOf: properties: declawed: type: boolean type: object + example: null BigCat_allOf: properties: kind: @@ -2179,6 +2181,7 @@ components: - jaguars type: string type: object + example: null securitySchemes: petstore_auth: flows: diff --git a/samples/client/petstore/java/jersey2-java8/api/openapi.yaml b/samples/client/petstore/java/jersey2-java8/api/openapi.yaml index 3ded94aeafc25dcdf38c11567cfc8e8cf4f49172..151c0e7627d3cf0d34ece85ff6f72f0d799203a4 100644 --- a/samples/client/petstore/java/jersey2-java8/api/openapi.yaml +++ b/samples/client/petstore/java/jersey2-java8/api/openapi.yaml @@ -2164,11 +2164,13 @@ components: breed: type: string type: object + example: null Cat_allOf: properties: declawed: type: boolean type: object + example: null BigCat_allOf: properties: kind: @@ -2179,6 +2181,7 @@ components: - jaguars type: string type: object + example: null securitySchemes: petstore_auth: flows: diff --git a/samples/client/petstore/java/jersey3/api/openapi.yaml b/samples/client/petstore/java/jersey3/api/openapi.yaml index 1db8f0a9d1a5cd6233b77518b385e7e366886ba7..bd4e3fa22b6cc2f4c4797f136fbeb300f8f91eea 100644 --- a/samples/client/petstore/java/jersey3/api/openapi.yaml +++ b/samples/client/petstore/java/jersey3/api/openapi.yaml @@ -2286,11 +2286,13 @@ components: breed: type: string type: object + example: null Cat_allOf: properties: declawed: type: boolean type: object + example: null ChildCat_allOf: properties: name: @@ -2302,6 +2304,7 @@ components: type: string x-enum-as-string: true type: object + example: null securitySchemes: petstore_auth: flows: diff --git a/samples/client/petstore/java/native-async/api/openapi.yaml b/samples/client/petstore/java/native-async/api/openapi.yaml index 3ded94aeafc25dcdf38c11567cfc8e8cf4f49172..151c0e7627d3cf0d34ece85ff6f72f0d799203a4 100644 --- a/samples/client/petstore/java/native-async/api/openapi.yaml +++ b/samples/client/petstore/java/native-async/api/openapi.yaml @@ -2164,11 +2164,13 @@ components: breed: type: string type: object + example: null Cat_allOf: properties: declawed: type: boolean type: object + example: null BigCat_allOf: properties: kind: @@ -2179,6 +2181,7 @@ components: - jaguars type: string type: object + example: null securitySchemes: petstore_auth: flows: diff --git a/samples/client/petstore/java/native/api/openapi.yaml b/samples/client/petstore/java/native/api/openapi.yaml index 3ded94aeafc25dcdf38c11567cfc8e8cf4f49172..151c0e7627d3cf0d34ece85ff6f72f0d799203a4 100644 --- a/samples/client/petstore/java/native/api/openapi.yaml +++ b/samples/client/petstore/java/native/api/openapi.yaml @@ -2164,11 +2164,13 @@ components: breed: type: string type: object + example: null Cat_allOf: properties: declawed: type: boolean type: object + example: null BigCat_allOf: properties: kind: @@ -2179,6 +2181,7 @@ components: - jaguars type: string type: object + example: null securitySchemes: petstore_auth: flows: diff --git a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/resources/openapi/openapi.yaml b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/resources/openapi/openapi.yaml index 3ded94aeafc25dcdf38c11567cfc8e8cf4f49172..151c0e7627d3cf0d34ece85ff6f72f0d799203a4 100644 --- a/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/resources/openapi/openapi.yaml +++ b/samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/resources/openapi/openapi.yaml @@ -2164,11 +2164,13 @@ components: breed: type: string type: object + example: null Cat_allOf: properties: declawed: type: boolean type: object + example: null BigCat_allOf: properties: kind: @@ -2179,6 +2181,7 @@ components: - jaguars type: string type: object + example: null securitySchemes: petstore_auth: flows: diff --git a/samples/client/petstore/java/okhttp-gson-parcelableModel/api/openapi.yaml b/samples/client/petstore/java/okhttp-gson-parcelableModel/api/openapi.yaml index 3ded94aeafc25dcdf38c11567cfc8e8cf4f49172..151c0e7627d3cf0d34ece85ff6f72f0d799203a4 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/api/openapi.yaml +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/api/openapi.yaml @@ -2164,11 +2164,13 @@ components: breed: type: string type: object + example: null Cat_allOf: properties: declawed: type: boolean type: object + example: null BigCat_allOf: properties: kind: @@ -2179,6 +2181,7 @@ components: - jaguars type: string type: object + example: null securitySchemes: petstore_auth: flows: diff --git a/samples/client/petstore/java/okhttp-gson/.openapi-generator/FILES b/samples/client/petstore/java/okhttp-gson/.openapi-generator/FILES index a251ba61270c6ea4556080b3c5ea980d2624b1af..74fd5c044a7e21f11fc3be9161a30c9f2336ac8d 100644 --- a/samples/client/petstore/java/okhttp-gson/.openapi-generator/FILES +++ b/samples/client/petstore/java/okhttp-gson/.openapi-generator/FILES @@ -14,6 +14,7 @@ docs/ArrayOfArrayOfNumberOnly.md docs/ArrayOfInlineAllOf.md docs/ArrayOfInlineAllOfArrayAllofDogPropertyInner.md docs/ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf.md +docs/ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf1.md docs/ArrayOfNumberOnly.md docs/ArrayTest.md docs/Banana.md @@ -137,6 +138,7 @@ src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java src/main/java/org/openapitools/client/model/ArrayOfInlineAllOf.java src/main/java/org/openapitools/client/model/ArrayOfInlineAllOfArrayAllofDogPropertyInner.java src/main/java/org/openapitools/client/model/ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf.java +src/main/java/org/openapitools/client/model/ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf1.java src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java src/main/java/org/openapitools/client/model/ArrayTest.java src/main/java/org/openapitools/client/model/Banana.java diff --git a/samples/client/petstore/java/okhttp-gson/README.md b/samples/client/petstore/java/okhttp-gson/README.md index 95044bce969e63fde896c7cbfe35d869e22a3c37..710fdcd645b871a2592627e05bc019fe7b957732 100644 --- a/samples/client/petstore/java/okhttp-gson/README.md +++ b/samples/client/petstore/java/okhttp-gson/README.md @@ -164,6 +164,7 @@ Class | Method | HTTP request | Description - [ArrayOfInlineAllOf](docs/ArrayOfInlineAllOf.md) - [ArrayOfInlineAllOfArrayAllofDogPropertyInner](docs/ArrayOfInlineAllOfArrayAllofDogPropertyInner.md) - [ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf](docs/ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf.md) + - [ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf1](docs/ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf1.md) - [ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md) - [ArrayTest](docs/ArrayTest.md) - [Banana](docs/Banana.md) diff --git a/samples/client/petstore/java/okhttp-gson/api/openapi.yaml b/samples/client/petstore/java/okhttp-gson/api/openapi.yaml index 58c71aba579c04730825dffb178d7de7eb408283..d0c337f4e5054496d3997869f21d53f85fa52a66 100644 --- a/samples/client/petstore/java/okhttp-gson/api/openapi.yaml +++ b/samples/client/petstore/java/okhttp-gson/api/openapi.yaml @@ -2350,20 +2350,27 @@ components: breed: type: string type: object + example: null Cat_allOf: properties: declawed: type: boolean type: object + example: null ArrayOfInlineAllOf_array_allof_dog_property_inner_allOf: + properties: + breed: + type: string + type: object + ArrayOfInlineAllOf_array_allof_dog_property_inner_allOf_1: properties: color: type: string type: object ArrayOfInlineAllOf_array_allof_dog_property_inner: allOf: - - $ref: '#/components/schemas/Dog_allOf' - $ref: '#/components/schemas/ArrayOfInlineAllOf_array_allof_dog_property_inner_allOf' + - $ref: '#/components/schemas/ArrayOfInlineAllOf_array_allof_dog_property_inner_allOf_1' securitySchemes: petstore_auth: flows: diff --git a/samples/client/petstore/java/okhttp-gson/docs/ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf.md b/samples/client/petstore/java/okhttp-gson/docs/ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf.md index 4ec0e1638567c274ed09f1526306a1f8cb76be83..a30fc63ecf0dd98d599182b6683feb4a66f22ed3 100644 --- a/samples/client/petstore/java/okhttp-gson/docs/ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf.md +++ b/samples/client/petstore/java/okhttp-gson/docs/ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf.md @@ -7,7 +7,7 @@ | Name | Type | Description | Notes | |------------ | ------------- | ------------- | -------------| -|**color** | **String** | | [optional] | +|**breed** | **String** | | [optional] | diff --git a/samples/client/petstore/java/okhttp-gson/docs/ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf1.md b/samples/client/petstore/java/okhttp-gson/docs/ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf1.md new file mode 100644 index 0000000000000000000000000000000000000000..fa8c070f537b7d2357f844a1b16807ce124053be --- /dev/null +++ b/samples/client/petstore/java/okhttp-gson/docs/ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf1.md @@ -0,0 +1,13 @@ + + +# ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf1 + + +## Properties + +| Name | Type | Description | Notes | +|------------ | ------------- | ------------- | -------------| +|**color** | **String** | | [optional] | + + + diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/JSON.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/JSON.java index 9b5001cb0bcc6b8692f8a2f6c703ea8bf75747b4..00b9ca5ddcaf81d8767010bb04e8f0c4e7e056f4 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/JSON.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/JSON.java @@ -236,6 +236,7 @@ public class JSON { gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.ArrayOfInlineAllOf.CustomTypeAdapterFactory()); gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.ArrayOfInlineAllOfArrayAllofDogPropertyInner.CustomTypeAdapterFactory()); gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf.CustomTypeAdapterFactory()); + gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf1.CustomTypeAdapterFactory()); gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.ArrayOfNumberOnly.CustomTypeAdapterFactory()); gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.ArrayTest.CustomTypeAdapterFactory()); gsonBuilder.registerTypeAdapterFactory(new org.openapitools.client.model.Banana.CustomTypeAdapterFactory()); diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf.java index 6a2f57b5fde1dabb04a9ebf13d9d75e7eadb2840..e5d997a8bfc7f31789b2a79c0ef3e16379dbe53a 100644 --- a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf.java +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf.java @@ -49,33 +49,33 @@ import org.openapitools.client.JSON; */ @javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") public class ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf { - public static final String SERIALIZED_NAME_COLOR = "color"; - @SerializedName(SERIALIZED_NAME_COLOR) - private String color; + public static final String SERIALIZED_NAME_BREED = "breed"; + @SerializedName(SERIALIZED_NAME_BREED) + private String breed; public ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf() { } - public ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf color(String color) { + public ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf breed(String breed) { - this.color = color; + this.breed = breed; return this; } /** - * Get color - * @return color + * Get breed + * @return breed **/ @javax.annotation.Nullable @ApiModelProperty(value = "") - public String getColor() { - return color; + public String getBreed() { + return breed; } - public void setColor(String color) { - this.color = color; + public void setBreed(String breed) { + this.breed = breed; } /** @@ -124,20 +124,20 @@ public class ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf { return false; } ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf arrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf = (ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf) o; - return Objects.equals(this.color, arrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf.color)&& + return Objects.equals(this.breed, arrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf.breed)&& Objects.equals(this.additionalProperties, arrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf.additionalProperties); } @Override public int hashCode() { - return Objects.hash(color, additionalProperties); + return Objects.hash(breed, additionalProperties); } @Override public String toString() { StringBuilder sb = new StringBuilder(); sb.append("class ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf {\n"); - sb.append(" color: ").append(toIndentedString(color)).append("\n"); + sb.append(" breed: ").append(toIndentedString(breed)).append("\n"); sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); sb.append("}"); return sb.toString(); @@ -161,7 +161,7 @@ public class ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf { static { // a set of all properties/fields (JSON key names) openapiFields = new HashSet<String>(); - openapiFields.add("color"); + openapiFields.add("breed"); // a set of required properties/fields (JSON key names) openapiRequiredFields = new HashSet<String>(); @@ -181,8 +181,8 @@ public class ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf { throw new IllegalArgumentException(String.format("The required field(s) %s in ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf is not found in the empty JSON string", ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf.openapiRequiredFields.toString())); } } - if ((jsonObj.get("color") != null && !jsonObj.get("color").isJsonNull()) && !jsonObj.get("color").isJsonPrimitive()) { - throw new IllegalArgumentException(String.format("Expected the field `color` to be a primitive type in the JSON string but got `%s`", jsonObj.get("color").toString())); + if ((jsonObj.get("breed") != null && !jsonObj.get("breed").isJsonNull()) && !jsonObj.get("breed").isJsonPrimitive()) { + throw new IllegalArgumentException(String.format("Expected the field `breed` to be a primitive type in the JSON string but got `%s`", jsonObj.get("breed").toString())); } } diff --git a/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf1.java b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf1.java new file mode 100644 index 0000000000000000000000000000000000000000..a98e855d5480395b64d08a104ee9afaa3f56b5ef --- /dev/null +++ b/samples/client/petstore/java/okhttp-gson/src/main/java/org/openapitools/client/model/ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf1.java @@ -0,0 +1,273 @@ +/* + * OpenAPI 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import java.util.Objects; +import java.util.Arrays; +import com.google.gson.TypeAdapter; +import com.google.gson.annotations.JsonAdapter; +import com.google.gson.annotations.SerializedName; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.io.IOException; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; +import com.google.gson.JsonArray; +import com.google.gson.JsonDeserializationContext; +import com.google.gson.JsonDeserializer; +import com.google.gson.JsonElement; +import com.google.gson.JsonObject; +import com.google.gson.JsonParseException; +import com.google.gson.TypeAdapterFactory; +import com.google.gson.reflect.TypeToken; + +import java.lang.reflect.Type; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Map; +import java.util.Map.Entry; +import java.util.Set; + +import org.openapitools.client.JSON; + +/** + * ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf1 + */ +@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen") +public class ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf1 { + public static final String SERIALIZED_NAME_COLOR = "color"; + @SerializedName(SERIALIZED_NAME_COLOR) + private String color; + + public ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf1() { + } + + public ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf1 color(String color) { + + this.color = color; + return this; + } + + /** + * Get color + * @return color + **/ + @javax.annotation.Nullable + @ApiModelProperty(value = "") + + public String getColor() { + return color; + } + + + public void setColor(String color) { + this.color = color; + } + + /** + * A container for additional, undeclared properties. + * This is a holder for any undeclared properties as specified with + * the 'additionalProperties' keyword in the OAS document. + */ + private Map<String, Object> additionalProperties; + + /** + * Set the additional (undeclared) property with the specified name and value. + * If the property does not already exist, create it otherwise replace it. + */ + public ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf1 putAdditionalProperty(String key, Object value) { + if (this.additionalProperties == null) { + this.additionalProperties = new HashMap<String, Object>(); + } + this.additionalProperties.put(key, value); + return this; + } + + /** + * Return the additional (undeclared) property. + */ + public Map<String, Object> getAdditionalProperties() { + return additionalProperties; + } + + /** + * Return the additional (undeclared) property with the specified name. + */ + public Object getAdditionalProperty(String key) { + if (this.additionalProperties == null) { + return null; + } + return this.additionalProperties.get(key); + } + + + @Override + public boolean equals(Object o) { + if (this == o) { + return true; + } + if (o == null || getClass() != o.getClass()) { + return false; + } + ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf1 arrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf1 = (ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf1) o; + return Objects.equals(this.color, arrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf1.color)&& + Objects.equals(this.additionalProperties, arrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf1.additionalProperties); + } + + @Override + public int hashCode() { + return Objects.hash(color, additionalProperties); + } + + @Override + public String toString() { + StringBuilder sb = new StringBuilder(); + sb.append("class ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf1 {\n"); + sb.append(" color: ").append(toIndentedString(color)).append("\n"); + sb.append(" additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n"); + sb.append("}"); + return sb.toString(); + } + + /** + * Convert the given object to string with each line indented by 4 spaces + * (except the first line). + */ + private String toIndentedString(Object o) { + if (o == null) { + return "null"; + } + return o.toString().replace("\n", "\n "); + } + + + public static HashSet<String> openapiFields; + public static HashSet<String> openapiRequiredFields; + + static { + // a set of all properties/fields (JSON key names) + openapiFields = new HashSet<String>(); + openapiFields.add("color"); + + // a set of required properties/fields (JSON key names) + openapiRequiredFields = new HashSet<String>(); + } + + /** + * Validates the JSON Object and throws an exception if issues found + * + * @param jsonObj JSON Object + * @throws IOException if the JSON Object is invalid with respect to ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf1 + */ + public static void validateJsonObject(JsonObject jsonObj) throws IOException { + if (jsonObj == null) { + if (ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf1.openapiRequiredFields.isEmpty()) { + return; + } else { // has required fields + throw new IllegalArgumentException(String.format("The required field(s) %s in ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf1 is not found in the empty JSON string", ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf1.openapiRequiredFields.toString())); + } + } + if ((jsonObj.get("color") != null && !jsonObj.get("color").isJsonNull()) && !jsonObj.get("color").isJsonPrimitive()) { + throw new IllegalArgumentException(String.format("Expected the field `color` to be a primitive type in the JSON string but got `%s`", jsonObj.get("color").toString())); + } + } + + public static class CustomTypeAdapterFactory implements TypeAdapterFactory { + @SuppressWarnings("unchecked") + @Override + public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> type) { + if (!ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf1.class.isAssignableFrom(type.getRawType())) { + return null; // this class only serializes 'ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf1' and its subtypes + } + final TypeAdapter<JsonElement> elementAdapter = gson.getAdapter(JsonElement.class); + final TypeAdapter<ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf1> thisAdapter + = gson.getDelegateAdapter(this, TypeToken.get(ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf1.class)); + + return (TypeAdapter<T>) new TypeAdapter<ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf1>() { + @Override + public void write(JsonWriter out, ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf1 value) throws IOException { + JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject(); + obj.remove("additionalProperties"); + // serialize additonal properties + if (value.getAdditionalProperties() != null) { + for (Map.Entry<String, Object> entry : value.getAdditionalProperties().entrySet()) { + if (entry.getValue() instanceof String) + obj.addProperty(entry.getKey(), (String) entry.getValue()); + else if (entry.getValue() instanceof Number) + obj.addProperty(entry.getKey(), (Number) entry.getValue()); + else if (entry.getValue() instanceof Boolean) + obj.addProperty(entry.getKey(), (Boolean) entry.getValue()); + else if (entry.getValue() instanceof Character) + obj.addProperty(entry.getKey(), (Character) entry.getValue()); + else { + obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject()); + } + } + } + elementAdapter.write(out, obj); + } + + @Override + public ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf1 read(JsonReader in) throws IOException { + JsonObject jsonObj = elementAdapter.read(in).getAsJsonObject(); + validateJsonObject(jsonObj); + // store additional fields in the deserialized instance + ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf1 instance = thisAdapter.fromJsonTree(jsonObj); + for (Map.Entry<String, JsonElement> entry : jsonObj.entrySet()) { + if (!openapiFields.contains(entry.getKey())) { + if (entry.getValue().isJsonPrimitive()) { // primitive type + if (entry.getValue().getAsJsonPrimitive().isString()) + instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString()); + else if (entry.getValue().getAsJsonPrimitive().isNumber()) + instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber()); + else if (entry.getValue().getAsJsonPrimitive().isBoolean()) + instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean()); + else + throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString())); + } else { // non-primitive type + instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class)); + } + } + } + return instance; + } + + }.nullSafe(); + } + } + + /** + * Create an instance of ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf1 given an JSON string + * + * @param jsonString JSON string + * @return An instance of ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf1 + * @throws IOException if the JSON string is invalid with respect to ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf1 + */ + public static ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf1 fromJson(String jsonString) throws IOException { + return JSON.getGson().fromJson(jsonString, ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf1.class); + } + + /** + * Convert an instance of ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf1 to an JSON string + * + * @return JSON string + */ + public String toJson() { + return JSON.getGson().toJson(this); + } +} + diff --git a/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf1Test.java b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf1Test.java new file mode 100644 index 0000000000000000000000000000000000000000..427d1c9cde36e2ba5bf7639ecbd35334d876fca5 --- /dev/null +++ b/samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf1Test.java @@ -0,0 +1,50 @@ +/* + * OpenAPI 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: \" \\ + * + * The version of the OpenAPI document: 1.0.0 + * + * + * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech). + * https://openapi-generator.tech + * Do not edit the class manually. + */ + + +package org.openapitools.client.model; + +import com.google.gson.TypeAdapter; +import com.google.gson.annotations.JsonAdapter; +import com.google.gson.annotations.SerializedName; +import com.google.gson.stream.JsonReader; +import com.google.gson.stream.JsonWriter; +import io.swagger.annotations.ApiModel; +import io.swagger.annotations.ApiModelProperty; +import java.io.IOException; +import org.junit.jupiter.api.Disabled; +import org.junit.jupiter.api.Test; + + +/** + * Model tests for ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf1 + */ +public class ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf1Test { + private final ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf1 model = new ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf1(); + + /** + * Model tests for ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf1 + */ + @Test + public void testArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf1() { + // TODO: test ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf1 + } + + /** + * Test the property 'color' + */ + @Test + public void colorTest() { + // TODO: test color + } + +} diff --git a/samples/client/petstore/java/rest-assured-jackson/api/openapi.yaml b/samples/client/petstore/java/rest-assured-jackson/api/openapi.yaml index 3ded94aeafc25dcdf38c11567cfc8e8cf4f49172..151c0e7627d3cf0d34ece85ff6f72f0d799203a4 100644 --- a/samples/client/petstore/java/rest-assured-jackson/api/openapi.yaml +++ b/samples/client/petstore/java/rest-assured-jackson/api/openapi.yaml @@ -2164,11 +2164,13 @@ components: breed: type: string type: object + example: null Cat_allOf: properties: declawed: type: boolean type: object + example: null BigCat_allOf: properties: kind: @@ -2179,6 +2181,7 @@ components: - jaguars type: string type: object + example: null securitySchemes: petstore_auth: flows: diff --git a/samples/client/petstore/java/rest-assured/api/openapi.yaml b/samples/client/petstore/java/rest-assured/api/openapi.yaml index 3ded94aeafc25dcdf38c11567cfc8e8cf4f49172..151c0e7627d3cf0d34ece85ff6f72f0d799203a4 100644 --- a/samples/client/petstore/java/rest-assured/api/openapi.yaml +++ b/samples/client/petstore/java/rest-assured/api/openapi.yaml @@ -2164,11 +2164,13 @@ components: breed: type: string type: object + example: null Cat_allOf: properties: declawed: type: boolean type: object + example: null BigCat_allOf: properties: kind: @@ -2179,6 +2181,7 @@ components: - jaguars type: string type: object + example: null securitySchemes: petstore_auth: flows: diff --git a/samples/client/petstore/java/resteasy/api/openapi.yaml b/samples/client/petstore/java/resteasy/api/openapi.yaml index 3ded94aeafc25dcdf38c11567cfc8e8cf4f49172..151c0e7627d3cf0d34ece85ff6f72f0d799203a4 100644 --- a/samples/client/petstore/java/resteasy/api/openapi.yaml +++ b/samples/client/petstore/java/resteasy/api/openapi.yaml @@ -2164,11 +2164,13 @@ components: breed: type: string type: object + example: null Cat_allOf: properties: declawed: type: boolean type: object + example: null BigCat_allOf: properties: kind: @@ -2179,6 +2181,7 @@ components: - jaguars type: string type: object + example: null securitySchemes: petstore_auth: flows: diff --git a/samples/client/petstore/java/resttemplate-withXml/api/openapi.yaml b/samples/client/petstore/java/resttemplate-withXml/api/openapi.yaml index 3ded94aeafc25dcdf38c11567cfc8e8cf4f49172..151c0e7627d3cf0d34ece85ff6f72f0d799203a4 100644 --- a/samples/client/petstore/java/resttemplate-withXml/api/openapi.yaml +++ b/samples/client/petstore/java/resttemplate-withXml/api/openapi.yaml @@ -2164,11 +2164,13 @@ components: breed: type: string type: object + example: null Cat_allOf: properties: declawed: type: boolean type: object + example: null BigCat_allOf: properties: kind: @@ -2179,6 +2181,7 @@ components: - jaguars type: string type: object + example: null securitySchemes: petstore_auth: flows: diff --git a/samples/client/petstore/java/resttemplate/api/openapi.yaml b/samples/client/petstore/java/resttemplate/api/openapi.yaml index 3ded94aeafc25dcdf38c11567cfc8e8cf4f49172..151c0e7627d3cf0d34ece85ff6f72f0d799203a4 100644 --- a/samples/client/petstore/java/resttemplate/api/openapi.yaml +++ b/samples/client/petstore/java/resttemplate/api/openapi.yaml @@ -2164,11 +2164,13 @@ components: breed: type: string type: object + example: null Cat_allOf: properties: declawed: type: boolean type: object + example: null BigCat_allOf: properties: kind: @@ -2179,6 +2181,7 @@ components: - jaguars type: string type: object + example: null securitySchemes: petstore_auth: flows: diff --git a/samples/client/petstore/java/retrofit2-play26/api/openapi.yaml b/samples/client/petstore/java/retrofit2-play26/api/openapi.yaml index 3ded94aeafc25dcdf38c11567cfc8e8cf4f49172..151c0e7627d3cf0d34ece85ff6f72f0d799203a4 100644 --- a/samples/client/petstore/java/retrofit2-play26/api/openapi.yaml +++ b/samples/client/petstore/java/retrofit2-play26/api/openapi.yaml @@ -2164,11 +2164,13 @@ components: breed: type: string type: object + example: null Cat_allOf: properties: declawed: type: boolean type: object + example: null BigCat_allOf: properties: kind: @@ -2179,6 +2181,7 @@ components: - jaguars type: string type: object + example: null securitySchemes: petstore_auth: flows: diff --git a/samples/client/petstore/java/retrofit2/api/openapi.yaml b/samples/client/petstore/java/retrofit2/api/openapi.yaml index 3ded94aeafc25dcdf38c11567cfc8e8cf4f49172..151c0e7627d3cf0d34ece85ff6f72f0d799203a4 100644 --- a/samples/client/petstore/java/retrofit2/api/openapi.yaml +++ b/samples/client/petstore/java/retrofit2/api/openapi.yaml @@ -2164,11 +2164,13 @@ components: breed: type: string type: object + example: null Cat_allOf: properties: declawed: type: boolean type: object + example: null BigCat_allOf: properties: kind: @@ -2179,6 +2181,7 @@ components: - jaguars type: string type: object + example: null securitySchemes: petstore_auth: flows: diff --git a/samples/client/petstore/java/retrofit2rx2/api/openapi.yaml b/samples/client/petstore/java/retrofit2rx2/api/openapi.yaml index 3ded94aeafc25dcdf38c11567cfc8e8cf4f49172..151c0e7627d3cf0d34ece85ff6f72f0d799203a4 100644 --- a/samples/client/petstore/java/retrofit2rx2/api/openapi.yaml +++ b/samples/client/petstore/java/retrofit2rx2/api/openapi.yaml @@ -2164,11 +2164,13 @@ components: breed: type: string type: object + example: null Cat_allOf: properties: declawed: type: boolean type: object + example: null BigCat_allOf: properties: kind: @@ -2179,6 +2181,7 @@ components: - jaguars type: string type: object + example: null securitySchemes: petstore_auth: flows: diff --git a/samples/client/petstore/java/retrofit2rx3/api/openapi.yaml b/samples/client/petstore/java/retrofit2rx3/api/openapi.yaml index 3ded94aeafc25dcdf38c11567cfc8e8cf4f49172..151c0e7627d3cf0d34ece85ff6f72f0d799203a4 100644 --- a/samples/client/petstore/java/retrofit2rx3/api/openapi.yaml +++ b/samples/client/petstore/java/retrofit2rx3/api/openapi.yaml @@ -2164,11 +2164,13 @@ components: breed: type: string type: object + example: null Cat_allOf: properties: declawed: type: boolean type: object + example: null BigCat_allOf: properties: kind: @@ -2179,6 +2181,7 @@ components: - jaguars type: string type: object + example: null securitySchemes: petstore_auth: flows: diff --git a/samples/client/petstore/java/vertx-no-nullable/api/openapi.yaml b/samples/client/petstore/java/vertx-no-nullable/api/openapi.yaml index 3ded94aeafc25dcdf38c11567cfc8e8cf4f49172..151c0e7627d3cf0d34ece85ff6f72f0d799203a4 100644 --- a/samples/client/petstore/java/vertx-no-nullable/api/openapi.yaml +++ b/samples/client/petstore/java/vertx-no-nullable/api/openapi.yaml @@ -2164,11 +2164,13 @@ components: breed: type: string type: object + example: null Cat_allOf: properties: declawed: type: boolean type: object + example: null BigCat_allOf: properties: kind: @@ -2179,6 +2181,7 @@ components: - jaguars type: string type: object + example: null securitySchemes: petstore_auth: flows: diff --git a/samples/client/petstore/java/vertx/api/openapi.yaml b/samples/client/petstore/java/vertx/api/openapi.yaml index 3ded94aeafc25dcdf38c11567cfc8e8cf4f49172..151c0e7627d3cf0d34ece85ff6f72f0d799203a4 100644 --- a/samples/client/petstore/java/vertx/api/openapi.yaml +++ b/samples/client/petstore/java/vertx/api/openapi.yaml @@ -2164,11 +2164,13 @@ components: breed: type: string type: object + example: null Cat_allOf: properties: declawed: type: boolean type: object + example: null BigCat_allOf: properties: kind: @@ -2179,6 +2181,7 @@ components: - jaguars type: string type: object + example: null securitySchemes: petstore_auth: flows: diff --git a/samples/client/petstore/java/webclient/api/openapi.yaml b/samples/client/petstore/java/webclient/api/openapi.yaml index 6715cdabc8fcb9a0d4aebca323599b94d60f57f4..f54c98c7f7bfbada24fdf788068552c7d0eb8f5b 100644 --- a/samples/client/petstore/java/webclient/api/openapi.yaml +++ b/samples/client/petstore/java/webclient/api/openapi.yaml @@ -2132,11 +2132,13 @@ components: breed: type: string type: object + example: null Cat_allOf: properties: declawed: type: boolean type: object + example: null securitySchemes: petstore_auth: flows: diff --git a/samples/openapi3/client/petstore/go/go-petstore/api/openapi.yaml b/samples/openapi3/client/petstore/go/go-petstore/api/openapi.yaml index a55cbf5727e9cf32d4fd97502335aa8f8a88fa69..791d9c43e478bec69bf3e8ca2e934ca57f0e2853 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/api/openapi.yaml +++ b/samples/openapi3/client/petstore/go/go-petstore/api/openapi.yaml @@ -2126,11 +2126,13 @@ components: breed: type: string type: object + example: null Cat_allOf: properties: declawed: type: boolean type: object + example: null NullableAllOf_child: allOf: - $ref: '#/components/schemas/NullableAllOfChild' @@ -2141,6 +2143,7 @@ components: description: A discriminator value type: string type: object + example: null securitySchemes: petstore_auth: flows: diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/api/openapi.yaml b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/api/openapi.yaml index a74ced440426caa6328a9fc7d73f26fd0f6d4f64..369e485b55f6035bc931b11fc84fa4b7a4da327e 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/api/openapi.yaml +++ b/samples/openapi3/client/petstore/java/jersey2-java8-special-characters/api/openapi.yaml @@ -48,9 +48,11 @@ components: prop1: type: string type: object + example: null MySchemaName___Characters_allOf: properties: prop2: type: string type: object + example: null diff --git a/samples/openapi3/client/petstore/java/jersey2-java8/api/openapi.yaml b/samples/openapi3/client/petstore/java/jersey2-java8/api/openapi.yaml index 1db8f0a9d1a5cd6233b77518b385e7e366886ba7..bd4e3fa22b6cc2f4c4797f136fbeb300f8f91eea 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/api/openapi.yaml +++ b/samples/openapi3/client/petstore/java/jersey2-java8/api/openapi.yaml @@ -2286,11 +2286,13 @@ components: breed: type: string type: object + example: null Cat_allOf: properties: declawed: type: boolean type: object + example: null ChildCat_allOf: properties: name: @@ -2302,6 +2304,7 @@ components: type: string x-enum-as-string: true type: object + example: null securitySchemes: petstore_auth: flows: diff --git a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/resources/openapi.yaml b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/resources/openapi.yaml index bf1a427641776d3343396f42e37a40963d15cde5..5fdcfc33eadab01c4fa198e36f392d4f769dbd47 100644 --- a/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/resources/openapi.yaml +++ b/samples/openapi3/server/petstore/springboot-beanvalidation-no-nullable/src/main/resources/openapi.yaml @@ -2238,11 +2238,13 @@ components: breed: type: string type: object + example: null Cat_allOf: properties: declawed: type: boolean type: object + example: null BigCat_allOf: properties: kind: @@ -2253,6 +2255,7 @@ components: - jaguars type: string type: object + example: null securitySchemes: petstore_auth: flows: diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/resources/openapi.yaml b/samples/openapi3/server/petstore/springboot-delegate/src/main/resources/openapi.yaml index bf1a427641776d3343396f42e37a40963d15cde5..5fdcfc33eadab01c4fa198e36f392d4f769dbd47 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/resources/openapi.yaml +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/resources/openapi.yaml @@ -2238,11 +2238,13 @@ components: breed: type: string type: object + example: null Cat_allOf: properties: declawed: type: boolean type: object + example: null BigCat_allOf: properties: kind: @@ -2253,6 +2255,7 @@ components: - jaguars type: string type: object + example: null securitySchemes: petstore_auth: flows: diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml index bf1a427641776d3343396f42e37a40963d15cde5..5fdcfc33eadab01c4fa198e36f392d4f769dbd47 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml @@ -2238,11 +2238,13 @@ components: breed: type: string type: object + example: null Cat_allOf: properties: declawed: type: boolean type: object + example: null BigCat_allOf: properties: kind: @@ -2253,6 +2255,7 @@ components: - jaguars type: string type: object + example: null securitySchemes: petstore_auth: flows: diff --git a/samples/openapi3/server/petstore/springboot-reactive/src/main/resources/openapi.yaml b/samples/openapi3/server/petstore/springboot-reactive/src/main/resources/openapi.yaml index bf1a427641776d3343396f42e37a40963d15cde5..5fdcfc33eadab01c4fa198e36f392d4f769dbd47 100644 --- a/samples/openapi3/server/petstore/springboot-reactive/src/main/resources/openapi.yaml +++ b/samples/openapi3/server/petstore/springboot-reactive/src/main/resources/openapi.yaml @@ -2238,11 +2238,13 @@ components: breed: type: string type: object + example: null Cat_allOf: properties: declawed: type: boolean type: object + example: null BigCat_allOf: properties: kind: @@ -2253,6 +2255,7 @@ components: - jaguars type: string type: object + example: null securitySchemes: petstore_auth: flows: diff --git a/samples/openapi3/server/petstore/springboot-useoptional/src/main/resources/openapi.yaml b/samples/openapi3/server/petstore/springboot-useoptional/src/main/resources/openapi.yaml index bf1a427641776d3343396f42e37a40963d15cde5..5fdcfc33eadab01c4fa198e36f392d4f769dbd47 100644 --- a/samples/openapi3/server/petstore/springboot-useoptional/src/main/resources/openapi.yaml +++ b/samples/openapi3/server/petstore/springboot-useoptional/src/main/resources/openapi.yaml @@ -2238,11 +2238,13 @@ components: breed: type: string type: object + example: null Cat_allOf: properties: declawed: type: boolean type: object + example: null BigCat_allOf: properties: kind: @@ -2253,6 +2255,7 @@ components: - jaguars type: string type: object + example: null securitySchemes: petstore_auth: flows: diff --git a/samples/server/petstore/java-play-framework-fake-endpoints/public/openapi.json b/samples/server/petstore/java-play-framework-fake-endpoints/public/openapi.json index f1f6720be96262660a6f1f6e5b13606604ff7ade..3178371fbb2770ae4505c2a53c82528693b950e5 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints/public/openapi.json +++ b/samples/server/petstore/java-play-framework-fake-endpoints/public/openapi.json @@ -2850,7 +2850,8 @@ "type" : "string" } }, - "type" : "object" + "type" : "object", + "example" : null }, "Cat_allOf" : { "properties" : { @@ -2858,7 +2859,8 @@ "type" : "boolean" } }, - "type" : "object" + "type" : "object", + "example" : null }, "BigCat_allOf" : { "properties" : { @@ -2867,7 +2869,8 @@ "type" : "string" } }, - "type" : "object" + "type" : "object", + "example" : null } }, "securitySchemes" : { diff --git a/samples/server/petstore/jaxrs-spec-interface/src/main/openapi/openapi.yaml b/samples/server/petstore/jaxrs-spec-interface/src/main/openapi/openapi.yaml index bf1a427641776d3343396f42e37a40963d15cde5..5fdcfc33eadab01c4fa198e36f392d4f769dbd47 100644 --- a/samples/server/petstore/jaxrs-spec-interface/src/main/openapi/openapi.yaml +++ b/samples/server/petstore/jaxrs-spec-interface/src/main/openapi/openapi.yaml @@ -2238,11 +2238,13 @@ components: breed: type: string type: object + example: null Cat_allOf: properties: declawed: type: boolean type: object + example: null BigCat_allOf: properties: kind: @@ -2253,6 +2255,7 @@ components: - jaguars type: string type: object + example: null securitySchemes: petstore_auth: flows: diff --git a/samples/server/petstore/jaxrs-spec/src/main/openapi/openapi.yaml b/samples/server/petstore/jaxrs-spec/src/main/openapi/openapi.yaml index bf1a427641776d3343396f42e37a40963d15cde5..5fdcfc33eadab01c4fa198e36f392d4f769dbd47 100644 --- a/samples/server/petstore/jaxrs-spec/src/main/openapi/openapi.yaml +++ b/samples/server/petstore/jaxrs-spec/src/main/openapi/openapi.yaml @@ -2238,11 +2238,13 @@ components: breed: type: string type: object + example: null Cat_allOf: properties: declawed: type: boolean type: object + example: null BigCat_allOf: properties: kind: @@ -2253,6 +2255,7 @@ components: - jaguars type: string type: object + example: null securitySchemes: petstore_auth: flows: diff --git a/samples/server/petstore/rust-server/output/openapi-v3/api/openapi.yaml b/samples/server/petstore/rust-server/output/openapi-v3/api/openapi.yaml index 996c7e94d8d1bbf937faeceeb32e34bec53f0a0c..43da25ffc94e48ea983ca18e4fe9b9a52bd2e6b6 100644 --- a/samples/server/petstore/rust-server/output/openapi-v3/api/openapi.yaml +++ b/samples/server/petstore/rust-server/output/openapi-v3/api/openapi.yaml @@ -459,11 +459,9 @@ paths: items: $ref: '#/components/schemas/StringObject' type: array - explode: true in: query name: list-of-strings required: false - style: form responses: "200": description: Success @@ -685,12 +683,14 @@ components: - FOO - BAR type: string + example: null _12345AnyOfObject_anyOf: enum: - FOO - BAR - '*' type: string + example: null securitySchemes: authScheme: flows: diff --git a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/api/openapi.yaml b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/api/openapi.yaml index 96301e90a405aff81f021ae5f10d55e766892575..4c17f555f4e81b77d4b1870eb24f6a169f5e3de4 100644 --- a/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/api/openapi.yaml +++ b/samples/server/petstore/rust-server/output/petstore-with-fake-endpoints-models-for-testing/api/openapi.yaml @@ -1576,11 +1576,13 @@ components: breed: type: string type: object + example: null Cat_allOf: properties: declawed: type: boolean type: object + example: null securitySchemes: petstore_auth: flows: diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/resources/openapi.yaml index bf1a427641776d3343396f42e37a40963d15cde5..5fdcfc33eadab01c4fa198e36f392d4f769dbd47 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/resources/openapi.yaml @@ -2238,11 +2238,13 @@ components: breed: type: string type: object + example: null Cat_allOf: properties: declawed: type: boolean type: object + example: null BigCat_allOf: properties: kind: @@ -2253,6 +2255,7 @@ components: - jaguars type: string type: object + example: null securitySchemes: petstore_auth: flows: diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-beanvalidation/src/main/resources/openapi.yaml index bf1a427641776d3343396f42e37a40963d15cde5..5fdcfc33eadab01c4fa198e36f392d4f769dbd47 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-beanvalidation/src/main/resources/openapi.yaml @@ -2238,11 +2238,13 @@ components: breed: type: string type: object + example: null Cat_allOf: properties: declawed: type: boolean type: object + example: null BigCat_allOf: properties: kind: @@ -2253,6 +2255,7 @@ components: - jaguars type: string type: object + example: null securitySchemes: petstore_auth: flows: diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-delegate-j8/src/main/resources/openapi.yaml index bf1a427641776d3343396f42e37a40963d15cde5..5fdcfc33eadab01c4fa198e36f392d4f769dbd47 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-delegate-j8/src/main/resources/openapi.yaml @@ -2238,11 +2238,13 @@ components: breed: type: string type: object + example: null Cat_allOf: properties: declawed: type: boolean type: object + example: null BigCat_allOf: properties: kind: @@ -2253,6 +2255,7 @@ components: - jaguars type: string type: object + example: null securitySchemes: petstore_auth: flows: diff --git a/samples/server/petstore/springboot-delegate/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-delegate/src/main/resources/openapi.yaml index bf1a427641776d3343396f42e37a40963d15cde5..5fdcfc33eadab01c4fa198e36f392d4f769dbd47 100644 --- a/samples/server/petstore/springboot-delegate/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-delegate/src/main/resources/openapi.yaml @@ -2238,11 +2238,13 @@ components: breed: type: string type: object + example: null Cat_allOf: properties: declawed: type: boolean type: object + example: null BigCat_allOf: properties: kind: @@ -2253,6 +2255,7 @@ components: - jaguars type: string type: object + example: null securitySchemes: petstore_auth: flows: diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml index bf1a427641776d3343396f42e37a40963d15cde5..5fdcfc33eadab01c4fa198e36f392d4f769dbd47 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml @@ -2238,11 +2238,13 @@ components: breed: type: string type: object + example: null Cat_allOf: properties: declawed: type: boolean type: object + example: null BigCat_allOf: properties: kind: @@ -2253,6 +2255,7 @@ components: - jaguars type: string type: object + example: null securitySchemes: petstore_auth: flows: diff --git a/samples/server/petstore/springboot-reactive/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-reactive/src/main/resources/openapi.yaml index bf1a427641776d3343396f42e37a40963d15cde5..5fdcfc33eadab01c4fa198e36f392d4f769dbd47 100644 --- a/samples/server/petstore/springboot-reactive/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-reactive/src/main/resources/openapi.yaml @@ -2238,11 +2238,13 @@ components: breed: type: string type: object + example: null Cat_allOf: properties: declawed: type: boolean type: object + example: null BigCat_allOf: properties: kind: @@ -2253,6 +2255,7 @@ components: - jaguars type: string type: object + example: null securitySchemes: petstore_auth: flows: diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/resources/openapi.yaml index 3e8e64ad1da4462b7f9ed9d3048587601ee20e69..81cc16dcab22b7a072832b1dd2dccabc4892ae39 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/resources/openapi.yaml @@ -2232,11 +2232,13 @@ components: breed: type: string type: object + example: null Cat_allOf: properties: declawed: type: boolean type: object + example: null securitySchemes: petstore_auth: flows: diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/resources/openapi.yaml index 3e8e64ad1da4462b7f9ed9d3048587601ee20e69..81cc16dcab22b7a072832b1dd2dccabc4892ae39 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/resources/openapi.yaml @@ -2232,11 +2232,13 @@ components: breed: type: string type: object + example: null Cat_allOf: properties: declawed: type: boolean type: object + example: null securitySchemes: petstore_auth: flows: diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/resources/openapi.yaml index 3e8e64ad1da4462b7f9ed9d3048587601ee20e69..81cc16dcab22b7a072832b1dd2dccabc4892ae39 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/resources/openapi.yaml @@ -2232,11 +2232,13 @@ components: breed: type: string type: object + example: null Cat_allOf: properties: declawed: type: boolean type: object + example: null securitySchemes: petstore_auth: flows: diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-spring-pageable/src/main/resources/openapi.yaml index 3e8e64ad1da4462b7f9ed9d3048587601ee20e69..81cc16dcab22b7a072832b1dd2dccabc4892ae39 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-spring-pageable/src/main/resources/openapi.yaml @@ -2232,11 +2232,13 @@ components: breed: type: string type: object + example: null Cat_allOf: properties: declawed: type: boolean type: object + example: null securitySchemes: petstore_auth: flows: diff --git a/samples/server/petstore/springboot-useoptional/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-useoptional/src/main/resources/openapi.yaml index bf1a427641776d3343396f42e37a40963d15cde5..5fdcfc33eadab01c4fa198e36f392d4f769dbd47 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-useoptional/src/main/resources/openapi.yaml @@ -2238,11 +2238,13 @@ components: breed: type: string type: object + example: null Cat_allOf: properties: declawed: type: boolean type: object + example: null BigCat_allOf: properties: kind: @@ -2253,6 +2255,7 @@ components: - jaguars type: string type: object + example: null securitySchemes: petstore_auth: flows: diff --git a/samples/server/petstore/springboot-virtualan/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-virtualan/src/main/resources/openapi.yaml index bf1a427641776d3343396f42e37a40963d15cde5..5fdcfc33eadab01c4fa198e36f392d4f769dbd47 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-virtualan/src/main/resources/openapi.yaml @@ -2238,11 +2238,13 @@ components: breed: type: string type: object + example: null Cat_allOf: properties: declawed: type: boolean type: object + example: null BigCat_allOf: properties: kind: @@ -2253,6 +2255,7 @@ components: - jaguars type: string type: object + example: null securitySchemes: petstore_auth: flows: diff --git a/samples/server/petstore/springboot/src/main/resources/openapi.yaml b/samples/server/petstore/springboot/src/main/resources/openapi.yaml index bf1a427641776d3343396f42e37a40963d15cde5..5fdcfc33eadab01c4fa198e36f392d4f769dbd47 100644 --- a/samples/server/petstore/springboot/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot/src/main/resources/openapi.yaml @@ -2238,11 +2238,13 @@ components: breed: type: string type: object + example: null Cat_allOf: properties: declawed: type: boolean type: object + example: null BigCat_allOf: properties: kind: @@ -2253,6 +2255,7 @@ components: - jaguars type: string type: object + example: null securitySchemes: petstore_auth: flows: