diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/examples/ExampleGenerator.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/examples/ExampleGenerator.java index 6ba0cdaceeda..8b6d0a630eac 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/examples/ExampleGenerator.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/examples/ExampleGenerator.java @@ -351,7 +351,7 @@ private Object resolveModelToExample(String name, String mediaType, Schema schem } processedModels.add(name); - Map values = new HashMap<>(); + Map values = new LinkedHashMap<>(); LOGGER.debug("Resolving model '{}' to example", name); if (schema.getExample() != null) { LOGGER.debug("Using example from spec: {}", schema.getExample()); diff --git a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache index f76cf70a7b59..546de6e436fd 100644 --- a/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/JavaSpring/pojo.mustache @@ -144,7 +144,7 @@ public {{>sealed}}class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}} {{^lombok.Data}} {{! begin feature: fluent setter methods }} - public {{classname}} {{name}}({{>nullableAnnotation}}{{{datatypeWithEnum}}} {{name}}) { + public {{classname}} {{name}}({{>nullableAnnotation}}{{>nullableDataType}} {{name}}) { {{#openApiNullable}} this.{{name}} = {{#isNullable}}JsonNullable.of({{/isNullable}}{{#useOptional}}{{^required}}{{^isNullable}}{{^isContainer}}Optional.of{{#optionalAcceptNullable}}Nullable{{/optionalAcceptNullable}}({{/isContainer}}{{/isNullable}}{{/required}}{{/useOptional}}{{name}}{{#isNullable}}){{/isNullable}}{{#useOptional}}{{^required}}{{^isNullable}}{{^isContainer}}){{/isContainer}}{{/isNullable}}{{/required}}{{/useOptional}}; {{/openApiNullable}} @@ -260,7 +260,7 @@ public {{>sealed}}class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}} {{^lombok.Setter}} {{! begin feature: fluent setter methods for inherited properties }} - public {{classname}} {{name}}({{{datatypeWithEnum}}} {{name}}) { + public {{classname}} {{name}}({{>nullableAnnotation}}{{>nullableDataType}} {{name}}) { super.{{name}}({{name}}); return this; } diff --git a/modules/openapi-generator/src/main/resources/java-camel-server/pojo.mustache b/modules/openapi-generator/src/main/resources/java-camel-server/pojo.mustache index 29b24f808e96..383412a5c063 100644 --- a/modules/openapi-generator/src/main/resources/java-camel-server/pojo.mustache +++ b/modules/openapi-generator/src/main/resources/java-camel-server/pojo.mustache @@ -155,7 +155,7 @@ public class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}{{^parent}} {{^lombok.Data}} {{! begin feature: fluent setter methods }} - public {{classname}} {{name}}({{{datatypeWithEnum}}} {{name}}) { + public {{classname}} {{name}}({{>nullableDataType}} {{name}}) { {{#openApiNullable}} this.{{name}} = {{#isNullable}}JsonNullable.of({{/isNullable}}{{#useOptional}}{{^required}}{{^isNullable}}{{^isContainer}}Optional.of({{/isContainer}}{{/isNullable}}{{/required}}{{/useOptional}}{{name}}{{#isNullable}}){{/isNullable}}{{#useOptional}}{{^required}}{{^isNullable}}{{^isContainer}}){{/isContainer}}{{/isNullable}}{{/required}}{{/useOptional}}; {{/openApiNullable}} @@ -280,7 +280,7 @@ public class {{classname}}{{#parent}} extends {{{parent}}}{{/parent}}{{^parent}} {{^lombok.Setter}} {{! begin feature: fluent setter methods for inherited properties }} - public {{classname}} {{name}}({{{datatypeWithEnum}}} {{name}}) { + public {{classname}} {{name}}({{>nullableDataType}} {{name}}) { super.{{name}}({{name}}); return this; } diff --git a/modules/openapi-generator/src/test/java/org/openapitools/codegen/ExampleGeneratorTest.java b/modules/openapi-generator/src/test/java/org/openapitools/codegen/ExampleGeneratorTest.java index 2dcd51986560..2bff3ce7991e 100644 --- a/modules/openapi-generator/src/test/java/org/openapitools/codegen/ExampleGeneratorTest.java +++ b/modules/openapi-generator/src/test/java/org/openapitools/codegen/ExampleGeneratorTest.java @@ -1,6 +1,8 @@ package org.openapitools.codegen; import io.swagger.v3.oas.models.OpenAPI; +import io.swagger.v3.oas.models.media.Schema; +import io.swagger.v3.oas.models.media.IntegerSchema; import org.openapitools.codegen.examples.ExampleGenerator; import org.testng.annotations.Test; @@ -11,6 +13,7 @@ import static org.testng.AssertJUnit.assertEquals; import static org.testng.AssertJUnit.assertNull; +import static org.testng.AssertJUnit.assertTrue; public class ExampleGeneratorTest { @Test @@ -334,4 +337,77 @@ public void generateFromResponseSchemaWithAnyOfComposedModel() { assertEquals(String.format(Locale.ROOT, "{%n \"example_schema_property\" : \"example schema property value\"%n}"), examples.get(0).get("example")); assertEquals("200", examples.get(0).get("statusCode")); } + + @Test + public void testExamplePropertyOrderPreservation() { + OpenAPI openAPI = new OpenAPI(); + + // Create a schema with properties in a specific order + Schema testSchema = new Schema<>(); + testSchema.setType("object"); + + // Use LinkedHashMap to preserve property order as defined in spec + Map properties = new LinkedHashMap<>(); + + // Add properties in the specific order: zebra, apple, mango, cherry, banana + IntegerSchema zebraSchema = new IntegerSchema(); + zebraSchema.setExample(1); + properties.put("zebra", zebraSchema); + + IntegerSchema appleSchema = new IntegerSchema(); + appleSchema.setExample(2); + properties.put("apple", appleSchema); + + IntegerSchema mangoSchema = new IntegerSchema(); + mangoSchema.setExample(3); + properties.put("mango", mangoSchema); + + IntegerSchema cherrySchema = new IntegerSchema(); + cherrySchema.setExample(4); + properties.put("cherry", cherrySchema); + + IntegerSchema bananaSchema = new IntegerSchema(); + bananaSchema.setExample(5); + properties.put("banana", bananaSchema); + + testSchema.setProperties(properties); + + // Create examples map + Map examples = new HashMap<>(); + examples.put("TestModel", testSchema); + + // Generate the example using the model name approach + ExampleGenerator generator = new ExampleGenerator(examples, openAPI); + Set mediaTypeKeys = new TreeSet<>(); + mediaTypeKeys.add("application/json"); + + List> generatedExamples = generator.generate(null, new ArrayList<>(mediaTypeKeys), "TestModel"); + + assertEquals(1, generatedExamples.size()); + String exampleOutput = generatedExamples.get(0).get("example"); + + //System.out.println("Generated example output: " + exampleOutput); + + // Verify the example contains properties in the correct order + // The order should be: zebra, apple, mango, cherry, banana + assertTrue(exampleOutput.contains("\"zebra\" : 1")); + assertTrue(exampleOutput.contains("\"apple\" : 2")); + assertTrue(exampleOutput.contains("\"mango\" : 3")); + assertTrue(exampleOutput.contains("\"cherry\" : 4")); + assertTrue(exampleOutput.contains("\"banana\" : 5")); + + // Verify the order by checking the position of each field in the string + int zebraPos = exampleOutput.indexOf("\"zebra\""); + int applePos = exampleOutput.indexOf("\"apple\""); + int mangoPos = exampleOutput.indexOf("\"mango\""); + int cherryPos = exampleOutput.indexOf("\"cherry\""); + int bananaPos = exampleOutput.indexOf("\"banana\""); + + //System.out.println("Field positions: zebra=" + zebraPos + ", apple=" + applePos + ", mango=" + mangoPos + ", cherry=" + cherryPos + ", banana=" + bananaPos); + + assertTrue("zebra should come before apple", zebraPos < applePos); + assertTrue("apple should come before mango", applePos < mangoPos); + assertTrue("mango should come before cherry", mangoPos < cherryPos); + assertTrue("cherry should come before banana", cherryPos < bananaPos); + } } diff --git a/samples/client/echo_api/csharp/restsharp/net8/EchoApi/api/openapi.yaml b/samples/client/echo_api/csharp/restsharp/net8/EchoApi/api/openapi.yaml index 366a01195ff9..7f8a7aa17153 100644 --- a/samples/client/echo_api/csharp/restsharp/net8/EchoApi/api/openapi.yaml +++ b/samples/client/echo_api/csharp/restsharp/net8/EchoApi/api/openapi.yaml @@ -698,8 +698,8 @@ components: schemas: Category: example: - name: Dogs id: 1 + name: Dogs properties: id: example: 1 @@ -713,8 +713,8 @@ components: name: category Tag: example: - name: name id: 0 + name: name properties: id: format: int64 @@ -726,19 +726,19 @@ components: name: tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 10 + name: doggie category: - name: Dogs id: 1 + name: Dogs + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 0 - - name: name - id: 0 + - id: 0 + name: name + - id: 0 + name: name status: available properties: id: diff --git a/samples/client/echo_api/go/api/openapi.yaml b/samples/client/echo_api/go/api/openapi.yaml index eb05cdd20723..db621ff263e6 100644 --- a/samples/client/echo_api/go/api/openapi.yaml +++ b/samples/client/echo_api/go/api/openapi.yaml @@ -698,8 +698,8 @@ components: schemas: Category: example: - name: Dogs id: 1 + name: Dogs properties: id: example: 1 @@ -713,8 +713,8 @@ components: name: category Tag: example: - name: name id: 0 + name: name properties: id: format: int64 @@ -726,19 +726,19 @@ components: name: tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 10 + name: doggie category: - name: Dogs id: 1 + name: Dogs + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 0 - - name: name - id: 0 + - id: 0 + name: name + - id: 0 + name: name status: available properties: id: diff --git a/samples/client/echo_api/java/apache-httpclient/api/openapi.yaml b/samples/client/echo_api/java/apache-httpclient/api/openapi.yaml index 19c965868738..3db61941ab2c 100644 --- a/samples/client/echo_api/java/apache-httpclient/api/openapi.yaml +++ b/samples/client/echo_api/java/apache-httpclient/api/openapi.yaml @@ -766,8 +766,8 @@ components: schemas: Category: example: - name: Dogs id: 1 + name: Dogs properties: id: example: 1 @@ -781,8 +781,8 @@ components: name: category Tag: example: - name: name id: 0 + name: name properties: id: format: int64 @@ -794,19 +794,19 @@ components: name: tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 10 + name: doggie category: - name: Dogs id: 1 + name: Dogs + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 0 - - name: name - id: 0 + - id: 0 + name: name + - id: 0 + name: name status: available properties: id: diff --git a/samples/client/echo_api/java/feign-gson/api/openapi.yaml b/samples/client/echo_api/java/feign-gson/api/openapi.yaml index 19c965868738..3db61941ab2c 100644 --- a/samples/client/echo_api/java/feign-gson/api/openapi.yaml +++ b/samples/client/echo_api/java/feign-gson/api/openapi.yaml @@ -766,8 +766,8 @@ components: schemas: Category: example: - name: Dogs id: 1 + name: Dogs properties: id: example: 1 @@ -781,8 +781,8 @@ components: name: category Tag: example: - name: name id: 0 + name: name properties: id: format: int64 @@ -794,19 +794,19 @@ components: name: tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 10 + name: doggie category: - name: Dogs id: 1 + name: Dogs + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 0 - - name: name - id: 0 + - id: 0 + name: name + - id: 0 + name: name status: available properties: id: diff --git a/samples/client/echo_api/java/native/api/openapi.yaml b/samples/client/echo_api/java/native/api/openapi.yaml index 19c965868738..3db61941ab2c 100644 --- a/samples/client/echo_api/java/native/api/openapi.yaml +++ b/samples/client/echo_api/java/native/api/openapi.yaml @@ -766,8 +766,8 @@ components: schemas: Category: example: - name: Dogs id: 1 + name: Dogs properties: id: example: 1 @@ -781,8 +781,8 @@ components: name: category Tag: example: - name: name id: 0 + name: name properties: id: format: int64 @@ -794,19 +794,19 @@ components: name: tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 10 + name: doggie category: - name: Dogs id: 1 + name: Dogs + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 0 - - name: name - id: 0 + - id: 0 + name: name + - id: 0 + name: name status: available properties: id: diff --git a/samples/client/echo_api/java/okhttp-gson-user-defined-templates/api/openapi.yaml b/samples/client/echo_api/java/okhttp-gson-user-defined-templates/api/openapi.yaml index c3c0afb36f74..a1efcc2e4d8c 100644 --- a/samples/client/echo_api/java/okhttp-gson-user-defined-templates/api/openapi.yaml +++ b/samples/client/echo_api/java/okhttp-gson-user-defined-templates/api/openapi.yaml @@ -665,12 +665,12 @@ components: Order: description: An order for a pets from the pet store example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -701,8 +701,8 @@ components: Category: description: A category for a pet example: - name: name id: 6 + name: name properties: id: format: int64 @@ -717,14 +717,14 @@ components: User: description: A User who is purchasing from the pet store example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -752,8 +752,8 @@ components: Tag: description: A tag for a pet example: - name: name id: 1 + name: name properties: id: format: int64 @@ -767,19 +767,19 @@ components: Pet: description: A pet for sale in the pet store example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: diff --git a/samples/client/echo_api/java/okhttp-gson/api/openapi.yaml b/samples/client/echo_api/java/okhttp-gson/api/openapi.yaml index 19c965868738..3db61941ab2c 100644 --- a/samples/client/echo_api/java/okhttp-gson/api/openapi.yaml +++ b/samples/client/echo_api/java/okhttp-gson/api/openapi.yaml @@ -766,8 +766,8 @@ components: schemas: Category: example: - name: Dogs id: 1 + name: Dogs properties: id: example: 1 @@ -781,8 +781,8 @@ components: name: category Tag: example: - name: name id: 0 + name: name properties: id: format: int64 @@ -794,19 +794,19 @@ components: name: tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 10 + name: doggie category: - name: Dogs id: 1 + name: Dogs + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 0 - - name: name - id: 0 + - id: 0 + name: name + - id: 0 + name: name status: available properties: id: diff --git a/samples/client/echo_api/java/restclient/api/openapi.yaml b/samples/client/echo_api/java/restclient/api/openapi.yaml index 19c965868738..3db61941ab2c 100644 --- a/samples/client/echo_api/java/restclient/api/openapi.yaml +++ b/samples/client/echo_api/java/restclient/api/openapi.yaml @@ -766,8 +766,8 @@ components: schemas: Category: example: - name: Dogs id: 1 + name: Dogs properties: id: example: 1 @@ -781,8 +781,8 @@ components: name: category Tag: example: - name: name id: 0 + name: name properties: id: format: int64 @@ -794,19 +794,19 @@ components: name: tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 10 + name: doggie category: - name: Dogs id: 1 + name: Dogs + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 0 - - name: name - id: 0 + - id: 0 + name: name + - id: 0 + name: name status: available properties: id: diff --git a/samples/client/echo_api/java/resteasy/api/openapi.yaml b/samples/client/echo_api/java/resteasy/api/openapi.yaml index 19c965868738..3db61941ab2c 100644 --- a/samples/client/echo_api/java/resteasy/api/openapi.yaml +++ b/samples/client/echo_api/java/resteasy/api/openapi.yaml @@ -766,8 +766,8 @@ components: schemas: Category: example: - name: Dogs id: 1 + name: Dogs properties: id: example: 1 @@ -781,8 +781,8 @@ components: name: category Tag: example: - name: name id: 0 + name: name properties: id: format: int64 @@ -794,19 +794,19 @@ components: name: tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 10 + name: doggie category: - name: Dogs id: 1 + name: Dogs + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 0 - - name: name - id: 0 + - id: 0 + name: name + - id: 0 + name: name status: available properties: id: diff --git a/samples/client/echo_api/java/resttemplate/api/openapi.yaml b/samples/client/echo_api/java/resttemplate/api/openapi.yaml index 19c965868738..3db61941ab2c 100644 --- a/samples/client/echo_api/java/resttemplate/api/openapi.yaml +++ b/samples/client/echo_api/java/resttemplate/api/openapi.yaml @@ -766,8 +766,8 @@ components: schemas: Category: example: - name: Dogs id: 1 + name: Dogs properties: id: example: 1 @@ -781,8 +781,8 @@ components: name: category Tag: example: - name: name id: 0 + name: name properties: id: format: int64 @@ -794,19 +794,19 @@ components: name: tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 10 + name: doggie category: - name: Dogs id: 1 + name: Dogs + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 0 - - name: name - id: 0 + - id: 0 + name: name + - id: 0 + name: name status: available properties: id: diff --git a/samples/client/others/java/okhttp-gson-streaming/api/openapi.yaml b/samples/client/others/java/okhttp-gson-streaming/api/openapi.yaml index 901d5abb442b..9b0525ecdbc6 100644 --- a/samples/client/others/java/okhttp-gson-streaming/api/openapi.yaml +++ b/samples/client/others/java/okhttp-gson-streaming/api/openapi.yaml @@ -61,10 +61,10 @@ components: schemas: SomeObj: example: - name: name - active: true $_type: SomeObjIdentifier id: 0 + name: name + active: true type: type properties: $_type: diff --git a/samples/client/others/java/restclient-sealedInterface/api/openapi.yaml b/samples/client/others/java/restclient-sealedInterface/api/openapi.yaml index 936ffd7cd331..da2ec89ed53f 100644 --- a/samples/client/others/java/restclient-sealedInterface/api/openapi.yaml +++ b/samples/client/others/java/restclient-sealedInterface/api/openapi.yaml @@ -147,13 +147,13 @@ components: type: object example: null example: + href: href + id: id + '@schemaLocation': '@schemaLocation' '@baseType': '@baseType' '@type': '@type' fooPropA: fooPropA - href: href - id: id fooPropB: fooPropB - '@schemaLocation': '@schemaLocation' FooRef: allOf: - $ref: "#/components/schemas/EntityRef" @@ -196,21 +196,21 @@ components: type: object example: null example: + href: href + id: id + '@schemaLocation': '@schemaLocation' '@baseType': '@baseType' '@type': '@type' + barPropA: barPropA + fooPropB: fooPropB foo: + href: href + id: id + '@schemaLocation': '@schemaLocation' '@baseType': '@baseType' '@type': '@type' fooPropA: fooPropA - href: href - id: id fooPropB: fooPropB - '@schemaLocation': '@schemaLocation' - href: href - id: id - fooPropB: fooPropB - '@schemaLocation': '@schemaLocation' - barPropA: barPropA BarRefOrValue: oneOf: - $ref: "#/components/schemas/Bar" diff --git a/samples/client/others/java/webclient-sealedInterface/api/openapi.yaml b/samples/client/others/java/webclient-sealedInterface/api/openapi.yaml index e08db5ecc3f1..5d77162a3a2e 100644 --- a/samples/client/others/java/webclient-sealedInterface/api/openapi.yaml +++ b/samples/client/others/java/webclient-sealedInterface/api/openapi.yaml @@ -162,13 +162,13 @@ components: type: object example: null example: + href: href + id: id + '@schemaLocation': '@schemaLocation' '@baseType': '@baseType' '@type': '@type' fooPropA: fooPropA - href: href - id: id fooPropB: fooPropB - '@schemaLocation': '@schemaLocation' type: object FooRef: allOf: @@ -215,21 +215,21 @@ components: type: object example: null example: + href: href + id: id + '@schemaLocation': '@schemaLocation' '@baseType': '@baseType' '@type': '@type' + barPropA: barPropA + fooPropB: fooPropB foo: + href: href + id: id + '@schemaLocation': '@schemaLocation' '@baseType': '@baseType' '@type': '@type' fooPropA: fooPropA - href: href - id: id fooPropB: fooPropB - '@schemaLocation': '@schemaLocation' - href: href - id: id - fooPropB: fooPropB - '@schemaLocation': '@schemaLocation' - barPropA: barPropA type: object BarRefOrValue: oneOf: diff --git a/samples/client/others/java/webclient-sealedInterface_3_1/api/openapi.yaml b/samples/client/others/java/webclient-sealedInterface_3_1/api/openapi.yaml index 936ffd7cd331..da2ec89ed53f 100644 --- a/samples/client/others/java/webclient-sealedInterface_3_1/api/openapi.yaml +++ b/samples/client/others/java/webclient-sealedInterface_3_1/api/openapi.yaml @@ -147,13 +147,13 @@ components: type: object example: null example: + href: href + id: id + '@schemaLocation': '@schemaLocation' '@baseType': '@baseType' '@type': '@type' fooPropA: fooPropA - href: href - id: id fooPropB: fooPropB - '@schemaLocation': '@schemaLocation' FooRef: allOf: - $ref: "#/components/schemas/EntityRef" @@ -196,21 +196,21 @@ components: type: object example: null example: + href: href + id: id + '@schemaLocation': '@schemaLocation' '@baseType': '@baseType' '@type': '@type' + barPropA: barPropA + fooPropB: fooPropB foo: + href: href + id: id + '@schemaLocation': '@schemaLocation' '@baseType': '@baseType' '@type': '@type' fooPropA: fooPropA - href: href - id: id fooPropB: fooPropB - '@schemaLocation': '@schemaLocation' - href: href - id: id - fooPropB: fooPropB - '@schemaLocation': '@schemaLocation' - barPropA: barPropA BarRefOrValue: oneOf: - $ref: "#/components/schemas/Bar" diff --git a/samples/client/petstore/csharp/generichost/latest/NullTypes/api/openapi.yaml b/samples/client/petstore/csharp/generichost/latest/NullTypes/api/openapi.yaml index 90bf97be3f98..26a290a9cad1 100644 --- a/samples/client/petstore/csharp/generichost/latest/NullTypes/api/openapi.yaml +++ b/samples/client/petstore/csharp/generichost/latest/NullTypes/api/openapi.yaml @@ -62,11 +62,11 @@ components: description: | A Widget demonstrating every OAS 3.1 null-type pattern that the C# generator must handle correctly. example: - shape: "" - color: color - name: name id: 0 + name: name debugInfo: "" + shape: "" + color: color properties: id: description: Unique identifier. diff --git a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/api/openapi.yaml b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/api/openapi.yaml index 19998598b25e..a179b6cfdd29 100644 --- a/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/api/openapi.yaml +++ b/samples/client/petstore/csharp/generichost/latest/UseDateTimeOffset/api/openapi.yaml @@ -1358,9 +1358,9 @@ components: RolesReportsHash: description: Role report Hash example: + role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 role: name: name - role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 properties: role_uuid: format: uuid @@ -1381,12 +1381,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2020-02-02T20:20:20.000222Z - complete: false status: placed + complete: false properties: id: format: int64 @@ -1416,8 +1416,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1432,18 +1432,18 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 - objectWithNoDeclaredPropsNullable: "{}" phone: phone + userStatus: 6 objectWithNoDeclaredProps: "{}" - id: 0 - anyTypePropNullable: "" - email: email + objectWithNoDeclaredPropsNullable: "{}" anyTypeProp: "" - username: username + anyTypePropNullable: "" properties: id: format: int64 @@ -1489,8 +1489,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1502,19 +1502,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -2064,8 +2064,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2801,10 +2801,10 @@ components: type: integer notificationtest-getElements-v1-Response-mPayload: example: + pkiNotificationtestID: 0 a_objVariableobject: - null - null - pkiNotificationtestID: 0 properties: pkiNotificationtestID: type: integer diff --git a/samples/client/petstore/csharp/generichost/net10/AllOf/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net10/AllOf/api/openapi.yaml index b95830bb548a..b57be1506fb4 100644 --- a/samples/client/petstore/csharp/generichost/net10/AllOf/api/openapi.yaml +++ b/samples/client/petstore/csharp/generichost/net10/AllOf/api/openapi.yaml @@ -35,9 +35,9 @@ components: c: Child propertyName: $_type example: + $_type: $_type lastName: lastName firstName: firstName - $_type: $_type properties: $_type: type: string diff --git a/samples/client/petstore/csharp/generichost/net10/FormModels/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net10/FormModels/api/openapi.yaml index 02a7e6c2b775..6dae7b5ccbd3 100644 --- a/samples/client/petstore/csharp/generichost/net10/FormModels/api/openapi.yaml +++ b/samples/client/petstore/csharp/generichost/net10/FormModels/api/openapi.yaml @@ -1327,9 +1327,9 @@ components: RolesReportsHash: description: Role report Hash example: + role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 role: name: name - role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 properties: role_uuid: format: uuid @@ -1350,12 +1350,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2020-02-02T20:20:20.000222Z - complete: false status: placed + complete: false properties: id: format: int64 @@ -1380,8 +1380,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1396,18 +1396,18 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 - objectWithNoDeclaredPropsNullable: "{}" phone: phone + userStatus: 6 objectWithNoDeclaredProps: "{}" - id: 0 - anyTypePropNullable: "" - email: email + objectWithNoDeclaredPropsNullable: "{}" anyTypeProp: "" - username: username + anyTypePropNullable: "" properties: id: format: int64 @@ -1453,8 +1453,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1466,19 +1466,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1981,8 +1981,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2623,10 +2623,10 @@ components: type: integer notificationtest-getElements-v1-Response-mPayload: example: + pkiNotificationtestID: 0 a_objVariableobject: - null - null - pkiNotificationtestID: 0 properties: pkiNotificationtestID: type: integer diff --git a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/api/openapi.yaml index 19998598b25e..a179b6cfdd29 100644 --- a/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/api/openapi.yaml +++ b/samples/client/petstore/csharp/generichost/net10/NullReferenceTypes/api/openapi.yaml @@ -1358,9 +1358,9 @@ components: RolesReportsHash: description: Role report Hash example: + role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 role: name: name - role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 properties: role_uuid: format: uuid @@ -1381,12 +1381,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2020-02-02T20:20:20.000222Z - complete: false status: placed + complete: false properties: id: format: int64 @@ -1416,8 +1416,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1432,18 +1432,18 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 - objectWithNoDeclaredPropsNullable: "{}" phone: phone + userStatus: 6 objectWithNoDeclaredProps: "{}" - id: 0 - anyTypePropNullable: "" - email: email + objectWithNoDeclaredPropsNullable: "{}" anyTypeProp: "" - username: username + anyTypePropNullable: "" properties: id: format: int64 @@ -1489,8 +1489,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1502,19 +1502,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -2064,8 +2064,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2801,10 +2801,10 @@ components: type: integer notificationtest-getElements-v1-Response-mPayload: example: + pkiNotificationtestID: 0 a_objVariableobject: - null - null - pkiNotificationtestID: 0 properties: pkiNotificationtestID: type: integer diff --git a/samples/client/petstore/csharp/generichost/net10/Petstore/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net10/Petstore/api/openapi.yaml index 19998598b25e..a179b6cfdd29 100644 --- a/samples/client/petstore/csharp/generichost/net10/Petstore/api/openapi.yaml +++ b/samples/client/petstore/csharp/generichost/net10/Petstore/api/openapi.yaml @@ -1358,9 +1358,9 @@ components: RolesReportsHash: description: Role report Hash example: + role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 role: name: name - role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 properties: role_uuid: format: uuid @@ -1381,12 +1381,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2020-02-02T20:20:20.000222Z - complete: false status: placed + complete: false properties: id: format: int64 @@ -1416,8 +1416,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1432,18 +1432,18 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 - objectWithNoDeclaredPropsNullable: "{}" phone: phone + userStatus: 6 objectWithNoDeclaredProps: "{}" - id: 0 - anyTypePropNullable: "" - email: email + objectWithNoDeclaredPropsNullable: "{}" anyTypeProp: "" - username: username + anyTypePropNullable: "" properties: id: format: int64 @@ -1489,8 +1489,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1502,19 +1502,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -2064,8 +2064,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2801,10 +2801,10 @@ components: type: integer notificationtest-getElements-v1-Response-mPayload: example: + pkiNotificationtestID: 0 a_objVariableobject: - null - null - pkiNotificationtestID: 0 properties: pkiNotificationtestID: type: integer diff --git a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/api/openapi.yaml index 19998598b25e..a179b6cfdd29 100644 --- a/samples/client/petstore/csharp/generichost/net10/SourceGeneration/api/openapi.yaml +++ b/samples/client/petstore/csharp/generichost/net10/SourceGeneration/api/openapi.yaml @@ -1358,9 +1358,9 @@ components: RolesReportsHash: description: Role report Hash example: + role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 role: name: name - role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 properties: role_uuid: format: uuid @@ -1381,12 +1381,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2020-02-02T20:20:20.000222Z - complete: false status: placed + complete: false properties: id: format: int64 @@ -1416,8 +1416,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1432,18 +1432,18 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 - objectWithNoDeclaredPropsNullable: "{}" phone: phone + userStatus: 6 objectWithNoDeclaredProps: "{}" - id: 0 - anyTypePropNullable: "" - email: email + objectWithNoDeclaredPropsNullable: "{}" anyTypeProp: "" - username: username + anyTypePropNullable: "" properties: id: format: int64 @@ -1489,8 +1489,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1502,19 +1502,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -2064,8 +2064,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2801,10 +2801,10 @@ components: type: integer notificationtest-getElements-v1-Response-mPayload: example: + pkiNotificationtestID: 0 a_objVariableobject: - null - null - pkiNotificationtestID: 0 properties: pkiNotificationtestID: type: integer diff --git a/samples/client/petstore/csharp/generichost/net4.7/AllOf/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net4.7/AllOf/api/openapi.yaml index b95830bb548a..b57be1506fb4 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/AllOf/api/openapi.yaml +++ b/samples/client/petstore/csharp/generichost/net4.7/AllOf/api/openapi.yaml @@ -35,9 +35,9 @@ components: c: Child propertyName: $_type example: + $_type: $_type lastName: lastName firstName: firstName - $_type: $_type properties: $_type: type: string diff --git a/samples/client/petstore/csharp/generichost/net4.7/FormModels/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net4.7/FormModels/api/openapi.yaml index 02a7e6c2b775..6dae7b5ccbd3 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/FormModels/api/openapi.yaml +++ b/samples/client/petstore/csharp/generichost/net4.7/FormModels/api/openapi.yaml @@ -1327,9 +1327,9 @@ components: RolesReportsHash: description: Role report Hash example: + role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 role: name: name - role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 properties: role_uuid: format: uuid @@ -1350,12 +1350,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2020-02-02T20:20:20.000222Z - complete: false status: placed + complete: false properties: id: format: int64 @@ -1380,8 +1380,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1396,18 +1396,18 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 - objectWithNoDeclaredPropsNullable: "{}" phone: phone + userStatus: 6 objectWithNoDeclaredProps: "{}" - id: 0 - anyTypePropNullable: "" - email: email + objectWithNoDeclaredPropsNullable: "{}" anyTypeProp: "" - username: username + anyTypePropNullable: "" properties: id: format: int64 @@ -1453,8 +1453,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1466,19 +1466,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1981,8 +1981,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2623,10 +2623,10 @@ components: type: integer notificationtest-getElements-v1-Response-mPayload: example: + pkiNotificationtestID: 0 a_objVariableobject: - null - null - pkiNotificationtestID: 0 properties: pkiNotificationtestID: type: integer diff --git a/samples/client/petstore/csharp/generichost/net4.7/Petstore/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net4.7/Petstore/api/openapi.yaml index 19998598b25e..a179b6cfdd29 100644 --- a/samples/client/petstore/csharp/generichost/net4.7/Petstore/api/openapi.yaml +++ b/samples/client/petstore/csharp/generichost/net4.7/Petstore/api/openapi.yaml @@ -1358,9 +1358,9 @@ components: RolesReportsHash: description: Role report Hash example: + role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 role: name: name - role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 properties: role_uuid: format: uuid @@ -1381,12 +1381,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2020-02-02T20:20:20.000222Z - complete: false status: placed + complete: false properties: id: format: int64 @@ -1416,8 +1416,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1432,18 +1432,18 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 - objectWithNoDeclaredPropsNullable: "{}" phone: phone + userStatus: 6 objectWithNoDeclaredProps: "{}" - id: 0 - anyTypePropNullable: "" - email: email + objectWithNoDeclaredPropsNullable: "{}" anyTypeProp: "" - username: username + anyTypePropNullable: "" properties: id: format: int64 @@ -1489,8 +1489,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1502,19 +1502,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -2064,8 +2064,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2801,10 +2801,10 @@ components: type: integer notificationtest-getElements-v1-Response-mPayload: example: + pkiNotificationtestID: 0 a_objVariableobject: - null - null - pkiNotificationtestID: 0 properties: pkiNotificationtestID: type: integer diff --git a/samples/client/petstore/csharp/generichost/net4.8/AllOf/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net4.8/AllOf/api/openapi.yaml index b95830bb548a..b57be1506fb4 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/AllOf/api/openapi.yaml +++ b/samples/client/petstore/csharp/generichost/net4.8/AllOf/api/openapi.yaml @@ -35,9 +35,9 @@ components: c: Child propertyName: $_type example: + $_type: $_type lastName: lastName firstName: firstName - $_type: $_type properties: $_type: type: string diff --git a/samples/client/petstore/csharp/generichost/net4.8/FormModels/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net4.8/FormModels/api/openapi.yaml index 02a7e6c2b775..6dae7b5ccbd3 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/FormModels/api/openapi.yaml +++ b/samples/client/petstore/csharp/generichost/net4.8/FormModels/api/openapi.yaml @@ -1327,9 +1327,9 @@ components: RolesReportsHash: description: Role report Hash example: + role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 role: name: name - role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 properties: role_uuid: format: uuid @@ -1350,12 +1350,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2020-02-02T20:20:20.000222Z - complete: false status: placed + complete: false properties: id: format: int64 @@ -1380,8 +1380,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1396,18 +1396,18 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 - objectWithNoDeclaredPropsNullable: "{}" phone: phone + userStatus: 6 objectWithNoDeclaredProps: "{}" - id: 0 - anyTypePropNullable: "" - email: email + objectWithNoDeclaredPropsNullable: "{}" anyTypeProp: "" - username: username + anyTypePropNullable: "" properties: id: format: int64 @@ -1453,8 +1453,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1466,19 +1466,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1981,8 +1981,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2623,10 +2623,10 @@ components: type: integer notificationtest-getElements-v1-Response-mPayload: example: + pkiNotificationtestID: 0 a_objVariableobject: - null - null - pkiNotificationtestID: 0 properties: pkiNotificationtestID: type: integer diff --git a/samples/client/petstore/csharp/generichost/net4.8/Petstore/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net4.8/Petstore/api/openapi.yaml index 19998598b25e..a179b6cfdd29 100644 --- a/samples/client/petstore/csharp/generichost/net4.8/Petstore/api/openapi.yaml +++ b/samples/client/petstore/csharp/generichost/net4.8/Petstore/api/openapi.yaml @@ -1358,9 +1358,9 @@ components: RolesReportsHash: description: Role report Hash example: + role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 role: name: name - role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 properties: role_uuid: format: uuid @@ -1381,12 +1381,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2020-02-02T20:20:20.000222Z - complete: false status: placed + complete: false properties: id: format: int64 @@ -1416,8 +1416,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1432,18 +1432,18 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 - objectWithNoDeclaredPropsNullable: "{}" phone: phone + userStatus: 6 objectWithNoDeclaredProps: "{}" - id: 0 - anyTypePropNullable: "" - email: email + objectWithNoDeclaredPropsNullable: "{}" anyTypeProp: "" - username: username + anyTypePropNullable: "" properties: id: format: int64 @@ -1489,8 +1489,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1502,19 +1502,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -2064,8 +2064,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2801,10 +2801,10 @@ components: type: integer notificationtest-getElements-v1-Response-mPayload: example: + pkiNotificationtestID: 0 a_objVariableobject: - null - null - pkiNotificationtestID: 0 properties: pkiNotificationtestID: type: integer diff --git a/samples/client/petstore/csharp/generichost/net8/AllOf/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net8/AllOf/api/openapi.yaml index b95830bb548a..b57be1506fb4 100644 --- a/samples/client/petstore/csharp/generichost/net8/AllOf/api/openapi.yaml +++ b/samples/client/petstore/csharp/generichost/net8/AllOf/api/openapi.yaml @@ -35,9 +35,9 @@ components: c: Child propertyName: $_type example: + $_type: $_type lastName: lastName firstName: firstName - $_type: $_type properties: $_type: type: string diff --git a/samples/client/petstore/csharp/generichost/net8/FormModels/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net8/FormModels/api/openapi.yaml index 02a7e6c2b775..6dae7b5ccbd3 100644 --- a/samples/client/petstore/csharp/generichost/net8/FormModels/api/openapi.yaml +++ b/samples/client/petstore/csharp/generichost/net8/FormModels/api/openapi.yaml @@ -1327,9 +1327,9 @@ components: RolesReportsHash: description: Role report Hash example: + role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 role: name: name - role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 properties: role_uuid: format: uuid @@ -1350,12 +1350,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2020-02-02T20:20:20.000222Z - complete: false status: placed + complete: false properties: id: format: int64 @@ -1380,8 +1380,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1396,18 +1396,18 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 - objectWithNoDeclaredPropsNullable: "{}" phone: phone + userStatus: 6 objectWithNoDeclaredProps: "{}" - id: 0 - anyTypePropNullable: "" - email: email + objectWithNoDeclaredPropsNullable: "{}" anyTypeProp: "" - username: username + anyTypePropNullable: "" properties: id: format: int64 @@ -1453,8 +1453,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1466,19 +1466,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1981,8 +1981,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2623,10 +2623,10 @@ components: type: integer notificationtest-getElements-v1-Response-mPayload: example: + pkiNotificationtestID: 0 a_objVariableobject: - null - null - pkiNotificationtestID: 0 properties: pkiNotificationtestID: type: integer diff --git a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/api/openapi.yaml index 19998598b25e..a179b6cfdd29 100644 --- a/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/api/openapi.yaml +++ b/samples/client/petstore/csharp/generichost/net8/NullReferenceTypes/api/openapi.yaml @@ -1358,9 +1358,9 @@ components: RolesReportsHash: description: Role report Hash example: + role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 role: name: name - role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 properties: role_uuid: format: uuid @@ -1381,12 +1381,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2020-02-02T20:20:20.000222Z - complete: false status: placed + complete: false properties: id: format: int64 @@ -1416,8 +1416,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1432,18 +1432,18 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 - objectWithNoDeclaredPropsNullable: "{}" phone: phone + userStatus: 6 objectWithNoDeclaredProps: "{}" - id: 0 - anyTypePropNullable: "" - email: email + objectWithNoDeclaredPropsNullable: "{}" anyTypeProp: "" - username: username + anyTypePropNullable: "" properties: id: format: int64 @@ -1489,8 +1489,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1502,19 +1502,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -2064,8 +2064,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2801,10 +2801,10 @@ components: type: integer notificationtest-getElements-v1-Response-mPayload: example: + pkiNotificationtestID: 0 a_objVariableobject: - null - null - pkiNotificationtestID: 0 properties: pkiNotificationtestID: type: integer diff --git a/samples/client/petstore/csharp/generichost/net8/Petstore/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net8/Petstore/api/openapi.yaml index 19998598b25e..a179b6cfdd29 100644 --- a/samples/client/petstore/csharp/generichost/net8/Petstore/api/openapi.yaml +++ b/samples/client/petstore/csharp/generichost/net8/Petstore/api/openapi.yaml @@ -1358,9 +1358,9 @@ components: RolesReportsHash: description: Role report Hash example: + role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 role: name: name - role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 properties: role_uuid: format: uuid @@ -1381,12 +1381,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2020-02-02T20:20:20.000222Z - complete: false status: placed + complete: false properties: id: format: int64 @@ -1416,8 +1416,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1432,18 +1432,18 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 - objectWithNoDeclaredPropsNullable: "{}" phone: phone + userStatus: 6 objectWithNoDeclaredProps: "{}" - id: 0 - anyTypePropNullable: "" - email: email + objectWithNoDeclaredPropsNullable: "{}" anyTypeProp: "" - username: username + anyTypePropNullable: "" properties: id: format: int64 @@ -1489,8 +1489,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1502,19 +1502,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -2064,8 +2064,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2801,10 +2801,10 @@ components: type: integer notificationtest-getElements-v1-Response-mPayload: example: + pkiNotificationtestID: 0 a_objVariableobject: - null - null - pkiNotificationtestID: 0 properties: pkiNotificationtestID: type: integer diff --git a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/api/openapi.yaml index 19998598b25e..a179b6cfdd29 100644 --- a/samples/client/petstore/csharp/generichost/net8/SourceGeneration/api/openapi.yaml +++ b/samples/client/petstore/csharp/generichost/net8/SourceGeneration/api/openapi.yaml @@ -1358,9 +1358,9 @@ components: RolesReportsHash: description: Role report Hash example: + role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 role: name: name - role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 properties: role_uuid: format: uuid @@ -1381,12 +1381,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2020-02-02T20:20:20.000222Z - complete: false status: placed + complete: false properties: id: format: int64 @@ -1416,8 +1416,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1432,18 +1432,18 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 - objectWithNoDeclaredPropsNullable: "{}" phone: phone + userStatus: 6 objectWithNoDeclaredProps: "{}" - id: 0 - anyTypePropNullable: "" - email: email + objectWithNoDeclaredPropsNullable: "{}" anyTypeProp: "" - username: username + anyTypePropNullable: "" properties: id: format: int64 @@ -1489,8 +1489,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1502,19 +1502,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -2064,8 +2064,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2801,10 +2801,10 @@ components: type: integer notificationtest-getElements-v1-Response-mPayload: example: + pkiNotificationtestID: 0 a_objVariableobject: - null - null - pkiNotificationtestID: 0 properties: pkiNotificationtestID: type: integer diff --git a/samples/client/petstore/csharp/generichost/net9/AllOf/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net9/AllOf/api/openapi.yaml index b95830bb548a..b57be1506fb4 100644 --- a/samples/client/petstore/csharp/generichost/net9/AllOf/api/openapi.yaml +++ b/samples/client/petstore/csharp/generichost/net9/AllOf/api/openapi.yaml @@ -35,9 +35,9 @@ components: c: Child propertyName: $_type example: + $_type: $_type lastName: lastName firstName: firstName - $_type: $_type properties: $_type: type: string diff --git a/samples/client/petstore/csharp/generichost/net9/FormModels/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net9/FormModels/api/openapi.yaml index 02a7e6c2b775..6dae7b5ccbd3 100644 --- a/samples/client/petstore/csharp/generichost/net9/FormModels/api/openapi.yaml +++ b/samples/client/petstore/csharp/generichost/net9/FormModels/api/openapi.yaml @@ -1327,9 +1327,9 @@ components: RolesReportsHash: description: Role report Hash example: + role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 role: name: name - role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 properties: role_uuid: format: uuid @@ -1350,12 +1350,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2020-02-02T20:20:20.000222Z - complete: false status: placed + complete: false properties: id: format: int64 @@ -1380,8 +1380,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1396,18 +1396,18 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 - objectWithNoDeclaredPropsNullable: "{}" phone: phone + userStatus: 6 objectWithNoDeclaredProps: "{}" - id: 0 - anyTypePropNullable: "" - email: email + objectWithNoDeclaredPropsNullable: "{}" anyTypeProp: "" - username: username + anyTypePropNullable: "" properties: id: format: int64 @@ -1453,8 +1453,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1466,19 +1466,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1981,8 +1981,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2623,10 +2623,10 @@ components: type: integer notificationtest-getElements-v1-Response-mPayload: example: + pkiNotificationtestID: 0 a_objVariableobject: - null - null - pkiNotificationtestID: 0 properties: pkiNotificationtestID: type: integer diff --git a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/api/openapi.yaml index 19998598b25e..a179b6cfdd29 100644 --- a/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/api/openapi.yaml +++ b/samples/client/petstore/csharp/generichost/net9/NullReferenceTypes/api/openapi.yaml @@ -1358,9 +1358,9 @@ components: RolesReportsHash: description: Role report Hash example: + role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 role: name: name - role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 properties: role_uuid: format: uuid @@ -1381,12 +1381,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2020-02-02T20:20:20.000222Z - complete: false status: placed + complete: false properties: id: format: int64 @@ -1416,8 +1416,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1432,18 +1432,18 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 - objectWithNoDeclaredPropsNullable: "{}" phone: phone + userStatus: 6 objectWithNoDeclaredProps: "{}" - id: 0 - anyTypePropNullable: "" - email: email + objectWithNoDeclaredPropsNullable: "{}" anyTypeProp: "" - username: username + anyTypePropNullable: "" properties: id: format: int64 @@ -1489,8 +1489,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1502,19 +1502,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -2064,8 +2064,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2801,10 +2801,10 @@ components: type: integer notificationtest-getElements-v1-Response-mPayload: example: + pkiNotificationtestID: 0 a_objVariableobject: - null - null - pkiNotificationtestID: 0 properties: pkiNotificationtestID: type: integer diff --git a/samples/client/petstore/csharp/generichost/net9/Petstore/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net9/Petstore/api/openapi.yaml index 19998598b25e..a179b6cfdd29 100644 --- a/samples/client/petstore/csharp/generichost/net9/Petstore/api/openapi.yaml +++ b/samples/client/petstore/csharp/generichost/net9/Petstore/api/openapi.yaml @@ -1358,9 +1358,9 @@ components: RolesReportsHash: description: Role report Hash example: + role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 role: name: name - role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 properties: role_uuid: format: uuid @@ -1381,12 +1381,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2020-02-02T20:20:20.000222Z - complete: false status: placed + complete: false properties: id: format: int64 @@ -1416,8 +1416,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1432,18 +1432,18 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 - objectWithNoDeclaredPropsNullable: "{}" phone: phone + userStatus: 6 objectWithNoDeclaredProps: "{}" - id: 0 - anyTypePropNullable: "" - email: email + objectWithNoDeclaredPropsNullable: "{}" anyTypeProp: "" - username: username + anyTypePropNullable: "" properties: id: format: int64 @@ -1489,8 +1489,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1502,19 +1502,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -2064,8 +2064,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2801,10 +2801,10 @@ components: type: integer notificationtest-getElements-v1-Response-mPayload: example: + pkiNotificationtestID: 0 a_objVariableobject: - null - null - pkiNotificationtestID: 0 properties: pkiNotificationtestID: type: integer diff --git a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/api/openapi.yaml b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/api/openapi.yaml index 19998598b25e..a179b6cfdd29 100644 --- a/samples/client/petstore/csharp/generichost/net9/SourceGeneration/api/openapi.yaml +++ b/samples/client/petstore/csharp/generichost/net9/SourceGeneration/api/openapi.yaml @@ -1358,9 +1358,9 @@ components: RolesReportsHash: description: Role report Hash example: + role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 role: name: name - role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 properties: role_uuid: format: uuid @@ -1381,12 +1381,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2020-02-02T20:20:20.000222Z - complete: false status: placed + complete: false properties: id: format: int64 @@ -1416,8 +1416,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1432,18 +1432,18 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 - objectWithNoDeclaredPropsNullable: "{}" phone: phone + userStatus: 6 objectWithNoDeclaredProps: "{}" - id: 0 - anyTypePropNullable: "" - email: email + objectWithNoDeclaredPropsNullable: "{}" anyTypeProp: "" - username: username + anyTypePropNullable: "" properties: id: format: int64 @@ -1489,8 +1489,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1502,19 +1502,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -2064,8 +2064,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2801,10 +2801,10 @@ components: type: integer notificationtest-getElements-v1-Response-mPayload: example: + pkiNotificationtestID: 0 a_objVariableobject: - null - null - pkiNotificationtestID: 0 properties: pkiNotificationtestID: type: integer diff --git a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/api/openapi.yaml b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/api/openapi.yaml index 19998598b25e..a179b6cfdd29 100644 --- a/samples/client/petstore/csharp/generichost/standard2.0/Petstore/api/openapi.yaml +++ b/samples/client/petstore/csharp/generichost/standard2.0/Petstore/api/openapi.yaml @@ -1358,9 +1358,9 @@ components: RolesReportsHash: description: Role report Hash example: + role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 role: name: name - role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 properties: role_uuid: format: uuid @@ -1381,12 +1381,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2020-02-02T20:20:20.000222Z - complete: false status: placed + complete: false properties: id: format: int64 @@ -1416,8 +1416,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1432,18 +1432,18 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 - objectWithNoDeclaredPropsNullable: "{}" phone: phone + userStatus: 6 objectWithNoDeclaredProps: "{}" - id: 0 - anyTypePropNullable: "" - email: email + objectWithNoDeclaredPropsNullable: "{}" anyTypeProp: "" - username: username + anyTypePropNullable: "" properties: id: format: int64 @@ -1489,8 +1489,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1502,19 +1502,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -2064,8 +2064,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2801,10 +2801,10 @@ components: type: integer notificationtest-getElements-v1-Response-mPayload: example: + pkiNotificationtestID: 0 a_objVariableobject: - null - null - pkiNotificationtestID: 0 properties: pkiNotificationtestID: type: integer diff --git a/samples/client/petstore/csharp/httpclient/net10/Petstore-nonPublicApi/api/openapi.yaml b/samples/client/petstore/csharp/httpclient/net10/Petstore-nonPublicApi/api/openapi.yaml index 1ba4d555550c..846b09992cd3 100644 --- a/samples/client/petstore/csharp/httpclient/net10/Petstore-nonPublicApi/api/openapi.yaml +++ b/samples/client/petstore/csharp/httpclient/net10/Petstore-nonPublicApi/api/openapi.yaml @@ -57,8 +57,8 @@ components: Category: description: A category for a pet example: - name: name id: 6 + name: name properties: id: format: int64 @@ -73,8 +73,8 @@ components: Tag: description: A tag for a pet example: - name: name id: 1 + name: name properties: id: format: int64 @@ -88,19 +88,19 @@ components: Pet: description: A pet for sale in the pet store example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: diff --git a/samples/client/petstore/csharp/httpclient/net10/Petstore/api/openapi.yaml b/samples/client/petstore/csharp/httpclient/net10/Petstore/api/openapi.yaml index 19998598b25e..a179b6cfdd29 100644 --- a/samples/client/petstore/csharp/httpclient/net10/Petstore/api/openapi.yaml +++ b/samples/client/petstore/csharp/httpclient/net10/Petstore/api/openapi.yaml @@ -1358,9 +1358,9 @@ components: RolesReportsHash: description: Role report Hash example: + role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 role: name: name - role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 properties: role_uuid: format: uuid @@ -1381,12 +1381,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2020-02-02T20:20:20.000222Z - complete: false status: placed + complete: false properties: id: format: int64 @@ -1416,8 +1416,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1432,18 +1432,18 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 - objectWithNoDeclaredPropsNullable: "{}" phone: phone + userStatus: 6 objectWithNoDeclaredProps: "{}" - id: 0 - anyTypePropNullable: "" - email: email + objectWithNoDeclaredPropsNullable: "{}" anyTypeProp: "" - username: username + anyTypePropNullable: "" properties: id: format: int64 @@ -1489,8 +1489,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1502,19 +1502,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -2064,8 +2064,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2801,10 +2801,10 @@ components: type: integer notificationtest-getElements-v1-Response-mPayload: example: + pkiNotificationtestID: 0 a_objVariableobject: - null - null - pkiNotificationtestID: 0 properties: pkiNotificationtestID: type: integer diff --git a/samples/client/petstore/csharp/httpclient/net9/Petstore-nonPublicApi/api/openapi.yaml b/samples/client/petstore/csharp/httpclient/net9/Petstore-nonPublicApi/api/openapi.yaml index 1ba4d555550c..846b09992cd3 100644 --- a/samples/client/petstore/csharp/httpclient/net9/Petstore-nonPublicApi/api/openapi.yaml +++ b/samples/client/petstore/csharp/httpclient/net9/Petstore-nonPublicApi/api/openapi.yaml @@ -57,8 +57,8 @@ components: Category: description: A category for a pet example: - name: name id: 6 + name: name properties: id: format: int64 @@ -73,8 +73,8 @@ components: Tag: description: A tag for a pet example: - name: name id: 1 + name: name properties: id: format: int64 @@ -88,19 +88,19 @@ components: Pet: description: A pet for sale in the pet store example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: diff --git a/samples/client/petstore/csharp/httpclient/net9/Petstore/api/openapi.yaml b/samples/client/petstore/csharp/httpclient/net9/Petstore/api/openapi.yaml index 19998598b25e..a179b6cfdd29 100644 --- a/samples/client/petstore/csharp/httpclient/net9/Petstore/api/openapi.yaml +++ b/samples/client/petstore/csharp/httpclient/net9/Petstore/api/openapi.yaml @@ -1358,9 +1358,9 @@ components: RolesReportsHash: description: Role report Hash example: + role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 role: name: name - role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 properties: role_uuid: format: uuid @@ -1381,12 +1381,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2020-02-02T20:20:20.000222Z - complete: false status: placed + complete: false properties: id: format: int64 @@ -1416,8 +1416,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1432,18 +1432,18 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 - objectWithNoDeclaredPropsNullable: "{}" phone: phone + userStatus: 6 objectWithNoDeclaredProps: "{}" - id: 0 - anyTypePropNullable: "" - email: email + objectWithNoDeclaredPropsNullable: "{}" anyTypeProp: "" - username: username + anyTypePropNullable: "" properties: id: format: int64 @@ -1489,8 +1489,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1502,19 +1502,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -2064,8 +2064,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2801,10 +2801,10 @@ components: type: integer notificationtest-getElements-v1-Response-mPayload: example: + pkiNotificationtestID: 0 a_objVariableobject: - null - null - pkiNotificationtestID: 0 properties: pkiNotificationtestID: type: integer diff --git a/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/api/openapi.yaml b/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/api/openapi.yaml index 19998598b25e..a179b6cfdd29 100644 --- a/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/api/openapi.yaml +++ b/samples/client/petstore/csharp/httpclient/standard2.0/Petstore/api/openapi.yaml @@ -1358,9 +1358,9 @@ components: RolesReportsHash: description: Role report Hash example: + role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 role: name: name - role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 properties: role_uuid: format: uuid @@ -1381,12 +1381,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2020-02-02T20:20:20.000222Z - complete: false status: placed + complete: false properties: id: format: int64 @@ -1416,8 +1416,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1432,18 +1432,18 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 - objectWithNoDeclaredPropsNullable: "{}" phone: phone + userStatus: 6 objectWithNoDeclaredProps: "{}" - id: 0 - anyTypePropNullable: "" - email: email + objectWithNoDeclaredPropsNullable: "{}" anyTypeProp: "" - username: username + anyTypePropNullable: "" properties: id: format: int64 @@ -1489,8 +1489,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1502,19 +1502,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -2064,8 +2064,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2801,10 +2801,10 @@ components: type: integer notificationtest-getElements-v1-Response-mPayload: example: + pkiNotificationtestID: 0 a_objVariableobject: - null - null - pkiNotificationtestID: 0 properties: pkiNotificationtestID: type: integer diff --git a/samples/client/petstore/csharp/restsharp/net10/EnumMappings/api/openapi.yaml b/samples/client/petstore/csharp/restsharp/net10/EnumMappings/api/openapi.yaml index b9edae059aa9..8b117e1ca006 100644 --- a/samples/client/petstore/csharp/restsharp/net10/EnumMappings/api/openapi.yaml +++ b/samples/client/petstore/csharp/restsharp/net10/EnumMappings/api/openapi.yaml @@ -607,12 +607,12 @@ components: Order: description: An order for a pets from the pet store example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -643,8 +643,8 @@ components: Category: description: A category for a pet example: - name: name id: 6 + name: name properties: id: format: int64 @@ -659,14 +659,14 @@ components: User: description: A User who is purchasing from the pet store example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -694,8 +694,8 @@ components: Tag: description: A tag for a pet example: - name: name id: 1 + name: name properties: id: format: int64 @@ -709,19 +709,19 @@ components: Pet: description: A pet for sale in the pet store example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: diff --git a/samples/client/petstore/csharp/restsharp/net10/Petstore/api/openapi.yaml b/samples/client/petstore/csharp/restsharp/net10/Petstore/api/openapi.yaml index 16251878c7d2..eb7f61110c60 100644 --- a/samples/client/petstore/csharp/restsharp/net10/Petstore/api/openapi.yaml +++ b/samples/client/petstore/csharp/restsharp/net10/Petstore/api/openapi.yaml @@ -1307,9 +1307,9 @@ components: RolesReportsHash: description: Role report Hash example: + role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 role: name: name - role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 properties: role_uuid: format: uuid @@ -1330,12 +1330,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2020-02-02T20:20:20.000222Z - complete: false status: placed + complete: false properties: id: format: int64 @@ -1365,8 +1365,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1381,18 +1381,18 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 - objectWithNoDeclaredPropsNullable: "{}" phone: phone + userStatus: 6 objectWithNoDeclaredProps: "{}" - id: 0 - anyTypePropNullable: "" - email: email + objectWithNoDeclaredPropsNullable: "{}" anyTypeProp: "" - username: username + anyTypePropNullable: "" properties: id: format: int64 @@ -1438,8 +1438,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1451,19 +1451,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1972,8 +1972,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2709,10 +2709,10 @@ components: type: integer notificationtest-getElements-v1-Response-mPayload: example: + pkiNotificationtestID: 0 a_objVariableobject: - null - null - pkiNotificationtestID: 0 properties: pkiNotificationtestID: type: integer diff --git a/samples/client/petstore/csharp/restsharp/net4.7/MultipleFrameworks/api/openapi.yaml b/samples/client/petstore/csharp/restsharp/net4.7/MultipleFrameworks/api/openapi.yaml index b9edae059aa9..8b117e1ca006 100644 --- a/samples/client/petstore/csharp/restsharp/net4.7/MultipleFrameworks/api/openapi.yaml +++ b/samples/client/petstore/csharp/restsharp/net4.7/MultipleFrameworks/api/openapi.yaml @@ -607,12 +607,12 @@ components: Order: description: An order for a pets from the pet store example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -643,8 +643,8 @@ components: Category: description: A category for a pet example: - name: name id: 6 + name: name properties: id: format: int64 @@ -659,14 +659,14 @@ components: User: description: A User who is purchasing from the pet store example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -694,8 +694,8 @@ components: Tag: description: A tag for a pet example: - name: name id: 1 + name: name properties: id: format: int64 @@ -709,19 +709,19 @@ components: Pet: description: A pet for sale in the pet store example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: diff --git a/samples/client/petstore/csharp/restsharp/net4.7/Petstore/api/openapi.yaml b/samples/client/petstore/csharp/restsharp/net4.7/Petstore/api/openapi.yaml index 886c93019332..62fa8d98f5fa 100644 --- a/samples/client/petstore/csharp/restsharp/net4.7/Petstore/api/openapi.yaml +++ b/samples/client/petstore/csharp/restsharp/net4.7/Petstore/api/openapi.yaml @@ -1305,9 +1305,9 @@ components: RolesReportsHash: description: Role report Hash example: + role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 role: name: name - role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 properties: role_uuid: format: uuid @@ -1328,12 +1328,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2020-02-02T20:20:20.000222Z - complete: false status: placed + complete: false properties: id: format: int64 @@ -1363,8 +1363,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1379,18 +1379,18 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 - objectWithNoDeclaredPropsNullable: "{}" phone: phone + userStatus: 6 objectWithNoDeclaredProps: "{}" - id: 0 - anyTypePropNullable: "" - email: email + objectWithNoDeclaredPropsNullable: "{}" anyTypeProp: "" - username: username + anyTypePropNullable: "" properties: id: format: int64 @@ -1436,8 +1436,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1449,19 +1449,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1970,8 +1970,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2707,10 +2707,10 @@ components: type: integer notificationtest-getElements-v1-Response-mPayload: example: + pkiNotificationtestID: 0 a_objVariableobject: - null - null - pkiNotificationtestID: 0 properties: pkiNotificationtestID: type: integer diff --git a/samples/client/petstore/csharp/restsharp/net4.8/Petstore/api/openapi.yaml b/samples/client/petstore/csharp/restsharp/net4.8/Petstore/api/openapi.yaml index 886c93019332..62fa8d98f5fa 100644 --- a/samples/client/petstore/csharp/restsharp/net4.8/Petstore/api/openapi.yaml +++ b/samples/client/petstore/csharp/restsharp/net4.8/Petstore/api/openapi.yaml @@ -1305,9 +1305,9 @@ components: RolesReportsHash: description: Role report Hash example: + role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 role: name: name - role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 properties: role_uuid: format: uuid @@ -1328,12 +1328,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2020-02-02T20:20:20.000222Z - complete: false status: placed + complete: false properties: id: format: int64 @@ -1363,8 +1363,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1379,18 +1379,18 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 - objectWithNoDeclaredPropsNullable: "{}" phone: phone + userStatus: 6 objectWithNoDeclaredProps: "{}" - id: 0 - anyTypePropNullable: "" - email: email + objectWithNoDeclaredPropsNullable: "{}" anyTypeProp: "" - username: username + anyTypePropNullable: "" properties: id: format: int64 @@ -1436,8 +1436,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1449,19 +1449,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1970,8 +1970,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2707,10 +2707,10 @@ components: type: integer notificationtest-getElements-v1-Response-mPayload: example: + pkiNotificationtestID: 0 a_objVariableobject: - null - null - pkiNotificationtestID: 0 properties: pkiNotificationtestID: type: integer diff --git a/samples/client/petstore/csharp/restsharp/net8/EnumMappings/api/openapi.yaml b/samples/client/petstore/csharp/restsharp/net8/EnumMappings/api/openapi.yaml index 886c93019332..62fa8d98f5fa 100644 --- a/samples/client/petstore/csharp/restsharp/net8/EnumMappings/api/openapi.yaml +++ b/samples/client/petstore/csharp/restsharp/net8/EnumMappings/api/openapi.yaml @@ -1305,9 +1305,9 @@ components: RolesReportsHash: description: Role report Hash example: + role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 role: name: name - role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 properties: role_uuid: format: uuid @@ -1328,12 +1328,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2020-02-02T20:20:20.000222Z - complete: false status: placed + complete: false properties: id: format: int64 @@ -1363,8 +1363,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1379,18 +1379,18 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 - objectWithNoDeclaredPropsNullable: "{}" phone: phone + userStatus: 6 objectWithNoDeclaredProps: "{}" - id: 0 - anyTypePropNullable: "" - email: email + objectWithNoDeclaredPropsNullable: "{}" anyTypeProp: "" - username: username + anyTypePropNullable: "" properties: id: format: int64 @@ -1436,8 +1436,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1449,19 +1449,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1970,8 +1970,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2707,10 +2707,10 @@ components: type: integer notificationtest-getElements-v1-Response-mPayload: example: + pkiNotificationtestID: 0 a_objVariableobject: - null - null - pkiNotificationtestID: 0 properties: pkiNotificationtestID: type: integer diff --git a/samples/client/petstore/csharp/restsharp/net8/Petstore/api/openapi.yaml b/samples/client/petstore/csharp/restsharp/net8/Petstore/api/openapi.yaml index 19998598b25e..a179b6cfdd29 100644 --- a/samples/client/petstore/csharp/restsharp/net8/Petstore/api/openapi.yaml +++ b/samples/client/petstore/csharp/restsharp/net8/Petstore/api/openapi.yaml @@ -1358,9 +1358,9 @@ components: RolesReportsHash: description: Role report Hash example: + role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 role: name: name - role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 properties: role_uuid: format: uuid @@ -1381,12 +1381,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2020-02-02T20:20:20.000222Z - complete: false status: placed + complete: false properties: id: format: int64 @@ -1416,8 +1416,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1432,18 +1432,18 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 - objectWithNoDeclaredPropsNullable: "{}" phone: phone + userStatus: 6 objectWithNoDeclaredProps: "{}" - id: 0 - anyTypePropNullable: "" - email: email + objectWithNoDeclaredPropsNullable: "{}" anyTypeProp: "" - username: username + anyTypePropNullable: "" properties: id: format: int64 @@ -1489,8 +1489,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1502,19 +1502,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -2064,8 +2064,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2801,10 +2801,10 @@ components: type: integer notificationtest-getElements-v1-Response-mPayload: example: + pkiNotificationtestID: 0 a_objVariableobject: - null - null - pkiNotificationtestID: 0 properties: pkiNotificationtestID: type: integer diff --git a/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/api/openapi.yaml b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/api/openapi.yaml index 1ba4d555550c..846b09992cd3 100644 --- a/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/api/openapi.yaml +++ b/samples/client/petstore/csharp/restsharp/net8/useVirtualForHooks/api/openapi.yaml @@ -57,8 +57,8 @@ components: Category: description: A category for a pet example: - name: name id: 6 + name: name properties: id: format: int64 @@ -73,8 +73,8 @@ components: Tag: description: A tag for a pet example: - name: name id: 1 + name: name properties: id: format: int64 @@ -88,19 +88,19 @@ components: Pet: description: A pet for sale in the pet store example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: diff --git a/samples/client/petstore/csharp/restsharp/net9/EnumMappings/api/openapi.yaml b/samples/client/petstore/csharp/restsharp/net9/EnumMappings/api/openapi.yaml index 886c93019332..62fa8d98f5fa 100644 --- a/samples/client/petstore/csharp/restsharp/net9/EnumMappings/api/openapi.yaml +++ b/samples/client/petstore/csharp/restsharp/net9/EnumMappings/api/openapi.yaml @@ -1305,9 +1305,9 @@ components: RolesReportsHash: description: Role report Hash example: + role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 role: name: name - role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 properties: role_uuid: format: uuid @@ -1328,12 +1328,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2020-02-02T20:20:20.000222Z - complete: false status: placed + complete: false properties: id: format: int64 @@ -1363,8 +1363,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1379,18 +1379,18 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 - objectWithNoDeclaredPropsNullable: "{}" phone: phone + userStatus: 6 objectWithNoDeclaredProps: "{}" - id: 0 - anyTypePropNullable: "" - email: email + objectWithNoDeclaredPropsNullable: "{}" anyTypeProp: "" - username: username + anyTypePropNullable: "" properties: id: format: int64 @@ -1436,8 +1436,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1449,19 +1449,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1970,8 +1970,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2707,10 +2707,10 @@ components: type: integer notificationtest-getElements-v1-Response-mPayload: example: + pkiNotificationtestID: 0 a_objVariableobject: - null - null - pkiNotificationtestID: 0 properties: pkiNotificationtestID: type: integer diff --git a/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/api/openapi.yaml b/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/api/openapi.yaml index 19998598b25e..a179b6cfdd29 100644 --- a/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/api/openapi.yaml +++ b/samples/client/petstore/csharp/restsharp/standard2.0/ConditionalSerialization/api/openapi.yaml @@ -1358,9 +1358,9 @@ components: RolesReportsHash: description: Role report Hash example: + role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 role: name: name - role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 properties: role_uuid: format: uuid @@ -1381,12 +1381,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2020-02-02T20:20:20.000222Z - complete: false status: placed + complete: false properties: id: format: int64 @@ -1416,8 +1416,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1432,18 +1432,18 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 - objectWithNoDeclaredPropsNullable: "{}" phone: phone + userStatus: 6 objectWithNoDeclaredProps: "{}" - id: 0 - anyTypePropNullable: "" - email: email + objectWithNoDeclaredPropsNullable: "{}" anyTypeProp: "" - username: username + anyTypePropNullable: "" properties: id: format: int64 @@ -1489,8 +1489,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1502,19 +1502,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -2064,8 +2064,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2801,10 +2801,10 @@ components: type: integer notificationtest-getElements-v1-Response-mPayload: example: + pkiNotificationtestID: 0 a_objVariableobject: - null - null - pkiNotificationtestID: 0 properties: pkiNotificationtestID: type: integer diff --git a/samples/client/petstore/csharp/restsharp/standard2.0/Petstore/api/openapi.yaml b/samples/client/petstore/csharp/restsharp/standard2.0/Petstore/api/openapi.yaml index 16251878c7d2..eb7f61110c60 100644 --- a/samples/client/petstore/csharp/restsharp/standard2.0/Petstore/api/openapi.yaml +++ b/samples/client/petstore/csharp/restsharp/standard2.0/Petstore/api/openapi.yaml @@ -1307,9 +1307,9 @@ components: RolesReportsHash: description: Role report Hash example: + role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 role: name: name - role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 properties: role_uuid: format: uuid @@ -1330,12 +1330,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2020-02-02T20:20:20.000222Z - complete: false status: placed + complete: false properties: id: format: int64 @@ -1365,8 +1365,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1381,18 +1381,18 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 - objectWithNoDeclaredPropsNullable: "{}" phone: phone + userStatus: 6 objectWithNoDeclaredProps: "{}" - id: 0 - anyTypePropNullable: "" - email: email + objectWithNoDeclaredPropsNullable: "{}" anyTypeProp: "" - username: username + anyTypePropNullable: "" properties: id: format: int64 @@ -1438,8 +1438,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1451,19 +1451,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1972,8 +1972,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2709,10 +2709,10 @@ components: type: integer notificationtest-getElements-v1-Response-mPayload: example: + pkiNotificationtestID: 0 a_objVariableobject: - null - null - pkiNotificationtestID: 0 properties: pkiNotificationtestID: type: integer diff --git a/samples/client/petstore/csharp/unityWebRequest/net10/Petstore/api/openapi.yaml b/samples/client/petstore/csharp/unityWebRequest/net10/Petstore/api/openapi.yaml index 19998598b25e..a179b6cfdd29 100644 --- a/samples/client/petstore/csharp/unityWebRequest/net10/Petstore/api/openapi.yaml +++ b/samples/client/petstore/csharp/unityWebRequest/net10/Petstore/api/openapi.yaml @@ -1358,9 +1358,9 @@ components: RolesReportsHash: description: Role report Hash example: + role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 role: name: name - role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 properties: role_uuid: format: uuid @@ -1381,12 +1381,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2020-02-02T20:20:20.000222Z - complete: false status: placed + complete: false properties: id: format: int64 @@ -1416,8 +1416,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1432,18 +1432,18 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 - objectWithNoDeclaredPropsNullable: "{}" phone: phone + userStatus: 6 objectWithNoDeclaredProps: "{}" - id: 0 - anyTypePropNullable: "" - email: email + objectWithNoDeclaredPropsNullable: "{}" anyTypeProp: "" - username: username + anyTypePropNullable: "" properties: id: format: int64 @@ -1489,8 +1489,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1502,19 +1502,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -2064,8 +2064,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2801,10 +2801,10 @@ components: type: integer notificationtest-getElements-v1-Response-mPayload: example: + pkiNotificationtestID: 0 a_objVariableobject: - null - null - pkiNotificationtestID: 0 properties: pkiNotificationtestID: type: integer diff --git a/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/api/openapi.yaml b/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/api/openapi.yaml index 19998598b25e..a179b6cfdd29 100644 --- a/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/api/openapi.yaml +++ b/samples/client/petstore/csharp/unityWebRequest/net9/Petstore/api/openapi.yaml @@ -1358,9 +1358,9 @@ components: RolesReportsHash: description: Role report Hash example: + role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 role: name: name - role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 properties: role_uuid: format: uuid @@ -1381,12 +1381,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2020-02-02T20:20:20.000222Z - complete: false status: placed + complete: false properties: id: format: int64 @@ -1416,8 +1416,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1432,18 +1432,18 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 - objectWithNoDeclaredPropsNullable: "{}" phone: phone + userStatus: 6 objectWithNoDeclaredProps: "{}" - id: 0 - anyTypePropNullable: "" - email: email + objectWithNoDeclaredPropsNullable: "{}" anyTypeProp: "" - username: username + anyTypePropNullable: "" properties: id: format: int64 @@ -1489,8 +1489,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1502,19 +1502,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -2064,8 +2064,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2801,10 +2801,10 @@ components: type: integer notificationtest-getElements-v1-Response-mPayload: example: + pkiNotificationtestID: 0 a_objVariableobject: - null - null - pkiNotificationtestID: 0 properties: pkiNotificationtestID: type: integer diff --git a/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/api/openapi.yaml b/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/api/openapi.yaml index 19998598b25e..a179b6cfdd29 100644 --- a/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/api/openapi.yaml +++ b/samples/client/petstore/csharp/unityWebRequest/standard2.0/Petstore/api/openapi.yaml @@ -1358,9 +1358,9 @@ components: RolesReportsHash: description: Role report Hash example: + role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 role: name: name - role_uuid: 046b6c7f-0b8a-43b9-b35d-6489e6daee91 properties: role_uuid: format: uuid @@ -1381,12 +1381,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2020-02-02T20:20:20.000222Z - complete: false status: placed + complete: false properties: id: format: int64 @@ -1416,8 +1416,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1432,18 +1432,18 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 - objectWithNoDeclaredPropsNullable: "{}" phone: phone + userStatus: 6 objectWithNoDeclaredProps: "{}" - id: 0 - anyTypePropNullable: "" - email: email + objectWithNoDeclaredPropsNullable: "{}" anyTypeProp: "" - username: username + anyTypePropNullable: "" properties: id: format: int64 @@ -1489,8 +1489,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1502,19 +1502,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -2064,8 +2064,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2801,10 +2801,10 @@ components: type: integer notificationtest-getElements-v1-Response-mPayload: example: + pkiNotificationtestID: 0 a_objVariableobject: - null - null - pkiNotificationtestID: 0 properties: pkiNotificationtestID: type: integer diff --git a/samples/client/petstore/go/go-petstore/api/openapi.yaml b/samples/client/petstore/go/go-petstore/api/openapi.yaml index 0e71a56691ee..0c537a5ee3f9 100644 --- a/samples/client/petstore/go/go-petstore/api/openapi.yaml +++ b/samples/client/petstore/go/go-petstore/api/openapi.yaml @@ -1091,12 +1091,12 @@ components: schemas: Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1125,8 +1125,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1141,14 +1141,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1175,8 +1175,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1188,19 +1188,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1706,8 +1706,8 @@ components: type: string OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: diff --git a/samples/client/petstore/java/apache-httpclient-jackson3/api/openapi.yaml b/samples/client/petstore/java/apache-httpclient-jackson3/api/openapi.yaml index 7d3a48a0496b..9a74972a7401 100644 --- a/samples/client/petstore/java/apache-httpclient-jackson3/api/openapi.yaml +++ b/samples/client/petstore/java/apache-httpclient-jackson3/api/openapi.yaml @@ -1436,12 +1436,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1470,8 +1470,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1486,14 +1486,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1520,8 +1520,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1533,19 +1533,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1982,8 +1982,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2021,9 +2021,9 @@ components: type: string type: object example: - otherProperty: otherProperty - nullableProperty: nullableProperty type: ChildWithNullable + nullableProperty: nullableProperty + otherProperty: otherProperty StringBooleanMap: additionalProperties: type: boolean diff --git a/samples/client/petstore/java/apache-httpclient/api/openapi.yaml b/samples/client/petstore/java/apache-httpclient/api/openapi.yaml index 7d3a48a0496b..9a74972a7401 100644 --- a/samples/client/petstore/java/apache-httpclient/api/openapi.yaml +++ b/samples/client/petstore/java/apache-httpclient/api/openapi.yaml @@ -1436,12 +1436,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1470,8 +1470,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1486,14 +1486,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1520,8 +1520,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1533,19 +1533,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1982,8 +1982,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2021,9 +2021,9 @@ components: type: string type: object example: - otherProperty: otherProperty - nullableProperty: nullableProperty type: ChildWithNullable + nullableProperty: nullableProperty + otherProperty: otherProperty StringBooleanMap: additionalProperties: type: boolean diff --git a/samples/client/petstore/java/feign-hc5/api/openapi.yaml b/samples/client/petstore/java/feign-hc5/api/openapi.yaml index 7d3a48a0496b..9a74972a7401 100644 --- a/samples/client/petstore/java/feign-hc5/api/openapi.yaml +++ b/samples/client/petstore/java/feign-hc5/api/openapi.yaml @@ -1436,12 +1436,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1470,8 +1470,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1486,14 +1486,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1520,8 +1520,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1533,19 +1533,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1982,8 +1982,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2021,9 +2021,9 @@ components: type: string type: object example: - otherProperty: otherProperty - nullableProperty: nullableProperty type: ChildWithNullable + nullableProperty: nullableProperty + otherProperty: otherProperty StringBooleanMap: additionalProperties: type: boolean 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 7e1e3a0f13b9..426145d1685a 100644 --- a/samples/client/petstore/java/feign-no-nullable/api/openapi.yaml +++ b/samples/client/petstore/java/feign-no-nullable/api/openapi.yaml @@ -1196,12 +1196,12 @@ components: schemas: Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1230,8 +1230,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1246,14 +1246,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1280,8 +1280,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1293,19 +1293,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1811,8 +1811,8 @@ components: type: string OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: diff --git a/samples/client/petstore/java/feign/api/openapi.yaml b/samples/client/petstore/java/feign/api/openapi.yaml index 7d3a48a0496b..9a74972a7401 100644 --- a/samples/client/petstore/java/feign/api/openapi.yaml +++ b/samples/client/petstore/java/feign/api/openapi.yaml @@ -1436,12 +1436,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1470,8 +1470,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1486,14 +1486,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1520,8 +1520,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1533,19 +1533,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1982,8 +1982,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2021,9 +2021,9 @@ components: type: string type: object example: - otherProperty: otherProperty - nullableProperty: nullableProperty type: ChildWithNullable + nullableProperty: nullableProperty + otherProperty: otherProperty StringBooleanMap: additionalProperties: type: boolean 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 7e1e3a0f13b9..426145d1685a 100644 --- a/samples/client/petstore/java/google-api-client/api/openapi.yaml +++ b/samples/client/petstore/java/google-api-client/api/openapi.yaml @@ -1196,12 +1196,12 @@ components: schemas: Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1230,8 +1230,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1246,14 +1246,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1280,8 +1280,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1293,19 +1293,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1811,8 +1811,8 @@ components: type: string OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: 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 7e1e3a0f13b9..426145d1685a 100644 --- a/samples/client/petstore/java/jersey2-java8-localdatetime/api/openapi.yaml +++ b/samples/client/petstore/java/jersey2-java8-localdatetime/api/openapi.yaml @@ -1196,12 +1196,12 @@ components: schemas: Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1230,8 +1230,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1246,14 +1246,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1280,8 +1280,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1293,19 +1293,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1811,8 +1811,8 @@ components: type: string OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: diff --git a/samples/client/petstore/java/jersey2-java8/api/openapi.yaml b/samples/client/petstore/java/jersey2-java8/api/openapi.yaml index 7e1e3a0f13b9..426145d1685a 100644 --- a/samples/client/petstore/java/jersey2-java8/api/openapi.yaml +++ b/samples/client/petstore/java/jersey2-java8/api/openapi.yaml @@ -1196,12 +1196,12 @@ components: schemas: Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1230,8 +1230,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1246,14 +1246,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1280,8 +1280,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1293,19 +1293,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1811,8 +1811,8 @@ components: type: string OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: diff --git a/samples/client/petstore/java/jersey3/api/openapi.yaml b/samples/client/petstore/java/jersey3/api/openapi.yaml index 724ee694f1f2..c336960b860c 100644 --- a/samples/client/petstore/java/jersey3/api/openapi.yaml +++ b/samples/client/petstore/java/jersey3/api/openapi.yaml @@ -1311,12 +1311,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2020-02-02T20:20:20.000222Z - complete: false status: placed + complete: false properties: id: format: int64 @@ -1346,8 +1346,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1362,18 +1362,18 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 - objectWithNoDeclaredPropsNullable: "{}" phone: phone + userStatus: 6 objectWithNoDeclaredProps: "{}" - id: 0 - anyTypePropNullable: "" - email: email + objectWithNoDeclaredPropsNullable: "{}" anyTypeProp: "" - username: username + anyTypePropNullable: "" properties: id: format: int64 @@ -1419,8 +1419,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1432,19 +1432,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1905,8 +1905,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: diff --git a/samples/client/petstore/java/native-async/api/openapi.yaml b/samples/client/petstore/java/native-async/api/openapi.yaml index 679fbdda6ba6..c999de47bc75 100644 --- a/samples/client/petstore/java/native-async/api/openapi.yaml +++ b/samples/client/petstore/java/native-async/api/openapi.yaml @@ -1322,12 +1322,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2020-02-02T20:20:20.000222Z - complete: false status: placed + complete: false properties: id: format: int64 @@ -1357,8 +1357,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1373,18 +1373,18 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 - objectWithNoDeclaredPropsNullable: "{}" phone: phone + userStatus: 6 objectWithNoDeclaredProps: "{}" - id: 0 - anyTypePropNullable: "" - email: email + objectWithNoDeclaredPropsNullable: "{}" anyTypeProp: "" - username: username + anyTypePropNullable: "" properties: id: format: int64 @@ -1430,8 +1430,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1443,19 +1443,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1916,8 +1916,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: diff --git a/samples/client/petstore/java/native-jackson3-jspecify/api/openapi.yaml b/samples/client/petstore/java/native-jackson3-jspecify/api/openapi.yaml index 9fb2142503e4..bb4af21b8960 100644 --- a/samples/client/petstore/java/native-jackson3-jspecify/api/openapi.yaml +++ b/samples/client/petstore/java/native-jackson3-jspecify/api/openapi.yaml @@ -61,7 +61,6 @@ components: Foo: example: dt: 2000-01-23T04:56:07.000+00:00 - number: 0.8008281904610115 binary: "" listOfDt: - 2000-01-23T04:56:07.000+00:00 @@ -70,6 +69,7 @@ components: - 2000-01-23T04:56:07.000+00:00 - 2000-01-23T04:56:07.000+00:00 requiredDt: 2000-01-23T04:56:07.000+00:00 + number: 0.8008281904610115 properties: dt: format: date-time diff --git a/samples/client/petstore/java/native-jackson3/api/openapi.yaml b/samples/client/petstore/java/native-jackson3/api/openapi.yaml index 679fbdda6ba6..c999de47bc75 100644 --- a/samples/client/petstore/java/native-jackson3/api/openapi.yaml +++ b/samples/client/petstore/java/native-jackson3/api/openapi.yaml @@ -1322,12 +1322,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2020-02-02T20:20:20.000222Z - complete: false status: placed + complete: false properties: id: format: int64 @@ -1357,8 +1357,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1373,18 +1373,18 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 - objectWithNoDeclaredPropsNullable: "{}" phone: phone + userStatus: 6 objectWithNoDeclaredProps: "{}" - id: 0 - anyTypePropNullable: "" - email: email + objectWithNoDeclaredPropsNullable: "{}" anyTypeProp: "" - username: username + anyTypePropNullable: "" properties: id: format: int64 @@ -1430,8 +1430,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1443,19 +1443,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1916,8 +1916,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: diff --git a/samples/client/petstore/java/native-jakarta/api/openapi.yaml b/samples/client/petstore/java/native-jakarta/api/openapi.yaml index c3c0afb36f74..a1efcc2e4d8c 100644 --- a/samples/client/petstore/java/native-jakarta/api/openapi.yaml +++ b/samples/client/petstore/java/native-jakarta/api/openapi.yaml @@ -665,12 +665,12 @@ components: Order: description: An order for a pets from the pet store example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -701,8 +701,8 @@ components: Category: description: A category for a pet example: - name: name id: 6 + name: name properties: id: format: int64 @@ -717,14 +717,14 @@ components: User: description: A User who is purchasing from the pet store example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -752,8 +752,8 @@ components: Tag: description: A tag for a pet example: - name: name id: 1 + name: name properties: id: format: int64 @@ -767,19 +767,19 @@ components: Pet: description: A pet for sale in the pet store example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: diff --git a/samples/client/petstore/java/native-useGzipFeature/api/openapi.yaml b/samples/client/petstore/java/native-useGzipFeature/api/openapi.yaml index e12cb58862db..ca8277d711bc 100644 --- a/samples/client/petstore/java/native-useGzipFeature/api/openapi.yaml +++ b/samples/client/petstore/java/native-useGzipFeature/api/openapi.yaml @@ -61,8 +61,8 @@ components: Category: description: A category for a pet example: - name: name id: 6 + name: name properties: id: format: int64 @@ -77,8 +77,8 @@ components: Tag: description: A tag for a pet example: - name: name id: 1 + name: name properties: id: format: int64 @@ -92,19 +92,19 @@ components: Pet: description: A pet for sale in the pet store example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: diff --git a/samples/client/petstore/java/native/api/openapi.yaml b/samples/client/petstore/java/native/api/openapi.yaml index 679fbdda6ba6..c999de47bc75 100644 --- a/samples/client/petstore/java/native/api/openapi.yaml +++ b/samples/client/petstore/java/native/api/openapi.yaml @@ -1322,12 +1322,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2020-02-02T20:20:20.000222Z - complete: false status: placed + complete: false properties: id: format: int64 @@ -1357,8 +1357,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1373,18 +1373,18 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 - objectWithNoDeclaredPropsNullable: "{}" phone: phone + userStatus: 6 objectWithNoDeclaredProps: "{}" - id: 0 - anyTypePropNullable: "" - email: email + objectWithNoDeclaredPropsNullable: "{}" anyTypeProp: "" - username: username + anyTypePropNullable: "" properties: id: format: int64 @@ -1430,8 +1430,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1443,19 +1443,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1916,8 +1916,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: diff --git a/samples/client/petstore/java/okhttp-gson-3.1/api/openapi.yaml b/samples/client/petstore/java/okhttp-gson-3.1/api/openapi.yaml index 143fc0a336ce..b025a1f25653 100644 --- a/samples/client/petstore/java/okhttp-gson-3.1/api/openapi.yaml +++ b/samples/client/petstore/java/okhttp-gson-3.1/api/openapi.yaml @@ -895,12 +895,12 @@ components: Order: description: An order for a pets from the pet store example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -930,8 +930,8 @@ components: Category: description: A category for a pet example: - name: name id: 6 + name: name properties: id: format: int64 @@ -945,14 +945,14 @@ components: User: description: A User who is purchasing from the pet store example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -979,8 +979,8 @@ components: Tag: description: A tag for a pet example: - name: name id: 1 + name: name properties: id: format: int64 @@ -993,19 +993,19 @@ components: Pet: description: A pet for sale in the pet store example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: diff --git a/samples/client/petstore/java/okhttp-gson-awsv4signature/api/openapi.yaml b/samples/client/petstore/java/okhttp-gson-awsv4signature/api/openapi.yaml index c3c0afb36f74..a1efcc2e4d8c 100644 --- a/samples/client/petstore/java/okhttp-gson-awsv4signature/api/openapi.yaml +++ b/samples/client/petstore/java/okhttp-gson-awsv4signature/api/openapi.yaml @@ -665,12 +665,12 @@ components: Order: description: An order for a pets from the pet store example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -701,8 +701,8 @@ components: Category: description: A category for a pet example: - name: name id: 6 + name: name properties: id: format: int64 @@ -717,14 +717,14 @@ components: User: description: A User who is purchasing from the pet store example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -752,8 +752,8 @@ components: Tag: description: A tag for a pet example: - name: name id: 1 + name: name properties: id: format: int64 @@ -767,19 +767,19 @@ components: Pet: description: A pet for sale in the pet store example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: 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 7e1e3a0f13b9..426145d1685a 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 @@ -1196,12 +1196,12 @@ components: schemas: Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1230,8 +1230,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1246,14 +1246,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1280,8 +1280,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1293,19 +1293,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1811,8 +1811,8 @@ components: type: string OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: diff --git a/samples/client/petstore/java/okhttp-gson-group-parameter/api/openapi.yaml b/samples/client/petstore/java/okhttp-gson-group-parameter/api/openapi.yaml index 921582869876..80c98f47cea9 100644 --- a/samples/client/petstore/java/okhttp-gson-group-parameter/api/openapi.yaml +++ b/samples/client/petstore/java/okhttp-gson-group-parameter/api/openapi.yaml @@ -359,8 +359,8 @@ components: Category: description: A category for a pet example: - name: name id: 6 + name: name properties: id: format: int64 @@ -401,8 +401,8 @@ components: Tag: description: A tag for a pet example: - name: name id: 1 + name: name properties: id: format: int64 @@ -416,19 +416,19 @@ components: Pet: description: A pet for sale in the pet store example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: diff --git a/samples/client/petstore/java/okhttp-gson-nullable-required/api/openapi.yaml b/samples/client/petstore/java/okhttp-gson-nullable-required/api/openapi.yaml index 880ac4348325..d6e3b97cf3b8 100644 --- a/samples/client/petstore/java/okhttp-gson-nullable-required/api/openapi.yaml +++ b/samples/client/petstore/java/okhttp-gson-nullable-required/api/openapi.yaml @@ -641,12 +641,12 @@ components: Order: description: An order for a pets from the pet store example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -677,8 +677,8 @@ components: Category: description: A category for a pet example: - name: name id: 6 + name: name properties: id: format: int64 @@ -693,14 +693,14 @@ components: User: description: A User who is purchasing from the pet store example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -728,8 +728,8 @@ components: Tag: description: A tag for a pet example: - name: name id: 1 + name: name properties: id: format: int64 @@ -743,19 +743,19 @@ components: Pet: description: A pet for sale in the pet store example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: 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 7e1e3a0f13b9..426145d1685a 100644 --- a/samples/client/petstore/java/okhttp-gson-parcelableModel/api/openapi.yaml +++ b/samples/client/petstore/java/okhttp-gson-parcelableModel/api/openapi.yaml @@ -1196,12 +1196,12 @@ components: schemas: Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1230,8 +1230,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1246,14 +1246,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1280,8 +1280,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1293,19 +1293,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1811,8 +1811,8 @@ components: type: string OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: diff --git a/samples/client/petstore/java/okhttp-gson-swagger1/api/openapi.yaml b/samples/client/petstore/java/okhttp-gson-swagger1/api/openapi.yaml index a3db1598d290..d45ad9329428 100644 --- a/samples/client/petstore/java/okhttp-gson-swagger1/api/openapi.yaml +++ b/samples/client/petstore/java/okhttp-gson-swagger1/api/openapi.yaml @@ -665,12 +665,12 @@ components: Order: description: An order for a pets from the pet store example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -701,8 +701,8 @@ components: Category: description: A category for a pet example: - name: name id: 6 + name: name properties: id: format: int64 @@ -717,14 +717,14 @@ components: User: description: A User who is purchasing from the pet store example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -752,8 +752,8 @@ components: Tag: description: A tag for a pet example: - name: name id: 1 + name: name properties: id: format: int64 @@ -767,19 +767,19 @@ components: Pet: description: A pet for sale in the pet store example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: diff --git a/samples/client/petstore/java/okhttp-gson-swagger2/api/openapi.yaml b/samples/client/petstore/java/okhttp-gson-swagger2/api/openapi.yaml index c3c0afb36f74..a1efcc2e4d8c 100644 --- a/samples/client/petstore/java/okhttp-gson-swagger2/api/openapi.yaml +++ b/samples/client/petstore/java/okhttp-gson-swagger2/api/openapi.yaml @@ -665,12 +665,12 @@ components: Order: description: An order for a pets from the pet store example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -701,8 +701,8 @@ components: Category: description: A category for a pet example: - name: name id: 6 + name: name properties: id: format: int64 @@ -717,14 +717,14 @@ components: User: description: A User who is purchasing from the pet store example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -752,8 +752,8 @@ components: Tag: description: A tag for a pet example: - name: name id: 1 + name: name properties: id: format: int64 @@ -767,19 +767,19 @@ components: Pet: description: A pet for sale in the pet store example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: diff --git a/samples/client/petstore/java/okhttp-gson/api/openapi.yaml b/samples/client/petstore/java/okhttp-gson/api/openapi.yaml index ef5aa7ad125b..4206587c9fd2 100644 --- a/samples/client/petstore/java/okhttp-gson/api/openapi.yaml +++ b/samples/client/petstore/java/okhttp-gson/api/openapi.yaml @@ -1575,12 +1575,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2020-02-02T20:20:20.000222Z - complete: false status: placed + complete: false properties: id: format: int64 @@ -1610,8 +1610,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1626,18 +1626,18 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 - objectWithNoDeclaredPropsNullable: "{}" phone: phone + userStatus: 6 objectWithNoDeclaredProps: "{}" - id: 0 - anyTypePropNullable: "" - email: email + objectWithNoDeclaredPropsNullable: "{}" anyTypeProp: "" - username: username + anyTypePropNullable: "" properties: id: format: int64 @@ -1683,8 +1683,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1696,19 +1696,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -2201,8 +2201,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2918,29 +2918,29 @@ components: - string_prop type: object example: + integer_prop: 0 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 + date_prop: 2000-01-23 + datetime_prop: 2000-01-23T04:56:07.000+00:00 array_nullable_prop: - "{}" - "{}" - custom_enum: custom - integer_prop: 0 array_and_items_nullable_prop: - "{}" - "{}" - object_items_nullable: - key: "{}" + array_items_nullable: + - "{}" + - "{}" object_nullable_prop: key: "{}" object_and_items_nullable_prop: key: "{}" - date_prop: 2000-01-23 - array_items_nullable: - - "{}" - - "{}" + object_items_nullable: + key: "{}" + custom_ref_enum: custom + custom_enum: custom NestedArrayWithDefaultValues: properties: nestedArray: 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 7e1e3a0f13b9..426145d1685a 100644 --- a/samples/client/petstore/java/rest-assured-jackson/api/openapi.yaml +++ b/samples/client/petstore/java/rest-assured-jackson/api/openapi.yaml @@ -1196,12 +1196,12 @@ components: schemas: Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1230,8 +1230,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1246,14 +1246,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1280,8 +1280,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1293,19 +1293,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1811,8 +1811,8 @@ components: type: string OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: diff --git a/samples/client/petstore/java/rest-assured/api/openapi.yaml b/samples/client/petstore/java/rest-assured/api/openapi.yaml index 7e1e3a0f13b9..426145d1685a 100644 --- a/samples/client/petstore/java/rest-assured/api/openapi.yaml +++ b/samples/client/petstore/java/rest-assured/api/openapi.yaml @@ -1196,12 +1196,12 @@ components: schemas: Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1230,8 +1230,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1246,14 +1246,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1280,8 +1280,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1293,19 +1293,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1811,8 +1811,8 @@ components: type: string OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: diff --git a/samples/client/petstore/java/restclient-nullable-arrays/api/openapi.yaml b/samples/client/petstore/java/restclient-nullable-arrays/api/openapi.yaml index 4d22c956f502..79b34a6a9326 100644 --- a/samples/client/petstore/java/restclient-nullable-arrays/api/openapi.yaml +++ b/samples/client/petstore/java/restclient-nullable-arrays/api/openapi.yaml @@ -28,8 +28,8 @@ components: ByteArrayObject: example: nullableArray: nullableArray - nullableString: nullableString normalArray: normalArray + nullableString: nullableString stringField: stringField intField: 0.8008281904610115 properties: diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson2/api/openapi.yaml b/samples/client/petstore/java/restclient-springBoot4-jackson2/api/openapi.yaml index e12cb58862db..ca8277d711bc 100644 --- a/samples/client/petstore/java/restclient-springBoot4-jackson2/api/openapi.yaml +++ b/samples/client/petstore/java/restclient-springBoot4-jackson2/api/openapi.yaml @@ -61,8 +61,8 @@ components: Category: description: A category for a pet example: - name: name id: 6 + name: name properties: id: format: int64 @@ -77,8 +77,8 @@ components: Tag: description: A tag for a pet example: - name: name id: 1 + name: name properties: id: format: int64 @@ -92,19 +92,19 @@ components: Pet: description: A pet for sale in the pet store example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/api/openapi.yaml b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/api/openapi.yaml index 9fb2142503e4..bb4af21b8960 100644 --- a/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/api/openapi.yaml +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3-jspecify/api/openapi.yaml @@ -61,7 +61,6 @@ components: Foo: example: dt: 2000-01-23T04:56:07.000+00:00 - number: 0.8008281904610115 binary: "" listOfDt: - 2000-01-23T04:56:07.000+00:00 @@ -70,6 +69,7 @@ components: - 2000-01-23T04:56:07.000+00:00 - 2000-01-23T04:56:07.000+00:00 requiredDt: 2000-01-23T04:56:07.000+00:00 + number: 0.8008281904610115 properties: dt: format: date-time diff --git a/samples/client/petstore/java/restclient-springBoot4-jackson3/api/openapi.yaml b/samples/client/petstore/java/restclient-springBoot4-jackson3/api/openapi.yaml index e12cb58862db..ca8277d711bc 100644 --- a/samples/client/petstore/java/restclient-springBoot4-jackson3/api/openapi.yaml +++ b/samples/client/petstore/java/restclient-springBoot4-jackson3/api/openapi.yaml @@ -61,8 +61,8 @@ components: Category: description: A category for a pet example: - name: name id: 6 + name: name properties: id: format: int64 @@ -77,8 +77,8 @@ components: Tag: description: A tag for a pet example: - name: name id: 1 + name: name properties: id: format: int64 @@ -92,19 +92,19 @@ components: Pet: description: A pet for sale in the pet store example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: diff --git a/samples/client/petstore/java/restclient-swagger2/api/openapi.yaml b/samples/client/petstore/java/restclient-swagger2/api/openapi.yaml index 7d3a48a0496b..9a74972a7401 100644 --- a/samples/client/petstore/java/restclient-swagger2/api/openapi.yaml +++ b/samples/client/petstore/java/restclient-swagger2/api/openapi.yaml @@ -1436,12 +1436,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1470,8 +1470,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1486,14 +1486,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1520,8 +1520,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1533,19 +1533,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1982,8 +1982,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2021,9 +2021,9 @@ components: type: string type: object example: - otherProperty: otherProperty - nullableProperty: nullableProperty type: ChildWithNullable + nullableProperty: nullableProperty + otherProperty: otherProperty StringBooleanMap: additionalProperties: type: boolean diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/api/openapi.yaml b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/api/openapi.yaml index 7d3a48a0496b..9a74972a7401 100644 --- a/samples/client/petstore/java/restclient-useSingleRequestParameter-static/api/openapi.yaml +++ b/samples/client/petstore/java/restclient-useSingleRequestParameter-static/api/openapi.yaml @@ -1436,12 +1436,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1470,8 +1470,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1486,14 +1486,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1520,8 +1520,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1533,19 +1533,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1982,8 +1982,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2021,9 +2021,9 @@ components: type: string type: object example: - otherProperty: otherProperty - nullableProperty: nullableProperty type: ChildWithNullable + nullableProperty: nullableProperty + otherProperty: otherProperty StringBooleanMap: additionalProperties: type: boolean diff --git a/samples/client/petstore/java/restclient-useSingleRequestParameter/api/openapi.yaml b/samples/client/petstore/java/restclient-useSingleRequestParameter/api/openapi.yaml index 7d3a48a0496b..9a74972a7401 100644 --- a/samples/client/petstore/java/restclient-useSingleRequestParameter/api/openapi.yaml +++ b/samples/client/petstore/java/restclient-useSingleRequestParameter/api/openapi.yaml @@ -1436,12 +1436,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1470,8 +1470,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1486,14 +1486,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1520,8 +1520,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1533,19 +1533,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1982,8 +1982,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2021,9 +2021,9 @@ components: type: string type: object example: - otherProperty: otherProperty - nullableProperty: nullableProperty type: ChildWithNullable + nullableProperty: nullableProperty + otherProperty: otherProperty StringBooleanMap: additionalProperties: type: boolean diff --git a/samples/client/petstore/java/restclient/api/openapi.yaml b/samples/client/petstore/java/restclient/api/openapi.yaml index 7d3a48a0496b..9a74972a7401 100644 --- a/samples/client/petstore/java/restclient/api/openapi.yaml +++ b/samples/client/petstore/java/restclient/api/openapi.yaml @@ -1436,12 +1436,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1470,8 +1470,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1486,14 +1486,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1520,8 +1520,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1533,19 +1533,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1982,8 +1982,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2021,9 +2021,9 @@ components: type: string type: object example: - otherProperty: otherProperty - nullableProperty: nullableProperty type: ChildWithNullable + nullableProperty: nullableProperty + otherProperty: otherProperty StringBooleanMap: additionalProperties: type: boolean diff --git a/samples/client/petstore/java/resteasy/api/openapi.yaml b/samples/client/petstore/java/resteasy/api/openapi.yaml index 7d3a48a0496b..9a74972a7401 100644 --- a/samples/client/petstore/java/resteasy/api/openapi.yaml +++ b/samples/client/petstore/java/resteasy/api/openapi.yaml @@ -1436,12 +1436,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1470,8 +1470,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1486,14 +1486,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1520,8 +1520,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1533,19 +1533,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1982,8 +1982,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2021,9 +2021,9 @@ components: type: string type: object example: - otherProperty: otherProperty - nullableProperty: nullableProperty type: ChildWithNullable + nullableProperty: nullableProperty + otherProperty: otherProperty StringBooleanMap: additionalProperties: type: boolean diff --git a/samples/client/petstore/java/resttemplate-jakarta/api/openapi.yaml b/samples/client/petstore/java/resttemplate-jakarta/api/openapi.yaml index c3c0afb36f74..a1efcc2e4d8c 100644 --- a/samples/client/petstore/java/resttemplate-jakarta/api/openapi.yaml +++ b/samples/client/petstore/java/resttemplate-jakarta/api/openapi.yaml @@ -665,12 +665,12 @@ components: Order: description: An order for a pets from the pet store example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -701,8 +701,8 @@ components: Category: description: A category for a pet example: - name: name id: 6 + name: name properties: id: format: int64 @@ -717,14 +717,14 @@ components: User: description: A User who is purchasing from the pet store example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -752,8 +752,8 @@ components: Tag: description: A tag for a pet example: - name: name id: 1 + name: name properties: id: format: int64 @@ -767,19 +767,19 @@ components: Pet: description: A pet for sale in the pet store example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: diff --git a/samples/client/petstore/java/resttemplate-springBoot4-jackson2/api/openapi.yaml b/samples/client/petstore/java/resttemplate-springBoot4-jackson2/api/openapi.yaml index e12cb58862db..ca8277d711bc 100644 --- a/samples/client/petstore/java/resttemplate-springBoot4-jackson2/api/openapi.yaml +++ b/samples/client/petstore/java/resttemplate-springBoot4-jackson2/api/openapi.yaml @@ -61,8 +61,8 @@ components: Category: description: A category for a pet example: - name: name id: 6 + name: name properties: id: format: int64 @@ -77,8 +77,8 @@ components: Tag: description: A tag for a pet example: - name: name id: 1 + name: name properties: id: format: int64 @@ -92,19 +92,19 @@ components: Pet: description: A pet for sale in the pet store example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: diff --git a/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/api/openapi.yaml b/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/api/openapi.yaml index 9fb2142503e4..bb4af21b8960 100644 --- a/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/api/openapi.yaml +++ b/samples/client/petstore/java/resttemplate-springBoot4-jackson3-jspecify/api/openapi.yaml @@ -61,7 +61,6 @@ components: Foo: example: dt: 2000-01-23T04:56:07.000+00:00 - number: 0.8008281904610115 binary: "" listOfDt: - 2000-01-23T04:56:07.000+00:00 @@ -70,6 +69,7 @@ components: - 2000-01-23T04:56:07.000+00:00 - 2000-01-23T04:56:07.000+00:00 requiredDt: 2000-01-23T04:56:07.000+00:00 + number: 0.8008281904610115 properties: dt: format: date-time diff --git a/samples/client/petstore/java/resttemplate-springBoot4-jackson3/api/openapi.yaml b/samples/client/petstore/java/resttemplate-springBoot4-jackson3/api/openapi.yaml index e12cb58862db..ca8277d711bc 100644 --- a/samples/client/petstore/java/resttemplate-springBoot4-jackson3/api/openapi.yaml +++ b/samples/client/petstore/java/resttemplate-springBoot4-jackson3/api/openapi.yaml @@ -61,8 +61,8 @@ components: Category: description: A category for a pet example: - name: name id: 6 + name: name properties: id: format: int64 @@ -77,8 +77,8 @@ components: Tag: description: A tag for a pet example: - name: name id: 1 + name: name properties: id: format: int64 @@ -92,19 +92,19 @@ components: Pet: description: A pet for sale in the pet store example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: diff --git a/samples/client/petstore/java/resttemplate-swagger1/api/openapi.yaml b/samples/client/petstore/java/resttemplate-swagger1/api/openapi.yaml index c3c0afb36f74..a1efcc2e4d8c 100644 --- a/samples/client/petstore/java/resttemplate-swagger1/api/openapi.yaml +++ b/samples/client/petstore/java/resttemplate-swagger1/api/openapi.yaml @@ -665,12 +665,12 @@ components: Order: description: An order for a pets from the pet store example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -701,8 +701,8 @@ components: Category: description: A category for a pet example: - name: name id: 6 + name: name properties: id: format: int64 @@ -717,14 +717,14 @@ components: User: description: A User who is purchasing from the pet store example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -752,8 +752,8 @@ components: Tag: description: A tag for a pet example: - name: name id: 1 + name: name properties: id: format: int64 @@ -767,19 +767,19 @@ components: Pet: description: A pet for sale in the pet store example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: diff --git a/samples/client/petstore/java/resttemplate-swagger2/api/openapi.yaml b/samples/client/petstore/java/resttemplate-swagger2/api/openapi.yaml index c3c0afb36f74..a1efcc2e4d8c 100644 --- a/samples/client/petstore/java/resttemplate-swagger2/api/openapi.yaml +++ b/samples/client/petstore/java/resttemplate-swagger2/api/openapi.yaml @@ -665,12 +665,12 @@ components: Order: description: An order for a pets from the pet store example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -701,8 +701,8 @@ components: Category: description: A category for a pet example: - name: name id: 6 + name: name properties: id: format: int64 @@ -717,14 +717,14 @@ components: User: description: A User who is purchasing from the pet store example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -752,8 +752,8 @@ components: Tag: description: A tag for a pet example: - name: name id: 1 + name: name properties: id: format: int64 @@ -767,19 +767,19 @@ components: Pet: description: A pet for sale in the pet store example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: diff --git a/samples/client/petstore/java/resttemplate-withXml/api/openapi.yaml b/samples/client/petstore/java/resttemplate-withXml/api/openapi.yaml index 7d3a48a0496b..9a74972a7401 100644 --- a/samples/client/petstore/java/resttemplate-withXml/api/openapi.yaml +++ b/samples/client/petstore/java/resttemplate-withXml/api/openapi.yaml @@ -1436,12 +1436,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1470,8 +1470,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1486,14 +1486,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1520,8 +1520,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1533,19 +1533,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1982,8 +1982,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2021,9 +2021,9 @@ components: type: string type: object example: - otherProperty: otherProperty - nullableProperty: nullableProperty type: ChildWithNullable + nullableProperty: nullableProperty + otherProperty: otherProperty StringBooleanMap: additionalProperties: type: boolean diff --git a/samples/client/petstore/java/resttemplate/api/openapi.yaml b/samples/client/petstore/java/resttemplate/api/openapi.yaml index 7d3a48a0496b..9a74972a7401 100644 --- a/samples/client/petstore/java/resttemplate/api/openapi.yaml +++ b/samples/client/petstore/java/resttemplate/api/openapi.yaml @@ -1436,12 +1436,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1470,8 +1470,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1486,14 +1486,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1520,8 +1520,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1533,19 +1533,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1982,8 +1982,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2021,9 +2021,9 @@ components: type: string type: object example: - otherProperty: otherProperty - nullableProperty: nullableProperty type: ChildWithNullable + nullableProperty: nullableProperty + otherProperty: otherProperty StringBooleanMap: additionalProperties: type: boolean diff --git a/samples/client/petstore/java/retrofit2-play26/api/openapi.yaml b/samples/client/petstore/java/retrofit2-play26/api/openapi.yaml index 7e1e3a0f13b9..426145d1685a 100644 --- a/samples/client/petstore/java/retrofit2-play26/api/openapi.yaml +++ b/samples/client/petstore/java/retrofit2-play26/api/openapi.yaml @@ -1196,12 +1196,12 @@ components: schemas: Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1230,8 +1230,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1246,14 +1246,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1280,8 +1280,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1293,19 +1293,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1811,8 +1811,8 @@ components: type: string OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: diff --git a/samples/client/petstore/java/retrofit2/api/openapi.yaml b/samples/client/petstore/java/retrofit2/api/openapi.yaml index 7e1e3a0f13b9..426145d1685a 100644 --- a/samples/client/petstore/java/retrofit2/api/openapi.yaml +++ b/samples/client/petstore/java/retrofit2/api/openapi.yaml @@ -1196,12 +1196,12 @@ components: schemas: Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1230,8 +1230,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1246,14 +1246,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1280,8 +1280,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1293,19 +1293,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1811,8 +1811,8 @@ components: type: string OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: diff --git a/samples/client/petstore/java/retrofit2rx2/api/openapi.yaml b/samples/client/petstore/java/retrofit2rx2/api/openapi.yaml index 7e1e3a0f13b9..426145d1685a 100644 --- a/samples/client/petstore/java/retrofit2rx2/api/openapi.yaml +++ b/samples/client/petstore/java/retrofit2rx2/api/openapi.yaml @@ -1196,12 +1196,12 @@ components: schemas: Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1230,8 +1230,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1246,14 +1246,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1280,8 +1280,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1293,19 +1293,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1811,8 +1811,8 @@ components: type: string OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: diff --git a/samples/client/petstore/java/retrofit2rx3/api/openapi.yaml b/samples/client/petstore/java/retrofit2rx3/api/openapi.yaml index 7e1e3a0f13b9..426145d1685a 100644 --- a/samples/client/petstore/java/retrofit2rx3/api/openapi.yaml +++ b/samples/client/petstore/java/retrofit2rx3/api/openapi.yaml @@ -1196,12 +1196,12 @@ components: schemas: Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1230,8 +1230,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1246,14 +1246,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1280,8 +1280,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1293,19 +1293,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1811,8 +1811,8 @@ components: type: string OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: 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 7e1e3a0f13b9..426145d1685a 100644 --- a/samples/client/petstore/java/vertx-no-nullable/api/openapi.yaml +++ b/samples/client/petstore/java/vertx-no-nullable/api/openapi.yaml @@ -1196,12 +1196,12 @@ components: schemas: Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1230,8 +1230,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1246,14 +1246,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1280,8 +1280,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1293,19 +1293,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1811,8 +1811,8 @@ components: type: string OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: diff --git a/samples/client/petstore/java/vertx-supportVertxFuture/api/openapi.yaml b/samples/client/petstore/java/vertx-supportVertxFuture/api/openapi.yaml index 7d3a48a0496b..9a74972a7401 100644 --- a/samples/client/petstore/java/vertx-supportVertxFuture/api/openapi.yaml +++ b/samples/client/petstore/java/vertx-supportVertxFuture/api/openapi.yaml @@ -1436,12 +1436,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1470,8 +1470,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1486,14 +1486,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1520,8 +1520,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1533,19 +1533,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1982,8 +1982,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2021,9 +2021,9 @@ components: type: string type: object example: - otherProperty: otherProperty - nullableProperty: nullableProperty type: ChildWithNullable + nullableProperty: nullableProperty + otherProperty: otherProperty StringBooleanMap: additionalProperties: type: boolean diff --git a/samples/client/petstore/java/vertx/api/openapi.yaml b/samples/client/petstore/java/vertx/api/openapi.yaml index 7d3a48a0496b..9a74972a7401 100644 --- a/samples/client/petstore/java/vertx/api/openapi.yaml +++ b/samples/client/petstore/java/vertx/api/openapi.yaml @@ -1436,12 +1436,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1470,8 +1470,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1486,14 +1486,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1520,8 +1520,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1533,19 +1533,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1982,8 +1982,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2021,9 +2021,9 @@ components: type: string type: object example: - otherProperty: otherProperty - nullableProperty: nullableProperty type: ChildWithNullable + nullableProperty: nullableProperty + otherProperty: otherProperty StringBooleanMap: additionalProperties: type: boolean diff --git a/samples/client/petstore/java/vertx5-supportVertxFuture/api/openapi.yaml b/samples/client/petstore/java/vertx5-supportVertxFuture/api/openapi.yaml index 7d3a48a0496b..9a74972a7401 100644 --- a/samples/client/petstore/java/vertx5-supportVertxFuture/api/openapi.yaml +++ b/samples/client/petstore/java/vertx5-supportVertxFuture/api/openapi.yaml @@ -1436,12 +1436,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1470,8 +1470,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1486,14 +1486,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1520,8 +1520,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1533,19 +1533,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1982,8 +1982,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2021,9 +2021,9 @@ components: type: string type: object example: - otherProperty: otherProperty - nullableProperty: nullableProperty type: ChildWithNullable + nullableProperty: nullableProperty + otherProperty: otherProperty StringBooleanMap: additionalProperties: type: boolean diff --git a/samples/client/petstore/java/vertx5/api/openapi.yaml b/samples/client/petstore/java/vertx5/api/openapi.yaml index 7d3a48a0496b..9a74972a7401 100644 --- a/samples/client/petstore/java/vertx5/api/openapi.yaml +++ b/samples/client/petstore/java/vertx5/api/openapi.yaml @@ -1436,12 +1436,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1470,8 +1470,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1486,14 +1486,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1520,8 +1520,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1533,19 +1533,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1982,8 +1982,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2021,9 +2021,9 @@ components: type: string type: object example: - otherProperty: otherProperty - nullableProperty: nullableProperty type: ChildWithNullable + nullableProperty: nullableProperty + otherProperty: otherProperty StringBooleanMap: additionalProperties: type: boolean diff --git a/samples/client/petstore/java/webclient-jakarta/api/openapi.yaml b/samples/client/petstore/java/webclient-jakarta/api/openapi.yaml index 7d3a48a0496b..9a74972a7401 100644 --- a/samples/client/petstore/java/webclient-jakarta/api/openapi.yaml +++ b/samples/client/petstore/java/webclient-jakarta/api/openapi.yaml @@ -1436,12 +1436,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1470,8 +1470,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1486,14 +1486,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1520,8 +1520,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1533,19 +1533,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1982,8 +1982,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2021,9 +2021,9 @@ components: type: string type: object example: - otherProperty: otherProperty - nullableProperty: nullableProperty type: ChildWithNullable + nullableProperty: nullableProperty + otherProperty: otherProperty StringBooleanMap: additionalProperties: type: boolean diff --git a/samples/client/petstore/java/webclient-nullable-arrays/api/openapi.yaml b/samples/client/petstore/java/webclient-nullable-arrays/api/openapi.yaml index 4d22c956f502..79b34a6a9326 100644 --- a/samples/client/petstore/java/webclient-nullable-arrays/api/openapi.yaml +++ b/samples/client/petstore/java/webclient-nullable-arrays/api/openapi.yaml @@ -28,8 +28,8 @@ components: ByteArrayObject: example: nullableArray: nullableArray - nullableString: nullableString normalArray: normalArray + nullableString: nullableString stringField: stringField intField: 0.8008281904610115 properties: diff --git a/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/api/openapi.yaml b/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/api/openapi.yaml index 9fb2142503e4..bb4af21b8960 100644 --- a/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/api/openapi.yaml +++ b/samples/client/petstore/java/webclient-springBoot4-jackson3-jspecify/api/openapi.yaml @@ -61,7 +61,6 @@ components: Foo: example: dt: 2000-01-23T04:56:07.000+00:00 - number: 0.8008281904610115 binary: "" listOfDt: - 2000-01-23T04:56:07.000+00:00 @@ -70,6 +69,7 @@ components: - 2000-01-23T04:56:07.000+00:00 - 2000-01-23T04:56:07.000+00:00 requiredDt: 2000-01-23T04:56:07.000+00:00 + number: 0.8008281904610115 properties: dt: format: date-time diff --git a/samples/client/petstore/java/webclient-springBoot4-jackson3/api/openapi.yaml b/samples/client/petstore/java/webclient-springBoot4-jackson3/api/openapi.yaml index e12cb58862db..ca8277d711bc 100644 --- a/samples/client/petstore/java/webclient-springBoot4-jackson3/api/openapi.yaml +++ b/samples/client/petstore/java/webclient-springBoot4-jackson3/api/openapi.yaml @@ -61,8 +61,8 @@ components: Category: description: A category for a pet example: - name: name id: 6 + name: name properties: id: format: int64 @@ -77,8 +77,8 @@ components: Tag: description: A tag for a pet example: - name: name id: 1 + name: name properties: id: format: int64 @@ -92,19 +92,19 @@ components: Pet: description: A pet for sale in the pet store example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: diff --git a/samples/client/petstore/java/webclient-swagger2/api/openapi.yaml b/samples/client/petstore/java/webclient-swagger2/api/openapi.yaml index 7d3a48a0496b..9a74972a7401 100644 --- a/samples/client/petstore/java/webclient-swagger2/api/openapi.yaml +++ b/samples/client/petstore/java/webclient-swagger2/api/openapi.yaml @@ -1436,12 +1436,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1470,8 +1470,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1486,14 +1486,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1520,8 +1520,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1533,19 +1533,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1982,8 +1982,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2021,9 +2021,9 @@ components: type: string type: object example: - otherProperty: otherProperty - nullableProperty: nullableProperty type: ChildWithNullable + nullableProperty: nullableProperty + otherProperty: otherProperty StringBooleanMap: additionalProperties: type: boolean diff --git a/samples/client/petstore/java/webclient-useSingleRequestParameter/api/openapi.yaml b/samples/client/petstore/java/webclient-useSingleRequestParameter/api/openapi.yaml index 7d3a48a0496b..9a74972a7401 100644 --- a/samples/client/petstore/java/webclient-useSingleRequestParameter/api/openapi.yaml +++ b/samples/client/petstore/java/webclient-useSingleRequestParameter/api/openapi.yaml @@ -1436,12 +1436,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1470,8 +1470,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1486,14 +1486,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1520,8 +1520,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1533,19 +1533,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1982,8 +1982,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2021,9 +2021,9 @@ components: type: string type: object example: - otherProperty: otherProperty - nullableProperty: nullableProperty type: ChildWithNullable + nullableProperty: nullableProperty + otherProperty: otherProperty StringBooleanMap: additionalProperties: type: boolean diff --git a/samples/client/petstore/java/webclient/api/openapi.yaml b/samples/client/petstore/java/webclient/api/openapi.yaml index 7d3a48a0496b..9a74972a7401 100644 --- a/samples/client/petstore/java/webclient/api/openapi.yaml +++ b/samples/client/petstore/java/webclient/api/openapi.yaml @@ -1436,12 +1436,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1470,8 +1470,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1486,14 +1486,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1520,8 +1520,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1533,19 +1533,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1982,8 +1982,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2021,9 +2021,9 @@ components: type: string type: object example: - otherProperty: otherProperty - nullableProperty: nullableProperty type: ChildWithNullable + nullableProperty: nullableProperty + otherProperty: otherProperty StringBooleanMap: additionalProperties: type: boolean diff --git a/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/Pet.java b/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/Pet.java index 7fa5120ec446..97372d1431ac 100644 --- a/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/Pet.java +++ b/samples/client/petstore/spring-cloud-deprecated/src/main/java/org/openapitools/model/Pet.java @@ -135,7 +135,7 @@ public void setCategory(@Nullable Category category) { this.category = category; } - public Pet name(String name) { + public Pet name(JsonNullable name) { this.name = JsonNullable.of(name); return this; } diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java index 8c551568f763..01a53281f419 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java @@ -303,7 +303,7 @@ public void setAnytype1(@Nullable Object anytype1) { this.anytype1 = anytype1; } - public AdditionalPropertiesClassDto anytype2(Object anytype2) { + public AdditionalPropertiesClassDto anytype2(JsonNullable anytype2) { this.anytype2 = JsonNullable.of(anytype2); return this; } diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/BigCatDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/BigCatDto.java index 6249d9210c0a..67945c261233 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/BigCatDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/BigCatDto.java @@ -94,7 +94,7 @@ public void setKind(@Nullable KindEnum kind) { } - public BigCatDto declawed(Boolean declawed) { + public BigCatDto declawed(@Nullable Boolean declawed) { super.declawed(declawed); return this; } diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ChildWithNullableDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ChildWithNullableDto.java index 8bce2ad373f4..514ddd0f42dd 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ChildWithNullableDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ChildWithNullableDto.java @@ -53,12 +53,12 @@ public void setOtherProperty(@Nullable String otherProperty) { } - public ChildWithNullableDto type(TypeEnum type) { + public ChildWithNullableDto type(@Nullable TypeEnum type) { super.type(type); return this; } - public ChildWithNullableDto nullableProperty(String nullableProperty) { + public ChildWithNullableDto nullableProperty(JsonNullable nullableProperty) { super.nullableProperty(nullableProperty); return this; } diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java index 249fda7ae574..1dd30daf2220 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java @@ -43,7 +43,7 @@ public ContainerDefaultValueDto() { super(); } - public ContainerDefaultValueDto nullableArray(List nullableArray) { + public ContainerDefaultValueDto nullableArray(JsonNullable> nullableArray) { this.nullableArray = JsonNullable.of(nullableArray); return this; } @@ -70,7 +70,7 @@ public void setNullableArray(JsonNullable> nullableArray) { this.nullableArray = nullableArray; } - public ContainerDefaultValueDto nullableRequiredArray(List nullableRequiredArray) { + public ContainerDefaultValueDto nullableRequiredArray(JsonNullable> nullableRequiredArray) { this.nullableRequiredArray = JsonNullable.of(nullableRequiredArray); return this; } @@ -126,7 +126,7 @@ public void setRequiredArray(List requiredArray) { this.requiredArray = requiredArray; } - public ContainerDefaultValueDto nullableArrayWithDefault(List nullableArrayWithDefault) { + public ContainerDefaultValueDto nullableArrayWithDefault(JsonNullable> nullableArrayWithDefault) { this.nullableArrayWithDefault = JsonNullable.of(nullableArrayWithDefault); return this; } diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/NullableMapPropertyDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/NullableMapPropertyDto.java index be041f3dcf5f..41f271297ce3 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/NullableMapPropertyDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/NullableMapPropertyDto.java @@ -30,7 +30,7 @@ public class NullableMapPropertyDto { private JsonNullable> languageValues = JsonNullable.>undefined(); - public NullableMapPropertyDto languageValues(Map languageValues) { + public NullableMapPropertyDto languageValues(JsonNullable> languageValues) { this.languageValues = JsonNullable.of(languageValues); return this; } diff --git a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ParentWithNullableDto.java b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ParentWithNullableDto.java index 68742bfb9aac..fa135f730583 100644 --- a/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ParentWithNullableDto.java +++ b/samples/client/petstore/spring-http-interface-noResponseEntity/src/main/java/org/openapitools/model/ParentWithNullableDto.java @@ -94,7 +94,7 @@ public void setType(@Nullable TypeEnum type) { this.type = type; } - public ParentWithNullableDto nullableProperty(String nullableProperty) { + public ParentWithNullableDto nullableProperty(JsonNullable nullableProperty) { this.nullableProperty = JsonNullable.of(nullableProperty); return this; } diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 23b49dbabecb..653580124031 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -301,7 +301,7 @@ public void setAnytype1(@Nullable Object anytype1) { this.anytype1 = anytype1; } - public AdditionalPropertiesClass anytype2(Object anytype2) { + public AdditionalPropertiesClass anytype2(JsonNullable anytype2) { this.anytype2 = JsonNullable.of(anytype2); return this; } diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/BigCat.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/BigCat.java index f39cb8ca7321..3aa8f7359a5b 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/BigCat.java @@ -99,7 +99,7 @@ public void setKind(@Nullable KindEnum kind) { } - public BigCat declawed(Boolean declawed) { + public BigCat declawed(@Nullable Boolean declawed) { super.declawed(declawed); return this; } diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ChildWithNullable.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ChildWithNullable.java index 8498e2b9a708..83840c506901 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ChildWithNullable.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ChildWithNullable.java @@ -51,12 +51,12 @@ public void setOtherProperty(@Nullable String otherProperty) { } - public ChildWithNullable type(TypeEnum type) { + public ChildWithNullable type(@Nullable TypeEnum type) { super.type(type); return this; } - public ChildWithNullable nullableProperty(String nullableProperty) { + public ChildWithNullable nullableProperty(JsonNullable nullableProperty) { super.nullableProperty(nullableProperty); return this; } diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ContainerDefaultValue.java index 9d93832b96c8..b909dc142991 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -49,7 +49,7 @@ public ContainerDefaultValue(List nullableRequiredArray, List re this.requiredArray = requiredArray; } - public ContainerDefaultValue nullableArray(List nullableArray) { + public ContainerDefaultValue nullableArray(JsonNullable> nullableArray) { this.nullableArray = JsonNullable.of(nullableArray); return this; } @@ -76,7 +76,7 @@ public void setNullableArray(JsonNullable> nullableArray) { this.nullableArray = nullableArray; } - public ContainerDefaultValue nullableRequiredArray(List nullableRequiredArray) { + public ContainerDefaultValue nullableRequiredArray(JsonNullable> nullableRequiredArray) { this.nullableRequiredArray = JsonNullable.of(nullableRequiredArray); return this; } @@ -132,7 +132,7 @@ public void setRequiredArray(List requiredArray) { this.requiredArray = requiredArray; } - public ContainerDefaultValue nullableArrayWithDefault(List nullableArrayWithDefault) { + public ContainerDefaultValue nullableArrayWithDefault(JsonNullable> nullableArrayWithDefault) { this.nullableArrayWithDefault = JsonNullable.of(nullableArrayWithDefault); return this; } diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/NullableMapProperty.java index 882c51c94e8c..c8a1867beefa 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -28,7 +28,7 @@ public class NullableMapProperty { private JsonNullable> languageValues = JsonNullable.>undefined(); - public NullableMapProperty languageValues(Map languageValues) { + public NullableMapProperty languageValues(JsonNullable> languageValues) { this.languageValues = JsonNullable.of(languageValues); return this; } diff --git a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ParentWithNullable.java b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ParentWithNullable.java index bb7647b0df96..9f3deb2163dc 100644 --- a/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ParentWithNullable.java +++ b/samples/client/petstore/spring-http-interface-reactive-noResponseEntity/src/main/java/org/openapitools/model/ParentWithNullable.java @@ -93,7 +93,7 @@ public void setType(@Nullable TypeEnum type) { this.type = type; } - public ParentWithNullable nullableProperty(String nullableProperty) { + public ParentWithNullable nullableProperty(JsonNullable nullableProperty) { this.nullableProperty = JsonNullable.of(nullableProperty); return this; } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 23b49dbabecb..653580124031 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -301,7 +301,7 @@ public void setAnytype1(@Nullable Object anytype1) { this.anytype1 = anytype1; } - public AdditionalPropertiesClass anytype2(Object anytype2) { + public AdditionalPropertiesClass anytype2(JsonNullable anytype2) { this.anytype2 = JsonNullable.of(anytype2); return this; } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/BigCat.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/BigCat.java index f39cb8ca7321..3aa8f7359a5b 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/BigCat.java @@ -99,7 +99,7 @@ public void setKind(@Nullable KindEnum kind) { } - public BigCat declawed(Boolean declawed) { + public BigCat declawed(@Nullable Boolean declawed) { super.declawed(declawed); return this; } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ChildWithNullable.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ChildWithNullable.java index 8498e2b9a708..83840c506901 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ChildWithNullable.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ChildWithNullable.java @@ -51,12 +51,12 @@ public void setOtherProperty(@Nullable String otherProperty) { } - public ChildWithNullable type(TypeEnum type) { + public ChildWithNullable type(@Nullable TypeEnum type) { super.type(type); return this; } - public ChildWithNullable nullableProperty(String nullableProperty) { + public ChildWithNullable nullableProperty(JsonNullable nullableProperty) { super.nullableProperty(nullableProperty); return this; } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java index 9d93832b96c8..b909dc142991 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -49,7 +49,7 @@ public ContainerDefaultValue(List nullableRequiredArray, List re this.requiredArray = requiredArray; } - public ContainerDefaultValue nullableArray(List nullableArray) { + public ContainerDefaultValue nullableArray(JsonNullable> nullableArray) { this.nullableArray = JsonNullable.of(nullableArray); return this; } @@ -76,7 +76,7 @@ public void setNullableArray(JsonNullable> nullableArray) { this.nullableArray = nullableArray; } - public ContainerDefaultValue nullableRequiredArray(List nullableRequiredArray) { + public ContainerDefaultValue nullableRequiredArray(JsonNullable> nullableRequiredArray) { this.nullableRequiredArray = JsonNullable.of(nullableRequiredArray); return this; } @@ -132,7 +132,7 @@ public void setRequiredArray(List requiredArray) { this.requiredArray = requiredArray; } - public ContainerDefaultValue nullableArrayWithDefault(List nullableArrayWithDefault) { + public ContainerDefaultValue nullableArrayWithDefault(JsonNullable> nullableArrayWithDefault) { this.nullableArrayWithDefault = JsonNullable.of(nullableArrayWithDefault); return this; } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/NullableMapProperty.java index 882c51c94e8c..c8a1867beefa 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -28,7 +28,7 @@ public class NullableMapProperty { private JsonNullable> languageValues = JsonNullable.>undefined(); - public NullableMapProperty languageValues(Map languageValues) { + public NullableMapProperty languageValues(JsonNullable> languageValues) { this.languageValues = JsonNullable.of(languageValues); return this; } diff --git a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ParentWithNullable.java b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ParentWithNullable.java index bb7647b0df96..9f3deb2163dc 100644 --- a/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ParentWithNullable.java +++ b/samples/client/petstore/spring-http-interface-reactive/src/main/java/org/openapitools/model/ParentWithNullable.java @@ -93,7 +93,7 @@ public void setType(@Nullable TypeEnum type) { this.type = type; } - public ParentWithNullable nullableProperty(String nullableProperty) { + public ParentWithNullable nullableProperty(JsonNullable nullableProperty) { this.nullableProperty = JsonNullable.of(nullableProperty); return this; } diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/BigCatDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/BigCatDto.java index f0b50596da48..5336a569f6c1 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/BigCatDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/BigCatDto.java @@ -93,7 +93,7 @@ public void setKind(@Nullable KindEnum kind) { } - public BigCatDto declawed(Boolean declawed) { + public BigCatDto declawed(@Nullable Boolean declawed) { super.declawed(declawed); return this; } diff --git a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ChildWithNullableDto.java b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ChildWithNullableDto.java index a499dd31c542..cdcc3105649a 100644 --- a/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ChildWithNullableDto.java +++ b/samples/client/petstore/spring-http-interface-springboot-4/src/main/java/org/openapitools/model/ChildWithNullableDto.java @@ -50,12 +50,12 @@ public void setOtherProperty(@Nullable String otherProperty) { } - public ChildWithNullableDto type(TypeEnum type) { + public ChildWithNullableDto type(@Nullable TypeEnum type) { super.type(type); return this; } - public ChildWithNullableDto nullableProperty(String nullableProperty) { + public ChildWithNullableDto nullableProperty(@Nullable String nullableProperty) { super.nullableProperty(nullableProperty); return this; } diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 23b49dbabecb..653580124031 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -301,7 +301,7 @@ public void setAnytype1(@Nullable Object anytype1) { this.anytype1 = anytype1; } - public AdditionalPropertiesClass anytype2(Object anytype2) { + public AdditionalPropertiesClass anytype2(JsonNullable anytype2) { this.anytype2 = JsonNullable.of(anytype2); return this; } diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/BigCat.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/BigCat.java index f39cb8ca7321..3aa8f7359a5b 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/BigCat.java @@ -99,7 +99,7 @@ public void setKind(@Nullable KindEnum kind) { } - public BigCat declawed(Boolean declawed) { + public BigCat declawed(@Nullable Boolean declawed) { super.declawed(declawed); return this; } diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ChildWithNullable.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ChildWithNullable.java index 8498e2b9a708..83840c506901 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ChildWithNullable.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ChildWithNullable.java @@ -51,12 +51,12 @@ public void setOtherProperty(@Nullable String otherProperty) { } - public ChildWithNullable type(TypeEnum type) { + public ChildWithNullable type(@Nullable TypeEnum type) { super.type(type); return this; } - public ChildWithNullable nullableProperty(String nullableProperty) { + public ChildWithNullable nullableProperty(JsonNullable nullableProperty) { super.nullableProperty(nullableProperty); return this; } diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ContainerDefaultValue.java index 9d93832b96c8..b909dc142991 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -49,7 +49,7 @@ public ContainerDefaultValue(List nullableRequiredArray, List re this.requiredArray = requiredArray; } - public ContainerDefaultValue nullableArray(List nullableArray) { + public ContainerDefaultValue nullableArray(JsonNullable> nullableArray) { this.nullableArray = JsonNullable.of(nullableArray); return this; } @@ -76,7 +76,7 @@ public void setNullableArray(JsonNullable> nullableArray) { this.nullableArray = nullableArray; } - public ContainerDefaultValue nullableRequiredArray(List nullableRequiredArray) { + public ContainerDefaultValue nullableRequiredArray(JsonNullable> nullableRequiredArray) { this.nullableRequiredArray = JsonNullable.of(nullableRequiredArray); return this; } @@ -132,7 +132,7 @@ public void setRequiredArray(List requiredArray) { this.requiredArray = requiredArray; } - public ContainerDefaultValue nullableArrayWithDefault(List nullableArrayWithDefault) { + public ContainerDefaultValue nullableArrayWithDefault(JsonNullable> nullableArrayWithDefault) { this.nullableArrayWithDefault = JsonNullable.of(nullableArrayWithDefault); return this; } diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/NullableMapProperty.java index 882c51c94e8c..c8a1867beefa 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -28,7 +28,7 @@ public class NullableMapProperty { private JsonNullable> languageValues = JsonNullable.>undefined(); - public NullableMapProperty languageValues(Map languageValues) { + public NullableMapProperty languageValues(JsonNullable> languageValues) { this.languageValues = JsonNullable.of(languageValues); return this; } diff --git a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ParentWithNullable.java b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ParentWithNullable.java index bb7647b0df96..9f3deb2163dc 100644 --- a/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ParentWithNullable.java +++ b/samples/client/petstore/spring-http-interface-useHttpServiceProxyFactoryInterfacesConfigurator/src/main/java/org/openapitools/model/ParentWithNullable.java @@ -93,7 +93,7 @@ public void setType(@Nullable TypeEnum type) { this.type = type; } - public ParentWithNullable nullableProperty(String nullableProperty) { + public ParentWithNullable nullableProperty(JsonNullable nullableProperty) { this.nullableProperty = JsonNullable.of(nullableProperty); return this; } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java index 8c551568f763..01a53281f419 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java @@ -303,7 +303,7 @@ public void setAnytype1(@Nullable Object anytype1) { this.anytype1 = anytype1; } - public AdditionalPropertiesClassDto anytype2(Object anytype2) { + public AdditionalPropertiesClassDto anytype2(JsonNullable anytype2) { this.anytype2 = JsonNullable.of(anytype2); return this; } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/BigCatDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/BigCatDto.java index 6249d9210c0a..67945c261233 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/BigCatDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/BigCatDto.java @@ -94,7 +94,7 @@ public void setKind(@Nullable KindEnum kind) { } - public BigCatDto declawed(Boolean declawed) { + public BigCatDto declawed(@Nullable Boolean declawed) { super.declawed(declawed); return this; } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ChildWithNullableDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ChildWithNullableDto.java index 8bce2ad373f4..514ddd0f42dd 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ChildWithNullableDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ChildWithNullableDto.java @@ -53,12 +53,12 @@ public void setOtherProperty(@Nullable String otherProperty) { } - public ChildWithNullableDto type(TypeEnum type) { + public ChildWithNullableDto type(@Nullable TypeEnum type) { super.type(type); return this; } - public ChildWithNullableDto nullableProperty(String nullableProperty) { + public ChildWithNullableDto nullableProperty(JsonNullable nullableProperty) { super.nullableProperty(nullableProperty); return this; } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java index 249fda7ae574..1dd30daf2220 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java @@ -43,7 +43,7 @@ public ContainerDefaultValueDto() { super(); } - public ContainerDefaultValueDto nullableArray(List nullableArray) { + public ContainerDefaultValueDto nullableArray(JsonNullable> nullableArray) { this.nullableArray = JsonNullable.of(nullableArray); return this; } @@ -70,7 +70,7 @@ public void setNullableArray(JsonNullable> nullableArray) { this.nullableArray = nullableArray; } - public ContainerDefaultValueDto nullableRequiredArray(List nullableRequiredArray) { + public ContainerDefaultValueDto nullableRequiredArray(JsonNullable> nullableRequiredArray) { this.nullableRequiredArray = JsonNullable.of(nullableRequiredArray); return this; } @@ -126,7 +126,7 @@ public void setRequiredArray(List requiredArray) { this.requiredArray = requiredArray; } - public ContainerDefaultValueDto nullableArrayWithDefault(List nullableArrayWithDefault) { + public ContainerDefaultValueDto nullableArrayWithDefault(JsonNullable> nullableArrayWithDefault) { this.nullableArrayWithDefault = JsonNullable.of(nullableArrayWithDefault); return this; } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NullableMapPropertyDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NullableMapPropertyDto.java index be041f3dcf5f..41f271297ce3 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NullableMapPropertyDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/NullableMapPropertyDto.java @@ -30,7 +30,7 @@ public class NullableMapPropertyDto { private JsonNullable> languageValues = JsonNullable.>undefined(); - public NullableMapPropertyDto languageValues(Map languageValues) { + public NullableMapPropertyDto languageValues(JsonNullable> languageValues) { this.languageValues = JsonNullable.of(languageValues); return this; } diff --git a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ParentWithNullableDto.java b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ParentWithNullableDto.java index 68742bfb9aac..fa135f730583 100644 --- a/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ParentWithNullableDto.java +++ b/samples/client/petstore/spring-http-interface/src/main/java/org/openapitools/model/ParentWithNullableDto.java @@ -94,7 +94,7 @@ public void setType(@Nullable TypeEnum type) { this.type = type; } - public ParentWithNullableDto nullableProperty(String nullableProperty) { + public ParentWithNullableDto nullableProperty(JsonNullable nullableProperty) { this.nullableProperty = JsonNullable.of(nullableProperty); return this; } diff --git a/samples/documentation/html/index.html b/samples/documentation/html/index.html index 81a6253d5e79..d2cf9d683377 100644 --- a/samples/documentation/html/index.html +++ b/samples/documentation/html/index.html @@ -266,19 +266,19 @@

Return type

Example data

Content-Type: application/json
{
-  "photoUrls" : [ "photoUrls", "photoUrls" ],
-  "name" : "doggie",
   "id" : 0,
   "category" : {
-    "name" : "name",
-    "id" : 6
+    "id" : 6,
+    "name" : "name"
   },
+  "name" : "doggie",
+  "photoUrls" : [ "photoUrls", "photoUrls" ],
   "tags" : [ {
-    "name" : "name",
-    "id" : 1
+    "id" : 1,
+    "name" : "name"
   }, {
-    "name" : "name",
-    "id" : 1
+    "id" : 1,
+    "name" : "name"
   } ],
   "status" : "available"
 }
@@ -387,35 +387,35 @@

Return type

Example data

Content-Type: application/json
[ {
-  "photoUrls" : [ "photoUrls", "photoUrls" ],
-  "name" : "doggie",
   "id" : 0,
   "category" : {
-    "name" : "name",
-    "id" : 6
+    "id" : 6,
+    "name" : "name"
   },
+  "name" : "doggie",
+  "photoUrls" : [ "photoUrls", "photoUrls" ],
   "tags" : [ {
-    "name" : "name",
-    "id" : 1
+    "id" : 1,
+    "name" : "name"
   }, {
-    "name" : "name",
-    "id" : 1
+    "id" : 1,
+    "name" : "name"
   } ],
   "status" : "available"
 }, {
-  "photoUrls" : [ "photoUrls", "photoUrls" ],
-  "name" : "doggie",
   "id" : 0,
   "category" : {
-    "name" : "name",
-    "id" : 6
+    "id" : 6,
+    "name" : "name"
   },
+  "name" : "doggie",
+  "photoUrls" : [ "photoUrls", "photoUrls" ],
   "tags" : [ {
-    "name" : "name",
-    "id" : 1
+    "id" : 1,
+    "name" : "name"
   }, {
-    "name" : "name",
-    "id" : 1
+    "id" : 1,
+    "name" : "name"
   } ],
   "status" : "available"
 } ]
@@ -487,35 +487,35 @@

Return type

Example data

Content-Type: application/json
[ {
-  "photoUrls" : [ "photoUrls", "photoUrls" ],
-  "name" : "doggie",
   "id" : 0,
   "category" : {
-    "name" : "name",
-    "id" : 6
+    "id" : 6,
+    "name" : "name"
   },
+  "name" : "doggie",
+  "photoUrls" : [ "photoUrls", "photoUrls" ],
   "tags" : [ {
-    "name" : "name",
-    "id" : 1
+    "id" : 1,
+    "name" : "name"
   }, {
-    "name" : "name",
-    "id" : 1
+    "id" : 1,
+    "name" : "name"
   } ],
   "status" : "available"
 }, {
-  "photoUrls" : [ "photoUrls", "photoUrls" ],
-  "name" : "doggie",
   "id" : 0,
   "category" : {
-    "name" : "name",
-    "id" : 6
+    "id" : 6,
+    "name" : "name"
   },
+  "name" : "doggie",
+  "photoUrls" : [ "photoUrls", "photoUrls" ],
   "tags" : [ {
-    "name" : "name",
-    "id" : 1
+    "id" : 1,
+    "name" : "name"
   }, {
-    "name" : "name",
-    "id" : 1
+    "id" : 1,
+    "name" : "name"
   } ],
   "status" : "available"
 } ]
@@ -587,19 +587,19 @@

Return type

Example data

Content-Type: application/json
{
-  "photoUrls" : [ "photoUrls", "photoUrls" ],
-  "name" : "doggie",
   "id" : 0,
   "category" : {
-    "name" : "name",
-    "id" : 6
+    "id" : 6,
+    "name" : "name"
   },
+  "name" : "doggie",
+  "photoUrls" : [ "photoUrls", "photoUrls" ],
   "tags" : [ {
-    "name" : "name",
-    "id" : 1
+    "id" : 1,
+    "name" : "name"
   }, {
-    "name" : "name",
-    "id" : 1
+    "id" : 1,
+    "name" : "name"
   } ],
   "status" : "available"
 }
@@ -681,19 +681,19 @@

Return type

Example data

Content-Type: application/json
{
-  "photoUrls" : [ "photoUrls", "photoUrls" ],
-  "name" : "doggie",
   "id" : 0,
   "category" : {
-    "name" : "name",
-    "id" : 6
+    "id" : 6,
+    "name" : "name"
   },
+  "name" : "doggie",
+  "photoUrls" : [ "photoUrls", "photoUrls" ],
   "tags" : [ {
-    "name" : "name",
-    "id" : 1
+    "id" : 1,
+    "name" : "name"
   }, {
-    "name" : "name",
-    "id" : 1
+    "id" : 1,
+    "name" : "name"
   } ],
   "status" : "available"
 }
@@ -936,12 +936,12 @@

Return type

Example data

Content-Type: application/json
{
+  "id" : 0,
   "petId" : 6,
   "quantity" : 1,
-  "id" : 0,
   "shipDate" : "2000-01-23T04:56:07.000+00:00",
-  "complete" : false,
-  "status" : "placed"
+  "status" : "placed",
+  "complete" : false
 }

Example data

Content-Type: application/xml
@@ -1010,12 +1010,12 @@

Return type

Example data

Content-Type: application/json
{
+  "id" : 0,
   "petId" : 6,
   "quantity" : 1,
-  "id" : 0,
   "shipDate" : "2000-01-23T04:56:07.000+00:00",
-  "complete" : false,
-  "status" : "placed"
+  "status" : "placed",
+  "complete" : false
 }

Example data

Content-Type: application/xml
@@ -1217,14 +1217,14 @@

Return type

Example data

Content-Type: application/json
{
+  "id" : 0,
+  "username" : "username",
   "firstName" : "firstName",
   "lastName" : "lastName",
+  "email" : "email",
   "password" : "password",
-  "userStatus" : 6,
   "phone" : "phone",
-  "id" : 0,
-  "email" : "email",
-  "username" : "username"
+  "userStatus" : 6
 }

Example data

Content-Type: application/xml
diff --git a/samples/documentation/html2/index.html b/samples/documentation/html2/index.html index defce7cd6ce2..f5c2487a959a 100644 --- a/samples/documentation/html2/index.html +++ b/samples/documentation/html2/index.html @@ -1161,19 +1161,19 @@

Usage and SDK Samples

-H "Content-Type: application/json,application/xml" \ "http://petstore.swagger.io/v2/pet" \ -d '{ - "photoUrls" : [ "photoUrls", "photoUrls" ], - "name" : "doggie", "id" : 0, "category" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, + "name" : "doggie", + "photoUrls" : [ "photoUrls", "photoUrls" ], "tags" : [ { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" } ], "status" : "available" }' \ @@ -3613,19 +3613,19 @@

Usage and SDK Samples

-H "Content-Type: application/json,application/xml" \ "http://petstore.swagger.io/v2/pet" \ -d '{ - "photoUrls" : [ "photoUrls", "photoUrls" ], - "name" : "doggie", "id" : 0, "category" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, + "name" : "doggie", + "photoUrls" : [ "photoUrls", "photoUrls" ], "tags" : [ { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" } ], "status" : "available" }' \ @@ -6506,12 +6506,12 @@

Usage and SDK Samples

-H "Content-Type: application/json" \ "http://petstore.swagger.io/v2/store/order" \ -d '{ + "id" : 0, "petId" : 6, "quantity" : 1, - "id" : 0, "shipDate" : "2000-01-23T04:56:07.000+00:00", - "complete" : false, - "status" : "placed" + "status" : "placed", + "complete" : false }' @@ -6975,14 +6975,14 @@

Usage and SDK Samples

-H "Content-Type: application/json" \ "http://petstore.swagger.io/v2/user" \ -d '{ + "id" : 0, + "username" : "username", "firstName" : "firstName", "lastName" : "lastName", + "email" : "email", "password" : "password", - "userStatus" : 6, "phone" : "phone", - "id" : 0, - "email" : "email", - "username" : "username" + "userStatus" : 6 }' @@ -7392,14 +7392,14 @@

Usage and SDK Samples

-H "Content-Type: application/json" \ "http://petstore.swagger.io/v2/user/createWithArray" \ -d '{ + "id" : 0, + "username" : "username", "firstName" : "firstName", "lastName" : "lastName", + "email" : "email", "password" : "password", - "userStatus" : 6, "phone" : "phone", - "id" : 0, - "email" : "email", - "username" : "username" + "userStatus" : 6 }' @@ -7812,14 +7812,14 @@

Usage and SDK Samples

-H "Content-Type: application/json" \ "http://petstore.swagger.io/v2/user/createWithList" \ -d '{ + "id" : 0, + "username" : "username", "firstName" : "firstName", "lastName" : "lastName", + "email" : "email", "password" : "password", - "userStatus" : 6, "phone" : "phone", - "id" : 0, - "email" : "email", - "username" : "username" + "userStatus" : 6 }' @@ -10063,14 +10063,14 @@

Usage and SDK Samples

-H "Content-Type: application/json" \ "http://petstore.swagger.io/v2/user/{username}" \ -d '{ + "id" : 0, + "username" : "username", "firstName" : "firstName", "lastName" : "lastName", + "email" : "email", "password" : "password", - "userStatus" : 6, "phone" : "phone", - "id" : 0, - "email" : "email", - "username" : "username" + "userStatus" : 6 }' diff --git a/samples/openapi3/client/petstore/go-petstore-generateMarshalJSON-false/api/openapi.yaml b/samples/openapi3/client/petstore/go-petstore-generateMarshalJSON-false/api/openapi.yaml index 25e6b6ed012a..9caa7de78b2d 100644 --- a/samples/openapi3/client/petstore/go-petstore-generateMarshalJSON-false/api/openapi.yaml +++ b/samples/openapi3/client/petstore/go-petstore-generateMarshalJSON-false/api/openapi.yaml @@ -57,8 +57,8 @@ components: Category: description: A category for a pet example: - name: name id: 6 + name: name properties: id: format: int64 @@ -73,8 +73,8 @@ components: Tag: description: A tag for a pet example: - name: name id: 1 + name: name properties: id: format: int64 @@ -88,19 +88,19 @@ components: Pet: description: A pet for sale in the pet store example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: diff --git a/samples/openapi3/client/petstore/go-petstore-withXml/api/openapi.yaml b/samples/openapi3/client/petstore/go-petstore-withXml/api/openapi.yaml index 25e6b6ed012a..9caa7de78b2d 100644 --- a/samples/openapi3/client/petstore/go-petstore-withXml/api/openapi.yaml +++ b/samples/openapi3/client/petstore/go-petstore-withXml/api/openapi.yaml @@ -57,8 +57,8 @@ components: Category: description: A category for a pet example: - name: name id: 6 + name: name properties: id: format: int64 @@ -73,8 +73,8 @@ components: Tag: description: A tag for a pet example: - name: name id: 1 + name: name properties: id: format: int64 @@ -88,19 +88,19 @@ components: Pet: description: A pet for sale in the pet store example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: diff --git a/samples/openapi3/client/petstore/go/go-petstore-aws-signature/api/openapi.yaml b/samples/openapi3/client/petstore/go/go-petstore-aws-signature/api/openapi.yaml index 25e6b6ed012a..9caa7de78b2d 100644 --- a/samples/openapi3/client/petstore/go/go-petstore-aws-signature/api/openapi.yaml +++ b/samples/openapi3/client/petstore/go/go-petstore-aws-signature/api/openapi.yaml @@ -57,8 +57,8 @@ components: Category: description: A category for a pet example: - name: name id: 6 + name: name properties: id: format: int64 @@ -73,8 +73,8 @@ components: Tag: description: A tag for a pet example: - name: name id: 1 + name: name properties: id: format: int64 @@ -88,19 +88,19 @@ components: Pet: description: A pet for sale in the pet store example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: 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 ea42fcc918e1..1785e5b472ee 100644 --- a/samples/openapi3/client/petstore/go/go-petstore/api/openapi.yaml +++ b/samples/openapi3/client/petstore/go/go-petstore/api/openapi.yaml @@ -1409,12 +1409,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1443,8 +1443,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1459,18 +1459,18 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 - arbitraryTypeValue: "" - arbitraryNullableTypeValue: "" phone: phone - id: 0 + userStatus: 6 arbitraryObject: "{}" - email: email arbitraryNullableObject: "{}" - username: username + arbitraryTypeValue: "" + arbitraryNullableTypeValue: "" properties: id: format: int64 @@ -1513,8 +1513,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1526,19 +1526,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1993,8 +1993,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: 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 ccbcdccc208e..08fa91b44474 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 @@ -51,6 +51,6 @@ components: \ language-specific classname with allowed characters in that programming\ \ language." example: - prop2: prop2 objectType: objectType + prop2: prop2 diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/api/openapi.yaml b/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/api/openapi.yaml index c3c0afb36f74..a1efcc2e4d8c 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/api/openapi.yaml +++ b/samples/openapi3/client/petstore/java/jersey2-java8-swagger1/api/openapi.yaml @@ -665,12 +665,12 @@ components: Order: description: An order for a pets from the pet store example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -701,8 +701,8 @@ components: Category: description: A category for a pet example: - name: name id: 6 + name: name properties: id: format: int64 @@ -717,14 +717,14 @@ components: User: description: A User who is purchasing from the pet store example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -752,8 +752,8 @@ components: Tag: description: A tag for a pet example: - name: name id: 1 + name: name properties: id: format: int64 @@ -767,19 +767,19 @@ components: Pet: description: A pet for sale in the pet store example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: diff --git a/samples/openapi3/client/petstore/java/jersey2-java8-swagger2/api/openapi.yaml b/samples/openapi3/client/petstore/java/jersey2-java8-swagger2/api/openapi.yaml index c3c0afb36f74..a1efcc2e4d8c 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8-swagger2/api/openapi.yaml +++ b/samples/openapi3/client/petstore/java/jersey2-java8-swagger2/api/openapi.yaml @@ -665,12 +665,12 @@ components: Order: description: An order for a pets from the pet store example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -701,8 +701,8 @@ components: Category: description: A category for a pet example: - name: name id: 6 + name: name properties: id: format: int64 @@ -717,14 +717,14 @@ components: User: description: A User who is purchasing from the pet store example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -752,8 +752,8 @@ components: Tag: description: A tag for a pet example: - name: name id: 1 + name: name properties: id: format: int64 @@ -767,19 +767,19 @@ components: Pet: description: A pet for sale in the pet store example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: 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 724ee694f1f2..c336960b860c 100644 --- a/samples/openapi3/client/petstore/java/jersey2-java8/api/openapi.yaml +++ b/samples/openapi3/client/petstore/java/jersey2-java8/api/openapi.yaml @@ -1311,12 +1311,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2020-02-02T20:20:20.000222Z - complete: false status: placed + complete: false properties: id: format: int64 @@ -1346,8 +1346,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1362,18 +1362,18 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 - objectWithNoDeclaredPropsNullable: "{}" phone: phone + userStatus: 6 objectWithNoDeclaredProps: "{}" - id: 0 - anyTypePropNullable: "" - email: email + objectWithNoDeclaredPropsNullable: "{}" anyTypeProp: "" - username: username + anyTypePropNullable: "" properties: id: format: int64 @@ -1419,8 +1419,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1432,19 +1432,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1905,8 +1905,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: diff --git a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Category.java b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Category.java index 0c7737883379..c6e4128d6521 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Category.java +++ b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Category.java @@ -25,7 +25,7 @@ public class Category { private Optional<@Pattern(regexp = "^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$") String> name = Optional.empty(); - public Category id(Long id) { + public Category id(Optional id) { this.id = Optional.ofNullable(id); return this; } @@ -45,7 +45,7 @@ public void setId(Optional id) { this.id = id; } - public Category name(String name) { + public Category name(Optional name) { this.name = Optional.ofNullable(name); return this; } diff --git a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/ModelApiResponse.java index 39f9fd3bd43d..edf44f19a21c 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -29,7 +29,7 @@ public class ModelApiResponse { private Optional message = Optional.empty(); - public ModelApiResponse code(Integer code) { + public ModelApiResponse code(Optional code) { this.code = Optional.ofNullable(code); return this; } @@ -49,7 +49,7 @@ public void setCode(Optional code) { this.code = code; } - public ModelApiResponse type(String type) { + public ModelApiResponse type(Optional type) { this.type = Optional.ofNullable(type); return this; } @@ -69,7 +69,7 @@ public void setType(Optional type) { this.type = type; } - public ModelApiResponse message(String message) { + public ModelApiResponse message(Optional message) { this.message = Optional.ofNullable(message); return this; } diff --git a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Order.java b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Order.java index 8345918ebcd6..7e259d6ceea1 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Order.java +++ b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Order.java @@ -74,7 +74,7 @@ public static StatusEnum fromValue(String value) { private Optional complete = Optional.of(false); - public Order id(Long id) { + public Order id(Optional id) { this.id = Optional.ofNullable(id); return this; } @@ -94,7 +94,7 @@ public void setId(Optional id) { this.id = id; } - public Order petId(Long petId) { + public Order petId(Optional petId) { this.petId = Optional.ofNullable(petId); return this; } @@ -114,7 +114,7 @@ public void setPetId(Optional petId) { this.petId = petId; } - public Order quantity(Integer quantity) { + public Order quantity(Optional quantity) { this.quantity = Optional.ofNullable(quantity); return this; } @@ -134,7 +134,7 @@ public void setQuantity(Optional quantity) { this.quantity = quantity; } - public Order shipDate(OffsetDateTime shipDate) { + public Order shipDate(Optional shipDate) { this.shipDate = Optional.ofNullable(shipDate); return this; } @@ -154,7 +154,7 @@ public void setShipDate(Optional shipDate) { this.shipDate = shipDate; } - public Order status(StatusEnum status) { + public Order status(Optional status) { this.status = Optional.ofNullable(status); return this; } @@ -174,7 +174,7 @@ public void setStatus(Optional status) { this.status = status; } - public Order complete(Boolean complete) { + public Order complete(Optional complete) { this.complete = Optional.ofNullable(complete); return this; } diff --git a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Pet.java b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Pet.java index 19d0d28f105f..0b63292ed330 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Pet.java +++ b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Pet.java @@ -91,7 +91,7 @@ public Pet(String name, List photoUrls) { this.photoUrls = photoUrls; } - public Pet id(Long id) { + public Pet id(Optional id) { this.id = Optional.ofNullable(id); return this; } @@ -111,7 +111,7 @@ public void setId(Optional id) { this.id = id; } - public Pet category(Category category) { + public Pet category(Optional category) { this.category = Optional.ofNullable(category); return this; } @@ -207,7 +207,7 @@ public void setTags(List<@Valid Tag> tags) { this.tags = tags; } - public Pet status(StatusEnum status) { + public Pet status(Optional status) { this.status = Optional.ofNullable(status); return this; } diff --git a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Tag.java b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Tag.java index 4879680edb29..840de502224a 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Tag.java +++ b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/Tag.java @@ -25,7 +25,7 @@ public class Tag { private Optional name = Optional.empty(); - public Tag id(Long id) { + public Tag id(Optional id) { this.id = Optional.ofNullable(id); return this; } @@ -45,7 +45,7 @@ public void setId(Optional id) { this.id = id; } - public Tag name(String name) { + public Tag name(Optional name) { this.name = Optional.ofNullable(name); return this; } diff --git a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/User.java b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/User.java index 22e8de2ed84f..b8ecd4e6d2cd 100644 --- a/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/User.java +++ b/samples/openapi3/client/petstore/spring-cloud-3-with-optional/src/main/java/org/openapitools/model/User.java @@ -37,7 +37,7 @@ public class User { private Optional userStatus = Optional.empty(); - public User id(Long id) { + public User id(Optional id) { this.id = Optional.ofNullable(id); return this; } @@ -57,7 +57,7 @@ public void setId(Optional id) { this.id = id; } - public User username(String username) { + public User username(Optional username) { this.username = Optional.ofNullable(username); return this; } @@ -77,7 +77,7 @@ public void setUsername(Optional username) { this.username = username; } - public User firstName(String firstName) { + public User firstName(Optional firstName) { this.firstName = Optional.ofNullable(firstName); return this; } @@ -97,7 +97,7 @@ public void setFirstName(Optional firstName) { this.firstName = firstName; } - public User lastName(String lastName) { + public User lastName(Optional lastName) { this.lastName = Optional.ofNullable(lastName); return this; } @@ -117,7 +117,7 @@ public void setLastName(Optional lastName) { this.lastName = lastName; } - public User email(String email) { + public User email(Optional email) { this.email = Optional.ofNullable(email); return this; } @@ -137,7 +137,7 @@ public void setEmail(Optional email) { this.email = email; } - public User password(String password) { + public User password(Optional password) { this.password = Optional.ofNullable(password); return this; } @@ -157,7 +157,7 @@ public void setPassword(Optional password) { this.password = password; } - public User phone(String phone) { + public User phone(Optional phone) { this.phone = Optional.ofNullable(phone); return this; } @@ -177,7 +177,7 @@ public void setPhone(Optional phone) { this.phone = phone; } - public User userStatus(Integer userStatus) { + public User userStatus(Optional userStatus) { this.userStatus = Optional.ofNullable(userStatus); return this; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 31fb21c743c0..edeb6a3b1bd8 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -312,7 +312,7 @@ public void setAnytype1(@Nullable Object anytype1) { this.anytype1 = anytype1; } - public AdditionalPropertiesClass anytype2(Object anytype2) { + public AdditionalPropertiesClass anytype2(JsonNullable anytype2) { this.anytype2 = JsonNullable.of(anytype2); return this; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/BigCat.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/BigCat.java index c2ca16a3715c..dfa05d61e164 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/BigCat.java @@ -95,7 +95,7 @@ public void setKind(@Nullable KindEnum kind) { } - public BigCat declawed(Boolean declawed) { + public BigCat declawed(@Nullable Boolean declawed) { super.declawed(declawed); return this; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ChildWithNullable.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ChildWithNullable.java index d841f7752340..f90958041da4 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ChildWithNullable.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ChildWithNullable.java @@ -54,12 +54,12 @@ public void setOtherProperty(@Nullable String otherProperty) { } - public ChildWithNullable type(TypeEnum type) { + public ChildWithNullable type(@Nullable TypeEnum type) { super.type(type); return this; } - public ChildWithNullable nullableProperty(String nullableProperty) { + public ChildWithNullable nullableProperty(JsonNullable nullableProperty) { super.nullableProperty(nullableProperty); return this; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ContainerDefaultValue.java index 643241c007b4..388ca04c10c3 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -43,7 +43,7 @@ public ContainerDefaultValue() { super(); } - public ContainerDefaultValue nullableArray(List nullableArray) { + public ContainerDefaultValue nullableArray(JsonNullable> nullableArray) { this.nullableArray = JsonNullable.of(nullableArray); return this; } @@ -71,7 +71,7 @@ public void setNullableArray(JsonNullable> nullableArray) { this.nullableArray = nullableArray; } - public ContainerDefaultValue nullableRequiredArray(List nullableRequiredArray) { + public ContainerDefaultValue nullableRequiredArray(JsonNullable> nullableRequiredArray) { this.nullableRequiredArray = JsonNullable.of(nullableRequiredArray); return this; } @@ -129,7 +129,7 @@ public void setRequiredArray(List requiredArray) { this.requiredArray = requiredArray; } - public ContainerDefaultValue nullableArrayWithDefault(List nullableArrayWithDefault) { + public ContainerDefaultValue nullableArrayWithDefault(JsonNullable> nullableArrayWithDefault) { this.nullableArrayWithDefault = JsonNullable.of(nullableArrayWithDefault); return this; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/NullableMapProperty.java index 85b9061b4838..f9956d4a5d52 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -30,7 +30,7 @@ public class NullableMapProperty { @Valid private JsonNullable> languageValues = JsonNullable.>undefined(); - public NullableMapProperty languageValues(Map languageValues) { + public NullableMapProperty languageValues(JsonNullable> languageValues) { this.languageValues = JsonNullable.of(languageValues); return this; } diff --git a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ParentWithNullable.java b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ParentWithNullable.java index 1d88649a8fca..652eef33f398 100644 --- a/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ParentWithNullable.java +++ b/samples/openapi3/client/petstore/spring-cloud-oas3-fakeapi/src/main/java/org/openapitools/model/ParentWithNullable.java @@ -96,7 +96,7 @@ public void setType(@Nullable TypeEnum type) { this.type = type; } - public ParentWithNullable nullableProperty(String nullableProperty) { + public ParentWithNullable nullableProperty(JsonNullable nullableProperty) { this.nullableProperty = JsonNullable.of(nullableProperty); return this; } diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java index 994376b81a15..f2403a86f4a0 100644 --- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/PetApi.java @@ -81,7 +81,7 @@ default ResponseEntity addPet( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + String exampleString = "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -167,7 +167,7 @@ default ResponseEntity> findPetsByStatus( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -222,7 +222,7 @@ default ResponseEntity> findPetsByTags( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -276,7 +276,7 @@ default ResponseEntity getPetById( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + String exampleString = "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -336,7 +336,7 @@ default ResponseEntity updatePet( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + String exampleString = "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java index 36ba9beb086a..cac181998a8d 100644 --- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/StoreApi.java @@ -143,7 +143,7 @@ default ResponseEntity getOrderById( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -193,7 +193,7 @@ default ResponseEntity placeOrder( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java index bb3350efcd20..eebf84ebd3e1 100644 --- a/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/client/petstore/spring-stubs/src/main/java/org/openapitools/api/UserApi.java @@ -211,7 +211,7 @@ default ResponseEntity getUserByName( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"password\" : \"password\", \"userStatus\" : 6, \"phone\" : \"phone\", \"id\" : 0, \"email\" : \"email\", \"username\" : \"username\" }"; + String exampleString = "{ \"id\" : 0, \"username\" : \"username\", \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"email\" : \"email\", \"password\" : \"password\", \"phone\" : \"phone\", \"userStatus\" : 6 }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/openapi3/server/petstore/go/go-petstore/api/openapi.yaml b/samples/openapi3/server/petstore/go/go-petstore/api/openapi.yaml index 8c9403338b1a..119b69481958 100644 --- a/samples/openapi3/server/petstore/go/go-petstore/api/openapi.yaml +++ b/samples/openapi3/server/petstore/go/go-petstore/api/openapi.yaml @@ -727,22 +727,22 @@ components: example: petId: 5 quantity: 5 - requireTest: requireTest - comment: comment - id: 1 shipDate: 2000-01-23T04:56:07.000+00:00 - type: type - complete: false promotion: true + requireTest: requireTest + type: type + id: 1 status: placed + complete: false + comment: comment type: object xml: name: Order Category: description: A category for a pet example: - name: name id: 6 + name: name nullable: true properties: id: @@ -758,160 +758,160 @@ components: User: description: A User who is purchasing from the pet store example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone + userStatus: 6 deepSliceModel: - - - - name: name - id: 1 - - name: name - id: 1 - - - name: name - id: 1 - - name: name - id: 1 - - - - name: name - id: 1 - - name: name - id: 1 - - - name: name - id: 1 - - name: name - id: 1 - id: 0 + - - - id: 1 + name: name + - id: 1 + name: name + - - id: 1 + name: name + - id: 1 + name: name + - - - id: 1 + name: name + - id: 1 + name: name + - - id: 1 + name: name + - id: 1 + name: name deepSliceMap: - - tag: - name: name id: 1 + name: name Pet: - - photoUrls: - - photoUrls - - photoUrls - name: doggie - id: 0 + - id: 0 category: - name: name id: 6 - tags: - - name: name - id: 1 - - name: name - id: 1 - status: available - - photoUrls: + name: name + name: doggie + photoUrls: - photoUrls - photoUrls - name: doggie - id: 0 - category: + tags: + - id: 1 + name: name + - id: 1 name: name + status: available + - id: 0 + category: id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available - tag: - name: name id: 1 + name: name Pet: - - photoUrls: - - photoUrls - - photoUrls - name: doggie - id: 0 + - id: 0 category: - name: name id: 6 - tags: - - name: name - id: 1 - - name: name - id: 1 - status: available - - photoUrls: + name: name + name: doggie + photoUrls: - photoUrls - photoUrls - name: doggie - id: 0 - category: + tags: + - id: 1 name: name + - id: 1 + name: name + status: available + - id: 0 + category: id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available - - tag: - name: name id: 1 + name: name Pet: - - photoUrls: - - photoUrls - - photoUrls - name: doggie - id: 0 + - id: 0 category: - name: name id: 6 - tags: - - name: name - id: 1 - - name: name - id: 1 - status: available - - photoUrls: + name: name + name: doggie + photoUrls: - photoUrls - photoUrls - name: doggie - id: 0 - category: + tags: + - id: 1 + name: name + - id: 1 name: name + status: available + - id: 0 + category: id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available - tag: - name: name id: 1 + name: name Pet: - - photoUrls: - - photoUrls - - photoUrls - name: doggie - id: 0 + - id: 0 category: - name: name id: 6 - tags: - - name: name - id: 1 - - name: name - id: 1 - status: available - - photoUrls: + name: name + name: doggie + photoUrls: - photoUrls - photoUrls - name: doggie - id: 0 - category: + tags: + - id: 1 + name: name + - id: 1 name: name + status: available + - id: 0 + category: id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available - email: email - username: username properties: id: format: int64 @@ -962,8 +962,8 @@ components: Tag: description: A tag for a pet example: - name: name id: 1 + name: name properties: id: format: int64 @@ -977,19 +977,19 @@ components: Pet: description: A pet for sale in the pet store example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1070,36 +1070,36 @@ components: description: An array 3-deep. example: tag: - name: name id: 1 + name: name Pet: - - photoUrls: - - photoUrls - - photoUrls - name: doggie - id: 0 + - id: 0 category: - name: name id: 6 - tags: - - name: name - id: 1 - - name: name - id: 1 - status: available - - photoUrls: + name: name + name: doggie + photoUrls: - photoUrls - photoUrls - name: doggie - id: 0 - category: + tags: + - id: 1 + name: name + - id: 1 name: name + status: available + - id: 0 + category: id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: tag: diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/api/BarApi.java b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/api/BarApi.java index 7ed1a44adb65..8bc427c57037 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/api/BarApi.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/api/BarApi.java @@ -72,7 +72,7 @@ default ResponseEntity createBar( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"@baseType\" : \"@baseType\", \"@type\" : \"@type\", \"foo\" : { \"@baseType\" : \"@baseType\", \"@type\" : \"@type\", \"fooPropA\" : \"fooPropA\", \"href\" : \"href\", \"id\" : \"id\", \"fooPropB\" : \"fooPropB\", \"@schemaLocation\" : \"@schemaLocation\" }, \"href\" : \"href\", \"id\" : \"id\", \"fooPropB\" : \"fooPropB\", \"@schemaLocation\" : \"@schemaLocation\", \"barPropA\" : \"barPropA\" }"; + String exampleString = "{ \"href\" : \"href\", \"id\" : \"id\", \"@schemaLocation\" : \"@schemaLocation\", \"@baseType\" : \"@baseType\", \"@type\" : \"@type\", \"barPropA\" : \"barPropA\", \"fooPropB\" : \"fooPropB\", \"foo\" : { \"href\" : \"href\", \"id\" : \"id\", \"@schemaLocation\" : \"@schemaLocation\", \"@baseType\" : \"@baseType\", \"@type\" : \"@type\", \"fooPropA\" : \"fooPropA\", \"fooPropB\" : \"fooPropB\" } }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/api/FooApi.java b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/api/FooApi.java index e47af5bb871b..1e3b66b6b1a7 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/api/FooApi.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/api/FooApi.java @@ -73,7 +73,7 @@ default ResponseEntity createFoo( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"@baseType\" : \"@baseType\", \"@type\" : \"@type\", \"fooPropA\" : \"fooPropA\", \"href\" : \"href\", \"id\" : \"id\", \"fooPropB\" : \"fooPropB\", \"@schemaLocation\" : \"@schemaLocation\" }"; + String exampleString = "{ \"href\" : \"href\", \"id\" : \"id\", \"@schemaLocation\" : \"@schemaLocation\", \"@baseType\" : \"@baseType\", \"@type\" : \"@type\", \"fooPropA\" : \"fooPropA\", \"fooPropB\" : \"fooPropB\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -111,7 +111,7 @@ default ResponseEntity> getAllFoos( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json;charset=utf-8"))) { - String exampleString = "[ { \"@baseType\" : \"@baseType\", \"@type\" : \"@type\", \"fooPropA\" : \"fooPropA\", \"href\" : \"href\", \"id\" : \"id\", \"fooPropB\" : \"fooPropB\", \"@schemaLocation\" : \"@schemaLocation\" }, { \"@baseType\" : \"@baseType\", \"@type\" : \"@type\", \"fooPropA\" : \"fooPropA\", \"href\" : \"href\", \"id\" : \"id\", \"fooPropB\" : \"fooPropB\", \"@schemaLocation\" : \"@schemaLocation\" } ]"; + String exampleString = "[ { \"href\" : \"href\", \"id\" : \"id\", \"@schemaLocation\" : \"@schemaLocation\", \"@baseType\" : \"@baseType\", \"@type\" : \"@type\", \"fooPropA\" : \"fooPropA\", \"fooPropB\" : \"fooPropB\" }, { \"href\" : \"href\", \"id\" : \"id\", \"@schemaLocation\" : \"@schemaLocation\", \"@baseType\" : \"@baseType\", \"@type\" : \"@type\", \"fooPropA\" : \"fooPropA\", \"fooPropB\" : \"fooPropB\" } ]"; ApiUtil.setExampleResponse(request, "application/json;charset=utf-8", exampleString); break; } diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Bar.java b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Bar.java index 81e39f6a4fc5..2e02164dd186 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Bar.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Bar.java @@ -133,17 +133,17 @@ public void setFoo(@Nullable FooRefOrValue foo) { } - public Bar href(String href) { + public Bar href(@Nullable String href) { super.href(href); return this; } - public Bar atSchemaLocation(String atSchemaLocation) { + public Bar atSchemaLocation(@Nullable String atSchemaLocation) { super.atSchemaLocation(atSchemaLocation); return this; } - public Bar atBaseType(String atBaseType) { + public Bar atBaseType(@Nullable String atBaseType) { super.atBaseType(atBaseType); return this; } diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/BarCreate.java b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/BarCreate.java index c585cc9cba9f..129e6e8386b5 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/BarCreate.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/BarCreate.java @@ -111,22 +111,22 @@ public void setFoo(@Nullable FooRefOrValue foo) { } - public BarCreate href(String href) { + public BarCreate href(@Nullable String href) { super.href(href); return this; } - public BarCreate id(String id) { + public BarCreate id(@Nullable String id) { super.id(id); return this; } - public BarCreate atSchemaLocation(String atSchemaLocation) { + public BarCreate atSchemaLocation(@Nullable String atSchemaLocation) { super.atSchemaLocation(atSchemaLocation); return this; } - public BarCreate atBaseType(String atBaseType) { + public BarCreate atBaseType(@Nullable String atBaseType) { super.atBaseType(atBaseType); return this; } diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/BarRef.java b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/BarRef.java index 4f6b36242e0b..b7aa4c249c25 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/BarRef.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/BarRef.java @@ -39,22 +39,22 @@ public BarRef(String atType) { } - public BarRef href(String href) { + public BarRef href(@Nullable String href) { super.href(href); return this; } - public BarRef id(String id) { + public BarRef id(@Nullable String id) { super.id(id); return this; } - public BarRef atSchemaLocation(String atSchemaLocation) { + public BarRef atSchemaLocation(@Nullable String atSchemaLocation) { super.atSchemaLocation(atSchemaLocation); return this; } - public BarRef atBaseType(String atBaseType) { + public BarRef atBaseType(@Nullable String atBaseType) { super.atBaseType(atBaseType); return this; } @@ -64,12 +64,12 @@ public BarRef atType(String atType) { return this; } - public BarRef name(String name) { + public BarRef name(@Nullable String name) { super.name(name); return this; } - public BarRef atReferredType(String atReferredType) { + public BarRef atReferredType(@Nullable String atReferredType) { super.atReferredType(atReferredType); return this; } diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Foo.java b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Foo.java index d8b1a7911a46..bb1906490fb3 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Foo.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Foo.java @@ -85,22 +85,22 @@ public void setFooPropB(@Nullable String fooPropB) { } - public Foo href(String href) { + public Foo href(@Nullable String href) { super.href(href); return this; } - public Foo id(String id) { + public Foo id(@Nullable String id) { super.id(id); return this; } - public Foo atSchemaLocation(String atSchemaLocation) { + public Foo atSchemaLocation(@Nullable String atSchemaLocation) { super.atSchemaLocation(atSchemaLocation); return this; } - public Foo atBaseType(String atBaseType) { + public Foo atBaseType(@Nullable String atBaseType) { super.atBaseType(atBaseType); return this; } diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/FooRef.java b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/FooRef.java index b70f5bab783f..144922807310 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/FooRef.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/FooRef.java @@ -62,22 +62,22 @@ public void setFoorefPropA(@Nullable String foorefPropA) { } - public FooRef href(String href) { + public FooRef href(@Nullable String href) { super.href(href); return this; } - public FooRef id(String id) { + public FooRef id(@Nullable String id) { super.id(id); return this; } - public FooRef atSchemaLocation(String atSchemaLocation) { + public FooRef atSchemaLocation(@Nullable String atSchemaLocation) { super.atSchemaLocation(atSchemaLocation); return this; } - public FooRef atBaseType(String atBaseType) { + public FooRef atBaseType(@Nullable String atBaseType) { super.atBaseType(atBaseType); return this; } @@ -87,12 +87,12 @@ public FooRef atType(String atType) { return this; } - public FooRef name(String name) { + public FooRef name(@Nullable String name) { super.name(name); return this; } - public FooRef atReferredType(String atReferredType) { + public FooRef atReferredType(@Nullable String atReferredType) { super.atReferredType(atReferredType); return this; } diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Pasta.java b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Pasta.java index df72220a6e24..d6834bd5390d 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Pasta.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Pasta.java @@ -62,22 +62,22 @@ public void setVendor(@Nullable String vendor) { } - public Pasta href(String href) { + public Pasta href(@Nullable String href) { super.href(href); return this; } - public Pasta id(String id) { + public Pasta id(@Nullable String id) { super.id(id); return this; } - public Pasta atSchemaLocation(String atSchemaLocation) { + public Pasta atSchemaLocation(@Nullable String atSchemaLocation) { super.atSchemaLocation(atSchemaLocation); return this; } - public Pasta atBaseType(String atBaseType) { + public Pasta atBaseType(@Nullable String atBaseType) { super.atBaseType(atBaseType); return this; } diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Pizza.java b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Pizza.java index 16b7e89d2fb4..4e6bafacd2a1 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Pizza.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/Pizza.java @@ -71,22 +71,22 @@ public void setPizzaSize(@Nullable BigDecimal pizzaSize) { } - public Pizza href(String href) { + public Pizza href(@Nullable String href) { super.href(href); return this; } - public Pizza id(String id) { + public Pizza id(@Nullable String id) { super.id(id); return this; } - public Pizza atSchemaLocation(String atSchemaLocation) { + public Pizza atSchemaLocation(@Nullable String atSchemaLocation) { super.atSchemaLocation(atSchemaLocation); return this; } - public Pizza atBaseType(String atBaseType) { + public Pizza atBaseType(@Nullable String atBaseType) { super.atBaseType(atBaseType); return this; } diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/PizzaSpeziale.java b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/PizzaSpeziale.java index b5c3f8f0a389..8fde71522749 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/PizzaSpeziale.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/java/org/openapitools/model/PizzaSpeziale.java @@ -63,27 +63,27 @@ public void setToppings(@Nullable String toppings) { } - public PizzaSpeziale pizzaSize(BigDecimal pizzaSize) { + public PizzaSpeziale pizzaSize(@Nullable BigDecimal pizzaSize) { super.pizzaSize(pizzaSize); return this; } - public PizzaSpeziale href(String href) { + public PizzaSpeziale href(@Nullable String href) { super.href(href); return this; } - public PizzaSpeziale id(String id) { + public PizzaSpeziale id(@Nullable String id) { super.id(id); return this; } - public PizzaSpeziale atSchemaLocation(String atSchemaLocation) { + public PizzaSpeziale atSchemaLocation(@Nullable String atSchemaLocation) { super.atSchemaLocation(atSchemaLocation); return this; } - public PizzaSpeziale atBaseType(String atBaseType) { + public PizzaSpeziale atBaseType(@Nullable String atBaseType) { super.atBaseType(atBaseType); return this; } diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/resources/openapi.yaml b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/resources/openapi.yaml index 5ab636303754..3dcf1b76abc0 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/resources/openapi.yaml +++ b/samples/openapi3/server/petstore/spring-boot-oneof-interface/src/main/resources/openapi.yaml @@ -168,13 +168,13 @@ components: type: object example: null example: + href: href + id: id + '@schemaLocation': '@schemaLocation' '@baseType': '@baseType' '@type': '@type' fooPropA: fooPropA - href: href - id: id fooPropB: fooPropB - '@schemaLocation': '@schemaLocation' type: object FooRef: allOf: @@ -221,21 +221,21 @@ components: type: object example: null example: + href: href + id: id + '@schemaLocation': '@schemaLocation' '@baseType': '@baseType' '@type': '@type' + barPropA: barPropA + fooPropB: fooPropB foo: + href: href + id: id + '@schemaLocation': '@schemaLocation' '@baseType': '@baseType' '@type': '@type' fooPropA: fooPropA - href: href - id: id fooPropB: fooPropB - '@schemaLocation': '@schemaLocation' - href: href - id: id - fooPropB: fooPropB - '@schemaLocation': '@schemaLocation' - barPropA: barPropA type: object BarRefOrValue: oneOf: diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/api/BarApi.java b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/api/BarApi.java index 7ed1a44adb65..8bc427c57037 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/api/BarApi.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/api/BarApi.java @@ -72,7 +72,7 @@ default ResponseEntity createBar( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"@baseType\" : \"@baseType\", \"@type\" : \"@type\", \"foo\" : { \"@baseType\" : \"@baseType\", \"@type\" : \"@type\", \"fooPropA\" : \"fooPropA\", \"href\" : \"href\", \"id\" : \"id\", \"fooPropB\" : \"fooPropB\", \"@schemaLocation\" : \"@schemaLocation\" }, \"href\" : \"href\", \"id\" : \"id\", \"fooPropB\" : \"fooPropB\", \"@schemaLocation\" : \"@schemaLocation\", \"barPropA\" : \"barPropA\" }"; + String exampleString = "{ \"href\" : \"href\", \"id\" : \"id\", \"@schemaLocation\" : \"@schemaLocation\", \"@baseType\" : \"@baseType\", \"@type\" : \"@type\", \"barPropA\" : \"barPropA\", \"fooPropB\" : \"fooPropB\", \"foo\" : { \"href\" : \"href\", \"id\" : \"id\", \"@schemaLocation\" : \"@schemaLocation\", \"@baseType\" : \"@baseType\", \"@type\" : \"@type\", \"fooPropA\" : \"fooPropA\", \"fooPropB\" : \"fooPropB\" } }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/api/FooApi.java b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/api/FooApi.java index e47af5bb871b..1e3b66b6b1a7 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/api/FooApi.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/api/FooApi.java @@ -73,7 +73,7 @@ default ResponseEntity createFoo( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"@baseType\" : \"@baseType\", \"@type\" : \"@type\", \"fooPropA\" : \"fooPropA\", \"href\" : \"href\", \"id\" : \"id\", \"fooPropB\" : \"fooPropB\", \"@schemaLocation\" : \"@schemaLocation\" }"; + String exampleString = "{ \"href\" : \"href\", \"id\" : \"id\", \"@schemaLocation\" : \"@schemaLocation\", \"@baseType\" : \"@baseType\", \"@type\" : \"@type\", \"fooPropA\" : \"fooPropA\", \"fooPropB\" : \"fooPropB\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -111,7 +111,7 @@ default ResponseEntity> getAllFoos( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json;charset=utf-8"))) { - String exampleString = "[ { \"@baseType\" : \"@baseType\", \"@type\" : \"@type\", \"fooPropA\" : \"fooPropA\", \"href\" : \"href\", \"id\" : \"id\", \"fooPropB\" : \"fooPropB\", \"@schemaLocation\" : \"@schemaLocation\" }, { \"@baseType\" : \"@baseType\", \"@type\" : \"@type\", \"fooPropA\" : \"fooPropA\", \"href\" : \"href\", \"id\" : \"id\", \"fooPropB\" : \"fooPropB\", \"@schemaLocation\" : \"@schemaLocation\" } ]"; + String exampleString = "[ { \"href\" : \"href\", \"id\" : \"id\", \"@schemaLocation\" : \"@schemaLocation\", \"@baseType\" : \"@baseType\", \"@type\" : \"@type\", \"fooPropA\" : \"fooPropA\", \"fooPropB\" : \"fooPropB\" }, { \"href\" : \"href\", \"id\" : \"id\", \"@schemaLocation\" : \"@schemaLocation\", \"@baseType\" : \"@baseType\", \"@type\" : \"@type\", \"fooPropA\" : \"fooPropA\", \"fooPropB\" : \"fooPropB\" } ]"; ApiUtil.setExampleResponse(request, "application/json;charset=utf-8", exampleString); break; } diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Bar.java b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Bar.java index 24121df1e5dc..db08bd552f67 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Bar.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Bar.java @@ -133,17 +133,17 @@ public void setFoo(@Nullable FooRefOrValue foo) { } - public Bar href(String href) { + public Bar href(@Nullable String href) { super.href(href); return this; } - public Bar atSchemaLocation(String atSchemaLocation) { + public Bar atSchemaLocation(@Nullable String atSchemaLocation) { super.atSchemaLocation(atSchemaLocation); return this; } - public Bar atBaseType(String atBaseType) { + public Bar atBaseType(@Nullable String atBaseType) { super.atBaseType(atBaseType); return this; } diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/BarCreate.java b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/BarCreate.java index e632e191f3cd..95dedc23360e 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/BarCreate.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/BarCreate.java @@ -111,22 +111,22 @@ public void setFoo(@Nullable FooRefOrValue foo) { } - public BarCreate href(String href) { + public BarCreate href(@Nullable String href) { super.href(href); return this; } - public BarCreate id(String id) { + public BarCreate id(@Nullable String id) { super.id(id); return this; } - public BarCreate atSchemaLocation(String atSchemaLocation) { + public BarCreate atSchemaLocation(@Nullable String atSchemaLocation) { super.atSchemaLocation(atSchemaLocation); return this; } - public BarCreate atBaseType(String atBaseType) { + public BarCreate atBaseType(@Nullable String atBaseType) { super.atBaseType(atBaseType); return this; } diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/BarRef.java b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/BarRef.java index e1581e5f11ce..42210a674e7a 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/BarRef.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/BarRef.java @@ -39,22 +39,22 @@ public BarRef(String atType) { } - public BarRef href(String href) { + public BarRef href(@Nullable String href) { super.href(href); return this; } - public BarRef id(String id) { + public BarRef id(@Nullable String id) { super.id(id); return this; } - public BarRef atSchemaLocation(String atSchemaLocation) { + public BarRef atSchemaLocation(@Nullable String atSchemaLocation) { super.atSchemaLocation(atSchemaLocation); return this; } - public BarRef atBaseType(String atBaseType) { + public BarRef atBaseType(@Nullable String atBaseType) { super.atBaseType(atBaseType); return this; } @@ -64,12 +64,12 @@ public BarRef atType(String atType) { return this; } - public BarRef name(String name) { + public BarRef name(@Nullable String name) { super.name(name); return this; } - public BarRef atReferredType(String atReferredType) { + public BarRef atReferredType(@Nullable String atReferredType) { super.atReferredType(atReferredType); return this; } diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Foo.java b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Foo.java index 5dfd61ea9665..86578ed76f8a 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Foo.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Foo.java @@ -85,22 +85,22 @@ public void setFooPropB(@Nullable String fooPropB) { } - public Foo href(String href) { + public Foo href(@Nullable String href) { super.href(href); return this; } - public Foo id(String id) { + public Foo id(@Nullable String id) { super.id(id); return this; } - public Foo atSchemaLocation(String atSchemaLocation) { + public Foo atSchemaLocation(@Nullable String atSchemaLocation) { super.atSchemaLocation(atSchemaLocation); return this; } - public Foo atBaseType(String atBaseType) { + public Foo atBaseType(@Nullable String atBaseType) { super.atBaseType(atBaseType); return this; } diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/FooRef.java b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/FooRef.java index f40929863903..4ab0207b25db 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/FooRef.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/FooRef.java @@ -62,22 +62,22 @@ public void setFoorefPropA(@Nullable String foorefPropA) { } - public FooRef href(String href) { + public FooRef href(@Nullable String href) { super.href(href); return this; } - public FooRef id(String id) { + public FooRef id(@Nullable String id) { super.id(id); return this; } - public FooRef atSchemaLocation(String atSchemaLocation) { + public FooRef atSchemaLocation(@Nullable String atSchemaLocation) { super.atSchemaLocation(atSchemaLocation); return this; } - public FooRef atBaseType(String atBaseType) { + public FooRef atBaseType(@Nullable String atBaseType) { super.atBaseType(atBaseType); return this; } @@ -87,12 +87,12 @@ public FooRef atType(String atType) { return this; } - public FooRef name(String name) { + public FooRef name(@Nullable String name) { super.name(name); return this; } - public FooRef atReferredType(String atReferredType) { + public FooRef atReferredType(@Nullable String atReferredType) { super.atReferredType(atReferredType); return this; } diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Pasta.java b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Pasta.java index bd4ee29a355c..6c268be4b0d9 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Pasta.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Pasta.java @@ -62,22 +62,22 @@ public void setVendor(@Nullable String vendor) { } - public Pasta href(String href) { + public Pasta href(@Nullable String href) { super.href(href); return this; } - public Pasta id(String id) { + public Pasta id(@Nullable String id) { super.id(id); return this; } - public Pasta atSchemaLocation(String atSchemaLocation) { + public Pasta atSchemaLocation(@Nullable String atSchemaLocation) { super.atSchemaLocation(atSchemaLocation); return this; } - public Pasta atBaseType(String atBaseType) { + public Pasta atBaseType(@Nullable String atBaseType) { super.atBaseType(atBaseType); return this; } diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Pizza.java b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Pizza.java index 9b1aedfed2e7..122a1cac3308 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Pizza.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/Pizza.java @@ -71,22 +71,22 @@ public void setPizzaSize(@Nullable BigDecimal pizzaSize) { } - public Pizza href(String href) { + public Pizza href(@Nullable String href) { super.href(href); return this; } - public Pizza id(String id) { + public Pizza id(@Nullable String id) { super.id(id); return this; } - public Pizza atSchemaLocation(String atSchemaLocation) { + public Pizza atSchemaLocation(@Nullable String atSchemaLocation) { super.atSchemaLocation(atSchemaLocation); return this; } - public Pizza atBaseType(String atBaseType) { + public Pizza atBaseType(@Nullable String atBaseType) { super.atBaseType(atBaseType); return this; } diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/PizzaSpeziale.java b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/PizzaSpeziale.java index 68f6905479ab..953971b9ea82 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/PizzaSpeziale.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/java/org/openapitools/model/PizzaSpeziale.java @@ -63,27 +63,27 @@ public void setToppings(@Nullable String toppings) { } - public PizzaSpeziale pizzaSize(BigDecimal pizzaSize) { + public PizzaSpeziale pizzaSize(@Nullable BigDecimal pizzaSize) { super.pizzaSize(pizzaSize); return this; } - public PizzaSpeziale href(String href) { + public PizzaSpeziale href(@Nullable String href) { super.href(href); return this; } - public PizzaSpeziale id(String id) { + public PizzaSpeziale id(@Nullable String id) { super.id(id); return this; } - public PizzaSpeziale atSchemaLocation(String atSchemaLocation) { + public PizzaSpeziale atSchemaLocation(@Nullable String atSchemaLocation) { super.atSchemaLocation(atSchemaLocation); return this; } - public PizzaSpeziale atBaseType(String atBaseType) { + public PizzaSpeziale atBaseType(@Nullable String atBaseType) { super.atBaseType(atBaseType); return this; } diff --git a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/resources/openapi.yaml b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/resources/openapi.yaml index 5ab636303754..3dcf1b76abc0 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/resources/openapi.yaml +++ b/samples/openapi3/server/petstore/spring-boot-oneof-sealed/src/main/resources/openapi.yaml @@ -168,13 +168,13 @@ components: type: object example: null example: + href: href + id: id + '@schemaLocation': '@schemaLocation' '@baseType': '@baseType' '@type': '@type' fooPropA: fooPropA - href: href - id: id fooPropB: fooPropB - '@schemaLocation': '@schemaLocation' type: object FooRef: allOf: @@ -221,21 +221,21 @@ components: type: object example: null example: + href: href + id: id + '@schemaLocation': '@schemaLocation' '@baseType': '@baseType' '@type': '@type' + barPropA: barPropA + fooPropB: fooPropB foo: + href: href + id: id + '@schemaLocation': '@schemaLocation' '@baseType': '@baseType' '@type': '@type' fooPropA: fooPropA - href: href - id: id fooPropB: fooPropB - '@schemaLocation': '@schemaLocation' - href: href - id: id - fooPropB: fooPropB - '@schemaLocation': '@schemaLocation' - barPropA: barPropA type: object BarRefOrValue: oneOf: diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/BarApi.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/BarApi.java index 7ed1a44adb65..8bc427c57037 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/BarApi.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/BarApi.java @@ -72,7 +72,7 @@ default ResponseEntity createBar( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"@baseType\" : \"@baseType\", \"@type\" : \"@type\", \"foo\" : { \"@baseType\" : \"@baseType\", \"@type\" : \"@type\", \"fooPropA\" : \"fooPropA\", \"href\" : \"href\", \"id\" : \"id\", \"fooPropB\" : \"fooPropB\", \"@schemaLocation\" : \"@schemaLocation\" }, \"href\" : \"href\", \"id\" : \"id\", \"fooPropB\" : \"fooPropB\", \"@schemaLocation\" : \"@schemaLocation\", \"barPropA\" : \"barPropA\" }"; + String exampleString = "{ \"href\" : \"href\", \"id\" : \"id\", \"@schemaLocation\" : \"@schemaLocation\", \"@baseType\" : \"@baseType\", \"@type\" : \"@type\", \"barPropA\" : \"barPropA\", \"fooPropB\" : \"fooPropB\", \"foo\" : { \"href\" : \"href\", \"id\" : \"id\", \"@schemaLocation\" : \"@schemaLocation\", \"@baseType\" : \"@baseType\", \"@type\" : \"@type\", \"fooPropA\" : \"fooPropA\", \"fooPropB\" : \"fooPropB\" } }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/FooApi.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/FooApi.java index e47af5bb871b..1e3b66b6b1a7 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/FooApi.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/api/FooApi.java @@ -73,7 +73,7 @@ default ResponseEntity createFoo( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"@baseType\" : \"@baseType\", \"@type\" : \"@type\", \"fooPropA\" : \"fooPropA\", \"href\" : \"href\", \"id\" : \"id\", \"fooPropB\" : \"fooPropB\", \"@schemaLocation\" : \"@schemaLocation\" }"; + String exampleString = "{ \"href\" : \"href\", \"id\" : \"id\", \"@schemaLocation\" : \"@schemaLocation\", \"@baseType\" : \"@baseType\", \"@type\" : \"@type\", \"fooPropA\" : \"fooPropA\", \"fooPropB\" : \"fooPropB\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -111,7 +111,7 @@ default ResponseEntity> getAllFoos( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json;charset=utf-8"))) { - String exampleString = "[ { \"@baseType\" : \"@baseType\", \"@type\" : \"@type\", \"fooPropA\" : \"fooPropA\", \"href\" : \"href\", \"id\" : \"id\", \"fooPropB\" : \"fooPropB\", \"@schemaLocation\" : \"@schemaLocation\" }, { \"@baseType\" : \"@baseType\", \"@type\" : \"@type\", \"fooPropA\" : \"fooPropA\", \"href\" : \"href\", \"id\" : \"id\", \"fooPropB\" : \"fooPropB\", \"@schemaLocation\" : \"@schemaLocation\" } ]"; + String exampleString = "[ { \"href\" : \"href\", \"id\" : \"id\", \"@schemaLocation\" : \"@schemaLocation\", \"@baseType\" : \"@baseType\", \"@type\" : \"@type\", \"fooPropA\" : \"fooPropA\", \"fooPropB\" : \"fooPropB\" }, { \"href\" : \"href\", \"id\" : \"id\", \"@schemaLocation\" : \"@schemaLocation\", \"@baseType\" : \"@baseType\", \"@type\" : \"@type\", \"fooPropA\" : \"fooPropA\", \"fooPropB\" : \"fooPropB\" } ]"; ApiUtil.setExampleResponse(request, "application/json;charset=utf-8", exampleString); break; } diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Bar.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Bar.java index 62a60b4b39dc..5216c209366e 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Bar.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Bar.java @@ -133,17 +133,17 @@ public void setFoo(@Nullable FooRefOrValue foo) { } - public Bar href(String href) { + public Bar href(@Nullable String href) { super.href(href); return this; } - public Bar atSchemaLocation(String atSchemaLocation) { + public Bar atSchemaLocation(@Nullable String atSchemaLocation) { super.atSchemaLocation(atSchemaLocation); return this; } - public Bar atBaseType(String atBaseType) { + public Bar atBaseType(@Nullable String atBaseType) { super.atBaseType(atBaseType); return this; } diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarCreate.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarCreate.java index ea930a4e6239..20fbaaadccd8 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarCreate.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarCreate.java @@ -111,22 +111,22 @@ public void setFoo(@Nullable FooRefOrValue foo) { } - public BarCreate href(String href) { + public BarCreate href(@Nullable String href) { super.href(href); return this; } - public BarCreate id(String id) { + public BarCreate id(@Nullable String id) { super.id(id); return this; } - public BarCreate atSchemaLocation(String atSchemaLocation) { + public BarCreate atSchemaLocation(@Nullable String atSchemaLocation) { super.atSchemaLocation(atSchemaLocation); return this; } - public BarCreate atBaseType(String atBaseType) { + public BarCreate atBaseType(@Nullable String atBaseType) { super.atBaseType(atBaseType); return this; } diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarRef.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarRef.java index 88e38ba8d016..9066a076bda2 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarRef.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/BarRef.java @@ -39,22 +39,22 @@ public BarRef(String atType) { } - public BarRef href(String href) { + public BarRef href(@Nullable String href) { super.href(href); return this; } - public BarRef id(String id) { + public BarRef id(@Nullable String id) { super.id(id); return this; } - public BarRef atSchemaLocation(String atSchemaLocation) { + public BarRef atSchemaLocation(@Nullable String atSchemaLocation) { super.atSchemaLocation(atSchemaLocation); return this; } - public BarRef atBaseType(String atBaseType) { + public BarRef atBaseType(@Nullable String atBaseType) { super.atBaseType(atBaseType); return this; } @@ -64,12 +64,12 @@ public BarRef atType(String atType) { return this; } - public BarRef name(String name) { + public BarRef name(@Nullable String name) { super.name(name); return this; } - public BarRef atReferredType(String atReferredType) { + public BarRef atReferredType(@Nullable String atReferredType) { super.atReferredType(atReferredType); return this; } diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Foo.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Foo.java index 585bdf2f6ef7..079d8883c8ff 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Foo.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Foo.java @@ -85,22 +85,22 @@ public void setFooPropB(@Nullable String fooPropB) { } - public Foo href(String href) { + public Foo href(@Nullable String href) { super.href(href); return this; } - public Foo id(String id) { + public Foo id(@Nullable String id) { super.id(id); return this; } - public Foo atSchemaLocation(String atSchemaLocation) { + public Foo atSchemaLocation(@Nullable String atSchemaLocation) { super.atSchemaLocation(atSchemaLocation); return this; } - public Foo atBaseType(String atBaseType) { + public Foo atBaseType(@Nullable String atBaseType) { super.atBaseType(atBaseType); return this; } diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/FooRef.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/FooRef.java index 396b4a70265b..f6e72d21ab9a 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/FooRef.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/FooRef.java @@ -62,22 +62,22 @@ public void setFoorefPropA(@Nullable String foorefPropA) { } - public FooRef href(String href) { + public FooRef href(@Nullable String href) { super.href(href); return this; } - public FooRef id(String id) { + public FooRef id(@Nullable String id) { super.id(id); return this; } - public FooRef atSchemaLocation(String atSchemaLocation) { + public FooRef atSchemaLocation(@Nullable String atSchemaLocation) { super.atSchemaLocation(atSchemaLocation); return this; } - public FooRef atBaseType(String atBaseType) { + public FooRef atBaseType(@Nullable String atBaseType) { super.atBaseType(atBaseType); return this; } @@ -87,12 +87,12 @@ public FooRef atType(String atType) { return this; } - public FooRef name(String name) { + public FooRef name(@Nullable String name) { super.name(name); return this; } - public FooRef atReferredType(String atReferredType) { + public FooRef atReferredType(@Nullable String atReferredType) { super.atReferredType(atReferredType); return this; } diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pasta.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pasta.java index b6ada5a8e0f4..4b2594f5b122 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pasta.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pasta.java @@ -62,22 +62,22 @@ public void setVendor(@Nullable String vendor) { } - public Pasta href(String href) { + public Pasta href(@Nullable String href) { super.href(href); return this; } - public Pasta id(String id) { + public Pasta id(@Nullable String id) { super.id(id); return this; } - public Pasta atSchemaLocation(String atSchemaLocation) { + public Pasta atSchemaLocation(@Nullable String atSchemaLocation) { super.atSchemaLocation(atSchemaLocation); return this; } - public Pasta atBaseType(String atBaseType) { + public Pasta atBaseType(@Nullable String atBaseType) { super.atBaseType(atBaseType); return this; } diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pizza.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pizza.java index d1911eeaa762..a8d5c0c3df45 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pizza.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/Pizza.java @@ -71,22 +71,22 @@ public void setPizzaSize(@Nullable BigDecimal pizzaSize) { } - public Pizza href(String href) { + public Pizza href(@Nullable String href) { super.href(href); return this; } - public Pizza id(String id) { + public Pizza id(@Nullable String id) { super.id(id); return this; } - public Pizza atSchemaLocation(String atSchemaLocation) { + public Pizza atSchemaLocation(@Nullable String atSchemaLocation) { super.atSchemaLocation(atSchemaLocation); return this; } - public Pizza atBaseType(String atBaseType) { + public Pizza atBaseType(@Nullable String atBaseType) { super.atBaseType(atBaseType); return this; } diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/PizzaSpeziale.java b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/PizzaSpeziale.java index 9fd9b7cf60db..c1838adac969 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/PizzaSpeziale.java +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/java/org/openapitools/model/PizzaSpeziale.java @@ -63,27 +63,27 @@ public void setToppings(@Nullable String toppings) { } - public PizzaSpeziale pizzaSize(BigDecimal pizzaSize) { + public PizzaSpeziale pizzaSize(@Nullable BigDecimal pizzaSize) { super.pizzaSize(pizzaSize); return this; } - public PizzaSpeziale href(String href) { + public PizzaSpeziale href(@Nullable String href) { super.href(href); return this; } - public PizzaSpeziale id(String id) { + public PizzaSpeziale id(@Nullable String id) { super.id(id); return this; } - public PizzaSpeziale atSchemaLocation(String atSchemaLocation) { + public PizzaSpeziale atSchemaLocation(@Nullable String atSchemaLocation) { super.atSchemaLocation(atSchemaLocation); return this; } - public PizzaSpeziale atBaseType(String atBaseType) { + public PizzaSpeziale atBaseType(@Nullable String atBaseType) { super.atBaseType(atBaseType); return this; } diff --git a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/resources/openapi.yaml b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/resources/openapi.yaml index 5ab636303754..3dcf1b76abc0 100644 --- a/samples/openapi3/server/petstore/spring-boot-oneof/src/main/resources/openapi.yaml +++ b/samples/openapi3/server/petstore/spring-boot-oneof/src/main/resources/openapi.yaml @@ -168,13 +168,13 @@ components: type: object example: null example: + href: href + id: id + '@schemaLocation': '@schemaLocation' '@baseType': '@baseType' '@type': '@type' fooPropA: fooPropA - href: href - id: id fooPropB: fooPropB - '@schemaLocation': '@schemaLocation' type: object FooRef: allOf: @@ -221,21 +221,21 @@ components: type: object example: null example: + href: href + id: id + '@schemaLocation': '@schemaLocation' '@baseType': '@baseType' '@type': '@type' + barPropA: barPropA + fooPropB: fooPropB foo: + href: href + id: id + '@schemaLocation': '@schemaLocation' '@baseType': '@baseType' '@type': '@type' fooPropA: fooPropA - href: href - id: id fooPropB: fooPropB - '@schemaLocation': '@schemaLocation' - href: href - id: id - fooPropB: fooPropB - '@schemaLocation': '@schemaLocation' - barPropA: barPropA type: object BarRefOrValue: oneOf: diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/PetApi.java index ca5016f9cb57..3c853bf79cff 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/PetApi.java @@ -81,7 +81,7 @@ default ResponseEntity addPet( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + String exampleString = "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -167,7 +167,7 @@ default ResponseEntity> findPetsByStatus( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -222,7 +222,7 @@ default ResponseEntity> findPetsByTags( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -276,7 +276,7 @@ default ResponseEntity getPetById( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + String exampleString = "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -336,7 +336,7 @@ default ResponseEntity updatePet( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + String exampleString = "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/StoreApi.java index 7bbe2b0951c1..e9a1b761ed80 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/StoreApi.java @@ -143,7 +143,7 @@ default ResponseEntity getOrderById( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -193,7 +193,7 @@ default ResponseEntity placeOrder( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/UserApi.java index 2ac726c91f5e..91044c0a35cd 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/java/org/openapitools/api/UserApi.java @@ -211,7 +211,7 @@ default ResponseEntity getUserByName( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"password\" : \"password\", \"userStatus\" : 6, \"phone\" : \"phone\", \"id\" : 0, \"email\" : \"email\", \"username\" : \"username\" }"; + String exampleString = "{ \"id\" : 0, \"username\" : \"username\", \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"email\" : \"email\", \"password\" : \"password\", \"phone\" : \"phone\", \"userStatus\" : 6 }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/resources/openapi.yaml b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/resources/openapi.yaml index 31074771d9fb..aa6fc7e42167 100644 --- a/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/resources/openapi.yaml +++ b/samples/openapi3/server/petstore/spring-boot-springdoc/src/main/resources/openapi.yaml @@ -705,12 +705,12 @@ components: Order: description: An order for a pets from the pet store example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -741,8 +741,8 @@ components: Category: description: A category for a pet example: - name: name id: 6 + name: name properties: id: format: int64 @@ -757,14 +757,14 @@ components: User: description: A User who is purchasing from the pet store example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -792,8 +792,8 @@ components: Tag: description: A tag for a pet example: - name: name id: 1 + name: name properties: id: format: int64 @@ -807,19 +807,19 @@ components: Pet: description: A pet for sale in the pet store example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: diff --git a/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/api/PetApiDelegate.java b/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/api/PetApiDelegate.java index c44cc6e8c2b9..46b360075f5e 100644 --- a/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/api/PetApiDelegate.java +++ b/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/api/PetApiDelegate.java @@ -42,7 +42,7 @@ default ResponseEntity addPet(Pet pet, getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + String exampleString = "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -87,7 +87,7 @@ default ResponseEntity> findPetsByStatus(List status, getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -118,7 +118,7 @@ default ResponseEntity> findPetsByTags(List tags, getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -148,7 +148,7 @@ default ResponseEntity getPetById(Long petId, getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + String exampleString = "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -181,7 +181,7 @@ default ResponseEntity updatePet(Pet pet, getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + String exampleString = "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/api/StoreApiDelegate.java b/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/api/StoreApiDelegate.java index 78dc24a9e5fb..f0a700765504 100644 --- a/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/api/StoreApiDelegate.java +++ b/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/api/StoreApiDelegate.java @@ -69,7 +69,7 @@ default ResponseEntity getOrderById(Long orderId, getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -98,7 +98,7 @@ default ResponseEntity placeOrder(Order order, getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/api/UserApiDelegate.java b/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/api/UserApiDelegate.java index 82273961277e..6134c3a8d9af 100644 --- a/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/api/UserApiDelegate.java +++ b/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/java/org/openapitools/api/UserApiDelegate.java @@ -99,7 +99,7 @@ default ResponseEntity getUserByName(String username, getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"password\" : \"password\", \"userStatus\" : 6, \"phone\" : \"phone\", \"id\" : 0, \"email\" : \"email\", \"username\" : \"username\" }"; + String exampleString = "{ \"id\" : 0, \"username\" : \"username\", \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"email\" : \"email\", \"password\" : \"password\", \"phone\" : \"phone\", \"userStatus\" : 6 }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/resources/openapi.yaml b/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/resources/openapi.yaml index 31074771d9fb..aa6fc7e42167 100644 --- a/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/resources/openapi.yaml +++ b/samples/openapi3/server/petstore/springboot-3-include-http-request-context/src/main/resources/openapi.yaml @@ -705,12 +705,12 @@ components: Order: description: An order for a pets from the pet store example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -741,8 +741,8 @@ components: Category: description: A category for a pet example: - name: name id: 6 + name: name properties: id: format: int64 @@ -757,14 +757,14 @@ components: User: description: A User who is purchasing from the pet store example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -792,8 +792,8 @@ components: Tag: description: A tag for a pet example: - name: name id: 1 + name: name properties: id: format: int64 @@ -807,19 +807,19 @@ components: Pet: description: A pet for sale in the pet store example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/PetApi.java index ca5016f9cb57..3c853bf79cff 100644 --- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/PetApi.java @@ -81,7 +81,7 @@ default ResponseEntity addPet( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + String exampleString = "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -167,7 +167,7 @@ default ResponseEntity> findPetsByStatus( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -222,7 +222,7 @@ default ResponseEntity> findPetsByTags( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -276,7 +276,7 @@ default ResponseEntity getPetById( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + String exampleString = "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -336,7 +336,7 @@ default ResponseEntity updatePet( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + String exampleString = "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/StoreApi.java index 7bbe2b0951c1..e9a1b761ed80 100644 --- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/StoreApi.java @@ -143,7 +143,7 @@ default ResponseEntity getOrderById( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -193,7 +193,7 @@ default ResponseEntity placeOrder( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/UserApi.java index 2ac726c91f5e..91044c0a35cd 100644 --- a/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/server/petstore/springboot-3/src/main/java/org/openapitools/api/UserApi.java @@ -211,7 +211,7 @@ default ResponseEntity getUserByName( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"password\" : \"password\", \"userStatus\" : 6, \"phone\" : \"phone\", \"id\" : 0, \"email\" : \"email\", \"username\" : \"username\" }"; + String exampleString = "{ \"id\" : 0, \"username\" : \"username\", \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"email\" : \"email\", \"password\" : \"password\", \"phone\" : \"phone\", \"userStatus\" : 6 }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/openapi3/server/petstore/springboot-3/src/main/resources/openapi.yaml b/samples/openapi3/server/petstore/springboot-3/src/main/resources/openapi.yaml index 31074771d9fb..aa6fc7e42167 100644 --- a/samples/openapi3/server/petstore/springboot-3/src/main/resources/openapi.yaml +++ b/samples/openapi3/server/petstore/springboot-3/src/main/resources/openapi.yaml @@ -705,12 +705,12 @@ components: Order: description: An order for a pets from the pet store example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -741,8 +741,8 @@ components: Category: description: A category for a pet example: - name: name id: 6 + name: name properties: id: format: int64 @@ -757,14 +757,14 @@ components: User: description: A User who is purchasing from the pet store example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -792,8 +792,8 @@ components: Tag: description: A tag for a pet example: - name: name id: 1 + name: name properties: id: format: int64 @@ -807,19 +807,19 @@ components: Pet: description: A pet for sale in the pet store example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: diff --git a/samples/openapi3/server/petstore/springboot-4-jspecify/src/main/java/org/openapitools/api/FooApi.java b/samples/openapi3/server/petstore/springboot-4-jspecify/src/main/java/org/openapitools/api/FooApi.java index 3aacfff41a0a..9723dd661e9c 100644 --- a/samples/openapi3/server/petstore/springboot-4-jspecify/src/main/java/org/openapitools/api/FooApi.java +++ b/samples/openapi3/server/petstore/springboot-4-jspecify/src/main/java/org/openapitools/api/FooApi.java @@ -75,7 +75,7 @@ default ResponseEntity fooDtParamGet( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"dt\" : \"2000-01-23T04:56:07.000+00:00\", \"number\" : 0.8008281904610115, \"binary\" : \"\", \"listOfDt\" : [ \"2000-01-23T04:56:07.000+00:00\", \"2000-01-23T04:56:07.000+00:00\" ], \"listMinIntems\" : [ \"2000-01-23T04:56:07.000+00:00\", \"2000-01-23T04:56:07.000+00:00\" ], \"requiredDt\" : \"2000-01-23T04:56:07.000+00:00\" }"; + String exampleString = "{ \"dt\" : \"2000-01-23T04:56:07.000+00:00\", \"binary\" : \"\", \"listOfDt\" : [ \"2000-01-23T04:56:07.000+00:00\", \"2000-01-23T04:56:07.000+00:00\" ], \"listMinIntems\" : [ \"2000-01-23T04:56:07.000+00:00\", \"2000-01-23T04:56:07.000+00:00\" ], \"requiredDt\" : \"2000-01-23T04:56:07.000+00:00\", \"number\" : 0.8008281904610115 }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/openapi3/server/petstore/springboot-4-jspecify/src/main/java/org/openapitools/model/Foo.java b/samples/openapi3/server/petstore/springboot-4-jspecify/src/main/java/org/openapitools/model/Foo.java index 81ac8b51b79a..cd95f88d5db3 100644 --- a/samples/openapi3/server/petstore/springboot-4-jspecify/src/main/java/org/openapitools/model/Foo.java +++ b/samples/openapi3/server/petstore/springboot-4-jspecify/src/main/java/org/openapitools/model/Foo.java @@ -73,7 +73,7 @@ public Foo(OffsetDateTime dt, org.springframework.core.io.Resource binary, List< this.number = number; } - public Foo dt(OffsetDateTime dt) { + public Foo dt(@Nullable OffsetDateTime dt) { this.dt = dt; return this; } @@ -97,7 +97,7 @@ public void setDt(@Nullable OffsetDateTime dt) { this.dt = dt; } - public Foo binary(org.springframework.core.io.Resource binary) { + public Foo binary(org.springframework.core.io.@Nullable Resource binary) { this.binary = binary; return this; } @@ -213,7 +213,7 @@ public void setRequiredDt(OffsetDateTime requiredDt) { this.requiredDt = requiredDt; } - public Foo number(BigDecimal number) { + public Foo number(@Nullable BigDecimal number) { this.number = number; return this; } diff --git a/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/api/PetApi.java index ca5016f9cb57..3c853bf79cff 100644 --- a/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/api/PetApi.java @@ -81,7 +81,7 @@ default ResponseEntity addPet( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + String exampleString = "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -167,7 +167,7 @@ default ResponseEntity> findPetsByStatus( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -222,7 +222,7 @@ default ResponseEntity> findPetsByTags( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -276,7 +276,7 @@ default ResponseEntity getPetById( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + String exampleString = "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -336,7 +336,7 @@ default ResponseEntity updatePet( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + String exampleString = "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/api/StoreApi.java index 7bbe2b0951c1..e9a1b761ed80 100644 --- a/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/api/StoreApi.java @@ -143,7 +143,7 @@ default ResponseEntity getOrderById( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -193,7 +193,7 @@ default ResponseEntity placeOrder( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/api/UserApi.java index 2ac726c91f5e..91044c0a35cd 100644 --- a/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/server/petstore/springboot-4/src/main/java/org/openapitools/api/UserApi.java @@ -211,7 +211,7 @@ default ResponseEntity getUserByName( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"password\" : \"password\", \"userStatus\" : 6, \"phone\" : \"phone\", \"id\" : 0, \"email\" : \"email\", \"username\" : \"username\" }"; + String exampleString = "{ \"id\" : 0, \"username\" : \"username\", \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"email\" : \"email\", \"password\" : \"password\", \"phone\" : \"phone\", \"userStatus\" : 6 }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/openapi3/server/petstore/springboot-4/src/main/resources/openapi.yaml b/samples/openapi3/server/petstore/springboot-4/src/main/resources/openapi.yaml index 31074771d9fb..aa6fc7e42167 100644 --- a/samples/openapi3/server/petstore/springboot-4/src/main/resources/openapi.yaml +++ b/samples/openapi3/server/petstore/springboot-4/src/main/resources/openapi.yaml @@ -705,12 +705,12 @@ components: Order: description: An order for a pets from the pet store example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -741,8 +741,8 @@ components: Category: description: A category for a pet example: - name: name id: 6 + name: name properties: id: format: int64 @@ -757,14 +757,14 @@ components: User: description: A User who is purchasing from the pet store example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -792,8 +792,8 @@ components: Tag: description: A tag for a pet example: - name: name id: 1 + name: name properties: id: format: int64 @@ -807,19 +807,19 @@ components: Pet: description: A pet for sale in the pet store example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java index d9cf089cdc7a..54ebbd8d3d4a 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java @@ -76,7 +76,7 @@ default ResponseEntity fakeOuterCompositeSerialize(OuterComposit getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("*/*"))) { - String exampleString = "{ \"my_string\" : \"my_string\", \"my_number\" : 0.8008281904610115, \"my_boolean\" : true }"; + String exampleString = "{ \"my_number\" : 0.8008281904610115, \"my_string\" : \"my_string\", \"my_boolean\" : true }"; ApiUtil.setExampleResponse(request, "*/*", exampleString); break; } @@ -123,7 +123,7 @@ default ResponseEntity responseObjectDiff getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\", \"normalPropertyName\" : \"normalPropertyName\" }"; + String exampleString = "{ \"normalPropertyName\" : \"normalPropertyName\", \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiDelegate.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiDelegate.java index 5c7b62100da6..eaac3b964320 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiDelegate.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiDelegate.java @@ -71,7 +71,7 @@ default ResponseEntity> findPetsByStatus(List status) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -101,7 +101,7 @@ default ResponseEntity> findPetsByTags(Set tags) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -130,7 +130,7 @@ default ResponseEntity getPetById(Long petId) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + String exampleString = "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiDelegate.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiDelegate.java index 7f0fb2e3308e..3ef21cc1cfde 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiDelegate.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiDelegate.java @@ -66,7 +66,7 @@ default ResponseEntity getOrderById(Long orderId) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -94,7 +94,7 @@ default ResponseEntity placeOrder(Order order) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApiDelegate.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApiDelegate.java index d7bae957061b..b9e8850b4e83 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApiDelegate.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApiDelegate.java @@ -93,7 +93,7 @@ default ResponseEntity getUserByName(String username) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"password\" : \"password\", \"userStatus\" : 6, \"phone\" : \"phone\", \"id\" : 0, \"email\" : \"email\", \"username\" : \"username\" }"; + String exampleString = "{ \"id\" : 0, \"username\" : \"username\", \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"email\" : \"email\", \"password\" : \"password\", \"phone\" : \"phone\", \"userStatus\" : 6 }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 31fb21c743c0..edeb6a3b1bd8 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -312,7 +312,7 @@ public void setAnytype1(@Nullable Object anytype1) { this.anytype1 = anytype1; } - public AdditionalPropertiesClass anytype2(Object anytype2) { + public AdditionalPropertiesClass anytype2(JsonNullable anytype2) { this.anytype2 = JsonNullable.of(anytype2); return this; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java index 0b8bd86e0136..54dc118a6e44 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java @@ -102,7 +102,7 @@ public void setKind(@Nullable KindEnum kind) { } - public BigCat declawed(Boolean declawed) { + public BigCat declawed(@Nullable Boolean declawed) { super.declawed(declawed); return this; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ChildWithNullable.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ChildWithNullable.java index d841f7752340..f90958041da4 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ChildWithNullable.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ChildWithNullable.java @@ -54,12 +54,12 @@ public void setOtherProperty(@Nullable String otherProperty) { } - public ChildWithNullable type(TypeEnum type) { + public ChildWithNullable type(@Nullable TypeEnum type) { super.type(type); return this; } - public ChildWithNullable nullableProperty(String nullableProperty) { + public ChildWithNullable nullableProperty(JsonNullable nullableProperty) { super.nullableProperty(nullableProperty); return this; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java index b54195b47503..99dfeb81b3c8 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -51,7 +51,7 @@ public ContainerDefaultValue(List nullableRequiredArray, List re this.requiredArray = requiredArray; } - public ContainerDefaultValue nullableArray(List nullableArray) { + public ContainerDefaultValue nullableArray(JsonNullable> nullableArray) { this.nullableArray = JsonNullable.of(nullableArray); return this; } @@ -79,7 +79,7 @@ public void setNullableArray(JsonNullable> nullableArray) { this.nullableArray = nullableArray; } - public ContainerDefaultValue nullableRequiredArray(List nullableRequiredArray) { + public ContainerDefaultValue nullableRequiredArray(JsonNullable> nullableRequiredArray) { this.nullableRequiredArray = JsonNullable.of(nullableRequiredArray); return this; } @@ -137,7 +137,7 @@ public void setRequiredArray(List requiredArray) { this.requiredArray = requiredArray; } - public ContainerDefaultValue nullableArrayWithDefault(List nullableArrayWithDefault) { + public ContainerDefaultValue nullableArrayWithDefault(JsonNullable> nullableArrayWithDefault) { this.nullableArrayWithDefault = JsonNullable.of(nullableArrayWithDefault); return this; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NullableMapProperty.java index 85b9061b4838..f9956d4a5d52 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -30,7 +30,7 @@ public class NullableMapProperty { @Valid private JsonNullable> languageValues = JsonNullable.>undefined(); - public NullableMapProperty languageValues(Map languageValues) { + public NullableMapProperty languageValues(JsonNullable> languageValues) { this.languageValues = JsonNullable.of(languageValues); return this; } diff --git a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ParentWithNullable.java b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ParentWithNullable.java index 1d88649a8fca..652eef33f398 100644 --- a/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ParentWithNullable.java +++ b/samples/openapi3/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ParentWithNullable.java @@ -96,7 +96,7 @@ public void setType(@Nullable TypeEnum type) { this.type = type; } - public ParentWithNullable nullableProperty(String nullableProperty) { + public ParentWithNullable nullableProperty(JsonNullable nullableProperty) { this.nullableProperty = JsonNullable.of(nullableProperty); return this; } 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 cb8da56b1462..3ee3d2f2941d 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 @@ -1315,12 +1315,12 @@ components: schemas: Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1349,8 +1349,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1365,14 +1365,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1399,8 +1399,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1412,19 +1412,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1912,8 +1912,8 @@ components: type: string OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -1951,9 +1951,9 @@ components: type: string type: object example: - otherProperty: otherProperty - nullableProperty: nullableProperty type: ChildWithNullable + nullableProperty: nullableProperty + otherProperty: otherProperty StringBooleanMap: additionalProperties: type: boolean @@ -2264,10 +2264,10 @@ components: type: object ResponseObjectWithDifferentFieldNames: example: + normalPropertyName: normalPropertyName UPPER_CASE_PROPERTY_SNAKE: UPPER_CASE_PROPERTY_SNAKE lower-case-property-dashes: lower-case-property-dashes property name with spaces: property name with spaces - normalPropertyName: normalPropertyName properties: normalPropertyName: type: string diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java index 9c5691f047cc..69217b5a23af 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java @@ -147,7 +147,7 @@ default ResponseEntity fakeOuterCompositeSerialize( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("*/*"))) { - String exampleString = "{ \"my_string\" : \"my_string\", \"my_number\" : 0.8008281904610115, \"my_boolean\" : true }"; + String exampleString = "{ \"my_number\" : 0.8008281904610115, \"my_string\" : \"my_string\", \"my_boolean\" : true }"; ApiUtil.setExampleResponse(request, "*/*", exampleString); break; } @@ -249,7 +249,7 @@ default ResponseEntity responseObjectDiff getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\", \"normalPropertyName\" : \"normalPropertyName\" }"; + String exampleString = "{ \"normalPropertyName\" : \"normalPropertyName\", \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java index c451aadc9de0..cfd0c47a5350 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java @@ -153,7 +153,7 @@ default ResponseEntity> findPetsByStatus( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -208,7 +208,7 @@ default ResponseEntity> findPetsByTags( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -262,7 +262,7 @@ default ResponseEntity getPetById( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + String exampleString = "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java index e178ae562118..b5dc0c07a165 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java @@ -143,7 +143,7 @@ default ResponseEntity getOrderById( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -193,7 +193,7 @@ default ResponseEntity placeOrder( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java index 4107908070c5..c961a8a861db 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java @@ -199,7 +199,7 @@ default ResponseEntity getUserByName( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"password\" : \"password\", \"userStatus\" : 6, \"phone\" : \"phone\", \"id\" : 0, \"email\" : \"email\", \"username\" : \"username\" }"; + String exampleString = "{ \"id\" : 0, \"username\" : \"username\", \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"email\" : \"email\", \"password\" : \"password\", \"phone\" : \"phone\", \"userStatus\" : 6 }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 31fb21c743c0..edeb6a3b1bd8 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -312,7 +312,7 @@ public void setAnytype1(@Nullable Object anytype1) { this.anytype1 = anytype1; } - public AdditionalPropertiesClass anytype2(Object anytype2) { + public AdditionalPropertiesClass anytype2(JsonNullable anytype2) { this.anytype2 = JsonNullable.of(anytype2); return this; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java index 0b8bd86e0136..54dc118a6e44 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java @@ -102,7 +102,7 @@ public void setKind(@Nullable KindEnum kind) { } - public BigCat declawed(Boolean declawed) { + public BigCat declawed(@Nullable Boolean declawed) { super.declawed(declawed); return this; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ChildWithNullable.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ChildWithNullable.java index d841f7752340..f90958041da4 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ChildWithNullable.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ChildWithNullable.java @@ -54,12 +54,12 @@ public void setOtherProperty(@Nullable String otherProperty) { } - public ChildWithNullable type(TypeEnum type) { + public ChildWithNullable type(@Nullable TypeEnum type) { super.type(type); return this; } - public ChildWithNullable nullableProperty(String nullableProperty) { + public ChildWithNullable nullableProperty(JsonNullable nullableProperty) { super.nullableProperty(nullableProperty); return this; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java index b54195b47503..99dfeb81b3c8 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -51,7 +51,7 @@ public ContainerDefaultValue(List nullableRequiredArray, List re this.requiredArray = requiredArray; } - public ContainerDefaultValue nullableArray(List nullableArray) { + public ContainerDefaultValue nullableArray(JsonNullable> nullableArray) { this.nullableArray = JsonNullable.of(nullableArray); return this; } @@ -79,7 +79,7 @@ public void setNullableArray(JsonNullable> nullableArray) { this.nullableArray = nullableArray; } - public ContainerDefaultValue nullableRequiredArray(List nullableRequiredArray) { + public ContainerDefaultValue nullableRequiredArray(JsonNullable> nullableRequiredArray) { this.nullableRequiredArray = JsonNullable.of(nullableRequiredArray); return this; } @@ -137,7 +137,7 @@ public void setRequiredArray(List requiredArray) { this.requiredArray = requiredArray; } - public ContainerDefaultValue nullableArrayWithDefault(List nullableArrayWithDefault) { + public ContainerDefaultValue nullableArrayWithDefault(JsonNullable> nullableArrayWithDefault) { this.nullableArrayWithDefault = JsonNullable.of(nullableArrayWithDefault); return this; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NullableMapProperty.java index 85b9061b4838..f9956d4a5d52 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -30,7 +30,7 @@ public class NullableMapProperty { @Valid private JsonNullable> languageValues = JsonNullable.>undefined(); - public NullableMapProperty languageValues(Map languageValues) { + public NullableMapProperty languageValues(JsonNullable> languageValues) { this.languageValues = JsonNullable.of(languageValues); return this; } diff --git a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ParentWithNullable.java b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ParentWithNullable.java index 1d88649a8fca..652eef33f398 100644 --- a/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ParentWithNullable.java +++ b/samples/openapi3/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ParentWithNullable.java @@ -96,7 +96,7 @@ public void setType(@Nullable TypeEnum type) { this.type = type; } - public ParentWithNullable nullableProperty(String nullableProperty) { + public ParentWithNullable nullableProperty(JsonNullable nullableProperty) { this.nullableProperty = JsonNullable.of(nullableProperty); return this; } 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 cb8da56b1462..3ee3d2f2941d 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 @@ -1315,12 +1315,12 @@ components: schemas: Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1349,8 +1349,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1365,14 +1365,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1399,8 +1399,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1412,19 +1412,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1912,8 +1912,8 @@ components: type: string OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -1951,9 +1951,9 @@ components: type: string type: object example: - otherProperty: otherProperty - nullableProperty: nullableProperty type: ChildWithNullable + nullableProperty: nullableProperty + otherProperty: otherProperty StringBooleanMap: additionalProperties: type: boolean @@ -2264,10 +2264,10 @@ components: type: object ResponseObjectWithDifferentFieldNames: example: + normalPropertyName: normalPropertyName UPPER_CASE_PROPERTY_SNAKE: UPPER_CASE_PROPERTY_SNAKE lower-case-property-dashes: lower-case-property-dashes property name with spaces: property name with spaces - normalPropertyName: normalPropertyName properties: normalPropertyName: type: string diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/PetApi.java index f7b32f7edd1e..9f452be31515 100644 --- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/PetApi.java @@ -52,7 +52,7 @@ default ResponseEntity addPet( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + String exampleString = "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -110,7 +110,7 @@ default ResponseEntity> findPetsByStatus( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -148,7 +148,7 @@ default ResponseEntity> findPetsByTags( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -185,7 +185,7 @@ default ResponseEntity getPetById( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + String exampleString = "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -226,7 +226,7 @@ default ResponseEntity updatePet( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + String exampleString = "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/StoreApi.java index ff5a27fc8f59..41400da24f12 100644 --- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/StoreApi.java @@ -92,7 +92,7 @@ default ResponseEntity getOrderById( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -129,7 +129,7 @@ default ResponseEntity placeOrder( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/UserApi.java index ebc7d5ee5cac..e55bf51179b2 100644 --- a/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/server/petstore/springboot-source/src/main/java/org/openapitools/api/UserApi.java @@ -135,7 +135,7 @@ default ResponseEntity getUserByName( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"password\" : \"password\", \"userStatus\" : 6, \"phone\" : \"phone\", \"id\" : 0, \"email\" : \"email\", \"username\" : \"username\" }"; + String exampleString = "{ \"id\" : 0, \"username\" : \"username\", \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"email\" : \"email\", \"password\" : \"password\", \"phone\" : \"phone\", \"userStatus\" : 6 }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/openapi3/server/petstore/springboot-source/src/main/resources/openapi.yaml b/samples/openapi3/server/petstore/springboot-source/src/main/resources/openapi.yaml index 31074771d9fb..aa6fc7e42167 100644 --- a/samples/openapi3/server/petstore/springboot-source/src/main/resources/openapi.yaml +++ b/samples/openapi3/server/petstore/springboot-source/src/main/resources/openapi.yaml @@ -705,12 +705,12 @@ components: Order: description: An order for a pets from the pet store example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -741,8 +741,8 @@ components: Category: description: A category for a pet example: - name: name id: 6 + name: name properties: id: format: int64 @@ -757,14 +757,14 @@ components: User: description: A User who is purchasing from the pet store example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -792,8 +792,8 @@ components: Tag: description: A tag for a pet example: - name: name id: 1 + name: name properties: id: format: int64 @@ -807,19 +807,19 @@ components: Pet: description: A pet for sale in the pet store example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java index 233a722e0a4c..6c3e1dd2fa0e 100644 --- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java @@ -82,7 +82,7 @@ default ResponseEntity addPet( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + String exampleString = "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -168,7 +168,7 @@ default ResponseEntity> findPetsByStatus( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -223,7 +223,7 @@ default ResponseEntity> findPetsByTags( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -277,7 +277,7 @@ default ResponseEntity getPetById( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + String exampleString = "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -337,7 +337,7 @@ default ResponseEntity updatePet( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + String exampleString = "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java index c0e8b2301491..0b71ff90651f 100644 --- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java @@ -144,7 +144,7 @@ default ResponseEntity getOrderById( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -194,7 +194,7 @@ default ResponseEntity placeOrder( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java index 000c6dbad2ca..8dceb49a69c3 100644 --- a/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/openapi3/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java @@ -212,7 +212,7 @@ default ResponseEntity getUserByName( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"password\" : \"password\", \"userStatus\" : 6, \"phone\" : \"phone\", \"id\" : 0, \"email\" : \"email\", \"username\" : \"username\" }"; + String exampleString = "{ \"id\" : 0, \"username\" : \"username\", \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"email\" : \"email\", \"password\" : \"password\", \"phone\" : \"phone\", \"userStatus\" : 6 }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/openapi3/server/petstore/springboot/src/main/resources/openapi.yaml b/samples/openapi3/server/petstore/springboot/src/main/resources/openapi.yaml index 31074771d9fb..aa6fc7e42167 100644 --- a/samples/openapi3/server/petstore/springboot/src/main/resources/openapi.yaml +++ b/samples/openapi3/server/petstore/springboot/src/main/resources/openapi.yaml @@ -705,12 +705,12 @@ components: Order: description: An order for a pets from the pet store example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -741,8 +741,8 @@ components: Category: description: A category for a pet example: - name: name id: 6 + name: name properties: id: format: int64 @@ -757,14 +757,14 @@ components: User: description: A User who is purchasing from the pet store example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -792,8 +792,8 @@ components: Tag: description: A tag for a pet example: - name: name id: 1 + name: name properties: id: format: int64 @@ -807,19 +807,19 @@ components: Pet: description: A pet for sale in the pet store example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: diff --git a/samples/server/echo_api/erlang-server/priv/openapi.json b/samples/server/echo_api/erlang-server/priv/openapi.json index 1538e9de3520..e83b433bfd5e 100644 --- a/samples/server/echo_api/erlang-server/priv/openapi.json +++ b/samples/server/echo_api/erlang-server/priv/openapi.json @@ -974,8 +974,8 @@ "schemas" : { "Category" : { "example" : { - "name" : "Dogs", - "id" : 1 + "id" : 1, + "name" : "Dogs" }, "properties" : { "id" : { @@ -995,8 +995,8 @@ }, "Tag" : { "example" : { - "name" : "name", - "id" : 0 + "id" : 0, + "name" : "name" }, "properties" : { "id" : { @@ -1014,19 +1014,19 @@ }, "Pet" : { "example" : { - "photoUrls" : [ "photoUrls", "photoUrls" ], - "name" : "doggie", "id" : 10, + "name" : "doggie", "category" : { - "name" : "Dogs", - "id" : 1 + "id" : 1, + "name" : "Dogs" }, + "photoUrls" : [ "photoUrls", "photoUrls" ], "tags" : [ { - "name" : "name", - "id" : 0 + "id" : 0, + "name" : "name" }, { - "name" : "name", - "id" : 0 + "id" : 0, + "name" : "name" } ], "status" : "available" }, diff --git a/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Controllers/FakeApi.cs b/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Controllers/FakeApi.cs index 8f7bd3e85146..3145fcf11c83 100644 --- a/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Controllers/FakeApi.cs +++ b/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Controllers/FakeApi.cs @@ -43,7 +43,7 @@ public virtual IActionResult FakeNullableExampleTest() //TODO: Uncomment the next line to return response 200 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(200, default); string exampleJson = null; - exampleJson = "{\n \"nullableName\" : \"nullableName\",\n \"name\" : \"name\"\n}"; + exampleJson = "{\n \"name\" : \"name\",\n \"nullableName\" : \"nullableName\"\n}"; var example = exampleJson != null ? JsonConvert.DeserializeObject(exampleJson) diff --git a/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Controllers/PetApi.cs b/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Controllers/PetApi.cs index af251d3c8e95..7566272c848a 100644 --- a/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Controllers/PetApi.cs +++ b/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Controllers/PetApi.cs @@ -48,7 +48,7 @@ public virtual IActionResult AddPet([FromBody]Pet pet) //TODO: Uncomment the next line to return response 405 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(405); string exampleJson = null; - exampleJson = "{\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -97,7 +97,7 @@ public virtual IActionResult FindPetsByStatus([FromQuery (Name = "status")][Requ //TODO: Uncomment the next line to return response 400 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(400); string exampleJson = null; - exampleJson = "[ {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}, {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n} ]"; + exampleJson = "[ {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}, {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n} ]"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -128,7 +128,7 @@ public virtual IActionResult FindPetsByTags([FromQuery (Name = "tags")][Required //TODO: Uncomment the next line to return response 400 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(400); string exampleJson = null; - exampleJson = "[ {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}, {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n} ]"; + exampleJson = "[ {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}, {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n} ]"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -162,7 +162,7 @@ public virtual IActionResult GetPetById([FromRoute (Name = "petId")][Required]lo //TODO: Uncomment the next line to return response 404 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(404); string exampleJson = null; - exampleJson = "{\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -198,7 +198,7 @@ public virtual IActionResult UpdatePet([FromBody]Pet pet) //TODO: Uncomment the next line to return response 405 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(405); string exampleJson = null; - exampleJson = "{\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}"; exampleJson = "\n 123456789\n doggie\n \n aeiou\n \n \n \n aeiou\n"; var example = exampleJson != null diff --git a/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Controllers/StoreApi.cs b/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Controllers/StoreApi.cs index 506f6e905e04..4cd5906946e5 100644 --- a/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Controllers/StoreApi.cs +++ b/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Controllers/StoreApi.cs @@ -98,7 +98,7 @@ public virtual IActionResult GetOrderById([FromRoute (Name = "orderId")][Require //TODO: Uncomment the next line to return response 404 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(404); string exampleJson = null; - exampleJson = "{\n \"petId\" : 6,\n \"quantity\" : 1,\n \"id\" : 0,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"complete\" : false,\n \"status\" : \"placed\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"petId\" : 6,\n \"quantity\" : 1,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"status\" : \"placed\",\n \"complete\" : false\n}"; exampleJson = "\n 123456789\n 123456789\n 123\n 2000-01-23T04:56:07.000Z\n aeiou\n true\n"; var example = exampleJson != null @@ -128,7 +128,7 @@ public virtual IActionResult PlaceOrder([FromBody]Order order) //TODO: Uncomment the next line to return response 400 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(400); string exampleJson = null; - exampleJson = "{\n \"petId\" : 6,\n \"quantity\" : 1,\n \"id\" : 0,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"complete\" : false,\n \"status\" : \"placed\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"petId\" : 6,\n \"quantity\" : 1,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"status\" : \"placed\",\n \"complete\" : false\n}"; exampleJson = "\n 123456789\n 123456789\n 123\n 2000-01-23T04:56:07.000Z\n aeiou\n true\n"; var example = exampleJson != null diff --git a/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Controllers/UserApi.cs b/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Controllers/UserApi.cs index 26cf3e920d0b..a7fac11d8e88 100644 --- a/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Controllers/UserApi.cs +++ b/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Controllers/UserApi.cs @@ -134,7 +134,7 @@ public virtual IActionResult GetUserByName([FromRoute (Name = "username")][Requi //TODO: Uncomment the next line to return response 404 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(404); string exampleJson = null; - exampleJson = "{\n \"firstName\" : \"firstName\",\n \"lastName\" : \"lastName\",\n \"password\" : \"password\",\n \"userStatus\" : 6,\n \"phone\" : \"phone\",\n \"id\" : 0,\n \"email\" : \"email\",\n \"username\" : \"username\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"username\" : \"username\",\n \"firstName\" : \"firstName\",\n \"lastName\" : \"lastName\",\n \"email\" : \"email\",\n \"password\" : \"password\",\n \"phone\" : \"phone\",\n \"userStatus\" : 6\n}"; exampleJson = "\n 123456789\n aeiou\n aeiou\n aeiou\n aeiou\n aeiou\n aeiou\n 123\n"; var example = exampleJson != null diff --git a/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/wwwroot/openapi-original.json b/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/wwwroot/openapi-original.json index b47dce3d2c68..0bfba110c0eb 100644 --- a/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/wwwroot/openapi-original.json +++ b/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/wwwroot/openapi-original.json @@ -874,8 +874,8 @@ }, "TestNullable" : { "example" : { - "nullableName" : "nullableName", - "name" : "name" + "name" : "name", + "nullableName" : "nullableName" }, "properties" : { "name" : { @@ -891,12 +891,12 @@ "Order" : { "description" : "An order for a pets from the pet store", "example" : { + "id" : 0, "petId" : 6, "quantity" : 1, - "id" : 0, "shipDate" : "2000-01-23T04:56:07.000+00:00", - "complete" : false, - "status" : "placed" + "status" : "placed", + "complete" : false }, "properties" : { "id" : { @@ -934,8 +934,8 @@ "Category" : { "description" : "A category for a pet", "example" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, "properties" : { "id" : { @@ -956,14 +956,14 @@ "User" : { "description" : "A User who is purchasing from the pet store", "example" : { + "id" : 0, + "username" : "username", "firstName" : "firstName", "lastName" : "lastName", + "email" : "email", "password" : "password", - "userStatus" : 6, "phone" : "phone", - "id" : 0, - "email" : "email", - "username" : "username" + "userStatus" : 6 }, "properties" : { "id" : { @@ -1003,8 +1003,8 @@ "Tag" : { "description" : "A tag for a pet", "example" : { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, "properties" : { "id" : { @@ -1024,19 +1024,19 @@ "Pet" : { "description" : "A pet for sale in the pet store", "example" : { - "photoUrls" : [ "photoUrls", "photoUrls" ], - "name" : "doggie", "id" : 0, "category" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, + "name" : "doggie", + "photoUrls" : [ "photoUrls", "photoUrls" ], "tags" : [ { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" } ], "status" : "available" }, diff --git a/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Controllers/FakeApi.cs b/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Controllers/FakeApi.cs index 8f7bd3e85146..3145fcf11c83 100644 --- a/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Controllers/FakeApi.cs +++ b/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Controllers/FakeApi.cs @@ -43,7 +43,7 @@ public virtual IActionResult FakeNullableExampleTest() //TODO: Uncomment the next line to return response 200 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(200, default); string exampleJson = null; - exampleJson = "{\n \"nullableName\" : \"nullableName\",\n \"name\" : \"name\"\n}"; + exampleJson = "{\n \"name\" : \"name\",\n \"nullableName\" : \"nullableName\"\n}"; var example = exampleJson != null ? JsonConvert.DeserializeObject(exampleJson) diff --git a/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Controllers/PetApi.cs b/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Controllers/PetApi.cs index af251d3c8e95..7566272c848a 100644 --- a/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Controllers/PetApi.cs +++ b/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Controllers/PetApi.cs @@ -48,7 +48,7 @@ public virtual IActionResult AddPet([FromBody]Pet pet) //TODO: Uncomment the next line to return response 405 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(405); string exampleJson = null; - exampleJson = "{\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -97,7 +97,7 @@ public virtual IActionResult FindPetsByStatus([FromQuery (Name = "status")][Requ //TODO: Uncomment the next line to return response 400 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(400); string exampleJson = null; - exampleJson = "[ {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}, {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n} ]"; + exampleJson = "[ {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}, {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n} ]"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -128,7 +128,7 @@ public virtual IActionResult FindPetsByTags([FromQuery (Name = "tags")][Required //TODO: Uncomment the next line to return response 400 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(400); string exampleJson = null; - exampleJson = "[ {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}, {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n} ]"; + exampleJson = "[ {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}, {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n} ]"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -162,7 +162,7 @@ public virtual IActionResult GetPetById([FromRoute (Name = "petId")][Required]lo //TODO: Uncomment the next line to return response 404 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(404); string exampleJson = null; - exampleJson = "{\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -198,7 +198,7 @@ public virtual IActionResult UpdatePet([FromBody]Pet pet) //TODO: Uncomment the next line to return response 405 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(405); string exampleJson = null; - exampleJson = "{\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}"; exampleJson = "\n 123456789\n doggie\n \n aeiou\n \n \n \n aeiou\n"; var example = exampleJson != null diff --git a/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Controllers/StoreApi.cs b/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Controllers/StoreApi.cs index 506f6e905e04..4cd5906946e5 100644 --- a/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Controllers/StoreApi.cs +++ b/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Controllers/StoreApi.cs @@ -98,7 +98,7 @@ public virtual IActionResult GetOrderById([FromRoute (Name = "orderId")][Require //TODO: Uncomment the next line to return response 404 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(404); string exampleJson = null; - exampleJson = "{\n \"petId\" : 6,\n \"quantity\" : 1,\n \"id\" : 0,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"complete\" : false,\n \"status\" : \"placed\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"petId\" : 6,\n \"quantity\" : 1,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"status\" : \"placed\",\n \"complete\" : false\n}"; exampleJson = "\n 123456789\n 123456789\n 123\n 2000-01-23T04:56:07.000Z\n aeiou\n true\n"; var example = exampleJson != null @@ -128,7 +128,7 @@ public virtual IActionResult PlaceOrder([FromBody]Order order) //TODO: Uncomment the next line to return response 400 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(400); string exampleJson = null; - exampleJson = "{\n \"petId\" : 6,\n \"quantity\" : 1,\n \"id\" : 0,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"complete\" : false,\n \"status\" : \"placed\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"petId\" : 6,\n \"quantity\" : 1,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"status\" : \"placed\",\n \"complete\" : false\n}"; exampleJson = "\n 123456789\n 123456789\n 123\n 2000-01-23T04:56:07.000Z\n aeiou\n true\n"; var example = exampleJson != null diff --git a/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Controllers/UserApi.cs b/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Controllers/UserApi.cs index 26cf3e920d0b..a7fac11d8e88 100644 --- a/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Controllers/UserApi.cs +++ b/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Controllers/UserApi.cs @@ -134,7 +134,7 @@ public virtual IActionResult GetUserByName([FromRoute (Name = "username")][Requi //TODO: Uncomment the next line to return response 404 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(404); string exampleJson = null; - exampleJson = "{\n \"firstName\" : \"firstName\",\n \"lastName\" : \"lastName\",\n \"password\" : \"password\",\n \"userStatus\" : 6,\n \"phone\" : \"phone\",\n \"id\" : 0,\n \"email\" : \"email\",\n \"username\" : \"username\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"username\" : \"username\",\n \"firstName\" : \"firstName\",\n \"lastName\" : \"lastName\",\n \"email\" : \"email\",\n \"password\" : \"password\",\n \"phone\" : \"phone\",\n \"userStatus\" : 6\n}"; exampleJson = "\n 123456789\n aeiou\n aeiou\n aeiou\n aeiou\n aeiou\n aeiou\n 123\n"; var example = exampleJson != null diff --git a/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/wwwroot/openapi-original.json b/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/wwwroot/openapi-original.json index b47dce3d2c68..0bfba110c0eb 100644 --- a/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/wwwroot/openapi-original.json +++ b/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/wwwroot/openapi-original.json @@ -874,8 +874,8 @@ }, "TestNullable" : { "example" : { - "nullableName" : "nullableName", - "name" : "name" + "name" : "name", + "nullableName" : "nullableName" }, "properties" : { "name" : { @@ -891,12 +891,12 @@ "Order" : { "description" : "An order for a pets from the pet store", "example" : { + "id" : 0, "petId" : 6, "quantity" : 1, - "id" : 0, "shipDate" : "2000-01-23T04:56:07.000+00:00", - "complete" : false, - "status" : "placed" + "status" : "placed", + "complete" : false }, "properties" : { "id" : { @@ -934,8 +934,8 @@ "Category" : { "description" : "A category for a pet", "example" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, "properties" : { "id" : { @@ -956,14 +956,14 @@ "User" : { "description" : "A User who is purchasing from the pet store", "example" : { + "id" : 0, + "username" : "username", "firstName" : "firstName", "lastName" : "lastName", + "email" : "email", "password" : "password", - "userStatus" : 6, "phone" : "phone", - "id" : 0, - "email" : "email", - "username" : "username" + "userStatus" : 6 }, "properties" : { "id" : { @@ -1003,8 +1003,8 @@ "Tag" : { "description" : "A tag for a pet", "example" : { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, "properties" : { "id" : { @@ -1024,19 +1024,19 @@ "Pet" : { "description" : "A pet for sale in the pet store", "example" : { - "photoUrls" : [ "photoUrls", "photoUrls" ], - "name" : "doggie", "id" : 0, "category" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, + "name" : "doggie", + "photoUrls" : [ "photoUrls", "photoUrls" ], "tags" : [ { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" } ], "status" : "available" }, diff --git a/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Controllers/FakeApi.cs b/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Controllers/FakeApi.cs index 8f7bd3e85146..3145fcf11c83 100644 --- a/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Controllers/FakeApi.cs +++ b/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Controllers/FakeApi.cs @@ -43,7 +43,7 @@ public virtual IActionResult FakeNullableExampleTest() //TODO: Uncomment the next line to return response 200 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(200, default); string exampleJson = null; - exampleJson = "{\n \"nullableName\" : \"nullableName\",\n \"name\" : \"name\"\n}"; + exampleJson = "{\n \"name\" : \"name\",\n \"nullableName\" : \"nullableName\"\n}"; var example = exampleJson != null ? JsonConvert.DeserializeObject(exampleJson) diff --git a/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Controllers/PetApi.cs b/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Controllers/PetApi.cs index af251d3c8e95..7566272c848a 100644 --- a/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Controllers/PetApi.cs +++ b/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Controllers/PetApi.cs @@ -48,7 +48,7 @@ public virtual IActionResult AddPet([FromBody]Pet pet) //TODO: Uncomment the next line to return response 405 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(405); string exampleJson = null; - exampleJson = "{\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -97,7 +97,7 @@ public virtual IActionResult FindPetsByStatus([FromQuery (Name = "status")][Requ //TODO: Uncomment the next line to return response 400 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(400); string exampleJson = null; - exampleJson = "[ {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}, {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n} ]"; + exampleJson = "[ {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}, {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n} ]"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -128,7 +128,7 @@ public virtual IActionResult FindPetsByTags([FromQuery (Name = "tags")][Required //TODO: Uncomment the next line to return response 400 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(400); string exampleJson = null; - exampleJson = "[ {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}, {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n} ]"; + exampleJson = "[ {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}, {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n} ]"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -162,7 +162,7 @@ public virtual IActionResult GetPetById([FromRoute (Name = "petId")][Required]lo //TODO: Uncomment the next line to return response 404 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(404); string exampleJson = null; - exampleJson = "{\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -198,7 +198,7 @@ public virtual IActionResult UpdatePet([FromBody]Pet pet) //TODO: Uncomment the next line to return response 405 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(405); string exampleJson = null; - exampleJson = "{\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}"; exampleJson = "\n 123456789\n doggie\n \n aeiou\n \n \n \n aeiou\n"; var example = exampleJson != null diff --git a/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Controllers/StoreApi.cs b/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Controllers/StoreApi.cs index 506f6e905e04..4cd5906946e5 100644 --- a/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Controllers/StoreApi.cs +++ b/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Controllers/StoreApi.cs @@ -98,7 +98,7 @@ public virtual IActionResult GetOrderById([FromRoute (Name = "orderId")][Require //TODO: Uncomment the next line to return response 404 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(404); string exampleJson = null; - exampleJson = "{\n \"petId\" : 6,\n \"quantity\" : 1,\n \"id\" : 0,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"complete\" : false,\n \"status\" : \"placed\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"petId\" : 6,\n \"quantity\" : 1,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"status\" : \"placed\",\n \"complete\" : false\n}"; exampleJson = "\n 123456789\n 123456789\n 123\n 2000-01-23T04:56:07.000Z\n aeiou\n true\n"; var example = exampleJson != null @@ -128,7 +128,7 @@ public virtual IActionResult PlaceOrder([FromBody]Order order) //TODO: Uncomment the next line to return response 400 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(400); string exampleJson = null; - exampleJson = "{\n \"petId\" : 6,\n \"quantity\" : 1,\n \"id\" : 0,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"complete\" : false,\n \"status\" : \"placed\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"petId\" : 6,\n \"quantity\" : 1,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"status\" : \"placed\",\n \"complete\" : false\n}"; exampleJson = "\n 123456789\n 123456789\n 123\n 2000-01-23T04:56:07.000Z\n aeiou\n true\n"; var example = exampleJson != null diff --git a/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Controllers/UserApi.cs b/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Controllers/UserApi.cs index 26cf3e920d0b..a7fac11d8e88 100644 --- a/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Controllers/UserApi.cs +++ b/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Controllers/UserApi.cs @@ -134,7 +134,7 @@ public virtual IActionResult GetUserByName([FromRoute (Name = "username")][Requi //TODO: Uncomment the next line to return response 404 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(404); string exampleJson = null; - exampleJson = "{\n \"firstName\" : \"firstName\",\n \"lastName\" : \"lastName\",\n \"password\" : \"password\",\n \"userStatus\" : 6,\n \"phone\" : \"phone\",\n \"id\" : 0,\n \"email\" : \"email\",\n \"username\" : \"username\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"username\" : \"username\",\n \"firstName\" : \"firstName\",\n \"lastName\" : \"lastName\",\n \"email\" : \"email\",\n \"password\" : \"password\",\n \"phone\" : \"phone\",\n \"userStatus\" : 6\n}"; exampleJson = "\n 123456789\n aeiou\n aeiou\n aeiou\n aeiou\n aeiou\n aeiou\n 123\n"; var example = exampleJson != null diff --git a/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/wwwroot/openapi-original.json b/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/wwwroot/openapi-original.json index b47dce3d2c68..0bfba110c0eb 100644 --- a/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/wwwroot/openapi-original.json +++ b/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/wwwroot/openapi-original.json @@ -874,8 +874,8 @@ }, "TestNullable" : { "example" : { - "nullableName" : "nullableName", - "name" : "name" + "name" : "name", + "nullableName" : "nullableName" }, "properties" : { "name" : { @@ -891,12 +891,12 @@ "Order" : { "description" : "An order for a pets from the pet store", "example" : { + "id" : 0, "petId" : 6, "quantity" : 1, - "id" : 0, "shipDate" : "2000-01-23T04:56:07.000+00:00", - "complete" : false, - "status" : "placed" + "status" : "placed", + "complete" : false }, "properties" : { "id" : { @@ -934,8 +934,8 @@ "Category" : { "description" : "A category for a pet", "example" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, "properties" : { "id" : { @@ -956,14 +956,14 @@ "User" : { "description" : "A User who is purchasing from the pet store", "example" : { + "id" : 0, + "username" : "username", "firstName" : "firstName", "lastName" : "lastName", + "email" : "email", "password" : "password", - "userStatus" : 6, "phone" : "phone", - "id" : 0, - "email" : "email", - "username" : "username" + "userStatus" : 6 }, "properties" : { "id" : { @@ -1003,8 +1003,8 @@ "Tag" : { "description" : "A tag for a pet", "example" : { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, "properties" : { "id" : { @@ -1024,19 +1024,19 @@ "Pet" : { "description" : "A pet for sale in the pet store", "example" : { - "photoUrls" : [ "photoUrls", "photoUrls" ], - "name" : "doggie", "id" : 0, "category" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, + "name" : "doggie", + "photoUrls" : [ "photoUrls", "photoUrls" ], "tags" : [ { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" } ], "status" : "available" }, diff --git a/samples/server/petstore/aspnetcore-6.0-NewtonsoftFalse/src/Org.OpenAPITools/Controllers/FakeApi.cs b/samples/server/petstore/aspnetcore-6.0-NewtonsoftFalse/src/Org.OpenAPITools/Controllers/FakeApi.cs index 68cdf5001253..14209697cfcd 100644 --- a/samples/server/petstore/aspnetcore-6.0-NewtonsoftFalse/src/Org.OpenAPITools/Controllers/FakeApi.cs +++ b/samples/server/petstore/aspnetcore-6.0-NewtonsoftFalse/src/Org.OpenAPITools/Controllers/FakeApi.cs @@ -43,7 +43,7 @@ public virtual IActionResult FakeNullableExampleTest() //TODO: Uncomment the next line to return response 200 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(200, default); string exampleJson = null; - exampleJson = "{\n \"nullableName\" : \"nullableName\",\n \"name\" : \"name\"\n}"; + exampleJson = "{\n \"name\" : \"name\",\n \"nullableName\" : \"nullableName\"\n}"; var example = exampleJson != null ? JsonSerializer.Deserialize(exampleJson) diff --git a/samples/server/petstore/aspnetcore-6.0-NewtonsoftFalse/src/Org.OpenAPITools/Controllers/PetApi.cs b/samples/server/petstore/aspnetcore-6.0-NewtonsoftFalse/src/Org.OpenAPITools/Controllers/PetApi.cs index 6e04e2464a67..90375ff4ac5c 100644 --- a/samples/server/petstore/aspnetcore-6.0-NewtonsoftFalse/src/Org.OpenAPITools/Controllers/PetApi.cs +++ b/samples/server/petstore/aspnetcore-6.0-NewtonsoftFalse/src/Org.OpenAPITools/Controllers/PetApi.cs @@ -48,7 +48,7 @@ public virtual IActionResult AddPet([FromBody]Pet pet) //TODO: Uncomment the next line to return response 405 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(405); string exampleJson = null; - exampleJson = "{\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -97,7 +97,7 @@ public virtual IActionResult FindPetsByStatus([FromQuery (Name = "status")][Requ //TODO: Uncomment the next line to return response 400 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(400); string exampleJson = null; - exampleJson = "[ {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}, {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n} ]"; + exampleJson = "[ {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}, {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n} ]"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -128,7 +128,7 @@ public virtual IActionResult FindPetsByTags([FromQuery (Name = "tags")][Required //TODO: Uncomment the next line to return response 400 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(400); string exampleJson = null; - exampleJson = "[ {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}, {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n} ]"; + exampleJson = "[ {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}, {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n} ]"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -162,7 +162,7 @@ public virtual IActionResult GetPetById([FromRoute (Name = "petId")][Required]lo //TODO: Uncomment the next line to return response 404 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(404); string exampleJson = null; - exampleJson = "{\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -198,7 +198,7 @@ public virtual IActionResult UpdatePet([FromBody]Pet pet) //TODO: Uncomment the next line to return response 405 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(405); string exampleJson = null; - exampleJson = "{\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}"; exampleJson = "\n 123456789\n doggie\n \n aeiou\n \n \n \n aeiou\n"; var example = exampleJson != null diff --git a/samples/server/petstore/aspnetcore-6.0-NewtonsoftFalse/src/Org.OpenAPITools/Controllers/StoreApi.cs b/samples/server/petstore/aspnetcore-6.0-NewtonsoftFalse/src/Org.OpenAPITools/Controllers/StoreApi.cs index 3c27591fc730..98724c33c141 100644 --- a/samples/server/petstore/aspnetcore-6.0-NewtonsoftFalse/src/Org.OpenAPITools/Controllers/StoreApi.cs +++ b/samples/server/petstore/aspnetcore-6.0-NewtonsoftFalse/src/Org.OpenAPITools/Controllers/StoreApi.cs @@ -98,7 +98,7 @@ public virtual IActionResult GetOrderById([FromRoute (Name = "orderId")][Require //TODO: Uncomment the next line to return response 404 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(404); string exampleJson = null; - exampleJson = "{\n \"petId\" : 6,\n \"quantity\" : 1,\n \"id\" : 0,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"complete\" : false,\n \"status\" : \"placed\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"petId\" : 6,\n \"quantity\" : 1,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"status\" : \"placed\",\n \"complete\" : false\n}"; exampleJson = "\n 123456789\n 123456789\n 123\n 2000-01-23T04:56:07.000Z\n aeiou\n true\n"; var example = exampleJson != null @@ -128,7 +128,7 @@ public virtual IActionResult PlaceOrder([FromBody]Order order) //TODO: Uncomment the next line to return response 400 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(400); string exampleJson = null; - exampleJson = "{\n \"petId\" : 6,\n \"quantity\" : 1,\n \"id\" : 0,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"complete\" : false,\n \"status\" : \"placed\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"petId\" : 6,\n \"quantity\" : 1,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"status\" : \"placed\",\n \"complete\" : false\n}"; exampleJson = "\n 123456789\n 123456789\n 123\n 2000-01-23T04:56:07.000Z\n aeiou\n true\n"; var example = exampleJson != null diff --git a/samples/server/petstore/aspnetcore-6.0-NewtonsoftFalse/src/Org.OpenAPITools/Controllers/UserApi.cs b/samples/server/petstore/aspnetcore-6.0-NewtonsoftFalse/src/Org.OpenAPITools/Controllers/UserApi.cs index cc9e825aca15..ab7cc56a1b79 100644 --- a/samples/server/petstore/aspnetcore-6.0-NewtonsoftFalse/src/Org.OpenAPITools/Controllers/UserApi.cs +++ b/samples/server/petstore/aspnetcore-6.0-NewtonsoftFalse/src/Org.OpenAPITools/Controllers/UserApi.cs @@ -134,7 +134,7 @@ public virtual IActionResult GetUserByName([FromRoute (Name = "username")][Requi //TODO: Uncomment the next line to return response 404 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(404); string exampleJson = null; - exampleJson = "{\n \"firstName\" : \"firstName\",\n \"lastName\" : \"lastName\",\n \"password\" : \"password\",\n \"userStatus\" : 6,\n \"phone\" : \"phone\",\n \"id\" : 0,\n \"email\" : \"email\",\n \"username\" : \"username\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"username\" : \"username\",\n \"firstName\" : \"firstName\",\n \"lastName\" : \"lastName\",\n \"email\" : \"email\",\n \"password\" : \"password\",\n \"phone\" : \"phone\",\n \"userStatus\" : 6\n}"; exampleJson = "\n 123456789\n aeiou\n aeiou\n aeiou\n aeiou\n aeiou\n aeiou\n 123\n"; var example = exampleJson != null diff --git a/samples/server/petstore/aspnetcore-6.0-NewtonsoftFalse/src/Org.OpenAPITools/wwwroot/openapi-original.json b/samples/server/petstore/aspnetcore-6.0-NewtonsoftFalse/src/Org.OpenAPITools/wwwroot/openapi-original.json index b47dce3d2c68..0bfba110c0eb 100644 --- a/samples/server/petstore/aspnetcore-6.0-NewtonsoftFalse/src/Org.OpenAPITools/wwwroot/openapi-original.json +++ b/samples/server/petstore/aspnetcore-6.0-NewtonsoftFalse/src/Org.OpenAPITools/wwwroot/openapi-original.json @@ -874,8 +874,8 @@ }, "TestNullable" : { "example" : { - "nullableName" : "nullableName", - "name" : "name" + "name" : "name", + "nullableName" : "nullableName" }, "properties" : { "name" : { @@ -891,12 +891,12 @@ "Order" : { "description" : "An order for a pets from the pet store", "example" : { + "id" : 0, "petId" : 6, "quantity" : 1, - "id" : 0, "shipDate" : "2000-01-23T04:56:07.000+00:00", - "complete" : false, - "status" : "placed" + "status" : "placed", + "complete" : false }, "properties" : { "id" : { @@ -934,8 +934,8 @@ "Category" : { "description" : "A category for a pet", "example" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, "properties" : { "id" : { @@ -956,14 +956,14 @@ "User" : { "description" : "A User who is purchasing from the pet store", "example" : { + "id" : 0, + "username" : "username", "firstName" : "firstName", "lastName" : "lastName", + "email" : "email", "password" : "password", - "userStatus" : 6, "phone" : "phone", - "id" : 0, - "email" : "email", - "username" : "username" + "userStatus" : 6 }, "properties" : { "id" : { @@ -1003,8 +1003,8 @@ "Tag" : { "description" : "A tag for a pet", "example" : { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, "properties" : { "id" : { @@ -1024,19 +1024,19 @@ "Pet" : { "description" : "A pet for sale in the pet store", "example" : { - "photoUrls" : [ "photoUrls", "photoUrls" ], - "name" : "doggie", "id" : 0, "category" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, + "name" : "doggie", + "photoUrls" : [ "photoUrls", "photoUrls" ], "tags" : [ { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" } ], "status" : "available" }, diff --git a/samples/server/petstore/aspnetcore-6.0-nullableReferenceTypes/src/Org.OpenAPITools/Controllers/FakeApi.cs b/samples/server/petstore/aspnetcore-6.0-nullableReferenceTypes/src/Org.OpenAPITools/Controllers/FakeApi.cs index 8f7bd3e85146..3145fcf11c83 100644 --- a/samples/server/petstore/aspnetcore-6.0-nullableReferenceTypes/src/Org.OpenAPITools/Controllers/FakeApi.cs +++ b/samples/server/petstore/aspnetcore-6.0-nullableReferenceTypes/src/Org.OpenAPITools/Controllers/FakeApi.cs @@ -43,7 +43,7 @@ public virtual IActionResult FakeNullableExampleTest() //TODO: Uncomment the next line to return response 200 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(200, default); string exampleJson = null; - exampleJson = "{\n \"nullableName\" : \"nullableName\",\n \"name\" : \"name\"\n}"; + exampleJson = "{\n \"name\" : \"name\",\n \"nullableName\" : \"nullableName\"\n}"; var example = exampleJson != null ? JsonConvert.DeserializeObject(exampleJson) diff --git a/samples/server/petstore/aspnetcore-6.0-nullableReferenceTypes/src/Org.OpenAPITools/Controllers/PetApi.cs b/samples/server/petstore/aspnetcore-6.0-nullableReferenceTypes/src/Org.OpenAPITools/Controllers/PetApi.cs index d857227c4292..99a2defb5331 100644 --- a/samples/server/petstore/aspnetcore-6.0-nullableReferenceTypes/src/Org.OpenAPITools/Controllers/PetApi.cs +++ b/samples/server/petstore/aspnetcore-6.0-nullableReferenceTypes/src/Org.OpenAPITools/Controllers/PetApi.cs @@ -48,7 +48,7 @@ public virtual IActionResult AddPet([FromBody]Pet pet) //TODO: Uncomment the next line to return response 405 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(405); string exampleJson = null; - exampleJson = "{\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -97,7 +97,7 @@ public virtual IActionResult FindPetsByStatus([FromQuery (Name = "status")][Requ //TODO: Uncomment the next line to return response 400 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(400); string exampleJson = null; - exampleJson = "[ {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}, {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n} ]"; + exampleJson = "[ {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}, {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n} ]"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -128,7 +128,7 @@ public virtual IActionResult FindPetsByTags([FromQuery (Name = "tags")][Required //TODO: Uncomment the next line to return response 400 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(400); string exampleJson = null; - exampleJson = "[ {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}, {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n} ]"; + exampleJson = "[ {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}, {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n} ]"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -162,7 +162,7 @@ public virtual IActionResult GetPetById([FromRoute (Name = "petId")][Required]lo //TODO: Uncomment the next line to return response 404 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(404); string exampleJson = null; - exampleJson = "{\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -198,7 +198,7 @@ public virtual IActionResult UpdatePet([FromBody]Pet pet) //TODO: Uncomment the next line to return response 405 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(405); string exampleJson = null; - exampleJson = "{\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}"; exampleJson = "\n 123456789\n doggie\n \n aeiou\n \n \n \n aeiou\n"; var example = exampleJson != null diff --git a/samples/server/petstore/aspnetcore-6.0-nullableReferenceTypes/src/Org.OpenAPITools/Controllers/StoreApi.cs b/samples/server/petstore/aspnetcore-6.0-nullableReferenceTypes/src/Org.OpenAPITools/Controllers/StoreApi.cs index 506f6e905e04..4cd5906946e5 100644 --- a/samples/server/petstore/aspnetcore-6.0-nullableReferenceTypes/src/Org.OpenAPITools/Controllers/StoreApi.cs +++ b/samples/server/petstore/aspnetcore-6.0-nullableReferenceTypes/src/Org.OpenAPITools/Controllers/StoreApi.cs @@ -98,7 +98,7 @@ public virtual IActionResult GetOrderById([FromRoute (Name = "orderId")][Require //TODO: Uncomment the next line to return response 404 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(404); string exampleJson = null; - exampleJson = "{\n \"petId\" : 6,\n \"quantity\" : 1,\n \"id\" : 0,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"complete\" : false,\n \"status\" : \"placed\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"petId\" : 6,\n \"quantity\" : 1,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"status\" : \"placed\",\n \"complete\" : false\n}"; exampleJson = "\n 123456789\n 123456789\n 123\n 2000-01-23T04:56:07.000Z\n aeiou\n true\n"; var example = exampleJson != null @@ -128,7 +128,7 @@ public virtual IActionResult PlaceOrder([FromBody]Order order) //TODO: Uncomment the next line to return response 400 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(400); string exampleJson = null; - exampleJson = "{\n \"petId\" : 6,\n \"quantity\" : 1,\n \"id\" : 0,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"complete\" : false,\n \"status\" : \"placed\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"petId\" : 6,\n \"quantity\" : 1,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"status\" : \"placed\",\n \"complete\" : false\n}"; exampleJson = "\n 123456789\n 123456789\n 123\n 2000-01-23T04:56:07.000Z\n aeiou\n true\n"; var example = exampleJson != null diff --git a/samples/server/petstore/aspnetcore-6.0-nullableReferenceTypes/src/Org.OpenAPITools/Controllers/UserApi.cs b/samples/server/petstore/aspnetcore-6.0-nullableReferenceTypes/src/Org.OpenAPITools/Controllers/UserApi.cs index 26cf3e920d0b..a7fac11d8e88 100644 --- a/samples/server/petstore/aspnetcore-6.0-nullableReferenceTypes/src/Org.OpenAPITools/Controllers/UserApi.cs +++ b/samples/server/petstore/aspnetcore-6.0-nullableReferenceTypes/src/Org.OpenAPITools/Controllers/UserApi.cs @@ -134,7 +134,7 @@ public virtual IActionResult GetUserByName([FromRoute (Name = "username")][Requi //TODO: Uncomment the next line to return response 404 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(404); string exampleJson = null; - exampleJson = "{\n \"firstName\" : \"firstName\",\n \"lastName\" : \"lastName\",\n \"password\" : \"password\",\n \"userStatus\" : 6,\n \"phone\" : \"phone\",\n \"id\" : 0,\n \"email\" : \"email\",\n \"username\" : \"username\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"username\" : \"username\",\n \"firstName\" : \"firstName\",\n \"lastName\" : \"lastName\",\n \"email\" : \"email\",\n \"password\" : \"password\",\n \"phone\" : \"phone\",\n \"userStatus\" : 6\n}"; exampleJson = "\n 123456789\n aeiou\n aeiou\n aeiou\n aeiou\n aeiou\n aeiou\n 123\n"; var example = exampleJson != null diff --git a/samples/server/petstore/aspnetcore-6.0-nullableReferenceTypes/src/Org.OpenAPITools/wwwroot/openapi-original.json b/samples/server/petstore/aspnetcore-6.0-nullableReferenceTypes/src/Org.OpenAPITools/wwwroot/openapi-original.json index b47dce3d2c68..0bfba110c0eb 100644 --- a/samples/server/petstore/aspnetcore-6.0-nullableReferenceTypes/src/Org.OpenAPITools/wwwroot/openapi-original.json +++ b/samples/server/petstore/aspnetcore-6.0-nullableReferenceTypes/src/Org.OpenAPITools/wwwroot/openapi-original.json @@ -874,8 +874,8 @@ }, "TestNullable" : { "example" : { - "nullableName" : "nullableName", - "name" : "name" + "name" : "name", + "nullableName" : "nullableName" }, "properties" : { "name" : { @@ -891,12 +891,12 @@ "Order" : { "description" : "An order for a pets from the pet store", "example" : { + "id" : 0, "petId" : 6, "quantity" : 1, - "id" : 0, "shipDate" : "2000-01-23T04:56:07.000+00:00", - "complete" : false, - "status" : "placed" + "status" : "placed", + "complete" : false }, "properties" : { "id" : { @@ -934,8 +934,8 @@ "Category" : { "description" : "A category for a pet", "example" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, "properties" : { "id" : { @@ -956,14 +956,14 @@ "User" : { "description" : "A User who is purchasing from the pet store", "example" : { + "id" : 0, + "username" : "username", "firstName" : "firstName", "lastName" : "lastName", + "email" : "email", "password" : "password", - "userStatus" : 6, "phone" : "phone", - "id" : 0, - "email" : "email", - "username" : "username" + "userStatus" : 6 }, "properties" : { "id" : { @@ -1003,8 +1003,8 @@ "Tag" : { "description" : "A tag for a pet", "example" : { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, "properties" : { "id" : { @@ -1024,19 +1024,19 @@ "Pet" : { "description" : "A pet for sale in the pet store", "example" : { - "photoUrls" : [ "photoUrls", "photoUrls" ], - "name" : "doggie", "id" : 0, "category" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, + "name" : "doggie", + "photoUrls" : [ "photoUrls", "photoUrls" ], "tags" : [ { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" } ], "status" : "available" }, diff --git a/samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/Controllers/FakeApi.cs b/samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/Controllers/FakeApi.cs index 8f7bd3e85146..3145fcf11c83 100644 --- a/samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/Controllers/FakeApi.cs +++ b/samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/Controllers/FakeApi.cs @@ -43,7 +43,7 @@ public virtual IActionResult FakeNullableExampleTest() //TODO: Uncomment the next line to return response 200 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(200, default); string exampleJson = null; - exampleJson = "{\n \"nullableName\" : \"nullableName\",\n \"name\" : \"name\"\n}"; + exampleJson = "{\n \"name\" : \"name\",\n \"nullableName\" : \"nullableName\"\n}"; var example = exampleJson != null ? JsonConvert.DeserializeObject(exampleJson) diff --git a/samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/Controllers/PetApi.cs b/samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/Controllers/PetApi.cs index af251d3c8e95..7566272c848a 100644 --- a/samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/Controllers/PetApi.cs +++ b/samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/Controllers/PetApi.cs @@ -48,7 +48,7 @@ public virtual IActionResult AddPet([FromBody]Pet pet) //TODO: Uncomment the next line to return response 405 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(405); string exampleJson = null; - exampleJson = "{\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -97,7 +97,7 @@ public virtual IActionResult FindPetsByStatus([FromQuery (Name = "status")][Requ //TODO: Uncomment the next line to return response 400 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(400); string exampleJson = null; - exampleJson = "[ {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}, {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n} ]"; + exampleJson = "[ {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}, {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n} ]"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -128,7 +128,7 @@ public virtual IActionResult FindPetsByTags([FromQuery (Name = "tags")][Required //TODO: Uncomment the next line to return response 400 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(400); string exampleJson = null; - exampleJson = "[ {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}, {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n} ]"; + exampleJson = "[ {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}, {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n} ]"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -162,7 +162,7 @@ public virtual IActionResult GetPetById([FromRoute (Name = "petId")][Required]lo //TODO: Uncomment the next line to return response 404 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(404); string exampleJson = null; - exampleJson = "{\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -198,7 +198,7 @@ public virtual IActionResult UpdatePet([FromBody]Pet pet) //TODO: Uncomment the next line to return response 405 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(405); string exampleJson = null; - exampleJson = "{\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}"; exampleJson = "\n 123456789\n doggie\n \n aeiou\n \n \n \n aeiou\n"; var example = exampleJson != null diff --git a/samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/Controllers/StoreApi.cs b/samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/Controllers/StoreApi.cs index 506f6e905e04..4cd5906946e5 100644 --- a/samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/Controllers/StoreApi.cs +++ b/samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/Controllers/StoreApi.cs @@ -98,7 +98,7 @@ public virtual IActionResult GetOrderById([FromRoute (Name = "orderId")][Require //TODO: Uncomment the next line to return response 404 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(404); string exampleJson = null; - exampleJson = "{\n \"petId\" : 6,\n \"quantity\" : 1,\n \"id\" : 0,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"complete\" : false,\n \"status\" : \"placed\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"petId\" : 6,\n \"quantity\" : 1,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"status\" : \"placed\",\n \"complete\" : false\n}"; exampleJson = "\n 123456789\n 123456789\n 123\n 2000-01-23T04:56:07.000Z\n aeiou\n true\n"; var example = exampleJson != null @@ -128,7 +128,7 @@ public virtual IActionResult PlaceOrder([FromBody]Order order) //TODO: Uncomment the next line to return response 400 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(400); string exampleJson = null; - exampleJson = "{\n \"petId\" : 6,\n \"quantity\" : 1,\n \"id\" : 0,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"complete\" : false,\n \"status\" : \"placed\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"petId\" : 6,\n \"quantity\" : 1,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"status\" : \"placed\",\n \"complete\" : false\n}"; exampleJson = "\n 123456789\n 123456789\n 123\n 2000-01-23T04:56:07.000Z\n aeiou\n true\n"; var example = exampleJson != null diff --git a/samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/Controllers/UserApi.cs b/samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/Controllers/UserApi.cs index 26cf3e920d0b..a7fac11d8e88 100644 --- a/samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/Controllers/UserApi.cs +++ b/samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/Controllers/UserApi.cs @@ -134,7 +134,7 @@ public virtual IActionResult GetUserByName([FromRoute (Name = "username")][Requi //TODO: Uncomment the next line to return response 404 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(404); string exampleJson = null; - exampleJson = "{\n \"firstName\" : \"firstName\",\n \"lastName\" : \"lastName\",\n \"password\" : \"password\",\n \"userStatus\" : 6,\n \"phone\" : \"phone\",\n \"id\" : 0,\n \"email\" : \"email\",\n \"username\" : \"username\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"username\" : \"username\",\n \"firstName\" : \"firstName\",\n \"lastName\" : \"lastName\",\n \"email\" : \"email\",\n \"password\" : \"password\",\n \"phone\" : \"phone\",\n \"userStatus\" : 6\n}"; exampleJson = "\n 123456789\n aeiou\n aeiou\n aeiou\n aeiou\n aeiou\n aeiou\n 123\n"; var example = exampleJson != null diff --git a/samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/wwwroot/openapi-original.json b/samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/wwwroot/openapi-original.json index b47dce3d2c68..0bfba110c0eb 100644 --- a/samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/wwwroot/openapi-original.json +++ b/samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/wwwroot/openapi-original.json @@ -874,8 +874,8 @@ }, "TestNullable" : { "example" : { - "nullableName" : "nullableName", - "name" : "name" + "name" : "name", + "nullableName" : "nullableName" }, "properties" : { "name" : { @@ -891,12 +891,12 @@ "Order" : { "description" : "An order for a pets from the pet store", "example" : { + "id" : 0, "petId" : 6, "quantity" : 1, - "id" : 0, "shipDate" : "2000-01-23T04:56:07.000+00:00", - "complete" : false, - "status" : "placed" + "status" : "placed", + "complete" : false }, "properties" : { "id" : { @@ -934,8 +934,8 @@ "Category" : { "description" : "A category for a pet", "example" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, "properties" : { "id" : { @@ -956,14 +956,14 @@ "User" : { "description" : "A User who is purchasing from the pet store", "example" : { + "id" : 0, + "username" : "username", "firstName" : "firstName", "lastName" : "lastName", + "email" : "email", "password" : "password", - "userStatus" : 6, "phone" : "phone", - "id" : 0, - "email" : "email", - "username" : "username" + "userStatus" : 6 }, "properties" : { "id" : { @@ -1003,8 +1003,8 @@ "Tag" : { "description" : "A tag for a pet", "example" : { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, "properties" : { "id" : { @@ -1024,19 +1024,19 @@ "Pet" : { "description" : "A pet for sale in the pet store", "example" : { - "photoUrls" : [ "photoUrls", "photoUrls" ], - "name" : "doggie", "id" : 0, "category" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, + "name" : "doggie", + "photoUrls" : [ "photoUrls", "photoUrls" ], "tags" : [ { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" } ], "status" : "available" }, diff --git a/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/Controllers/FakeApi.cs b/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/Controllers/FakeApi.cs index 8f7bd3e85146..3145fcf11c83 100644 --- a/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/Controllers/FakeApi.cs +++ b/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/Controllers/FakeApi.cs @@ -43,7 +43,7 @@ public virtual IActionResult FakeNullableExampleTest() //TODO: Uncomment the next line to return response 200 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(200, default); string exampleJson = null; - exampleJson = "{\n \"nullableName\" : \"nullableName\",\n \"name\" : \"name\"\n}"; + exampleJson = "{\n \"name\" : \"name\",\n \"nullableName\" : \"nullableName\"\n}"; var example = exampleJson != null ? JsonConvert.DeserializeObject(exampleJson) diff --git a/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/Controllers/PetApi.cs b/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/Controllers/PetApi.cs index af251d3c8e95..7566272c848a 100644 --- a/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/Controllers/PetApi.cs +++ b/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/Controllers/PetApi.cs @@ -48,7 +48,7 @@ public virtual IActionResult AddPet([FromBody]Pet pet) //TODO: Uncomment the next line to return response 405 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(405); string exampleJson = null; - exampleJson = "{\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -97,7 +97,7 @@ public virtual IActionResult FindPetsByStatus([FromQuery (Name = "status")][Requ //TODO: Uncomment the next line to return response 400 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(400); string exampleJson = null; - exampleJson = "[ {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}, {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n} ]"; + exampleJson = "[ {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}, {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n} ]"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -128,7 +128,7 @@ public virtual IActionResult FindPetsByTags([FromQuery (Name = "tags")][Required //TODO: Uncomment the next line to return response 400 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(400); string exampleJson = null; - exampleJson = "[ {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}, {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n} ]"; + exampleJson = "[ {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}, {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n} ]"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -162,7 +162,7 @@ public virtual IActionResult GetPetById([FromRoute (Name = "petId")][Required]lo //TODO: Uncomment the next line to return response 404 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(404); string exampleJson = null; - exampleJson = "{\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -198,7 +198,7 @@ public virtual IActionResult UpdatePet([FromBody]Pet pet) //TODO: Uncomment the next line to return response 405 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(405); string exampleJson = null; - exampleJson = "{\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}"; exampleJson = "\n 123456789\n doggie\n \n aeiou\n \n \n \n aeiou\n"; var example = exampleJson != null diff --git a/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/Controllers/StoreApi.cs b/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/Controllers/StoreApi.cs index 506f6e905e04..4cd5906946e5 100644 --- a/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/Controllers/StoreApi.cs +++ b/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/Controllers/StoreApi.cs @@ -98,7 +98,7 @@ public virtual IActionResult GetOrderById([FromRoute (Name = "orderId")][Require //TODO: Uncomment the next line to return response 404 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(404); string exampleJson = null; - exampleJson = "{\n \"petId\" : 6,\n \"quantity\" : 1,\n \"id\" : 0,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"complete\" : false,\n \"status\" : \"placed\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"petId\" : 6,\n \"quantity\" : 1,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"status\" : \"placed\",\n \"complete\" : false\n}"; exampleJson = "\n 123456789\n 123456789\n 123\n 2000-01-23T04:56:07.000Z\n aeiou\n true\n"; var example = exampleJson != null @@ -128,7 +128,7 @@ public virtual IActionResult PlaceOrder([FromBody]Order order) //TODO: Uncomment the next line to return response 400 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(400); string exampleJson = null; - exampleJson = "{\n \"petId\" : 6,\n \"quantity\" : 1,\n \"id\" : 0,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"complete\" : false,\n \"status\" : \"placed\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"petId\" : 6,\n \"quantity\" : 1,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"status\" : \"placed\",\n \"complete\" : false\n}"; exampleJson = "\n 123456789\n 123456789\n 123\n 2000-01-23T04:56:07.000Z\n aeiou\n true\n"; var example = exampleJson != null diff --git a/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/Controllers/UserApi.cs b/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/Controllers/UserApi.cs index 26cf3e920d0b..a7fac11d8e88 100644 --- a/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/Controllers/UserApi.cs +++ b/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/Controllers/UserApi.cs @@ -134,7 +134,7 @@ public virtual IActionResult GetUserByName([FromRoute (Name = "username")][Requi //TODO: Uncomment the next line to return response 404 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(404); string exampleJson = null; - exampleJson = "{\n \"firstName\" : \"firstName\",\n \"lastName\" : \"lastName\",\n \"password\" : \"password\",\n \"userStatus\" : 6,\n \"phone\" : \"phone\",\n \"id\" : 0,\n \"email\" : \"email\",\n \"username\" : \"username\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"username\" : \"username\",\n \"firstName\" : \"firstName\",\n \"lastName\" : \"lastName\",\n \"email\" : \"email\",\n \"password\" : \"password\",\n \"phone\" : \"phone\",\n \"userStatus\" : 6\n}"; exampleJson = "\n 123456789\n aeiou\n aeiou\n aeiou\n aeiou\n aeiou\n aeiou\n 123\n"; var example = exampleJson != null diff --git a/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/wwwroot/openapi-original.json b/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/wwwroot/openapi-original.json index b47dce3d2c68..0bfba110c0eb 100644 --- a/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/wwwroot/openapi-original.json +++ b/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/wwwroot/openapi-original.json @@ -874,8 +874,8 @@ }, "TestNullable" : { "example" : { - "nullableName" : "nullableName", - "name" : "name" + "name" : "name", + "nullableName" : "nullableName" }, "properties" : { "name" : { @@ -891,12 +891,12 @@ "Order" : { "description" : "An order for a pets from the pet store", "example" : { + "id" : 0, "petId" : 6, "quantity" : 1, - "id" : 0, "shipDate" : "2000-01-23T04:56:07.000+00:00", - "complete" : false, - "status" : "placed" + "status" : "placed", + "complete" : false }, "properties" : { "id" : { @@ -934,8 +934,8 @@ "Category" : { "description" : "A category for a pet", "example" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, "properties" : { "id" : { @@ -956,14 +956,14 @@ "User" : { "description" : "A User who is purchasing from the pet store", "example" : { + "id" : 0, + "username" : "username", "firstName" : "firstName", "lastName" : "lastName", + "email" : "email", "password" : "password", - "userStatus" : 6, "phone" : "phone", - "id" : 0, - "email" : "email", - "username" : "username" + "userStatus" : 6 }, "properties" : { "id" : { @@ -1003,8 +1003,8 @@ "Tag" : { "description" : "A tag for a pet", "example" : { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, "properties" : { "id" : { @@ -1024,19 +1024,19 @@ "Pet" : { "description" : "A pet for sale in the pet store", "example" : { - "photoUrls" : [ "photoUrls", "photoUrls" ], - "name" : "doggie", "id" : 0, "category" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, + "name" : "doggie", + "photoUrls" : [ "photoUrls", "photoUrls" ], "tags" : [ { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" } ], "status" : "available" }, diff --git a/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Controllers/FakeApi.cs b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Controllers/FakeApi.cs index 8753be7eca89..66cb2f1966e7 100644 --- a/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Controllers/FakeApi.cs +++ b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Controllers/FakeApi.cs @@ -40,7 +40,7 @@ public virtual IActionResult FakeNullableExampleTest() //TODO: Uncomment the next line to return response 200 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(200, default); string exampleJson = null; - exampleJson = "{\n \"nullableName\" : \"nullableName\",\n \"name\" : \"name\"\n}"; + exampleJson = "{\n \"name\" : \"name\",\n \"nullableName\" : \"nullableName\"\n}"; var example = exampleJson != null ? JsonConvert.DeserializeObject(exampleJson) diff --git a/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Controllers/PetApi.cs b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Controllers/PetApi.cs index 8c8bee627e4a..a4bc3e9aad30 100644 --- a/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Controllers/PetApi.cs +++ b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Controllers/PetApi.cs @@ -45,7 +45,7 @@ public virtual IActionResult AddPet([FromBody]Pet pet) //TODO: Uncomment the next line to return response 405 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(405); string exampleJson = null; - exampleJson = "{\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -92,7 +92,7 @@ public virtual IActionResult FindPetsByStatus([FromQuery (Name = "status")][Requ //TODO: Uncomment the next line to return response 400 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(400); string exampleJson = null; - exampleJson = "[ {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}, {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n} ]"; + exampleJson = "[ {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}, {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n} ]"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -122,7 +122,7 @@ public virtual IActionResult FindPetsByTags([FromQuery (Name = "tags")][Required //TODO: Uncomment the next line to return response 400 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(400); string exampleJson = null; - exampleJson = "[ {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}, {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n} ]"; + exampleJson = "[ {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}, {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n} ]"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -155,7 +155,7 @@ public virtual IActionResult GetPetById([FromRoute (Name = "petId")][Required]lo //TODO: Uncomment the next line to return response 404 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(404); string exampleJson = null; - exampleJson = "{\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -190,7 +190,7 @@ public virtual IActionResult UpdatePet([FromBody]Pet pet) //TODO: Uncomment the next line to return response 405 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(405); string exampleJson = null; - exampleJson = "{\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}"; exampleJson = "\n 123456789\n doggie\n \n aeiou\n \n \n \n aeiou\n"; var example = exampleJson != null diff --git a/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Controllers/StoreApi.cs b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Controllers/StoreApi.cs index 79ae539f33b0..865fc442acf3 100644 --- a/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Controllers/StoreApi.cs +++ b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Controllers/StoreApi.cs @@ -93,7 +93,7 @@ public virtual IActionResult GetOrderById([FromRoute (Name = "orderId")][Require //TODO: Uncomment the next line to return response 404 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(404); string exampleJson = null; - exampleJson = "{\n \"petId\" : 6,\n \"quantity\" : 1,\n \"id\" : 0,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"complete\" : false,\n \"status\" : \"placed\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"petId\" : 6,\n \"quantity\" : 1,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"status\" : \"placed\",\n \"complete\" : false\n}"; exampleJson = "\n 123456789\n 123456789\n 123\n 2000-01-23T04:56:07.000Z\n aeiou\n true\n"; var example = exampleJson != null @@ -122,7 +122,7 @@ public virtual IActionResult PlaceOrder([FromBody]Order order) //TODO: Uncomment the next line to return response 400 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(400); string exampleJson = null; - exampleJson = "{\n \"petId\" : 6,\n \"quantity\" : 1,\n \"id\" : 0,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"complete\" : false,\n \"status\" : \"placed\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"petId\" : 6,\n \"quantity\" : 1,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"status\" : \"placed\",\n \"complete\" : false\n}"; exampleJson = "\n 123456789\n 123456789\n 123\n 2000-01-23T04:56:07.000Z\n aeiou\n true\n"; var example = exampleJson != null diff --git a/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Controllers/UserApi.cs b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Controllers/UserApi.cs index 209fe56035cd..457b3b32426b 100644 --- a/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Controllers/UserApi.cs +++ b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Controllers/UserApi.cs @@ -127,7 +127,7 @@ public virtual IActionResult GetUserByName([FromRoute (Name = "username")][Requi //TODO: Uncomment the next line to return response 404 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(404); string exampleJson = null; - exampleJson = "{\n \"firstName\" : \"firstName\",\n \"lastName\" : \"lastName\",\n \"password\" : \"password\",\n \"userStatus\" : 6,\n \"phone\" : \"phone\",\n \"id\" : 0,\n \"email\" : \"email\",\n \"username\" : \"username\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"username\" : \"username\",\n \"firstName\" : \"firstName\",\n \"lastName\" : \"lastName\",\n \"email\" : \"email\",\n \"password\" : \"password\",\n \"phone\" : \"phone\",\n \"userStatus\" : 6\n}"; exampleJson = "\n 123456789\n aeiou\n aeiou\n aeiou\n aeiou\n aeiou\n aeiou\n 123\n"; var example = exampleJson != null diff --git a/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/Controllers/FakeApi.cs b/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/Controllers/FakeApi.cs index 8f7bd3e85146..3145fcf11c83 100644 --- a/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/Controllers/FakeApi.cs +++ b/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/Controllers/FakeApi.cs @@ -43,7 +43,7 @@ public virtual IActionResult FakeNullableExampleTest() //TODO: Uncomment the next line to return response 200 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(200, default); string exampleJson = null; - exampleJson = "{\n \"nullableName\" : \"nullableName\",\n \"name\" : \"name\"\n}"; + exampleJson = "{\n \"name\" : \"name\",\n \"nullableName\" : \"nullableName\"\n}"; var example = exampleJson != null ? JsonConvert.DeserializeObject(exampleJson) diff --git a/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/Controllers/PetApi.cs b/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/Controllers/PetApi.cs index af251d3c8e95..7566272c848a 100644 --- a/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/Controllers/PetApi.cs +++ b/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/Controllers/PetApi.cs @@ -48,7 +48,7 @@ public virtual IActionResult AddPet([FromBody]Pet pet) //TODO: Uncomment the next line to return response 405 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(405); string exampleJson = null; - exampleJson = "{\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -97,7 +97,7 @@ public virtual IActionResult FindPetsByStatus([FromQuery (Name = "status")][Requ //TODO: Uncomment the next line to return response 400 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(400); string exampleJson = null; - exampleJson = "[ {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}, {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n} ]"; + exampleJson = "[ {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}, {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n} ]"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -128,7 +128,7 @@ public virtual IActionResult FindPetsByTags([FromQuery (Name = "tags")][Required //TODO: Uncomment the next line to return response 400 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(400); string exampleJson = null; - exampleJson = "[ {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}, {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n} ]"; + exampleJson = "[ {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}, {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n} ]"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -162,7 +162,7 @@ public virtual IActionResult GetPetById([FromRoute (Name = "petId")][Required]lo //TODO: Uncomment the next line to return response 404 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(404); string exampleJson = null; - exampleJson = "{\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -198,7 +198,7 @@ public virtual IActionResult UpdatePet([FromBody]Pet pet) //TODO: Uncomment the next line to return response 405 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(405); string exampleJson = null; - exampleJson = "{\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}"; exampleJson = "\n 123456789\n doggie\n \n aeiou\n \n \n \n aeiou\n"; var example = exampleJson != null diff --git a/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/Controllers/StoreApi.cs b/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/Controllers/StoreApi.cs index 506f6e905e04..4cd5906946e5 100644 --- a/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/Controllers/StoreApi.cs +++ b/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/Controllers/StoreApi.cs @@ -98,7 +98,7 @@ public virtual IActionResult GetOrderById([FromRoute (Name = "orderId")][Require //TODO: Uncomment the next line to return response 404 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(404); string exampleJson = null; - exampleJson = "{\n \"petId\" : 6,\n \"quantity\" : 1,\n \"id\" : 0,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"complete\" : false,\n \"status\" : \"placed\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"petId\" : 6,\n \"quantity\" : 1,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"status\" : \"placed\",\n \"complete\" : false\n}"; exampleJson = "\n 123456789\n 123456789\n 123\n 2000-01-23T04:56:07.000Z\n aeiou\n true\n"; var example = exampleJson != null @@ -128,7 +128,7 @@ public virtual IActionResult PlaceOrder([FromBody]Order order) //TODO: Uncomment the next line to return response 400 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(400); string exampleJson = null; - exampleJson = "{\n \"petId\" : 6,\n \"quantity\" : 1,\n \"id\" : 0,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"complete\" : false,\n \"status\" : \"placed\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"petId\" : 6,\n \"quantity\" : 1,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"status\" : \"placed\",\n \"complete\" : false\n}"; exampleJson = "\n 123456789\n 123456789\n 123\n 2000-01-23T04:56:07.000Z\n aeiou\n true\n"; var example = exampleJson != null diff --git a/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/Controllers/UserApi.cs b/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/Controllers/UserApi.cs index 26cf3e920d0b..a7fac11d8e88 100644 --- a/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/Controllers/UserApi.cs +++ b/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/Controllers/UserApi.cs @@ -134,7 +134,7 @@ public virtual IActionResult GetUserByName([FromRoute (Name = "username")][Requi //TODO: Uncomment the next line to return response 404 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(404); string exampleJson = null; - exampleJson = "{\n \"firstName\" : \"firstName\",\n \"lastName\" : \"lastName\",\n \"password\" : \"password\",\n \"userStatus\" : 6,\n \"phone\" : \"phone\",\n \"id\" : 0,\n \"email\" : \"email\",\n \"username\" : \"username\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"username\" : \"username\",\n \"firstName\" : \"firstName\",\n \"lastName\" : \"lastName\",\n \"email\" : \"email\",\n \"password\" : \"password\",\n \"phone\" : \"phone\",\n \"userStatus\" : 6\n}"; exampleJson = "\n 123456789\n aeiou\n aeiou\n aeiou\n aeiou\n aeiou\n aeiou\n 123\n"; var example = exampleJson != null diff --git a/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/wwwroot/openapi-original.json b/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/wwwroot/openapi-original.json index b47dce3d2c68..0bfba110c0eb 100644 --- a/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/wwwroot/openapi-original.json +++ b/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/wwwroot/openapi-original.json @@ -874,8 +874,8 @@ }, "TestNullable" : { "example" : { - "nullableName" : "nullableName", - "name" : "name" + "name" : "name", + "nullableName" : "nullableName" }, "properties" : { "name" : { @@ -891,12 +891,12 @@ "Order" : { "description" : "An order for a pets from the pet store", "example" : { + "id" : 0, "petId" : 6, "quantity" : 1, - "id" : 0, "shipDate" : "2000-01-23T04:56:07.000+00:00", - "complete" : false, - "status" : "placed" + "status" : "placed", + "complete" : false }, "properties" : { "id" : { @@ -934,8 +934,8 @@ "Category" : { "description" : "A category for a pet", "example" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, "properties" : { "id" : { @@ -956,14 +956,14 @@ "User" : { "description" : "A User who is purchasing from the pet store", "example" : { + "id" : 0, + "username" : "username", "firstName" : "firstName", "lastName" : "lastName", + "email" : "email", "password" : "password", - "userStatus" : 6, "phone" : "phone", - "id" : 0, - "email" : "email", - "username" : "username" + "userStatus" : 6 }, "properties" : { "id" : { @@ -1003,8 +1003,8 @@ "Tag" : { "description" : "A tag for a pet", "example" : { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, "properties" : { "id" : { @@ -1024,19 +1024,19 @@ "Pet" : { "description" : "A pet for sale in the pet store", "example" : { - "photoUrls" : [ "photoUrls", "photoUrls" ], - "name" : "doggie", "id" : 0, "category" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, + "name" : "doggie", + "photoUrls" : [ "photoUrls", "photoUrls" ], "tags" : [ { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" } ], "status" : "available" }, diff --git a/samples/server/petstore/aspnetcore-8.0-NewtonsoftFalse/src/Org.OpenAPITools/Controllers/FakeApi.cs b/samples/server/petstore/aspnetcore-8.0-NewtonsoftFalse/src/Org.OpenAPITools/Controllers/FakeApi.cs index 68cdf5001253..14209697cfcd 100644 --- a/samples/server/petstore/aspnetcore-8.0-NewtonsoftFalse/src/Org.OpenAPITools/Controllers/FakeApi.cs +++ b/samples/server/petstore/aspnetcore-8.0-NewtonsoftFalse/src/Org.OpenAPITools/Controllers/FakeApi.cs @@ -43,7 +43,7 @@ public virtual IActionResult FakeNullableExampleTest() //TODO: Uncomment the next line to return response 200 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(200, default); string exampleJson = null; - exampleJson = "{\n \"nullableName\" : \"nullableName\",\n \"name\" : \"name\"\n}"; + exampleJson = "{\n \"name\" : \"name\",\n \"nullableName\" : \"nullableName\"\n}"; var example = exampleJson != null ? JsonSerializer.Deserialize(exampleJson) diff --git a/samples/server/petstore/aspnetcore-8.0-NewtonsoftFalse/src/Org.OpenAPITools/Controllers/PetApi.cs b/samples/server/petstore/aspnetcore-8.0-NewtonsoftFalse/src/Org.OpenAPITools/Controllers/PetApi.cs index 6e04e2464a67..90375ff4ac5c 100644 --- a/samples/server/petstore/aspnetcore-8.0-NewtonsoftFalse/src/Org.OpenAPITools/Controllers/PetApi.cs +++ b/samples/server/petstore/aspnetcore-8.0-NewtonsoftFalse/src/Org.OpenAPITools/Controllers/PetApi.cs @@ -48,7 +48,7 @@ public virtual IActionResult AddPet([FromBody]Pet pet) //TODO: Uncomment the next line to return response 405 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(405); string exampleJson = null; - exampleJson = "{\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -97,7 +97,7 @@ public virtual IActionResult FindPetsByStatus([FromQuery (Name = "status")][Requ //TODO: Uncomment the next line to return response 400 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(400); string exampleJson = null; - exampleJson = "[ {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}, {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n} ]"; + exampleJson = "[ {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}, {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n} ]"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -128,7 +128,7 @@ public virtual IActionResult FindPetsByTags([FromQuery (Name = "tags")][Required //TODO: Uncomment the next line to return response 400 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(400); string exampleJson = null; - exampleJson = "[ {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}, {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n} ]"; + exampleJson = "[ {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}, {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n} ]"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -162,7 +162,7 @@ public virtual IActionResult GetPetById([FromRoute (Name = "petId")][Required]lo //TODO: Uncomment the next line to return response 404 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(404); string exampleJson = null; - exampleJson = "{\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -198,7 +198,7 @@ public virtual IActionResult UpdatePet([FromBody]Pet pet) //TODO: Uncomment the next line to return response 405 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(405); string exampleJson = null; - exampleJson = "{\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}"; exampleJson = "\n 123456789\n doggie\n \n aeiou\n \n \n \n aeiou\n"; var example = exampleJson != null diff --git a/samples/server/petstore/aspnetcore-8.0-NewtonsoftFalse/src/Org.OpenAPITools/Controllers/StoreApi.cs b/samples/server/petstore/aspnetcore-8.0-NewtonsoftFalse/src/Org.OpenAPITools/Controllers/StoreApi.cs index 3c27591fc730..98724c33c141 100644 --- a/samples/server/petstore/aspnetcore-8.0-NewtonsoftFalse/src/Org.OpenAPITools/Controllers/StoreApi.cs +++ b/samples/server/petstore/aspnetcore-8.0-NewtonsoftFalse/src/Org.OpenAPITools/Controllers/StoreApi.cs @@ -98,7 +98,7 @@ public virtual IActionResult GetOrderById([FromRoute (Name = "orderId")][Require //TODO: Uncomment the next line to return response 404 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(404); string exampleJson = null; - exampleJson = "{\n \"petId\" : 6,\n \"quantity\" : 1,\n \"id\" : 0,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"complete\" : false,\n \"status\" : \"placed\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"petId\" : 6,\n \"quantity\" : 1,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"status\" : \"placed\",\n \"complete\" : false\n}"; exampleJson = "\n 123456789\n 123456789\n 123\n 2000-01-23T04:56:07.000Z\n aeiou\n true\n"; var example = exampleJson != null @@ -128,7 +128,7 @@ public virtual IActionResult PlaceOrder([FromBody]Order order) //TODO: Uncomment the next line to return response 400 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(400); string exampleJson = null; - exampleJson = "{\n \"petId\" : 6,\n \"quantity\" : 1,\n \"id\" : 0,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"complete\" : false,\n \"status\" : \"placed\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"petId\" : 6,\n \"quantity\" : 1,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"status\" : \"placed\",\n \"complete\" : false\n}"; exampleJson = "\n 123456789\n 123456789\n 123\n 2000-01-23T04:56:07.000Z\n aeiou\n true\n"; var example = exampleJson != null diff --git a/samples/server/petstore/aspnetcore-8.0-NewtonsoftFalse/src/Org.OpenAPITools/Controllers/UserApi.cs b/samples/server/petstore/aspnetcore-8.0-NewtonsoftFalse/src/Org.OpenAPITools/Controllers/UserApi.cs index cc9e825aca15..ab7cc56a1b79 100644 --- a/samples/server/petstore/aspnetcore-8.0-NewtonsoftFalse/src/Org.OpenAPITools/Controllers/UserApi.cs +++ b/samples/server/petstore/aspnetcore-8.0-NewtonsoftFalse/src/Org.OpenAPITools/Controllers/UserApi.cs @@ -134,7 +134,7 @@ public virtual IActionResult GetUserByName([FromRoute (Name = "username")][Requi //TODO: Uncomment the next line to return response 404 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(404); string exampleJson = null; - exampleJson = "{\n \"firstName\" : \"firstName\",\n \"lastName\" : \"lastName\",\n \"password\" : \"password\",\n \"userStatus\" : 6,\n \"phone\" : \"phone\",\n \"id\" : 0,\n \"email\" : \"email\",\n \"username\" : \"username\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"username\" : \"username\",\n \"firstName\" : \"firstName\",\n \"lastName\" : \"lastName\",\n \"email\" : \"email\",\n \"password\" : \"password\",\n \"phone\" : \"phone\",\n \"userStatus\" : 6\n}"; exampleJson = "\n 123456789\n aeiou\n aeiou\n aeiou\n aeiou\n aeiou\n aeiou\n 123\n"; var example = exampleJson != null diff --git a/samples/server/petstore/aspnetcore-8.0-NewtonsoftFalse/src/Org.OpenAPITools/wwwroot/openapi-original.json b/samples/server/petstore/aspnetcore-8.0-NewtonsoftFalse/src/Org.OpenAPITools/wwwroot/openapi-original.json index b47dce3d2c68..0bfba110c0eb 100644 --- a/samples/server/petstore/aspnetcore-8.0-NewtonsoftFalse/src/Org.OpenAPITools/wwwroot/openapi-original.json +++ b/samples/server/petstore/aspnetcore-8.0-NewtonsoftFalse/src/Org.OpenAPITools/wwwroot/openapi-original.json @@ -874,8 +874,8 @@ }, "TestNullable" : { "example" : { - "nullableName" : "nullableName", - "name" : "name" + "name" : "name", + "nullableName" : "nullableName" }, "properties" : { "name" : { @@ -891,12 +891,12 @@ "Order" : { "description" : "An order for a pets from the pet store", "example" : { + "id" : 0, "petId" : 6, "quantity" : 1, - "id" : 0, "shipDate" : "2000-01-23T04:56:07.000+00:00", - "complete" : false, - "status" : "placed" + "status" : "placed", + "complete" : false }, "properties" : { "id" : { @@ -934,8 +934,8 @@ "Category" : { "description" : "A category for a pet", "example" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, "properties" : { "id" : { @@ -956,14 +956,14 @@ "User" : { "description" : "A User who is purchasing from the pet store", "example" : { + "id" : 0, + "username" : "username", "firstName" : "firstName", "lastName" : "lastName", + "email" : "email", "password" : "password", - "userStatus" : 6, "phone" : "phone", - "id" : 0, - "email" : "email", - "username" : "username" + "userStatus" : 6 }, "properties" : { "id" : { @@ -1003,8 +1003,8 @@ "Tag" : { "description" : "A tag for a pet", "example" : { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, "properties" : { "id" : { @@ -1024,19 +1024,19 @@ "Pet" : { "description" : "A pet for sale in the pet store", "example" : { - "photoUrls" : [ "photoUrls", "photoUrls" ], - "name" : "doggie", "id" : 0, "category" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, + "name" : "doggie", + "photoUrls" : [ "photoUrls", "photoUrls" ], "tags" : [ { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" } ], "status" : "available" }, diff --git a/samples/server/petstore/aspnetcore-8.0-abstract-class/src/Org.OpenAPITools/Controllers/FakeApi.cs b/samples/server/petstore/aspnetcore-8.0-abstract-class/src/Org.OpenAPITools/Controllers/FakeApi.cs index 75077a4a462a..0890ed7ef8bb 100644 --- a/samples/server/petstore/aspnetcore-8.0-abstract-class/src/Org.OpenAPITools/Controllers/FakeApi.cs +++ b/samples/server/petstore/aspnetcore-8.0-abstract-class/src/Org.OpenAPITools/Controllers/FakeApi.cs @@ -43,7 +43,7 @@ public virtual IActionResult FakeNullableExampleTest() //TODO: Uncomment the next line to return response 200 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(200, default); string exampleJson = null; - exampleJson = "{\n \"nullableName\" : \"nullableName\",\n \"name\" : \"name\"\n}"; + exampleJson = "{\n \"name\" : \"name\",\n \"nullableName\" : \"nullableName\"\n}"; var example = exampleJson != null ? JsonConvert.DeserializeObject(exampleJson) diff --git a/samples/server/petstore/aspnetcore-8.0-abstract-class/src/Org.OpenAPITools/Controllers/PetApi.cs b/samples/server/petstore/aspnetcore-8.0-abstract-class/src/Org.OpenAPITools/Controllers/PetApi.cs index b76a9c17782c..1d5cca662496 100644 --- a/samples/server/petstore/aspnetcore-8.0-abstract-class/src/Org.OpenAPITools/Controllers/PetApi.cs +++ b/samples/server/petstore/aspnetcore-8.0-abstract-class/src/Org.OpenAPITools/Controllers/PetApi.cs @@ -48,7 +48,7 @@ public virtual IActionResult AddPet([FromBody]Pet pet) //TODO: Uncomment the next line to return response 405 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(405); string exampleJson = null; - exampleJson = "{\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -97,7 +97,7 @@ public virtual IActionResult FindPetsByStatus([FromQuery (Name = "status")][Requ //TODO: Uncomment the next line to return response 400 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(400); string exampleJson = null; - exampleJson = "[ {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}, {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n} ]"; + exampleJson = "[ {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}, {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n} ]"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -128,7 +128,7 @@ public virtual IActionResult FindPetsByTags([FromQuery (Name = "tags")][Required //TODO: Uncomment the next line to return response 400 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(400); string exampleJson = null; - exampleJson = "[ {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}, {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n} ]"; + exampleJson = "[ {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}, {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n} ]"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -162,7 +162,7 @@ public virtual IActionResult GetPetById([FromRoute (Name = "petId")][Required]lo //TODO: Uncomment the next line to return response 404 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(404); string exampleJson = null; - exampleJson = "{\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -198,7 +198,7 @@ public virtual IActionResult UpdatePet([FromBody]Pet pet) //TODO: Uncomment the next line to return response 405 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(405); string exampleJson = null; - exampleJson = "{\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}"; exampleJson = "\n 123456789\n doggie\n \n aeiou\n \n \n \n aeiou\n"; var example = exampleJson != null diff --git a/samples/server/petstore/aspnetcore-8.0-abstract-class/src/Org.OpenAPITools/Controllers/StoreApi.cs b/samples/server/petstore/aspnetcore-8.0-abstract-class/src/Org.OpenAPITools/Controllers/StoreApi.cs index 0b7e22afaf0c..3b379e010cc3 100644 --- a/samples/server/petstore/aspnetcore-8.0-abstract-class/src/Org.OpenAPITools/Controllers/StoreApi.cs +++ b/samples/server/petstore/aspnetcore-8.0-abstract-class/src/Org.OpenAPITools/Controllers/StoreApi.cs @@ -98,7 +98,7 @@ public virtual IActionResult GetOrderById([FromRoute (Name = "orderId")][Require //TODO: Uncomment the next line to return response 404 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(404); string exampleJson = null; - exampleJson = "{\n \"petId\" : 6,\n \"quantity\" : 1,\n \"id\" : 0,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"complete\" : false,\n \"status\" : \"placed\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"petId\" : 6,\n \"quantity\" : 1,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"status\" : \"placed\",\n \"complete\" : false\n}"; exampleJson = "\n 123456789\n 123456789\n 123\n 2000-01-23T04:56:07.000Z\n aeiou\n true\n"; var example = exampleJson != null @@ -128,7 +128,7 @@ public virtual IActionResult PlaceOrder([FromBody]Order order) //TODO: Uncomment the next line to return response 400 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(400); string exampleJson = null; - exampleJson = "{\n \"petId\" : 6,\n \"quantity\" : 1,\n \"id\" : 0,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"complete\" : false,\n \"status\" : \"placed\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"petId\" : 6,\n \"quantity\" : 1,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"status\" : \"placed\",\n \"complete\" : false\n}"; exampleJson = "\n 123456789\n 123456789\n 123\n 2000-01-23T04:56:07.000Z\n aeiou\n true\n"; var example = exampleJson != null diff --git a/samples/server/petstore/aspnetcore-8.0-abstract-class/src/Org.OpenAPITools/Controllers/UserApi.cs b/samples/server/petstore/aspnetcore-8.0-abstract-class/src/Org.OpenAPITools/Controllers/UserApi.cs index 0e747d8e0d2e..f877c44988dc 100644 --- a/samples/server/petstore/aspnetcore-8.0-abstract-class/src/Org.OpenAPITools/Controllers/UserApi.cs +++ b/samples/server/petstore/aspnetcore-8.0-abstract-class/src/Org.OpenAPITools/Controllers/UserApi.cs @@ -134,7 +134,7 @@ public virtual IActionResult GetUserByName([FromRoute (Name = "username")][Requi //TODO: Uncomment the next line to return response 404 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(404); string exampleJson = null; - exampleJson = "{\n \"firstName\" : \"firstName\",\n \"lastName\" : \"lastName\",\n \"password\" : \"password\",\n \"userStatus\" : 6,\n \"phone\" : \"phone\",\n \"id\" : 0,\n \"email\" : \"email\",\n \"username\" : \"username\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"username\" : \"username\",\n \"firstName\" : \"firstName\",\n \"lastName\" : \"lastName\",\n \"email\" : \"email\",\n \"password\" : \"password\",\n \"phone\" : \"phone\",\n \"userStatus\" : 6\n}"; exampleJson = "\n 123456789\n aeiou\n aeiou\n aeiou\n aeiou\n aeiou\n aeiou\n 123\n"; var example = exampleJson != null diff --git a/samples/server/petstore/aspnetcore-8.0-abstract-class/src/Org.OpenAPITools/wwwroot/openapi-original.json b/samples/server/petstore/aspnetcore-8.0-abstract-class/src/Org.OpenAPITools/wwwroot/openapi-original.json index b47dce3d2c68..0bfba110c0eb 100644 --- a/samples/server/petstore/aspnetcore-8.0-abstract-class/src/Org.OpenAPITools/wwwroot/openapi-original.json +++ b/samples/server/petstore/aspnetcore-8.0-abstract-class/src/Org.OpenAPITools/wwwroot/openapi-original.json @@ -874,8 +874,8 @@ }, "TestNullable" : { "example" : { - "nullableName" : "nullableName", - "name" : "name" + "name" : "name", + "nullableName" : "nullableName" }, "properties" : { "name" : { @@ -891,12 +891,12 @@ "Order" : { "description" : "An order for a pets from the pet store", "example" : { + "id" : 0, "petId" : 6, "quantity" : 1, - "id" : 0, "shipDate" : "2000-01-23T04:56:07.000+00:00", - "complete" : false, - "status" : "placed" + "status" : "placed", + "complete" : false }, "properties" : { "id" : { @@ -934,8 +934,8 @@ "Category" : { "description" : "A category for a pet", "example" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, "properties" : { "id" : { @@ -956,14 +956,14 @@ "User" : { "description" : "A User who is purchasing from the pet store", "example" : { + "id" : 0, + "username" : "username", "firstName" : "firstName", "lastName" : "lastName", + "email" : "email", "password" : "password", - "userStatus" : 6, "phone" : "phone", - "id" : 0, - "email" : "email", - "username" : "username" + "userStatus" : 6 }, "properties" : { "id" : { @@ -1003,8 +1003,8 @@ "Tag" : { "description" : "A tag for a pet", "example" : { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, "properties" : { "id" : { @@ -1024,19 +1024,19 @@ "Pet" : { "description" : "A pet for sale in the pet store", "example" : { - "photoUrls" : [ "photoUrls", "photoUrls" ], - "name" : "doggie", "id" : 0, "category" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, + "name" : "doggie", + "photoUrls" : [ "photoUrls", "photoUrls" ], "tags" : [ { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" } ], "status" : "available" }, diff --git a/samples/server/petstore/aspnetcore-8.0-nullableReferenceTypes/src/Org.OpenAPITools/Controllers/FakeApi.cs b/samples/server/petstore/aspnetcore-8.0-nullableReferenceTypes/src/Org.OpenAPITools/Controllers/FakeApi.cs index 8f7bd3e85146..3145fcf11c83 100644 --- a/samples/server/petstore/aspnetcore-8.0-nullableReferenceTypes/src/Org.OpenAPITools/Controllers/FakeApi.cs +++ b/samples/server/petstore/aspnetcore-8.0-nullableReferenceTypes/src/Org.OpenAPITools/Controllers/FakeApi.cs @@ -43,7 +43,7 @@ public virtual IActionResult FakeNullableExampleTest() //TODO: Uncomment the next line to return response 200 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(200, default); string exampleJson = null; - exampleJson = "{\n \"nullableName\" : \"nullableName\",\n \"name\" : \"name\"\n}"; + exampleJson = "{\n \"name\" : \"name\",\n \"nullableName\" : \"nullableName\"\n}"; var example = exampleJson != null ? JsonConvert.DeserializeObject(exampleJson) diff --git a/samples/server/petstore/aspnetcore-8.0-nullableReferenceTypes/src/Org.OpenAPITools/Controllers/PetApi.cs b/samples/server/petstore/aspnetcore-8.0-nullableReferenceTypes/src/Org.OpenAPITools/Controllers/PetApi.cs index d857227c4292..99a2defb5331 100644 --- a/samples/server/petstore/aspnetcore-8.0-nullableReferenceTypes/src/Org.OpenAPITools/Controllers/PetApi.cs +++ b/samples/server/petstore/aspnetcore-8.0-nullableReferenceTypes/src/Org.OpenAPITools/Controllers/PetApi.cs @@ -48,7 +48,7 @@ public virtual IActionResult AddPet([FromBody]Pet pet) //TODO: Uncomment the next line to return response 405 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(405); string exampleJson = null; - exampleJson = "{\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -97,7 +97,7 @@ public virtual IActionResult FindPetsByStatus([FromQuery (Name = "status")][Requ //TODO: Uncomment the next line to return response 400 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(400); string exampleJson = null; - exampleJson = "[ {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}, {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n} ]"; + exampleJson = "[ {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}, {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n} ]"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -128,7 +128,7 @@ public virtual IActionResult FindPetsByTags([FromQuery (Name = "tags")][Required //TODO: Uncomment the next line to return response 400 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(400); string exampleJson = null; - exampleJson = "[ {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}, {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n} ]"; + exampleJson = "[ {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}, {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n} ]"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -162,7 +162,7 @@ public virtual IActionResult GetPetById([FromRoute (Name = "petId")][Required]lo //TODO: Uncomment the next line to return response 404 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(404); string exampleJson = null; - exampleJson = "{\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -198,7 +198,7 @@ public virtual IActionResult UpdatePet([FromBody]Pet pet) //TODO: Uncomment the next line to return response 405 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(405); string exampleJson = null; - exampleJson = "{\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}"; exampleJson = "\n 123456789\n doggie\n \n aeiou\n \n \n \n aeiou\n"; var example = exampleJson != null diff --git a/samples/server/petstore/aspnetcore-8.0-nullableReferenceTypes/src/Org.OpenAPITools/Controllers/StoreApi.cs b/samples/server/petstore/aspnetcore-8.0-nullableReferenceTypes/src/Org.OpenAPITools/Controllers/StoreApi.cs index 506f6e905e04..4cd5906946e5 100644 --- a/samples/server/petstore/aspnetcore-8.0-nullableReferenceTypes/src/Org.OpenAPITools/Controllers/StoreApi.cs +++ b/samples/server/petstore/aspnetcore-8.0-nullableReferenceTypes/src/Org.OpenAPITools/Controllers/StoreApi.cs @@ -98,7 +98,7 @@ public virtual IActionResult GetOrderById([FromRoute (Name = "orderId")][Require //TODO: Uncomment the next line to return response 404 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(404); string exampleJson = null; - exampleJson = "{\n \"petId\" : 6,\n \"quantity\" : 1,\n \"id\" : 0,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"complete\" : false,\n \"status\" : \"placed\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"petId\" : 6,\n \"quantity\" : 1,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"status\" : \"placed\",\n \"complete\" : false\n}"; exampleJson = "\n 123456789\n 123456789\n 123\n 2000-01-23T04:56:07.000Z\n aeiou\n true\n"; var example = exampleJson != null @@ -128,7 +128,7 @@ public virtual IActionResult PlaceOrder([FromBody]Order order) //TODO: Uncomment the next line to return response 400 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(400); string exampleJson = null; - exampleJson = "{\n \"petId\" : 6,\n \"quantity\" : 1,\n \"id\" : 0,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"complete\" : false,\n \"status\" : \"placed\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"petId\" : 6,\n \"quantity\" : 1,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"status\" : \"placed\",\n \"complete\" : false\n}"; exampleJson = "\n 123456789\n 123456789\n 123\n 2000-01-23T04:56:07.000Z\n aeiou\n true\n"; var example = exampleJson != null diff --git a/samples/server/petstore/aspnetcore-8.0-nullableReferenceTypes/src/Org.OpenAPITools/Controllers/UserApi.cs b/samples/server/petstore/aspnetcore-8.0-nullableReferenceTypes/src/Org.OpenAPITools/Controllers/UserApi.cs index 26cf3e920d0b..a7fac11d8e88 100644 --- a/samples/server/petstore/aspnetcore-8.0-nullableReferenceTypes/src/Org.OpenAPITools/Controllers/UserApi.cs +++ b/samples/server/petstore/aspnetcore-8.0-nullableReferenceTypes/src/Org.OpenAPITools/Controllers/UserApi.cs @@ -134,7 +134,7 @@ public virtual IActionResult GetUserByName([FromRoute (Name = "username")][Requi //TODO: Uncomment the next line to return response 404 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(404); string exampleJson = null; - exampleJson = "{\n \"firstName\" : \"firstName\",\n \"lastName\" : \"lastName\",\n \"password\" : \"password\",\n \"userStatus\" : 6,\n \"phone\" : \"phone\",\n \"id\" : 0,\n \"email\" : \"email\",\n \"username\" : \"username\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"username\" : \"username\",\n \"firstName\" : \"firstName\",\n \"lastName\" : \"lastName\",\n \"email\" : \"email\",\n \"password\" : \"password\",\n \"phone\" : \"phone\",\n \"userStatus\" : 6\n}"; exampleJson = "\n 123456789\n aeiou\n aeiou\n aeiou\n aeiou\n aeiou\n aeiou\n 123\n"; var example = exampleJson != null diff --git a/samples/server/petstore/aspnetcore-8.0-nullableReferenceTypes/src/Org.OpenAPITools/wwwroot/openapi-original.json b/samples/server/petstore/aspnetcore-8.0-nullableReferenceTypes/src/Org.OpenAPITools/wwwroot/openapi-original.json index b47dce3d2c68..0bfba110c0eb 100644 --- a/samples/server/petstore/aspnetcore-8.0-nullableReferenceTypes/src/Org.OpenAPITools/wwwroot/openapi-original.json +++ b/samples/server/petstore/aspnetcore-8.0-nullableReferenceTypes/src/Org.OpenAPITools/wwwroot/openapi-original.json @@ -874,8 +874,8 @@ }, "TestNullable" : { "example" : { - "nullableName" : "nullableName", - "name" : "name" + "name" : "name", + "nullableName" : "nullableName" }, "properties" : { "name" : { @@ -891,12 +891,12 @@ "Order" : { "description" : "An order for a pets from the pet store", "example" : { + "id" : 0, "petId" : 6, "quantity" : 1, - "id" : 0, "shipDate" : "2000-01-23T04:56:07.000+00:00", - "complete" : false, - "status" : "placed" + "status" : "placed", + "complete" : false }, "properties" : { "id" : { @@ -934,8 +934,8 @@ "Category" : { "description" : "A category for a pet", "example" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, "properties" : { "id" : { @@ -956,14 +956,14 @@ "User" : { "description" : "A User who is purchasing from the pet store", "example" : { + "id" : 0, + "username" : "username", "firstName" : "firstName", "lastName" : "lastName", + "email" : "email", "password" : "password", - "userStatus" : 6, "phone" : "phone", - "id" : 0, - "email" : "email", - "username" : "username" + "userStatus" : 6 }, "properties" : { "id" : { @@ -1003,8 +1003,8 @@ "Tag" : { "description" : "A tag for a pet", "example" : { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, "properties" : { "id" : { @@ -1024,19 +1024,19 @@ "Pet" : { "description" : "A pet for sale in the pet store", "example" : { - "photoUrls" : [ "photoUrls", "photoUrls" ], - "name" : "doggie", "id" : 0, "category" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, + "name" : "doggie", + "photoUrls" : [ "photoUrls", "photoUrls" ], "tags" : [ { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" } ], "status" : "available" }, diff --git a/samples/server/petstore/aspnetcore-8.0-pocoModels/src/Org.OpenAPITools/Controllers/FakeApi.cs b/samples/server/petstore/aspnetcore-8.0-pocoModels/src/Org.OpenAPITools/Controllers/FakeApi.cs index 8f7bd3e85146..3145fcf11c83 100644 --- a/samples/server/petstore/aspnetcore-8.0-pocoModels/src/Org.OpenAPITools/Controllers/FakeApi.cs +++ b/samples/server/petstore/aspnetcore-8.0-pocoModels/src/Org.OpenAPITools/Controllers/FakeApi.cs @@ -43,7 +43,7 @@ public virtual IActionResult FakeNullableExampleTest() //TODO: Uncomment the next line to return response 200 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(200, default); string exampleJson = null; - exampleJson = "{\n \"nullableName\" : \"nullableName\",\n \"name\" : \"name\"\n}"; + exampleJson = "{\n \"name\" : \"name\",\n \"nullableName\" : \"nullableName\"\n}"; var example = exampleJson != null ? JsonConvert.DeserializeObject(exampleJson) diff --git a/samples/server/petstore/aspnetcore-8.0-pocoModels/src/Org.OpenAPITools/Controllers/PetApi.cs b/samples/server/petstore/aspnetcore-8.0-pocoModels/src/Org.OpenAPITools/Controllers/PetApi.cs index af251d3c8e95..7566272c848a 100644 --- a/samples/server/petstore/aspnetcore-8.0-pocoModels/src/Org.OpenAPITools/Controllers/PetApi.cs +++ b/samples/server/petstore/aspnetcore-8.0-pocoModels/src/Org.OpenAPITools/Controllers/PetApi.cs @@ -48,7 +48,7 @@ public virtual IActionResult AddPet([FromBody]Pet pet) //TODO: Uncomment the next line to return response 405 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(405); string exampleJson = null; - exampleJson = "{\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -97,7 +97,7 @@ public virtual IActionResult FindPetsByStatus([FromQuery (Name = "status")][Requ //TODO: Uncomment the next line to return response 400 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(400); string exampleJson = null; - exampleJson = "[ {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}, {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n} ]"; + exampleJson = "[ {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}, {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n} ]"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -128,7 +128,7 @@ public virtual IActionResult FindPetsByTags([FromQuery (Name = "tags")][Required //TODO: Uncomment the next line to return response 400 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(400); string exampleJson = null; - exampleJson = "[ {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}, {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n} ]"; + exampleJson = "[ {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}, {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n} ]"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -162,7 +162,7 @@ public virtual IActionResult GetPetById([FromRoute (Name = "petId")][Required]lo //TODO: Uncomment the next line to return response 404 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(404); string exampleJson = null; - exampleJson = "{\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -198,7 +198,7 @@ public virtual IActionResult UpdatePet([FromBody]Pet pet) //TODO: Uncomment the next line to return response 405 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(405); string exampleJson = null; - exampleJson = "{\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}"; exampleJson = "\n 123456789\n doggie\n \n aeiou\n \n \n \n aeiou\n"; var example = exampleJson != null diff --git a/samples/server/petstore/aspnetcore-8.0-pocoModels/src/Org.OpenAPITools/Controllers/StoreApi.cs b/samples/server/petstore/aspnetcore-8.0-pocoModels/src/Org.OpenAPITools/Controllers/StoreApi.cs index 506f6e905e04..4cd5906946e5 100644 --- a/samples/server/petstore/aspnetcore-8.0-pocoModels/src/Org.OpenAPITools/Controllers/StoreApi.cs +++ b/samples/server/petstore/aspnetcore-8.0-pocoModels/src/Org.OpenAPITools/Controllers/StoreApi.cs @@ -98,7 +98,7 @@ public virtual IActionResult GetOrderById([FromRoute (Name = "orderId")][Require //TODO: Uncomment the next line to return response 404 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(404); string exampleJson = null; - exampleJson = "{\n \"petId\" : 6,\n \"quantity\" : 1,\n \"id\" : 0,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"complete\" : false,\n \"status\" : \"placed\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"petId\" : 6,\n \"quantity\" : 1,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"status\" : \"placed\",\n \"complete\" : false\n}"; exampleJson = "\n 123456789\n 123456789\n 123\n 2000-01-23T04:56:07.000Z\n aeiou\n true\n"; var example = exampleJson != null @@ -128,7 +128,7 @@ public virtual IActionResult PlaceOrder([FromBody]Order order) //TODO: Uncomment the next line to return response 400 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(400); string exampleJson = null; - exampleJson = "{\n \"petId\" : 6,\n \"quantity\" : 1,\n \"id\" : 0,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"complete\" : false,\n \"status\" : \"placed\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"petId\" : 6,\n \"quantity\" : 1,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"status\" : \"placed\",\n \"complete\" : false\n}"; exampleJson = "\n 123456789\n 123456789\n 123\n 2000-01-23T04:56:07.000Z\n aeiou\n true\n"; var example = exampleJson != null diff --git a/samples/server/petstore/aspnetcore-8.0-pocoModels/src/Org.OpenAPITools/Controllers/UserApi.cs b/samples/server/petstore/aspnetcore-8.0-pocoModels/src/Org.OpenAPITools/Controllers/UserApi.cs index 26cf3e920d0b..a7fac11d8e88 100644 --- a/samples/server/petstore/aspnetcore-8.0-pocoModels/src/Org.OpenAPITools/Controllers/UserApi.cs +++ b/samples/server/petstore/aspnetcore-8.0-pocoModels/src/Org.OpenAPITools/Controllers/UserApi.cs @@ -134,7 +134,7 @@ public virtual IActionResult GetUserByName([FromRoute (Name = "username")][Requi //TODO: Uncomment the next line to return response 404 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(404); string exampleJson = null; - exampleJson = "{\n \"firstName\" : \"firstName\",\n \"lastName\" : \"lastName\",\n \"password\" : \"password\",\n \"userStatus\" : 6,\n \"phone\" : \"phone\",\n \"id\" : 0,\n \"email\" : \"email\",\n \"username\" : \"username\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"username\" : \"username\",\n \"firstName\" : \"firstName\",\n \"lastName\" : \"lastName\",\n \"email\" : \"email\",\n \"password\" : \"password\",\n \"phone\" : \"phone\",\n \"userStatus\" : 6\n}"; exampleJson = "\n 123456789\n aeiou\n aeiou\n aeiou\n aeiou\n aeiou\n aeiou\n 123\n"; var example = exampleJson != null diff --git a/samples/server/petstore/aspnetcore-8.0-pocoModels/src/Org.OpenAPITools/wwwroot/openapi-original.json b/samples/server/petstore/aspnetcore-8.0-pocoModels/src/Org.OpenAPITools/wwwroot/openapi-original.json index b47dce3d2c68..0bfba110c0eb 100644 --- a/samples/server/petstore/aspnetcore-8.0-pocoModels/src/Org.OpenAPITools/wwwroot/openapi-original.json +++ b/samples/server/petstore/aspnetcore-8.0-pocoModels/src/Org.OpenAPITools/wwwroot/openapi-original.json @@ -874,8 +874,8 @@ }, "TestNullable" : { "example" : { - "nullableName" : "nullableName", - "name" : "name" + "name" : "name", + "nullableName" : "nullableName" }, "properties" : { "name" : { @@ -891,12 +891,12 @@ "Order" : { "description" : "An order for a pets from the pet store", "example" : { + "id" : 0, "petId" : 6, "quantity" : 1, - "id" : 0, "shipDate" : "2000-01-23T04:56:07.000+00:00", - "complete" : false, - "status" : "placed" + "status" : "placed", + "complete" : false }, "properties" : { "id" : { @@ -934,8 +934,8 @@ "Category" : { "description" : "A category for a pet", "example" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, "properties" : { "id" : { @@ -956,14 +956,14 @@ "User" : { "description" : "A User who is purchasing from the pet store", "example" : { + "id" : 0, + "username" : "username", "firstName" : "firstName", "lastName" : "lastName", + "email" : "email", "password" : "password", - "userStatus" : 6, "phone" : "phone", - "id" : 0, - "email" : "email", - "username" : "username" + "userStatus" : 6 }, "properties" : { "id" : { @@ -1003,8 +1003,8 @@ "Tag" : { "description" : "A tag for a pet", "example" : { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, "properties" : { "id" : { @@ -1024,19 +1024,19 @@ "Pet" : { "description" : "A pet for sale in the pet store", "example" : { - "photoUrls" : [ "photoUrls", "photoUrls" ], - "name" : "doggie", "id" : 0, "category" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, + "name" : "doggie", + "photoUrls" : [ "photoUrls", "photoUrls" ], "tags" : [ { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" } ], "status" : "available" }, diff --git a/samples/server/petstore/aspnetcore-8.0-project4Models/src/Org.OpenAPITools/Controllers/FakeApi.cs b/samples/server/petstore/aspnetcore-8.0-project4Models/src/Org.OpenAPITools/Controllers/FakeApi.cs index 8f7bd3e85146..3145fcf11c83 100644 --- a/samples/server/petstore/aspnetcore-8.0-project4Models/src/Org.OpenAPITools/Controllers/FakeApi.cs +++ b/samples/server/petstore/aspnetcore-8.0-project4Models/src/Org.OpenAPITools/Controllers/FakeApi.cs @@ -43,7 +43,7 @@ public virtual IActionResult FakeNullableExampleTest() //TODO: Uncomment the next line to return response 200 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(200, default); string exampleJson = null; - exampleJson = "{\n \"nullableName\" : \"nullableName\",\n \"name\" : \"name\"\n}"; + exampleJson = "{\n \"name\" : \"name\",\n \"nullableName\" : \"nullableName\"\n}"; var example = exampleJson != null ? JsonConvert.DeserializeObject(exampleJson) diff --git a/samples/server/petstore/aspnetcore-8.0-project4Models/src/Org.OpenAPITools/Controllers/PetApi.cs b/samples/server/petstore/aspnetcore-8.0-project4Models/src/Org.OpenAPITools/Controllers/PetApi.cs index af251d3c8e95..7566272c848a 100644 --- a/samples/server/petstore/aspnetcore-8.0-project4Models/src/Org.OpenAPITools/Controllers/PetApi.cs +++ b/samples/server/petstore/aspnetcore-8.0-project4Models/src/Org.OpenAPITools/Controllers/PetApi.cs @@ -48,7 +48,7 @@ public virtual IActionResult AddPet([FromBody]Pet pet) //TODO: Uncomment the next line to return response 405 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(405); string exampleJson = null; - exampleJson = "{\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -97,7 +97,7 @@ public virtual IActionResult FindPetsByStatus([FromQuery (Name = "status")][Requ //TODO: Uncomment the next line to return response 400 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(400); string exampleJson = null; - exampleJson = "[ {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}, {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n} ]"; + exampleJson = "[ {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}, {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n} ]"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -128,7 +128,7 @@ public virtual IActionResult FindPetsByTags([FromQuery (Name = "tags")][Required //TODO: Uncomment the next line to return response 400 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(400); string exampleJson = null; - exampleJson = "[ {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}, {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n} ]"; + exampleJson = "[ {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}, {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n} ]"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -162,7 +162,7 @@ public virtual IActionResult GetPetById([FromRoute (Name = "petId")][Required]lo //TODO: Uncomment the next line to return response 404 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(404); string exampleJson = null; - exampleJson = "{\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -198,7 +198,7 @@ public virtual IActionResult UpdatePet([FromBody]Pet pet) //TODO: Uncomment the next line to return response 405 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(405); string exampleJson = null; - exampleJson = "{\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}"; exampleJson = "\n 123456789\n doggie\n \n aeiou\n \n \n \n aeiou\n"; var example = exampleJson != null diff --git a/samples/server/petstore/aspnetcore-8.0-project4Models/src/Org.OpenAPITools/Controllers/StoreApi.cs b/samples/server/petstore/aspnetcore-8.0-project4Models/src/Org.OpenAPITools/Controllers/StoreApi.cs index 506f6e905e04..4cd5906946e5 100644 --- a/samples/server/petstore/aspnetcore-8.0-project4Models/src/Org.OpenAPITools/Controllers/StoreApi.cs +++ b/samples/server/petstore/aspnetcore-8.0-project4Models/src/Org.OpenAPITools/Controllers/StoreApi.cs @@ -98,7 +98,7 @@ public virtual IActionResult GetOrderById([FromRoute (Name = "orderId")][Require //TODO: Uncomment the next line to return response 404 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(404); string exampleJson = null; - exampleJson = "{\n \"petId\" : 6,\n \"quantity\" : 1,\n \"id\" : 0,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"complete\" : false,\n \"status\" : \"placed\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"petId\" : 6,\n \"quantity\" : 1,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"status\" : \"placed\",\n \"complete\" : false\n}"; exampleJson = "\n 123456789\n 123456789\n 123\n 2000-01-23T04:56:07.000Z\n aeiou\n true\n"; var example = exampleJson != null @@ -128,7 +128,7 @@ public virtual IActionResult PlaceOrder([FromBody]Order order) //TODO: Uncomment the next line to return response 400 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(400); string exampleJson = null; - exampleJson = "{\n \"petId\" : 6,\n \"quantity\" : 1,\n \"id\" : 0,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"complete\" : false,\n \"status\" : \"placed\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"petId\" : 6,\n \"quantity\" : 1,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"status\" : \"placed\",\n \"complete\" : false\n}"; exampleJson = "\n 123456789\n 123456789\n 123\n 2000-01-23T04:56:07.000Z\n aeiou\n true\n"; var example = exampleJson != null diff --git a/samples/server/petstore/aspnetcore-8.0-project4Models/src/Org.OpenAPITools/Controllers/UserApi.cs b/samples/server/petstore/aspnetcore-8.0-project4Models/src/Org.OpenAPITools/Controllers/UserApi.cs index 26cf3e920d0b..a7fac11d8e88 100644 --- a/samples/server/petstore/aspnetcore-8.0-project4Models/src/Org.OpenAPITools/Controllers/UserApi.cs +++ b/samples/server/petstore/aspnetcore-8.0-project4Models/src/Org.OpenAPITools/Controllers/UserApi.cs @@ -134,7 +134,7 @@ public virtual IActionResult GetUserByName([FromRoute (Name = "username")][Requi //TODO: Uncomment the next line to return response 404 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(404); string exampleJson = null; - exampleJson = "{\n \"firstName\" : \"firstName\",\n \"lastName\" : \"lastName\",\n \"password\" : \"password\",\n \"userStatus\" : 6,\n \"phone\" : \"phone\",\n \"id\" : 0,\n \"email\" : \"email\",\n \"username\" : \"username\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"username\" : \"username\",\n \"firstName\" : \"firstName\",\n \"lastName\" : \"lastName\",\n \"email\" : \"email\",\n \"password\" : \"password\",\n \"phone\" : \"phone\",\n \"userStatus\" : 6\n}"; exampleJson = "\n 123456789\n aeiou\n aeiou\n aeiou\n aeiou\n aeiou\n aeiou\n 123\n"; var example = exampleJson != null diff --git a/samples/server/petstore/aspnetcore-8.0-project4Models/src/Org.OpenAPITools/wwwroot/openapi-original.json b/samples/server/petstore/aspnetcore-8.0-project4Models/src/Org.OpenAPITools/wwwroot/openapi-original.json index b47dce3d2c68..0bfba110c0eb 100644 --- a/samples/server/petstore/aspnetcore-8.0-project4Models/src/Org.OpenAPITools/wwwroot/openapi-original.json +++ b/samples/server/petstore/aspnetcore-8.0-project4Models/src/Org.OpenAPITools/wwwroot/openapi-original.json @@ -874,8 +874,8 @@ }, "TestNullable" : { "example" : { - "nullableName" : "nullableName", - "name" : "name" + "name" : "name", + "nullableName" : "nullableName" }, "properties" : { "name" : { @@ -891,12 +891,12 @@ "Order" : { "description" : "An order for a pets from the pet store", "example" : { + "id" : 0, "petId" : 6, "quantity" : 1, - "id" : 0, "shipDate" : "2000-01-23T04:56:07.000+00:00", - "complete" : false, - "status" : "placed" + "status" : "placed", + "complete" : false }, "properties" : { "id" : { @@ -934,8 +934,8 @@ "Category" : { "description" : "A category for a pet", "example" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, "properties" : { "id" : { @@ -956,14 +956,14 @@ "User" : { "description" : "A User who is purchasing from the pet store", "example" : { + "id" : 0, + "username" : "username", "firstName" : "firstName", "lastName" : "lastName", + "email" : "email", "password" : "password", - "userStatus" : 6, "phone" : "phone", - "id" : 0, - "email" : "email", - "username" : "username" + "userStatus" : 6 }, "properties" : { "id" : { @@ -1003,8 +1003,8 @@ "Tag" : { "description" : "A tag for a pet", "example" : { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, "properties" : { "id" : { @@ -1024,19 +1024,19 @@ "Pet" : { "description" : "A pet for sale in the pet store", "example" : { - "photoUrls" : [ "photoUrls", "photoUrls" ], - "name" : "doggie", "id" : 0, "category" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, + "name" : "doggie", + "photoUrls" : [ "photoUrls", "photoUrls" ], "tags" : [ { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" } ], "status" : "available" }, diff --git a/samples/server/petstore/aspnetcore-8.0-use-centralized-package-version-management/src/Org.OpenAPITools/Controllers/FakeApi.cs b/samples/server/petstore/aspnetcore-8.0-use-centralized-package-version-management/src/Org.OpenAPITools/Controllers/FakeApi.cs index 8f7bd3e85146..3145fcf11c83 100644 --- a/samples/server/petstore/aspnetcore-8.0-use-centralized-package-version-management/src/Org.OpenAPITools/Controllers/FakeApi.cs +++ b/samples/server/petstore/aspnetcore-8.0-use-centralized-package-version-management/src/Org.OpenAPITools/Controllers/FakeApi.cs @@ -43,7 +43,7 @@ public virtual IActionResult FakeNullableExampleTest() //TODO: Uncomment the next line to return response 200 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(200, default); string exampleJson = null; - exampleJson = "{\n \"nullableName\" : \"nullableName\",\n \"name\" : \"name\"\n}"; + exampleJson = "{\n \"name\" : \"name\",\n \"nullableName\" : \"nullableName\"\n}"; var example = exampleJson != null ? JsonConvert.DeserializeObject(exampleJson) diff --git a/samples/server/petstore/aspnetcore-8.0-use-centralized-package-version-management/src/Org.OpenAPITools/Controllers/PetApi.cs b/samples/server/petstore/aspnetcore-8.0-use-centralized-package-version-management/src/Org.OpenAPITools/Controllers/PetApi.cs index af251d3c8e95..7566272c848a 100644 --- a/samples/server/petstore/aspnetcore-8.0-use-centralized-package-version-management/src/Org.OpenAPITools/Controllers/PetApi.cs +++ b/samples/server/petstore/aspnetcore-8.0-use-centralized-package-version-management/src/Org.OpenAPITools/Controllers/PetApi.cs @@ -48,7 +48,7 @@ public virtual IActionResult AddPet([FromBody]Pet pet) //TODO: Uncomment the next line to return response 405 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(405); string exampleJson = null; - exampleJson = "{\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -97,7 +97,7 @@ public virtual IActionResult FindPetsByStatus([FromQuery (Name = "status")][Requ //TODO: Uncomment the next line to return response 400 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(400); string exampleJson = null; - exampleJson = "[ {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}, {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n} ]"; + exampleJson = "[ {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}, {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n} ]"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -128,7 +128,7 @@ public virtual IActionResult FindPetsByTags([FromQuery (Name = "tags")][Required //TODO: Uncomment the next line to return response 400 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(400); string exampleJson = null; - exampleJson = "[ {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}, {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n} ]"; + exampleJson = "[ {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}, {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n} ]"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -162,7 +162,7 @@ public virtual IActionResult GetPetById([FromRoute (Name = "petId")][Required]lo //TODO: Uncomment the next line to return response 404 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(404); string exampleJson = null; - exampleJson = "{\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -198,7 +198,7 @@ public virtual IActionResult UpdatePet([FromBody]Pet pet) //TODO: Uncomment the next line to return response 405 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(405); string exampleJson = null; - exampleJson = "{\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}"; exampleJson = "\n 123456789\n doggie\n \n aeiou\n \n \n \n aeiou\n"; var example = exampleJson != null diff --git a/samples/server/petstore/aspnetcore-8.0-use-centralized-package-version-management/src/Org.OpenAPITools/Controllers/StoreApi.cs b/samples/server/petstore/aspnetcore-8.0-use-centralized-package-version-management/src/Org.OpenAPITools/Controllers/StoreApi.cs index 506f6e905e04..4cd5906946e5 100644 --- a/samples/server/petstore/aspnetcore-8.0-use-centralized-package-version-management/src/Org.OpenAPITools/Controllers/StoreApi.cs +++ b/samples/server/petstore/aspnetcore-8.0-use-centralized-package-version-management/src/Org.OpenAPITools/Controllers/StoreApi.cs @@ -98,7 +98,7 @@ public virtual IActionResult GetOrderById([FromRoute (Name = "orderId")][Require //TODO: Uncomment the next line to return response 404 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(404); string exampleJson = null; - exampleJson = "{\n \"petId\" : 6,\n \"quantity\" : 1,\n \"id\" : 0,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"complete\" : false,\n \"status\" : \"placed\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"petId\" : 6,\n \"quantity\" : 1,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"status\" : \"placed\",\n \"complete\" : false\n}"; exampleJson = "\n 123456789\n 123456789\n 123\n 2000-01-23T04:56:07.000Z\n aeiou\n true\n"; var example = exampleJson != null @@ -128,7 +128,7 @@ public virtual IActionResult PlaceOrder([FromBody]Order order) //TODO: Uncomment the next line to return response 400 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(400); string exampleJson = null; - exampleJson = "{\n \"petId\" : 6,\n \"quantity\" : 1,\n \"id\" : 0,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"complete\" : false,\n \"status\" : \"placed\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"petId\" : 6,\n \"quantity\" : 1,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"status\" : \"placed\",\n \"complete\" : false\n}"; exampleJson = "\n 123456789\n 123456789\n 123\n 2000-01-23T04:56:07.000Z\n aeiou\n true\n"; var example = exampleJson != null diff --git a/samples/server/petstore/aspnetcore-8.0-use-centralized-package-version-management/src/Org.OpenAPITools/Controllers/UserApi.cs b/samples/server/petstore/aspnetcore-8.0-use-centralized-package-version-management/src/Org.OpenAPITools/Controllers/UserApi.cs index 26cf3e920d0b..a7fac11d8e88 100644 --- a/samples/server/petstore/aspnetcore-8.0-use-centralized-package-version-management/src/Org.OpenAPITools/Controllers/UserApi.cs +++ b/samples/server/petstore/aspnetcore-8.0-use-centralized-package-version-management/src/Org.OpenAPITools/Controllers/UserApi.cs @@ -134,7 +134,7 @@ public virtual IActionResult GetUserByName([FromRoute (Name = "username")][Requi //TODO: Uncomment the next line to return response 404 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(404); string exampleJson = null; - exampleJson = "{\n \"firstName\" : \"firstName\",\n \"lastName\" : \"lastName\",\n \"password\" : \"password\",\n \"userStatus\" : 6,\n \"phone\" : \"phone\",\n \"id\" : 0,\n \"email\" : \"email\",\n \"username\" : \"username\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"username\" : \"username\",\n \"firstName\" : \"firstName\",\n \"lastName\" : \"lastName\",\n \"email\" : \"email\",\n \"password\" : \"password\",\n \"phone\" : \"phone\",\n \"userStatus\" : 6\n}"; exampleJson = "\n 123456789\n aeiou\n aeiou\n aeiou\n aeiou\n aeiou\n aeiou\n 123\n"; var example = exampleJson != null diff --git a/samples/server/petstore/aspnetcore-8.0-use-centralized-package-version-management/src/Org.OpenAPITools/wwwroot/openapi-original.json b/samples/server/petstore/aspnetcore-8.0-use-centralized-package-version-management/src/Org.OpenAPITools/wwwroot/openapi-original.json index b47dce3d2c68..0bfba110c0eb 100644 --- a/samples/server/petstore/aspnetcore-8.0-use-centralized-package-version-management/src/Org.OpenAPITools/wwwroot/openapi-original.json +++ b/samples/server/petstore/aspnetcore-8.0-use-centralized-package-version-management/src/Org.OpenAPITools/wwwroot/openapi-original.json @@ -874,8 +874,8 @@ }, "TestNullable" : { "example" : { - "nullableName" : "nullableName", - "name" : "name" + "name" : "name", + "nullableName" : "nullableName" }, "properties" : { "name" : { @@ -891,12 +891,12 @@ "Order" : { "description" : "An order for a pets from the pet store", "example" : { + "id" : 0, "petId" : 6, "quantity" : 1, - "id" : 0, "shipDate" : "2000-01-23T04:56:07.000+00:00", - "complete" : false, - "status" : "placed" + "status" : "placed", + "complete" : false }, "properties" : { "id" : { @@ -934,8 +934,8 @@ "Category" : { "description" : "A category for a pet", "example" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, "properties" : { "id" : { @@ -956,14 +956,14 @@ "User" : { "description" : "A User who is purchasing from the pet store", "example" : { + "id" : 0, + "username" : "username", "firstName" : "firstName", "lastName" : "lastName", + "email" : "email", "password" : "password", - "userStatus" : 6, "phone" : "phone", - "id" : 0, - "email" : "email", - "username" : "username" + "userStatus" : 6 }, "properties" : { "id" : { @@ -1003,8 +1003,8 @@ "Tag" : { "description" : "A tag for a pet", "example" : { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, "properties" : { "id" : { @@ -1024,19 +1024,19 @@ "Pet" : { "description" : "A pet for sale in the pet store", "example" : { - "photoUrls" : [ "photoUrls", "photoUrls" ], - "name" : "doggie", "id" : 0, "category" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, + "name" : "doggie", + "photoUrls" : [ "photoUrls", "photoUrls" ], "tags" : [ { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" } ], "status" : "available" }, diff --git a/samples/server/petstore/aspnetcore-8.0-useSwashBuckle/src/Org.OpenAPITools/Controllers/FakeApi.cs b/samples/server/petstore/aspnetcore-8.0-useSwashBuckle/src/Org.OpenAPITools/Controllers/FakeApi.cs index 8753be7eca89..66cb2f1966e7 100644 --- a/samples/server/petstore/aspnetcore-8.0-useSwashBuckle/src/Org.OpenAPITools/Controllers/FakeApi.cs +++ b/samples/server/petstore/aspnetcore-8.0-useSwashBuckle/src/Org.OpenAPITools/Controllers/FakeApi.cs @@ -40,7 +40,7 @@ public virtual IActionResult FakeNullableExampleTest() //TODO: Uncomment the next line to return response 200 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(200, default); string exampleJson = null; - exampleJson = "{\n \"nullableName\" : \"nullableName\",\n \"name\" : \"name\"\n}"; + exampleJson = "{\n \"name\" : \"name\",\n \"nullableName\" : \"nullableName\"\n}"; var example = exampleJson != null ? JsonConvert.DeserializeObject(exampleJson) diff --git a/samples/server/petstore/aspnetcore-8.0-useSwashBuckle/src/Org.OpenAPITools/Controllers/PetApi.cs b/samples/server/petstore/aspnetcore-8.0-useSwashBuckle/src/Org.OpenAPITools/Controllers/PetApi.cs index 8c8bee627e4a..a4bc3e9aad30 100644 --- a/samples/server/petstore/aspnetcore-8.0-useSwashBuckle/src/Org.OpenAPITools/Controllers/PetApi.cs +++ b/samples/server/petstore/aspnetcore-8.0-useSwashBuckle/src/Org.OpenAPITools/Controllers/PetApi.cs @@ -45,7 +45,7 @@ public virtual IActionResult AddPet([FromBody]Pet pet) //TODO: Uncomment the next line to return response 405 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(405); string exampleJson = null; - exampleJson = "{\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -92,7 +92,7 @@ public virtual IActionResult FindPetsByStatus([FromQuery (Name = "status")][Requ //TODO: Uncomment the next line to return response 400 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(400); string exampleJson = null; - exampleJson = "[ {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}, {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n} ]"; + exampleJson = "[ {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}, {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n} ]"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -122,7 +122,7 @@ public virtual IActionResult FindPetsByTags([FromQuery (Name = "tags")][Required //TODO: Uncomment the next line to return response 400 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(400); string exampleJson = null; - exampleJson = "[ {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}, {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n} ]"; + exampleJson = "[ {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}, {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n} ]"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -155,7 +155,7 @@ public virtual IActionResult GetPetById([FromRoute (Name = "petId")][Required]lo //TODO: Uncomment the next line to return response 404 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(404); string exampleJson = null; - exampleJson = "{\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -190,7 +190,7 @@ public virtual IActionResult UpdatePet([FromBody]Pet pet) //TODO: Uncomment the next line to return response 405 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(405); string exampleJson = null; - exampleJson = "{\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}"; exampleJson = "\n 123456789\n doggie\n \n aeiou\n \n \n \n aeiou\n"; var example = exampleJson != null diff --git a/samples/server/petstore/aspnetcore-8.0-useSwashBuckle/src/Org.OpenAPITools/Controllers/StoreApi.cs b/samples/server/petstore/aspnetcore-8.0-useSwashBuckle/src/Org.OpenAPITools/Controllers/StoreApi.cs index 79ae539f33b0..865fc442acf3 100644 --- a/samples/server/petstore/aspnetcore-8.0-useSwashBuckle/src/Org.OpenAPITools/Controllers/StoreApi.cs +++ b/samples/server/petstore/aspnetcore-8.0-useSwashBuckle/src/Org.OpenAPITools/Controllers/StoreApi.cs @@ -93,7 +93,7 @@ public virtual IActionResult GetOrderById([FromRoute (Name = "orderId")][Require //TODO: Uncomment the next line to return response 404 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(404); string exampleJson = null; - exampleJson = "{\n \"petId\" : 6,\n \"quantity\" : 1,\n \"id\" : 0,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"complete\" : false,\n \"status\" : \"placed\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"petId\" : 6,\n \"quantity\" : 1,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"status\" : \"placed\",\n \"complete\" : false\n}"; exampleJson = "\n 123456789\n 123456789\n 123\n 2000-01-23T04:56:07.000Z\n aeiou\n true\n"; var example = exampleJson != null @@ -122,7 +122,7 @@ public virtual IActionResult PlaceOrder([FromBody]Order order) //TODO: Uncomment the next line to return response 400 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(400); string exampleJson = null; - exampleJson = "{\n \"petId\" : 6,\n \"quantity\" : 1,\n \"id\" : 0,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"complete\" : false,\n \"status\" : \"placed\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"petId\" : 6,\n \"quantity\" : 1,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"status\" : \"placed\",\n \"complete\" : false\n}"; exampleJson = "\n 123456789\n 123456789\n 123\n 2000-01-23T04:56:07.000Z\n aeiou\n true\n"; var example = exampleJson != null diff --git a/samples/server/petstore/aspnetcore-8.0-useSwashBuckle/src/Org.OpenAPITools/Controllers/UserApi.cs b/samples/server/petstore/aspnetcore-8.0-useSwashBuckle/src/Org.OpenAPITools/Controllers/UserApi.cs index 209fe56035cd..457b3b32426b 100644 --- a/samples/server/petstore/aspnetcore-8.0-useSwashBuckle/src/Org.OpenAPITools/Controllers/UserApi.cs +++ b/samples/server/petstore/aspnetcore-8.0-useSwashBuckle/src/Org.OpenAPITools/Controllers/UserApi.cs @@ -127,7 +127,7 @@ public virtual IActionResult GetUserByName([FromRoute (Name = "username")][Requi //TODO: Uncomment the next line to return response 404 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(404); string exampleJson = null; - exampleJson = "{\n \"firstName\" : \"firstName\",\n \"lastName\" : \"lastName\",\n \"password\" : \"password\",\n \"userStatus\" : 6,\n \"phone\" : \"phone\",\n \"id\" : 0,\n \"email\" : \"email\",\n \"username\" : \"username\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"username\" : \"username\",\n \"firstName\" : \"firstName\",\n \"lastName\" : \"lastName\",\n \"email\" : \"email\",\n \"password\" : \"password\",\n \"phone\" : \"phone\",\n \"userStatus\" : 6\n}"; exampleJson = "\n 123456789\n aeiou\n aeiou\n aeiou\n aeiou\n aeiou\n aeiou\n 123\n"; var example = exampleJson != null diff --git a/samples/server/petstore/aspnetcore-8.0/src/Org.OpenAPITools/Controllers/FakeApi.cs b/samples/server/petstore/aspnetcore-8.0/src/Org.OpenAPITools/Controllers/FakeApi.cs index 8f7bd3e85146..3145fcf11c83 100644 --- a/samples/server/petstore/aspnetcore-8.0/src/Org.OpenAPITools/Controllers/FakeApi.cs +++ b/samples/server/petstore/aspnetcore-8.0/src/Org.OpenAPITools/Controllers/FakeApi.cs @@ -43,7 +43,7 @@ public virtual IActionResult FakeNullableExampleTest() //TODO: Uncomment the next line to return response 200 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(200, default); string exampleJson = null; - exampleJson = "{\n \"nullableName\" : \"nullableName\",\n \"name\" : \"name\"\n}"; + exampleJson = "{\n \"name\" : \"name\",\n \"nullableName\" : \"nullableName\"\n}"; var example = exampleJson != null ? JsonConvert.DeserializeObject(exampleJson) diff --git a/samples/server/petstore/aspnetcore-8.0/src/Org.OpenAPITools/Controllers/PetApi.cs b/samples/server/petstore/aspnetcore-8.0/src/Org.OpenAPITools/Controllers/PetApi.cs index af251d3c8e95..7566272c848a 100644 --- a/samples/server/petstore/aspnetcore-8.0/src/Org.OpenAPITools/Controllers/PetApi.cs +++ b/samples/server/petstore/aspnetcore-8.0/src/Org.OpenAPITools/Controllers/PetApi.cs @@ -48,7 +48,7 @@ public virtual IActionResult AddPet([FromBody]Pet pet) //TODO: Uncomment the next line to return response 405 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(405); string exampleJson = null; - exampleJson = "{\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -97,7 +97,7 @@ public virtual IActionResult FindPetsByStatus([FromQuery (Name = "status")][Requ //TODO: Uncomment the next line to return response 400 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(400); string exampleJson = null; - exampleJson = "[ {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}, {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n} ]"; + exampleJson = "[ {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}, {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n} ]"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -128,7 +128,7 @@ public virtual IActionResult FindPetsByTags([FromQuery (Name = "tags")][Required //TODO: Uncomment the next line to return response 400 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(400); string exampleJson = null; - exampleJson = "[ {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}, {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n} ]"; + exampleJson = "[ {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}, {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n} ]"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -162,7 +162,7 @@ public virtual IActionResult GetPetById([FromRoute (Name = "petId")][Required]lo //TODO: Uncomment the next line to return response 404 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(404); string exampleJson = null; - exampleJson = "{\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -198,7 +198,7 @@ public virtual IActionResult UpdatePet([FromBody]Pet pet) //TODO: Uncomment the next line to return response 405 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(405); string exampleJson = null; - exampleJson = "{\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}"; exampleJson = "\n 123456789\n doggie\n \n aeiou\n \n \n \n aeiou\n"; var example = exampleJson != null diff --git a/samples/server/petstore/aspnetcore-8.0/src/Org.OpenAPITools/Controllers/StoreApi.cs b/samples/server/petstore/aspnetcore-8.0/src/Org.OpenAPITools/Controllers/StoreApi.cs index 506f6e905e04..4cd5906946e5 100644 --- a/samples/server/petstore/aspnetcore-8.0/src/Org.OpenAPITools/Controllers/StoreApi.cs +++ b/samples/server/petstore/aspnetcore-8.0/src/Org.OpenAPITools/Controllers/StoreApi.cs @@ -98,7 +98,7 @@ public virtual IActionResult GetOrderById([FromRoute (Name = "orderId")][Require //TODO: Uncomment the next line to return response 404 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(404); string exampleJson = null; - exampleJson = "{\n \"petId\" : 6,\n \"quantity\" : 1,\n \"id\" : 0,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"complete\" : false,\n \"status\" : \"placed\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"petId\" : 6,\n \"quantity\" : 1,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"status\" : \"placed\",\n \"complete\" : false\n}"; exampleJson = "\n 123456789\n 123456789\n 123\n 2000-01-23T04:56:07.000Z\n aeiou\n true\n"; var example = exampleJson != null @@ -128,7 +128,7 @@ public virtual IActionResult PlaceOrder([FromBody]Order order) //TODO: Uncomment the next line to return response 400 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(400); string exampleJson = null; - exampleJson = "{\n \"petId\" : 6,\n \"quantity\" : 1,\n \"id\" : 0,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"complete\" : false,\n \"status\" : \"placed\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"petId\" : 6,\n \"quantity\" : 1,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"status\" : \"placed\",\n \"complete\" : false\n}"; exampleJson = "\n 123456789\n 123456789\n 123\n 2000-01-23T04:56:07.000Z\n aeiou\n true\n"; var example = exampleJson != null diff --git a/samples/server/petstore/aspnetcore-8.0/src/Org.OpenAPITools/Controllers/UserApi.cs b/samples/server/petstore/aspnetcore-8.0/src/Org.OpenAPITools/Controllers/UserApi.cs index 26cf3e920d0b..a7fac11d8e88 100644 --- a/samples/server/petstore/aspnetcore-8.0/src/Org.OpenAPITools/Controllers/UserApi.cs +++ b/samples/server/petstore/aspnetcore-8.0/src/Org.OpenAPITools/Controllers/UserApi.cs @@ -134,7 +134,7 @@ public virtual IActionResult GetUserByName([FromRoute (Name = "username")][Requi //TODO: Uncomment the next line to return response 404 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(404); string exampleJson = null; - exampleJson = "{\n \"firstName\" : \"firstName\",\n \"lastName\" : \"lastName\",\n \"password\" : \"password\",\n \"userStatus\" : 6,\n \"phone\" : \"phone\",\n \"id\" : 0,\n \"email\" : \"email\",\n \"username\" : \"username\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"username\" : \"username\",\n \"firstName\" : \"firstName\",\n \"lastName\" : \"lastName\",\n \"email\" : \"email\",\n \"password\" : \"password\",\n \"phone\" : \"phone\",\n \"userStatus\" : 6\n}"; exampleJson = "\n 123456789\n aeiou\n aeiou\n aeiou\n aeiou\n aeiou\n aeiou\n 123\n"; var example = exampleJson != null diff --git a/samples/server/petstore/aspnetcore-8.0/src/Org.OpenAPITools/wwwroot/openapi-original.json b/samples/server/petstore/aspnetcore-8.0/src/Org.OpenAPITools/wwwroot/openapi-original.json index b47dce3d2c68..0bfba110c0eb 100644 --- a/samples/server/petstore/aspnetcore-8.0/src/Org.OpenAPITools/wwwroot/openapi-original.json +++ b/samples/server/petstore/aspnetcore-8.0/src/Org.OpenAPITools/wwwroot/openapi-original.json @@ -874,8 +874,8 @@ }, "TestNullable" : { "example" : { - "nullableName" : "nullableName", - "name" : "name" + "name" : "name", + "nullableName" : "nullableName" }, "properties" : { "name" : { @@ -891,12 +891,12 @@ "Order" : { "description" : "An order for a pets from the pet store", "example" : { + "id" : 0, "petId" : 6, "quantity" : 1, - "id" : 0, "shipDate" : "2000-01-23T04:56:07.000+00:00", - "complete" : false, - "status" : "placed" + "status" : "placed", + "complete" : false }, "properties" : { "id" : { @@ -934,8 +934,8 @@ "Category" : { "description" : "A category for a pet", "example" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, "properties" : { "id" : { @@ -956,14 +956,14 @@ "User" : { "description" : "A User who is purchasing from the pet store", "example" : { + "id" : 0, + "username" : "username", "firstName" : "firstName", "lastName" : "lastName", + "email" : "email", "password" : "password", - "userStatus" : 6, "phone" : "phone", - "id" : 0, - "email" : "email", - "username" : "username" + "userStatus" : 6 }, "properties" : { "id" : { @@ -1003,8 +1003,8 @@ "Tag" : { "description" : "A tag for a pet", "example" : { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, "properties" : { "id" : { @@ -1024,19 +1024,19 @@ "Pet" : { "description" : "A pet for sale in the pet store", "example" : { - "photoUrls" : [ "photoUrls", "photoUrls" ], - "name" : "doggie", "id" : 0, "category" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, + "name" : "doggie", + "photoUrls" : [ "photoUrls", "photoUrls" ], "tags" : [ { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" } ], "status" : "available" }, diff --git a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Controllers/PetApi.cs b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Controllers/PetApi.cs index b56d24282256..77f343547a68 100644 --- a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Controllers/PetApi.cs +++ b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Controllers/PetApi.cs @@ -86,7 +86,7 @@ public virtual IActionResult FindPetsByStatus([FromQuery (Name = "status")][Requ //TODO: Uncomment the next line to return response 400 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(400); string exampleJson = null; - exampleJson = "[ {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}, {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n} ]"; + exampleJson = "[ {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}, {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n} ]"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -117,7 +117,7 @@ public virtual IActionResult FindPetsByTags([FromQuery (Name = "tags")][Required //TODO: Uncomment the next line to return response 400 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(400); string exampleJson = null; - exampleJson = "[ {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}, {\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n} ]"; + exampleJson = "[ {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}, {\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n} ]"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null @@ -151,7 +151,7 @@ public virtual IActionResult GetPetById([FromRoute (Name = "petId")][Required]lo //TODO: Uncomment the next line to return response 404 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(404); string exampleJson = null; - exampleJson = "{\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"name\" : \"doggie\",\n \"id\" : 0,\n \"category\" : {\n \"name\" : \"name\",\n \"id\" : 6\n },\n \"tags\" : [ {\n \"name\" : \"name\",\n \"id\" : 1\n }, {\n \"name\" : \"name\",\n \"id\" : 1\n } ],\n \"status\" : \"available\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"category\" : {\n \"id\" : 6,\n \"name\" : \"name\"\n },\n \"name\" : \"doggie\",\n \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ],\n \"tags\" : [ {\n \"id\" : 1,\n \"name\" : \"name\"\n }, {\n \"id\" : 1,\n \"name\" : \"name\"\n } ],\n \"status\" : \"available\"\n}"; exampleJson = "\n 123456789\n \n 123456789\n aeiou\n \n doggie\n \n aeiou\n \n \n \n 123456789\n aeiou\n \n \n aeiou\n"; var example = exampleJson != null diff --git a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Controllers/StoreApi.cs b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Controllers/StoreApi.cs index abce15156a6b..b140b22d6595 100644 --- a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Controllers/StoreApi.cs +++ b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Controllers/StoreApi.cs @@ -98,7 +98,7 @@ public virtual IActionResult GetOrderById([FromRoute (Name = "orderId")][Require //TODO: Uncomment the next line to return response 404 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(404); string exampleJson = null; - exampleJson = "{\n \"petId\" : 6,\n \"quantity\" : 1,\n \"id\" : 0,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"complete\" : false,\n \"status\" : \"placed\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"petId\" : 6,\n \"quantity\" : 1,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"status\" : \"placed\",\n \"complete\" : false\n}"; exampleJson = "\n 123456789\n 123456789\n 123\n 2000-01-23T04:56:07.000Z\n aeiou\n true\n"; var example = exampleJson != null @@ -127,7 +127,7 @@ public virtual IActionResult PlaceOrder([FromBody]Order body) //TODO: Uncomment the next line to return response 400 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(400); string exampleJson = null; - exampleJson = "{\n \"petId\" : 6,\n \"quantity\" : 1,\n \"id\" : 0,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"complete\" : false,\n \"status\" : \"placed\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"petId\" : 6,\n \"quantity\" : 1,\n \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\",\n \"status\" : \"placed\",\n \"complete\" : false\n}"; exampleJson = "\n 123456789\n 123456789\n 123\n 2000-01-23T04:56:07.000Z\n aeiou\n true\n"; var example = exampleJson != null diff --git a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Controllers/UserApi.cs b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Controllers/UserApi.cs index 271ee8094fdd..96fd6c696c8f 100644 --- a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Controllers/UserApi.cs +++ b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Controllers/UserApi.cs @@ -127,7 +127,7 @@ public virtual IActionResult GetUserByName([FromRoute (Name = "username")][Requi //TODO: Uncomment the next line to return response 404 or use other options such as return this.NotFound(), return this.BadRequest(..), ... // return StatusCode(404); string exampleJson = null; - exampleJson = "{\n \"firstName\" : \"firstName\",\n \"lastName\" : \"lastName\",\n \"password\" : \"password\",\n \"userStatus\" : 6,\n \"phone\" : \"phone\",\n \"id\" : 0,\n \"email\" : \"email\",\n \"username\" : \"username\"\n}"; + exampleJson = "{\n \"id\" : 0,\n \"username\" : \"username\",\n \"firstName\" : \"firstName\",\n \"lastName\" : \"lastName\",\n \"email\" : \"email\",\n \"password\" : \"password\",\n \"phone\" : \"phone\",\n \"userStatus\" : 6\n}"; exampleJson = "\n 123456789\n aeiou\n aeiou\n aeiou\n aeiou\n aeiou\n aeiou\n 123\n"; var example = exampleJson != null diff --git a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/wwwroot/openapi-original.json b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/wwwroot/openapi-original.json index 333dcf2bfceb..36c014dba742 100644 --- a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/wwwroot/openapi-original.json +++ b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/wwwroot/openapi-original.json @@ -754,12 +754,12 @@ "Order" : { "description" : "An order for a pets from the pet store", "example" : { + "id" : 0, "petId" : 6, "quantity" : 1, - "id" : 0, "shipDate" : "2000-01-23T04:56:07.000+00:00", - "complete" : false, - "status" : "placed" + "status" : "placed", + "complete" : false }, "properties" : { "id" : { @@ -797,8 +797,8 @@ "Category" : { "description" : "A category for a pet", "example" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, "properties" : { "id" : { @@ -818,14 +818,14 @@ "User" : { "description" : "A User who is purchasing from the pet store", "example" : { + "id" : 0, + "username" : "username", "firstName" : "firstName", "lastName" : "lastName", + "email" : "email", "password" : "password", - "userStatus" : 6, "phone" : "phone", - "id" : 0, - "email" : "email", - "username" : "username" + "userStatus" : 6 }, "properties" : { "id" : { @@ -865,8 +865,8 @@ "Tag" : { "description" : "A tag for a pet", "example" : { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, "properties" : { "id" : { @@ -886,19 +886,19 @@ "Pet" : { "description" : "A pet for sale in the pet store", "example" : { - "photoUrls" : [ "photoUrls", "photoUrls" ], - "name" : "doggie", "id" : 0, "category" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, + "name" : "doggie", + "photoUrls" : [ "photoUrls", "photoUrls" ], "tags" : [ { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" } ], "status" : "available" }, diff --git a/samples/server/petstore/erlang-server/priv/openapi.json b/samples/server/petstore/erlang-server/priv/openapi.json index 8c95563cbadb..ad1d12f9dec6 100644 --- a/samples/server/petstore/erlang-server/priv/openapi.json +++ b/samples/server/petstore/erlang-server/priv/openapi.json @@ -812,12 +812,12 @@ "Order" : { "description" : "An order for a pets from the pet store", "example" : { + "id" : 0, "petId" : 6, "quantity" : 1, - "id" : 0, "shipDate" : "2000-01-23T04:56:07.000+00:00", - "complete" : false, - "status" : "placed" + "status" : "placed", + "complete" : false }, "properties" : { "id" : { @@ -855,8 +855,8 @@ "Category" : { "description" : "A category for a pet", "example" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, "properties" : { "id" : { @@ -877,14 +877,14 @@ "User" : { "description" : "A User who is purchasing from the pet store", "example" : { + "id" : 0, + "username" : "username", "firstName" : "firstName", "lastName" : "lastName", + "email" : "email", "password" : "password", - "userStatus" : 6, "phone" : "phone", - "id" : 0, - "email" : "email", - "username" : "username" + "userStatus" : 6 }, "properties" : { "id" : { @@ -924,8 +924,8 @@ "Tag" : { "description" : "A tag for a pet", "example" : { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, "properties" : { "id" : { @@ -945,19 +945,19 @@ "Pet" : { "description" : "A pet for sale in the pet store", "example" : { - "photoUrls" : [ "photoUrls", "photoUrls" ], - "name" : "doggie", "id" : 0, "category" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, + "name" : "doggie", + "photoUrls" : [ "photoUrls", "photoUrls" ], "tags" : [ { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" } ], "status" : "available" }, diff --git a/samples/server/petstore/go-api-server/api/openapi.yaml b/samples/server/petstore/go-api-server/api/openapi.yaml index c755995d4940..6e61c3813b55 100644 --- a/samples/server/petstore/go-api-server/api/openapi.yaml +++ b/samples/server/petstore/go-api-server/api/openapi.yaml @@ -1031,21 +1031,21 @@ components: example: petId: 5 quantity: 5 - comment: comment - id: 1 shipDate: 2000-01-23T04:56:07.000+00:00 - type: type - complete: false promotion: true + type: type + id: 1 status: placed + complete: false + comment: comment type: object xml: name: Order Category: description: A category for a pet example: - name: name id: 6 + name: name nullable: true properties: id: @@ -1061,160 +1061,160 @@ components: User: description: A User who is purchasing from the pet store example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone + userStatus: 6 deepSliceModel: - - - - name: name - id: 1 - - name: name - id: 1 - - - name: name - id: 1 - - name: name - id: 1 - - - - name: name - id: 1 - - name: name - id: 1 - - - name: name - id: 1 - - name: name - id: 1 - id: 0 + - - - id: 1 + name: name + - id: 1 + name: name + - - id: 1 + name: name + - id: 1 + name: name + - - - id: 1 + name: name + - id: 1 + name: name + - - id: 1 + name: name + - id: 1 + name: name deepSliceMap: - - tag: - name: name id: 1 + name: name Pet: - - photoUrls: - - photoUrls - - photoUrls - name: doggie - id: 0 + - id: 0 category: - name: name id: 6 - tags: - - name: name - id: 1 - - name: name - id: 1 - status: available - - photoUrls: + name: name + name: doggie + photoUrls: - photoUrls - photoUrls - name: doggie - id: 0 - category: + tags: + - id: 1 name: name + - id: 1 + name: name + status: available + - id: 0 + category: id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available - tag: - name: name id: 1 + name: name Pet: - - photoUrls: - - photoUrls - - photoUrls - name: doggie - id: 0 + - id: 0 category: - name: name id: 6 - tags: - - name: name - id: 1 - - name: name - id: 1 - status: available - - photoUrls: + name: name + name: doggie + photoUrls: - photoUrls - photoUrls - name: doggie - id: 0 - category: + tags: + - id: 1 + name: name + - id: 1 name: name + status: available + - id: 0 + category: id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available - - tag: - name: name id: 1 + name: name Pet: - - photoUrls: - - photoUrls - - photoUrls - name: doggie - id: 0 + - id: 0 category: - name: name id: 6 - tags: - - name: name - id: 1 - - name: name - id: 1 - status: available - - photoUrls: + name: name + name: doggie + photoUrls: - photoUrls - photoUrls - name: doggie - id: 0 - category: + tags: + - id: 1 + name: name + - id: 1 name: name + status: available + - id: 0 + category: id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available - tag: - name: name id: 1 + name: name Pet: - - photoUrls: - - photoUrls - - photoUrls - name: doggie - id: 0 + - id: 0 category: - name: name id: 6 - tags: - - name: name - id: 1 - - name: name - id: 1 - status: available - - photoUrls: + name: name + name: doggie + photoUrls: - photoUrls - photoUrls - name: doggie - id: 0 - category: + tags: + - id: 1 name: name + - id: 1 + name: name + status: available + - id: 0 + category: id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available - email: email - username: username properties: id: format: int64 @@ -1265,160 +1265,160 @@ components: UserNullable: description: A User who is purchasing from the pet store example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone + userStatus: 6 deepSliceModel: - - - - name: name - id: 1 - - name: name - id: 1 - - - name: name - id: 1 - - name: name - id: 1 - - - - name: name - id: 1 - - name: name - id: 1 - - - name: name - id: 1 - - name: name - id: 1 - id: 0 + - - - id: 1 + name: name + - id: 1 + name: name + - - id: 1 + name: name + - id: 1 + name: name + - - - id: 1 + name: name + - id: 1 + name: name + - - id: 1 + name: name + - id: 1 + name: name deepSliceMap: - - tag: - name: name id: 1 + name: name Pet: - - photoUrls: - - photoUrls - - photoUrls - name: doggie - id: 0 + - id: 0 category: - name: name id: 6 - tags: - - name: name - id: 1 - - name: name - id: 1 - status: available - - photoUrls: + name: name + name: doggie + photoUrls: - photoUrls - photoUrls - name: doggie - id: 0 - category: + tags: + - id: 1 + name: name + - id: 1 name: name + status: available + - id: 0 + category: id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available - tag: - name: name id: 1 + name: name Pet: - - photoUrls: - - photoUrls - - photoUrls - name: doggie - id: 0 + - id: 0 category: - name: name id: 6 - tags: - - name: name - id: 1 - - name: name - id: 1 - status: available - - photoUrls: + name: name + name: doggie + photoUrls: - photoUrls - photoUrls - name: doggie - id: 0 - category: + tags: + - id: 1 name: name + - id: 1 + name: name + status: available + - id: 0 + category: id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available - - tag: - name: name id: 1 + name: name Pet: - - photoUrls: - - photoUrls - - photoUrls - name: doggie - id: 0 + - id: 0 category: - name: name id: 6 - tags: - - name: name - id: 1 - - name: name - id: 1 - status: available - - photoUrls: + name: name + name: doggie + photoUrls: - photoUrls - photoUrls - name: doggie - id: 0 - category: + tags: + - id: 1 + name: name + - id: 1 name: name + status: available + - id: 0 + category: id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available - tag: - name: name id: 1 + name: name Pet: - - photoUrls: - - photoUrls - - photoUrls - name: doggie - id: 0 + - id: 0 category: - name: name id: 6 - tags: - - name: name - id: 1 - - name: name - id: 1 - status: available - - photoUrls: + name: name + name: doggie + photoUrls: - photoUrls - photoUrls - name: doggie - id: 0 - category: + tags: + - id: 1 + name: name + - id: 1 name: name + status: available + - id: 0 + category: id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available - email: email - username: username nullable: true properties: id: @@ -1470,8 +1470,8 @@ components: Tag: description: A tag for a pet example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1485,19 +1485,19 @@ components: Pet: description: A pet for sale in the pet store example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1615,36 +1615,36 @@ components: description: An array 3-deep. example: tag: - name: name id: 1 + name: name Pet: - - photoUrls: - - photoUrls - - photoUrls - name: doggie - id: 0 + - id: 0 category: - name: name id: 6 - tags: - - name: name - id: 1 - - name: name - id: 1 - status: available - - photoUrls: + name: name + name: doggie + photoUrls: - photoUrls - photoUrls - name: doggie - id: 0 - category: + tags: + - id: 1 + name: name + - id: 1 name: name + status: available + - id: 0 + category: id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: tag: diff --git a/samples/server/petstore/go-chi-server/api/openapi.yaml b/samples/server/petstore/go-chi-server/api/openapi.yaml index c755995d4940..6e61c3813b55 100644 --- a/samples/server/petstore/go-chi-server/api/openapi.yaml +++ b/samples/server/petstore/go-chi-server/api/openapi.yaml @@ -1031,21 +1031,21 @@ components: example: petId: 5 quantity: 5 - comment: comment - id: 1 shipDate: 2000-01-23T04:56:07.000+00:00 - type: type - complete: false promotion: true + type: type + id: 1 status: placed + complete: false + comment: comment type: object xml: name: Order Category: description: A category for a pet example: - name: name id: 6 + name: name nullable: true properties: id: @@ -1061,160 +1061,160 @@ components: User: description: A User who is purchasing from the pet store example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone + userStatus: 6 deepSliceModel: - - - - name: name - id: 1 - - name: name - id: 1 - - - name: name - id: 1 - - name: name - id: 1 - - - - name: name - id: 1 - - name: name - id: 1 - - - name: name - id: 1 - - name: name - id: 1 - id: 0 + - - - id: 1 + name: name + - id: 1 + name: name + - - id: 1 + name: name + - id: 1 + name: name + - - - id: 1 + name: name + - id: 1 + name: name + - - id: 1 + name: name + - id: 1 + name: name deepSliceMap: - - tag: - name: name id: 1 + name: name Pet: - - photoUrls: - - photoUrls - - photoUrls - name: doggie - id: 0 + - id: 0 category: - name: name id: 6 - tags: - - name: name - id: 1 - - name: name - id: 1 - status: available - - photoUrls: + name: name + name: doggie + photoUrls: - photoUrls - photoUrls - name: doggie - id: 0 - category: + tags: + - id: 1 name: name + - id: 1 + name: name + status: available + - id: 0 + category: id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available - tag: - name: name id: 1 + name: name Pet: - - photoUrls: - - photoUrls - - photoUrls - name: doggie - id: 0 + - id: 0 category: - name: name id: 6 - tags: - - name: name - id: 1 - - name: name - id: 1 - status: available - - photoUrls: + name: name + name: doggie + photoUrls: - photoUrls - photoUrls - name: doggie - id: 0 - category: + tags: + - id: 1 + name: name + - id: 1 name: name + status: available + - id: 0 + category: id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available - - tag: - name: name id: 1 + name: name Pet: - - photoUrls: - - photoUrls - - photoUrls - name: doggie - id: 0 + - id: 0 category: - name: name id: 6 - tags: - - name: name - id: 1 - - name: name - id: 1 - status: available - - photoUrls: + name: name + name: doggie + photoUrls: - photoUrls - photoUrls - name: doggie - id: 0 - category: + tags: + - id: 1 + name: name + - id: 1 name: name + status: available + - id: 0 + category: id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available - tag: - name: name id: 1 + name: name Pet: - - photoUrls: - - photoUrls - - photoUrls - name: doggie - id: 0 + - id: 0 category: - name: name id: 6 - tags: - - name: name - id: 1 - - name: name - id: 1 - status: available - - photoUrls: + name: name + name: doggie + photoUrls: - photoUrls - photoUrls - name: doggie - id: 0 - category: + tags: + - id: 1 name: name + - id: 1 + name: name + status: available + - id: 0 + category: id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available - email: email - username: username properties: id: format: int64 @@ -1265,160 +1265,160 @@ components: UserNullable: description: A User who is purchasing from the pet store example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone + userStatus: 6 deepSliceModel: - - - - name: name - id: 1 - - name: name - id: 1 - - - name: name - id: 1 - - name: name - id: 1 - - - - name: name - id: 1 - - name: name - id: 1 - - - name: name - id: 1 - - name: name - id: 1 - id: 0 + - - - id: 1 + name: name + - id: 1 + name: name + - - id: 1 + name: name + - id: 1 + name: name + - - - id: 1 + name: name + - id: 1 + name: name + - - id: 1 + name: name + - id: 1 + name: name deepSliceMap: - - tag: - name: name id: 1 + name: name Pet: - - photoUrls: - - photoUrls - - photoUrls - name: doggie - id: 0 + - id: 0 category: - name: name id: 6 - tags: - - name: name - id: 1 - - name: name - id: 1 - status: available - - photoUrls: + name: name + name: doggie + photoUrls: - photoUrls - photoUrls - name: doggie - id: 0 - category: + tags: + - id: 1 + name: name + - id: 1 name: name + status: available + - id: 0 + category: id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available - tag: - name: name id: 1 + name: name Pet: - - photoUrls: - - photoUrls - - photoUrls - name: doggie - id: 0 + - id: 0 category: - name: name id: 6 - tags: - - name: name - id: 1 - - name: name - id: 1 - status: available - - photoUrls: + name: name + name: doggie + photoUrls: - photoUrls - photoUrls - name: doggie - id: 0 - category: + tags: + - id: 1 name: name + - id: 1 + name: name + status: available + - id: 0 + category: id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available - - tag: - name: name id: 1 + name: name Pet: - - photoUrls: - - photoUrls - - photoUrls - name: doggie - id: 0 + - id: 0 category: - name: name id: 6 - tags: - - name: name - id: 1 - - name: name - id: 1 - status: available - - photoUrls: + name: name + name: doggie + photoUrls: - photoUrls - photoUrls - name: doggie - id: 0 - category: + tags: + - id: 1 + name: name + - id: 1 name: name + status: available + - id: 0 + category: id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available - tag: - name: name id: 1 + name: name Pet: - - photoUrls: - - photoUrls - - photoUrls - name: doggie - id: 0 + - id: 0 category: - name: name id: 6 - tags: - - name: name - id: 1 - - name: name - id: 1 - status: available - - photoUrls: + name: name + name: doggie + photoUrls: - photoUrls - photoUrls - name: doggie - id: 0 - category: + tags: + - id: 1 + name: name + - id: 1 name: name + status: available + - id: 0 + category: id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available - email: email - username: username nullable: true properties: id: @@ -1470,8 +1470,8 @@ components: Tag: description: A tag for a pet example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1485,19 +1485,19 @@ components: Pet: description: A pet for sale in the pet store example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1615,36 +1615,36 @@ components: description: An array 3-deep. example: tag: - name: name id: 1 + name: name Pet: - - photoUrls: - - photoUrls - - photoUrls - name: doggie - id: 0 + - id: 0 category: - name: name id: 6 - tags: - - name: name - id: 1 - - name: name - id: 1 - status: available - - photoUrls: + name: name + name: doggie + photoUrls: - photoUrls - photoUrls - name: doggie - id: 0 - category: + tags: + - id: 1 + name: name + - id: 1 name: name + status: available + - id: 0 + category: id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: tag: diff --git a/samples/server/petstore/go-echo-server/.docs/api/openapi.yaml b/samples/server/petstore/go-echo-server/.docs/api/openapi.yaml index f687243b34d6..885b64671054 100644 --- a/samples/server/petstore/go-echo-server/.docs/api/openapi.yaml +++ b/samples/server/petstore/go-echo-server/.docs/api/openapi.yaml @@ -607,12 +607,12 @@ components: Order: description: An order for a pets from the pet store example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -643,8 +643,8 @@ components: Category: description: A category for a pet example: - name: name id: 6 + name: name properties: id: format: int64 @@ -659,14 +659,14 @@ components: User: description: A User who is purchasing from the pet store example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -694,8 +694,8 @@ components: Tag: description: A tag for a pet example: - name: name id: 1 + name: name properties: id: format: int64 @@ -709,19 +709,19 @@ components: Pet: description: A pet for sale in the pet store example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: diff --git a/samples/server/petstore/go-gin-api-server-interface-only/api/openapi.yaml b/samples/server/petstore/go-gin-api-server-interface-only/api/openapi.yaml index f687243b34d6..885b64671054 100644 --- a/samples/server/petstore/go-gin-api-server-interface-only/api/openapi.yaml +++ b/samples/server/petstore/go-gin-api-server-interface-only/api/openapi.yaml @@ -607,12 +607,12 @@ components: Order: description: An order for a pets from the pet store example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -643,8 +643,8 @@ components: Category: description: A category for a pet example: - name: name id: 6 + name: name properties: id: format: int64 @@ -659,14 +659,14 @@ components: User: description: A User who is purchasing from the pet store example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -694,8 +694,8 @@ components: Tag: description: A tag for a pet example: - name: name id: 1 + name: name properties: id: format: int64 @@ -709,19 +709,19 @@ components: Pet: description: A pet for sale in the pet store example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: diff --git a/samples/server/petstore/go-gin-api-server/api/openapi.yaml b/samples/server/petstore/go-gin-api-server/api/openapi.yaml index f687243b34d6..885b64671054 100644 --- a/samples/server/petstore/go-gin-api-server/api/openapi.yaml +++ b/samples/server/petstore/go-gin-api-server/api/openapi.yaml @@ -607,12 +607,12 @@ components: Order: description: An order for a pets from the pet store example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -643,8 +643,8 @@ components: Category: description: A category for a pet example: - name: name id: 6 + name: name properties: id: format: int64 @@ -659,14 +659,14 @@ components: User: description: A User who is purchasing from the pet store example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -694,8 +694,8 @@ components: Tag: description: A tag for a pet example: - name: name id: 1 + name: name properties: id: format: int64 @@ -709,19 +709,19 @@ components: Pet: description: A pet for sale in the pet store example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/PetApiRoutesImpl.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/PetApiRoutesImpl.java index 945e4c56a014..a90ff9856348 100644 --- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/PetApiRoutesImpl.java +++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/PetApiRoutesImpl.java @@ -26,7 +26,7 @@ public void configure() throws Exception { .log(LoggingLevel.INFO, "BODY TYPE: ${body.getClass().getName()}") .end() .log(LoggingLevel.INFO, "HEADERS: ${headers}") - .setBody(constant("{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }")) + .setBody(constant("{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }")) .unmarshal().json(JsonLibrary.Jackson, Pet.class); /** DELETE /pet/{petId} : Deletes a pet @@ -48,7 +48,7 @@ public void configure() throws Exception { .log(LoggingLevel.INFO, "BODY TYPE: ${body.getClass().getName()}") .end() .log(LoggingLevel.INFO, "HEADERS: ${headers}") - .setBody(constant("[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]")) + .setBody(constant("[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]")) .unmarshal().json(JsonLibrary.Jackson, Pet[].class); /** GET /pet/findByTags : Finds Pets by tags @@ -60,7 +60,7 @@ public void configure() throws Exception { .log(LoggingLevel.INFO, "BODY TYPE: ${body.getClass().getName()}") .end() .log(LoggingLevel.INFO, "HEADERS: ${headers}") - .setBody(constant("[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]")) + .setBody(constant("[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]")) .unmarshal().json(JsonLibrary.Jackson, Pet[].class); /** GET /pet/{petId} : Find pet by ID @@ -72,7 +72,7 @@ public void configure() throws Exception { .log(LoggingLevel.INFO, "BODY TYPE: ${body.getClass().getName()}") .end() .log(LoggingLevel.INFO, "HEADERS: ${headers}") - .setBody(constant("{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }")) + .setBody(constant("{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }")) .unmarshal().json(JsonLibrary.Jackson, Pet.class); /** PUT /pet : Update an existing pet @@ -84,7 +84,7 @@ public void configure() throws Exception { .log(LoggingLevel.INFO, "BODY TYPE: ${body.getClass().getName()}") .end() .log(LoggingLevel.INFO, "HEADERS: ${headers}") - .setBody(constant("{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }")) + .setBody(constant("{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }")) .unmarshal().json(JsonLibrary.Jackson, Pet.class); /** POST /pet/{petId} : Updates a pet in the store with form data diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/StoreApiRoutesImpl.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/StoreApiRoutesImpl.java index 5f317ad16d42..d7ca808a5ed7 100644 --- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/StoreApiRoutesImpl.java +++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/StoreApiRoutesImpl.java @@ -46,7 +46,7 @@ public void configure() throws Exception { .log(LoggingLevel.INFO, "BODY TYPE: ${body.getClass().getName()}") .end() .log(LoggingLevel.INFO, "HEADERS: ${headers}") - .setBody(constant("{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }")) + .setBody(constant("{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }")) .unmarshal().json(JsonLibrary.Jackson, Order.class); /** POST /store/order : Place an order for a pet @@ -58,7 +58,7 @@ public void configure() throws Exception { .log(LoggingLevel.INFO, "BODY TYPE: ${body.getClass().getName()}") .end() .log(LoggingLevel.INFO, "HEADERS: ${headers}") - .setBody(constant("{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }")) + .setBody(constant("{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }")) .unmarshal().json(JsonLibrary.Jackson, Order.class); } } diff --git a/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/UserApiRoutesImpl.java b/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/UserApiRoutesImpl.java index 5d301dbe03c9..0ad3aeb5883c 100644 --- a/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/UserApiRoutesImpl.java +++ b/samples/server/petstore/java-camel/src/main/java/org/openapitools/api/UserApiRoutesImpl.java @@ -66,7 +66,7 @@ public void configure() throws Exception { .log(LoggingLevel.INFO, "BODY TYPE: ${body.getClass().getName()}") .end() .log(LoggingLevel.INFO, "HEADERS: ${headers}") - .setBody(constant("{ \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"password\" : \"password\", \"userStatus\" : 6, \"phone\" : \"phone\", \"id\" : 0, \"email\" : \"email\", \"username\" : \"username\" }")) + .setBody(constant("{ \"id\" : 0, \"username\" : \"username\", \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"email\" : \"email\", \"password\" : \"password\", \"phone\" : \"phone\", \"userStatus\" : 6 }")) .unmarshal().json(JsonLibrary.Jackson, User.class); /** GET /user/login : Logs user into the system diff --git a/samples/server/petstore/java-helidon-server/v3/mp/src/main/resources/META-INF/openapi.yml b/samples/server/petstore/java-helidon-server/v3/mp/src/main/resources/META-INF/openapi.yml index 71ba74eeb055..e119dd1b876a 100644 --- a/samples/server/petstore/java-helidon-server/v3/mp/src/main/resources/META-INF/openapi.yml +++ b/samples/server/petstore/java-helidon-server/v3/mp/src/main/resources/META-INF/openapi.yml @@ -1436,12 +1436,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1470,8 +1470,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1486,14 +1486,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1520,8 +1520,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1533,19 +1533,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1982,8 +1982,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2021,9 +2021,9 @@ components: type: string type: object example: - otherProperty: otherProperty - nullableProperty: nullableProperty type: ChildWithNullable + nullableProperty: nullableProperty + otherProperty: otherProperty StringBooleanMap: additionalProperties: type: boolean diff --git a/samples/server/petstore/java-helidon-server/v3/se/src/main/resources/META-INF/openapi.yml b/samples/server/petstore/java-helidon-server/v3/se/src/main/resources/META-INF/openapi.yml index 71ba74eeb055..e119dd1b876a 100644 --- a/samples/server/petstore/java-helidon-server/v3/se/src/main/resources/META-INF/openapi.yml +++ b/samples/server/petstore/java-helidon-server/v3/se/src/main/resources/META-INF/openapi.yml @@ -1436,12 +1436,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1470,8 +1470,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1486,14 +1486,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1520,8 +1520,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1533,19 +1533,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1982,8 +1982,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2021,9 +2021,9 @@ components: type: string type: object example: - otherProperty: otherProperty - nullableProperty: nullableProperty type: ChildWithNullable + nullableProperty: nullableProperty + otherProperty: otherProperty StringBooleanMap: additionalProperties: type: boolean diff --git a/samples/server/petstore/java-helidon-server/v4/mp/src/main/resources/META-INF/openapi.yml b/samples/server/petstore/java-helidon-server/v4/mp/src/main/resources/META-INF/openapi.yml index 71ba74eeb055..e119dd1b876a 100644 --- a/samples/server/petstore/java-helidon-server/v4/mp/src/main/resources/META-INF/openapi.yml +++ b/samples/server/petstore/java-helidon-server/v4/mp/src/main/resources/META-INF/openapi.yml @@ -1436,12 +1436,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1470,8 +1470,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1486,14 +1486,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1520,8 +1520,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1533,19 +1533,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1982,8 +1982,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2021,9 +2021,9 @@ components: type: string type: object example: - otherProperty: otherProperty - nullableProperty: nullableProperty type: ChildWithNullable + nullableProperty: nullableProperty + otherProperty: otherProperty StringBooleanMap: additionalProperties: type: boolean diff --git a/samples/server/petstore/java-helidon-server/v4/se-uac-group-by-file-path/src/main/resources/META-INF/openapi.yml b/samples/server/petstore/java-helidon-server/v4/se-uac-group-by-file-path/src/main/resources/META-INF/openapi.yml index 71ba74eeb055..e119dd1b876a 100644 --- a/samples/server/petstore/java-helidon-server/v4/se-uac-group-by-file-path/src/main/resources/META-INF/openapi.yml +++ b/samples/server/petstore/java-helidon-server/v4/se-uac-group-by-file-path/src/main/resources/META-INF/openapi.yml @@ -1436,12 +1436,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1470,8 +1470,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1486,14 +1486,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1520,8 +1520,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1533,19 +1533,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1982,8 +1982,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2021,9 +2021,9 @@ components: type: string type: object example: - otherProperty: otherProperty - nullableProperty: nullableProperty type: ChildWithNullable + nullableProperty: nullableProperty + otherProperty: otherProperty StringBooleanMap: additionalProperties: type: boolean diff --git a/samples/server/petstore/java-helidon-server/v4/se-uac/src/main/resources/META-INF/openapi.yml b/samples/server/petstore/java-helidon-server/v4/se-uac/src/main/resources/META-INF/openapi.yml index 71ba74eeb055..e119dd1b876a 100644 --- a/samples/server/petstore/java-helidon-server/v4/se-uac/src/main/resources/META-INF/openapi.yml +++ b/samples/server/petstore/java-helidon-server/v4/se-uac/src/main/resources/META-INF/openapi.yml @@ -1436,12 +1436,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1470,8 +1470,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1486,14 +1486,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1520,8 +1520,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1533,19 +1533,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1982,8 +1982,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2021,9 +2021,9 @@ components: type: string type: object example: - otherProperty: otherProperty - nullableProperty: nullableProperty type: ChildWithNullable + nullableProperty: nullableProperty + otherProperty: otherProperty StringBooleanMap: additionalProperties: type: boolean diff --git a/samples/server/petstore/java-helidon-server/v4/se/src/main/resources/META-INF/openapi.yml b/samples/server/petstore/java-helidon-server/v4/se/src/main/resources/META-INF/openapi.yml index 71ba74eeb055..e119dd1b876a 100644 --- a/samples/server/petstore/java-helidon-server/v4/se/src/main/resources/META-INF/openapi.yml +++ b/samples/server/petstore/java-helidon-server/v4/se/src/main/resources/META-INF/openapi.yml @@ -1436,12 +1436,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1470,8 +1470,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1486,14 +1486,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1520,8 +1520,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1533,19 +1533,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1982,8 +1982,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2021,9 +2021,9 @@ components: type: string type: object example: - otherProperty: otherProperty - nullableProperty: nullableProperty type: ChildWithNullable + nullableProperty: nullableProperty + otherProperty: otherProperty StringBooleanMap: additionalProperties: type: boolean diff --git a/samples/server/petstore/java-play-framework-api-package-override/public/openapi.json b/samples/server/petstore/java-play-framework-api-package-override/public/openapi.json index 3dc93a787265..c1ca9eb6d8e9 100644 --- a/samples/server/petstore/java-play-framework-api-package-override/public/openapi.json +++ b/samples/server/petstore/java-play-framework-api-package-override/public/openapi.json @@ -783,12 +783,12 @@ "Order" : { "description" : "An order for a pets from the pet store", "example" : { + "id" : 0, "petId" : 6, "quantity" : 1, - "id" : 0, "shipDate" : "2000-01-23T04:56:07.000+00:00", - "complete" : false, - "status" : "placed" + "status" : "placed", + "complete" : false }, "properties" : { "id" : { @@ -826,8 +826,8 @@ "Category" : { "description" : "A category for a pet", "example" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, "properties" : { "id" : { @@ -847,14 +847,14 @@ "User" : { "description" : "A User who is purchasing from the pet store", "example" : { + "id" : 0, + "username" : "username", "firstName" : "firstName", "lastName" : "lastName", + "email" : "email", "password" : "password", - "userStatus" : 6, "phone" : "phone", - "id" : 0, - "email" : "email", - "username" : "username" + "userStatus" : 6 }, "properties" : { "id" : { @@ -894,8 +894,8 @@ "Tag" : { "description" : "A tag for a pet", "example" : { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, "properties" : { "id" : { @@ -915,19 +915,19 @@ "Pet" : { "description" : "A pet for sale in the pet store", "example" : { - "photoUrls" : [ "photoUrls", "photoUrls" ], - "name" : "doggie", "id" : 0, "category" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, + "name" : "doggie", + "photoUrls" : [ "photoUrls", "photoUrls" ], "tags" : [ { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" } ], "status" : "available" }, diff --git a/samples/server/petstore/java-play-framework-async/public/openapi.json b/samples/server/petstore/java-play-framework-async/public/openapi.json index 3dc93a787265..c1ca9eb6d8e9 100644 --- a/samples/server/petstore/java-play-framework-async/public/openapi.json +++ b/samples/server/petstore/java-play-framework-async/public/openapi.json @@ -783,12 +783,12 @@ "Order" : { "description" : "An order for a pets from the pet store", "example" : { + "id" : 0, "petId" : 6, "quantity" : 1, - "id" : 0, "shipDate" : "2000-01-23T04:56:07.000+00:00", - "complete" : false, - "status" : "placed" + "status" : "placed", + "complete" : false }, "properties" : { "id" : { @@ -826,8 +826,8 @@ "Category" : { "description" : "A category for a pet", "example" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, "properties" : { "id" : { @@ -847,14 +847,14 @@ "User" : { "description" : "A User who is purchasing from the pet store", "example" : { + "id" : 0, + "username" : "username", "firstName" : "firstName", "lastName" : "lastName", + "email" : "email", "password" : "password", - "userStatus" : 6, "phone" : "phone", - "id" : 0, - "email" : "email", - "username" : "username" + "userStatus" : 6 }, "properties" : { "id" : { @@ -894,8 +894,8 @@ "Tag" : { "description" : "A tag for a pet", "example" : { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, "properties" : { "id" : { @@ -915,19 +915,19 @@ "Pet" : { "description" : "A pet for sale in the pet store", "example" : { - "photoUrls" : [ "photoUrls", "photoUrls" ], - "name" : "doggie", "id" : 0, "category" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, + "name" : "doggie", + "photoUrls" : [ "photoUrls", "photoUrls" ], "tags" : [ { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" } ], "status" : "available" }, diff --git a/samples/server/petstore/java-play-framework-controller-only/public/openapi.json b/samples/server/petstore/java-play-framework-controller-only/public/openapi.json index 3dc93a787265..c1ca9eb6d8e9 100644 --- a/samples/server/petstore/java-play-framework-controller-only/public/openapi.json +++ b/samples/server/petstore/java-play-framework-controller-only/public/openapi.json @@ -783,12 +783,12 @@ "Order" : { "description" : "An order for a pets from the pet store", "example" : { + "id" : 0, "petId" : 6, "quantity" : 1, - "id" : 0, "shipDate" : "2000-01-23T04:56:07.000+00:00", - "complete" : false, - "status" : "placed" + "status" : "placed", + "complete" : false }, "properties" : { "id" : { @@ -826,8 +826,8 @@ "Category" : { "description" : "A category for a pet", "example" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, "properties" : { "id" : { @@ -847,14 +847,14 @@ "User" : { "description" : "A User who is purchasing from the pet store", "example" : { + "id" : 0, + "username" : "username", "firstName" : "firstName", "lastName" : "lastName", + "email" : "email", "password" : "password", - "userStatus" : 6, "phone" : "phone", - "id" : 0, - "email" : "email", - "username" : "username" + "userStatus" : 6 }, "properties" : { "id" : { @@ -894,8 +894,8 @@ "Tag" : { "description" : "A tag for a pet", "example" : { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, "properties" : { "id" : { @@ -915,19 +915,19 @@ "Pet" : { "description" : "A pet for sale in the pet store", "example" : { - "photoUrls" : [ "photoUrls", "photoUrls" ], - "name" : "doggie", "id" : 0, "category" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, + "name" : "doggie", + "photoUrls" : [ "photoUrls", "photoUrls" ], "tags" : [ { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" } ], "status" : "available" }, diff --git a/samples/server/petstore/java-play-framework-fake-endpoints-with-security/public/openapi.json b/samples/server/petstore/java-play-framework-fake-endpoints-with-security/public/openapi.json index caab0808595f..8c0b5170c20c 100644 --- a/samples/server/petstore/java-play-framework-fake-endpoints-with-security/public/openapi.json +++ b/samples/server/petstore/java-play-framework-fake-endpoints-with-security/public/openapi.json @@ -192,8 +192,8 @@ "Category" : { "description" : "A category for a pet", "example" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, "properties" : { "id" : { @@ -250,8 +250,8 @@ "Tag" : { "description" : "A tag for a pet", "example" : { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, "properties" : { "id" : { @@ -271,19 +271,19 @@ "Pet" : { "description" : "A pet for sale in the pet store", "example" : { - "photoUrls" : [ "photoUrls", "photoUrls" ], - "name" : "doggie", "id" : 0, "category" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, + "name" : "doggie", + "photoUrls" : [ "photoUrls", "photoUrls" ], "tags" : [ { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" } ], "status" : "available" }, 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 d1c6dbe41351..df4fb1f8ff0e 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 @@ -1512,12 +1512,12 @@ "schemas" : { "Order" : { "example" : { + "id" : 0, "petId" : 6, "quantity" : 1, - "id" : 0, "shipDate" : "2000-01-23T04:56:07.000+00:00", - "complete" : false, - "status" : "placed" + "status" : "placed", + "complete" : false }, "properties" : { "id" : { @@ -1553,8 +1553,8 @@ }, "Category" : { "example" : { - "name" : "default-name", - "id" : 6 + "id" : 6, + "name" : "default-name" }, "properties" : { "id" : { @@ -1574,14 +1574,14 @@ }, "User" : { "example" : { + "id" : 0, + "username" : "username", "firstName" : "firstName", "lastName" : "lastName", + "email" : "email", "password" : "password", - "userStatus" : 6, "phone" : "phone", - "id" : 0, - "email" : "email", - "username" : "username" + "userStatus" : 6 }, "properties" : { "id" : { @@ -1620,8 +1620,8 @@ }, "Tag" : { "example" : { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, "properties" : { "id" : { @@ -1639,19 +1639,19 @@ }, "Pet" : { "example" : { - "photoUrls" : [ "photoUrls", "photoUrls" ], - "name" : "doggie", "id" : 0, "category" : { - "name" : "default-name", - "id" : 6 + "id" : 6, + "name" : "default-name" }, + "name" : "doggie", + "photoUrls" : [ "photoUrls", "photoUrls" ], "tags" : [ { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" } ], "status" : "available" }, @@ -2331,8 +2331,8 @@ }, "OuterComposite" : { "example" : { - "my_string" : "my_string", "my_number" : 0.8008281904610115, + "my_string" : "my_string", "my_boolean" : true }, "properties" : { diff --git a/samples/server/petstore/java-play-framework-no-bean-validation/public/openapi.json b/samples/server/petstore/java-play-framework-no-bean-validation/public/openapi.json index 3dc93a787265..c1ca9eb6d8e9 100644 --- a/samples/server/petstore/java-play-framework-no-bean-validation/public/openapi.json +++ b/samples/server/petstore/java-play-framework-no-bean-validation/public/openapi.json @@ -783,12 +783,12 @@ "Order" : { "description" : "An order for a pets from the pet store", "example" : { + "id" : 0, "petId" : 6, "quantity" : 1, - "id" : 0, "shipDate" : "2000-01-23T04:56:07.000+00:00", - "complete" : false, - "status" : "placed" + "status" : "placed", + "complete" : false }, "properties" : { "id" : { @@ -826,8 +826,8 @@ "Category" : { "description" : "A category for a pet", "example" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, "properties" : { "id" : { @@ -847,14 +847,14 @@ "User" : { "description" : "A User who is purchasing from the pet store", "example" : { + "id" : 0, + "username" : "username", "firstName" : "firstName", "lastName" : "lastName", + "email" : "email", "password" : "password", - "userStatus" : 6, "phone" : "phone", - "id" : 0, - "email" : "email", - "username" : "username" + "userStatus" : 6 }, "properties" : { "id" : { @@ -894,8 +894,8 @@ "Tag" : { "description" : "A tag for a pet", "example" : { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, "properties" : { "id" : { @@ -915,19 +915,19 @@ "Pet" : { "description" : "A pet for sale in the pet store", "example" : { - "photoUrls" : [ "photoUrls", "photoUrls" ], - "name" : "doggie", "id" : 0, "category" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, + "name" : "doggie", + "photoUrls" : [ "photoUrls", "photoUrls" ], "tags" : [ { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" } ], "status" : "available" }, diff --git a/samples/server/petstore/java-play-framework-no-excp-handling/public/openapi.json b/samples/server/petstore/java-play-framework-no-excp-handling/public/openapi.json index 3dc93a787265..c1ca9eb6d8e9 100644 --- a/samples/server/petstore/java-play-framework-no-excp-handling/public/openapi.json +++ b/samples/server/petstore/java-play-framework-no-excp-handling/public/openapi.json @@ -783,12 +783,12 @@ "Order" : { "description" : "An order for a pets from the pet store", "example" : { + "id" : 0, "petId" : 6, "quantity" : 1, - "id" : 0, "shipDate" : "2000-01-23T04:56:07.000+00:00", - "complete" : false, - "status" : "placed" + "status" : "placed", + "complete" : false }, "properties" : { "id" : { @@ -826,8 +826,8 @@ "Category" : { "description" : "A category for a pet", "example" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, "properties" : { "id" : { @@ -847,14 +847,14 @@ "User" : { "description" : "A User who is purchasing from the pet store", "example" : { + "id" : 0, + "username" : "username", "firstName" : "firstName", "lastName" : "lastName", + "email" : "email", "password" : "password", - "userStatus" : 6, "phone" : "phone", - "id" : 0, - "email" : "email", - "username" : "username" + "userStatus" : 6 }, "properties" : { "id" : { @@ -894,8 +894,8 @@ "Tag" : { "description" : "A tag for a pet", "example" : { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, "properties" : { "id" : { @@ -915,19 +915,19 @@ "Pet" : { "description" : "A pet for sale in the pet store", "example" : { - "photoUrls" : [ "photoUrls", "photoUrls" ], - "name" : "doggie", "id" : 0, "category" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, + "name" : "doggie", + "photoUrls" : [ "photoUrls", "photoUrls" ], "tags" : [ { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" } ], "status" : "available" }, diff --git a/samples/server/petstore/java-play-framework-no-interface/public/openapi.json b/samples/server/petstore/java-play-framework-no-interface/public/openapi.json index 3dc93a787265..c1ca9eb6d8e9 100644 --- a/samples/server/petstore/java-play-framework-no-interface/public/openapi.json +++ b/samples/server/petstore/java-play-framework-no-interface/public/openapi.json @@ -783,12 +783,12 @@ "Order" : { "description" : "An order for a pets from the pet store", "example" : { + "id" : 0, "petId" : 6, "quantity" : 1, - "id" : 0, "shipDate" : "2000-01-23T04:56:07.000+00:00", - "complete" : false, - "status" : "placed" + "status" : "placed", + "complete" : false }, "properties" : { "id" : { @@ -826,8 +826,8 @@ "Category" : { "description" : "A category for a pet", "example" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, "properties" : { "id" : { @@ -847,14 +847,14 @@ "User" : { "description" : "A User who is purchasing from the pet store", "example" : { + "id" : 0, + "username" : "username", "firstName" : "firstName", "lastName" : "lastName", + "email" : "email", "password" : "password", - "userStatus" : 6, "phone" : "phone", - "id" : 0, - "email" : "email", - "username" : "username" + "userStatus" : 6 }, "properties" : { "id" : { @@ -894,8 +894,8 @@ "Tag" : { "description" : "A tag for a pet", "example" : { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, "properties" : { "id" : { @@ -915,19 +915,19 @@ "Pet" : { "description" : "A pet for sale in the pet store", "example" : { - "photoUrls" : [ "photoUrls", "photoUrls" ], - "name" : "doggie", "id" : 0, "category" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, + "name" : "doggie", + "photoUrls" : [ "photoUrls", "photoUrls" ], "tags" : [ { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" } ], "status" : "available" }, diff --git a/samples/server/petstore/java-play-framework-no-nullable/public/openapi.json b/samples/server/petstore/java-play-framework-no-nullable/public/openapi.json index 3dc93a787265..c1ca9eb6d8e9 100644 --- a/samples/server/petstore/java-play-framework-no-nullable/public/openapi.json +++ b/samples/server/petstore/java-play-framework-no-nullable/public/openapi.json @@ -783,12 +783,12 @@ "Order" : { "description" : "An order for a pets from the pet store", "example" : { + "id" : 0, "petId" : 6, "quantity" : 1, - "id" : 0, "shipDate" : "2000-01-23T04:56:07.000+00:00", - "complete" : false, - "status" : "placed" + "status" : "placed", + "complete" : false }, "properties" : { "id" : { @@ -826,8 +826,8 @@ "Category" : { "description" : "A category for a pet", "example" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, "properties" : { "id" : { @@ -847,14 +847,14 @@ "User" : { "description" : "A User who is purchasing from the pet store", "example" : { + "id" : 0, + "username" : "username", "firstName" : "firstName", "lastName" : "lastName", + "email" : "email", "password" : "password", - "userStatus" : 6, "phone" : "phone", - "id" : 0, - "email" : "email", - "username" : "username" + "userStatus" : 6 }, "properties" : { "id" : { @@ -894,8 +894,8 @@ "Tag" : { "description" : "A tag for a pet", "example" : { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, "properties" : { "id" : { @@ -915,19 +915,19 @@ "Pet" : { "description" : "A pet for sale in the pet store", "example" : { - "photoUrls" : [ "photoUrls", "photoUrls" ], - "name" : "doggie", "id" : 0, "category" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, + "name" : "doggie", + "photoUrls" : [ "photoUrls", "photoUrls" ], "tags" : [ { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" } ], "status" : "available" }, diff --git a/samples/server/petstore/java-play-framework-no-wrap-calls/public/openapi.json b/samples/server/petstore/java-play-framework-no-wrap-calls/public/openapi.json index 3dc93a787265..c1ca9eb6d8e9 100644 --- a/samples/server/petstore/java-play-framework-no-wrap-calls/public/openapi.json +++ b/samples/server/petstore/java-play-framework-no-wrap-calls/public/openapi.json @@ -783,12 +783,12 @@ "Order" : { "description" : "An order for a pets from the pet store", "example" : { + "id" : 0, "petId" : 6, "quantity" : 1, - "id" : 0, "shipDate" : "2000-01-23T04:56:07.000+00:00", - "complete" : false, - "status" : "placed" + "status" : "placed", + "complete" : false }, "properties" : { "id" : { @@ -826,8 +826,8 @@ "Category" : { "description" : "A category for a pet", "example" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, "properties" : { "id" : { @@ -847,14 +847,14 @@ "User" : { "description" : "A User who is purchasing from the pet store", "example" : { + "id" : 0, + "username" : "username", "firstName" : "firstName", "lastName" : "lastName", + "email" : "email", "password" : "password", - "userStatus" : 6, "phone" : "phone", - "id" : 0, - "email" : "email", - "username" : "username" + "userStatus" : 6 }, "properties" : { "id" : { @@ -894,8 +894,8 @@ "Tag" : { "description" : "A tag for a pet", "example" : { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, "properties" : { "id" : { @@ -915,19 +915,19 @@ "Pet" : { "description" : "A pet for sale in the pet store", "example" : { - "photoUrls" : [ "photoUrls", "photoUrls" ], - "name" : "doggie", "id" : 0, "category" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, + "name" : "doggie", + "photoUrls" : [ "photoUrls", "photoUrls" ], "tags" : [ { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" } ], "status" : "available" }, diff --git a/samples/server/petstore/java-play-framework/public/openapi.json b/samples/server/petstore/java-play-framework/public/openapi.json index 3dc93a787265..c1ca9eb6d8e9 100644 --- a/samples/server/petstore/java-play-framework/public/openapi.json +++ b/samples/server/petstore/java-play-framework/public/openapi.json @@ -783,12 +783,12 @@ "Order" : { "description" : "An order for a pets from the pet store", "example" : { + "id" : 0, "petId" : 6, "quantity" : 1, - "id" : 0, "shipDate" : "2000-01-23T04:56:07.000+00:00", - "complete" : false, - "status" : "placed" + "status" : "placed", + "complete" : false }, "properties" : { "id" : { @@ -826,8 +826,8 @@ "Category" : { "description" : "A category for a pet", "example" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, "properties" : { "id" : { @@ -847,14 +847,14 @@ "User" : { "description" : "A User who is purchasing from the pet store", "example" : { + "id" : 0, + "username" : "username", "firstName" : "firstName", "lastName" : "lastName", + "email" : "email", "password" : "password", - "userStatus" : 6, "phone" : "phone", - "id" : 0, - "email" : "email", - "username" : "username" + "userStatus" : 6 }, "properties" : { "id" : { @@ -894,8 +894,8 @@ "Tag" : { "description" : "A tag for a pet", "example" : { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, "properties" : { "id" : { @@ -915,19 +915,19 @@ "Pet" : { "description" : "A pet for sale in the pet store", "example" : { - "photoUrls" : [ "photoUrls", "photoUrls" ], - "name" : "doggie", "id" : 0, "category" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, + "name" : "doggie", + "photoUrls" : [ "photoUrls", "photoUrls" ], "tags" : [ { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" } ], "status" : "available" }, diff --git a/samples/server/petstore/java-undertow/src/main/resources/config/openapi.json b/samples/server/petstore/java-undertow/src/main/resources/config/openapi.json index 43bb5387eef2..ea337d278077 100644 --- a/samples/server/petstore/java-undertow/src/main/resources/config/openapi.json +++ b/samples/server/petstore/java-undertow/src/main/resources/config/openapi.json @@ -841,12 +841,12 @@ "Order" : { "description" : "An order for a pets from the pet store", "example" : { + "id" : 0, "petId" : 6, "quantity" : 1, - "id" : 0, "shipDate" : "2000-01-23T04:56:07.000+00:00", - "complete" : false, - "status" : "placed" + "status" : "placed", + "complete" : false }, "properties" : { "id" : { @@ -884,8 +884,8 @@ "Category" : { "description" : "A category for a pet", "example" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, "properties" : { "id" : { @@ -906,14 +906,14 @@ "User" : { "description" : "A User who is purchasing from the pet store", "example" : { + "id" : 0, + "username" : "username", "firstName" : "firstName", "lastName" : "lastName", + "email" : "email", "password" : "password", - "userStatus" : 6, "phone" : "phone", - "id" : 0, - "email" : "email", - "username" : "username" + "userStatus" : 6 }, "properties" : { "id" : { @@ -953,8 +953,8 @@ "Tag" : { "description" : "A tag for a pet", "example" : { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, "properties" : { "id" : { @@ -974,19 +974,19 @@ "Pet" : { "description" : "A pet for sale in the pet store", "example" : { - "photoUrls" : [ "photoUrls", "photoUrls" ], - "name" : "doggie", "id" : 0, "category" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, + "name" : "doggie", + "photoUrls" : [ "photoUrls", "photoUrls" ], "tags" : [ { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" } ], "status" : "available" }, diff --git a/samples/server/petstore/java-vertx-web/src/main/resources/openapi.yaml b/samples/server/petstore/java-vertx-web/src/main/resources/openapi.yaml index 264a06cd03f3..97e827e4e3c0 100644 --- a/samples/server/petstore/java-vertx-web/src/main/resources/openapi.yaml +++ b/samples/server/petstore/java-vertx-web/src/main/resources/openapi.yaml @@ -665,12 +665,12 @@ components: Order: description: An order for a pets from the pet store example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -701,8 +701,8 @@ components: Category: description: A category for a pet example: - name: name id: 6 + name: name properties: id: format: int64 @@ -717,14 +717,14 @@ components: User: description: A User who is purchasing from the pet store example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -752,8 +752,8 @@ components: Tag: description: A tag for a pet example: - name: name id: 1 + name: name properties: id: format: int64 @@ -767,19 +767,19 @@ components: Pet: description: A pet for sale in the pet store example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: diff --git a/samples/server/petstore/java-wiremock/src/main/java/org/openapitools/mockserver/api/FakeApiMockServer.java b/samples/server/petstore/java-wiremock/src/main/java/org/openapitools/mockserver/api/FakeApiMockServer.java index 4fd68f735613..ea3e50e32f75 100644 --- a/samples/server/petstore/java-wiremock/src/main/java/org/openapitools/mockserver/api/FakeApiMockServer.java +++ b/samples/server/petstore/java-wiremock/src/main/java/org/openapitools/mockserver/api/FakeApiMockServer.java @@ -111,7 +111,7 @@ public static MappingBuilder stubFakeHttpSignatureTestFault(@javax.annotation.No public static String fakeHttpSignatureTestRequestSample1() { - return "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + return "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }"; } public static String fakeHttpSignatureTestRequestSample2() { return " 123456789 123456789 aeiou doggie aeiou 123456789 aeiou aeiou "; @@ -177,11 +177,11 @@ public static MappingBuilder stubFakeOuterCompositeSerializeFault(@javax.annotat } public static String fakeOuterCompositeSerialize200ResponseSample1() { - return "{ \"my_string\" : \"my_string\", \"my_number\" : 0.8008281904610115, \"my_boolean\" : true }"; + return "{ \"my_number\" : 0.8008281904610115, \"my_string\" : \"my_string\", \"my_boolean\" : true }"; } public static String fakeOuterCompositeSerializeRequestSample1() { - return "{ \"my_string\" : \"my_string\", \"my_number\" : 0.8008281904610115, \"my_boolean\" : true }"; + return "{ \"my_number\" : 0.8008281904610115, \"my_string\" : \"my_string\", \"my_boolean\" : true }"; } @@ -394,7 +394,7 @@ public static MappingBuilder stubTestBodyWithQueryParamsFault(@javax.annotation. public static String testBodyWithQueryParamsRequestSample1() { - return "{ \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"password\" : \"password\", \"userStatus\" : 6, \"phone\" : \"phone\", \"id\" : 0, \"email\" : \"email\", \"username\" : \"username\" }"; + return "{ \"id\" : 0, \"username\" : \"username\", \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"email\" : \"email\", \"password\" : \"password\", \"phone\" : \"phone\", \"userStatus\" : 6 }"; } @@ -844,7 +844,7 @@ public static MappingBuilder stubTestNullableFault(@javax.annotation.Nonnull Str public static String testNullableRequestSample1() { - return "{ \"otherProperty\" : \"otherProperty\", \"nullableProperty\" : \"nullableProperty\", \"type\" : \"ChildWithNullable\" }"; + return "{ \"type\" : \"ChildWithNullable\", \"nullableProperty\" : \"nullableProperty\", \"otherProperty\" : \"otherProperty\" }"; } diff --git a/samples/server/petstore/java-wiremock/src/main/java/org/openapitools/mockserver/api/PetApiMockServer.java b/samples/server/petstore/java-wiremock/src/main/java/org/openapitools/mockserver/api/PetApiMockServer.java index 296e6c5e37c0..c8edc83ad002 100644 --- a/samples/server/petstore/java-wiremock/src/main/java/org/openapitools/mockserver/api/PetApiMockServer.java +++ b/samples/server/petstore/java-wiremock/src/main/java/org/openapitools/mockserver/api/PetApiMockServer.java @@ -52,7 +52,7 @@ public static MappingBuilder stubAddPetFault(@javax.annotation.Nonnull String bo public static String addPetRequestSample1() { - return "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + return "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }"; } public static String addPetRequestSample2() { return " 123456789 123456789 aeiou doggie aeiou 123456789 aeiou aeiou "; @@ -154,7 +154,7 @@ public static MappingBuilder stubFindPetsByStatusFault(@javax.annotation.Nonnull } public static String findPetsByStatus200ResponseSample1() { - return "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + return "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; } public static String findPetsByStatus200ResponseSample2() { return " 123456789 123456789 aeiou doggie aeiou 123456789 aeiou aeiou "; @@ -211,7 +211,7 @@ public static MappingBuilder stubFindPetsByTagsFault(@javax.annotation.Nonnull S } public static String findPetsByTags200ResponseSample1() { - return "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + return "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; } public static String findPetsByTags200ResponseSample2() { return " 123456789 123456789 aeiou doggie aeiou 123456789 aeiou aeiou "; @@ -282,7 +282,7 @@ public static MappingBuilder stubGetPetByIdFault(@javax.annotation.Nonnull Strin } public static String getPetById200ResponseSample1() { - return "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + return "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }"; } public static String getPetById200ResponseSample2() { return " 123456789 123456789 aeiou doggie aeiou 123456789 aeiou aeiou "; @@ -357,7 +357,7 @@ public static MappingBuilder stubUpdatePetFault(@javax.annotation.Nonnull String public static String updatePetRequestSample1() { - return "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + return "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }"; } public static String updatePetRequestSample2() { return " 123456789 123456789 aeiou doggie aeiou 123456789 aeiou aeiou "; diff --git a/samples/server/petstore/java-wiremock/src/main/java/org/openapitools/mockserver/api/StoreApiMockServer.java b/samples/server/petstore/java-wiremock/src/main/java/org/openapitools/mockserver/api/StoreApiMockServer.java index aaa75e0a58d4..1f896bfaeb01 100644 --- a/samples/server/petstore/java-wiremock/src/main/java/org/openapitools/mockserver/api/StoreApiMockServer.java +++ b/samples/server/petstore/java-wiremock/src/main/java/org/openapitools/mockserver/api/StoreApiMockServer.java @@ -135,7 +135,7 @@ public static MappingBuilder stubGetOrderByIdFault(@javax.annotation.Nonnull Str } public static String getOrderById200ResponseSample1() { - return "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + return "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; } public static String getOrderById200ResponseSample2() { return " 123456789 123456789 123 2000-01-23T04:56:07.000Z aeiou true "; @@ -187,14 +187,14 @@ public static MappingBuilder stubPlaceOrderFault(@javax.annotation.Nonnull Strin } public static String placeOrder200ResponseSample1() { - return "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + return "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; } public static String placeOrder200ResponseSample2() { return " 123456789 123456789 123 2000-01-23T04:56:07.000Z aeiou true "; } public static String placeOrderRequestSample1() { - return "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + return "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; } diff --git a/samples/server/petstore/java-wiremock/src/main/java/org/openapitools/mockserver/api/UserApiMockServer.java b/samples/server/petstore/java-wiremock/src/main/java/org/openapitools/mockserver/api/UserApiMockServer.java index 28f813a86c01..334105e83385 100644 --- a/samples/server/petstore/java-wiremock/src/main/java/org/openapitools/mockserver/api/UserApiMockServer.java +++ b/samples/server/petstore/java-wiremock/src/main/java/org/openapitools/mockserver/api/UserApiMockServer.java @@ -35,7 +35,7 @@ public static MappingBuilder stubCreateUserFault(@javax.annotation.Nonnull Strin public static String createUserRequestSample1() { - return "{ \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"password\" : \"password\", \"userStatus\" : 6, \"phone\" : \"phone\", \"id\" : 0, \"email\" : \"email\", \"username\" : \"username\" }"; + return "{ \"id\" : 0, \"username\" : \"username\", \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"email\" : \"email\", \"password\" : \"password\", \"phone\" : \"phone\", \"userStatus\" : 6 }"; } @@ -63,7 +63,7 @@ public static MappingBuilder stubCreateUsersWithArrayInputFault(@javax.annotatio public static String createUsersWithArrayInputRequestSample1() { - return "{ \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"password\" : \"password\", \"userStatus\" : 6, \"phone\" : \"phone\", \"id\" : 0, \"email\" : \"email\", \"username\" : \"username\" }"; + return "{ \"id\" : 0, \"username\" : \"username\", \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"email\" : \"email\", \"password\" : \"password\", \"phone\" : \"phone\", \"userStatus\" : 6 }"; } @@ -91,7 +91,7 @@ public static MappingBuilder stubCreateUsersWithListInputFault(@javax.annotation public static String createUsersWithListInputRequestSample1() { - return "{ \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"password\" : \"password\", \"userStatus\" : 6, \"phone\" : \"phone\", \"id\" : 0, \"email\" : \"email\", \"username\" : \"username\" }"; + return "{ \"id\" : 0, \"username\" : \"username\", \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"email\" : \"email\", \"password\" : \"password\", \"phone\" : \"phone\", \"userStatus\" : 6 }"; } @@ -190,7 +190,7 @@ public static MappingBuilder stubGetUserByNameFault(@javax.annotation.Nonnull St } public static String getUserByName200ResponseSample1() { - return "{ \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"password\" : \"password\", \"userStatus\" : 6, \"phone\" : \"phone\", \"id\" : 0, \"email\" : \"email\", \"username\" : \"username\" }"; + return "{ \"id\" : 0, \"username\" : \"username\", \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"email\" : \"email\", \"password\" : \"password\", \"phone\" : \"phone\", \"userStatus\" : 6 }"; } public static String getUserByName200ResponseSample2() { return " 123456789 aeiou aeiou aeiou aeiou aeiou aeiou 123 "; @@ -310,7 +310,7 @@ public static MappingBuilder stubUpdateUserFault(@javax.annotation.Nonnull Strin public static String updateUserRequestSample1() { - return "{ \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"password\" : \"password\", \"userStatus\" : 6, \"phone\" : \"phone\", \"id\" : 0, \"email\" : \"email\", \"username\" : \"username\" }"; + return "{ \"id\" : 0, \"username\" : \"username\", \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"email\" : \"email\", \"password\" : \"password\", \"phone\" : \"phone\", \"userStatus\" : 6 }"; } diff --git a/samples/server/petstore/jaxrs-spec-interface-response/src/main/openapi/openapi.yaml b/samples/server/petstore/jaxrs-spec-interface-response/src/main/openapi/openapi.yaml index 31074771d9fb..aa6fc7e42167 100644 --- a/samples/server/petstore/jaxrs-spec-interface-response/src/main/openapi/openapi.yaml +++ b/samples/server/petstore/jaxrs-spec-interface-response/src/main/openapi/openapi.yaml @@ -705,12 +705,12 @@ components: Order: description: An order for a pets from the pet store example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -741,8 +741,8 @@ components: Category: description: A category for a pet example: - name: name id: 6 + name: name properties: id: format: int64 @@ -757,14 +757,14 @@ components: User: description: A User who is purchasing from the pet store example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -792,8 +792,8 @@ components: Tag: description: A tag for a pet example: - name: name id: 1 + name: name properties: id: format: int64 @@ -807,19 +807,19 @@ components: Pet: description: A pet for sale in the pet store example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: 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 31074771d9fb..aa6fc7e42167 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 @@ -705,12 +705,12 @@ components: Order: description: An order for a pets from the pet store example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -741,8 +741,8 @@ components: Category: description: A category for a pet example: - name: name id: 6 + name: name properties: id: format: int64 @@ -757,14 +757,14 @@ components: User: description: A User who is purchasing from the pet store example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -792,8 +792,8 @@ components: Tag: description: A tag for a pet example: - name: name id: 1 + name: name properties: id: format: int64 @@ -807,19 +807,19 @@ components: Pet: description: A pet for sale in the pet store example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: diff --git a/samples/server/petstore/jaxrs-spec-jakarta/src/main/openapi/openapi.yaml b/samples/server/petstore/jaxrs-spec-jakarta/src/main/openapi/openapi.yaml index 0fe317558754..010a45afd646 100644 --- a/samples/server/petstore/jaxrs-spec-jakarta/src/main/openapi/openapi.yaml +++ b/samples/server/petstore/jaxrs-spec-jakarta/src/main/openapi/openapi.yaml @@ -1270,12 +1270,12 @@ components: schemas: Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1304,8 +1304,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1320,14 +1320,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1354,8 +1354,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1367,19 +1367,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1885,8 +1885,8 @@ components: type: string OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: diff --git a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/main/resources/META-INF/openapi.yaml b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/main/resources/META-INF/openapi.yaml index 31074771d9fb..aa6fc7e42167 100644 --- a/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/main/resources/META-INF/openapi.yaml +++ b/samples/server/petstore/jaxrs-spec-microprofile-openapi-annotations/src/main/resources/META-INF/openapi.yaml @@ -705,12 +705,12 @@ components: Order: description: An order for a pets from the pet store example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -741,8 +741,8 @@ components: Category: description: A category for a pet example: - name: name id: 6 + name: name properties: id: format: int64 @@ -757,14 +757,14 @@ components: User: description: A User who is purchasing from the pet store example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -792,8 +792,8 @@ components: Tag: description: A tag for a pet example: - name: name id: 1 + name: name properties: id: format: int64 @@ -807,19 +807,19 @@ components: Pet: description: A pet for sale in the pet store example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: diff --git a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/main/resources/META-INF/openapi.yaml b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/main/resources/META-INF/openapi.yaml index 81900f211c15..2b77b719546a 100644 --- a/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/main/resources/META-INF/openapi.yaml +++ b/samples/server/petstore/jaxrs-spec-quarkus-mutiny/src/main/resources/META-INF/openapi.yaml @@ -1526,12 +1526,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1560,8 +1560,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1576,14 +1576,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1610,8 +1610,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1623,19 +1623,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -2072,8 +2072,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2111,9 +2111,9 @@ components: type: string type: object example: - otherProperty: otherProperty - nullableProperty: nullableProperty type: ChildWithNullable + nullableProperty: nullableProperty + otherProperty: otherProperty StringBooleanMap: additionalProperties: type: boolean diff --git a/samples/server/petstore/jaxrs-spec-required-and-readonly-property/src/main/openapi/openapi.yaml b/samples/server/petstore/jaxrs-spec-required-and-readonly-property/src/main/openapi/openapi.yaml index 110c1a5218b6..714f228e82ee 100644 --- a/samples/server/petstore/jaxrs-spec-required-and-readonly-property/src/main/openapi/openapi.yaml +++ b/samples/server/petstore/jaxrs-spec-required-and-readonly-property/src/main/openapi/openapi.yaml @@ -22,8 +22,8 @@ components: ReadonlyAndRequiredProperties: example: requiredYesReadonlyYes: requiredYesReadonlyYes - requiredNoReadonlyYes: requiredNoReadonlyYes requiredYesReadonlyNo: requiredYesReadonlyNo + requiredNoReadonlyYes: requiredNoReadonlyYes requiredNoReadonlyNo: requiredNoReadonlyNo properties: requiredYesReadonlyYes: diff --git a/samples/server/petstore/jaxrs-spec-swagger-annotations/src/main/openapi/openapi.yaml b/samples/server/petstore/jaxrs-spec-swagger-annotations/src/main/openapi/openapi.yaml index e8ba4f7ffd4e..87b1f252beda 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-annotations/src/main/openapi/openapi.yaml +++ b/samples/server/petstore/jaxrs-spec-swagger-annotations/src/main/openapi/openapi.yaml @@ -1543,12 +1543,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1577,8 +1577,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1593,14 +1593,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1627,8 +1627,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1640,19 +1640,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -2088,8 +2088,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2127,9 +2127,9 @@ components: type: string type: object example: - otherProperty: otherProperty - nullableProperty: nullableProperty type: ChildWithNullable + nullableProperty: nullableProperty + otherProperty: otherProperty StringBooleanMap: additionalProperties: type: boolean diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/main/openapi/openapi.yaml b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/main/openapi/openapi.yaml index e8ba4f7ffd4e..87b1f252beda 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/main/openapi/openapi.yaml +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations-jakarta/src/main/openapi/openapi.yaml @@ -1543,12 +1543,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1577,8 +1577,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1593,14 +1593,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1627,8 +1627,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1640,19 +1640,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -2088,8 +2088,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2127,9 +2127,9 @@ components: type: string type: object example: - otherProperty: otherProperty - nullableProperty: nullableProperty type: ChildWithNullable + nullableProperty: nullableProperty + otherProperty: otherProperty StringBooleanMap: additionalProperties: type: boolean diff --git a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/main/openapi/openapi.yaml b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/main/openapi/openapi.yaml index e8ba4f7ffd4e..87b1f252beda 100644 --- a/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/main/openapi/openapi.yaml +++ b/samples/server/petstore/jaxrs-spec-swagger-v3-annotations/src/main/openapi/openapi.yaml @@ -1543,12 +1543,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1577,8 +1577,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1593,14 +1593,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1627,8 +1627,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1640,19 +1640,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -2088,8 +2088,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2127,9 +2127,9 @@ components: type: string type: object example: - otherProperty: otherProperty - nullableProperty: nullableProperty type: ChildWithNullable + nullableProperty: nullableProperty + otherProperty: otherProperty StringBooleanMap: additionalProperties: type: boolean diff --git a/samples/server/petstore/jaxrs-spec-withxml/src/main/openapi/openapi.yaml b/samples/server/petstore/jaxrs-spec-withxml/src/main/openapi/openapi.yaml index e8ba4f7ffd4e..87b1f252beda 100644 --- a/samples/server/petstore/jaxrs-spec-withxml/src/main/openapi/openapi.yaml +++ b/samples/server/petstore/jaxrs-spec-withxml/src/main/openapi/openapi.yaml @@ -1543,12 +1543,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1577,8 +1577,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1593,14 +1593,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1627,8 +1627,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1640,19 +1640,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -2088,8 +2088,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2127,9 +2127,9 @@ components: type: string type: object example: - otherProperty: otherProperty - nullableProperty: nullableProperty type: ChildWithNullable + nullableProperty: nullableProperty + otherProperty: otherProperty StringBooleanMap: additionalProperties: type: boolean 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 e8ba4f7ffd4e..87b1f252beda 100644 --- a/samples/server/petstore/jaxrs-spec/src/main/openapi/openapi.yaml +++ b/samples/server/petstore/jaxrs-spec/src/main/openapi/openapi.yaml @@ -1543,12 +1543,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1577,8 +1577,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1593,14 +1593,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1627,8 +1627,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1640,19 +1640,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -2088,8 +2088,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2127,9 +2127,9 @@ components: type: string type: object example: - otherProperty: otherProperty - nullableProperty: nullableProperty type: ChildWithNullable + nullableProperty: nullableProperty + otherProperty: otherProperty StringBooleanMap: additionalProperties: type: boolean diff --git a/samples/server/petstore/kotlin-server-modelMutable/src/main/kotlin/org/openapitools/server/apis/PetApi.kt b/samples/server/petstore/kotlin-server-modelMutable/src/main/kotlin/org/openapitools/server/apis/PetApi.kt index 45747e56482a..a9c36131ab17 100644 --- a/samples/server/petstore/kotlin-server-modelMutable/src/main/kotlin/org/openapitools/server/apis/PetApi.kt +++ b/samples/server/petstore/kotlin-server-modelMutable/src/main/kotlin/org/openapitools/server/apis/PetApi.kt @@ -59,35 +59,35 @@ fun Route.PetApi() { val exampleContentType = "application/json" val exampleContentString = """[ { - "photoUrls" : [ "photoUrls", "photoUrls" ], - "name" : "doggie", "id" : 0, "category" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, + "name" : "doggie", + "photoUrls" : [ "photoUrls", "photoUrls" ], "tags" : [ { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" } ], "status" : "available" }, { - "photoUrls" : [ "photoUrls", "photoUrls" ], - "name" : "doggie", "id" : 0, "category" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, + "name" : "doggie", + "photoUrls" : [ "photoUrls", "photoUrls" ], "tags" : [ { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" } ], "status" : "available" } ]""" @@ -109,35 +109,35 @@ fun Route.PetApi() { val exampleContentType = "application/json" val exampleContentString = """[ { - "photoUrls" : [ "photoUrls", "photoUrls" ], - "name" : "doggie", "id" : 0, "category" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, + "name" : "doggie", + "photoUrls" : [ "photoUrls", "photoUrls" ], "tags" : [ { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" } ], "status" : "available" }, { - "photoUrls" : [ "photoUrls", "photoUrls" ], - "name" : "doggie", "id" : 0, "category" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, + "name" : "doggie", + "photoUrls" : [ "photoUrls", "photoUrls" ], "tags" : [ { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" } ], "status" : "available" } ]""" @@ -159,19 +159,19 @@ fun Route.PetApi() { val exampleContentType = "application/json" val exampleContentString = """{ - "photoUrls" : [ "photoUrls", "photoUrls" ], - "name" : "doggie", "id" : 0, "category" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, + "name" : "doggie", + "photoUrls" : [ "photoUrls", "photoUrls" ], "tags" : [ { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" } ], "status" : "available" }""" diff --git a/samples/server/petstore/kotlin-server-modelMutable/src/main/kotlin/org/openapitools/server/apis/StoreApi.kt b/samples/server/petstore/kotlin-server-modelMutable/src/main/kotlin/org/openapitools/server/apis/StoreApi.kt index 7a2b5a45b2fa..c289d78f6d51 100644 --- a/samples/server/petstore/kotlin-server-modelMutable/src/main/kotlin/org/openapitools/server/apis/StoreApi.kt +++ b/samples/server/petstore/kotlin-server-modelMutable/src/main/kotlin/org/openapitools/server/apis/StoreApi.kt @@ -47,12 +47,12 @@ fun Route.StoreApi() { get { val exampleContentType = "application/json" val exampleContentString = """{ + "id" : 0, "petId" : 6, "quantity" : 1, - "id" : 0, "shipDate" : "2000-01-23T04:56:07.000+00:00", - "complete" : false, - "status" : "placed" + "status" : "placed", + "complete" : false }""" when (exampleContentType) { @@ -66,12 +66,12 @@ fun Route.StoreApi() { post { val exampleContentType = "application/json" val exampleContentString = """{ + "id" : 0, "petId" : 6, "quantity" : 1, - "id" : 0, "shipDate" : "2000-01-23T04:56:07.000+00:00", - "complete" : false, - "status" : "placed" + "status" : "placed", + "complete" : false }""" when (exampleContentType) { diff --git a/samples/server/petstore/kotlin-server-modelMutable/src/main/kotlin/org/openapitools/server/apis/UserApi.kt b/samples/server/petstore/kotlin-server-modelMutable/src/main/kotlin/org/openapitools/server/apis/UserApi.kt index 646343e21a7b..9d1d8a3257ce 100644 --- a/samples/server/petstore/kotlin-server-modelMutable/src/main/kotlin/org/openapitools/server/apis/UserApi.kt +++ b/samples/server/petstore/kotlin-server-modelMutable/src/main/kotlin/org/openapitools/server/apis/UserApi.kt @@ -51,14 +51,14 @@ fun Route.UserApi() { get { val exampleContentType = "application/json" val exampleContentString = """{ + "id" : 0, + "username" : "username", "firstName" : "firstName", "lastName" : "lastName", + "email" : "email", "password" : "password", - "userStatus" : 6, "phone" : "phone", - "id" : 0, - "email" : "email", - "username" : "username" + "userStatus" : 6 }""" when (exampleContentType) { diff --git a/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/apis/PetApi.kt b/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/apis/PetApi.kt index 45747e56482a..a9c36131ab17 100644 --- a/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/apis/PetApi.kt +++ b/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/apis/PetApi.kt @@ -59,35 +59,35 @@ fun Route.PetApi() { val exampleContentType = "application/json" val exampleContentString = """[ { - "photoUrls" : [ "photoUrls", "photoUrls" ], - "name" : "doggie", "id" : 0, "category" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, + "name" : "doggie", + "photoUrls" : [ "photoUrls", "photoUrls" ], "tags" : [ { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" } ], "status" : "available" }, { - "photoUrls" : [ "photoUrls", "photoUrls" ], - "name" : "doggie", "id" : 0, "category" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, + "name" : "doggie", + "photoUrls" : [ "photoUrls", "photoUrls" ], "tags" : [ { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" } ], "status" : "available" } ]""" @@ -109,35 +109,35 @@ fun Route.PetApi() { val exampleContentType = "application/json" val exampleContentString = """[ { - "photoUrls" : [ "photoUrls", "photoUrls" ], - "name" : "doggie", "id" : 0, "category" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, + "name" : "doggie", + "photoUrls" : [ "photoUrls", "photoUrls" ], "tags" : [ { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" } ], "status" : "available" }, { - "photoUrls" : [ "photoUrls", "photoUrls" ], - "name" : "doggie", "id" : 0, "category" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, + "name" : "doggie", + "photoUrls" : [ "photoUrls", "photoUrls" ], "tags" : [ { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" } ], "status" : "available" } ]""" @@ -159,19 +159,19 @@ fun Route.PetApi() { val exampleContentType = "application/json" val exampleContentString = """{ - "photoUrls" : [ "photoUrls", "photoUrls" ], - "name" : "doggie", "id" : 0, "category" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, + "name" : "doggie", + "photoUrls" : [ "photoUrls", "photoUrls" ], "tags" : [ { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" } ], "status" : "available" }""" diff --git a/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/apis/StoreApi.kt b/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/apis/StoreApi.kt index 7a2b5a45b2fa..c289d78f6d51 100644 --- a/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/apis/StoreApi.kt +++ b/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/apis/StoreApi.kt @@ -47,12 +47,12 @@ fun Route.StoreApi() { get { val exampleContentType = "application/json" val exampleContentString = """{ + "id" : 0, "petId" : 6, "quantity" : 1, - "id" : 0, "shipDate" : "2000-01-23T04:56:07.000+00:00", - "complete" : false, - "status" : "placed" + "status" : "placed", + "complete" : false }""" when (exampleContentType) { @@ -66,12 +66,12 @@ fun Route.StoreApi() { post { val exampleContentType = "application/json" val exampleContentString = """{ + "id" : 0, "petId" : 6, "quantity" : 1, - "id" : 0, "shipDate" : "2000-01-23T04:56:07.000+00:00", - "complete" : false, - "status" : "placed" + "status" : "placed", + "complete" : false }""" when (exampleContentType) { diff --git a/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/apis/UserApi.kt b/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/apis/UserApi.kt index 646343e21a7b..9d1d8a3257ce 100644 --- a/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/apis/UserApi.kt +++ b/samples/server/petstore/kotlin-server/ktor/src/main/kotlin/org/openapitools/server/apis/UserApi.kt @@ -51,14 +51,14 @@ fun Route.UserApi() { get { val exampleContentType = "application/json" val exampleContentString = """{ + "id" : 0, + "username" : "username", "firstName" : "firstName", "lastName" : "lastName", + "email" : "email", "password" : "password", - "userStatus" : 6, "phone" : "phone", - "id" : 0, - "email" : "email", - "username" : "username" + "userStatus" : 6 }""" when (exampleContentType) { diff --git a/samples/server/petstore/kotlin-server/ktor2-usetags-false/src/main/kotlin/org/openapitools/server/apis/PetApi.kt b/samples/server/petstore/kotlin-server/ktor2-usetags-false/src/main/kotlin/org/openapitools/server/apis/PetApi.kt index deac07497e74..6f357ec18ae9 100644 --- a/samples/server/petstore/kotlin-server/ktor2-usetags-false/src/main/kotlin/org/openapitools/server/apis/PetApi.kt +++ b/samples/server/petstore/kotlin-server/ktor2-usetags-false/src/main/kotlin/org/openapitools/server/apis/PetApi.kt @@ -61,35 +61,35 @@ fun Route.PetApi() { val exampleContentType = "application/json" val exampleContentString = """[ { - "photoUrls" : [ "photoUrls", "photoUrls" ], - "name" : "doggie", "id" : 0, "category" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, + "name" : "doggie", + "photoUrls" : [ "photoUrls", "photoUrls" ], "tags" : [ { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" } ], "status" : "available" }, { - "photoUrls" : [ "photoUrls", "photoUrls" ], - "name" : "doggie", "id" : 0, "category" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, + "name" : "doggie", + "photoUrls" : [ "photoUrls", "photoUrls" ], "tags" : [ { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" } ], "status" : "available" } ]""" @@ -111,35 +111,35 @@ fun Route.PetApi() { val exampleContentType = "application/json" val exampleContentString = """[ { - "photoUrls" : [ "photoUrls", "photoUrls" ], - "name" : "doggie", "id" : 0, "category" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, + "name" : "doggie", + "photoUrls" : [ "photoUrls", "photoUrls" ], "tags" : [ { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" } ], "status" : "available" }, { - "photoUrls" : [ "photoUrls", "photoUrls" ], - "name" : "doggie", "id" : 0, "category" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, + "name" : "doggie", + "photoUrls" : [ "photoUrls", "photoUrls" ], "tags" : [ { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" } ], "status" : "available" } ]""" @@ -172,19 +172,19 @@ fun Route.PetApi() { val exampleContentType = "application/json" val exampleContentString = """{ - "photoUrls" : [ "photoUrls", "photoUrls" ], - "name" : "doggie", "id" : 0, "category" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, + "name" : "doggie", + "photoUrls" : [ "photoUrls", "photoUrls" ], "tags" : [ { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" } ], "status" : "available" }""" diff --git a/samples/server/petstore/kotlin-server/ktor2-usetags-false/src/main/kotlin/org/openapitools/server/apis/StoreApi.kt b/samples/server/petstore/kotlin-server/ktor2-usetags-false/src/main/kotlin/org/openapitools/server/apis/StoreApi.kt index b85f5bc3a5fd..02e0b8daa27f 100644 --- a/samples/server/petstore/kotlin-server/ktor2-usetags-false/src/main/kotlin/org/openapitools/server/apis/StoreApi.kt +++ b/samples/server/petstore/kotlin-server/ktor2-usetags-false/src/main/kotlin/org/openapitools/server/apis/StoreApi.kt @@ -49,12 +49,12 @@ fun Route.StoreApi() { get { val exampleContentType = "application/json" val exampleContentString = """{ + "id" : 0, "petId" : 6, "quantity" : 1, - "id" : 0, "shipDate" : "2000-01-23T04:56:07.000+00:00", - "complete" : false, - "status" : "placed" + "status" : "placed", + "complete" : false }""" when (exampleContentType) { @@ -68,12 +68,12 @@ fun Route.StoreApi() { post { val exampleContentType = "application/json" val exampleContentString = """{ + "id" : 0, "petId" : 6, "quantity" : 1, - "id" : 0, "shipDate" : "2000-01-23T04:56:07.000+00:00", - "complete" : false, - "status" : "placed" + "status" : "placed", + "complete" : false }""" when (exampleContentType) { diff --git a/samples/server/petstore/kotlin-server/ktor2-usetags-false/src/main/kotlin/org/openapitools/server/apis/UserApi.kt b/samples/server/petstore/kotlin-server/ktor2-usetags-false/src/main/kotlin/org/openapitools/server/apis/UserApi.kt index 1f295edcbc31..db4f27d0eeda 100644 --- a/samples/server/petstore/kotlin-server/ktor2-usetags-false/src/main/kotlin/org/openapitools/server/apis/UserApi.kt +++ b/samples/server/petstore/kotlin-server/ktor2-usetags-false/src/main/kotlin/org/openapitools/server/apis/UserApi.kt @@ -53,14 +53,14 @@ fun Route.UserApi() { get { val exampleContentType = "application/json" val exampleContentString = """{ + "id" : 0, + "username" : "username", "firstName" : "firstName", "lastName" : "lastName", + "email" : "email", "password" : "password", - "userStatus" : 6, "phone" : "phone", - "id" : 0, - "email" : "email", - "username" : "username" + "userStatus" : 6 }""" when (exampleContentType) { diff --git a/samples/server/petstore/kotlin-server/ktor2/src/main/kotlin/org/openapitools/server/apis/PetApi.kt b/samples/server/petstore/kotlin-server/ktor2/src/main/kotlin/org/openapitools/server/apis/PetApi.kt index c3ae8e62f836..a16ffae5996a 100644 --- a/samples/server/petstore/kotlin-server/ktor2/src/main/kotlin/org/openapitools/server/apis/PetApi.kt +++ b/samples/server/petstore/kotlin-server/ktor2/src/main/kotlin/org/openapitools/server/apis/PetApi.kt @@ -39,19 +39,19 @@ fun Route.PetApi() { val exampleContentType = "application/json" val exampleContentString = """{ - "photoUrls" : [ "photoUrls", "photoUrls" ], - "name" : "doggie", "id" : 0, "category" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, + "name" : "doggie", + "photoUrls" : [ "photoUrls", "photoUrls" ], "tags" : [ { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" } ], "status" : "available" }""" @@ -84,35 +84,35 @@ fun Route.PetApi() { val exampleContentType = "application/json" val exampleContentString = """[ { - "photoUrls" : [ "photoUrls", "photoUrls" ], - "name" : "doggie", "id" : 0, "category" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, + "name" : "doggie", + "photoUrls" : [ "photoUrls", "photoUrls" ], "tags" : [ { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" } ], "status" : "available" }, { - "photoUrls" : [ "photoUrls", "photoUrls" ], - "name" : "doggie", "id" : 0, "category" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, + "name" : "doggie", + "photoUrls" : [ "photoUrls", "photoUrls" ], "tags" : [ { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" } ], "status" : "available" } ]""" @@ -134,35 +134,35 @@ fun Route.PetApi() { val exampleContentType = "application/json" val exampleContentString = """[ { - "photoUrls" : [ "photoUrls", "photoUrls" ], - "name" : "doggie", "id" : 0, "category" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, + "name" : "doggie", + "photoUrls" : [ "photoUrls", "photoUrls" ], "tags" : [ { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" } ], "status" : "available" }, { - "photoUrls" : [ "photoUrls", "photoUrls" ], - "name" : "doggie", "id" : 0, "category" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, + "name" : "doggie", + "photoUrls" : [ "photoUrls", "photoUrls" ], "tags" : [ { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" } ], "status" : "available" } ]""" @@ -184,19 +184,19 @@ fun Route.PetApi() { val exampleContentType = "application/json" val exampleContentString = """{ - "photoUrls" : [ "photoUrls", "photoUrls" ], - "name" : "doggie", "id" : 0, "category" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, + "name" : "doggie", + "photoUrls" : [ "photoUrls", "photoUrls" ], "tags" : [ { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" } ], "status" : "available" }""" @@ -218,19 +218,19 @@ fun Route.PetApi() { val exampleContentType = "application/json" val exampleContentString = """{ - "photoUrls" : [ "photoUrls", "photoUrls" ], - "name" : "doggie", "id" : 0, "category" : { - "name" : "name", - "id" : 6 + "id" : 6, + "name" : "name" }, + "name" : "doggie", + "photoUrls" : [ "photoUrls", "photoUrls" ], "tags" : [ { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" }, { - "name" : "name", - "id" : 1 + "id" : 1, + "name" : "name" } ], "status" : "available" }""" diff --git a/samples/server/petstore/kotlin-server/ktor2/src/main/kotlin/org/openapitools/server/apis/StoreApi.kt b/samples/server/petstore/kotlin-server/ktor2/src/main/kotlin/org/openapitools/server/apis/StoreApi.kt index b85f5bc3a5fd..02e0b8daa27f 100644 --- a/samples/server/petstore/kotlin-server/ktor2/src/main/kotlin/org/openapitools/server/apis/StoreApi.kt +++ b/samples/server/petstore/kotlin-server/ktor2/src/main/kotlin/org/openapitools/server/apis/StoreApi.kt @@ -49,12 +49,12 @@ fun Route.StoreApi() { get { val exampleContentType = "application/json" val exampleContentString = """{ + "id" : 0, "petId" : 6, "quantity" : 1, - "id" : 0, "shipDate" : "2000-01-23T04:56:07.000+00:00", - "complete" : false, - "status" : "placed" + "status" : "placed", + "complete" : false }""" when (exampleContentType) { @@ -68,12 +68,12 @@ fun Route.StoreApi() { post { val exampleContentType = "application/json" val exampleContentString = """{ + "id" : 0, "petId" : 6, "quantity" : 1, - "id" : 0, "shipDate" : "2000-01-23T04:56:07.000+00:00", - "complete" : false, - "status" : "placed" + "status" : "placed", + "complete" : false }""" when (exampleContentType) { diff --git a/samples/server/petstore/kotlin-server/ktor2/src/main/kotlin/org/openapitools/server/apis/UserApi.kt b/samples/server/petstore/kotlin-server/ktor2/src/main/kotlin/org/openapitools/server/apis/UserApi.kt index 4dd034786ca9..19a271ae530b 100644 --- a/samples/server/petstore/kotlin-server/ktor2/src/main/kotlin/org/openapitools/server/apis/UserApi.kt +++ b/samples/server/petstore/kotlin-server/ktor2/src/main/kotlin/org/openapitools/server/apis/UserApi.kt @@ -77,14 +77,14 @@ fun Route.UserApi() { get { val exampleContentType = "application/json" val exampleContentString = """{ + "id" : 0, + "username" : "username", "firstName" : "firstName", "lastName" : "lastName", + "email" : "email", "password" : "password", - "userStatus" : 6, "phone" : "phone", - "id" : 0, - "email" : "email", - "username" : "username" + "userStatus" : 6 }""" when (exampleContentType) { diff --git a/samples/server/petstore/kotlin-spring-default/src/main/resources/openapi.yaml b/samples/server/petstore/kotlin-spring-default/src/main/resources/openapi.yaml index 1f2e34812c4b..522cfa16779d 100644 --- a/samples/server/petstore/kotlin-spring-default/src/main/resources/openapi.yaml +++ b/samples/server/petstore/kotlin-spring-default/src/main/resources/openapi.yaml @@ -650,12 +650,12 @@ components: Order: description: An order for a pets from the pet store example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -686,8 +686,8 @@ components: Category: description: A category for a pet example: - name: name id: 6 + name: name properties: id: format: int64 @@ -702,14 +702,14 @@ components: User: description: A User who is purchasing from the pet store example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -739,8 +739,8 @@ components: Tag: description: A tag for a pet example: - name: name id: 1 + name: name properties: id: format: int64 @@ -754,19 +754,19 @@ components: Pet: description: A pet for sale in the pet store example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: diff --git a/samples/server/petstore/kotlin-springboot-bigdecimal-default/src/main/resources/openapi.yaml b/samples/server/petstore/kotlin-springboot-bigdecimal-default/src/main/resources/openapi.yaml index 7ae4aa59b7bf..152f5dc426e5 100644 --- a/samples/server/petstore/kotlin-springboot-bigdecimal-default/src/main/resources/openapi.yaml +++ b/samples/server/petstore/kotlin-springboot-bigdecimal-default/src/main/resources/openapi.yaml @@ -20,10 +20,10 @@ components: schemas: Apa: example: - epa: 5.962133916683182 bepa: 0.8008281904610115 - depa: 1.4658129805029452 cepa: 6.027456183070403 + depa: 1.4658129805029452 + epa: 5.962133916683182 fepa: 5.637376656633329 gepa: 2.3021358869347655 properties: diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApiDelegate.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApiDelegate.kt index 7b43df537880..961378e9c47f 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApiDelegate.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/PetApiDelegate.kt @@ -26,7 +26,7 @@ interface PetApiDelegate { getRequest().ifPresent { request -> for (mediaType in MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - ApiUtil.setExampleResponse(request, "application/json", "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"}") + ApiUtil.setExampleResponse(request, "application/json", "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\"}") break } if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) { @@ -57,7 +57,7 @@ interface PetApiDelegate { getRequest().ifPresent { request -> for (mediaType in MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - ApiUtil.setExampleResponse(request, "application/json", "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"}, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"} ]") + ApiUtil.setExampleResponse(request, "application/json", "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\"}, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\"} ]") break } if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) { @@ -78,7 +78,7 @@ interface PetApiDelegate { getRequest().ifPresent { request -> for (mediaType in MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - ApiUtil.setExampleResponse(request, "application/json", "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"}, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"} ]") + ApiUtil.setExampleResponse(request, "application/json", "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\"}, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\"} ]") break } if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) { @@ -99,7 +99,7 @@ interface PetApiDelegate { getRequest().ifPresent { request -> for (mediaType in MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - ApiUtil.setExampleResponse(request, "application/json", "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"}") + ApiUtil.setExampleResponse(request, "application/json", "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\"}") break } if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) { @@ -120,7 +120,7 @@ interface PetApiDelegate { getRequest().ifPresent { request -> for (mediaType in MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - ApiUtil.setExampleResponse(request, "application/json", "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"}") + ApiUtil.setExampleResponse(request, "application/json", "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\"}") break } if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) { diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApiDelegate.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApiDelegate.kt index 5470648bd4ee..868120930b9c 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApiDelegate.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/StoreApiDelegate.kt @@ -43,7 +43,7 @@ interface StoreApiDelegate { getRequest().ifPresent { request -> for (mediaType in MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - ApiUtil.setExampleResponse(request, "application/json", "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\"}") + ApiUtil.setExampleResponse(request, "application/json", "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false}") break } if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) { @@ -64,7 +64,7 @@ interface StoreApiDelegate { getRequest().ifPresent { request -> for (mediaType in MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - ApiUtil.setExampleResponse(request, "application/json", "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\"}") + ApiUtil.setExampleResponse(request, "application/json", "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false}") break } if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) { diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApiDelegate.kt b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApiDelegate.kt index e8033bdf5836..c1b629fd7579 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApiDelegate.kt +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/kotlin/org/openapitools/api/UserApiDelegate.kt @@ -61,7 +61,7 @@ interface UserApiDelegate { getRequest().ifPresent { request -> for (mediaType in MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - ApiUtil.setExampleResponse(request, "application/json", "{ \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"password\" : \"password\", \"userStatus\" : 6, \"phone\" : \"phone\", \"id\" : 0, \"email\" : \"email\", \"username\" : \"username\"}") + ApiUtil.setExampleResponse(request, "application/json", "{ \"id\" : 0, \"username\" : \"username\", \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"email\" : \"email\", \"password\" : \"password\", \"phone\" : \"phone\", \"userStatus\" : 6}") break } if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) { diff --git a/samples/server/petstore/kotlin-springboot-delegate/src/main/resources/openapi.yaml b/samples/server/petstore/kotlin-springboot-delegate/src/main/resources/openapi.yaml index f687243b34d6..885b64671054 100644 --- a/samples/server/petstore/kotlin-springboot-delegate/src/main/resources/openapi.yaml +++ b/samples/server/petstore/kotlin-springboot-delegate/src/main/resources/openapi.yaml @@ -607,12 +607,12 @@ components: Order: description: An order for a pets from the pet store example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -643,8 +643,8 @@ components: Category: description: A category for a pet example: - name: name id: 6 + name: name properties: id: format: int64 @@ -659,14 +659,14 @@ components: User: description: A User who is purchasing from the pet store example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -694,8 +694,8 @@ components: Tag: description: A tag for a pet example: - name: name id: 1 + name: name properties: id: format: int64 @@ -709,19 +709,19 @@ components: Pet: description: A pet for sale in the pet store example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: diff --git a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/resources/openapi.yaml b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/resources/openapi.yaml index c199cb612e2f..10dc7fc1a3c7 100644 --- a/samples/server/petstore/kotlin-springboot-modelMutable/src/main/resources/openapi.yaml +++ b/samples/server/petstore/kotlin-springboot-modelMutable/src/main/resources/openapi.yaml @@ -566,12 +566,12 @@ components: Order: description: An order for a pets from the pet store example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -602,8 +602,8 @@ components: Category: description: A category for a pet example: - name: name id: 6 + name: name properties: id: format: int64 @@ -617,14 +617,14 @@ components: User: description: A User who is purchasing from the pet store example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -652,8 +652,8 @@ components: Tag: description: A tag for a pet example: - name: name id: 1 + name: name properties: id: format: int64 @@ -667,19 +667,19 @@ components: Pet: description: A pet for sale in the pet store example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/PetApiDelegate.kt b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/PetApiDelegate.kt index 8907dac1a7a7..34e7c96c8079 100644 --- a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/PetApiDelegate.kt +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/PetApiDelegate.kt @@ -43,7 +43,7 @@ interface PetApiDelegate { getRequest().ifPresent { request -> for (mediaType in MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - ApiUtil.setExampleResponse(request, "application/json", "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"}, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"} ]") + ApiUtil.setExampleResponse(request, "application/json", "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\"}, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\"} ]") break } if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) { @@ -64,7 +64,7 @@ interface PetApiDelegate { getRequest().ifPresent { request -> for (mediaType in MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - ApiUtil.setExampleResponse(request, "application/json", "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"}, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"} ]") + ApiUtil.setExampleResponse(request, "application/json", "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\"}, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\"} ]") break } if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) { @@ -85,7 +85,7 @@ interface PetApiDelegate { getRequest().ifPresent { request -> for (mediaType in MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - ApiUtil.setExampleResponse(request, "application/json", "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\"}") + ApiUtil.setExampleResponse(request, "application/json", "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\"}") break } if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) { diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/StoreApiDelegate.kt b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/StoreApiDelegate.kt index 7c9aea227800..149de0c4dc14 100644 --- a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/StoreApiDelegate.kt +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/StoreApiDelegate.kt @@ -41,7 +41,7 @@ interface StoreApiDelegate { getRequest().ifPresent { request -> for (mediaType in MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - ApiUtil.setExampleResponse(request, "application/json", "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\"}") + ApiUtil.setExampleResponse(request, "application/json", "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false}") break } if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) { @@ -62,7 +62,7 @@ interface StoreApiDelegate { getRequest().ifPresent { request -> for (mediaType in MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - ApiUtil.setExampleResponse(request, "application/json", "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\"}") + ApiUtil.setExampleResponse(request, "application/json", "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false}") break } if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) { diff --git a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/UserApiDelegate.kt b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/UserApiDelegate.kt index 70bfb0eae387..074d4615b4f2 100644 --- a/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/UserApiDelegate.kt +++ b/samples/server/petstore/kotlin-springboot-no-response-entity-delegate/src/main/kotlin/org/openapitools/api/UserApiDelegate.kt @@ -59,7 +59,7 @@ interface UserApiDelegate { getRequest().ifPresent { request -> for (mediaType in MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - ApiUtil.setExampleResponse(request, "application/json", "{ \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"password\" : \"password\", \"userStatus\" : 6, \"phone\" : \"phone\", \"id\" : 0, \"email\" : \"email\", \"username\" : \"username\"}") + ApiUtil.setExampleResponse(request, "application/json", "{ \"id\" : 0, \"username\" : \"username\", \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"email\" : \"email\", \"password\" : \"password\", \"phone\" : \"phone\", \"userStatus\" : 6}") break } if (mediaType.isCompatibleWith(MediaType.valueOf("application/xml"))) { diff --git a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/resources/openapi.yaml b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/resources/openapi.yaml index f687243b34d6..885b64671054 100644 --- a/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/resources/openapi.yaml +++ b/samples/server/petstore/kotlin-springboot-reactive-without-flow/src/main/resources/openapi.yaml @@ -607,12 +607,12 @@ components: Order: description: An order for a pets from the pet store example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -643,8 +643,8 @@ components: Category: description: A category for a pet example: - name: name id: 6 + name: name properties: id: format: int64 @@ -659,14 +659,14 @@ components: User: description: A User who is purchasing from the pet store example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -694,8 +694,8 @@ components: Tag: description: A tag for a pet example: - name: name id: 1 + name: name properties: id: format: int64 @@ -709,19 +709,19 @@ components: Pet: description: A pet for sale in the pet store example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: diff --git a/samples/server/petstore/kotlin-springboot-reactive/src/main/resources/openapi.yaml b/samples/server/petstore/kotlin-springboot-reactive/src/main/resources/openapi.yaml index f687243b34d6..885b64671054 100644 --- a/samples/server/petstore/kotlin-springboot-reactive/src/main/resources/openapi.yaml +++ b/samples/server/petstore/kotlin-springboot-reactive/src/main/resources/openapi.yaml @@ -607,12 +607,12 @@ components: Order: description: An order for a pets from the pet store example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -643,8 +643,8 @@ components: Category: description: A category for a pet example: - name: name id: 6 + name: name properties: id: format: int64 @@ -659,14 +659,14 @@ components: User: description: A User who is purchasing from the pet store example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -694,8 +694,8 @@ components: Tag: description: A tag for a pet example: - name: name id: 1 + name: name properties: id: format: int64 @@ -709,19 +709,19 @@ components: Pet: description: A pet for sale in the pet store example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: diff --git a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/resources/openapi.yaml b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/resources/openapi.yaml index c199cb612e2f..10dc7fc1a3c7 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/resources/openapi.yaml +++ b/samples/server/petstore/kotlin-springboot-source-swagger1/src/main/resources/openapi.yaml @@ -566,12 +566,12 @@ components: Order: description: An order for a pets from the pet store example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -602,8 +602,8 @@ components: Category: description: A category for a pet example: - name: name id: 6 + name: name properties: id: format: int64 @@ -617,14 +617,14 @@ components: User: description: A User who is purchasing from the pet store example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -652,8 +652,8 @@ components: Tag: description: A tag for a pet example: - name: name id: 1 + name: name properties: id: format: int64 @@ -667,19 +667,19 @@ components: Pet: description: A pet for sale in the pet store example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: diff --git a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/resources/openapi.yaml b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/resources/openapi.yaml index c199cb612e2f..10dc7fc1a3c7 100644 --- a/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/resources/openapi.yaml +++ b/samples/server/petstore/kotlin-springboot-source-swagger2/src/main/resources/openapi.yaml @@ -566,12 +566,12 @@ components: Order: description: An order for a pets from the pet store example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -602,8 +602,8 @@ components: Category: description: A category for a pet example: - name: name id: 6 + name: name properties: id: format: int64 @@ -617,14 +617,14 @@ components: User: description: A User who is purchasing from the pet store example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -652,8 +652,8 @@ components: Tag: description: A tag for a pet example: - name: name id: 1 + name: name properties: id: format: int64 @@ -667,19 +667,19 @@ components: Pet: description: A pet for sale in the pet store example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: diff --git a/samples/server/petstore/python-aiohttp-srclayout/src/openapi_server/openapi/openapi.yaml b/samples/server/petstore/python-aiohttp-srclayout/src/openapi_server/openapi/openapi.yaml index 6ed83581004b..ecfc98a40658 100644 --- a/samples/server/petstore/python-aiohttp-srclayout/src/openapi_server/openapi/openapi.yaml +++ b/samples/server/petstore/python-aiohttp-srclayout/src/openapi_server/openapi/openapi.yaml @@ -597,12 +597,12 @@ components: Order: description: An order for a pets from the pet store example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -639,8 +639,8 @@ components: Category: description: A category for a pet example: - name: name id: 6 + name: name properties: id: format: int64 @@ -656,14 +656,14 @@ components: User: description: A User who is purchasing from the pet store example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -699,8 +699,8 @@ components: Tag: description: A tag for a pet example: - name: name id: 1 + name: name properties: id: format: int64 @@ -716,19 +716,19 @@ components: Pet: description: A pet for sale in the pet store example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: diff --git a/samples/server/petstore/python-fastapi/openapi.yaml b/samples/server/petstore/python-fastapi/openapi.yaml index dddaa3538ed7..eb094b0e5101 100644 --- a/samples/server/petstore/python-fastapi/openapi.yaml +++ b/samples/server/petstore/python-fastapi/openapi.yaml @@ -637,12 +637,12 @@ components: Order: description: An order for a pets from the pet store example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -679,8 +679,8 @@ components: Category: description: A category for a pet example: - name: name id: 6 + name: name properties: id: format: int64 @@ -697,14 +697,14 @@ components: User: description: A User who is purchasing from the pet store example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -740,8 +740,8 @@ components: Tag: description: A tag for a pet example: - name: name id: 1 + name: name properties: id: format: int64 @@ -757,19 +757,19 @@ components: Pet: description: A pet for sale in the pet store example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: diff --git a/samples/server/petstore/python-flask/openapi_server/openapi/openapi.yaml b/samples/server/petstore/python-flask/openapi_server/openapi/openapi.yaml index 02f64a046294..5a89ed922792 100644 --- a/samples/server/petstore/python-flask/openapi_server/openapi/openapi.yaml +++ b/samples/server/petstore/python-flask/openapi_server/openapi/openapi.yaml @@ -658,12 +658,12 @@ components: Order: description: An order for a pets from the pet store example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -700,8 +700,8 @@ components: Category: description: A category for a pet example: - name: name id: 6 + name: name properties: id: format: int64 @@ -718,14 +718,14 @@ components: User: description: A User who is purchasing from the pet store example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -761,8 +761,8 @@ components: Tag: description: A tag for a pet example: - name: name id: 1 + name: name properties: id: format: int64 @@ -778,19 +778,19 @@ components: Pet: description: A pet for sale in the pet store example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: diff --git a/samples/server/petstore/rust-server-deprecated/output/openapi-v3/api/openapi.yaml b/samples/server/petstore/rust-server-deprecated/output/openapi-v3/api/openapi.yaml index e7a49d367f8a..25fdfe6470cc 100644 --- a/samples/server/petstore/rust-server-deprecated/output/openapi-v3/api/openapi.yaml +++ b/samples/server/petstore/rust-server-deprecated/output/openapi-v3/api/openapi.yaml @@ -739,10 +739,10 @@ components: type: integer ObjectUntypedProps: example: - not_required_untyped_nullable: "" required_untyped: "" required_untyped_nullable: "" not_required_untyped: "" + not_required_untyped_nullable: "" properties: required_untyped: nullable: false diff --git a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/api/openapi.yaml b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/api/openapi.yaml index c9cac8905821..7c364c4a75f9 100644 --- a/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/api/openapi.yaml +++ b/samples/server/petstore/rust-server-deprecated/output/petstore-with-fake-endpoints-models-for-testing/api/openapi.yaml @@ -892,12 +892,12 @@ components: schemas: Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -921,8 +921,8 @@ components: name: Order Category: example: - name: name id: 6 + name: name properties: id: format: int64 @@ -934,14 +934,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -968,8 +968,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -981,19 +981,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1373,8 +1373,8 @@ components: type: string OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: diff --git a/samples/server/petstore/rust-server-deprecated/output/rust-server-test/api/openapi.yaml b/samples/server/petstore/rust-server-deprecated/output/rust-server-test/api/openapi.yaml index 151702f8bf8a..2d7c4cf7fbe4 100644 --- a/samples/server/petstore/rust-server-deprecated/output/rust-server-test/api/openapi.yaml +++ b/samples/server/petstore/rust-server-deprecated/output/rust-server-test/api/openapi.yaml @@ -152,8 +152,8 @@ components: type: object example: null example: - sampleProperty: sampleProperty sampleBaseProperty: sampleBaseProperty + sampleProperty: sampleProperty baseAllOf: properties: sampleBaseProperty: 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 e7a49d367f8a..25fdfe6470cc 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 @@ -739,10 +739,10 @@ components: type: integer ObjectUntypedProps: example: - not_required_untyped_nullable: "" required_untyped: "" required_untyped_nullable: "" not_required_untyped: "" + not_required_untyped_nullable: "" properties: required_untyped: nullable: false 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 c9cac8905821..7c364c4a75f9 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 @@ -892,12 +892,12 @@ components: schemas: Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -921,8 +921,8 @@ components: name: Order Category: example: - name: name id: 6 + name: name properties: id: format: int64 @@ -934,14 +934,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -968,8 +968,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -981,19 +981,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1373,8 +1373,8 @@ components: type: string OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: diff --git a/samples/server/petstore/rust-server/output/rust-server-test/api/openapi.yaml b/samples/server/petstore/rust-server/output/rust-server-test/api/openapi.yaml index 151702f8bf8a..2d7c4cf7fbe4 100644 --- a/samples/server/petstore/rust-server/output/rust-server-test/api/openapi.yaml +++ b/samples/server/petstore/rust-server/output/rust-server-test/api/openapi.yaml @@ -152,8 +152,8 @@ components: type: object example: null example: - sampleProperty: sampleProperty sampleBaseProperty: sampleBaseProperty + sampleProperty: sampleProperty baseAllOf: properties: sampleBaseProperty: diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 31fb21c743c0..edeb6a3b1bd8 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -312,7 +312,7 @@ public void setAnytype1(@Nullable Object anytype1) { this.anytype1 = anytype1; } - public AdditionalPropertiesClass anytype2(Object anytype2) { + public AdditionalPropertiesClass anytype2(JsonNullable anytype2) { this.anytype2 = JsonNullable.of(anytype2); return this; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/BigCat.java index 0b8bd86e0136..54dc118a6e44 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/BigCat.java @@ -102,7 +102,7 @@ public void setKind(@Nullable KindEnum kind) { } - public BigCat declawed(Boolean declawed) { + public BigCat declawed(@Nullable Boolean declawed) { super.declawed(declawed); return this; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ChildWithNullable.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ChildWithNullable.java index d841f7752340..f90958041da4 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ChildWithNullable.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ChildWithNullable.java @@ -54,12 +54,12 @@ public void setOtherProperty(@Nullable String otherProperty) { } - public ChildWithNullable type(TypeEnum type) { + public ChildWithNullable type(@Nullable TypeEnum type) { super.type(type); return this; } - public ChildWithNullable nullableProperty(String nullableProperty) { + public ChildWithNullable nullableProperty(JsonNullable nullableProperty) { super.nullableProperty(nullableProperty); return this; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ContainerDefaultValue.java index b54195b47503..99dfeb81b3c8 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -51,7 +51,7 @@ public ContainerDefaultValue(List nullableRequiredArray, List re this.requiredArray = requiredArray; } - public ContainerDefaultValue nullableArray(List nullableArray) { + public ContainerDefaultValue nullableArray(JsonNullable> nullableArray) { this.nullableArray = JsonNullable.of(nullableArray); return this; } @@ -79,7 +79,7 @@ public void setNullableArray(JsonNullable> nullableArray) { this.nullableArray = nullableArray; } - public ContainerDefaultValue nullableRequiredArray(List nullableRequiredArray) { + public ContainerDefaultValue nullableRequiredArray(JsonNullable> nullableRequiredArray) { this.nullableRequiredArray = JsonNullable.of(nullableRequiredArray); return this; } @@ -137,7 +137,7 @@ public void setRequiredArray(List requiredArray) { this.requiredArray = requiredArray; } - public ContainerDefaultValue nullableArrayWithDefault(List nullableArrayWithDefault) { + public ContainerDefaultValue nullableArrayWithDefault(JsonNullable> nullableArrayWithDefault) { this.nullableArrayWithDefault = JsonNullable.of(nullableArrayWithDefault); return this; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/NullableMapProperty.java index 85b9061b4838..f9956d4a5d52 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -30,7 +30,7 @@ public class NullableMapProperty { @Valid private JsonNullable> languageValues = JsonNullable.>undefined(); - public NullableMapProperty languageValues(Map languageValues) { + public NullableMapProperty languageValues(JsonNullable> languageValues) { this.languageValues = JsonNullable.of(languageValues); return this; } diff --git a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ParentWithNullable.java b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ParentWithNullable.java index 1d88649a8fca..652eef33f398 100644 --- a/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ParentWithNullable.java +++ b/samples/server/petstore/spring-boot-defaultInterface-unhandledExcp/src/main/java/org/openapitools/model/ParentWithNullable.java @@ -96,7 +96,7 @@ public void setType(@Nullable TypeEnum type) { this.type = type; } - public ParentWithNullable nullableProperty(String nullableProperty) { + public ParentWithNullable nullableProperty(JsonNullable nullableProperty) { this.nullableProperty = JsonNullable.of(nullableProperty); return this; } diff --git a/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/model/ObjectWithUniqueItems.java b/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/model/ObjectWithUniqueItems.java index bd748f485ed3..9f812bfe2e0b 100644 --- a/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/model/ObjectWithUniqueItems.java +++ b/samples/server/petstore/spring-boot-nullable-set/src/main/java/org/openapitools/model/ObjectWithUniqueItems.java @@ -50,7 +50,7 @@ public class ObjectWithUniqueItems { @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) private @Nullable OffsetDateTime nullDateField; - public ObjectWithUniqueItems nullSet(Set nullSet) { + public ObjectWithUniqueItems nullSet(JsonNullable> nullSet) { this.nullSet = JsonNullable.of(nullSet); return this; } @@ -108,7 +108,7 @@ public void setNotNullSet(Set notNullSet) { this.notNullSet = notNullSet; } - public ObjectWithUniqueItems nullList(List nullList) { + public ObjectWithUniqueItems nullList(JsonNullable> nullList) { this.nullList = JsonNullable.of(nullList); return this; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java index 2f94f1c67ac4..485c9fb3a40c 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/FakeApi.java @@ -147,7 +147,7 @@ default ResponseEntity fakeOuterCompositeSerialize( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("*/*"))) { - String exampleString = "{ \"my_string\" : \"my_string\", \"my_number\" : 0.8008281904610115, \"my_boolean\" : true }"; + String exampleString = "{ \"my_number\" : 0.8008281904610115, \"my_string\" : \"my_string\", \"my_boolean\" : true }"; ApiUtil.setExampleResponse(request, "*/*", exampleString); break; } @@ -249,7 +249,7 @@ default ResponseEntity responseObjectDiff getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\", \"normalPropertyName\" : \"normalPropertyName\" }"; + String exampleString = "{ \"normalPropertyName\" : \"normalPropertyName\", \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApi.java index a7941f2eb7d5..f4fdb3cafb64 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/PetApi.java @@ -152,7 +152,7 @@ default ResponseEntity> findPetsByStatus( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -207,7 +207,7 @@ default ResponseEntity> findPetsByTags( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -261,7 +261,7 @@ default ResponseEntity getPetById( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + String exampleString = "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java index e178ae562118..b5dc0c07a165 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/StoreApi.java @@ -143,7 +143,7 @@ default ResponseEntity getOrderById( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -193,7 +193,7 @@ default ResponseEntity placeOrder( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java index 4107908070c5..c961a8a861db 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/api/UserApi.java @@ -199,7 +199,7 @@ default ResponseEntity getUserByName( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"password\" : \"password\", \"userStatus\" : 6, \"phone\" : \"phone\", \"id\" : 0, \"email\" : \"email\", \"username\" : \"username\" }"; + String exampleString = "{ \"id\" : 0, \"username\" : \"username\", \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"email\" : \"email\", \"password\" : \"password\", \"phone\" : \"phone\", \"userStatus\" : 6 }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCat.java index 728c27b9641a..569770cf9928 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/BigCat.java @@ -101,7 +101,7 @@ public void setKind(@Nullable KindEnum kind) { } - public BigCat declawed(Boolean declawed) { + public BigCat declawed(@Nullable Boolean declawed) { super.declawed(declawed); return this; } diff --git a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ChildWithNullable.java b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ChildWithNullable.java index 500176b53b87..88589234accd 100644 --- a/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ChildWithNullable.java +++ b/samples/server/petstore/springboot-beanvalidation-no-nullable/src/main/java/org/openapitools/model/ChildWithNullable.java @@ -51,12 +51,12 @@ public void setOtherProperty(@Nullable String otherProperty) { } - public ChildWithNullable type(TypeEnum type) { + public ChildWithNullable type(@Nullable TypeEnum type) { super.type(type); return this; } - public ChildWithNullable nullableProperty(String nullableProperty) { + public ChildWithNullable nullableProperty(@Nullable String nullableProperty) { super.nullableProperty(nullableProperty); return this; } 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 cb8da56b1462..3ee3d2f2941d 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 @@ -1315,12 +1315,12 @@ components: schemas: Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1349,8 +1349,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1365,14 +1365,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1399,8 +1399,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1412,19 +1412,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1912,8 +1912,8 @@ components: type: string OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -1951,9 +1951,9 @@ components: type: string type: object example: - otherProperty: otherProperty - nullableProperty: nullableProperty type: ChildWithNullable + nullableProperty: nullableProperty + otherProperty: otherProperty StringBooleanMap: additionalProperties: type: boolean @@ -2264,10 +2264,10 @@ components: type: object ResponseObjectWithDifferentFieldNames: example: + normalPropertyName: normalPropertyName UPPER_CASE_PROPERTY_SNAKE: UPPER_CASE_PROPERTY_SNAKE lower-case-property-dashes: lower-case-property-dashes property name with spaces: property name with spaces - normalPropertyName: normalPropertyName properties: normalPropertyName: type: string diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java index 2f94f1c67ac4..485c9fb3a40c 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/FakeApi.java @@ -147,7 +147,7 @@ default ResponseEntity fakeOuterCompositeSerialize( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("*/*"))) { - String exampleString = "{ \"my_string\" : \"my_string\", \"my_number\" : 0.8008281904610115, \"my_boolean\" : true }"; + String exampleString = "{ \"my_number\" : 0.8008281904610115, \"my_string\" : \"my_string\", \"my_boolean\" : true }"; ApiUtil.setExampleResponse(request, "*/*", exampleString); break; } @@ -249,7 +249,7 @@ default ResponseEntity responseObjectDiff getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\", \"normalPropertyName\" : \"normalPropertyName\" }"; + String exampleString = "{ \"normalPropertyName\" : \"normalPropertyName\", \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java index a7941f2eb7d5..f4fdb3cafb64 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/PetApi.java @@ -152,7 +152,7 @@ default ResponseEntity> findPetsByStatus( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -207,7 +207,7 @@ default ResponseEntity> findPetsByTags( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -261,7 +261,7 @@ default ResponseEntity getPetById( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + String exampleString = "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java index e178ae562118..b5dc0c07a165 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/StoreApi.java @@ -143,7 +143,7 @@ default ResponseEntity getOrderById( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -193,7 +193,7 @@ default ResponseEntity placeOrder( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java index 4107908070c5..c961a8a861db 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/api/UserApi.java @@ -199,7 +199,7 @@ default ResponseEntity getUserByName( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"password\" : \"password\", \"userStatus\" : 6, \"phone\" : \"phone\", \"id\" : 0, \"email\" : \"email\", \"username\" : \"username\" }"; + String exampleString = "{ \"id\" : 0, \"username\" : \"username\", \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"email\" : \"email\", \"password\" : \"password\", \"phone\" : \"phone\", \"userStatus\" : 6 }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 31fb21c743c0..edeb6a3b1bd8 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -312,7 +312,7 @@ public void setAnytype1(@Nullable Object anytype1) { this.anytype1 = anytype1; } - public AdditionalPropertiesClass anytype2(Object anytype2) { + public AdditionalPropertiesClass anytype2(JsonNullable anytype2) { this.anytype2 = JsonNullable.of(anytype2); return this; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCat.java index 0b8bd86e0136..54dc118a6e44 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/BigCat.java @@ -102,7 +102,7 @@ public void setKind(@Nullable KindEnum kind) { } - public BigCat declawed(Boolean declawed) { + public BigCat declawed(@Nullable Boolean declawed) { super.declawed(declawed); return this; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ChildWithNullable.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ChildWithNullable.java index d841f7752340..f90958041da4 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ChildWithNullable.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ChildWithNullable.java @@ -54,12 +54,12 @@ public void setOtherProperty(@Nullable String otherProperty) { } - public ChildWithNullable type(TypeEnum type) { + public ChildWithNullable type(@Nullable TypeEnum type) { super.type(type); return this; } - public ChildWithNullable nullableProperty(String nullableProperty) { + public ChildWithNullable nullableProperty(JsonNullable nullableProperty) { super.nullableProperty(nullableProperty); return this; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ContainerDefaultValue.java index b54195b47503..99dfeb81b3c8 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -51,7 +51,7 @@ public ContainerDefaultValue(List nullableRequiredArray, List re this.requiredArray = requiredArray; } - public ContainerDefaultValue nullableArray(List nullableArray) { + public ContainerDefaultValue nullableArray(JsonNullable> nullableArray) { this.nullableArray = JsonNullable.of(nullableArray); return this; } @@ -79,7 +79,7 @@ public void setNullableArray(JsonNullable> nullableArray) { this.nullableArray = nullableArray; } - public ContainerDefaultValue nullableRequiredArray(List nullableRequiredArray) { + public ContainerDefaultValue nullableRequiredArray(JsonNullable> nullableRequiredArray) { this.nullableRequiredArray = JsonNullable.of(nullableRequiredArray); return this; } @@ -137,7 +137,7 @@ public void setRequiredArray(List requiredArray) { this.requiredArray = requiredArray; } - public ContainerDefaultValue nullableArrayWithDefault(List nullableArrayWithDefault) { + public ContainerDefaultValue nullableArrayWithDefault(JsonNullable> nullableArrayWithDefault) { this.nullableArrayWithDefault = JsonNullable.of(nullableArrayWithDefault); return this; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/NullableMapProperty.java index 85b9061b4838..f9956d4a5d52 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -30,7 +30,7 @@ public class NullableMapProperty { @Valid private JsonNullable> languageValues = JsonNullable.>undefined(); - public NullableMapProperty languageValues(Map languageValues) { + public NullableMapProperty languageValues(JsonNullable> languageValues) { this.languageValues = JsonNullable.of(languageValues); return this; } diff --git a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ParentWithNullable.java b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ParentWithNullable.java index 1d88649a8fca..652eef33f398 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ParentWithNullable.java +++ b/samples/server/petstore/springboot-beanvalidation/src/main/java/org/openapitools/model/ParentWithNullable.java @@ -96,7 +96,7 @@ public void setType(@Nullable TypeEnum type) { this.type = type; } - public ParentWithNullable nullableProperty(String nullableProperty) { + public ParentWithNullable nullableProperty(JsonNullable nullableProperty) { this.nullableProperty = JsonNullable.of(nullableProperty); return this; } 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 cb8da56b1462..3ee3d2f2941d 100644 --- a/samples/server/petstore/springboot-beanvalidation/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-beanvalidation/src/main/resources/openapi.yaml @@ -1315,12 +1315,12 @@ components: schemas: Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1349,8 +1349,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1365,14 +1365,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1399,8 +1399,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1412,19 +1412,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1912,8 +1912,8 @@ components: type: string OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -1951,9 +1951,9 @@ components: type: string type: object example: - otherProperty: otherProperty - nullableProperty: nullableProperty type: ChildWithNullable + nullableProperty: nullableProperty + otherProperty: otherProperty StringBooleanMap: additionalProperties: type: boolean @@ -2264,10 +2264,10 @@ components: type: object ResponseObjectWithDifferentFieldNames: example: + normalPropertyName: normalPropertyName UPPER_CASE_PROPERTY_SNAKE: UPPER_CASE_PROPERTY_SNAKE lower-case-property-dashes: lower-case-property-dashes property name with spaces: property name with spaces - normalPropertyName: normalPropertyName properties: normalPropertyName: type: string diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/FakeApi.java index 9ac209378e2d..9ef3b238cf83 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/FakeApi.java @@ -147,7 +147,7 @@ default ResponseEntity fakeOuterCompositeSerialize( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("*/*"))) { - String exampleString = "{ \"my_string\" : \"my_string\", \"my_number\" : 0.8008281904610115, \"my_boolean\" : true }"; + String exampleString = "{ \"my_number\" : 0.8008281904610115, \"my_string\" : \"my_string\", \"my_boolean\" : true }"; ApiUtil.setExampleResponse(request, "*/*", exampleString); break; } @@ -249,7 +249,7 @@ default ResponseEntity responseObjectDiff getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\", \"normalPropertyName\" : \"normalPropertyName\" }"; + String exampleString = "{ \"normalPropertyName\" : \"normalPropertyName\", \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/PetApi.java index 4edddada9972..5b6353c597c7 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/PetApi.java @@ -152,7 +152,7 @@ default ResponseEntity> findPetsByStatus( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -207,7 +207,7 @@ default ResponseEntity> findPetsByTags( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -261,7 +261,7 @@ default ResponseEntity getPetById( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + String exampleString = "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/StoreApi.java index 014ca1d0e30f..c35ca86b4dde 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/StoreApi.java @@ -143,7 +143,7 @@ default ResponseEntity getOrderById( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -193,7 +193,7 @@ default ResponseEntity placeOrder( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/UserApi.java index 2093414b0384..46390ae029ea 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/api/UserApi.java @@ -199,7 +199,7 @@ default ResponseEntity getUserByName( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"password\" : \"password\", \"userStatus\" : 6, \"phone\" : \"phone\", \"id\" : 0, \"email\" : \"email\", \"username\" : \"username\" }"; + String exampleString = "{ \"id\" : 0, \"username\" : \"username\", \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"email\" : \"email\", \"password\" : \"password\", \"phone\" : \"phone\", \"userStatus\" : 6 }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 31fb21c743c0..edeb6a3b1bd8 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -312,7 +312,7 @@ public void setAnytype1(@Nullable Object anytype1) { this.anytype1 = anytype1; } - public AdditionalPropertiesClass anytype2(Object anytype2) { + public AdditionalPropertiesClass anytype2(JsonNullable anytype2) { this.anytype2 = JsonNullable.of(anytype2); return this; } diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/BigCat.java index 0b8bd86e0136..54dc118a6e44 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/BigCat.java @@ -102,7 +102,7 @@ public void setKind(@Nullable KindEnum kind) { } - public BigCat declawed(Boolean declawed) { + public BigCat declawed(@Nullable Boolean declawed) { super.declawed(declawed); return this; } diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ChildWithNullable.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ChildWithNullable.java index d841f7752340..f90958041da4 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ChildWithNullable.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ChildWithNullable.java @@ -54,12 +54,12 @@ public void setOtherProperty(@Nullable String otherProperty) { } - public ChildWithNullable type(TypeEnum type) { + public ChildWithNullable type(@Nullable TypeEnum type) { super.type(type); return this; } - public ChildWithNullable nullableProperty(String nullableProperty) { + public ChildWithNullable nullableProperty(JsonNullable nullableProperty) { super.nullableProperty(nullableProperty); return this; } diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ContainerDefaultValue.java index b54195b47503..99dfeb81b3c8 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -51,7 +51,7 @@ public ContainerDefaultValue(List nullableRequiredArray, List re this.requiredArray = requiredArray; } - public ContainerDefaultValue nullableArray(List nullableArray) { + public ContainerDefaultValue nullableArray(JsonNullable> nullableArray) { this.nullableArray = JsonNullable.of(nullableArray); return this; } @@ -79,7 +79,7 @@ public void setNullableArray(JsonNullable> nullableArray) { this.nullableArray = nullableArray; } - public ContainerDefaultValue nullableRequiredArray(List nullableRequiredArray) { + public ContainerDefaultValue nullableRequiredArray(JsonNullable> nullableRequiredArray) { this.nullableRequiredArray = JsonNullable.of(nullableRequiredArray); return this; } @@ -137,7 +137,7 @@ public void setRequiredArray(List requiredArray) { this.requiredArray = requiredArray; } - public ContainerDefaultValue nullableArrayWithDefault(List nullableArrayWithDefault) { + public ContainerDefaultValue nullableArrayWithDefault(JsonNullable> nullableArrayWithDefault) { this.nullableArrayWithDefault = JsonNullable.of(nullableArrayWithDefault); return this; } diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/NullableMapProperty.java index 85b9061b4838..f9956d4a5d52 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -30,7 +30,7 @@ public class NullableMapProperty { @Valid private JsonNullable> languageValues = JsonNullable.>undefined(); - public NullableMapProperty languageValues(Map languageValues) { + public NullableMapProperty languageValues(JsonNullable> languageValues) { this.languageValues = JsonNullable.of(languageValues); return this; } diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ParentWithNullable.java b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ParentWithNullable.java index 1d88649a8fca..652eef33f398 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ParentWithNullable.java +++ b/samples/server/petstore/springboot-builtin-validation/src/main/java/org/openapitools/model/ParentWithNullable.java @@ -96,7 +96,7 @@ public void setType(@Nullable TypeEnum type) { this.type = type; } - public ParentWithNullable nullableProperty(String nullableProperty) { + public ParentWithNullable nullableProperty(JsonNullable nullableProperty) { this.nullableProperty = JsonNullable.of(nullableProperty); return this; } diff --git a/samples/server/petstore/springboot-builtin-validation/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-builtin-validation/src/main/resources/openapi.yaml index cb8da56b1462..3ee3d2f2941d 100644 --- a/samples/server/petstore/springboot-builtin-validation/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-builtin-validation/src/main/resources/openapi.yaml @@ -1315,12 +1315,12 @@ components: schemas: Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1349,8 +1349,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1365,14 +1365,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1399,8 +1399,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1412,19 +1412,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1912,8 +1912,8 @@ components: type: string OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -1951,9 +1951,9 @@ components: type: string type: object example: - otherProperty: otherProperty - nullableProperty: nullableProperty type: ChildWithNullable + nullableProperty: nullableProperty + otherProperty: otherProperty StringBooleanMap: additionalProperties: type: boolean @@ -2264,10 +2264,10 @@ components: type: object ResponseObjectWithDifferentFieldNames: example: + normalPropertyName: normalPropertyName UPPER_CASE_PROPERTY_SNAKE: UPPER_CASE_PROPERTY_SNAKE lower-case-property-dashes: lower-case-property-dashes property name with spaces: property name with spaces - normalPropertyName: normalPropertyName properties: normalPropertyName: type: string diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java index d9cf089cdc7a..54ebbd8d3d4a 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java @@ -76,7 +76,7 @@ default ResponseEntity fakeOuterCompositeSerialize(OuterComposit getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("*/*"))) { - String exampleString = "{ \"my_string\" : \"my_string\", \"my_number\" : 0.8008281904610115, \"my_boolean\" : true }"; + String exampleString = "{ \"my_number\" : 0.8008281904610115, \"my_string\" : \"my_string\", \"my_boolean\" : true }"; ApiUtil.setExampleResponse(request, "*/*", exampleString); break; } @@ -123,7 +123,7 @@ default ResponseEntity responseObjectDiff getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\", \"normalPropertyName\" : \"normalPropertyName\" }"; + String exampleString = "{ \"normalPropertyName\" : \"normalPropertyName\", \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApiDelegate.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApiDelegate.java index 5c7b62100da6..eaac3b964320 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApiDelegate.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/PetApiDelegate.java @@ -71,7 +71,7 @@ default ResponseEntity> findPetsByStatus(List status) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -101,7 +101,7 @@ default ResponseEntity> findPetsByTags(Set tags) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -130,7 +130,7 @@ default ResponseEntity getPetById(Long petId) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + String exampleString = "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApiDelegate.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApiDelegate.java index 7f0fb2e3308e..3ef21cc1cfde 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApiDelegate.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/StoreApiDelegate.java @@ -66,7 +66,7 @@ default ResponseEntity getOrderById(Long orderId) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -94,7 +94,7 @@ default ResponseEntity placeOrder(Order order) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApiDelegate.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApiDelegate.java index d7bae957061b..b9e8850b4e83 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApiDelegate.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/api/UserApiDelegate.java @@ -93,7 +93,7 @@ default ResponseEntity getUserByName(String username) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"password\" : \"password\", \"userStatus\" : 6, \"phone\" : \"phone\", \"id\" : 0, \"email\" : \"email\", \"username\" : \"username\" }"; + String exampleString = "{ \"id\" : 0, \"username\" : \"username\", \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"email\" : \"email\", \"password\" : \"password\", \"phone\" : \"phone\", \"userStatus\" : 6 }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 31fb21c743c0..edeb6a3b1bd8 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -312,7 +312,7 @@ public void setAnytype1(@Nullable Object anytype1) { this.anytype1 = anytype1; } - public AdditionalPropertiesClass anytype2(Object anytype2) { + public AdditionalPropertiesClass anytype2(JsonNullable anytype2) { this.anytype2 = JsonNullable.of(anytype2); return this; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCat.java index 0b8bd86e0136..54dc118a6e44 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/BigCat.java @@ -102,7 +102,7 @@ public void setKind(@Nullable KindEnum kind) { } - public BigCat declawed(Boolean declawed) { + public BigCat declawed(@Nullable Boolean declawed) { super.declawed(declawed); return this; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ChildWithNullable.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ChildWithNullable.java index d841f7752340..f90958041da4 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ChildWithNullable.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ChildWithNullable.java @@ -54,12 +54,12 @@ public void setOtherProperty(@Nullable String otherProperty) { } - public ChildWithNullable type(TypeEnum type) { + public ChildWithNullable type(@Nullable TypeEnum type) { super.type(type); return this; } - public ChildWithNullable nullableProperty(String nullableProperty) { + public ChildWithNullable nullableProperty(JsonNullable nullableProperty) { super.nullableProperty(nullableProperty); return this; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ContainerDefaultValue.java index b54195b47503..99dfeb81b3c8 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -51,7 +51,7 @@ public ContainerDefaultValue(List nullableRequiredArray, List re this.requiredArray = requiredArray; } - public ContainerDefaultValue nullableArray(List nullableArray) { + public ContainerDefaultValue nullableArray(JsonNullable> nullableArray) { this.nullableArray = JsonNullable.of(nullableArray); return this; } @@ -79,7 +79,7 @@ public void setNullableArray(JsonNullable> nullableArray) { this.nullableArray = nullableArray; } - public ContainerDefaultValue nullableRequiredArray(List nullableRequiredArray) { + public ContainerDefaultValue nullableRequiredArray(JsonNullable> nullableRequiredArray) { this.nullableRequiredArray = JsonNullable.of(nullableRequiredArray); return this; } @@ -137,7 +137,7 @@ public void setRequiredArray(List requiredArray) { this.requiredArray = requiredArray; } - public ContainerDefaultValue nullableArrayWithDefault(List nullableArrayWithDefault) { + public ContainerDefaultValue nullableArrayWithDefault(JsonNullable> nullableArrayWithDefault) { this.nullableArrayWithDefault = JsonNullable.of(nullableArrayWithDefault); return this; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/NullableMapProperty.java index 85b9061b4838..f9956d4a5d52 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -30,7 +30,7 @@ public class NullableMapProperty { @Valid private JsonNullable> languageValues = JsonNullable.>undefined(); - public NullableMapProperty languageValues(Map languageValues) { + public NullableMapProperty languageValues(JsonNullable> languageValues) { this.languageValues = JsonNullable.of(languageValues); return this; } diff --git a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ParentWithNullable.java b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ParentWithNullable.java index 1d88649a8fca..652eef33f398 100644 --- a/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ParentWithNullable.java +++ b/samples/server/petstore/springboot-delegate-j8/src/main/java/org/openapitools/model/ParentWithNullable.java @@ -96,7 +96,7 @@ public void setType(@Nullable TypeEnum type) { this.type = type; } - public ParentWithNullable nullableProperty(String nullableProperty) { + public ParentWithNullable nullableProperty(JsonNullable nullableProperty) { this.nullableProperty = JsonNullable.of(nullableProperty); return this; } 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 cb8da56b1462..3ee3d2f2941d 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 @@ -1315,12 +1315,12 @@ components: schemas: Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1349,8 +1349,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1365,14 +1365,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1399,8 +1399,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1412,19 +1412,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1912,8 +1912,8 @@ components: type: string OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -1951,9 +1951,9 @@ components: type: string type: object example: - otherProperty: otherProperty - nullableProperty: nullableProperty type: ChildWithNullable + nullableProperty: nullableProperty + otherProperty: otherProperty StringBooleanMap: additionalProperties: type: boolean @@ -2264,10 +2264,10 @@ components: type: object ResponseObjectWithDifferentFieldNames: example: + normalPropertyName: normalPropertyName UPPER_CASE_PROPERTY_SNAKE: UPPER_CASE_PROPERTY_SNAKE lower-case-property-dashes: lower-case-property-dashes property name with spaces: property name with spaces - normalPropertyName: normalPropertyName properties: normalPropertyName: type: string diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/PetApiDelegate.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/PetApiDelegate.java index 6fe4e3852816..fc6e4c916c3a 100644 --- a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/PetApiDelegate.java +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/PetApiDelegate.java @@ -39,7 +39,7 @@ default Pet addPet(Pet pet) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + String exampleString = "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -82,7 +82,7 @@ default List findPetsByStatus(List status) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -112,7 +112,7 @@ default List findPetsByTags(List tags) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -141,7 +141,7 @@ default Pet getPetById(Long petId) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + String exampleString = "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -173,7 +173,7 @@ default Pet updatePet(Pet pet) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + String exampleString = "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/StoreApiDelegate.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/StoreApiDelegate.java index 99228c17de35..8780068dc193 100644 --- a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/StoreApiDelegate.java +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/StoreApiDelegate.java @@ -65,7 +65,7 @@ default Order getOrderById(Long orderId) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -93,7 +93,7 @@ default Order placeOrder(Order order) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/UserApiDelegate.java b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/UserApiDelegate.java index e7fbdb269971..eb6b2069c49b 100644 --- a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/UserApiDelegate.java +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/java/org/openapitools/api/UserApiDelegate.java @@ -92,7 +92,7 @@ default User getUserByName(String username) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"password\" : \"password\", \"userStatus\" : 6, \"phone\" : \"phone\", \"id\" : 0, \"email\" : \"email\", \"username\" : \"username\" }"; + String exampleString = "{ \"id\" : 0, \"username\" : \"username\", \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"email\" : \"email\", \"password\" : \"password\", \"phone\" : \"phone\", \"userStatus\" : 6 }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/resources/openapi.yaml index 31074771d9fb..aa6fc7e42167 100644 --- a/samples/server/petstore/springboot-delegate-no-response-entity/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-delegate-no-response-entity/src/main/resources/openapi.yaml @@ -705,12 +705,12 @@ components: Order: description: An order for a pets from the pet store example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -741,8 +741,8 @@ components: Category: description: A category for a pet example: - name: name id: 6 + name: name properties: id: format: int64 @@ -757,14 +757,14 @@ components: User: description: A User who is purchasing from the pet store example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -792,8 +792,8 @@ components: Tag: description: A tag for a pet example: - name: name id: 1 + name: name properties: id: format: int64 @@ -807,19 +807,19 @@ components: Pet: description: A pet for sale in the pet store example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java index d9cf089cdc7a..54ebbd8d3d4a 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/FakeApiDelegate.java @@ -76,7 +76,7 @@ default ResponseEntity fakeOuterCompositeSerialize(OuterComposit getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("*/*"))) { - String exampleString = "{ \"my_string\" : \"my_string\", \"my_number\" : 0.8008281904610115, \"my_boolean\" : true }"; + String exampleString = "{ \"my_number\" : 0.8008281904610115, \"my_string\" : \"my_string\", \"my_boolean\" : true }"; ApiUtil.setExampleResponse(request, "*/*", exampleString); break; } @@ -123,7 +123,7 @@ default ResponseEntity responseObjectDiff getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\", \"normalPropertyName\" : \"normalPropertyName\" }"; + String exampleString = "{ \"normalPropertyName\" : \"normalPropertyName\", \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiDelegate.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiDelegate.java index 5c7b62100da6..eaac3b964320 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiDelegate.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/PetApiDelegate.java @@ -71,7 +71,7 @@ default ResponseEntity> findPetsByStatus(List status) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -101,7 +101,7 @@ default ResponseEntity> findPetsByTags(Set tags) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -130,7 +130,7 @@ default ResponseEntity getPetById(Long petId) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + String exampleString = "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiDelegate.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiDelegate.java index 7f0fb2e3308e..3ef21cc1cfde 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiDelegate.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/StoreApiDelegate.java @@ -66,7 +66,7 @@ default ResponseEntity getOrderById(Long orderId) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -94,7 +94,7 @@ default ResponseEntity placeOrder(Order order) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApiDelegate.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApiDelegate.java index d7bae957061b..b9e8850b4e83 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApiDelegate.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/api/UserApiDelegate.java @@ -93,7 +93,7 @@ default ResponseEntity getUserByName(String username) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"password\" : \"password\", \"userStatus\" : 6, \"phone\" : \"phone\", \"id\" : 0, \"email\" : \"email\", \"username\" : \"username\" }"; + String exampleString = "{ \"id\" : 0, \"username\" : \"username\", \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"email\" : \"email\", \"password\" : \"password\", \"phone\" : \"phone\", \"userStatus\" : 6 }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 73dbb09aa03c..2b40289c97bc 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -333,7 +333,7 @@ public void setAnytype1(@Nullable Object anytype1) { this.anytype1 = anytype1; } - public AdditionalPropertiesClass anytype2(Object anytype2) { + public AdditionalPropertiesClass anytype2(JsonNullable anytype2) { this.anytype2 = JsonNullable.of(anytype2); return this; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java index 829a685c836b..4371a70e3a1f 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/BigCat.java @@ -110,7 +110,7 @@ public void setKind(@Nullable KindEnum kind) { } - public BigCat declawed(Boolean declawed) { + public BigCat declawed(@Nullable Boolean declawed) { super.declawed(declawed); return this; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ChildWithNullable.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ChildWithNullable.java index e3a532f44ada..39b3d979a118 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ChildWithNullable.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ChildWithNullable.java @@ -66,12 +66,12 @@ public void setOtherProperty(@Nullable String otherProperty) { } - public ChildWithNullable type(TypeEnum type) { + public ChildWithNullable type(@Nullable TypeEnum type) { super.type(type); return this; } - public ChildWithNullable nullableProperty(String nullableProperty) { + public ChildWithNullable nullableProperty(JsonNullable nullableProperty) { super.nullableProperty(nullableProperty); return this; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java index 8fd15f093514..dd5b2fa7218d 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -61,7 +61,7 @@ public ContainerDefaultValue(List nullableArray, List nullableRe this.nullableArrayWithDefault = JsonNullable.of(nullableArrayWithDefault); } - public ContainerDefaultValue nullableArray(List nullableArray) { + public ContainerDefaultValue nullableArray(JsonNullable> nullableArray) { this.nullableArray = JsonNullable.of(nullableArray); return this; } @@ -89,7 +89,7 @@ public void setNullableArray(JsonNullable> nullableArray) { this.nullableArray = nullableArray; } - public ContainerDefaultValue nullableRequiredArray(List nullableRequiredArray) { + public ContainerDefaultValue nullableRequiredArray(JsonNullable> nullableRequiredArray) { this.nullableRequiredArray = JsonNullable.of(nullableRequiredArray); return this; } @@ -147,7 +147,7 @@ public void setRequiredArray(List requiredArray) { this.requiredArray = requiredArray; } - public ContainerDefaultValue nullableArrayWithDefault(List nullableArrayWithDefault) { + public ContainerDefaultValue nullableArrayWithDefault(JsonNullable> nullableArrayWithDefault) { this.nullableArrayWithDefault = JsonNullable.of(nullableArrayWithDefault); return this; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NullableMapProperty.java index 86e49aa2458e..c80c8996c15d 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -41,7 +41,7 @@ public NullableMapProperty(Map languageValues) { this.languageValues = JsonNullable.of(languageValues); } - public NullableMapProperty languageValues(Map languageValues) { + public NullableMapProperty languageValues(JsonNullable> languageValues) { this.languageValues = JsonNullable.of(languageValues); return this; } diff --git a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ParentWithNullable.java b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ParentWithNullable.java index c36191163718..3f934feaa0e9 100644 --- a/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ParentWithNullable.java +++ b/samples/server/petstore/springboot-delegate/src/main/java/org/openapitools/model/ParentWithNullable.java @@ -108,7 +108,7 @@ public void setType(@Nullable TypeEnum type) { this.type = type; } - public ParentWithNullable nullableProperty(String nullableProperty) { + public ParentWithNullable nullableProperty(JsonNullable nullableProperty) { this.nullableProperty = JsonNullable.of(nullableProperty); return this; } 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 cb8da56b1462..3ee3d2f2941d 100644 --- a/samples/server/petstore/springboot-delegate/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-delegate/src/main/resources/openapi.yaml @@ -1315,12 +1315,12 @@ components: schemas: Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1349,8 +1349,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1365,14 +1365,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1399,8 +1399,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1412,19 +1412,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1912,8 +1912,8 @@ components: type: string OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -1951,9 +1951,9 @@ components: type: string type: object example: - otherProperty: otherProperty - nullableProperty: nullableProperty type: ChildWithNullable + nullableProperty: nullableProperty + otherProperty: otherProperty StringBooleanMap: additionalProperties: type: boolean @@ -2264,10 +2264,10 @@ components: type: object ResponseObjectWithDifferentFieldNames: example: + normalPropertyName: normalPropertyName UPPER_CASE_PROPERTY_SNAKE: UPPER_CASE_PROPERTY_SNAKE lower-case-property-dashes: lower-case-property-dashes property name with spaces: property name with spaces - normalPropertyName: normalPropertyName properties: normalPropertyName: type: string diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/PetApi.java index b18a6c1664ef..cb9609fa28be 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/PetApi.java @@ -52,7 +52,7 @@ default ResponseEntity addPet( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + String exampleString = "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -108,7 +108,7 @@ default ResponseEntity> findPetsByStatus( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -146,7 +146,7 @@ default ResponseEntity> findPetsByTags( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -183,7 +183,7 @@ default ResponseEntity getPetById( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + String exampleString = "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -224,7 +224,7 @@ default ResponseEntity updatePet( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + String exampleString = "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/StoreApi.java index a1816dd53660..b0cdc5db2db2 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/StoreApi.java @@ -92,7 +92,7 @@ default ResponseEntity getOrderById( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -129,7 +129,7 @@ default ResponseEntity placeOrder( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/UserApi.java index d9942743bc92..64a39db16321 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/java/org/openapitools/api/UserApi.java @@ -135,7 +135,7 @@ default ResponseEntity getUserByName( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"password\" : \"password\", \"userStatus\" : 6, \"phone\" : \"phone\", \"id\" : 0, \"email\" : \"email\", \"username\" : \"username\" }"; + String exampleString = "{ \"id\" : 0, \"username\" : \"username\", \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"email\" : \"email\", \"password\" : \"password\", \"phone\" : \"phone\", \"userStatus\" : 6 }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/resources/openapi.yaml index 31074771d9fb..aa6fc7e42167 100644 --- a/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-implicitHeaders-annotationLibrary/src/main/resources/openapi.yaml @@ -705,12 +705,12 @@ components: Order: description: An order for a pets from the pet store example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -741,8 +741,8 @@ components: Category: description: A category for a pet example: - name: name id: 6 + name: name properties: id: format: int64 @@ -757,14 +757,14 @@ components: User: description: A User who is purchasing from the pet store example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -792,8 +792,8 @@ components: Tag: description: A tag for a pet example: - name: name id: 1 + name: name properties: id: format: int64 @@ -807,19 +807,19 @@ components: Pet: description: A pet for sale in the pet store example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java index e48f56d651db..d68295f0f5a3 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/FakeApi.java @@ -147,7 +147,7 @@ default ResponseEntity fakeOuterCompositeSerialize( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("*/*"))) { - String exampleString = "{ \"my_string\" : \"my_string\", \"my_number\" : 0.8008281904610115, \"my_boolean\" : true }"; + String exampleString = "{ \"my_number\" : 0.8008281904610115, \"my_string\" : \"my_string\", \"my_boolean\" : true }"; ApiUtil.setExampleResponse(request, "*/*", exampleString); break; } @@ -249,7 +249,7 @@ default ResponseEntity responseObjectDiff getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\", \"normalPropertyName\" : \"normalPropertyName\" }"; + String exampleString = "{ \"normalPropertyName\" : \"normalPropertyName\", \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java index dd896074a3e9..48206fde695c 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/PetApi.java @@ -153,7 +153,7 @@ default ResponseEntity> findPetsByStatus( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -208,7 +208,7 @@ default ResponseEntity> findPetsByTags( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -262,7 +262,7 @@ default ResponseEntity getPetById( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + String exampleString = "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java index fe3f80964b3b..83956b35ff38 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/StoreApi.java @@ -143,7 +143,7 @@ default ResponseEntity getOrderById( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -193,7 +193,7 @@ default ResponseEntity placeOrder( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java index 791c68efeabb..931a7c44bb98 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/api/UserApi.java @@ -199,7 +199,7 @@ default ResponseEntity getUserByName( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"password\" : \"password\", \"userStatus\" : 6, \"phone\" : \"phone\", \"id\" : 0, \"email\" : \"email\", \"username\" : \"username\" }"; + String exampleString = "{ \"id\" : 0, \"username\" : \"username\", \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"email\" : \"email\", \"password\" : \"password\", \"phone\" : \"phone\", \"userStatus\" : 6 }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 71a07dfb02ad..2ac8fc745b04 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -312,7 +312,7 @@ public void setAnytype1(@Nullable Object anytype1) { this.anytype1 = anytype1; } - public AdditionalPropertiesClass anytype2(Object anytype2) { + public AdditionalPropertiesClass anytype2(JsonNullable anytype2) { this.anytype2 = JsonNullable.of(anytype2); return this; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java index 1deee1b1d4d9..9673b7c61d3f 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/BigCat.java @@ -102,7 +102,7 @@ public void setKind(@Nullable KindEnum kind) { } - public BigCat declawed(Boolean declawed) { + public BigCat declawed(@Nullable Boolean declawed) { super.declawed(declawed); return this; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ChildWithNullable.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ChildWithNullable.java index a4281a8e5f2d..0a743853a406 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ChildWithNullable.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ChildWithNullable.java @@ -54,12 +54,12 @@ public void setOtherProperty(@Nullable String otherProperty) { } - public ChildWithNullable type(TypeEnum type) { + public ChildWithNullable type(@Nullable TypeEnum type) { super.type(type); return this; } - public ChildWithNullable nullableProperty(String nullableProperty) { + public ChildWithNullable nullableProperty(JsonNullable nullableProperty) { super.nullableProperty(nullableProperty); return this; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java index d95b2ca5e0b5..ecbf17528a2c 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -51,7 +51,7 @@ public ContainerDefaultValue(List nullableRequiredArray, List re this.requiredArray = requiredArray; } - public ContainerDefaultValue nullableArray(List nullableArray) { + public ContainerDefaultValue nullableArray(JsonNullable> nullableArray) { this.nullableArray = JsonNullable.of(nullableArray); return this; } @@ -79,7 +79,7 @@ public void setNullableArray(JsonNullable> nullableArray) { this.nullableArray = nullableArray; } - public ContainerDefaultValue nullableRequiredArray(List nullableRequiredArray) { + public ContainerDefaultValue nullableRequiredArray(JsonNullable> nullableRequiredArray) { this.nullableRequiredArray = JsonNullable.of(nullableRequiredArray); return this; } @@ -137,7 +137,7 @@ public void setRequiredArray(List requiredArray) { this.requiredArray = requiredArray; } - public ContainerDefaultValue nullableArrayWithDefault(List nullableArrayWithDefault) { + public ContainerDefaultValue nullableArrayWithDefault(JsonNullable> nullableArrayWithDefault) { this.nullableArrayWithDefault = JsonNullable.of(nullableArrayWithDefault); return this; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NullableMapProperty.java index 184ac9321619..b506cdabacdc 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -30,7 +30,7 @@ public class NullableMapProperty { @Valid private JsonNullable> languageValues = JsonNullable.>undefined(); - public NullableMapProperty languageValues(Map languageValues) { + public NullableMapProperty languageValues(JsonNullable> languageValues) { this.languageValues = JsonNullable.of(languageValues); return this; } diff --git a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ParentWithNullable.java b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ParentWithNullable.java index 4778f0762b7a..2ad841649919 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ParentWithNullable.java +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/java/org/openapitools/model/ParentWithNullable.java @@ -96,7 +96,7 @@ public void setType(@Nullable TypeEnum type) { this.type = type; } - public ParentWithNullable nullableProperty(String nullableProperty) { + public ParentWithNullable nullableProperty(JsonNullable nullableProperty) { this.nullableProperty = JsonNullable.of(nullableProperty); return this; } 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 cb8da56b1462..3ee3d2f2941d 100644 --- a/samples/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-implicitHeaders/src/main/resources/openapi.yaml @@ -1315,12 +1315,12 @@ components: schemas: Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1349,8 +1349,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1365,14 +1365,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1399,8 +1399,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1412,19 +1412,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1912,8 +1912,8 @@ components: type: string OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -1951,9 +1951,9 @@ components: type: string type: object example: - otherProperty: otherProperty - nullableProperty: nullableProperty type: ChildWithNullable + nullableProperty: nullableProperty + otherProperty: otherProperty StringBooleanMap: additionalProperties: type: boolean @@ -2264,10 +2264,10 @@ components: type: object ResponseObjectWithDifferentFieldNames: example: + normalPropertyName: normalPropertyName UPPER_CASE_PROPERTY_SNAKE: UPPER_CASE_PROPERTY_SNAKE lower-case-property-dashes: lower-case-property-dashes property name with spaces: property name with spaces - normalPropertyName: normalPropertyName properties: normalPropertyName: type: string diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/FakeApi.java index 08ec90fb99d0..b557664f9465 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/FakeApi.java @@ -151,7 +151,7 @@ default ResponseEntity fakeOuterCompositeSerialize( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("*/*"))) { - String exampleString = "{ \"my_string\" : \"my_string\", \"my_number\" : 0.8008281904610115, \"my_boolean\" : true }"; + String exampleString = "{ \"my_number\" : 0.8008281904610115, \"my_string\" : \"my_string\", \"my_boolean\" : true }"; ApiUtil.setExampleResponse(request, "*/*", exampleString); break; } @@ -256,7 +256,7 @@ default ResponseEntity responseObjectD getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\", \"normalPropertyName\" : \"normalPropertyName\" }"; + String exampleString = "{ \"normalPropertyName\" : \"normalPropertyName\", \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/PetApi.java index e83ac1b11b4d..3930f6f75a1b 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/PetApi.java @@ -156,7 +156,7 @@ default ResponseEntity> findPetsByStatus( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -212,7 +212,7 @@ default ResponseEntity> findPetsByTags( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -267,7 +267,7 @@ default ResponseEntity getPetById( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + String exampleString = "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/StoreApi.java index fd27f0dc9b78..03a836b3b789 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/StoreApi.java @@ -146,7 +146,7 @@ default ResponseEntity getOrderById( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -197,7 +197,7 @@ default ResponseEntity placeOrder( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/UserApi.java index cdae1dc0d543..c7fcf9ab4b28 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/api/UserApi.java @@ -205,7 +205,7 @@ default ResponseEntity getUserByName( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"password\" : \"password\", \"userStatus\" : 6, \"phone\" : \"phone\", \"id\" : 0, \"email\" : \"email\", \"username\" : \"username\" }"; + String exampleString = "{ \"id\" : 0, \"username\" : \"username\", \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"email\" : \"email\", \"password\" : \"password\", \"phone\" : \"phone\", \"userStatus\" : 6 }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java index de6d28c450a9..fc774df9551e 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java @@ -314,7 +314,7 @@ public void setAnytype1(@Nullable Object anytype1) { this.anytype1 = anytype1; } - public AdditionalPropertiesClassDto anytype2(Object anytype2) { + public AdditionalPropertiesClassDto anytype2(JsonNullable anytype2) { this.anytype2 = JsonNullable.of(anytype2); return this; } diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/BigCatDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/BigCatDto.java index 974aed13ad42..bc1bc97d5069 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/BigCatDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/BigCatDto.java @@ -104,7 +104,7 @@ public void setKind(@Nullable KindEnum kind) { } - public BigCatDto declawed(Boolean declawed) { + public BigCatDto declawed(@Nullable Boolean declawed) { super.declawed(declawed); return this; } diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ChildWithNullableDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ChildWithNullableDto.java index dd149e504bf2..4b009f2b5898 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ChildWithNullableDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ChildWithNullableDto.java @@ -56,12 +56,12 @@ public void setOtherProperty(@Nullable String otherProperty) { } - public ChildWithNullableDto type(TypeEnum type) { + public ChildWithNullableDto type(@Nullable TypeEnum type) { super.type(type); return this; } - public ChildWithNullableDto nullableProperty(String nullableProperty) { + public ChildWithNullableDto nullableProperty(JsonNullable nullableProperty) { super.nullableProperty(nullableProperty); return this; } diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java index 2ba1099ed96c..58ec4145e1a2 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java @@ -53,7 +53,7 @@ public ContainerDefaultValueDto(List nullableRequiredArray, List this.requiredArray = requiredArray; } - public ContainerDefaultValueDto nullableArray(List nullableArray) { + public ContainerDefaultValueDto nullableArray(JsonNullable> nullableArray) { this.nullableArray = JsonNullable.of(nullableArray); return this; } @@ -81,7 +81,7 @@ public void setNullableArray(JsonNullable> nullableArray) { this.nullableArray = nullableArray; } - public ContainerDefaultValueDto nullableRequiredArray(List nullableRequiredArray) { + public ContainerDefaultValueDto nullableRequiredArray(JsonNullable> nullableRequiredArray) { this.nullableRequiredArray = JsonNullable.of(nullableRequiredArray); return this; } @@ -139,7 +139,7 @@ public void setRequiredArray(List requiredArray) { this.requiredArray = requiredArray; } - public ContainerDefaultValueDto nullableArrayWithDefault(List nullableArrayWithDefault) { + public ContainerDefaultValueDto nullableArrayWithDefault(JsonNullable> nullableArrayWithDefault) { this.nullableArrayWithDefault = JsonNullable.of(nullableArrayWithDefault); return this; } diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/NullableMapPropertyDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/NullableMapPropertyDto.java index 20f268f80d50..6578aac0e191 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/NullableMapPropertyDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/NullableMapPropertyDto.java @@ -32,7 +32,7 @@ public class NullableMapPropertyDto { @Valid private JsonNullable> languageValues = JsonNullable.>undefined(); - public NullableMapPropertyDto languageValues(Map languageValues) { + public NullableMapPropertyDto languageValues(JsonNullable> languageValues) { this.languageValues = JsonNullable.of(languageValues); return this; } diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ParentWithNullableDto.java b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ParentWithNullableDto.java index 6da4f43e17e2..6d7b27dff1e4 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ParentWithNullableDto.java +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/java/org/openapitools/model/ParentWithNullableDto.java @@ -97,7 +97,7 @@ public void setType(@Nullable TypeEnum type) { this.type = type; } - public ParentWithNullableDto nullableProperty(String nullableProperty) { + public ParentWithNullableDto nullableProperty(JsonNullable nullableProperty) { this.nullableProperty = JsonNullable.of(nullableProperty); return this; } diff --git a/samples/server/petstore/springboot-include-http-request-context/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-include-http-request-context/src/main/resources/openapi.yaml index dd592b359712..ffd8d109c347 100644 --- a/samples/server/petstore/springboot-include-http-request-context/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-include-http-request-context/src/main/resources/openapi.yaml @@ -1315,12 +1315,12 @@ components: schemas: Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1349,8 +1349,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1365,14 +1365,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1399,8 +1399,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1412,19 +1412,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1912,8 +1912,8 @@ components: type: string OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2252,10 +2252,10 @@ components: type: object ResponseObjectWithDifferentFieldNames: example: + normalPropertyName: normalPropertyName UPPER_CASE_PROPERTY_SNAKE: UPPER_CASE_PROPERTY_SNAKE lower-case-property-dashes: lower-case-property-dashes property name with spaces: property name with spaces - normalPropertyName: normalPropertyName properties: normalPropertyName: type: string diff --git a/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/api/PetApi.java index ca5016f9cb57..3c853bf79cff 100644 --- a/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/api/PetApi.java @@ -81,7 +81,7 @@ default ResponseEntity addPet( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + String exampleString = "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -167,7 +167,7 @@ default ResponseEntity> findPetsByStatus( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -222,7 +222,7 @@ default ResponseEntity> findPetsByTags( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -276,7 +276,7 @@ default ResponseEntity getPetById( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + String exampleString = "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -336,7 +336,7 @@ default ResponseEntity updatePet( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + String exampleString = "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/api/StoreApi.java index 7bbe2b0951c1..e9a1b761ed80 100644 --- a/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/api/StoreApi.java @@ -143,7 +143,7 @@ default ResponseEntity getOrderById( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -193,7 +193,7 @@ default ResponseEntity placeOrder( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/api/UserApi.java index 2ac726c91f5e..91044c0a35cd 100644 --- a/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-lombok-data/src/main/java/org/openapitools/api/UserApi.java @@ -211,7 +211,7 @@ default ResponseEntity getUserByName( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"password\" : \"password\", \"userStatus\" : 6, \"phone\" : \"phone\", \"id\" : 0, \"email\" : \"email\", \"username\" : \"username\" }"; + String exampleString = "{ \"id\" : 0, \"username\" : \"username\", \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"email\" : \"email\", \"password\" : \"password\", \"phone\" : \"phone\", \"userStatus\" : 6 }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-lombok-data/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-lombok-data/src/main/resources/openapi.yaml index 31074771d9fb..aa6fc7e42167 100644 --- a/samples/server/petstore/springboot-lombok-data/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-lombok-data/src/main/resources/openapi.yaml @@ -705,12 +705,12 @@ components: Order: description: An order for a pets from the pet store example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -741,8 +741,8 @@ components: Category: description: A category for a pet example: - name: name id: 6 + name: name properties: id: format: int64 @@ -757,14 +757,14 @@ components: User: description: A User who is purchasing from the pet store example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -792,8 +792,8 @@ components: Tag: description: A tag for a pet example: - name: name id: 1 + name: name properties: id: format: int64 @@ -807,19 +807,19 @@ components: Pet: description: A pet for sale in the pet store example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: diff --git a/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/api/PetApi.java index ca5016f9cb57..3c853bf79cff 100644 --- a/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/api/PetApi.java @@ -81,7 +81,7 @@ default ResponseEntity addPet( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + String exampleString = "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -167,7 +167,7 @@ default ResponseEntity> findPetsByStatus( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -222,7 +222,7 @@ default ResponseEntity> findPetsByTags( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -276,7 +276,7 @@ default ResponseEntity getPetById( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + String exampleString = "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -336,7 +336,7 @@ default ResponseEntity updatePet( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + String exampleString = "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/api/StoreApi.java index 7bbe2b0951c1..e9a1b761ed80 100644 --- a/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/api/StoreApi.java @@ -143,7 +143,7 @@ default ResponseEntity getOrderById( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -193,7 +193,7 @@ default ResponseEntity placeOrder( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/api/UserApi.java index 2ac726c91f5e..91044c0a35cd 100644 --- a/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-lombok-tostring/src/main/java/org/openapitools/api/UserApi.java @@ -211,7 +211,7 @@ default ResponseEntity getUserByName( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"password\" : \"password\", \"userStatus\" : 6, \"phone\" : \"phone\", \"id\" : 0, \"email\" : \"email\", \"username\" : \"username\" }"; + String exampleString = "{ \"id\" : 0, \"username\" : \"username\", \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"email\" : \"email\", \"password\" : \"password\", \"phone\" : \"phone\", \"userStatus\" : 6 }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-lombok-tostring/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-lombok-tostring/src/main/resources/openapi.yaml index 31074771d9fb..aa6fc7e42167 100644 --- a/samples/server/petstore/springboot-lombok-tostring/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-lombok-tostring/src/main/resources/openapi.yaml @@ -705,12 +705,12 @@ components: Order: description: An order for a pets from the pet store example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -741,8 +741,8 @@ components: Category: description: A category for a pet example: - name: name id: 6 + name: name properties: id: format: int64 @@ -757,14 +757,14 @@ components: User: description: A User who is purchasing from the pet store example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -792,8 +792,8 @@ components: Tag: description: A tag for a pet example: - name: name id: 1 + name: name properties: id: format: int64 @@ -807,19 +807,19 @@ components: Pet: description: A pet for sale in the pet store example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: diff --git a/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/PetApiDelegate.java b/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/PetApiDelegate.java index 0bcaef8f0af9..5f3db6dda7f9 100644 --- a/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/PetApiDelegate.java +++ b/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/PetApiDelegate.java @@ -40,7 +40,7 @@ default ResponseEntity addPet(Pet pet) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + String exampleString = "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -83,7 +83,7 @@ default ResponseEntity> findPetsByStatus(List status) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -113,7 +113,7 @@ default ResponseEntity> findPetsByTags(List tags) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -142,7 +142,7 @@ default ResponseEntity getPetById(Long petId) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + String exampleString = "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -174,7 +174,7 @@ default ResponseEntity updatePet(Pet pet) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + String exampleString = "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/StoreApiDelegate.java b/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/StoreApiDelegate.java index 3b0fbe6db4ae..25518ec5898b 100644 --- a/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/StoreApiDelegate.java +++ b/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/StoreApiDelegate.java @@ -66,7 +66,7 @@ default ResponseEntity getOrderById(Long orderId) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -94,7 +94,7 @@ default ResponseEntity placeOrder(Order order) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/UserApiDelegate.java b/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/UserApiDelegate.java index d7bae957061b..b9e8850b4e83 100644 --- a/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/UserApiDelegate.java +++ b/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/java/org/openapitools/api/UserApiDelegate.java @@ -93,7 +93,7 @@ default ResponseEntity getUserByName(String username) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"password\" : \"password\", \"userStatus\" : 6, \"phone\" : \"phone\", \"id\" : 0, \"email\" : \"email\", \"username\" : \"username\" }"; + String exampleString = "{ \"id\" : 0, \"username\" : \"username\", \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"email\" : \"email\", \"password\" : \"password\", \"phone\" : \"phone\", \"userStatus\" : 6 }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/resources/openapi.yaml index de94a4fcc912..b7247a9f5179 100644 --- a/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-petstore-with-api-response-examples/src/main/resources/openapi.yaml @@ -800,12 +800,12 @@ components: Order: description: An order for a pets from the pet store example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -836,8 +836,8 @@ components: Category: description: A category for a pet example: - name: name id: 6 + name: name properties: id: format: int64 @@ -852,14 +852,14 @@ components: User: description: A User who is purchasing from the pet store example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -887,8 +887,8 @@ components: Tag: description: A tag for a pet example: - name: name id: 1 + name: name properties: id: format: int64 @@ -902,19 +902,19 @@ components: Pet: description: A pet for sale in the pet store example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: name id: 6 + name: name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 31fb21c743c0..edeb6a3b1bd8 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -312,7 +312,7 @@ public void setAnytype1(@Nullable Object anytype1) { this.anytype1 = anytype1; } - public AdditionalPropertiesClass anytype2(Object anytype2) { + public AdditionalPropertiesClass anytype2(JsonNullable anytype2) { this.anytype2 = JsonNullable.of(anytype2); return this; } diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/BigCat.java index 0b8bd86e0136..54dc118a6e44 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/BigCat.java @@ -102,7 +102,7 @@ public void setKind(@Nullable KindEnum kind) { } - public BigCat declawed(Boolean declawed) { + public BigCat declawed(@Nullable Boolean declawed) { super.declawed(declawed); return this; } diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ChildWithNullable.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ChildWithNullable.java index d841f7752340..f90958041da4 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ChildWithNullable.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ChildWithNullable.java @@ -54,12 +54,12 @@ public void setOtherProperty(@Nullable String otherProperty) { } - public ChildWithNullable type(TypeEnum type) { + public ChildWithNullable type(@Nullable TypeEnum type) { super.type(type); return this; } - public ChildWithNullable nullableProperty(String nullableProperty) { + public ChildWithNullable nullableProperty(JsonNullable nullableProperty) { super.nullableProperty(nullableProperty); return this; } diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ContainerDefaultValue.java index b54195b47503..99dfeb81b3c8 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -51,7 +51,7 @@ public ContainerDefaultValue(List nullableRequiredArray, List re this.requiredArray = requiredArray; } - public ContainerDefaultValue nullableArray(List nullableArray) { + public ContainerDefaultValue nullableArray(JsonNullable> nullableArray) { this.nullableArray = JsonNullable.of(nullableArray); return this; } @@ -79,7 +79,7 @@ public void setNullableArray(JsonNullable> nullableArray) { this.nullableArray = nullableArray; } - public ContainerDefaultValue nullableRequiredArray(List nullableRequiredArray) { + public ContainerDefaultValue nullableRequiredArray(JsonNullable> nullableRequiredArray) { this.nullableRequiredArray = JsonNullable.of(nullableRequiredArray); return this; } @@ -137,7 +137,7 @@ public void setRequiredArray(List requiredArray) { this.requiredArray = requiredArray; } - public ContainerDefaultValue nullableArrayWithDefault(List nullableArrayWithDefault) { + public ContainerDefaultValue nullableArrayWithDefault(JsonNullable> nullableArrayWithDefault) { this.nullableArrayWithDefault = JsonNullable.of(nullableArrayWithDefault); return this; } diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/NullableMapProperty.java index 85b9061b4838..f9956d4a5d52 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -30,7 +30,7 @@ public class NullableMapProperty { @Valid private JsonNullable> languageValues = JsonNullable.>undefined(); - public NullableMapProperty languageValues(Map languageValues) { + public NullableMapProperty languageValues(JsonNullable> languageValues) { this.languageValues = JsonNullable.of(languageValues); return this; } diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ParentWithNullable.java b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ParentWithNullable.java index 1d88649a8fca..652eef33f398 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ParentWithNullable.java +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/java/org/openapitools/model/ParentWithNullable.java @@ -96,7 +96,7 @@ public void setType(@Nullable TypeEnum type) { this.type = type; } - public ParentWithNullable nullableProperty(String nullableProperty) { + public ParentWithNullable nullableProperty(JsonNullable nullableProperty) { this.nullableProperty = JsonNullable.of(nullableProperty); return this; } diff --git a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/resources/openapi.yaml index cb8da56b1462..3ee3d2f2941d 100644 --- a/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-reactive-noResponseEntity/src/main/resources/openapi.yaml @@ -1315,12 +1315,12 @@ components: schemas: Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1349,8 +1349,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1365,14 +1365,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1399,8 +1399,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1412,19 +1412,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1912,8 +1912,8 @@ components: type: string OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -1951,9 +1951,9 @@ components: type: string type: object example: - otherProperty: otherProperty - nullableProperty: nullableProperty type: ChildWithNullable + nullableProperty: nullableProperty + otherProperty: otherProperty StringBooleanMap: additionalProperties: type: boolean @@ -2264,10 +2264,10 @@ components: type: object ResponseObjectWithDifferentFieldNames: example: + normalPropertyName: normalPropertyName UPPER_CASE_PROPERTY_SNAKE: UPPER_CASE_PROPERTY_SNAKE lower-case-property-dashes: lower-case-property-dashes property name with spaces: property name with spaces - normalPropertyName: normalPropertyName properties: normalPropertyName: type: string diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java index adb6ffe1f80a..1480803ef709 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/FakeApiDelegate.java @@ -95,7 +95,7 @@ default Mono> fakeOuterCompositeSerialize(Mono> responseObje exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); for (MediaType mediaType : exchange.getRequest().getHeaders().getAccept()) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\", \"normalPropertyName\" : \"normalPropertyName\" }"; + String exampleString = "{ \"normalPropertyName\" : \"normalPropertyName\", \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\" }"; result = ApiUtil.getExampleResponse(exchange, MediaType.valueOf("application/json"), exampleString); break; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiDelegate.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiDelegate.java index f750aec24c8e..ba4dff9e2128 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiDelegate.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/PetApiDelegate.java @@ -90,7 +90,7 @@ default Mono>> findPetsByStatus(List status, exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); for (MediaType mediaType : exchange.getRequest().getHeaders().getAccept()) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; result = ApiUtil.getExampleResponse(exchange, MediaType.valueOf("application/json"), exampleString); break; } @@ -125,7 +125,7 @@ default Mono>> findPetsByTags(Set tags, exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); for (MediaType mediaType : exchange.getRequest().getHeaders().getAccept()) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; result = ApiUtil.getExampleResponse(exchange, MediaType.valueOf("application/json"), exampleString); break; } @@ -159,7 +159,7 @@ default Mono> getPetById(Long petId, exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); for (MediaType mediaType : exchange.getRequest().getHeaders().getAccept()) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + String exampleString = "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }"; result = ApiUtil.getExampleResponse(exchange, MediaType.valueOf("application/json"), exampleString); break; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiDelegate.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiDelegate.java index 1b67561ff65d..527a815e3d5d 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiDelegate.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/StoreApiDelegate.java @@ -84,7 +84,7 @@ default Mono> getOrderById(Long orderId, exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); for (MediaType mediaType : exchange.getRequest().getHeaders().getAccept()) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; result = ApiUtil.getExampleResponse(exchange, MediaType.valueOf("application/json"), exampleString); break; } @@ -117,7 +117,7 @@ default Mono> placeOrder(Mono order, exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); for (MediaType mediaType : exchange.getRequest().getHeaders().getAccept()) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; result = ApiUtil.getExampleResponse(exchange, MediaType.valueOf("application/json"), exampleString); break; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApiDelegate.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApiDelegate.java index 1e44acc84385..5850c0b9cd6d 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApiDelegate.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/api/UserApiDelegate.java @@ -124,7 +124,7 @@ default Mono> getUserByName(String username, exchange.getResponse().setStatusCode(HttpStatus.NOT_IMPLEMENTED); for (MediaType mediaType : exchange.getRequest().getHeaders().getAccept()) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"password\" : \"password\", \"userStatus\" : 6, \"phone\" : \"phone\", \"id\" : 0, \"email\" : \"email\", \"username\" : \"username\" }"; + String exampleString = "{ \"id\" : 0, \"username\" : \"username\", \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"email\" : \"email\", \"password\" : \"password\", \"phone\" : \"phone\", \"userStatus\" : 6 }"; result = ApiUtil.getExampleResponse(exchange, MediaType.valueOf("application/json"), exampleString); break; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 31fb21c743c0..edeb6a3b1bd8 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -312,7 +312,7 @@ public void setAnytype1(@Nullable Object anytype1) { this.anytype1 = anytype1; } - public AdditionalPropertiesClass anytype2(Object anytype2) { + public AdditionalPropertiesClass anytype2(JsonNullable anytype2) { this.anytype2 = JsonNullable.of(anytype2); return this; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCat.java index 0b8bd86e0136..54dc118a6e44 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/BigCat.java @@ -102,7 +102,7 @@ public void setKind(@Nullable KindEnum kind) { } - public BigCat declawed(Boolean declawed) { + public BigCat declawed(@Nullable Boolean declawed) { super.declawed(declawed); return this; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ChildWithNullable.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ChildWithNullable.java index d841f7752340..f90958041da4 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ChildWithNullable.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ChildWithNullable.java @@ -54,12 +54,12 @@ public void setOtherProperty(@Nullable String otherProperty) { } - public ChildWithNullable type(TypeEnum type) { + public ChildWithNullable type(@Nullable TypeEnum type) { super.type(type); return this; } - public ChildWithNullable nullableProperty(String nullableProperty) { + public ChildWithNullable nullableProperty(JsonNullable nullableProperty) { super.nullableProperty(nullableProperty); return this; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java index b54195b47503..99dfeb81b3c8 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -51,7 +51,7 @@ public ContainerDefaultValue(List nullableRequiredArray, List re this.requiredArray = requiredArray; } - public ContainerDefaultValue nullableArray(List nullableArray) { + public ContainerDefaultValue nullableArray(JsonNullable> nullableArray) { this.nullableArray = JsonNullable.of(nullableArray); return this; } @@ -79,7 +79,7 @@ public void setNullableArray(JsonNullable> nullableArray) { this.nullableArray = nullableArray; } - public ContainerDefaultValue nullableRequiredArray(List nullableRequiredArray) { + public ContainerDefaultValue nullableRequiredArray(JsonNullable> nullableRequiredArray) { this.nullableRequiredArray = JsonNullable.of(nullableRequiredArray); return this; } @@ -137,7 +137,7 @@ public void setRequiredArray(List requiredArray) { this.requiredArray = requiredArray; } - public ContainerDefaultValue nullableArrayWithDefault(List nullableArrayWithDefault) { + public ContainerDefaultValue nullableArrayWithDefault(JsonNullable> nullableArrayWithDefault) { this.nullableArrayWithDefault = JsonNullable.of(nullableArrayWithDefault); return this; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NullableMapProperty.java index 85b9061b4838..f9956d4a5d52 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -30,7 +30,7 @@ public class NullableMapProperty { @Valid private JsonNullable> languageValues = JsonNullable.>undefined(); - public NullableMapProperty languageValues(Map languageValues) { + public NullableMapProperty languageValues(JsonNullable> languageValues) { this.languageValues = JsonNullable.of(languageValues); return this; } diff --git a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ParentWithNullable.java b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ParentWithNullable.java index 1d88649a8fca..652eef33f398 100644 --- a/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ParentWithNullable.java +++ b/samples/server/petstore/springboot-reactive/src/main/java/org/openapitools/model/ParentWithNullable.java @@ -96,7 +96,7 @@ public void setType(@Nullable TypeEnum type) { this.type = type; } - public ParentWithNullable nullableProperty(String nullableProperty) { + public ParentWithNullable nullableProperty(JsonNullable nullableProperty) { this.nullableProperty = JsonNullable.of(nullableProperty); return this; } 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 cb8da56b1462..3ee3d2f2941d 100644 --- a/samples/server/petstore/springboot-reactive/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-reactive/src/main/resources/openapi.yaml @@ -1315,12 +1315,12 @@ components: schemas: Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1349,8 +1349,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1365,14 +1365,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1399,8 +1399,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1412,19 +1412,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1912,8 +1912,8 @@ components: type: string OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -1951,9 +1951,9 @@ components: type: string type: object example: - otherProperty: otherProperty - nullableProperty: nullableProperty type: ChildWithNullable + nullableProperty: nullableProperty + otherProperty: otherProperty StringBooleanMap: additionalProperties: type: boolean @@ -2264,10 +2264,10 @@ components: type: object ResponseObjectWithDifferentFieldNames: example: + normalPropertyName: normalPropertyName UPPER_CASE_PROPERTY_SNAKE: UPPER_CASE_PROPERTY_SNAKE lower-case-property-dashes: lower-case-property-dashes property name with spaces: property name with spaces - normalPropertyName: normalPropertyName properties: normalPropertyName: type: string diff --git a/samples/server/petstore/springboot-sort-validation/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-sort-validation/src/main/resources/openapi.yaml index a656feda6c06..295696bfc7fe 100644 --- a/samples/server/petstore/springboot-sort-validation/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-sort-validation/src/main/resources/openapi.yaml @@ -792,8 +792,8 @@ components: type: string Pet: example: - name: name id: 0 + name: name status: status properties: id: diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java index db7118533c71..7c49a174fc4e 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/FakeApiDelegate.java @@ -74,7 +74,7 @@ default ResponseEntity fakeOuterCompositeSerialize(OuterComposit getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("*/*"))) { - String exampleString = "{ \"my_string\" : \"my_string\", \"my_number\" : 0.8008281904610115, \"my_boolean\" : true }"; + String exampleString = "{ \"my_number\" : 0.8008281904610115, \"my_string\" : \"my_string\", \"my_boolean\" : true }"; ApiUtil.setExampleResponse(request, "*/*", exampleString); break; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/PetApiDelegate.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/PetApiDelegate.java index c5b2f8e2f1a6..811c82055d4b 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/PetApiDelegate.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/PetApiDelegate.java @@ -73,7 +73,7 @@ default ResponseEntity> findPetsByStatus(List status, final Pa getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -105,7 +105,7 @@ default ResponseEntity> findPetsByTags(List tags, getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -134,7 +134,7 @@ default ResponseEntity getPetById(Long petId) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + String exampleString = "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -160,7 +160,7 @@ default ResponseEntity> listAllPets(final Pageable pageable) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApiDelegate.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApiDelegate.java index 038521a016e8..9c061577406c 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApiDelegate.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/StoreApiDelegate.java @@ -66,7 +66,7 @@ default ResponseEntity getOrderById(Long orderId) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -93,7 +93,7 @@ default ResponseEntity placeOrder(Order body) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApiDelegate.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApiDelegate.java index b1a2aca6d9f8..234c9f61f8c6 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApiDelegate.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8/src/main/java/org/openapitools/api/UserApiDelegate.java @@ -90,7 +90,7 @@ default ResponseEntity getUserByName(String username) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"password\" : \"password\", \"userStatus\" : 6, \"phone\" : \"phone\", \"id\" : 0, \"email\" : \"email\", \"username\" : \"username\" }"; + String exampleString = "{ \"id\" : 0, \"username\" : \"username\", \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"email\" : \"email\", \"password\" : \"password\", \"phone\" : \"phone\", \"userStatus\" : 6 }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } 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 838ef8c6ecaa..6427fc28083e 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 @@ -1554,12 +1554,12 @@ components: schemas: Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1588,8 +1588,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1604,14 +1604,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1638,8 +1638,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1651,19 +1651,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -2156,8 +2156,8 @@ components: type: string OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApiDelegate.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApiDelegate.java index db7118533c71..7c49a174fc4e 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApiDelegate.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/FakeApiDelegate.java @@ -74,7 +74,7 @@ default ResponseEntity fakeOuterCompositeSerialize(OuterComposit getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("*/*"))) { - String exampleString = "{ \"my_string\" : \"my_string\", \"my_number\" : 0.8008281904610115, \"my_boolean\" : true }"; + String exampleString = "{ \"my_number\" : 0.8008281904610115, \"my_string\" : \"my_string\", \"my_boolean\" : true }"; ApiUtil.setExampleResponse(request, "*/*", exampleString); break; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApiDelegate.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApiDelegate.java index c5b2f8e2f1a6..811c82055d4b 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApiDelegate.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/PetApiDelegate.java @@ -73,7 +73,7 @@ default ResponseEntity> findPetsByStatus(List status, final Pa getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -105,7 +105,7 @@ default ResponseEntity> findPetsByTags(List tags, getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -134,7 +134,7 @@ default ResponseEntity getPetById(Long petId) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + String exampleString = "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -160,7 +160,7 @@ default ResponseEntity> listAllPets(final Pageable pageable) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApiDelegate.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApiDelegate.java index 038521a016e8..9c061577406c 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApiDelegate.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/StoreApiDelegate.java @@ -66,7 +66,7 @@ default ResponseEntity getOrderById(Long orderId) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -93,7 +93,7 @@ default ResponseEntity placeOrder(Order body) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApiDelegate.java b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApiDelegate.java index b1a2aca6d9f8..234c9f61f8c6 100644 --- a/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApiDelegate.java +++ b/samples/server/petstore/springboot-spring-pageable-delegatePattern/src/main/java/org/openapitools/api/UserApiDelegate.java @@ -90,7 +90,7 @@ default ResponseEntity getUserByName(String username) { getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"password\" : \"password\", \"userStatus\" : 6, \"phone\" : \"phone\", \"id\" : 0, \"email\" : \"email\", \"username\" : \"username\" }"; + String exampleString = "{ \"id\" : 0, \"username\" : \"username\", \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"email\" : \"email\", \"password\" : \"password\", \"phone\" : \"phone\", \"userStatus\" : 6 }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } 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 838ef8c6ecaa..6427fc28083e 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 @@ -1554,12 +1554,12 @@ components: schemas: Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1588,8 +1588,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1604,14 +1604,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1638,8 +1638,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1651,19 +1651,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -2156,8 +2156,8 @@ components: type: string OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java index d8f2eb1cc1ee..2cd071ac00f5 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/FakeApi.java @@ -143,7 +143,7 @@ default ResponseEntity fakeOuterCompositeSerialize( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("*/*"))) { - String exampleString = "{ \"my_string\" : \"my_string\", \"my_number\" : 0.8008281904610115, \"my_boolean\" : true }"; + String exampleString = "{ \"my_number\" : 0.8008281904610115, \"my_string\" : \"my_string\", \"my_boolean\" : true }"; ApiUtil.setExampleResponse(request, "*/*", exampleString); break; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/PetApi.java index 93bd20062c90..636fda1498a0 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/PetApi.java @@ -153,7 +153,7 @@ default ResponseEntity> findPetsByStatus( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -211,7 +211,7 @@ default ResponseEntity> findPetsByTags( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -265,7 +265,7 @@ default ResponseEntity getPetById( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + String exampleString = "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -314,7 +314,7 @@ default ResponseEntity> listAllPets( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApi.java index 7056b43c96ab..3b699c2ea9bb 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/StoreApi.java @@ -143,7 +143,7 @@ default ResponseEntity getOrderById( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -190,7 +190,7 @@ default ResponseEntity placeOrder( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/UserApi.java index 4eaa2581b5a6..b0ecdb8a5126 100644 --- a/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-spring-pageable-without-j8/src/main/java/org/openapitools/api/UserApi.java @@ -190,7 +190,7 @@ default ResponseEntity getUserByName( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"password\" : \"password\", \"userStatus\" : 6, \"phone\" : \"phone\", \"id\" : 0, \"email\" : \"email\", \"username\" : \"username\" }"; + String exampleString = "{ \"id\" : 0, \"username\" : \"username\", \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"email\" : \"email\", \"password\" : \"password\", \"phone\" : \"phone\", \"userStatus\" : 6 }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } 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 838ef8c6ecaa..6427fc28083e 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 @@ -1554,12 +1554,12 @@ components: schemas: Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1588,8 +1588,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1604,14 +1604,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1638,8 +1638,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1651,19 +1651,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -2156,8 +2156,8 @@ components: type: string OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java index d8f2eb1cc1ee..2cd071ac00f5 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/FakeApi.java @@ -143,7 +143,7 @@ default ResponseEntity fakeOuterCompositeSerialize( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("*/*"))) { - String exampleString = "{ \"my_string\" : \"my_string\", \"my_number\" : 0.8008281904610115, \"my_boolean\" : true }"; + String exampleString = "{ \"my_number\" : 0.8008281904610115, \"my_string\" : \"my_string\", \"my_boolean\" : true }"; ApiUtil.setExampleResponse(request, "*/*", exampleString); break; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/PetApi.java index 93bd20062c90..636fda1498a0 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/PetApi.java @@ -153,7 +153,7 @@ default ResponseEntity> findPetsByStatus( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -211,7 +211,7 @@ default ResponseEntity> findPetsByTags( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -265,7 +265,7 @@ default ResponseEntity getPetById( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + String exampleString = "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -314,7 +314,7 @@ default ResponseEntity> listAllPets( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java index 7056b43c96ab..3b699c2ea9bb 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/StoreApi.java @@ -143,7 +143,7 @@ default ResponseEntity getOrderById( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -190,7 +190,7 @@ default ResponseEntity placeOrder( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/UserApi.java index 4eaa2581b5a6..b0ecdb8a5126 100644 --- a/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-spring-pageable/src/main/java/org/openapitools/api/UserApi.java @@ -190,7 +190,7 @@ default ResponseEntity getUserByName( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"password\" : \"password\", \"userStatus\" : 6, \"phone\" : \"phone\", \"id\" : 0, \"email\" : \"email\", \"username\" : \"username\" }"; + String exampleString = "{ \"id\" : 0, \"username\" : \"username\", \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"email\" : \"email\", \"password\" : \"password\", \"phone\" : \"phone\", \"userStatus\" : 6 }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } 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 838ef8c6ecaa..6427fc28083e 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 @@ -1554,12 +1554,12 @@ components: schemas: Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1588,8 +1588,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1604,14 +1604,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1638,8 +1638,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1651,19 +1651,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -2156,8 +2156,8 @@ components: type: string OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java index 92ec5bbcd6ed..58bfce304442 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/FakeApi.java @@ -147,7 +147,7 @@ default ResponseEntity fakeOuterCompositeSerialize( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("*/*"))) { - String exampleString = "{ \"my_string\" : \"my_string\", \"my_number\" : 0.8008281904610115, \"my_boolean\" : true }"; + String exampleString = "{ \"my_number\" : 0.8008281904610115, \"my_string\" : \"my_string\", \"my_boolean\" : true }"; ApiUtil.setExampleResponse(request, "*/*", exampleString); break; } @@ -249,7 +249,7 @@ default ResponseEntity responseObjectDiff getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\", \"normalPropertyName\" : \"normalPropertyName\" }"; + String exampleString = "{ \"normalPropertyName\" : \"normalPropertyName\", \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java index 9970141906f0..13352abc3b84 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/PetApi.java @@ -152,7 +152,7 @@ default ResponseEntity> findPetsByStatus( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -207,7 +207,7 @@ default ResponseEntity> findPetsByTags( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -261,7 +261,7 @@ default ResponseEntity getPetById( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + String exampleString = "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java index e178ae562118..b5dc0c07a165 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/StoreApi.java @@ -143,7 +143,7 @@ default ResponseEntity getOrderById( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -193,7 +193,7 @@ default ResponseEntity placeOrder( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java index 4107908070c5..c961a8a861db 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/api/UserApi.java @@ -199,7 +199,7 @@ default ResponseEntity getUserByName( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"password\" : \"password\", \"userStatus\" : 6, \"phone\" : \"phone\", \"id\" : 0, \"email\" : \"email\", \"username\" : \"username\" }"; + String exampleString = "{ \"id\" : 0, \"username\" : \"username\", \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"email\" : \"email\", \"password\" : \"password\", \"phone\" : \"phone\", \"userStatus\" : 6 }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java index 8b44a3850741..b488f6463721 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesAnyType.java @@ -28,7 +28,7 @@ public class AdditionalPropertiesAnyType { private Optional name = Optional.empty(); - public AdditionalPropertiesAnyType name(String name) { + public AdditionalPropertiesAnyType name(Optional name) { this.name = Optional.ofNullable(name); return this; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java index 522235f40964..4025d6f73d4f 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesArray.java @@ -29,7 +29,7 @@ public class AdditionalPropertiesArray { private Optional name = Optional.empty(); - public AdditionalPropertiesArray name(String name) { + public AdditionalPropertiesArray name(Optional name) { this.name = Optional.ofNullable(name); return this; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java index 3e51f89b4caa..592ad9fc8d82 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesBoolean.java @@ -28,7 +28,7 @@ public class AdditionalPropertiesBoolean { private Optional name = Optional.empty(); - public AdditionalPropertiesBoolean name(String name) { + public AdditionalPropertiesBoolean name(Optional name) { this.name = Optional.ofNullable(name); return this; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java index 9ed59dd15a1e..539f4dad4239 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesClass.java @@ -291,7 +291,7 @@ public void setMapMapAnytype(Map> mapMapAnytype) { this.mapMapAnytype = mapMapAnytype; } - public AdditionalPropertiesClass anytype1(Object anytype1) { + public AdditionalPropertiesClass anytype1(Optional anytype1) { this.anytype1 = Optional.ofNullable(anytype1); return this; } @@ -312,7 +312,7 @@ public void setAnytype1(Optional anytype1) { this.anytype1 = anytype1; } - public AdditionalPropertiesClass anytype2(Object anytype2) { + public AdditionalPropertiesClass anytype2(JsonNullable anytype2) { this.anytype2 = JsonNullable.of(anytype2); return this; } @@ -332,7 +332,7 @@ public void setAnytype2(JsonNullable anytype2) { this.anytype2 = anytype2; } - public AdditionalPropertiesClass anytype3(Object anytype3) { + public AdditionalPropertiesClass anytype3(Optional anytype3) { this.anytype3 = Optional.ofNullable(anytype3); return this; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java index 101545aaa17a..6a8f5975a7b1 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesInteger.java @@ -28,7 +28,7 @@ public class AdditionalPropertiesInteger { private Optional name = Optional.empty(); - public AdditionalPropertiesInteger name(String name) { + public AdditionalPropertiesInteger name(Optional name) { this.name = Optional.ofNullable(name); return this; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java index 8aad13c2e8c4..f5163f7679b7 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesNumber.java @@ -29,7 +29,7 @@ public class AdditionalPropertiesNumber { private Optional name = Optional.empty(); - public AdditionalPropertiesNumber name(String name) { + public AdditionalPropertiesNumber name(Optional name) { this.name = Optional.ofNullable(name); return this; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java index afed6c64df3f..d96a8b6ac61f 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesObject.java @@ -29,7 +29,7 @@ public class AdditionalPropertiesObject { private Optional name = Optional.empty(); - public AdditionalPropertiesObject name(String name) { + public AdditionalPropertiesObject name(Optional name) { this.name = Optional.ofNullable(name); return this; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java index 95c4670132cc..68f0cae2b480 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/AdditionalPropertiesString.java @@ -28,7 +28,7 @@ public class AdditionalPropertiesString { private Optional name = Optional.empty(); - public AdditionalPropertiesString name(String name) { + public AdditionalPropertiesString name(Optional name) { this.name = Optional.ofNullable(name); return this; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java index 9a41cdd5c456..d68a4f49c770 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Animal.java @@ -72,7 +72,7 @@ public void setClassName(String className) { this.className = className; } - public Animal color(String color) { + public Animal color(Optional color) { this.color = Optional.ofNullable(color); return this; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java index df822b555b35..15163ccfc09f 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/BigCat.java @@ -80,7 +80,7 @@ public BigCat(String className) { super(className); } - public BigCat kind(KindEnum kind) { + public BigCat kind(Optional kind) { this.kind = Optional.ofNullable(kind); return this; } @@ -102,7 +102,7 @@ public void setKind(Optional kind) { } - public BigCat declawed(Boolean declawed) { + public BigCat declawed(Optional declawed) { super.declawed(declawed); return this; } @@ -112,7 +112,7 @@ public BigCat className(String className) { return this; } - public BigCat color(String color) { + public BigCat color(Optional color) { super.color(color); return this; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Capitalization.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Capitalization.java index 38e3afccd603..b62b26ee3974 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Capitalization.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Capitalization.java @@ -34,7 +34,7 @@ public class Capitalization { private Optional ATT_NAME = Optional.empty(); - public Capitalization smallCamel(String smallCamel) { + public Capitalization smallCamel(Optional smallCamel) { this.smallCamel = Optional.ofNullable(smallCamel); return this; } @@ -55,7 +55,7 @@ public void setSmallCamel(Optional smallCamel) { this.smallCamel = smallCamel; } - public Capitalization capitalCamel(String capitalCamel) { + public Capitalization capitalCamel(Optional capitalCamel) { this.capitalCamel = Optional.ofNullable(capitalCamel); return this; } @@ -76,7 +76,7 @@ public void setCapitalCamel(Optional capitalCamel) { this.capitalCamel = capitalCamel; } - public Capitalization smallSnake(String smallSnake) { + public Capitalization smallSnake(Optional smallSnake) { this.smallSnake = Optional.ofNullable(smallSnake); return this; } @@ -97,7 +97,7 @@ public void setSmallSnake(Optional smallSnake) { this.smallSnake = smallSnake; } - public Capitalization capitalSnake(String capitalSnake) { + public Capitalization capitalSnake(Optional capitalSnake) { this.capitalSnake = Optional.ofNullable(capitalSnake); return this; } @@ -118,7 +118,7 @@ public void setCapitalSnake(Optional capitalSnake) { this.capitalSnake = capitalSnake; } - public Capitalization scAETHFlowPoints(String scAETHFlowPoints) { + public Capitalization scAETHFlowPoints(Optional scAETHFlowPoints) { this.scAETHFlowPoints = Optional.ofNullable(scAETHFlowPoints); return this; } @@ -139,7 +139,7 @@ public void setScAETHFlowPoints(Optional scAETHFlowPoints) { this.scAETHFlowPoints = scAETHFlowPoints; } - public Capitalization ATT_NAME(String ATT_NAME) { + public Capitalization ATT_NAME(Optional ATT_NAME) { this.ATT_NAME = Optional.ofNullable(ATT_NAME); return this; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java index 8ee5f405c493..baaac4a16a8c 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Cat.java @@ -48,7 +48,7 @@ public Cat(String className) { super(className); } - public Cat declawed(Boolean declawed) { + public Cat declawed(Optional declawed) { this.declawed = Optional.ofNullable(declawed); return this; } @@ -75,7 +75,7 @@ public Cat className(String className) { return this; } - public Cat color(String color) { + public Cat color(Optional color) { super.color(color); return this; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Category.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Category.java index e241ffe5ac5e..bfb631d5b96a 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Category.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Category.java @@ -37,7 +37,7 @@ public Category(String name) { this.name = name; } - public Category id(Long id) { + public Category id(Optional id) { this.id = Optional.ofNullable(id); return this; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ChildWithNullable.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ChildWithNullable.java index 84f95d6e8e83..d2886161daf2 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ChildWithNullable.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ChildWithNullable.java @@ -32,7 +32,7 @@ public class ChildWithNullable extends ParentWithNullable { private Optional otherProperty = Optional.empty(); - public ChildWithNullable otherProperty(String otherProperty) { + public ChildWithNullable otherProperty(Optional otherProperty) { this.otherProperty = Optional.ofNullable(otherProperty); return this; } @@ -54,12 +54,12 @@ public void setOtherProperty(Optional otherProperty) { } - public ChildWithNullable type(TypeEnum type) { + public ChildWithNullable type(Optional type) { super.type(type); return this; } - public ChildWithNullable nullableProperty(String nullableProperty) { + public ChildWithNullable nullableProperty(JsonNullable nullableProperty) { super.nullableProperty(nullableProperty); return this; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ClassModel.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ClassModel.java index ee9f00da59d3..5e310931ae4f 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ClassModel.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ClassModel.java @@ -25,7 +25,7 @@ public class ClassModel { private Optional propertyClass = Optional.empty(); - public ClassModel propertyClass(String propertyClass) { + public ClassModel propertyClass(Optional propertyClass) { this.propertyClass = Optional.ofNullable(propertyClass); return this; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Client.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Client.java index c95d57e03fed..e8ce4a1b7692 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Client.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Client.java @@ -24,7 +24,7 @@ public class Client { private Optional client = Optional.empty(); - public Client client(String client) { + public Client client(Optional client) { this.client = Optional.ofNullable(client); return this; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ContainerDefaultValue.java index 39ede5ac601b..d869f4017f34 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ContainerDefaultValue.java @@ -51,7 +51,7 @@ public ContainerDefaultValue(List nullableRequiredArray, List re this.requiredArray = requiredArray; } - public ContainerDefaultValue nullableArray(List nullableArray) { + public ContainerDefaultValue nullableArray(JsonNullable> nullableArray) { this.nullableArray = JsonNullable.of(nullableArray); return this; } @@ -79,7 +79,7 @@ public void setNullableArray(JsonNullable> nullableArray) { this.nullableArray = nullableArray; } - public ContainerDefaultValue nullableRequiredArray(List nullableRequiredArray) { + public ContainerDefaultValue nullableRequiredArray(JsonNullable> nullableRequiredArray) { this.nullableRequiredArray = JsonNullable.of(nullableRequiredArray); return this; } @@ -137,7 +137,7 @@ public void setRequiredArray(List requiredArray) { this.requiredArray = requiredArray; } - public ContainerDefaultValue nullableArrayWithDefault(List nullableArrayWithDefault) { + public ContainerDefaultValue nullableArrayWithDefault(JsonNullable> nullableArrayWithDefault) { this.nullableArrayWithDefault = JsonNullable.of(nullableArrayWithDefault); return this; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java index 1625b230ec9c..e37eed244dd9 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Dog.java @@ -40,7 +40,7 @@ public Dog(String className) { super(className); } - public Dog breed(String breed) { + public Dog breed(Optional breed) { this.breed = Optional.ofNullable(breed); return this; } @@ -67,7 +67,7 @@ public Dog className(String className) { return this; } - public Dog color(String color) { + public Dog color(Optional color) { super.color(color); return this; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java index d72a55a278f6..db280ebb0ccf 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumArrays.java @@ -101,7 +101,7 @@ public static ArrayEnumEnum fromValue(String value) { @Valid private List arrayEnum = new ArrayList<>(); - public EnumArrays justSymbol(JustSymbolEnum justSymbol) { + public EnumArrays justSymbol(Optional justSymbol) { this.justSymbol = Optional.ofNullable(justSymbol); return this; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java index 5df657b739a9..53a7323791b2 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/EnumTest.java @@ -191,7 +191,7 @@ public EnumTest(EnumStringRequiredEnum enumStringRequired) { this.enumStringRequired = enumStringRequired; } - public EnumTest enumString(EnumStringEnum enumString) { + public EnumTest enumString(Optional enumString) { this.enumString = Optional.ofNullable(enumString); return this; } @@ -233,7 +233,7 @@ public void setEnumStringRequired(EnumStringRequiredEnum enumStringRequired) { this.enumStringRequired = enumStringRequired; } - public EnumTest enumInteger(EnumIntegerEnum enumInteger) { + public EnumTest enumInteger(Optional enumInteger) { this.enumInteger = Optional.ofNullable(enumInteger); return this; } @@ -254,7 +254,7 @@ public void setEnumInteger(Optional enumInteger) { this.enumInteger = enumInteger; } - public EnumTest enumNumber(EnumNumberEnum enumNumber) { + public EnumTest enumNumber(Optional enumNumber) { this.enumNumber = Optional.ofNullable(enumNumber); return this; } @@ -275,7 +275,7 @@ public void setEnumNumber(Optional enumNumber) { this.enumNumber = enumNumber; } - public EnumTest outerEnum(OuterEnum outerEnum) { + public EnumTest outerEnum(Optional outerEnum) { this.outerEnum = Optional.ofNullable(outerEnum); return this; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/File.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/File.java index 310c2bccf6e9..a41342381b01 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/File.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/File.java @@ -25,7 +25,7 @@ public class File { private Optional sourceURI = Optional.empty(); - public File sourceURI(String sourceURI) { + public File sourceURI(Optional sourceURI) { this.sourceURI = Optional.ofNullable(sourceURI); return this; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java index 2d6868eb9a26..705e7627801e 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FileSchemaTestClass.java @@ -31,7 +31,7 @@ public class FileSchemaTestClass { @Valid private List<@Valid File> files = new ArrayList<>(); - public FileSchemaTestClass file(File file) { + public FileSchemaTestClass file(Optional file) { this.file = Optional.ofNullable(file); return this; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FormatTest.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FormatTest.java index 9029d70bb8ee..19a379ac9c94 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FormatTest.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/FormatTest.java @@ -74,7 +74,7 @@ public FormatTest(BigDecimal number, byte[] _byte, LocalDate date, String passwo this.password = password; } - public FormatTest integer(Integer integer) { + public FormatTest integer(Optional integer) { this.integer = Optional.ofNullable(integer); return this; } @@ -97,7 +97,7 @@ public void setInteger(Optional integer) { this.integer = integer; } - public FormatTest int32(Integer int32) { + public FormatTest int32(Optional int32) { this.int32 = Optional.ofNullable(int32); return this; } @@ -120,7 +120,7 @@ public void setInt32(Optional int32) { this.int32 = int32; } - public FormatTest int64(Long int64) { + public FormatTest int64(Optional int64) { this.int64 = Optional.ofNullable(int64); return this; } @@ -164,7 +164,7 @@ public void setNumber(BigDecimal number) { this.number = number; } - public FormatTest _float(Float _float) { + public FormatTest _float(Optional _float) { this._float = Optional.ofNullable(_float); return this; } @@ -187,7 +187,7 @@ public void setFloat(Optional _float) { this._float = _float; } - public FormatTest _double(Double _double) { + public FormatTest _double(Optional _double) { this._double = Optional.ofNullable(_double); return this; } @@ -210,7 +210,7 @@ public void setDouble(Optional _double) { this._double = _double; } - public FormatTest string(String string) { + public FormatTest string(Optional string) { this.string = Optional.ofNullable(string); return this; } @@ -252,7 +252,7 @@ public void setByte(byte[] _byte) { this._byte = _byte; } - public FormatTest binary(org.springframework.core.io.Resource binary) { + public FormatTest binary(Optional binary) { this.binary = Optional.ofNullable(binary); return this; } @@ -294,7 +294,7 @@ public void setDate(LocalDate date) { this.date = date; } - public FormatTest dateTime(OffsetDateTime dateTime) { + public FormatTest dateTime(Optional dateTime) { this.dateTime = Optional.ofNullable(dateTime); return this; } @@ -315,7 +315,7 @@ public void setDateTime(Optional dateTime) { this.dateTime = dateTime; } - public FormatTest uuid(UUID uuid) { + public FormatTest uuid(Optional uuid) { this.uuid = Optional.ofNullable(uuid); return this; } @@ -357,7 +357,7 @@ public void setPassword(String password) { this.password = password; } - public FormatTest bigDecimal(BigDecimal bigDecimal) { + public FormatTest bigDecimal(Optional bigDecimal) { this.bigDecimal = Optional.ofNullable(bigDecimal); return this; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/HasOnlyReadOnly.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/HasOnlyReadOnly.java index 1edde03aa30c..008866f02f97 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/HasOnlyReadOnly.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/HasOnlyReadOnly.java @@ -28,7 +28,7 @@ public class HasOnlyReadOnly { private Optional foo = Optional.empty(); - public HasOnlyReadOnly bar(String bar) { + public HasOnlyReadOnly bar(Optional bar) { this.bar = Optional.ofNullable(bar); return this; } @@ -49,7 +49,7 @@ public void setBar(Optional bar) { this.bar = bar; } - public HasOnlyReadOnly foo(String foo) { + public HasOnlyReadOnly foo(Optional foo) { this.foo = Optional.ofNullable(foo); return this; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java index aeb8a5d5b5be..efb07459abb4 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/MixedPropertiesAndAdditionalPropertiesClass.java @@ -36,7 +36,7 @@ public class MixedPropertiesAndAdditionalPropertiesClass { @Valid private Map map = new HashMap<>(); - public MixedPropertiesAndAdditionalPropertiesClass uuid(UUID uuid) { + public MixedPropertiesAndAdditionalPropertiesClass uuid(Optional uuid) { this.uuid = Optional.ofNullable(uuid); return this; } @@ -57,7 +57,7 @@ public void setUuid(Optional uuid) { this.uuid = uuid; } - public MixedPropertiesAndAdditionalPropertiesClass dateTime(OffsetDateTime dateTime) { + public MixedPropertiesAndAdditionalPropertiesClass dateTime(Optional dateTime) { this.dateTime = Optional.ofNullable(dateTime); return this; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Model200Response.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Model200Response.java index 45027d1a34ea..0bb296f91166 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Model200Response.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Model200Response.java @@ -29,7 +29,7 @@ public class Model200Response { private Optional propertyClass = Optional.empty(); - public Model200Response name(Integer name) { + public Model200Response name(Optional name) { this.name = Optional.ofNullable(name); return this; } @@ -50,7 +50,7 @@ public void setName(Optional name) { this.name = name; } - public Model200Response propertyClass(String propertyClass) { + public Model200Response propertyClass(Optional propertyClass) { this.propertyClass = Optional.ofNullable(propertyClass); return this; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelApiResponse.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelApiResponse.java index 137835c05d6e..dd575455d19b 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelApiResponse.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelApiResponse.java @@ -30,7 +30,7 @@ public class ModelApiResponse { private Optional message = Optional.empty(); - public ModelApiResponse code(Integer code) { + public ModelApiResponse code(Optional code) { this.code = Optional.ofNullable(code); return this; } @@ -51,7 +51,7 @@ public void setCode(Optional code) { this.code = code; } - public ModelApiResponse type(String type) { + public ModelApiResponse type(Optional type) { this.type = Optional.ofNullable(type); return this; } @@ -72,7 +72,7 @@ public void setType(Optional type) { this.type = type; } - public ModelApiResponse message(String message) { + public ModelApiResponse message(Optional message) { this.message = Optional.ofNullable(message); return this; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelList.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelList.java index 9ab6cf7cd563..0b9396560285 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelList.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelList.java @@ -26,7 +26,7 @@ public class ModelList { private Optional _123list = Optional.empty(); - public ModelList _123list(String _123list) { + public ModelList _123list(Optional _123list) { this._123list = Optional.ofNullable(_123list); return this; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelReturn.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelReturn.java index f0fcf179d95f..6d47a2079590 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelReturn.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ModelReturn.java @@ -27,7 +27,7 @@ public class ModelReturn { private Optional _return = Optional.empty(); - public ModelReturn _return(Integer _return) { + public ModelReturn _return(Optional _return) { this._return = Optional.ofNullable(_return); return this; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Name.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Name.java index fd0a2b150e66..0f9cedb070e5 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Name.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Name.java @@ -63,7 +63,7 @@ public void setName(Integer name) { this.name = name; } - public Name snakeCase(Integer snakeCase) { + public Name snakeCase(Optional snakeCase) { this.snakeCase = Optional.ofNullable(snakeCase); return this; } @@ -84,7 +84,7 @@ public void setSnakeCase(Optional snakeCase) { this.snakeCase = snakeCase; } - public Name property(String property) { + public Name property(Optional property) { this.property = Optional.ofNullable(property); return this; } @@ -105,7 +105,7 @@ public void setProperty(Optional property) { this.property = property; } - public Name _123number(Integer _123number) { + public Name _123number(Optional _123number) { this._123number = Optional.ofNullable(_123number); return this; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NullableMapProperty.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NullableMapProperty.java index 745fe98704e2..bfa04d5009a5 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NullableMapProperty.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NullableMapProperty.java @@ -30,7 +30,7 @@ public class NullableMapProperty { @Valid private JsonNullable> languageValues = JsonNullable.>undefined(); - public NullableMapProperty languageValues(Map languageValues) { + public NullableMapProperty languageValues(JsonNullable> languageValues) { this.languageValues = JsonNullable.of(languageValues); return this; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NumberOnly.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NumberOnly.java index 730c7323c8c6..d92ba8f91e8d 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NumberOnly.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/NumberOnly.java @@ -25,7 +25,7 @@ public class NumberOnly { private Optional justNumber = Optional.empty(); - public NumberOnly justNumber(BigDecimal justNumber) { + public NumberOnly justNumber(Optional justNumber) { this.justNumber = Optional.ofNullable(justNumber); return this; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Order.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Order.java index 155d56660394..ef77463633c1 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Order.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Order.java @@ -75,7 +75,7 @@ public static StatusEnum fromValue(String value) { private Optional complete = Optional.of(false); - public Order id(Long id) { + public Order id(Optional id) { this.id = Optional.ofNullable(id); return this; } @@ -96,7 +96,7 @@ public void setId(Optional id) { this.id = id; } - public Order petId(Long petId) { + public Order petId(Optional petId) { this.petId = Optional.ofNullable(petId); return this; } @@ -117,7 +117,7 @@ public void setPetId(Optional petId) { this.petId = petId; } - public Order quantity(Integer quantity) { + public Order quantity(Optional quantity) { this.quantity = Optional.ofNullable(quantity); return this; } @@ -138,7 +138,7 @@ public void setQuantity(Optional quantity) { this.quantity = quantity; } - public Order shipDate(OffsetDateTime shipDate) { + public Order shipDate(Optional shipDate) { this.shipDate = Optional.ofNullable(shipDate); return this; } @@ -159,7 +159,7 @@ public void setShipDate(Optional shipDate) { this.shipDate = shipDate; } - public Order status(StatusEnum status) { + public Order status(Optional status) { this.status = Optional.ofNullable(status); return this; } @@ -180,7 +180,7 @@ public void setStatus(Optional status) { this.status = status; } - public Order complete(Boolean complete) { + public Order complete(Optional complete) { this.complete = Optional.ofNullable(complete); return this; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterComposite.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterComposite.java index 413e7cc6f296..bfba43d1c367 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterComposite.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/OuterComposite.java @@ -29,7 +29,7 @@ public class OuterComposite { private Optional myBoolean = Optional.empty(); - public OuterComposite myNumber(BigDecimal myNumber) { + public OuterComposite myNumber(Optional myNumber) { this.myNumber = Optional.ofNullable(myNumber); return this; } @@ -50,7 +50,7 @@ public void setMyNumber(Optional myNumber) { this.myNumber = myNumber; } - public OuterComposite myString(String myString) { + public OuterComposite myString(Optional myString) { this.myString = Optional.ofNullable(myString); return this; } @@ -71,7 +71,7 @@ public void setMyString(Optional myString) { this.myString = myString; } - public OuterComposite myBoolean(Boolean myBoolean) { + public OuterComposite myBoolean(Optional myBoolean) { this.myBoolean = Optional.ofNullable(myBoolean); return this; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ParentWithNullable.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ParentWithNullable.java index 090da1875398..c1069efbd11f 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ParentWithNullable.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ParentWithNullable.java @@ -75,7 +75,7 @@ public static TypeEnum fromValue(String value) { private JsonNullable nullableProperty = JsonNullable.undefined(); - public ParentWithNullable type(TypeEnum type) { + public ParentWithNullable type(Optional type) { this.type = Optional.ofNullable(type); return this; } @@ -96,7 +96,7 @@ public void setType(Optional type) { this.type = type; } - public ParentWithNullable nullableProperty(String nullableProperty) { + public ParentWithNullable nullableProperty(JsonNullable nullableProperty) { this.nullableProperty = JsonNullable.of(nullableProperty); return this; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java index fc168d4164d8..f5e4c15a718c 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Pet.java @@ -95,7 +95,7 @@ public Pet(String name, Set photoUrls) { this.photoUrls = photoUrls; } - public Pet id(Long id) { + public Pet id(Optional id) { this.id = Optional.ofNullable(id); return this; } @@ -116,7 +116,7 @@ public void setId(Optional id) { this.id = id; } - public Pet category(Category category) { + public Pet category(Optional category) { this.category = Optional.ofNullable(category); return this; } @@ -217,7 +217,7 @@ public void setTags(List<@Valid Tag> tags) { this.tags = tags; } - public Pet status(StatusEnum status) { + public Pet status(Optional status) { this.status = Optional.ofNullable(status); return this; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ReadOnlyFirst.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ReadOnlyFirst.java index a9b5a89e7fdf..73db16e30fe8 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ReadOnlyFirst.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ReadOnlyFirst.java @@ -26,7 +26,7 @@ public class ReadOnlyFirst { private Optional baz = Optional.empty(); - public ReadOnlyFirst bar(String bar) { + public ReadOnlyFirst bar(Optional bar) { this.bar = Optional.ofNullable(bar); return this; } @@ -47,7 +47,7 @@ public void setBar(Optional bar) { this.bar = bar; } - public ReadOnlyFirst baz(String baz) { + public ReadOnlyFirst baz(Optional baz) { this.baz = Optional.ofNullable(baz); return this; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java index ff4214fdfcbb..6731a4092bb5 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/ResponseObjectWithDifferentFieldNames.java @@ -30,7 +30,7 @@ public class ResponseObjectWithDifferentFieldNames { private Optional propertyNameWithSpaces = Optional.empty(); - public ResponseObjectWithDifferentFieldNames normalPropertyName(String normalPropertyName) { + public ResponseObjectWithDifferentFieldNames normalPropertyName(Optional normalPropertyName) { this.normalPropertyName = Optional.ofNullable(normalPropertyName); return this; } @@ -51,7 +51,7 @@ public void setNormalPropertyName(Optional normalPropertyName) { this.normalPropertyName = normalPropertyName; } - public ResponseObjectWithDifferentFieldNames UPPER_CASE_PROPERTY_SNAKE(String UPPER_CASE_PROPERTY_SNAKE) { + public ResponseObjectWithDifferentFieldNames UPPER_CASE_PROPERTY_SNAKE(Optional UPPER_CASE_PROPERTY_SNAKE) { this.UPPER_CASE_PROPERTY_SNAKE = Optional.ofNullable(UPPER_CASE_PROPERTY_SNAKE); return this; } @@ -72,7 +72,7 @@ public void setUPPERCASEPROPERTYSNAKE(Optional UPPER_CASE_PROPERTY_SNAKE this.UPPER_CASE_PROPERTY_SNAKE = UPPER_CASE_PROPERTY_SNAKE; } - public ResponseObjectWithDifferentFieldNames lowerCasePropertyDashes(String lowerCasePropertyDashes) { + public ResponseObjectWithDifferentFieldNames lowerCasePropertyDashes(Optional lowerCasePropertyDashes) { this.lowerCasePropertyDashes = Optional.ofNullable(lowerCasePropertyDashes); return this; } @@ -93,7 +93,7 @@ public void setLowerCasePropertyDashes(Optional lowerCasePropertyDashes) this.lowerCasePropertyDashes = lowerCasePropertyDashes; } - public ResponseObjectWithDifferentFieldNames propertyNameWithSpaces(String propertyNameWithSpaces) { + public ResponseObjectWithDifferentFieldNames propertyNameWithSpaces(Optional propertyNameWithSpaces) { this.propertyNameWithSpaces = Optional.ofNullable(propertyNameWithSpaces); return this; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java index 2ee2307aaee6..aa0c819c01e4 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/SpecialModelName.java @@ -26,7 +26,7 @@ public class SpecialModelName { private Optional $specialPropertyName = Optional.empty(); - public SpecialModelName $specialPropertyName(Long $specialPropertyName) { + public SpecialModelName $specialPropertyName(Optional $specialPropertyName) { this.$specialPropertyName = Optional.ofNullable($specialPropertyName); return this; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Tag.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Tag.java index 3a299c7c0a4f..4a3d3150b85d 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Tag.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/Tag.java @@ -26,7 +26,7 @@ public class Tag { private Optional name = Optional.empty(); - public Tag id(Long id) { + public Tag id(Optional id) { this.id = Optional.ofNullable(id); return this; } @@ -47,7 +47,7 @@ public void setId(Optional id) { this.id = id; } - public Tag name(String name) { + public Tag name(Optional name) { this.name = Optional.ofNullable(name); return this; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/User.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/User.java index 079731d117fa..ffdca781d204 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/User.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/User.java @@ -38,7 +38,7 @@ public class User { private Optional userStatus = Optional.empty(); - public User id(Long id) { + public User id(Optional id) { this.id = Optional.ofNullable(id); return this; } @@ -59,7 +59,7 @@ public void setId(Optional id) { this.id = id; } - public User username(String username) { + public User username(Optional username) { this.username = Optional.ofNullable(username); return this; } @@ -80,7 +80,7 @@ public void setUsername(Optional username) { this.username = username; } - public User firstName(String firstName) { + public User firstName(Optional firstName) { this.firstName = Optional.ofNullable(firstName); return this; } @@ -101,7 +101,7 @@ public void setFirstName(Optional firstName) { this.firstName = firstName; } - public User lastName(String lastName) { + public User lastName(Optional lastName) { this.lastName = Optional.ofNullable(lastName); return this; } @@ -122,7 +122,7 @@ public void setLastName(Optional lastName) { this.lastName = lastName; } - public User email(String email) { + public User email(Optional email) { this.email = Optional.ofNullable(email); return this; } @@ -143,7 +143,7 @@ public void setEmail(Optional email) { this.email = email; } - public User password(String password) { + public User password(Optional password) { this.password = Optional.ofNullable(password); return this; } @@ -164,7 +164,7 @@ public void setPassword(Optional password) { this.password = password; } - public User phone(String phone) { + public User phone(Optional phone) { this.phone = Optional.ofNullable(phone); return this; } @@ -185,7 +185,7 @@ public void setPhone(Optional phone) { this.phone = phone; } - public User userStatus(Integer userStatus) { + public User userStatus(Optional userStatus) { this.userStatus = Optional.ofNullable(userStatus); return this; } diff --git a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java index 0b23bf26f419..bc6a74ea32a6 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java +++ b/samples/server/petstore/springboot-useoptional/src/main/java/org/openapitools/model/XmlItem.java @@ -93,7 +93,7 @@ public class XmlItem { @Valid private List prefixNsWrappedArray = new ArrayList<>(); - public XmlItem attributeString(String attributeString) { + public XmlItem attributeString(Optional attributeString) { this.attributeString = Optional.ofNullable(attributeString); return this; } @@ -114,7 +114,7 @@ public void setAttributeString(Optional attributeString) { this.attributeString = attributeString; } - public XmlItem attributeNumber(BigDecimal attributeNumber) { + public XmlItem attributeNumber(Optional attributeNumber) { this.attributeNumber = Optional.ofNullable(attributeNumber); return this; } @@ -135,7 +135,7 @@ public void setAttributeNumber(Optional attributeNumber) { this.attributeNumber = attributeNumber; } - public XmlItem attributeInteger(Integer attributeInteger) { + public XmlItem attributeInteger(Optional attributeInteger) { this.attributeInteger = Optional.ofNullable(attributeInteger); return this; } @@ -156,7 +156,7 @@ public void setAttributeInteger(Optional attributeInteger) { this.attributeInteger = attributeInteger; } - public XmlItem attributeBoolean(Boolean attributeBoolean) { + public XmlItem attributeBoolean(Optional attributeBoolean) { this.attributeBoolean = Optional.ofNullable(attributeBoolean); return this; } @@ -206,7 +206,7 @@ public void setWrappedArray(List wrappedArray) { this.wrappedArray = wrappedArray; } - public XmlItem nameString(String nameString) { + public XmlItem nameString(Optional nameString) { this.nameString = Optional.ofNullable(nameString); return this; } @@ -227,7 +227,7 @@ public void setNameString(Optional nameString) { this.nameString = nameString; } - public XmlItem nameNumber(BigDecimal nameNumber) { + public XmlItem nameNumber(Optional nameNumber) { this.nameNumber = Optional.ofNullable(nameNumber); return this; } @@ -248,7 +248,7 @@ public void setNameNumber(Optional nameNumber) { this.nameNumber = nameNumber; } - public XmlItem nameInteger(Integer nameInteger) { + public XmlItem nameInteger(Optional nameInteger) { this.nameInteger = Optional.ofNullable(nameInteger); return this; } @@ -269,7 +269,7 @@ public void setNameInteger(Optional nameInteger) { this.nameInteger = nameInteger; } - public XmlItem nameBoolean(Boolean nameBoolean) { + public XmlItem nameBoolean(Optional nameBoolean) { this.nameBoolean = Optional.ofNullable(nameBoolean); return this; } @@ -348,7 +348,7 @@ public void setNameWrappedArray(List nameWrappedArray) { this.nameWrappedArray = nameWrappedArray; } - public XmlItem prefixString(String prefixString) { + public XmlItem prefixString(Optional prefixString) { this.prefixString = Optional.ofNullable(prefixString); return this; } @@ -369,7 +369,7 @@ public void setPrefixString(Optional prefixString) { this.prefixString = prefixString; } - public XmlItem prefixNumber(BigDecimal prefixNumber) { + public XmlItem prefixNumber(Optional prefixNumber) { this.prefixNumber = Optional.ofNullable(prefixNumber); return this; } @@ -390,7 +390,7 @@ public void setPrefixNumber(Optional prefixNumber) { this.prefixNumber = prefixNumber; } - public XmlItem prefixInteger(Integer prefixInteger) { + public XmlItem prefixInteger(Optional prefixInteger) { this.prefixInteger = Optional.ofNullable(prefixInteger); return this; } @@ -411,7 +411,7 @@ public void setPrefixInteger(Optional prefixInteger) { this.prefixInteger = prefixInteger; } - public XmlItem prefixBoolean(Boolean prefixBoolean) { + public XmlItem prefixBoolean(Optional prefixBoolean) { this.prefixBoolean = Optional.ofNullable(prefixBoolean); return this; } @@ -490,7 +490,7 @@ public void setPrefixWrappedArray(List prefixWrappedArray) { this.prefixWrappedArray = prefixWrappedArray; } - public XmlItem namespaceString(String namespaceString) { + public XmlItem namespaceString(Optional namespaceString) { this.namespaceString = Optional.ofNullable(namespaceString); return this; } @@ -511,7 +511,7 @@ public void setNamespaceString(Optional namespaceString) { this.namespaceString = namespaceString; } - public XmlItem namespaceNumber(BigDecimal namespaceNumber) { + public XmlItem namespaceNumber(Optional namespaceNumber) { this.namespaceNumber = Optional.ofNullable(namespaceNumber); return this; } @@ -532,7 +532,7 @@ public void setNamespaceNumber(Optional namespaceNumber) { this.namespaceNumber = namespaceNumber; } - public XmlItem namespaceInteger(Integer namespaceInteger) { + public XmlItem namespaceInteger(Optional namespaceInteger) { this.namespaceInteger = Optional.ofNullable(namespaceInteger); return this; } @@ -553,7 +553,7 @@ public void setNamespaceInteger(Optional namespaceInteger) { this.namespaceInteger = namespaceInteger; } - public XmlItem namespaceBoolean(Boolean namespaceBoolean) { + public XmlItem namespaceBoolean(Optional namespaceBoolean) { this.namespaceBoolean = Optional.ofNullable(namespaceBoolean); return this; } @@ -632,7 +632,7 @@ public void setNamespaceWrappedArray(List namespaceWrappedArray) { this.namespaceWrappedArray = namespaceWrappedArray; } - public XmlItem prefixNsString(String prefixNsString) { + public XmlItem prefixNsString(Optional prefixNsString) { this.prefixNsString = Optional.ofNullable(prefixNsString); return this; } @@ -653,7 +653,7 @@ public void setPrefixNsString(Optional prefixNsString) { this.prefixNsString = prefixNsString; } - public XmlItem prefixNsNumber(BigDecimal prefixNsNumber) { + public XmlItem prefixNsNumber(Optional prefixNsNumber) { this.prefixNsNumber = Optional.ofNullable(prefixNsNumber); return this; } @@ -674,7 +674,7 @@ public void setPrefixNsNumber(Optional prefixNsNumber) { this.prefixNsNumber = prefixNsNumber; } - public XmlItem prefixNsInteger(Integer prefixNsInteger) { + public XmlItem prefixNsInteger(Optional prefixNsInteger) { this.prefixNsInteger = Optional.ofNullable(prefixNsInteger); return this; } @@ -695,7 +695,7 @@ public void setPrefixNsInteger(Optional prefixNsInteger) { this.prefixNsInteger = prefixNsInteger; } - public XmlItem prefixNsBoolean(Boolean prefixNsBoolean) { + public XmlItem prefixNsBoolean(Optional prefixNsBoolean) { this.prefixNsBoolean = Optional.ofNullable(prefixNsBoolean); return this; } 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 cb8da56b1462..3ee3d2f2941d 100644 --- a/samples/server/petstore/springboot-useoptional/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-useoptional/src/main/resources/openapi.yaml @@ -1315,12 +1315,12 @@ components: schemas: Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1349,8 +1349,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1365,14 +1365,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1399,8 +1399,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1412,19 +1412,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1912,8 +1912,8 @@ components: type: string OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -1951,9 +1951,9 @@ components: type: string type: object example: - otherProperty: otherProperty - nullableProperty: nullableProperty type: ChildWithNullable + nullableProperty: nullableProperty + otherProperty: otherProperty StringBooleanMap: additionalProperties: type: boolean @@ -2264,10 +2264,10 @@ components: type: object ResponseObjectWithDifferentFieldNames: example: + normalPropertyName: normalPropertyName UPPER_CASE_PROPERTY_SNAKE: UPPER_CASE_PROPERTY_SNAKE lower-case-property-dashes: lower-case-property-dashes property name with spaces: property name with spaces - normalPropertyName: normalPropertyName properties: normalPropertyName: type: string diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java index 1d20d19a086b..1aaf6bd0d3ec 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/FakeApi.java @@ -153,7 +153,7 @@ default ResponseEntity fakeOuterCompositeSerialize( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("*/*"))) { - String exampleString = "{ \"my_string\" : \"my_string\", \"my_number\" : 0.8008281904610115, \"my_boolean\" : true }"; + String exampleString = "{ \"my_number\" : 0.8008281904610115, \"my_string\" : \"my_string\", \"my_boolean\" : true }"; ApiUtil.setExampleResponse(request, "*/*", exampleString); break; } @@ -258,7 +258,7 @@ default ResponseEntity responseObjectDiff getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\", \"normalPropertyName\" : \"normalPropertyName\" }"; + String exampleString = "{ \"normalPropertyName\" : \"normalPropertyName\", \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java index 698fc942fa5a..e06751c28d1e 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/PetApi.java @@ -158,7 +158,7 @@ default ResponseEntity> findPetsByStatus( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -214,7 +214,7 @@ default ResponseEntity> findPetsByTags( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -269,7 +269,7 @@ default ResponseEntity getPetById( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + String exampleString = "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java index d17a842b79d1..7152d673f6b9 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/StoreApi.java @@ -149,7 +149,7 @@ default ResponseEntity getOrderById( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -200,7 +200,7 @@ default ResponseEntity placeOrder( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApi.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApi.java index 90533e0d5769..9b8e90442af3 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApi.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/api/UserApi.java @@ -207,7 +207,7 @@ default ResponseEntity getUserByName( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"password\" : \"password\", \"userStatus\" : 6, \"phone\" : \"phone\", \"id\" : 0, \"email\" : \"email\", \"username\" : \"username\" }"; + String exampleString = "{ \"id\" : 0, \"username\" : \"username\", \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"email\" : \"email\", \"password\" : \"password\", \"phone\" : \"phone\", \"userStatus\" : 6 }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesClass.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesClass.java index 8555254362e6..20aa6a2ef773 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesClass.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/AdditionalPropertiesClass.java @@ -312,7 +312,7 @@ public void setAnytype1(@Nullable Object anytype1) { this.anytype1 = anytype1; } - public AdditionalPropertiesClass anytype2(Object anytype2) { + public AdditionalPropertiesClass anytype2(JsonNullable anytype2) { this.anytype2 = JsonNullable.of(anytype2); return this; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCat.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCat.java index cbd16a809029..8739538d34b5 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCat.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/BigCat.java @@ -102,7 +102,7 @@ public void setKind(@Nullable KindEnum kind) { } - public BigCat declawed(Boolean declawed) { + public BigCat declawed(@Nullable Boolean declawed) { super.declawed(declawed); return this; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ChildWithNullable.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ChildWithNullable.java index e45bacef9d0b..731dcf0fb11b 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ChildWithNullable.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ChildWithNullable.java @@ -54,12 +54,12 @@ public void setOtherProperty(@Nullable String otherProperty) { } - public ChildWithNullable type(TypeEnum type) { + public ChildWithNullable type(@Nullable TypeEnum type) { super.type(type); return this; } - public ChildWithNullable nullableProperty(String nullableProperty) { + public ChildWithNullable nullableProperty(JsonNullable nullableProperty) { super.nullableProperty(nullableProperty); return this; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ContainerDefaultValue.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ContainerDefaultValue.java index 86c7dd42fa70..5ddc1db99427 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ContainerDefaultValue.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ContainerDefaultValue.java @@ -51,7 +51,7 @@ public ContainerDefaultValue(List nullableRequiredArray, List re this.requiredArray = requiredArray; } - public ContainerDefaultValue nullableArray(List nullableArray) { + public ContainerDefaultValue nullableArray(JsonNullable> nullableArray) { this.nullableArray = JsonNullable.of(nullableArray); return this; } @@ -79,7 +79,7 @@ public void setNullableArray(JsonNullable> nullableArray) { this.nullableArray = nullableArray; } - public ContainerDefaultValue nullableRequiredArray(List nullableRequiredArray) { + public ContainerDefaultValue nullableRequiredArray(JsonNullable> nullableRequiredArray) { this.nullableRequiredArray = JsonNullable.of(nullableRequiredArray); return this; } @@ -137,7 +137,7 @@ public void setRequiredArray(List requiredArray) { this.requiredArray = requiredArray; } - public ContainerDefaultValue nullableArrayWithDefault(List nullableArrayWithDefault) { + public ContainerDefaultValue nullableArrayWithDefault(JsonNullable> nullableArrayWithDefault) { this.nullableArrayWithDefault = JsonNullable.of(nullableArrayWithDefault); return this; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/NullableMapProperty.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/NullableMapProperty.java index 19b1c3bfbeca..b83daaf9f62e 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/NullableMapProperty.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/NullableMapProperty.java @@ -30,7 +30,7 @@ public class NullableMapProperty { @Valid private JsonNullable> languageValues = JsonNullable.>undefined(); - public NullableMapProperty languageValues(Map languageValues) { + public NullableMapProperty languageValues(JsonNullable> languageValues) { this.languageValues = JsonNullable.of(languageValues); return this; } diff --git a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ParentWithNullable.java b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ParentWithNullable.java index 137b7aefecab..fde598ddd48a 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ParentWithNullable.java +++ b/samples/server/petstore/springboot-virtualan/src/main/java/org/openapitools/virtualan/model/ParentWithNullable.java @@ -96,7 +96,7 @@ public void setType(@Nullable TypeEnum type) { this.type = type; } - public ParentWithNullable nullableProperty(String nullableProperty) { + public ParentWithNullable nullableProperty(JsonNullable nullableProperty) { this.nullableProperty = JsonNullable.of(nullableProperty); return this; } 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 cb8da56b1462..3ee3d2f2941d 100644 --- a/samples/server/petstore/springboot-virtualan/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-virtualan/src/main/resources/openapi.yaml @@ -1315,12 +1315,12 @@ components: schemas: Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1349,8 +1349,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1365,14 +1365,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1399,8 +1399,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1412,19 +1412,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1912,8 +1912,8 @@ components: type: string OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -1951,9 +1951,9 @@ components: type: string type: object example: - otherProperty: otherProperty - nullableProperty: nullableProperty type: ChildWithNullable + nullableProperty: nullableProperty + otherProperty: otherProperty StringBooleanMap: additionalProperties: type: boolean @@ -2264,10 +2264,10 @@ components: type: object ResponseObjectWithDifferentFieldNames: example: + normalPropertyName: normalPropertyName UPPER_CASE_PROPERTY_SNAKE: UPPER_CASE_PROPERTY_SNAKE lower-case-property-dashes: lower-case-property-dashes property name with spaces: property name with spaces - normalPropertyName: normalPropertyName properties: normalPropertyName: type: string diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/FakeApi.java index d8d639159e7f..e6acfd763d02 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/FakeApi.java @@ -233,7 +233,7 @@ default ResponseEntity fakeOuterCompositeSerialize( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("*/*"))) { - String exampleString = "{ \"my_string\" : \"my_string\", \"my_number\" : 0.8008281904610115, \"my_boolean\" : true }"; + String exampleString = "{ \"my_number\" : 0.8008281904610115, \"my_string\" : \"my_string\", \"my_boolean\" : true }"; ApiUtil.setExampleResponse(request, "*/*", exampleString); break; } diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/PetApi.java index 34b9a51d83f1..a43384908794 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/PetApi.java @@ -152,7 +152,7 @@ default ResponseEntity> findPetsByStatus( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -207,7 +207,7 @@ default ResponseEntity> findPetsByTags( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -261,7 +261,7 @@ default ResponseEntity getPetById( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + String exampleString = "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/StoreApi.java index 04b3041bf241..ce567252c5f4 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/StoreApi.java @@ -143,7 +143,7 @@ default ResponseEntity getOrderById( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -193,7 +193,7 @@ default ResponseEntity placeOrder( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/UserApi.java index 2875c03cdf22..d750c85caf44 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/api/UserApi.java @@ -199,7 +199,7 @@ default ResponseEntity getUserByName( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"password\" : \"password\", \"userStatus\" : 6, \"phone\" : \"phone\", \"id\" : 0, \"email\" : \"email\", \"username\" : \"username\" }"; + String exampleString = "{ \"id\" : 0, \"username\" : \"username\", \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"email\" : \"email\", \"password\" : \"password\", \"phone\" : \"phone\", \"userStatus\" : 6 }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ChildWithNullableDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ChildWithNullableDto.java index dd149e504bf2..4b009f2b5898 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ChildWithNullableDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ChildWithNullableDto.java @@ -56,12 +56,12 @@ public void setOtherProperty(@Nullable String otherProperty) { } - public ChildWithNullableDto type(TypeEnum type) { + public ChildWithNullableDto type(@Nullable TypeEnum type) { super.type(type); return this; } - public ChildWithNullableDto nullableProperty(String nullableProperty) { + public ChildWithNullableDto nullableProperty(JsonNullable nullableProperty) { super.nullableProperty(nullableProperty); return this; } diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/EnumTestDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/EnumTestDto.java index a6e7481bf7cd..c9ab7139e298 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/EnumTestDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/EnumTestDto.java @@ -287,7 +287,7 @@ public void setEnumNumber(@Nullable EnumNumberEnum enumNumber) { this.enumNumber = enumNumber; } - public EnumTestDto outerEnum(OuterEnumDto outerEnum) { + public EnumTestDto outerEnum(JsonNullable outerEnum) { this.outerEnum = JsonNullable.of(outerEnum); return this; } diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/HealthCheckResultDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/HealthCheckResultDto.java index dc025fc1c67c..1b8349d46c9d 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/HealthCheckResultDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/HealthCheckResultDto.java @@ -30,7 +30,7 @@ public class HealthCheckResultDto { private JsonNullable nullableMessage = JsonNullable.undefined(); - public HealthCheckResultDto nullableMessage(String nullableMessage) { + public HealthCheckResultDto nullableMessage(JsonNullable nullableMessage) { this.nullableMessage = JsonNullable.of(nullableMessage); return this; } diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/NullableClassDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/NullableClassDto.java index bdb8f6c23333..a8cc35ebcebe 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/NullableClassDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/NullableClassDto.java @@ -71,7 +71,7 @@ public class NullableClassDto { @Valid private Map objectItemsNullable = new HashMap<>(); - public NullableClassDto integerProp(Integer integerProp) { + public NullableClassDto integerProp(JsonNullable integerProp) { this.integerProp = JsonNullable.of(integerProp); return this; } @@ -91,7 +91,7 @@ public void setIntegerProp(JsonNullable integerProp) { this.integerProp = integerProp; } - public NullableClassDto numberProp(BigDecimal numberProp) { + public NullableClassDto numberProp(JsonNullable numberProp) { this.numberProp = JsonNullable.of(numberProp); return this; } @@ -111,7 +111,7 @@ public void setNumberProp(JsonNullable numberProp) { this.numberProp = numberProp; } - public NullableClassDto booleanProp(Boolean booleanProp) { + public NullableClassDto booleanProp(JsonNullable booleanProp) { this.booleanProp = JsonNullable.of(booleanProp); return this; } @@ -131,7 +131,7 @@ public void setBooleanProp(JsonNullable booleanProp) { this.booleanProp = booleanProp; } - public NullableClassDto stringProp(String stringProp) { + public NullableClassDto stringProp(JsonNullable stringProp) { this.stringProp = JsonNullable.of(stringProp); return this; } @@ -151,7 +151,7 @@ public void setStringProp(JsonNullable stringProp) { this.stringProp = stringProp; } - public NullableClassDto dateProp(LocalDate dateProp) { + public NullableClassDto dateProp(JsonNullable dateProp) { this.dateProp = JsonNullable.of(dateProp); return this; } @@ -171,7 +171,7 @@ public void setDateProp(JsonNullable dateProp) { this.dateProp = dateProp; } - public NullableClassDto datetimeProp(OffsetDateTime datetimeProp) { + public NullableClassDto datetimeProp(JsonNullable datetimeProp) { this.datetimeProp = JsonNullable.of(datetimeProp); return this; } @@ -191,7 +191,7 @@ public void setDatetimeProp(JsonNullable datetimeProp) { this.datetimeProp = datetimeProp; } - public NullableClassDto arrayNullableProp(List arrayNullableProp) { + public NullableClassDto arrayNullableProp(JsonNullable> arrayNullableProp) { this.arrayNullableProp = JsonNullable.of(arrayNullableProp); return this; } @@ -219,7 +219,7 @@ public void setArrayNullableProp(JsonNullable> arrayNullableProp) { this.arrayNullableProp = arrayNullableProp; } - public NullableClassDto arrayAndItemsNullableProp(List arrayAndItemsNullableProp) { + public NullableClassDto arrayAndItemsNullableProp(JsonNullable> arrayAndItemsNullableProp) { this.arrayAndItemsNullableProp = JsonNullable.of(arrayAndItemsNullableProp); return this; } @@ -276,7 +276,7 @@ public void setArrayItemsNullable(List arrayItemsNullable) { this.arrayItemsNullable = arrayItemsNullable; } - public NullableClassDto objectNullableProp(Map objectNullableProp) { + public NullableClassDto objectNullableProp(JsonNullable> objectNullableProp) { this.objectNullableProp = JsonNullable.of(objectNullableProp); return this; } @@ -304,7 +304,7 @@ public void setObjectNullableProp(JsonNullable> objectNullab this.objectNullableProp = objectNullableProp; } - public NullableClassDto objectAndItemsNullableProp(Map objectAndItemsNullableProp) { + public NullableClassDto objectAndItemsNullableProp(JsonNullable> objectAndItemsNullableProp) { this.objectAndItemsNullableProp = JsonNullable.of(objectAndItemsNullableProp); return this; } diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ParentWithNullableDto.java b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ParentWithNullableDto.java index 6da4f43e17e2..6d7b27dff1e4 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ParentWithNullableDto.java +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/java/org/openapitools/model/ParentWithNullableDto.java @@ -97,7 +97,7 @@ public void setType(@Nullable TypeEnum type) { this.type = type; } - public ParentWithNullableDto nullableProperty(String nullableProperty) { + public ParentWithNullableDto nullableProperty(JsonNullable nullableProperty) { this.nullableProperty = JsonNullable.of(nullableProperty); return this; } diff --git a/samples/server/petstore/springboot-x-implements-skip/src/main/resources/openapi.yaml b/samples/server/petstore/springboot-x-implements-skip/src/main/resources/openapi.yaml index 279b8e9cc6df..fbeda8ffbf1e 100644 --- a/samples/server/petstore/springboot-x-implements-skip/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot-x-implements-skip/src/main/resources/openapi.yaml @@ -1526,12 +1526,12 @@ components: type: string Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1560,8 +1560,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1576,14 +1576,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1610,8 +1610,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1623,19 +1623,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -2075,8 +2075,8 @@ components: type: integer OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java index 3a7225c62e47..8e2760f5315d 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/FakeApi.java @@ -147,7 +147,7 @@ default ResponseEntity fakeOuterCompositeSerialize( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("*/*"))) { - String exampleString = "{ \"my_string\" : \"my_string\", \"my_number\" : 0.8008281904610115, \"my_boolean\" : true }"; + String exampleString = "{ \"my_number\" : 0.8008281904610115, \"my_string\" : \"my_string\", \"my_boolean\" : true }"; ApiUtil.setExampleResponse(request, "*/*", exampleString); break; } @@ -249,7 +249,7 @@ default ResponseEntity responseObjectD getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\", \"normalPropertyName\" : \"normalPropertyName\" }"; + String exampleString = "{ \"normalPropertyName\" : \"normalPropertyName\", \"UPPER_CASE_PROPERTY_SNAKE\" : \"UPPER_CASE_PROPERTY_SNAKE\", \"lower-case-property-dashes\" : \"lower-case-property-dashes\", \"property name with spaces\" : \"property name with spaces\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java index 38a8540f7420..3deebff2811f 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/PetApi.java @@ -152,7 +152,7 @@ default ResponseEntity> findPetsByStatus( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -207,7 +207,7 @@ default ResponseEntity> findPetsByTags( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "[ { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }, { \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" } ]"; + String exampleString = "[ { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }, { \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" } ]"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -261,7 +261,7 @@ default ResponseEntity getPetById( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"name\" : \"doggie\", \"id\" : 0, \"category\" : { \"name\" : \"default-name\", \"id\" : 6 }, \"tags\" : [ { \"name\" : \"name\", \"id\" : 1 }, { \"name\" : \"name\", \"id\" : 1 } ], \"status\" : \"available\" }"; + String exampleString = "{ \"id\" : 0, \"category\" : { \"id\" : 6, \"name\" : \"default-name\" }, \"name\" : \"doggie\", \"photoUrls\" : [ \"photoUrls\", \"photoUrls\" ], \"tags\" : [ { \"id\" : 1, \"name\" : \"name\" }, { \"id\" : 1, \"name\" : \"name\" } ], \"status\" : \"available\" }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java index f524bb9604e4..ea89f229eaa9 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/StoreApi.java @@ -143,7 +143,7 @@ default ResponseEntity getOrderById( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } @@ -193,7 +193,7 @@ default ResponseEntity placeOrder( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"petId\" : 6, \"quantity\" : 1, \"id\" : 0, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"complete\" : false, \"status\" : \"placed\" }"; + String exampleString = "{ \"id\" : 0, \"petId\" : 6, \"quantity\" : 1, \"shipDate\" : \"2000-01-23T04:56:07.000+00:00\", \"status\" : \"placed\", \"complete\" : false }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java index 012370501f57..de297111fe8e 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/api/UserApi.java @@ -199,7 +199,7 @@ default ResponseEntity getUserByName( getRequest().ifPresent(request -> { for (MediaType mediaType: MediaType.parseMediaTypes(request.getHeader("Accept"))) { if (mediaType.isCompatibleWith(MediaType.valueOf("application/json"))) { - String exampleString = "{ \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"password\" : \"password\", \"userStatus\" : 6, \"phone\" : \"phone\", \"id\" : 0, \"email\" : \"email\", \"username\" : \"username\" }"; + String exampleString = "{ \"id\" : 0, \"username\" : \"username\", \"firstName\" : \"firstName\", \"lastName\" : \"lastName\", \"email\" : \"email\", \"password\" : \"password\", \"phone\" : \"phone\", \"userStatus\" : 6 }"; ApiUtil.setExampleResponse(request, "application/json", exampleString); break; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java index de6d28c450a9..fc774df9551e 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/AdditionalPropertiesClassDto.java @@ -314,7 +314,7 @@ public void setAnytype1(@Nullable Object anytype1) { this.anytype1 = anytype1; } - public AdditionalPropertiesClassDto anytype2(Object anytype2) { + public AdditionalPropertiesClassDto anytype2(JsonNullable anytype2) { this.anytype2 = JsonNullable.of(anytype2); return this; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCatDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCatDto.java index 974aed13ad42..bc1bc97d5069 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCatDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/BigCatDto.java @@ -104,7 +104,7 @@ public void setKind(@Nullable KindEnum kind) { } - public BigCatDto declawed(Boolean declawed) { + public BigCatDto declawed(@Nullable Boolean declawed) { super.declawed(declawed); return this; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ChildWithNullableDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ChildWithNullableDto.java index dd149e504bf2..4b009f2b5898 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ChildWithNullableDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ChildWithNullableDto.java @@ -56,12 +56,12 @@ public void setOtherProperty(@Nullable String otherProperty) { } - public ChildWithNullableDto type(TypeEnum type) { + public ChildWithNullableDto type(@Nullable TypeEnum type) { super.type(type); return this; } - public ChildWithNullableDto nullableProperty(String nullableProperty) { + public ChildWithNullableDto nullableProperty(JsonNullable nullableProperty) { super.nullableProperty(nullableProperty); return this; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java index 2ba1099ed96c..58ec4145e1a2 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ContainerDefaultValueDto.java @@ -53,7 +53,7 @@ public ContainerDefaultValueDto(List nullableRequiredArray, List this.requiredArray = requiredArray; } - public ContainerDefaultValueDto nullableArray(List nullableArray) { + public ContainerDefaultValueDto nullableArray(JsonNullable> nullableArray) { this.nullableArray = JsonNullable.of(nullableArray); return this; } @@ -81,7 +81,7 @@ public void setNullableArray(JsonNullable> nullableArray) { this.nullableArray = nullableArray; } - public ContainerDefaultValueDto nullableRequiredArray(List nullableRequiredArray) { + public ContainerDefaultValueDto nullableRequiredArray(JsonNullable> nullableRequiredArray) { this.nullableRequiredArray = JsonNullable.of(nullableRequiredArray); return this; } @@ -139,7 +139,7 @@ public void setRequiredArray(List requiredArray) { this.requiredArray = requiredArray; } - public ContainerDefaultValueDto nullableArrayWithDefault(List nullableArrayWithDefault) { + public ContainerDefaultValueDto nullableArrayWithDefault(JsonNullable> nullableArrayWithDefault) { this.nullableArrayWithDefault = JsonNullable.of(nullableArrayWithDefault); return this; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NullableMapPropertyDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NullableMapPropertyDto.java index 20f268f80d50..6578aac0e191 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NullableMapPropertyDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/NullableMapPropertyDto.java @@ -32,7 +32,7 @@ public class NullableMapPropertyDto { @Valid private JsonNullable> languageValues = JsonNullable.>undefined(); - public NullableMapPropertyDto languageValues(Map languageValues) { + public NullableMapPropertyDto languageValues(JsonNullable> languageValues) { this.languageValues = JsonNullable.of(languageValues); return this; } diff --git a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ParentWithNullableDto.java b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ParentWithNullableDto.java index 6da4f43e17e2..6d7b27dff1e4 100644 --- a/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ParentWithNullableDto.java +++ b/samples/server/petstore/springboot/src/main/java/org/openapitools/model/ParentWithNullableDto.java @@ -97,7 +97,7 @@ public void setType(@Nullable TypeEnum type) { this.type = type; } - public ParentWithNullableDto nullableProperty(String nullableProperty) { + public ParentWithNullableDto nullableProperty(JsonNullable nullableProperty) { this.nullableProperty = JsonNullable.of(nullableProperty); return this; } diff --git a/samples/server/petstore/springboot/src/main/resources/openapi.yaml b/samples/server/petstore/springboot/src/main/resources/openapi.yaml index dd592b359712..ffd8d109c347 100644 --- a/samples/server/petstore/springboot/src/main/resources/openapi.yaml +++ b/samples/server/petstore/springboot/src/main/resources/openapi.yaml @@ -1315,12 +1315,12 @@ components: schemas: Order: example: + id: 0 petId: 6 quantity: 1 - id: 0 shipDate: 2000-01-23T04:56:07.000+00:00 - complete: false status: placed + complete: false properties: id: format: int64 @@ -1349,8 +1349,8 @@ components: name: Order Category: example: - name: default-name id: 6 + name: default-name properties: id: format: int64 @@ -1365,14 +1365,14 @@ components: name: Category User: example: + id: 0 + username: username firstName: firstName lastName: lastName + email: email password: password - userStatus: 6 phone: phone - id: 0 - email: email - username: username + userStatus: 6 properties: id: format: int64 @@ -1399,8 +1399,8 @@ components: name: User Tag: example: - name: name id: 1 + name: name properties: id: format: int64 @@ -1412,19 +1412,19 @@ components: name: Tag Pet: example: - photoUrls: - - photoUrls - - photoUrls - name: doggie id: 0 category: - name: default-name id: 6 + name: default-name + name: doggie + photoUrls: + - photoUrls + - photoUrls tags: - - name: name - id: 1 - - name: name - id: 1 + - id: 1 + name: name + - id: 1 + name: name status: available properties: id: @@ -1912,8 +1912,8 @@ components: type: string OuterComposite: example: - my_string: my_string my_number: 0.8008281904610115 + my_string: my_string my_boolean: true properties: my_number: @@ -2252,10 +2252,10 @@ components: type: object ResponseObjectWithDifferentFieldNames: example: + normalPropertyName: normalPropertyName UPPER_CASE_PROPERTY_SNAKE: UPPER_CASE_PROPERTY_SNAKE lower-case-property-dashes: lower-case-property-dashes property name with spaces: property name with spaces - normalPropertyName: normalPropertyName properties: normalPropertyName: type: string