[Inline model resolver] various improvements (#12293)

* better handling of requestbody in the inline resolver

* remove commented code

* better request body naming

* fix unique naming

* minor code format change

* removed additional underscore from names, fix test

* more fixes, update tests

* fix all tests

* undo changes to default codegen

* update samples

* update python tests

* add new files

* update samples

modules/openapi-generator/src/main/java/org/openapitools/codegen/InlineModelResolver.java

@@ -160,7 +160,8 @@ public class InlineModelResolver {
      * Recursively gather inline models that need to be generated and
      * replace inline schemas with $ref to schema to-be-generated.
      *
-     * @param schema target schema
+     * @param schema      target schema
+     * @param modelPrefix model name (usually the prefix of the inline model name)
      */
     private void gatherInlineModels(Schema schema, String modelPrefix) {
         if (schema.get$ref() != null) {
@@ -183,13 +184,12 @@ public class InlineModelResolver {
             if (props != null) {
                 for (String propName : props.keySet()) {
                     Schema prop = props.get(propName);
+                    String schemaName = resolveModelName(prop.getTitle(), modelPrefix + "_" + propName);
                     // Recurse to create $refs for inner models
-                    //gatherInlineModels(prop, modelPrefix + StringUtils.camelize(propName));
+                    gatherInlineModels(prop, schemaName);
-                    gatherInlineModels(prop, modelPrefix + "_" + propName);
                     if (isModelNeeded(prop)) {
                         // If this schema should be split into its own model, do so
-                        //Schema refSchema = this.makeSchemaResolve(modelPrefix, StringUtils.camelize(propName), prop);
+                        Schema refSchema = this.makeSchemaInComponents(schemaName, prop);
-                        Schema refSchema = this.makeSchemaResolve(modelPrefix, "_" + propName, prop);
                         props.put(propName, refSchema);
                     } else if (prop instanceof ComposedSchema) {
                         ComposedSchema m = (ComposedSchema) prop;
@@ -206,11 +206,12 @@ public class InlineModelResolver {
             if (schema.getAdditionalProperties() != null) {
                 if (schema.getAdditionalProperties() instanceof Schema) {
                     Schema inner = (Schema) schema.getAdditionalProperties();
+                    String schemaName = resolveModelName(schema.getTitle(), modelPrefix + "_" + "_value");
                     // Recurse to create $refs for inner models
-                    gatherInlineModels(inner, modelPrefix + "_addl_props");
+                    gatherInlineModels(inner, schemaName);
                     if (isModelNeeded(inner)) {
                         // If this schema should be split into its own model, do so
-                        Schema refSchema = this.makeSchemaResolve(modelPrefix, "_addl_props", inner);
+                        Schema refSchema = this.makeSchemaInComponents(schemaName, inner);
                         schema.setAdditionalProperties(refSchema);
                     }
                 }
@@ -231,17 +232,23 @@ public class InlineModelResolver {
         if (schema instanceof ArraySchema) {
             ArraySchema array = (ArraySchema) schema;
             Schema items = array.getItems();
+            /*if (items.getTitle() != null) {
+                LOGGER.info("schema title {}", items);
+                throw new RuntimeException("getTitle for array item is not null");
+            }*/
             if (items == null) {
                 LOGGER.error("Illegal schema found with array type but no items," +
                         " items must be defined for array schemas:\n " + schema.toString());
                 return;
             }
+            String schemaName = resolveModelName(items.getTitle(), modelPrefix + "_inner");
+
             // Recurse to create $refs for inner models
-            gatherInlineModels(items, modelPrefix + "Items");
+            gatherInlineModels(items, schemaName);
 
             if (isModelNeeded(items)) {
                 // If this schema should be split into its own model, do so
-                Schema refSchema = this.makeSchemaResolve(modelPrefix, "_inner", items);
+                Schema refSchema = this.makeSchemaInComponents(schemaName, items);
                 array.setItems(refSchema);
             }
         }
@@ -252,10 +259,11 @@ public class InlineModelResolver {
                 List<Schema> newAllOf = new ArrayList<Schema>();
                 boolean atLeastOneModel = false;
                 for (Schema inner : m.getAllOf()) {
+                    String schemaName = resolveModelName(inner.getTitle(), modelPrefix + "_allOf");
                     // Recurse to create $refs for inner models
-                    gatherInlineModels(inner, modelPrefix + "_allOf");
+                    gatherInlineModels(inner, schemaName);
                     if (isModelNeeded(inner)) {
-                        Schema refSchema = this.makeSchemaResolve(modelPrefix, "_allOf", inner);
+                        Schema refSchema = this.makeSchemaInComponents(schemaName, inner);
                         newAllOf.add(refSchema); // replace with ref
                         atLeastOneModel = true;
                     } else {
@@ -278,10 +286,11 @@ public class InlineModelResolver {
             if (m.getAnyOf() != null) {
                 List<Schema> newAnyOf = new ArrayList<Schema>();
                 for (Schema inner : m.getAnyOf()) {
+                    String schemaName = resolveModelName(inner.getTitle(), modelPrefix + "_anyOf");
                     // Recurse to create $refs for inner models
-                    gatherInlineModels(inner, modelPrefix + "_anyOf");
+                    gatherInlineModels(inner, schemaName);
                     if (isModelNeeded(inner)) {
-                        Schema refSchema = this.makeSchemaResolve(modelPrefix, "_anyOf", inner);
+                        Schema refSchema = this.makeSchemaInComponents(schemaName, inner);
                         newAnyOf.add(refSchema); // replace with ref
                     } else {
                         newAnyOf.add(inner);
@@ -292,10 +301,11 @@ public class InlineModelResolver {
             if (m.getOneOf() != null) {
                 List<Schema> newOneOf = new ArrayList<Schema>();
                 for (Schema inner : m.getOneOf()) {
+                    String schemaName = resolveModelName(inner.getTitle(), modelPrefix + "_oneOf");
                     // Recurse to create $refs for inner models
-                    gatherInlineModels(inner, modelPrefix + "_oneOf");
+                    gatherInlineModels(inner, schemaName);
                     if (isModelNeeded(inner)) {
-                        Schema refSchema = this.makeSchemaResolve(modelPrefix, "_oneOf", inner);
+                        Schema refSchema = this.makeSchemaInComponents(schemaName, inner);
                         newOneOf.add(refSchema); // replace with ref
                     } else {
                         newOneOf.add(inner);
@@ -307,15 +317,48 @@ public class InlineModelResolver {
         // Check not schema
         if (schema.getNot() != null) {
             Schema not = schema.getNot();
+            String schemaName = resolveModelName(schema.getTitle(), modelPrefix + "_not");
             // Recurse to create $refs for inner models
-            gatherInlineModels(not, modelPrefix + "_not");
+            gatherInlineModels(not, schemaName);
             if (isModelNeeded(not)) {
-                Schema refSchema = this.makeSchemaResolve(modelPrefix, "_not", not);
+                Schema refSchema = this.makeSchemaInComponents(schemaName, not);
                 schema.setNot(refSchema);
             }
         }
     }
 
+    /**
+     * Flatten inline models in content
+     *
+     * @param content target content
+     * @param name    backup name if no title is found
+     */
+    private void flattenContent(Content content, String name) {
+        if (content == null || content.isEmpty()) {
+            return;
+        }
+
+        for (String contentType : content.keySet()) {
+            MediaType mediaType = content.get(contentType);
+            if (mediaType == null) {
+                continue;
+            }
+            Schema schema = mediaType.getSchema();
+            if (schema == null) {
+                continue;
+            }
+            String schemaName = resolveModelName(schema.getTitle(), name); // name example: testPost_request
+            // Recursively gather/make inline models within this schema if any
+            gatherInlineModels(schema, schemaName);
+            if (isModelNeeded(schema)) {
+                // If this schema should be split into its own model, do so
+                //Schema refSchema = this.makeSchema(schemaName, schema);
+                Schema refSchema = this.makeSchemaInComponents(schemaName, schema);
+                mediaType.setSchema(refSchema);
+            }
+        }
+    }
+
     /**
      * Flatten inline models in RequestBody
      *
@@ -328,78 +371,14 @@ public class InlineModelResolver {
             return;
         }
 
-        Schema model = ModelUtils.getSchemaFromRequestBody(requestBody);
+        // unalias $ref
-        if (model instanceof ObjectSchema) {
+        if (requestBody.get$ref() != null) {
-            Schema obj = model;
+            String ref = ModelUtils.getSimpleRef(requestBody.get$ref());
-            if (obj.getType() == null || "object".equals(obj.getType())) {
+            requestBody = openAPI.getComponents().getRequestBodies().get(ref);
-                if (obj.getProperties() != null && obj.getProperties().size() > 0) {
-                    flattenProperties(openAPI, obj.getProperties(), pathname);
-                    // for model name, use "title" if defined, otherwise default to 'inline_object'
-                    String modelName = resolveModelName(obj.getTitle(), "inline_object");
-                    modelName = addSchemas(modelName, model);
-                    // create request body
-                    RequestBody rb = new RequestBody();
-                    rb.setRequired(requestBody.getRequired());
-                    Content content = new Content();
-                    MediaType mt = new MediaType();
-                    Schema schema = new Schema();
-                    schema.set$ref(modelName);
-                    mt.setSchema(schema);
-
-                    // get "consumes", e.g. application/xml, application/json
-                    Set<String> consumes;
-                    if (requestBody == null || requestBody.getContent() == null || requestBody.getContent().isEmpty()) {
-                        consumes = new HashSet<>();
-                        consumes.add("application/json"); // default to application/json
-                        LOGGER.info("Default to application/json for inline body schema");
-                    } else {
-                        consumes = requestBody.getContent().keySet();
-                    }
-
-                    for (String consume : consumes) {
-                        content.addMediaType(consume, mt);
-                    }
-
-                    rb.setContent(content);
-
-                    // add to openapi "components"
-                    if (openAPI.getComponents().getRequestBodies() == null) {
-                        Map<String, RequestBody> requestBodies = new HashMap<String, RequestBody>();
-                        requestBodies.put(modelName, rb);
-                        openAPI.getComponents().setRequestBodies(requestBodies);
-                    } else {
-                        openAPI.getComponents().getRequestBodies().put(modelName, rb);
-                    }
-
-                    // update requestBody to use $ref instead of inline def
-                    requestBody.set$ref(modelName);
-
-                }
-            }
-        } else if (model instanceof ArraySchema) {
-            ArraySchema am = (ArraySchema) model;
-            Schema inner = am.getItems();
-            if (inner instanceof ObjectSchema) {
-                ObjectSchema op = (ObjectSchema) inner;
-                if (op.getProperties() != null && op.getProperties().size() > 0) {
-                    flattenProperties(openAPI, op.getProperties(), pathname);
-                    // Generate a unique model name based on the title.
-                    String modelName = resolveModelName(op.getTitle(), null);
-                    Schema innerModel = modelFromProperty(openAPI, op, modelName);
-                    String existing = matchGenerated(innerModel);
-                    if (existing != null) {
-                        Schema schema = new Schema().$ref(existing);
-                        schema.setRequired(op.getRequired());
-                        am.setItems(schema);
-                    } else {
-                        modelName = addSchemas(modelName, innerModel);
-                        Schema schema = new Schema().$ref(modelName);
-                        schema.setRequired(op.getRequired());
-                        am.setItems(schema);
-                    }
-                }
-            }
         }
+
+        String name = operation.getOperationId() == null ? "inline_request" : operation.getOperationId() + "_request";
+        flattenContent(requestBody.getContent(), name);
     }
 
     /**
@@ -690,16 +669,16 @@ public class InlineModelResolver {
      * <p>
      * e.g. io.schema.User_name => io_schema_User_name
      *
-     * @param title String title field in the schema if present
+     * @param title     String title field in the schema if present
-     * @param key   String model name
+     * @param modelName String model name
      * @return if provided the sanitized {@code title}, else the sanitized {@code key}
      */
-    private String resolveModelName(String title, String key) {
+    private String resolveModelName(String title, String modelName) {
         if (title == null) {
-            if (key == null) {
+            if (modelName == null) {
                 return uniqueName("inline_object");
             }
-            return uniqueName(sanitizeName(key));
+            return uniqueName(sanitizeName(modelName));
         } else {
             return uniqueName(sanitizeName(title));
         }
@@ -731,6 +710,8 @@ public class InlineModelResolver {
      * Sanitizes the input so that it's valid name for a class or interface
      * <p>
      * e.g. 12.schema.User name => _2_schema_User_name
+     *
+     * @param name name to be processed to make sure it's sanitized
      */
     private String sanitizeName(final String name) {
         return name
@@ -738,9 +719,13 @@ public class InlineModelResolver {
                 .replaceAll("[^A-Za-z0-9]", "_"); // e.g. io.schema.User name => io_schema_User_name
     }
 
+    /**
+     * Generate a unique name for the input
+     *
+     * @param name name to be processed to make sure it's unique
+     */
     private String uniqueName(final String name) {
         if (openAPI.getComponents().getSchemas() == null) { // no schema has been created
-            uniqueNames.add(name);
             return name;
         }
 
@@ -748,7 +733,6 @@ public class InlineModelResolver {
         int count = 0;
         while (true) {
             if (!openAPI.getComponents().getSchemas().containsKey(uniqueName) && !uniqueNames.contains(uniqueName)) {
-                uniqueNames.add(uniqueName);
                 return uniqueName;
             }
             uniqueName = name + "_" + ++count;
@@ -896,24 +880,6 @@ public class InlineModelResolver {
         return model;
     }
 
-    /**
-     * Resolve namespace conflicts using:
-     * title (if title exists) or
-     * prefix + suffix (if title not specified)
-     *
-     * @param prefix used to form name if no title found in schema
-     * @param suffix used to form name if no title found in schema
-     * @param schema title property used to form name if exists and schema definition used
-     *               to create new schema if doesn't exist
-     * @return a new schema or $ref to an existing one if it was already created
-     */
-    private Schema makeSchemaResolve(String prefix, String suffix, Schema schema) {
-        if (schema.getTitle() == null) {
-            return makeSchemaInComponents(uniqueName(sanitizeName(prefix + suffix)), schema);
-        }
-        return makeSchemaInComponents(uniqueName(sanitizeName(schema.getTitle())), schema);
-    }
-
     /**
      * Move schema to components (if new) and return $ref to schema or
      * existing schema.
@@ -935,6 +901,7 @@ public class InlineModelResolver {
             refSchema = new Schema().$ref(name);
         }
         this.copyVendorExtensions(schema, refSchema);
+
         return refSchema;
     }
 
@@ -986,6 +953,8 @@ public class InlineModelResolver {
             LOGGER.info("Inline schema created as {}. To have complete control of the model name, set the `title` field or use the inlineSchemaNameMapping option (--inline-schema-name-mapping in CLI).", name);
         }
 
+        uniqueNames.add(name);
+
         return name;
     }
 

modules/openapi-generator/src/main/java/org/openapitools/codegen/utils/ModelUtils.java

@@ -1017,7 +1017,7 @@ public class ModelUtils {
      * Return the first defined Schema for a RequestBody
      *
      * @param requestBody request body of the operation
-     * @return firstSchema
+     * @return first schema
      */
     public static Schema getSchemaFromRequestBody(RequestBody requestBody) {
         return getSchemaFromContent(requestBody.getContent());

modules/openapi-generator/src/test/java/org/openapitools/codegen/DefaultCodegenTest.java

@@ -231,7 +231,8 @@ public class DefaultCodegenTest {
         final DefaultCodegen codegen = new DefaultCodegen();
         codegen.setOpenAPI(openAPI);
 
-        Schema requestBodySchema = ModelUtils.getSchemaFromRequestBody(openAPI.getPaths().get("/fake").getGet().getRequestBody());
+        Schema requestBodySchema = ModelUtils.getReferencedSchema(openAPI,
+                ModelUtils.getSchemaFromRequestBody(openAPI.getPaths().get("/fake").getGet().getRequestBody()));
         CodegenParameter codegenParameter = codegen.fromFormProperty("enum_form_string", (Schema) requestBodySchema.getProperties().get("enum_form_string"), new HashSet<String>());
 
         Assert.assertEquals(codegenParameter.defaultValue, "-efg");
@@ -245,6 +246,8 @@ public class DefaultCodegenTest {
         codegen.setOpenAPI(openAPI);
 
         Schema requestBodySchema = ModelUtils.getSchemaFromRequestBody(openAPI.getPaths().get("/thingy/{date}").getPost().getRequestBody());
+        // dereference
+        requestBodySchema = ModelUtils.getReferencedSchema(openAPI, requestBodySchema);
         CodegenParameter codegenParameter = codegen.fromFormProperty("visitDate", (Schema) requestBodySchema.getProperties().get("visitDate"),
                 new HashSet<>());
 
@@ -613,7 +616,8 @@ public class DefaultCodegenTest {
         final DefaultCodegen codegen = new DefaultCodegen();
 
         Operation operation = openAPI.getPaths().get("/state").getPost();
-        Schema schema = ModelUtils.getSchemaFromRequestBody(operation.getRequestBody());
+        Schema schema = ModelUtils.getReferencedSchema(openAPI,
+                ModelUtils.getSchemaFromRequestBody(operation.getRequestBody()));
         String type = codegen.getSchemaType(schema);
 
         Assert.assertNotNull(type);
@@ -2344,18 +2348,14 @@ public class DefaultCodegenTest {
         cg.preprocessOpenAPI(openAPI);
 
         // assert names of the response/request schema oneOf interfaces are as expected
-        Assert.assertEquals(
+        Schema s = ModelUtils.getReferencedSchema(openAPI, openAPI.getPaths()
-                openAPI.getPaths()
+                .get("/state")
-                        .get("/state")
+                .getPost()
-                        .getPost()
+                .getRequestBody()
-                        .getRequestBody()
+                .getContent()
-                        .getContent()
+                .get("application/json")
-                        .get("application/json")
+                .getSchema());
-                        .getSchema()
+        Assert.assertEquals(s.getExtensions().get("x-one-of-name"), "CreateStateRequest");
-                        .getExtensions()
-                        .get("x-one-of-name"),
-                "CreateState"
-        );
         Assert.assertEquals(
                 openAPI.getPaths()
                         .get("/state")
@@ -2372,7 +2372,8 @@ public class DefaultCodegenTest {
         // for the array schema, assert that a oneOf interface was added to schema map
         Schema items = ((ArraySchema) openAPI.getComponents().getSchemas().get("CustomOneOfArraySchema")).getItems();
         Assert.assertEquals(items.get$ref(), "#/components/schemas/CustomOneOfArraySchema_inner");
-        Schema innerItem = openAPI.getComponents().getSchemas().get("CustomOneOfArraySchema_inner");
+        //Assert.assertEquals(items.get$ref(), "#/components/schemas/createState_request");
+        Schema innerItem = ModelUtils.getReferencedSchema(openAPI, openAPI.getComponents().getSchemas().get("CustomOneOfArraySchema_inner"));
         Assert.assertEquals(innerItem.getExtensions().get("x-one-of-name"), "CustomOneOfArraySchemaInner");
     }
 

modules/openapi-generator/src/test/java/org/openapitools/codegen/InlineModelResolverTest.java

@@ -175,7 +175,7 @@ public class InlineModelResolverTest {
     }
 
     @Test
-    public void resolveInlineModel2DifferentInnerModelsWIthSameTitle() {
+    public void resolveInlineModel2DifferentInnerModelsWithSameTitle() {
         OpenAPI openapi = new OpenAPI();
         openapi.setComponents(new Components());
         openapi.getComponents().addSchemas("User", new ObjectSchema()
@@ -329,7 +329,9 @@ public class InlineModelResolverTest {
         new InlineModelResolver().flatten(openAPI);
 
         assertNotNull(openAPI.getComponents());
-        assertNotNull(openAPI.getComponents().getRequestBodies());
+        // no longer create inline requestBodies as references in the refactored inline model resolver (6.x)
+        assertNull(openAPI.getComponents().getRequestBodies());
+        assertNotNull(openAPI.getComponents().getSchemas().get("test1_request"));
     }
 
     @Test
@@ -359,7 +361,8 @@ public class InlineModelResolverTest {
                 .get("/resolve_inline_request_body")
                 .getPost()
                 .getRequestBody();
-        assertNotNull(requestBodyReference.get$ref());
+        assertEquals("#/components/schemas/resolveInlineRequestBody_request",
+                requestBodyReference.getContent().get("application/json").getSchema().get$ref());
 
         RequestBody requestBody = ModelUtils.getReferencedRequestBody(openAPI, requestBodyReference);
         MediaType mediaType = requestBody.getContent().get("application/json");
@@ -391,7 +394,8 @@ public class InlineModelResolverTest {
         new InlineModelResolver().flatten(openAPI);
 
         RequestBody requestBodyReference = openAPI.getPaths().get("/resolve_inline_request_body_with_title").getPost().getRequestBody();
-        assertEquals("#/components/requestBodies/resolve_inline_request_body_with_title", requestBodyReference.get$ref());
+        assertEquals("#/components/schemas/resolve_inline_request_body_with_title",
+                requestBodyReference.getContent().get("application/json").getSchema().get$ref());
     }
 
     @Test
@@ -429,7 +433,7 @@ public class InlineModelResolverTest {
 
         ArraySchema requestBody = (ArraySchema) mediaType.getSchema();
         assertNotNull(requestBody.getItems().get$ref());
-        assertEquals("#/components/schemas/inline_object_2", requestBody.getItems().get$ref());
+        assertEquals("#/components/schemas/resolveInlineArrayRequestBody_request_inner", requestBody.getItems().get$ref());
 
         Schema items = ModelUtils.getReferencedSchema(openAPI, ((ArraySchema) mediaType.getSchema()).getItems());
         assertTrue(items.getProperties().get("street") instanceof StringSchema);
@@ -603,10 +607,11 @@ public class InlineModelResolverTest {
                 .getContent()
                 .get("application/json");
 
-        assertTrue(mediaType.getSchema() instanceof ObjectSchema);
+        assertEquals("#/components/schemas/arbitraryObjectRequestBodyProperty_request", mediaType.getSchema().get$ref());
-
+        Schema requestBodySchema = ModelUtils.getReferencedSchema(openAPI, mediaType.getSchema());
-        ObjectSchema requestBodySchema = (ObjectSchema) mediaType.getSchema();
+        assertNotNull(requestBodySchema);
-        assertTrue(requestBodySchema.getProperties().get("arbitrary_object_request_body_property") instanceof ObjectSchema);
+        assertEquals(1, requestBodySchema.getProperties().size(), 1);
+        assertTrue(requestBodySchema.getProperties().get("arbitrary_object_request_body_property") instanceof  ObjectSchema);
     }
 
     @Test
@@ -903,9 +908,9 @@ public class InlineModelResolverTest {
 
         ObjectSchema items = (ObjectSchema) openAPI.getComponents().getSchemas().get("ArbitraryObjectModelWithArrayInlineWithTitleInner");
         assertEquals("ArbitraryObjectModelWithArrayInlineWithTitleInner", items.getTitle());
-        assertTrue(items.getProperties().get("arbitrary_object_model_with_array_inline_with_title") instanceof ObjectSchema);
+        assertTrue(items.getProperties().get("arbitrary_object_model_with_array_inline_with_title_property") instanceof ObjectSchema);
 
-        ObjectSchema itemsProperty = (ObjectSchema) items.getProperties().get("arbitrary_object_model_with_array_inline_with_title");
+        ObjectSchema itemsProperty = (ObjectSchema) items.getProperties().get("arbitrary_object_model_with_array_inline_with_title_property");
         assertNull(itemsProperty.getProperties());
     }
 
@@ -941,7 +946,6 @@ public class InlineModelResolverTest {
         Schema nullablePropertySchema = ModelUtils.getReferencedSchema(openAPI, nullablePropertyReference);
         assertTrue(nullablePropertySchema.getNullable());
 
-
         Schema nullableRequestBodyReference = (Schema) openAPI
                 .getPaths()
                 .get("/nullable_properties")
@@ -949,11 +953,14 @@ public class InlineModelResolverTest {
                 .getRequestBody()
                 .getContent()
                 .get("application/json")
-                .getSchema()
+                .getSchema();
-                .getProperties()
+                //.getProperties()
-                .get("nullable_request_body_property");
+                //.get("nullable_request_body_property");
         Schema nullableRequestBodySchema = ModelUtils.getReferencedSchema(openAPI, nullableRequestBodyReference);
-        assertTrue(nullableRequestBodySchema.getNullable());
+        //assertEquals(nullableRequestBodySchema, "");
+        Schema nullableSchema = ModelUtils.getReferencedSchema(openAPI,
+                ((Schema)nullableRequestBodySchema.getProperties().get("nullable_request_body_property")));
+        assertTrue(nullableSchema.getNullable());
     }
 
     @Test
@@ -970,14 +977,15 @@ public class InlineModelResolverTest {
                 .get("{$request.body#/callbackUri}")
                 .getPost()
                 .getRequestBody();
-        assertNotNull(callbackRequestBodyReference.get$ref());
+        assertNotNull(callbackRequestBodyReference.getContent().get("application/json").getSchema().get$ref());
+        assertEquals("#/components/schemas/webhookNotify_request", callbackRequestBodyReference.getContent().get("application/json").getSchema().get$ref());
 
-        RequestBody resolvedCallbackRequestBody = openAPI
+        /*RequestBody resolvedCallbackRequestBody = openAPI
                 .getComponents()
-                .getRequestBodies()
+                .getSchemas()
-                .get(ModelUtils.getSimpleRef(callbackRequestBodyReference.get$ref()));
+                .get(ModelUtils.getSimpleRef(callbackRequestBodyReference.getContent().get("application/json").getSchema().get$ref()));*/
 
-        Schema callbackRequestSchemaReference = resolvedCallbackRequestBody
+        Schema callbackRequestSchemaReference = callbackRequestBodyReference
                 .getContent()
                 .get("application/json")
                 .getSchema();
@@ -999,8 +1007,8 @@ public class InlineModelResolverTest {
         OpenAPI openAPI = TestUtils.parseSpec("src/test/resources/3_0/inline_model_resolver.yaml");
         InlineModelResolver resolver = new InlineModelResolver();
         Map<String, String> inlineSchemaNames = new HashMap<>();
-        inlineSchemaNames.put("inline_object_2", "SomethingMapped");
+        inlineSchemaNames.put("resolveInlineArrayRequestBody_request_inner", "SomethingMapped");
-        inlineSchemaNames.put("inline_object_4", "nothing_new");
+        inlineSchemaNames.put("arbitraryRequestBodyArrayProperty_request_inner", "nothing_new");
         resolver.setInlineSchemaNameMapping(inlineSchemaNames);
         resolver.flatten(openAPI);
 

modules/openapi-generator/src/test/java/org/openapitools/codegen/java/spring/SpringCodegenTest.java

@@ -517,8 +517,8 @@ public class SpringCodegenTest {
         generator.opts(input).generate();
 
         JavaFileAssert.assertThat(Paths.get(outputPath + "/src/main/java/org/openapitools/api/ExampleApi.java"))
-            .assertMethod("exampleApiPost", "InlineObject")
+            .assertMethod("exampleApiPost", "InlineRequest")
-            .hasParameter("inlineObject")
+            .hasParameter("inlineRequest")
             .assertParameterAnnotations()
             .containsWithNameAndAttributes("RequestBody", ImmutableMap.of("required", "false"));
 
@@ -591,7 +591,7 @@ public class SpringCodegenTest {
 
         // Check that api validates mixed multipart request
         JavaFileAssert.assertThat(files.get("MultipartMixedApi.java"))
-            .assertMethod("multipartMixed", "MultipartMixedStatus", "MultipartFile", "MultipartMixedMarker")
+            .assertMethod("multipartMixed", "MultipartMixedStatus", "MultipartFile", "MultipartMixedRequestMarker")
                 .hasParameter("status").withType("MultipartMixedStatus")
                 .assertParameterAnnotations()
                 .containsWithName("Valid")
@@ -602,7 +602,7 @@ public class SpringCodegenTest {
                 .assertParameterAnnotations()
                 .containsWithNameAndAttributes("RequestPart", ImmutableMap.of("value", "\"file\"", "required", "true"))
             .toParameter().toMethod()
-                .hasParameter("marker").withType("MultipartMixedMarker")
+                .hasParameter("marker").withType("MultipartMixedRequestMarker")
                 .assertParameterAnnotations()
                 .containsWithNameAndAttributes("RequestParam", ImmutableMap.of("value", "\"marker\"", "required", "false"));
     }

modules/openapi-generator/src/test/java/org/openapitools/codegen/typescript/TypeScriptClientCodegenTest.java

@@ -53,7 +53,11 @@ public class TypeScriptClientCodegenTest {
         codegen.setOpenAPI(openApi);
         PathItem path = openApi.getPaths().get("/pets");
         CodegenOperation operation = codegen.fromOperation("/pets", "patch", path.getPatch(), path.getServers());
-        Assert.assertEquals(operation.imports, Sets.newHashSet("Cat", "Dog"));
+        // TODO revise the commented test below as oneOf is no longer defined inline
+        //but instead defined using $ref with the new inline model resolver in 6.x
+        //Assert.assertEquals(operation.imports, Sets.newHashSet("Cat", "Dog"));
+        Assert.assertEquals(operation.imports, Sets.newHashSet("InlineRequest"));
+
     }
 
     @Test

modules/openapi-generator/src/test/java/org/openapitools/codegen/utils/ModelUtilsTest.java

@@ -60,6 +60,7 @@ public class ModelUtilsTest {
                 "SomeObj18",
                 "Common18",
                 "SomeObj18_allOf",
+                "inline_request",
                 "Obj19ByAge",
                 "Obj19ByType",
                 "SomeObj20",
@@ -78,7 +79,7 @@ public class ModelUtilsTest {
                 "AChild30",
                 "BChild30"
         );
-        Assert.assertEquals(allUsedSchemas.size(), expectedAllUsedSchemas.size());
+        Assert.assertEquals(allUsedSchemas, expectedAllUsedSchemas);
         Assert.assertTrue(allUsedSchemas.containsAll(expectedAllUsedSchemas));
     }
 

modules/openapi-generator/src/test/resources/3_0/composed-oneof.yaml

@@ -57,11 +57,13 @@ components:
         oneOf:
           - $ref: '#/components/schemas/ObjA'
           - $ref: '#/components/schemas/ObjB'
+          - $ref: '#/components/schemas/ObjC'
         discriminator:
           propertyName: realtype
           mapping:
             a-type: '#/components/schemas/ObjA'
             b-type: '#/components/schemas/ObjB'
+            c-type: '#/components/schemas/ObjC'
     ObjA:
       type: object
       properties:
@@ -78,4 +80,11 @@ components:
           type: string
         code:
           type: integer
-          format: int32
+          format: int32
+    ObjC:
+      type: object
+      properties:
+        realtype:
+          type: string
+        state:
+          type: string

modules/openapi-generator/src/test/resources/3_0/inline_model_resolver.yaml

@@ -382,7 +382,7 @@ components:
         title: ArbitraryObjectModelWithArrayInlineWithTitleInner
         type: object
         properties:
-          arbitrary_object_model_with_array_inline_with_title:
+          arbitrary_object_model_with_array_inline_with_title_property:
             type: object
     EmptyExampleOnStringTypeModels:
       type: string

samples/client/others/csharp-netcore-complex-files/.openapi-generator/FILES

@@ -2,12 +2,12 @@
 Org.OpenAPITools.sln
 README.md
 appveyor.yml
-docs/InlineObject.md
-docs/InlineObject1.md
-docs/InlineObject2.md
 docs/MultipartApi.md
-docs/MultipartMixedMarker.md
+docs/MultipartArrayRequest.md
+docs/MultipartMixedRequest.md
+docs/MultipartMixedRequestMarker.md
 docs/MultipartMixedStatus.md
+docs/MultipartSingleRequest.md
 git_push.sh
 src/Org.OpenAPITools.Test/Org.OpenAPITools.Test.csproj
 src/Org.OpenAPITools/Api/MultipartApi.cs
@@ -28,9 +28,9 @@ src/Org.OpenAPITools/Client/OpenAPIDateConverter.cs
 src/Org.OpenAPITools/Client/RequestOptions.cs
 src/Org.OpenAPITools/Client/RetryConfiguration.cs
 src/Org.OpenAPITools/Model/AbstractOpenAPISchema.cs
-src/Org.OpenAPITools/Model/InlineObject.cs
+src/Org.OpenAPITools/Model/MultipartArrayRequest.cs
-src/Org.OpenAPITools/Model/InlineObject1.cs
+src/Org.OpenAPITools/Model/MultipartMixedRequest.cs
-src/Org.OpenAPITools/Model/InlineObject2.cs
+src/Org.OpenAPITools/Model/MultipartMixedRequestMarker.cs
-src/Org.OpenAPITools/Model/MultipartMixedMarker.cs
 src/Org.OpenAPITools/Model/MultipartMixedStatus.cs
+src/Org.OpenAPITools/Model/MultipartSingleRequest.cs
 src/Org.OpenAPITools/Org.OpenAPITools.csproj

samples/client/others/csharp-netcore-complex-files/README.md

@@ -109,11 +109,11 @@ Class | Method | HTTP request | Description
 <a name="documentation-for-models"></a>
 ## Documentation for Models
 
- - [Model.InlineObject](docs/InlineObject.md)
+ - [Model.MultipartArrayRequest](docs/MultipartArrayRequest.md)
- - [Model.InlineObject1](docs/InlineObject1.md)
+ - [Model.MultipartMixedRequest](docs/MultipartMixedRequest.md)
- - [Model.InlineObject2](docs/InlineObject2.md)
+ - [Model.MultipartMixedRequestMarker](docs/MultipartMixedRequestMarker.md)
- - [Model.MultipartMixedMarker](docs/MultipartMixedMarker.md)
  - [Model.MultipartMixedStatus](docs/MultipartMixedStatus.md)
+ - [Model.MultipartSingleRequest](docs/MultipartSingleRequest.md)
 
 
 <a name="documentation-for-authorization"></a>

samples/client/others/csharp-netcore-complex-files/docs/MultipartApi.md

@@ -80,7 +80,7 @@ No authorization required
 
 <a name="multipartmixed"></a>
 # **MultipartMixed**
-> void MultipartMixed (MultipartMixedStatus status, System.IO.Stream file, MultipartMixedMarker marker = null)
+> void MultipartMixed (MultipartMixedStatus status, System.IO.Stream file, MultipartMixedRequestMarker marker = null)
 
 
 
@@ -105,7 +105,7 @@ namespace Example
             var apiInstance = new MultipartApi(config);
             var status = (MultipartMixedStatus) "ALLOWED";  // MultipartMixedStatus | 
             var file = new System.IO.MemoryStream(System.IO.File.ReadAllBytes("/path/to/file.txt"));  // System.IO.Stream | a file
-            var marker = new MultipartMixedMarker(); // MultipartMixedMarker |  (optional) 
+            var marker = new MultipartMixedRequestMarker(); // MultipartMixedRequestMarker |  (optional) 
 
             try
             {
@@ -128,7 +128,7 @@ Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **status** | **MultipartMixedStatus**|  | 
  **file** | **System.IO.Stream****System.IO.Stream**| a file | 
- **marker** | [**MultipartMixedMarker**](MultipartMixedMarker.md)|  | [optional] 
+ **marker** | [**MultipartMixedRequestMarker**](MultipartMixedRequestMarker.md)|  | [optional] 
 
 ### Return type
 

samples/client/others/csharp-netcore-complex-files/docs/MultipartArrayRequest.md

@@ -0,0 +1,10 @@
+# Org.OpenAPITools.Model.MultipartArrayRequest
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Files** | **List<System.IO.Stream>** | Many files | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+

samples/client/others/csharp-netcore-complex-files/docs/MultipartMixedRequest.md

@@ -0,0 +1,12 @@
+# Org.OpenAPITools.Model.MultipartMixedRequest
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Status** | **MultipartMixedStatus** |  | 
+**Marker** | [**MultipartMixedRequestMarker**](MultipartMixedRequestMarker.md) |  | [optional] 
+**File** | **System.IO.Stream** | a file | 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+

samples/client/others/csharp-netcore-complex-files/docs/MultipartMixedRequestMarker.md

@@ -0,0 +1,11 @@
+# Org.OpenAPITools.Model.MultipartMixedRequestMarker
+additional object
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**Name** | **string** |  | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+

samples/client/others/csharp-netcore-complex-files/docs/MultipartSingleRequest.md

@@ -0,0 +1,10 @@
+# Org.OpenAPITools.Model.MultipartSingleRequest
+
+## Properties
+
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**File** | **System.IO.Stream** | One file | [optional] 
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+

samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools.Test/Model/MultipartArrayRequestTests.cs

@@ -0,0 +1,70 @@
+/*
+ * MultipartFile test
+ *
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing MultipartArrayRequest
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class MultipartArrayRequestTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for MultipartArrayRequest
+        //private MultipartArrayRequest instance;
+
+        public MultipartArrayRequestTests()
+        {
+            // TODO uncomment below to create an instance of MultipartArrayRequest
+            //instance = new MultipartArrayRequest();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of MultipartArrayRequest
+        /// </summary>
+        [Fact]
+        public void MultipartArrayRequestInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" MultipartArrayRequest
+            //Assert.IsType<MultipartArrayRequest>(instance);
+        }
+
+
+        /// <summary>
+        /// Test the property 'Files'
+        /// </summary>
+        [Fact]
+        public void FilesTest()
+        {
+            // TODO unit test for the property 'Files'
+        }
+
+    }
+
+}

samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools.Test/Model/MultipartMixedRequestMarkerTests.cs

@@ -0,0 +1,70 @@
+/*
+ * MultipartFile test
+ *
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing MultipartMixedRequestMarker
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class MultipartMixedRequestMarkerTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for MultipartMixedRequestMarker
+        //private MultipartMixedRequestMarker instance;
+
+        public MultipartMixedRequestMarkerTests()
+        {
+            // TODO uncomment below to create an instance of MultipartMixedRequestMarker
+            //instance = new MultipartMixedRequestMarker();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of MultipartMixedRequestMarker
+        /// </summary>
+        [Fact]
+        public void MultipartMixedRequestMarkerInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" MultipartMixedRequestMarker
+            //Assert.IsType<MultipartMixedRequestMarker>(instance);
+        }
+
+
+        /// <summary>
+        /// Test the property 'Name'
+        /// </summary>
+        [Fact]
+        public void NameTest()
+        {
+            // TODO unit test for the property 'Name'
+        }
+
+    }
+
+}

samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools.Test/Model/MultipartMixedRequestTests.cs

@@ -0,0 +1,86 @@
+/*
+ * MultipartFile test
+ *
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing MultipartMixedRequest
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class MultipartMixedRequestTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for MultipartMixedRequest
+        //private MultipartMixedRequest instance;
+
+        public MultipartMixedRequestTests()
+        {
+            // TODO uncomment below to create an instance of MultipartMixedRequest
+            //instance = new MultipartMixedRequest();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of MultipartMixedRequest
+        /// </summary>
+        [Fact]
+        public void MultipartMixedRequestInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" MultipartMixedRequest
+            //Assert.IsType<MultipartMixedRequest>(instance);
+        }
+
+
+        /// <summary>
+        /// Test the property 'Status'
+        /// </summary>
+        [Fact]
+        public void StatusTest()
+        {
+            // TODO unit test for the property 'Status'
+        }
+        /// <summary>
+        /// Test the property 'Marker'
+        /// </summary>
+        [Fact]
+        public void MarkerTest()
+        {
+            // TODO unit test for the property 'Marker'
+        }
+        /// <summary>
+        /// Test the property 'File'
+        /// </summary>
+        [Fact]
+        public void FileTest()
+        {
+            // TODO unit test for the property 'File'
+        }
+
+    }
+
+}

samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools.Test/Model/MultipartSingleRequestTests.cs

@@ -0,0 +1,70 @@
+/*
+ * MultipartFile test
+ *
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using Xunit;
+
+using System;
+using System.Linq;
+using System.IO;
+using System.Collections.Generic;
+using Org.OpenAPITools.Api;
+using Org.OpenAPITools.Model;
+using Org.OpenAPITools.Client;
+using System.Reflection;
+using Newtonsoft.Json;
+
+namespace Org.OpenAPITools.Test.Model
+{
+    /// <summary>
+    ///  Class for testing MultipartSingleRequest
+    /// </summary>
+    /// <remarks>
+    /// This file is automatically generated by OpenAPI Generator (https://openapi-generator.tech).
+    /// Please update the test case below to test the model.
+    /// </remarks>
+    public class MultipartSingleRequestTests : IDisposable
+    {
+        // TODO uncomment below to declare an instance variable for MultipartSingleRequest
+        //private MultipartSingleRequest instance;
+
+        public MultipartSingleRequestTests()
+        {
+            // TODO uncomment below to create an instance of MultipartSingleRequest
+            //instance = new MultipartSingleRequest();
+        }
+
+        public void Dispose()
+        {
+            // Cleanup when everything is done.
+        }
+
+        /// <summary>
+        /// Test an instance of MultipartSingleRequest
+        /// </summary>
+        [Fact]
+        public void MultipartSingleRequestInstanceTest()
+        {
+            // TODO uncomment below to test "IsType" MultipartSingleRequest
+            //Assert.IsType<MultipartSingleRequest>(instance);
+        }
+
+
+        /// <summary>
+        /// Test the property 'File'
+        /// </summary>
+        [Fact]
+        public void FileTest()
+        {
+            // TODO unit test for the property 'File'
+        }
+
+    }
+
+}

samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Api/MultipartApi.cs

@@ -61,7 +61,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="marker"> (optional)</param>
         /// <param name="operationIndex">Index associated with the operation.</param>
         /// <returns></returns>
-        void MultipartMixed(MultipartMixedStatus status, System.IO.Stream file, MultipartMixedMarker marker = default(MultipartMixedMarker), int operationIndex = 0);
+        void MultipartMixed(MultipartMixedStatus status, System.IO.Stream file, MultipartMixedRequestMarker marker = default(MultipartMixedRequestMarker), int operationIndex = 0);
 
         /// <summary>
         /// 
@@ -75,7 +75,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="marker"> (optional)</param>
         /// <param name="operationIndex">Index associated with the operation.</param>
         /// <returns>ApiResponse of Object(void)</returns>
-        ApiResponse<Object> MultipartMixedWithHttpInfo(MultipartMixedStatus status, System.IO.Stream file, MultipartMixedMarker marker = default(MultipartMixedMarker), int operationIndex = 0);
+        ApiResponse<Object> MultipartMixedWithHttpInfo(MultipartMixedStatus status, System.IO.Stream file, MultipartMixedRequestMarker marker = default(MultipartMixedRequestMarker), int operationIndex = 0);
         /// <summary>
         /// 
         /// </summary>
@@ -146,7 +146,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="operationIndex">Index associated with the operation.</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of void</returns>
-        System.Threading.Tasks.Task MultipartMixedAsync(MultipartMixedStatus status, System.IO.Stream file, MultipartMixedMarker marker = default(MultipartMixedMarker), int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task MultipartMixedAsync(MultipartMixedStatus status, System.IO.Stream file, MultipartMixedRequestMarker marker = default(MultipartMixedRequestMarker), int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
 
         /// <summary>
         /// 
@@ -161,7 +161,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="operationIndex">Index associated with the operation.</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse</returns>
-        System.Threading.Tasks.Task<ApiResponse<Object>> MultipartMixedWithHttpInfoAsync(MultipartMixedStatus status, System.IO.Stream file, MultipartMixedMarker marker = default(MultipartMixedMarker), int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
+        System.Threading.Tasks.Task<ApiResponse<Object>> MultipartMixedWithHttpInfoAsync(MultipartMixedStatus status, System.IO.Stream file, MultipartMixedRequestMarker marker = default(MultipartMixedRequestMarker), int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken));
         /// <summary>
         /// 
         /// </summary>
@@ -458,7 +458,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="marker"> (optional)</param>
         /// <param name="operationIndex">Index associated with the operation.</param>
         /// <returns></returns>
-        public void MultipartMixed(MultipartMixedStatus status, System.IO.Stream file, MultipartMixedMarker marker = default(MultipartMixedMarker), int operationIndex = 0)
+        public void MultipartMixed(MultipartMixedStatus status, System.IO.Stream file, MultipartMixedRequestMarker marker = default(MultipartMixedRequestMarker), int operationIndex = 0)
         {
             MultipartMixedWithHttpInfo(status, file, marker);
         }
@@ -472,7 +472,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="marker"> (optional)</param>
         /// <param name="operationIndex">Index associated with the operation.</param>
         /// <returns>ApiResponse of Object(void)</returns>
-        public Org.OpenAPITools.Client.ApiResponse<Object> MultipartMixedWithHttpInfo(MultipartMixedStatus status, System.IO.Stream file, MultipartMixedMarker marker = default(MultipartMixedMarker), int operationIndex = 0)
+        public Org.OpenAPITools.Client.ApiResponse<Object> MultipartMixedWithHttpInfo(MultipartMixedStatus status, System.IO.Stream file, MultipartMixedRequestMarker marker = default(MultipartMixedRequestMarker), int operationIndex = 0)
         {
             // verify the required parameter 'file' is set
             if (file == null)
@@ -537,7 +537,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="operationIndex">Index associated with the operation.</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of void</returns>
-        public async System.Threading.Tasks.Task MultipartMixedAsync(MultipartMixedStatus status, System.IO.Stream file, MultipartMixedMarker marker = default(MultipartMixedMarker), int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public async System.Threading.Tasks.Task MultipartMixedAsync(MultipartMixedStatus status, System.IO.Stream file, MultipartMixedRequestMarker marker = default(MultipartMixedRequestMarker), int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
             await MultipartMixedWithHttpInfoAsync(status, file, marker, operationIndex, cancellationToken).ConfigureAwait(false);
         }
@@ -552,7 +552,7 @@ namespace Org.OpenAPITools.Api
         /// <param name="operationIndex">Index associated with the operation.</param>
         /// <param name="cancellationToken">Cancellation Token to cancel the request.</param>
         /// <returns>Task of ApiResponse</returns>
-        public async System.Threading.Tasks.Task<Org.OpenAPITools.Client.ApiResponse<Object>> MultipartMixedWithHttpInfoAsync(MultipartMixedStatus status, System.IO.Stream file, MultipartMixedMarker marker = default(MultipartMixedMarker), int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
+        public async System.Threading.Tasks.Task<Org.OpenAPITools.Client.ApiResponse<Object>> MultipartMixedWithHttpInfoAsync(MultipartMixedStatus status, System.IO.Stream file, MultipartMixedRequestMarker marker = default(MultipartMixedRequestMarker), int operationIndex = 0, System.Threading.CancellationToken cancellationToken = default(System.Threading.CancellationToken))
         {
             // verify the required parameter 'file' is set
             if (file == null)

samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Model/MultipartArrayRequest.cs

@@ -0,0 +1,121 @@
+/*
+ * MultipartFile test
+ *
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Text.RegularExpressions;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using Newtonsoft.Json.Linq;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// MultipartArrayRequest
+    /// </summary>
+    [DataContract(Name = "multipartArray_request")]
+    public partial class MultipartArrayRequest : IEquatable<MultipartArrayRequest>, IValidatableObject
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MultipartArrayRequest" /> class.
+        /// </summary>
+        /// <param name="files">Many files.</param>
+        public MultipartArrayRequest(List<System.IO.Stream> files = default(List<System.IO.Stream>))
+        {
+            this.Files = files;
+        }
+
+        /// <summary>
+        /// Many files
+        /// </summary>
+        /// <value>Many files</value>
+        [DataMember(Name = "files", EmitDefaultValue = false)]
+        public List<System.IO.Stream> Files { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append("class MultipartArrayRequest {\n");
+            sb.Append("  Files: ").Append(Files).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return OpenAPIClientUtils.compareLogic.Compare(this, input as MultipartArrayRequest).AreEqual;
+        }
+
+        /// <summary>
+        /// Returns true if MultipartArrayRequest instances are equal
+        /// </summary>
+        /// <param name="input">Instance of MultipartArrayRequest to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(MultipartArrayRequest input)
+        {
+            return OpenAPIClientUtils.compareLogic.Compare(this, input).AreEqual;
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Files != null)
+                {
+                    hashCode = (hashCode * 59) + this.Files.GetHashCode();
+                }
+                return hashCode;
+            }
+        }
+
+        /// <summary>
+        /// To validate all properties of the instance
+        /// </summary>
+        /// <param name="validationContext">Validation context</param>
+        /// <returns>Validation Result</returns>
+        public IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> Validate(ValidationContext validationContext)
+        {
+            yield break;
+        }
+    }
+
+}

samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Model/MultipartMixedRequest.cs

@@ -0,0 +1,154 @@
+/*
+ * MultipartFile test
+ *
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Text.RegularExpressions;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using Newtonsoft.Json.Linq;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// MultipartMixedRequest
+    /// </summary>
+    [DataContract(Name = "multipartMixed_request")]
+    public partial class MultipartMixedRequest : IEquatable<MultipartMixedRequest>, IValidatableObject
+    {
+
+        /// <summary>
+        /// Gets or Sets Status
+        /// </summary>
+        [DataMember(Name = "status", IsRequired = true, EmitDefaultValue = false)]
+        public MultipartMixedStatus Status { get; set; }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MultipartMixedRequest" /> class.
+        /// </summary>
+        [JsonConstructorAttribute]
+        protected MultipartMixedRequest() { }
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MultipartMixedRequest" /> class.
+        /// </summary>
+        /// <param name="status">status (required).</param>
+        /// <param name="marker">marker.</param>
+        /// <param name="file">a file (required).</param>
+        public MultipartMixedRequest(MultipartMixedStatus status = default(MultipartMixedStatus), MultipartMixedRequestMarker marker = default(MultipartMixedRequestMarker), System.IO.Stream file = default(System.IO.Stream))
+        {
+            this.Status = status;
+            // to ensure "file" is required (not null)
+            if (file == null)
+            {
+                throw new ArgumentNullException("file is a required property for MultipartMixedRequest and cannot be null");
+            }
+            this.File = file;
+            this.Marker = marker;
+        }
+
+        /// <summary>
+        /// Gets or Sets Marker
+        /// </summary>
+        [DataMember(Name = "marker", EmitDefaultValue = false)]
+        public MultipartMixedRequestMarker Marker { get; set; }
+
+        /// <summary>
+        /// a file
+        /// </summary>
+        /// <value>a file</value>
+        [DataMember(Name = "file", IsRequired = true, EmitDefaultValue = false)]
+        public System.IO.Stream File { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append("class MultipartMixedRequest {\n");
+            sb.Append("  Status: ").Append(Status).Append("\n");
+            sb.Append("  Marker: ").Append(Marker).Append("\n");
+            sb.Append("  File: ").Append(File).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return OpenAPIClientUtils.compareLogic.Compare(this, input as MultipartMixedRequest).AreEqual;
+        }
+
+        /// <summary>
+        /// Returns true if MultipartMixedRequest instances are equal
+        /// </summary>
+        /// <param name="input">Instance of MultipartMixedRequest to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(MultipartMixedRequest input)
+        {
+            return OpenAPIClientUtils.compareLogic.Compare(this, input).AreEqual;
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                hashCode = (hashCode * 59) + this.Status.GetHashCode();
+                if (this.Marker != null)
+                {
+                    hashCode = (hashCode * 59) + this.Marker.GetHashCode();
+                }
+                if (this.File != null)
+                {
+                    hashCode = (hashCode * 59) + this.File.GetHashCode();
+                }
+                return hashCode;
+            }
+        }
+
+        /// <summary>
+        /// To validate all properties of the instance
+        /// </summary>
+        /// <param name="validationContext">Validation context</param>
+        /// <returns>Validation Result</returns>
+        public IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> Validate(ValidationContext validationContext)
+        {
+            yield break;
+        }
+    }
+
+}

samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Model/MultipartMixedRequestMarker.cs

@@ -0,0 +1,120 @@
+/*
+ * MultipartFile test
+ *
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Text.RegularExpressions;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using Newtonsoft.Json.Linq;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// additional object
+    /// </summary>
+    [DataContract(Name = "multipartMixed_request_marker")]
+    public partial class MultipartMixedRequestMarker : IEquatable<MultipartMixedRequestMarker>, IValidatableObject
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MultipartMixedRequestMarker" /> class.
+        /// </summary>
+        /// <param name="name">name.</param>
+        public MultipartMixedRequestMarker(string name = default(string))
+        {
+            this.Name = name;
+        }
+
+        /// <summary>
+        /// Gets or Sets Name
+        /// </summary>
+        [DataMember(Name = "name", EmitDefaultValue = false)]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append("class MultipartMixedRequestMarker {\n");
+            sb.Append("  Name: ").Append(Name).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return OpenAPIClientUtils.compareLogic.Compare(this, input as MultipartMixedRequestMarker).AreEqual;
+        }
+
+        /// <summary>
+        /// Returns true if MultipartMixedRequestMarker instances are equal
+        /// </summary>
+        /// <param name="input">Instance of MultipartMixedRequestMarker to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(MultipartMixedRequestMarker input)
+        {
+            return OpenAPIClientUtils.compareLogic.Compare(this, input).AreEqual;
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.Name != null)
+                {
+                    hashCode = (hashCode * 59) + this.Name.GetHashCode();
+                }
+                return hashCode;
+            }
+        }
+
+        /// <summary>
+        /// To validate all properties of the instance
+        /// </summary>
+        /// <param name="validationContext">Validation context</param>
+        /// <returns>Validation Result</returns>
+        public IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> Validate(ValidationContext validationContext)
+        {
+            yield break;
+        }
+    }
+
+}

samples/client/others/csharp-netcore-complex-files/src/Org.OpenAPITools/Model/MultipartSingleRequest.cs

@@ -0,0 +1,121 @@
+/*
+ * MultipartFile test
+ *
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * Generated by: https://github.com/openapitools/openapi-generator.git
+ */
+
+
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.IO;
+using System.Runtime.Serialization;
+using System.Text;
+using System.Text.RegularExpressions;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Converters;
+using Newtonsoft.Json.Linq;
+using System.ComponentModel.DataAnnotations;
+using OpenAPIDateConverter = Org.OpenAPITools.Client.OpenAPIDateConverter;
+using OpenAPIClientUtils = Org.OpenAPITools.Client.ClientUtils;
+
+namespace Org.OpenAPITools.Model
+{
+    /// <summary>
+    /// MultipartSingleRequest
+    /// </summary>
+    [DataContract(Name = "multipartSingle_request")]
+    public partial class MultipartSingleRequest : IEquatable<MultipartSingleRequest>, IValidatableObject
+    {
+        /// <summary>
+        /// Initializes a new instance of the <see cref="MultipartSingleRequest" /> class.
+        /// </summary>
+        /// <param name="file">One file.</param>
+        public MultipartSingleRequest(System.IO.Stream file = default(System.IO.Stream))
+        {
+            this.File = file;
+        }
+
+        /// <summary>
+        /// One file
+        /// </summary>
+        /// <value>One file</value>
+        [DataMember(Name = "file", EmitDefaultValue = false)]
+        public System.IO.Stream File { get; set; }
+
+        /// <summary>
+        /// Returns the string presentation of the object
+        /// </summary>
+        /// <returns>String presentation of the object</returns>
+        public override string ToString()
+        {
+            StringBuilder sb = new StringBuilder();
+            sb.Append("class MultipartSingleRequest {\n");
+            sb.Append("  File: ").Append(File).Append("\n");
+            sb.Append("}\n");
+            return sb.ToString();
+        }
+
+        /// <summary>
+        /// Returns the JSON string presentation of the object
+        /// </summary>
+        /// <returns>JSON string presentation of the object</returns>
+        public virtual string ToJson()
+        {
+            return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented);
+        }
+
+        /// <summary>
+        /// Returns true if objects are equal
+        /// </summary>
+        /// <param name="input">Object to be compared</param>
+        /// <returns>Boolean</returns>
+        public override bool Equals(object input)
+        {
+            return OpenAPIClientUtils.compareLogic.Compare(this, input as MultipartSingleRequest).AreEqual;
+        }
+
+        /// <summary>
+        /// Returns true if MultipartSingleRequest instances are equal
+        /// </summary>
+        /// <param name="input">Instance of MultipartSingleRequest to be compared</param>
+        /// <returns>Boolean</returns>
+        public bool Equals(MultipartSingleRequest input)
+        {
+            return OpenAPIClientUtils.compareLogic.Compare(this, input).AreEqual;
+        }
+
+        /// <summary>
+        /// Gets the hash code
+        /// </summary>
+        /// <returns>Hash code</returns>
+        public override int GetHashCode()
+        {
+            unchecked // Overflow is fine, just wrap
+            {
+                int hashCode = 41;
+                if (this.File != null)
+                {
+                    hashCode = (hashCode * 59) + this.File.GetHashCode();
+                }
+                return hashCode;
+            }
+        }
+
+        /// <summary>
+        /// To validate all properties of the instance
+        /// </summary>
+        /// <param name="validationContext">Validation context</param>
+        /// <returns>Validation Result</returns>
+        public IEnumerable<System.ComponentModel.DataAnnotations.ValidationResult> Validate(ValidationContext validationContext)
+        {
+            yield break;
+        }
+    }
+
+}

samples/client/petstore/go/go-petstore/api/openapi.yaml

@@ -242,13 +242,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/updatePetWithForm_request'
-                name:
-                  description: Updated name of the pet
-                  type: string
-                status:
-                  description: Updated status of the pet
-                  type: string
       responses:
         "405":
           content: {}
@@ -275,14 +269,7 @@ paths:
         content:
           multipart/form-data:
             schema:
-              properties:
+              $ref: '#/components/schemas/uploadFile_request'
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                file:
-                  description: file to upload
-                  format: binary
-                  type: string
       responses:
         "200":
           content:
@@ -731,24 +718,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testEnumParameters_request'
-                enum_form_string_array:
-                  description: Form parameter enum test (string array)
-                  items:
-                    default: $
-                    enum:
-                    - '>'
-                    - $
-                    type: string
-                  type: array
-                enum_form_string:
-                  default: -efg
-                  description: Form parameter enum test (string)
-                  enum:
-                  - _abc
-                  - -efg
-                  - (xyz)
-                  type: string
       responses:
         "400":
           content: {}
@@ -791,77 +761,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testEndpointParameters_request'
-                integer:
-                  description: None
-                  format: int32
-                  maximum: 100
-                  minimum: 10
-                  type: integer
-                int32:
-                  description: None
-                  format: int32
-                  maximum: 200
-                  minimum: 20
-                  type: integer
-                int64:
-                  description: None
-                  format: int64
-                  type: integer
-                number:
-                  description: None
-                  maximum: 543.2
-                  minimum: 32.1
-                  type: number
-                float:
-                  description: None
-                  format: float
-                  maximum: 987.6
-                  type: number
-                double:
-                  description: None
-                  format: double
-                  maximum: 123.4
-                  minimum: 67.8
-                  type: number
-                string:
-                  description: None
-                  pattern: "/[a-z]/i"
-                  type: string
-                pattern_without_delimiter:
-                  description: None
-                  pattern: "^[A-Z].*"
-                  type: string
-                byte:
-                  description: None
-                  format: byte
-                  type: string
-                binary:
-                  description: None
-                  format: binary
-                  type: string
-                date:
-                  description: None
-                  format: date
-                  type: string
-                dateTime:
-                  description: None
-                  format: date-time
-                  type: string
-                password:
-                  description: None
-                  format: password
-                  maxLength: 64
-                  minLength: 10
-                  type: string
-                callback:
-                  description: None
-                  type: string
-              required:
-              - byte
-              - double
-              - number
-              - pattern_without_delimiter
         required: true
       responses:
         "400":
@@ -970,16 +870,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testJsonFormData_request'
-                param:
-                  description: field1
-                  type: string
-                param2:
-                  description: field2
-                  type: string
-              required:
-              - param
-              - param2
         required: true
       responses:
         "200":
@@ -1172,16 +1063,7 @@ paths:
         content:
           multipart/form-data:
             schema:
-              properties:
+              $ref: '#/components/schemas/uploadFileWithRequiredFile_request'
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                requiredFile:
-                  description: file to upload
-                  format: binary
-                  type: string
-              required:
-              - requiredFile
         required: true
       responses:
         "200":
@@ -2086,6 +1968,136 @@ components:
       xml:
         namespace: http://a.com/schema
         prefix: pre
+    updatePetWithForm_request:
+      properties:
+        name:
+          description: Updated name of the pet
+          type: string
+        status:
+          description: Updated status of the pet
+          type: string
+    uploadFile_request:
+      properties:
+        additionalMetadata:
+          description: Additional data to pass to server
+          type: string
+        file:
+          description: file to upload
+          format: binary
+          type: string
+    testEnumParameters_request:
+      properties:
+        enum_form_string_array:
+          description: Form parameter enum test (string array)
+          items:
+            default: $
+            enum:
+            - '>'
+            - $
+            type: string
+          type: array
+        enum_form_string:
+          default: -efg
+          description: Form parameter enum test (string)
+          enum:
+          - _abc
+          - -efg
+          - (xyz)
+          type: string
+    testEndpointParameters_request:
+      properties:
+        integer:
+          description: None
+          format: int32
+          maximum: 100
+          minimum: 10
+          type: integer
+        int32:
+          description: None
+          format: int32
+          maximum: 200
+          minimum: 20
+          type: integer
+        int64:
+          description: None
+          format: int64
+          type: integer
+        number:
+          description: None
+          maximum: 543.2
+          minimum: 32.1
+          type: number
+        float:
+          description: None
+          format: float
+          maximum: 987.6
+          type: number
+        double:
+          description: None
+          format: double
+          maximum: 123.4
+          minimum: 67.8
+          type: number
+        string:
+          description: None
+          pattern: "/[a-z]/i"
+          type: string
+        pattern_without_delimiter:
+          description: None
+          pattern: "^[A-Z].*"
+          type: string
+        byte:
+          description: None
+          format: byte
+          type: string
+        binary:
+          description: None
+          format: binary
+          type: string
+        date:
+          description: None
+          format: date
+          type: string
+        dateTime:
+          description: None
+          format: date-time
+          type: string
+        password:
+          description: None
+          format: password
+          maxLength: 64
+          minLength: 10
+          type: string
+        callback:
+          description: None
+          type: string
+      required:
+      - byte
+      - double
+      - number
+      - pattern_without_delimiter
+    testJsonFormData_request:
+      properties:
+        param:
+          description: field1
+          type: string
+        param2:
+          description: field2
+          type: string
+      required:
+      - param
+      - param2
+    uploadFileWithRequiredFile_request:
+      properties:
+        additionalMetadata:
+          description: Additional data to pass to server
+          type: string
+        requiredFile:
+          description: file to upload
+          format: binary
+          type: string
+      required:
+      - requiredFile
     Dog_allOf:
       properties:
         breed:

samples/client/petstore/haskell-http-client/openapi.yaml

@@ -242,13 +242,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/updatePetWithForm_request'
-                name:
-                  description: Updated name of the pet
-                  type: string
-                status:
-                  description: Updated status of the pet
-                  type: string
       responses:
         "405":
           content: {}
@@ -275,14 +269,7 @@ paths:
         content:
           multipart/form-data:
             schema:
-              properties:
+              $ref: '#/components/schemas/uploadFile_request'
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                file:
-                  description: file to upload
-                  format: binary
-                  type: string
       responses:
         "200":
           content:
@@ -731,24 +718,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testEnumParameters_request'
-                enum_form_string_array:
-                  description: Form parameter enum test (string array)
-                  items:
-                    default: $
-                    enum:
-                    - '>'
-                    - $
-                    type: string
-                  type: array
-                enum_form_string:
-                  default: -efg
-                  description: Form parameter enum test (string)
-                  enum:
-                  - _abc
-                  - -efg
-                  - (xyz)
-                  type: string
       responses:
         "400":
           content: {}
@@ -791,77 +761,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testEndpointParameters_request'
-                integer:
-                  description: None
-                  format: int32
-                  maximum: 100
-                  minimum: 10
-                  type: integer
-                int32:
-                  description: None
-                  format: int32
-                  maximum: 200
-                  minimum: 20
-                  type: integer
-                int64:
-                  description: None
-                  format: int64
-                  type: integer
-                number:
-                  description: None
-                  maximum: 543.2
-                  minimum: 32.1
-                  type: number
-                float:
-                  description: None
-                  format: float
-                  maximum: 987.6
-                  type: number
-                double:
-                  description: None
-                  format: double
-                  maximum: 123.4
-                  minimum: 67.8
-                  type: number
-                string:
-                  description: None
-                  pattern: "/[a-z]/i"
-                  type: string
-                pattern_without_delimiter:
-                  description: None
-                  pattern: "^[A-Z].*"
-                  type: string
-                byte:
-                  description: None
-                  format: byte
-                  type: string
-                binary:
-                  description: None
-                  format: binary
-                  type: string
-                date:
-                  description: None
-                  format: date
-                  type: string
-                dateTime:
-                  description: None
-                  format: date-time
-                  type: string
-                password:
-                  description: None
-                  format: password
-                  maxLength: 64
-                  minLength: 10
-                  type: string
-                callback:
-                  description: None
-                  type: string
-              required:
-              - byte
-              - double
-              - number
-              - pattern_without_delimiter
         required: true
       responses:
         "400":
@@ -970,16 +870,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testJsonFormData_request'
-                param:
-                  description: field1
-                  type: string
-                param2:
-                  description: field2
-                  type: string
-              required:
-              - param
-              - param2
         required: true
       responses:
         "200":
@@ -1172,16 +1063,7 @@ paths:
         content:
           multipart/form-data:
             schema:
-              properties:
+              $ref: '#/components/schemas/uploadFileWithRequiredFile_request'
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                requiredFile:
-                  description: file to upload
-                  format: binary
-                  type: string
-              required:
-              - requiredFile
         required: true
       responses:
         "200":
@@ -2086,6 +1968,136 @@ components:
       xml:
         namespace: http://a.com/schema
         prefix: pre
+    updatePetWithForm_request:
+      properties:
+        name:
+          description: Updated name of the pet
+          type: string
+        status:
+          description: Updated status of the pet
+          type: string
+    uploadFile_request:
+      properties:
+        additionalMetadata:
+          description: Additional data to pass to server
+          type: string
+        file:
+          description: file to upload
+          format: binary
+          type: string
+    testEnumParameters_request:
+      properties:
+        enum_form_string_array:
+          description: Form parameter enum test (string array)
+          items:
+            default: $
+            enum:
+            - '>'
+            - $
+            type: string
+          type: array
+        enum_form_string:
+          default: -efg
+          description: Form parameter enum test (string)
+          enum:
+          - _abc
+          - -efg
+          - (xyz)
+          type: string
+    testEndpointParameters_request:
+      properties:
+        integer:
+          description: None
+          format: int32
+          maximum: 100
+          minimum: 10
+          type: integer
+        int32:
+          description: None
+          format: int32
+          maximum: 200
+          minimum: 20
+          type: integer
+        int64:
+          description: None
+          format: int64
+          type: integer
+        number:
+          description: None
+          maximum: 543.2
+          minimum: 32.1
+          type: number
+        float:
+          description: None
+          format: float
+          maximum: 987.6
+          type: number
+        double:
+          description: None
+          format: double
+          maximum: 123.4
+          minimum: 67.8
+          type: number
+        string:
+          description: None
+          pattern: "/[a-z]/i"
+          type: string
+        pattern_without_delimiter:
+          description: None
+          pattern: "^[A-Z].*"
+          type: string
+        byte:
+          description: None
+          format: byte
+          type: string
+        binary:
+          description: None
+          format: binary
+          type: string
+        date:
+          description: None
+          format: date
+          type: string
+        dateTime:
+          description: None
+          format: date-time
+          type: string
+        password:
+          description: None
+          format: password
+          maxLength: 64
+          minLength: 10
+          type: string
+        callback:
+          description: None
+          type: string
+      required:
+      - byte
+      - double
+      - number
+      - pattern_without_delimiter
+    testJsonFormData_request:
+      properties:
+        param:
+          description: field1
+          type: string
+        param2:
+          description: field2
+          type: string
+      required:
+      - param
+      - param2
+    uploadFileWithRequiredFile_request:
+      properties:
+        additionalMetadata:
+          description: Additional data to pass to server
+          type: string
+        requiredFile:
+          description: file to upload
+          format: binary
+          type: string
+      required:
+      - requiredFile
     Dog_allOf:
       properties:
         breed:

samples/client/petstore/java/apache-httpclient/api/openapi.yaml

@@ -250,13 +250,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/updatePetWithForm_request'
-                name:
-                  description: Updated name of the pet
-                  type: string
-                status:
-                  description: Updated status of the pet
-                  type: string
       responses:
         "405":
           content: {}
@@ -285,14 +279,7 @@ paths:
         content:
           multipart/form-data:
             schema:
-              properties:
+              $ref: '#/components/schemas/uploadFile_request'
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                file:
-                  description: file to upload
-                  format: binary
-                  type: string
       responses:
         "200":
           content:
@@ -763,24 +750,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testEnumParameters_request'
-                enum_form_string_array:
-                  description: Form parameter enum test (string array)
-                  items:
-                    default: $
-                    enum:
-                    - '>'
-                    - $
-                    type: string
-                  type: array
-                enum_form_string:
-                  default: -efg
-                  description: Form parameter enum test (string)
-                  enum:
-                  - _abc
-                  - -efg
-                  - (xyz)
-                  type: string
       responses:
         "400":
           content: {}
@@ -827,77 +797,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testEndpointParameters_request'
-                integer:
-                  description: None
-                  format: int32
-                  maximum: 100
-                  minimum: 10
-                  type: integer
-                int32:
-                  description: None
-                  format: int32
-                  maximum: 200
-                  minimum: 20
-                  type: integer
-                int64:
-                  description: None
-                  format: int64
-                  type: integer
-                number:
-                  description: None
-                  maximum: 543.2
-                  minimum: 32.1
-                  type: number
-                float:
-                  description: None
-                  format: float
-                  maximum: 987.6
-                  type: number
-                double:
-                  description: None
-                  format: double
-                  maximum: 123.4
-                  minimum: 67.8
-                  type: number
-                string:
-                  description: None
-                  pattern: "/[a-z]/i"
-                  type: string
-                pattern_without_delimiter:
-                  description: None
-                  pattern: "^[A-Z].*"
-                  type: string
-                byte:
-                  description: None
-                  format: byte
-                  type: string
-                binary:
-                  description: None
-                  format: binary
-                  type: string
-                date:
-                  description: None
-                  format: date
-                  type: string
-                dateTime:
-                  description: None
-                  format: date-time
-                  type: string
-                password:
-                  description: None
-                  format: password
-                  maxLength: 64
-                  minLength: 10
-                  type: string
-                callback:
-                  description: None
-                  type: string
-              required:
-              - byte
-              - double
-              - number
-              - pattern_without_delimiter
         required: true
       responses:
         "400":
@@ -1016,16 +916,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testJsonFormData_request'
-                param:
-                  description: field1
-                  type: string
-                param2:
-                  description: field2
-                  type: string
-              required:
-              - param
-              - param2
         required: true
       responses:
         "200":
@@ -1231,16 +1122,7 @@ paths:
         content:
           multipart/form-data:
             schema:
-              properties:
+              $ref: '#/components/schemas/uploadFileWithRequiredFile_request'
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                requiredFile:
-                  description: file to upload
-                  format: binary
-                  type: string
-              required:
-              - requiredFile
         required: true
       responses:
         "200":
@@ -2147,6 +2029,136 @@ components:
       xml:
         namespace: http://a.com/schema
         prefix: pre
+    updatePetWithForm_request:
+      properties:
+        name:
+          description: Updated name of the pet
+          type: string
+        status:
+          description: Updated status of the pet
+          type: string
+    uploadFile_request:
+      properties:
+        additionalMetadata:
+          description: Additional data to pass to server
+          type: string
+        file:
+          description: file to upload
+          format: binary
+          type: string
+    testEnumParameters_request:
+      properties:
+        enum_form_string_array:
+          description: Form parameter enum test (string array)
+          items:
+            default: $
+            enum:
+            - '>'
+            - $
+            type: string
+          type: array
+        enum_form_string:
+          default: -efg
+          description: Form parameter enum test (string)
+          enum:
+          - _abc
+          - -efg
+          - (xyz)
+          type: string
+    testEndpointParameters_request:
+      properties:
+        integer:
+          description: None
+          format: int32
+          maximum: 100
+          minimum: 10
+          type: integer
+        int32:
+          description: None
+          format: int32
+          maximum: 200
+          minimum: 20
+          type: integer
+        int64:
+          description: None
+          format: int64
+          type: integer
+        number:
+          description: None
+          maximum: 543.2
+          minimum: 32.1
+          type: number
+        float:
+          description: None
+          format: float
+          maximum: 987.6
+          type: number
+        double:
+          description: None
+          format: double
+          maximum: 123.4
+          minimum: 67.8
+          type: number
+        string:
+          description: None
+          pattern: "/[a-z]/i"
+          type: string
+        pattern_without_delimiter:
+          description: None
+          pattern: "^[A-Z].*"
+          type: string
+        byte:
+          description: None
+          format: byte
+          type: string
+        binary:
+          description: None
+          format: binary
+          type: string
+        date:
+          description: None
+          format: date
+          type: string
+        dateTime:
+          description: None
+          format: date-time
+          type: string
+        password:
+          description: None
+          format: password
+          maxLength: 64
+          minLength: 10
+          type: string
+        callback:
+          description: None
+          type: string
+      required:
+      - byte
+      - double
+      - number
+      - pattern_without_delimiter
+    testJsonFormData_request:
+      properties:
+        param:
+          description: field1
+          type: string
+        param2:
+          description: field2
+          type: string
+      required:
+      - param
+      - param2
+    uploadFileWithRequiredFile_request:
+      properties:
+        additionalMetadata:
+          description: Additional data to pass to server
+          type: string
+        requiredFile:
+          description: file to upload
+          format: binary
+          type: string
+      required:
+      - requiredFile
     Dog_allOf:
       properties:
         breed:

samples/client/petstore/java/feign-no-nullable/api/openapi.yaml

@@ -250,13 +250,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/updatePetWithForm_request'
-                name:
-                  description: Updated name of the pet
-                  type: string
-                status:
-                  description: Updated status of the pet
-                  type: string
       responses:
         "405":
           content: {}
@@ -285,14 +279,7 @@ paths:
         content:
           multipart/form-data:
             schema:
-              properties:
+              $ref: '#/components/schemas/uploadFile_request'
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                file:
-                  description: file to upload
-                  format: binary
-                  type: string
       responses:
         "200":
           content:
@@ -763,24 +750,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testEnumParameters_request'
-                enum_form_string_array:
-                  description: Form parameter enum test (string array)
-                  items:
-                    default: $
-                    enum:
-                    - '>'
-                    - $
-                    type: string
-                  type: array
-                enum_form_string:
-                  default: -efg
-                  description: Form parameter enum test (string)
-                  enum:
-                  - _abc
-                  - -efg
-                  - (xyz)
-                  type: string
       responses:
         "400":
           content: {}
@@ -827,77 +797,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testEndpointParameters_request'
-                integer:
-                  description: None
-                  format: int32
-                  maximum: 100
-                  minimum: 10
-                  type: integer
-                int32:
-                  description: None
-                  format: int32
-                  maximum: 200
-                  minimum: 20
-                  type: integer
-                int64:
-                  description: None
-                  format: int64
-                  type: integer
-                number:
-                  description: None
-                  maximum: 543.2
-                  minimum: 32.1
-                  type: number
-                float:
-                  description: None
-                  format: float
-                  maximum: 987.6
-                  type: number
-                double:
-                  description: None
-                  format: double
-                  maximum: 123.4
-                  minimum: 67.8
-                  type: number
-                string:
-                  description: None
-                  pattern: "/[a-z]/i"
-                  type: string
-                pattern_without_delimiter:
-                  description: None
-                  pattern: "^[A-Z].*"
-                  type: string
-                byte:
-                  description: None
-                  format: byte
-                  type: string
-                binary:
-                  description: None
-                  format: binary
-                  type: string
-                date:
-                  description: None
-                  format: date
-                  type: string
-                dateTime:
-                  description: None
-                  format: date-time
-                  type: string
-                password:
-                  description: None
-                  format: password
-                  maxLength: 64
-                  minLength: 10
-                  type: string
-                callback:
-                  description: None
-                  type: string
-              required:
-              - byte
-              - double
-              - number
-              - pattern_without_delimiter
         required: true
       responses:
         "400":
@@ -1016,16 +916,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testJsonFormData_request'
-                param:
-                  description: field1
-                  type: string
-                param2:
-                  description: field2
-                  type: string
-              required:
-              - param
-              - param2
         required: true
       responses:
         "200":
@@ -1231,16 +1122,7 @@ paths:
         content:
           multipart/form-data:
             schema:
-              properties:
+              $ref: '#/components/schemas/uploadFileWithRequiredFile_request'
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                requiredFile:
-                  description: file to upload
-                  format: binary
-                  type: string
-              required:
-              - requiredFile
         required: true
       responses:
         "200":
@@ -2147,6 +2029,136 @@ components:
       xml:
         namespace: http://a.com/schema
         prefix: pre
+    updatePetWithForm_request:
+      properties:
+        name:
+          description: Updated name of the pet
+          type: string
+        status:
+          description: Updated status of the pet
+          type: string
+    uploadFile_request:
+      properties:
+        additionalMetadata:
+          description: Additional data to pass to server
+          type: string
+        file:
+          description: file to upload
+          format: binary
+          type: string
+    testEnumParameters_request:
+      properties:
+        enum_form_string_array:
+          description: Form parameter enum test (string array)
+          items:
+            default: $
+            enum:
+            - '>'
+            - $
+            type: string
+          type: array
+        enum_form_string:
+          default: -efg
+          description: Form parameter enum test (string)
+          enum:
+          - _abc
+          - -efg
+          - (xyz)
+          type: string
+    testEndpointParameters_request:
+      properties:
+        integer:
+          description: None
+          format: int32
+          maximum: 100
+          minimum: 10
+          type: integer
+        int32:
+          description: None
+          format: int32
+          maximum: 200
+          minimum: 20
+          type: integer
+        int64:
+          description: None
+          format: int64
+          type: integer
+        number:
+          description: None
+          maximum: 543.2
+          minimum: 32.1
+          type: number
+        float:
+          description: None
+          format: float
+          maximum: 987.6
+          type: number
+        double:
+          description: None
+          format: double
+          maximum: 123.4
+          minimum: 67.8
+          type: number
+        string:
+          description: None
+          pattern: "/[a-z]/i"
+          type: string
+        pattern_without_delimiter:
+          description: None
+          pattern: "^[A-Z].*"
+          type: string
+        byte:
+          description: None
+          format: byte
+          type: string
+        binary:
+          description: None
+          format: binary
+          type: string
+        date:
+          description: None
+          format: date
+          type: string
+        dateTime:
+          description: None
+          format: date-time
+          type: string
+        password:
+          description: None
+          format: password
+          maxLength: 64
+          minLength: 10
+          type: string
+        callback:
+          description: None
+          type: string
+      required:
+      - byte
+      - double
+      - number
+      - pattern_without_delimiter
+    testJsonFormData_request:
+      properties:
+        param:
+          description: field1
+          type: string
+        param2:
+          description: field2
+          type: string
+      required:
+      - param
+      - param2
+    uploadFileWithRequiredFile_request:
+      properties:
+        additionalMetadata:
+          description: Additional data to pass to server
+          type: string
+        requiredFile:
+          description: file to upload
+          format: binary
+          type: string
+      required:
+      - requiredFile
     Dog_allOf:
       properties:
         breed:

samples/client/petstore/java/feign/api/openapi.yaml

@@ -271,18 +271,10 @@ paths:
           type: integer
         style: simple
       requestBody:
-        $ref: '#/components/requestBodies/inline_object'
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/updatePetWithForm_request'
-                name:
-                  description: Updated name of the pet
-                  type: string
-                status:
-                  description: Updated status of the pet
-                  type: string
-              type: object
       responses:
         "200":
           description: Successful operation
@@ -312,19 +304,10 @@ paths:
           type: integer
         style: simple
       requestBody:
-        $ref: '#/components/requestBodies/inline_object_1'
         content:
           multipart/form-data:
             schema:
-              properties:
+              $ref: '#/components/schemas/uploadFile_request'
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                file:
-                  description: file to upload
-                  format: binary
-                  type: string
-              type: object
       responses:
         "200":
           content:
@@ -814,29 +797,10 @@ paths:
           type: array
         style: form
       requestBody:
-        $ref: '#/components/requestBodies/inline_object_2'
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testEnumParameters_request'
-                enum_form_string_array:
-                  description: Form parameter enum test (string array)
-                  items:
-                    default: $
-                    enum:
-                    - '>'
-                    - $
-                    type: string
-                  type: array
-                enum_form_string:
-                  default: -efg
-                  description: Form parameter enum test (string)
-                  enum:
-                  - _abc
-                  - -efg
-                  - (xyz)
-                  type: string
-              type: object
       responses:
         "400":
           description: Invalid request
@@ -872,81 +836,10 @@ paths:
         가짜 엔드 포인트
       operationId: testEndpointParameters
       requestBody:
-        $ref: '#/components/requestBodies/inline_object_3'
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testEndpointParameters_request'
-                integer:
-                  description: None
-                  maximum: 100
-                  minimum: 10
-                  type: integer
-                int32:
-                  description: None
-                  format: int32
-                  maximum: 200
-                  minimum: 20
-                  type: integer
-                int64:
-                  description: None
-                  format: int64
-                  type: integer
-                number:
-                  description: None
-                  maximum: 543.2
-                  minimum: 32.1
-                  type: number
-                float:
-                  description: None
-                  format: float
-                  maximum: 987.6
-                  type: number
-                double:
-                  description: None
-                  format: double
-                  maximum: 123.4
-                  minimum: 67.8
-                  type: number
-                string:
-                  description: None
-                  pattern: "/[a-z]/i"
-                  type: string
-                pattern_without_delimiter:
-                  description: None
-                  pattern: "^[A-Z].*"
-                  type: string
-                byte:
-                  description: None
-                  format: byte
-                  type: string
-                binary:
-                  description: None
-                  format: binary
-                  type: string
-                date:
-                  description: None
-                  format: date
-                  type: string
-                dateTime:
-                  description: None
-                  format: date-time
-                  type: string
-                password:
-                  description: None
-                  format: password
-                  maxLength: 64
-                  minLength: 10
-                  type: string
-                callback:
-                  description: None
-                  type: string
-              required:
-              - byte
-              - double
-              - number
-              - pattern_without_delimiter
-              type: object
       responses:
         "400":
           description: Invalid username supplied
@@ -1074,21 +967,10 @@ paths:
       description: ""
       operationId: testJsonFormData
       requestBody:
-        $ref: '#/components/requestBodies/inline_object_4'
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testJsonFormData_request'
-                param:
-                  description: field1
-                  type: string
-                param2:
-                  description: field2
-                  type: string
-              required:
-              - param
-              - param2
-              type: object
       responses:
         "200":
           description: successful operation
@@ -1287,21 +1169,10 @@ paths:
           type: integer
         style: simple
       requestBody:
-        $ref: '#/components/requestBodies/inline_object_5'
         content:
           multipart/form-data:
             schema:
-              properties:
+              $ref: '#/components/schemas/uploadFileWithRequiredFile_request'
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                requiredFile:
-                  description: file to upload
-                  format: binary
-                  type: string
-              required:
-              - requiredFile
-              type: object
       responses:
         "200":
           content:
@@ -1391,36 +1262,6 @@ components:
             $ref: '#/components/schemas/Pet'
       description: Pet object that needs to be added to the store
       required: true
-    inline_object:
-      content:
-        application/x-www-form-urlencoded:
-          schema:
-            $ref: '#/components/schemas/inline_object'
-    inline_object_1:
-      content:
-        multipart/form-data:
-          schema:
-            $ref: '#/components/schemas/inline_object_1'
-    inline_object_2:
-      content:
-        application/x-www-form-urlencoded:
-          schema:
-            $ref: '#/components/schemas/inline_object_2'
-    inline_object_3:
-      content:
-        application/x-www-form-urlencoded:
-          schema:
-            $ref: '#/components/schemas/inline_object_3'
-    inline_object_4:
-      content:
-        application/x-www-form-urlencoded:
-          schema:
-            $ref: '#/components/schemas/inline_object_4'
-    inline_object_5:
-      content:
-        multipart/form-data:
-          schema:
-            $ref: '#/components/schemas/inline_object_5'
   schemas:
     Foo:
       example:
@@ -2136,7 +1977,7 @@ components:
         string:
           $ref: '#/components/schemas/Foo'
       type: object
-    inline_object:
+    updatePetWithForm_request:
       properties:
         name:
           description: Updated name of the pet
@@ -2145,7 +1986,7 @@ components:
           description: Updated status of the pet
           type: string
       type: object
-    inline_object_1:
+    uploadFile_request:
       properties:
         additionalMetadata:
           description: Additional data to pass to server
@@ -2155,7 +1996,7 @@ components:
           format: binary
           type: string
       type: object
-    inline_object_2:
+    testEnumParameters_request:
       properties:
         enum_form_string_array:
           description: Form parameter enum test (string array)
@@ -2175,7 +2016,7 @@ components:
           - (xyz)
           type: string
       type: object
-    inline_object_3:
+    testEndpointParameters_request:
       properties:
         integer:
           description: None
@@ -2247,7 +2088,7 @@ components:
       - number
       - pattern_without_delimiter
       type: object
-    inline_object_4:
+    testJsonFormData_request:
       properties:
         param:
           description: field1
@@ -2259,7 +2100,7 @@ components:
       - param
       - param2
       type: object
-    inline_object_5:
+    uploadFileWithRequiredFile_request:
       properties:
         additionalMetadata:
           description: Additional data to pass to server

samples/client/petstore/java/google-api-client/api/openapi.yaml

@@ -250,13 +250,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/updatePetWithForm_request'
-                name:
-                  description: Updated name of the pet
-                  type: string
-                status:
-                  description: Updated status of the pet
-                  type: string
       responses:
         "405":
           content: {}
@@ -285,14 +279,7 @@ paths:
         content:
           multipart/form-data:
             schema:
-              properties:
+              $ref: '#/components/schemas/uploadFile_request'
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                file:
-                  description: file to upload
-                  format: binary
-                  type: string
       responses:
         "200":
           content:
@@ -763,24 +750,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testEnumParameters_request'
-                enum_form_string_array:
-                  description: Form parameter enum test (string array)
-                  items:
-                    default: $
-                    enum:
-                    - '>'
-                    - $
-                    type: string
-                  type: array
-                enum_form_string:
-                  default: -efg
-                  description: Form parameter enum test (string)
-                  enum:
-                  - _abc
-                  - -efg
-                  - (xyz)
-                  type: string
       responses:
         "400":
           content: {}
@@ -827,77 +797,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testEndpointParameters_request'
-                integer:
-                  description: None
-                  format: int32
-                  maximum: 100
-                  minimum: 10
-                  type: integer
-                int32:
-                  description: None
-                  format: int32
-                  maximum: 200
-                  minimum: 20
-                  type: integer
-                int64:
-                  description: None
-                  format: int64
-                  type: integer
-                number:
-                  description: None
-                  maximum: 543.2
-                  minimum: 32.1
-                  type: number
-                float:
-                  description: None
-                  format: float
-                  maximum: 987.6
-                  type: number
-                double:
-                  description: None
-                  format: double
-                  maximum: 123.4
-                  minimum: 67.8
-                  type: number
-                string:
-                  description: None
-                  pattern: "/[a-z]/i"
-                  type: string
-                pattern_without_delimiter:
-                  description: None
-                  pattern: "^[A-Z].*"
-                  type: string
-                byte:
-                  description: None
-                  format: byte
-                  type: string
-                binary:
-                  description: None
-                  format: binary
-                  type: string
-                date:
-                  description: None
-                  format: date
-                  type: string
-                dateTime:
-                  description: None
-                  format: date-time
-                  type: string
-                password:
-                  description: None
-                  format: password
-                  maxLength: 64
-                  minLength: 10
-                  type: string
-                callback:
-                  description: None
-                  type: string
-              required:
-              - byte
-              - double
-              - number
-              - pattern_without_delimiter
         required: true
       responses:
         "400":
@@ -1016,16 +916,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testJsonFormData_request'
-                param:
-                  description: field1
-                  type: string
-                param2:
-                  description: field2
-                  type: string
-              required:
-              - param
-              - param2
         required: true
       responses:
         "200":
@@ -1231,16 +1122,7 @@ paths:
         content:
           multipart/form-data:
             schema:
-              properties:
+              $ref: '#/components/schemas/uploadFileWithRequiredFile_request'
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                requiredFile:
-                  description: file to upload
-                  format: binary
-                  type: string
-              required:
-              - requiredFile
         required: true
       responses:
         "200":
@@ -2147,6 +2029,136 @@ components:
       xml:
         namespace: http://a.com/schema
         prefix: pre
+    updatePetWithForm_request:
+      properties:
+        name:
+          description: Updated name of the pet
+          type: string
+        status:
+          description: Updated status of the pet
+          type: string
+    uploadFile_request:
+      properties:
+        additionalMetadata:
+          description: Additional data to pass to server
+          type: string
+        file:
+          description: file to upload
+          format: binary
+          type: string
+    testEnumParameters_request:
+      properties:
+        enum_form_string_array:
+          description: Form parameter enum test (string array)
+          items:
+            default: $
+            enum:
+            - '>'
+            - $
+            type: string
+          type: array
+        enum_form_string:
+          default: -efg
+          description: Form parameter enum test (string)
+          enum:
+          - _abc
+          - -efg
+          - (xyz)
+          type: string
+    testEndpointParameters_request:
+      properties:
+        integer:
+          description: None
+          format: int32
+          maximum: 100
+          minimum: 10
+          type: integer
+        int32:
+          description: None
+          format: int32
+          maximum: 200
+          minimum: 20
+          type: integer
+        int64:
+          description: None
+          format: int64
+          type: integer
+        number:
+          description: None
+          maximum: 543.2
+          minimum: 32.1
+          type: number
+        float:
+          description: None
+          format: float
+          maximum: 987.6
+          type: number
+        double:
+          description: None
+          format: double
+          maximum: 123.4
+          minimum: 67.8
+          type: number
+        string:
+          description: None
+          pattern: "/[a-z]/i"
+          type: string
+        pattern_without_delimiter:
+          description: None
+          pattern: "^[A-Z].*"
+          type: string
+        byte:
+          description: None
+          format: byte
+          type: string
+        binary:
+          description: None
+          format: binary
+          type: string
+        date:
+          description: None
+          format: date
+          type: string
+        dateTime:
+          description: None
+          format: date-time
+          type: string
+        password:
+          description: None
+          format: password
+          maxLength: 64
+          minLength: 10
+          type: string
+        callback:
+          description: None
+          type: string
+      required:
+      - byte
+      - double
+      - number
+      - pattern_without_delimiter
+    testJsonFormData_request:
+      properties:
+        param:
+          description: field1
+          type: string
+        param2:
+          description: field2
+          type: string
+      required:
+      - param
+      - param2
+    uploadFileWithRequiredFile_request:
+      properties:
+        additionalMetadata:
+          description: Additional data to pass to server
+          type: string
+        requiredFile:
+          description: file to upload
+          format: binary
+          type: string
+      required:
+      - requiredFile
     Dog_allOf:
       properties:
         breed:

samples/client/petstore/java/jersey1/api/openapi.yaml

@@ -250,13 +250,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/updatePetWithForm_request'
-                name:
-                  description: Updated name of the pet
-                  type: string
-                status:
-                  description: Updated status of the pet
-                  type: string
       responses:
         "405":
           content: {}
@@ -285,14 +279,7 @@ paths:
         content:
           multipart/form-data:
             schema:
-              properties:
+              $ref: '#/components/schemas/uploadFile_request'
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                file:
-                  description: file to upload
-                  format: binary
-                  type: string
       responses:
         "200":
           content:
@@ -763,24 +750,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testEnumParameters_request'
-                enum_form_string_array:
-                  description: Form parameter enum test (string array)
-                  items:
-                    default: $
-                    enum:
-                    - '>'
-                    - $
-                    type: string
-                  type: array
-                enum_form_string:
-                  default: -efg
-                  description: Form parameter enum test (string)
-                  enum:
-                  - _abc
-                  - -efg
-                  - (xyz)
-                  type: string
       responses:
         "400":
           content: {}
@@ -827,77 +797,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testEndpointParameters_request'
-                integer:
-                  description: None
-                  format: int32
-                  maximum: 100
-                  minimum: 10
-                  type: integer
-                int32:
-                  description: None
-                  format: int32
-                  maximum: 200
-                  minimum: 20
-                  type: integer
-                int64:
-                  description: None
-                  format: int64
-                  type: integer
-                number:
-                  description: None
-                  maximum: 543.2
-                  minimum: 32.1
-                  type: number
-                float:
-                  description: None
-                  format: float
-                  maximum: 987.6
-                  type: number
-                double:
-                  description: None
-                  format: double
-                  maximum: 123.4
-                  minimum: 67.8
-                  type: number
-                string:
-                  description: None
-                  pattern: "/[a-z]/i"
-                  type: string
-                pattern_without_delimiter:
-                  description: None
-                  pattern: "^[A-Z].*"
-                  type: string
-                byte:
-                  description: None
-                  format: byte
-                  type: string
-                binary:
-                  description: None
-                  format: binary
-                  type: string
-                date:
-                  description: None
-                  format: date
-                  type: string
-                dateTime:
-                  description: None
-                  format: date-time
-                  type: string
-                password:
-                  description: None
-                  format: password
-                  maxLength: 64
-                  minLength: 10
-                  type: string
-                callback:
-                  description: None
-                  type: string
-              required:
-              - byte
-              - double
-              - number
-              - pattern_without_delimiter
         required: true
       responses:
         "400":
@@ -1016,16 +916,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testJsonFormData_request'
-                param:
-                  description: field1
-                  type: string
-                param2:
-                  description: field2
-                  type: string
-              required:
-              - param
-              - param2
         required: true
       responses:
         "200":
@@ -1231,16 +1122,7 @@ paths:
         content:
           multipart/form-data:
             schema:
-              properties:
+              $ref: '#/components/schemas/uploadFileWithRequiredFile_request'
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                requiredFile:
-                  description: file to upload
-                  format: binary
-                  type: string
-              required:
-              - requiredFile
         required: true
       responses:
         "200":
@@ -2147,6 +2029,136 @@ components:
       xml:
         namespace: http://a.com/schema
         prefix: pre
+    updatePetWithForm_request:
+      properties:
+        name:
+          description: Updated name of the pet
+          type: string
+        status:
+          description: Updated status of the pet
+          type: string
+    uploadFile_request:
+      properties:
+        additionalMetadata:
+          description: Additional data to pass to server
+          type: string
+        file:
+          description: file to upload
+          format: binary
+          type: string
+    testEnumParameters_request:
+      properties:
+        enum_form_string_array:
+          description: Form parameter enum test (string array)
+          items:
+            default: $
+            enum:
+            - '>'
+            - $
+            type: string
+          type: array
+        enum_form_string:
+          default: -efg
+          description: Form parameter enum test (string)
+          enum:
+          - _abc
+          - -efg
+          - (xyz)
+          type: string
+    testEndpointParameters_request:
+      properties:
+        integer:
+          description: None
+          format: int32
+          maximum: 100
+          minimum: 10
+          type: integer
+        int32:
+          description: None
+          format: int32
+          maximum: 200
+          minimum: 20
+          type: integer
+        int64:
+          description: None
+          format: int64
+          type: integer
+        number:
+          description: None
+          maximum: 543.2
+          minimum: 32.1
+          type: number
+        float:
+          description: None
+          format: float
+          maximum: 987.6
+          type: number
+        double:
+          description: None
+          format: double
+          maximum: 123.4
+          minimum: 67.8
+          type: number
+        string:
+          description: None
+          pattern: "/[a-z]/i"
+          type: string
+        pattern_without_delimiter:
+          description: None
+          pattern: "^[A-Z].*"
+          type: string
+        byte:
+          description: None
+          format: byte
+          type: string
+        binary:
+          description: None
+          format: binary
+          type: string
+        date:
+          description: None
+          format: date
+          type: string
+        dateTime:
+          description: None
+          format: date-time
+          type: string
+        password:
+          description: None
+          format: password
+          maxLength: 64
+          minLength: 10
+          type: string
+        callback:
+          description: None
+          type: string
+      required:
+      - byte
+      - double
+      - number
+      - pattern_without_delimiter
+    testJsonFormData_request:
+      properties:
+        param:
+          description: field1
+          type: string
+        param2:
+          description: field2
+          type: string
+      required:
+      - param
+      - param2
+    uploadFileWithRequiredFile_request:
+      properties:
+        additionalMetadata:
+          description: Additional data to pass to server
+          type: string
+        requiredFile:
+          description: file to upload
+          format: binary
+          type: string
+      required:
+      - requiredFile
     Dog_allOf:
       properties:
         breed:

samples/client/petstore/java/jersey2-java8-localdatetime/api/openapi.yaml

@@ -250,13 +250,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/updatePetWithForm_request'
-                name:
-                  description: Updated name of the pet
-                  type: string
-                status:
-                  description: Updated status of the pet
-                  type: string
       responses:
         "405":
           content: {}
@@ -285,14 +279,7 @@ paths:
         content:
           multipart/form-data:
             schema:
-              properties:
+              $ref: '#/components/schemas/uploadFile_request'
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                file:
-                  description: file to upload
-                  format: binary
-                  type: string
       responses:
         "200":
           content:
@@ -763,24 +750,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testEnumParameters_request'
-                enum_form_string_array:
-                  description: Form parameter enum test (string array)
-                  items:
-                    default: $
-                    enum:
-                    - '>'
-                    - $
-                    type: string
-                  type: array
-                enum_form_string:
-                  default: -efg
-                  description: Form parameter enum test (string)
-                  enum:
-                  - _abc
-                  - -efg
-                  - (xyz)
-                  type: string
       responses:
         "400":
           content: {}
@@ -827,77 +797,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testEndpointParameters_request'
-                integer:
-                  description: None
-                  format: int32
-                  maximum: 100
-                  minimum: 10
-                  type: integer
-                int32:
-                  description: None
-                  format: int32
-                  maximum: 200
-                  minimum: 20
-                  type: integer
-                int64:
-                  description: None
-                  format: int64
-                  type: integer
-                number:
-                  description: None
-                  maximum: 543.2
-                  minimum: 32.1
-                  type: number
-                float:
-                  description: None
-                  format: float
-                  maximum: 987.6
-                  type: number
-                double:
-                  description: None
-                  format: double
-                  maximum: 123.4
-                  minimum: 67.8
-                  type: number
-                string:
-                  description: None
-                  pattern: "/[a-z]/i"
-                  type: string
-                pattern_without_delimiter:
-                  description: None
-                  pattern: "^[A-Z].*"
-                  type: string
-                byte:
-                  description: None
-                  format: byte
-                  type: string
-                binary:
-                  description: None
-                  format: binary
-                  type: string
-                date:
-                  description: None
-                  format: date
-                  type: string
-                dateTime:
-                  description: None
-                  format: date-time
-                  type: string
-                password:
-                  description: None
-                  format: password
-                  maxLength: 64
-                  minLength: 10
-                  type: string
-                callback:
-                  description: None
-                  type: string
-              required:
-              - byte
-              - double
-              - number
-              - pattern_without_delimiter
         required: true
       responses:
         "400":
@@ -1016,16 +916,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testJsonFormData_request'
-                param:
-                  description: field1
-                  type: string
-                param2:
-                  description: field2
-                  type: string
-              required:
-              - param
-              - param2
         required: true
       responses:
         "200":
@@ -1231,16 +1122,7 @@ paths:
         content:
           multipart/form-data:
             schema:
-              properties:
+              $ref: '#/components/schemas/uploadFileWithRequiredFile_request'
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                requiredFile:
-                  description: file to upload
-                  format: binary
-                  type: string
-              required:
-              - requiredFile
         required: true
       responses:
         "200":
@@ -2147,6 +2029,136 @@ components:
       xml:
         namespace: http://a.com/schema
         prefix: pre
+    updatePetWithForm_request:
+      properties:
+        name:
+          description: Updated name of the pet
+          type: string
+        status:
+          description: Updated status of the pet
+          type: string
+    uploadFile_request:
+      properties:
+        additionalMetadata:
+          description: Additional data to pass to server
+          type: string
+        file:
+          description: file to upload
+          format: binary
+          type: string
+    testEnumParameters_request:
+      properties:
+        enum_form_string_array:
+          description: Form parameter enum test (string array)
+          items:
+            default: $
+            enum:
+            - '>'
+            - $
+            type: string
+          type: array
+        enum_form_string:
+          default: -efg
+          description: Form parameter enum test (string)
+          enum:
+          - _abc
+          - -efg
+          - (xyz)
+          type: string
+    testEndpointParameters_request:
+      properties:
+        integer:
+          description: None
+          format: int32
+          maximum: 100
+          minimum: 10
+          type: integer
+        int32:
+          description: None
+          format: int32
+          maximum: 200
+          minimum: 20
+          type: integer
+        int64:
+          description: None
+          format: int64
+          type: integer
+        number:
+          description: None
+          maximum: 543.2
+          minimum: 32.1
+          type: number
+        float:
+          description: None
+          format: float
+          maximum: 987.6
+          type: number
+        double:
+          description: None
+          format: double
+          maximum: 123.4
+          minimum: 67.8
+          type: number
+        string:
+          description: None
+          pattern: "/[a-z]/i"
+          type: string
+        pattern_without_delimiter:
+          description: None
+          pattern: "^[A-Z].*"
+          type: string
+        byte:
+          description: None
+          format: byte
+          type: string
+        binary:
+          description: None
+          format: binary
+          type: string
+        date:
+          description: None
+          format: date
+          type: string
+        dateTime:
+          description: None
+          format: date-time
+          type: string
+        password:
+          description: None
+          format: password
+          maxLength: 64
+          minLength: 10
+          type: string
+        callback:
+          description: None
+          type: string
+      required:
+      - byte
+      - double
+      - number
+      - pattern_without_delimiter
+    testJsonFormData_request:
+      properties:
+        param:
+          description: field1
+          type: string
+        param2:
+          description: field2
+          type: string
+      required:
+      - param
+      - param2
+    uploadFileWithRequiredFile_request:
+      properties:
+        additionalMetadata:
+          description: Additional data to pass to server
+          type: string
+        requiredFile:
+          description: file to upload
+          format: binary
+          type: string
+      required:
+      - requiredFile
     Dog_allOf:
       properties:
         breed:

samples/client/petstore/java/jersey2-java8/api/openapi.yaml

@@ -250,13 +250,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/updatePetWithForm_request'
-                name:
-                  description: Updated name of the pet
-                  type: string
-                status:
-                  description: Updated status of the pet
-                  type: string
       responses:
         "405":
           content: {}
@@ -285,14 +279,7 @@ paths:
         content:
           multipart/form-data:
             schema:
-              properties:
+              $ref: '#/components/schemas/uploadFile_request'
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                file:
-                  description: file to upload
-                  format: binary
-                  type: string
       responses:
         "200":
           content:
@@ -763,24 +750,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testEnumParameters_request'
-                enum_form_string_array:
-                  description: Form parameter enum test (string array)
-                  items:
-                    default: $
-                    enum:
-                    - '>'
-                    - $
-                    type: string
-                  type: array
-                enum_form_string:
-                  default: -efg
-                  description: Form parameter enum test (string)
-                  enum:
-                  - _abc
-                  - -efg
-                  - (xyz)
-                  type: string
       responses:
         "400":
           content: {}
@@ -827,77 +797,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testEndpointParameters_request'
-                integer:
-                  description: None
-                  format: int32
-                  maximum: 100
-                  minimum: 10
-                  type: integer
-                int32:
-                  description: None
-                  format: int32
-                  maximum: 200
-                  minimum: 20
-                  type: integer
-                int64:
-                  description: None
-                  format: int64
-                  type: integer
-                number:
-                  description: None
-                  maximum: 543.2
-                  minimum: 32.1
-                  type: number
-                float:
-                  description: None
-                  format: float
-                  maximum: 987.6
-                  type: number
-                double:
-                  description: None
-                  format: double
-                  maximum: 123.4
-                  minimum: 67.8
-                  type: number
-                string:
-                  description: None
-                  pattern: "/[a-z]/i"
-                  type: string
-                pattern_without_delimiter:
-                  description: None
-                  pattern: "^[A-Z].*"
-                  type: string
-                byte:
-                  description: None
-                  format: byte
-                  type: string
-                binary:
-                  description: None
-                  format: binary
-                  type: string
-                date:
-                  description: None
-                  format: date
-                  type: string
-                dateTime:
-                  description: None
-                  format: date-time
-                  type: string
-                password:
-                  description: None
-                  format: password
-                  maxLength: 64
-                  minLength: 10
-                  type: string
-                callback:
-                  description: None
-                  type: string
-              required:
-              - byte
-              - double
-              - number
-              - pattern_without_delimiter
         required: true
       responses:
         "400":
@@ -1016,16 +916,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testJsonFormData_request'
-                param:
-                  description: field1
-                  type: string
-                param2:
-                  description: field2
-                  type: string
-              required:
-              - param
-              - param2
         required: true
       responses:
         "200":
@@ -1231,16 +1122,7 @@ paths:
         content:
           multipart/form-data:
             schema:
-              properties:
+              $ref: '#/components/schemas/uploadFileWithRequiredFile_request'
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                requiredFile:
-                  description: file to upload
-                  format: binary
-                  type: string
-              required:
-              - requiredFile
         required: true
       responses:
         "200":
@@ -2147,6 +2029,136 @@ components:
       xml:
         namespace: http://a.com/schema
         prefix: pre
+    updatePetWithForm_request:
+      properties:
+        name:
+          description: Updated name of the pet
+          type: string
+        status:
+          description: Updated status of the pet
+          type: string
+    uploadFile_request:
+      properties:
+        additionalMetadata:
+          description: Additional data to pass to server
+          type: string
+        file:
+          description: file to upload
+          format: binary
+          type: string
+    testEnumParameters_request:
+      properties:
+        enum_form_string_array:
+          description: Form parameter enum test (string array)
+          items:
+            default: $
+            enum:
+            - '>'
+            - $
+            type: string
+          type: array
+        enum_form_string:
+          default: -efg
+          description: Form parameter enum test (string)
+          enum:
+          - _abc
+          - -efg
+          - (xyz)
+          type: string
+    testEndpointParameters_request:
+      properties:
+        integer:
+          description: None
+          format: int32
+          maximum: 100
+          minimum: 10
+          type: integer
+        int32:
+          description: None
+          format: int32
+          maximum: 200
+          minimum: 20
+          type: integer
+        int64:
+          description: None
+          format: int64
+          type: integer
+        number:
+          description: None
+          maximum: 543.2
+          minimum: 32.1
+          type: number
+        float:
+          description: None
+          format: float
+          maximum: 987.6
+          type: number
+        double:
+          description: None
+          format: double
+          maximum: 123.4
+          minimum: 67.8
+          type: number
+        string:
+          description: None
+          pattern: "/[a-z]/i"
+          type: string
+        pattern_without_delimiter:
+          description: None
+          pattern: "^[A-Z].*"
+          type: string
+        byte:
+          description: None
+          format: byte
+          type: string
+        binary:
+          description: None
+          format: binary
+          type: string
+        date:
+          description: None
+          format: date
+          type: string
+        dateTime:
+          description: None
+          format: date-time
+          type: string
+        password:
+          description: None
+          format: password
+          maxLength: 64
+          minLength: 10
+          type: string
+        callback:
+          description: None
+          type: string
+      required:
+      - byte
+      - double
+      - number
+      - pattern_without_delimiter
+    testJsonFormData_request:
+      properties:
+        param:
+          description: field1
+          type: string
+        param2:
+          description: field2
+          type: string
+      required:
+      - param
+      - param2
+    uploadFileWithRequiredFile_request:
+      properties:
+        additionalMetadata:
+          description: Additional data to pass to server
+          type: string
+        requiredFile:
+          description: file to upload
+          format: binary
+          type: string
+      required:
+      - requiredFile
     Dog_allOf:
       properties:
         breed:

samples/client/petstore/java/jersey3/api/openapi.yaml

@@ -262,18 +262,10 @@ paths:
           type: integer
         style: simple
       requestBody:
-        $ref: '#/components/requestBodies/inline_object'
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/updatePetWithForm_request'
-                name:
-                  description: Updated name of the pet
-                  type: string
-                status:
-                  description: Updated status of the pet
-                  type: string
-              type: object
       responses:
         "405":
           description: Invalid input
@@ -301,19 +293,10 @@ paths:
           type: integer
         style: simple
       requestBody:
-        $ref: '#/components/requestBodies/inline_object_1'
         content:
           multipart/form-data:
             schema:
-              properties:
+              $ref: '#/components/schemas/uploadFile_request'
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                file:
-                  description: file to upload
-                  format: binary
-                  type: string
-              type: object
       responses:
         "200":
           content:
@@ -794,29 +777,10 @@ paths:
           type: number
         style: form
       requestBody:
-        $ref: '#/components/requestBodies/inline_object_2'
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testEnumParameters_request'
-                enum_form_string_array:
-                  description: Form parameter enum test (string array)
-                  items:
-                    default: $
-                    enum:
-                    - '>'
-                    - $
-                    type: string
-                  type: array
-                enum_form_string:
-                  default: -efg
-                  description: Form parameter enum test (string)
-                  enum:
-                  - _abc
-                  - -efg
-                  - (xyz)
-                  type: string
-              type: object
       responses:
         "400":
           description: Invalid request
@@ -852,83 +816,10 @@ paths:
         가짜 엔드 포인트
       operationId: testEndpointParameters
       requestBody:
-        $ref: '#/components/requestBodies/inline_object_3'
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testEndpointParameters_request'
-                integer:
-                  description: None
-                  maximum: 100
-                  minimum: 10
-                  type: integer
-                int32:
-                  description: None
-                  format: int32
-                  maximum: 200
-                  minimum: 20
-                  type: integer
-                int64:
-                  description: None
-                  format: int64
-                  type: integer
-                number:
-                  description: None
-                  maximum: 543.2
-                  minimum: 32.1
-                  type: number
-                float:
-                  description: None
-                  format: float
-                  maximum: 987.6
-                  type: number
-                double:
-                  description: None
-                  format: double
-                  maximum: 123.4
-                  minimum: 67.8
-                  type: number
-                string:
-                  description: None
-                  pattern: "/[a-z]/i"
-                  type: string
-                pattern_without_delimiter:
-                  description: None
-                  pattern: "^[A-Z].*"
-                  type: string
-                byte:
-                  description: None
-                  format: byte
-                  type: string
-                binary:
-                  description: None
-                  format: binary
-                  type: string
-                date:
-                  description: None
-                  format: date
-                  type: string
-                dateTime:
-                  default: 2010-02-01T10:20:10.11111+01:00
-                  description: None
-                  example: 2020-02-02T20:20:20.22222Z
-                  format: date-time
-                  type: string
-                password:
-                  description: None
-                  format: password
-                  maxLength: 64
-                  minLength: 10
-                  type: string
-                callback:
-                  description: None
-                  type: string
-              required:
-              - byte
-              - double
-              - number
-              - pattern_without_delimiter
-              type: object
       responses:
         "400":
           description: Invalid username supplied
@@ -1034,21 +925,10 @@ paths:
       description: ""
       operationId: testJsonFormData
       requestBody:
-        $ref: '#/components/requestBodies/inline_object_4'
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testJsonFormData_request'
-                param:
-                  description: field1
-                  type: string
-                param2:
-                  description: field2
-                  type: string
-              required:
-              - param
-              - param2
-              type: object
       responses:
         "200":
           description: successful operation
@@ -1209,21 +1089,10 @@ paths:
           type: integer
         style: simple
       requestBody:
-        $ref: '#/components/requestBodies/inline_object_5'
         content:
           multipart/form-data:
             schema:
-              properties:
+              $ref: '#/components/schemas/uploadFileWithRequiredFile_request'
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                requiredFile:
-                  description: file to upload
-                  format: binary
-                  type: string
-              required:
-              - requiredFile
-              type: object
       responses:
         "200":
           content:
@@ -1302,36 +1171,6 @@ components:
             $ref: '#/components/schemas/Pet'
       description: Pet object that needs to be added to the store
       required: true
-    inline_object:
-      content:
-        application/x-www-form-urlencoded:
-          schema:
-            $ref: '#/components/schemas/inline_object'
-    inline_object_1:
-      content:
-        multipart/form-data:
-          schema:
-            $ref: '#/components/schemas/inline_object_1'
-    inline_object_2:
-      content:
-        application/x-www-form-urlencoded:
-          schema:
-            $ref: '#/components/schemas/inline_object_2'
-    inline_object_3:
-      content:
-        application/x-www-form-urlencoded:
-          schema:
-            $ref: '#/components/schemas/inline_object_3'
-    inline_object_4:
-      content:
-        application/x-www-form-urlencoded:
-          schema:
-            $ref: '#/components/schemas/inline_object_4'
-    inline_object_5:
-      content:
-        multipart/form-data:
-          schema:
-            $ref: '#/components/schemas/inline_object_5'
   schemas:
     Foo:
       example:
@@ -2305,7 +2144,7 @@ components:
         string:
           $ref: '#/components/schemas/Foo'
       type: object
-    inline_object:
+    updatePetWithForm_request:
       properties:
         name:
           description: Updated name of the pet
@@ -2314,7 +2153,7 @@ components:
           description: Updated status of the pet
           type: string
       type: object
-    inline_object_1:
+    uploadFile_request:
       properties:
         additionalMetadata:
           description: Additional data to pass to server
@@ -2324,7 +2163,7 @@ components:
           format: binary
           type: string
       type: object
-    inline_object_2:
+    testEnumParameters_request:
       properties:
         enum_form_string_array:
           description: Form parameter enum test (string array)
@@ -2344,7 +2183,7 @@ components:
           - (xyz)
           type: string
       type: object
-    inline_object_3:
+    testEndpointParameters_request:
       properties:
         integer:
           description: None
@@ -2418,7 +2257,7 @@ components:
       - number
       - pattern_without_delimiter
       type: object
-    inline_object_4:
+    testJsonFormData_request:
       properties:
         param:
           description: field1
@@ -2430,7 +2269,7 @@ components:
       - param
       - param2
       type: object
-    inline_object_5:
+    uploadFileWithRequiredFile_request:
       properties:
         additionalMetadata:
           description: Additional data to pass to server

samples/client/petstore/java/native-async/api/openapi.yaml

@@ -250,13 +250,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/updatePetWithForm_request'
-                name:
-                  description: Updated name of the pet
-                  type: string
-                status:
-                  description: Updated status of the pet
-                  type: string
       responses:
         "405":
           content: {}
@@ -285,14 +279,7 @@ paths:
         content:
           multipart/form-data:
             schema:
-              properties:
+              $ref: '#/components/schemas/uploadFile_request'
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                file:
-                  description: file to upload
-                  format: binary
-                  type: string
       responses:
         "200":
           content:
@@ -763,24 +750,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testEnumParameters_request'
-                enum_form_string_array:
-                  description: Form parameter enum test (string array)
-                  items:
-                    default: $
-                    enum:
-                    - '>'
-                    - $
-                    type: string
-                  type: array
-                enum_form_string:
-                  default: -efg
-                  description: Form parameter enum test (string)
-                  enum:
-                  - _abc
-                  - -efg
-                  - (xyz)
-                  type: string
       responses:
         "400":
           content: {}
@@ -827,77 +797,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testEndpointParameters_request'
-                integer:
-                  description: None
-                  format: int32
-                  maximum: 100
-                  minimum: 10
-                  type: integer
-                int32:
-                  description: None
-                  format: int32
-                  maximum: 200
-                  minimum: 20
-                  type: integer
-                int64:
-                  description: None
-                  format: int64
-                  type: integer
-                number:
-                  description: None
-                  maximum: 543.2
-                  minimum: 32.1
-                  type: number
-                float:
-                  description: None
-                  format: float
-                  maximum: 987.6
-                  type: number
-                double:
-                  description: None
-                  format: double
-                  maximum: 123.4
-                  minimum: 67.8
-                  type: number
-                string:
-                  description: None
-                  pattern: "/[a-z]/i"
-                  type: string
-                pattern_without_delimiter:
-                  description: None
-                  pattern: "^[A-Z].*"
-                  type: string
-                byte:
-                  description: None
-                  format: byte
-                  type: string
-                binary:
-                  description: None
-                  format: binary
-                  type: string
-                date:
-                  description: None
-                  format: date
-                  type: string
-                dateTime:
-                  description: None
-                  format: date-time
-                  type: string
-                password:
-                  description: None
-                  format: password
-                  maxLength: 64
-                  minLength: 10
-                  type: string
-                callback:
-                  description: None
-                  type: string
-              required:
-              - byte
-              - double
-              - number
-              - pattern_without_delimiter
         required: true
       responses:
         "400":
@@ -1016,16 +916,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testJsonFormData_request'
-                param:
-                  description: field1
-                  type: string
-                param2:
-                  description: field2
-                  type: string
-              required:
-              - param
-              - param2
         required: true
       responses:
         "200":
@@ -1231,16 +1122,7 @@ paths:
         content:
           multipart/form-data:
             schema:
-              properties:
+              $ref: '#/components/schemas/uploadFileWithRequiredFile_request'
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                requiredFile:
-                  description: file to upload
-                  format: binary
-                  type: string
-              required:
-              - requiredFile
         required: true
       responses:
         "200":
@@ -2147,6 +2029,136 @@ components:
       xml:
         namespace: http://a.com/schema
         prefix: pre
+    updatePetWithForm_request:
+      properties:
+        name:
+          description: Updated name of the pet
+          type: string
+        status:
+          description: Updated status of the pet
+          type: string
+    uploadFile_request:
+      properties:
+        additionalMetadata:
+          description: Additional data to pass to server
+          type: string
+        file:
+          description: file to upload
+          format: binary
+          type: string
+    testEnumParameters_request:
+      properties:
+        enum_form_string_array:
+          description: Form parameter enum test (string array)
+          items:
+            default: $
+            enum:
+            - '>'
+            - $
+            type: string
+          type: array
+        enum_form_string:
+          default: -efg
+          description: Form parameter enum test (string)
+          enum:
+          - _abc
+          - -efg
+          - (xyz)
+          type: string
+    testEndpointParameters_request:
+      properties:
+        integer:
+          description: None
+          format: int32
+          maximum: 100
+          minimum: 10
+          type: integer
+        int32:
+          description: None
+          format: int32
+          maximum: 200
+          minimum: 20
+          type: integer
+        int64:
+          description: None
+          format: int64
+          type: integer
+        number:
+          description: None
+          maximum: 543.2
+          minimum: 32.1
+          type: number
+        float:
+          description: None
+          format: float
+          maximum: 987.6
+          type: number
+        double:
+          description: None
+          format: double
+          maximum: 123.4
+          minimum: 67.8
+          type: number
+        string:
+          description: None
+          pattern: "/[a-z]/i"
+          type: string
+        pattern_without_delimiter:
+          description: None
+          pattern: "^[A-Z].*"
+          type: string
+        byte:
+          description: None
+          format: byte
+          type: string
+        binary:
+          description: None
+          format: binary
+          type: string
+        date:
+          description: None
+          format: date
+          type: string
+        dateTime:
+          description: None
+          format: date-time
+          type: string
+        password:
+          description: None
+          format: password
+          maxLength: 64
+          minLength: 10
+          type: string
+        callback:
+          description: None
+          type: string
+      required:
+      - byte
+      - double
+      - number
+      - pattern_without_delimiter
+    testJsonFormData_request:
+      properties:
+        param:
+          description: field1
+          type: string
+        param2:
+          description: field2
+          type: string
+      required:
+      - param
+      - param2
+    uploadFileWithRequiredFile_request:
+      properties:
+        additionalMetadata:
+          description: Additional data to pass to server
+          type: string
+        requiredFile:
+          description: file to upload
+          format: binary
+          type: string
+      required:
+      - requiredFile
     Dog_allOf:
       properties:
         breed:

samples/client/petstore/java/native/api/openapi.yaml

@@ -250,13 +250,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/updatePetWithForm_request'
-                name:
-                  description: Updated name of the pet
-                  type: string
-                status:
-                  description: Updated status of the pet
-                  type: string
       responses:
         "405":
           content: {}
@@ -285,14 +279,7 @@ paths:
         content:
           multipart/form-data:
             schema:
-              properties:
+              $ref: '#/components/schemas/uploadFile_request'
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                file:
-                  description: file to upload
-                  format: binary
-                  type: string
       responses:
         "200":
           content:
@@ -763,24 +750,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testEnumParameters_request'
-                enum_form_string_array:
-                  description: Form parameter enum test (string array)
-                  items:
-                    default: $
-                    enum:
-                    - '>'
-                    - $
-                    type: string
-                  type: array
-                enum_form_string:
-                  default: -efg
-                  description: Form parameter enum test (string)
-                  enum:
-                  - _abc
-                  - -efg
-                  - (xyz)
-                  type: string
       responses:
         "400":
           content: {}
@@ -827,77 +797,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testEndpointParameters_request'
-                integer:
-                  description: None
-                  format: int32
-                  maximum: 100
-                  minimum: 10
-                  type: integer
-                int32:
-                  description: None
-                  format: int32
-                  maximum: 200
-                  minimum: 20
-                  type: integer
-                int64:
-                  description: None
-                  format: int64
-                  type: integer
-                number:
-                  description: None
-                  maximum: 543.2
-                  minimum: 32.1
-                  type: number
-                float:
-                  description: None
-                  format: float
-                  maximum: 987.6
-                  type: number
-                double:
-                  description: None
-                  format: double
-                  maximum: 123.4
-                  minimum: 67.8
-                  type: number
-                string:
-                  description: None
-                  pattern: "/[a-z]/i"
-                  type: string
-                pattern_without_delimiter:
-                  description: None
-                  pattern: "^[A-Z].*"
-                  type: string
-                byte:
-                  description: None
-                  format: byte
-                  type: string
-                binary:
-                  description: None
-                  format: binary
-                  type: string
-                date:
-                  description: None
-                  format: date
-                  type: string
-                dateTime:
-                  description: None
-                  format: date-time
-                  type: string
-                password:
-                  description: None
-                  format: password
-                  maxLength: 64
-                  minLength: 10
-                  type: string
-                callback:
-                  description: None
-                  type: string
-              required:
-              - byte
-              - double
-              - number
-              - pattern_without_delimiter
         required: true
       responses:
         "400":
@@ -1016,16 +916,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testJsonFormData_request'
-                param:
-                  description: field1
-                  type: string
-                param2:
-                  description: field2
-                  type: string
-              required:
-              - param
-              - param2
         required: true
       responses:
         "200":
@@ -1231,16 +1122,7 @@ paths:
         content:
           multipart/form-data:
             schema:
-              properties:
+              $ref: '#/components/schemas/uploadFileWithRequiredFile_request'
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                requiredFile:
-                  description: file to upload
-                  format: binary
-                  type: string
-              required:
-              - requiredFile
         required: true
       responses:
         "200":
@@ -2147,6 +2029,136 @@ components:
       xml:
         namespace: http://a.com/schema
         prefix: pre
+    updatePetWithForm_request:
+      properties:
+        name:
+          description: Updated name of the pet
+          type: string
+        status:
+          description: Updated status of the pet
+          type: string
+    uploadFile_request:
+      properties:
+        additionalMetadata:
+          description: Additional data to pass to server
+          type: string
+        file:
+          description: file to upload
+          format: binary
+          type: string
+    testEnumParameters_request:
+      properties:
+        enum_form_string_array:
+          description: Form parameter enum test (string array)
+          items:
+            default: $
+            enum:
+            - '>'
+            - $
+            type: string
+          type: array
+        enum_form_string:
+          default: -efg
+          description: Form parameter enum test (string)
+          enum:
+          - _abc
+          - -efg
+          - (xyz)
+          type: string
+    testEndpointParameters_request:
+      properties:
+        integer:
+          description: None
+          format: int32
+          maximum: 100
+          minimum: 10
+          type: integer
+        int32:
+          description: None
+          format: int32
+          maximum: 200
+          minimum: 20
+          type: integer
+        int64:
+          description: None
+          format: int64
+          type: integer
+        number:
+          description: None
+          maximum: 543.2
+          minimum: 32.1
+          type: number
+        float:
+          description: None
+          format: float
+          maximum: 987.6
+          type: number
+        double:
+          description: None
+          format: double
+          maximum: 123.4
+          minimum: 67.8
+          type: number
+        string:
+          description: None
+          pattern: "/[a-z]/i"
+          type: string
+        pattern_without_delimiter:
+          description: None
+          pattern: "^[A-Z].*"
+          type: string
+        byte:
+          description: None
+          format: byte
+          type: string
+        binary:
+          description: None
+          format: binary
+          type: string
+        date:
+          description: None
+          format: date
+          type: string
+        dateTime:
+          description: None
+          format: date-time
+          type: string
+        password:
+          description: None
+          format: password
+          maxLength: 64
+          minLength: 10
+          type: string
+        callback:
+          description: None
+          type: string
+      required:
+      - byte
+      - double
+      - number
+      - pattern_without_delimiter
+    testJsonFormData_request:
+      properties:
+        param:
+          description: field1
+          type: string
+        param2:
+          description: field2
+          type: string
+      required:
+      - param
+      - param2
+    uploadFileWithRequiredFile_request:
+      properties:
+        additionalMetadata:
+          description: Additional data to pass to server
+          type: string
+        requiredFile:
+          description: file to upload
+          format: binary
+          type: string
+      required:
+      - requiredFile
     Dog_allOf:
       properties:
         breed:

samples/client/petstore/java/okhttp-gson-dynamicOperations/src/main/resources/openapi/openapi.yaml

@@ -250,13 +250,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/updatePetWithForm_request'
-                name:
-                  description: Updated name of the pet
-                  type: string
-                status:
-                  description: Updated status of the pet
-                  type: string
       responses:
         "405":
           content: {}
@@ -285,14 +279,7 @@ paths:
         content:
           multipart/form-data:
             schema:
-              properties:
+              $ref: '#/components/schemas/uploadFile_request'
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                file:
-                  description: file to upload
-                  format: binary
-                  type: string
       responses:
         "200":
           content:
@@ -763,24 +750,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testEnumParameters_request'
-                enum_form_string_array:
-                  description: Form parameter enum test (string array)
-                  items:
-                    default: $
-                    enum:
-                    - '>'
-                    - $
-                    type: string
-                  type: array
-                enum_form_string:
-                  default: -efg
-                  description: Form parameter enum test (string)
-                  enum:
-                  - _abc
-                  - -efg
-                  - (xyz)
-                  type: string
       responses:
         "400":
           content: {}
@@ -827,77 +797,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testEndpointParameters_request'
-                integer:
-                  description: None
-                  format: int32
-                  maximum: 100
-                  minimum: 10
-                  type: integer
-                int32:
-                  description: None
-                  format: int32
-                  maximum: 200
-                  minimum: 20
-                  type: integer
-                int64:
-                  description: None
-                  format: int64
-                  type: integer
-                number:
-                  description: None
-                  maximum: 543.2
-                  minimum: 32.1
-                  type: number
-                float:
-                  description: None
-                  format: float
-                  maximum: 987.6
-                  type: number
-                double:
-                  description: None
-                  format: double
-                  maximum: 123.4
-                  minimum: 67.8
-                  type: number
-                string:
-                  description: None
-                  pattern: "/[a-z]/i"
-                  type: string
-                pattern_without_delimiter:
-                  description: None
-                  pattern: "^[A-Z].*"
-                  type: string
-                byte:
-                  description: None
-                  format: byte
-                  type: string
-                binary:
-                  description: None
-                  format: binary
-                  type: string
-                date:
-                  description: None
-                  format: date
-                  type: string
-                dateTime:
-                  description: None
-                  format: date-time
-                  type: string
-                password:
-                  description: None
-                  format: password
-                  maxLength: 64
-                  minLength: 10
-                  type: string
-                callback:
-                  description: None
-                  type: string
-              required:
-              - byte
-              - double
-              - number
-              - pattern_without_delimiter
         required: true
       responses:
         "400":
@@ -1016,16 +916,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testJsonFormData_request'
-                param:
-                  description: field1
-                  type: string
-                param2:
-                  description: field2
-                  type: string
-              required:
-              - param
-              - param2
         required: true
       responses:
         "200":
@@ -1231,16 +1122,7 @@ paths:
         content:
           multipart/form-data:
             schema:
-              properties:
+              $ref: '#/components/schemas/uploadFileWithRequiredFile_request'
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                requiredFile:
-                  description: file to upload
-                  format: binary
-                  type: string
-              required:
-              - requiredFile
         required: true
       responses:
         "200":
@@ -2147,6 +2029,136 @@ components:
       xml:
         namespace: http://a.com/schema
         prefix: pre
+    updatePetWithForm_request:
+      properties:
+        name:
+          description: Updated name of the pet
+          type: string
+        status:
+          description: Updated status of the pet
+          type: string
+    uploadFile_request:
+      properties:
+        additionalMetadata:
+          description: Additional data to pass to server
+          type: string
+        file:
+          description: file to upload
+          format: binary
+          type: string
+    testEnumParameters_request:
+      properties:
+        enum_form_string_array:
+          description: Form parameter enum test (string array)
+          items:
+            default: $
+            enum:
+            - '>'
+            - $
+            type: string
+          type: array
+        enum_form_string:
+          default: -efg
+          description: Form parameter enum test (string)
+          enum:
+          - _abc
+          - -efg
+          - (xyz)
+          type: string
+    testEndpointParameters_request:
+      properties:
+        integer:
+          description: None
+          format: int32
+          maximum: 100
+          minimum: 10
+          type: integer
+        int32:
+          description: None
+          format: int32
+          maximum: 200
+          minimum: 20
+          type: integer
+        int64:
+          description: None
+          format: int64
+          type: integer
+        number:
+          description: None
+          maximum: 543.2
+          minimum: 32.1
+          type: number
+        float:
+          description: None
+          format: float
+          maximum: 987.6
+          type: number
+        double:
+          description: None
+          format: double
+          maximum: 123.4
+          minimum: 67.8
+          type: number
+        string:
+          description: None
+          pattern: "/[a-z]/i"
+          type: string
+        pattern_without_delimiter:
+          description: None
+          pattern: "^[A-Z].*"
+          type: string
+        byte:
+          description: None
+          format: byte
+          type: string
+        binary:
+          description: None
+          format: binary
+          type: string
+        date:
+          description: None
+          format: date
+          type: string
+        dateTime:
+          description: None
+          format: date-time
+          type: string
+        password:
+          description: None
+          format: password
+          maxLength: 64
+          minLength: 10
+          type: string
+        callback:
+          description: None
+          type: string
+      required:
+      - byte
+      - double
+      - number
+      - pattern_without_delimiter
+    testJsonFormData_request:
+      properties:
+        param:
+          description: field1
+          type: string
+        param2:
+          description: field2
+          type: string
+      required:
+      - param
+      - param2
+    uploadFileWithRequiredFile_request:
+      properties:
+        additionalMetadata:
+          description: Additional data to pass to server
+          type: string
+        requiredFile:
+          description: file to upload
+          format: binary
+          type: string
+      required:
+      - requiredFile
     Dog_allOf:
       properties:
         breed:

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

@@ -250,13 +250,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/updatePetWithForm_request'
-                name:
-                  description: Updated name of the pet
-                  type: string
-                status:
-                  description: Updated status of the pet
-                  type: string
       responses:
         "405":
           content: {}
@@ -285,14 +279,7 @@ paths:
         content:
           multipart/form-data:
             schema:
-              properties:
+              $ref: '#/components/schemas/uploadFile_request'
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                file:
-                  description: file to upload
-                  format: binary
-                  type: string
       responses:
         "200":
           content:
@@ -763,24 +750,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testEnumParameters_request'
-                enum_form_string_array:
-                  description: Form parameter enum test (string array)
-                  items:
-                    default: $
-                    enum:
-                    - '>'
-                    - $
-                    type: string
-                  type: array
-                enum_form_string:
-                  default: -efg
-                  description: Form parameter enum test (string)
-                  enum:
-                  - _abc
-                  - -efg
-                  - (xyz)
-                  type: string
       responses:
         "400":
           content: {}
@@ -827,77 +797,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testEndpointParameters_request'
-                integer:
-                  description: None
-                  format: int32
-                  maximum: 100
-                  minimum: 10
-                  type: integer
-                int32:
-                  description: None
-                  format: int32
-                  maximum: 200
-                  minimum: 20
-                  type: integer
-                int64:
-                  description: None
-                  format: int64
-                  type: integer
-                number:
-                  description: None
-                  maximum: 543.2
-                  minimum: 32.1
-                  type: number
-                float:
-                  description: None
-                  format: float
-                  maximum: 987.6
-                  type: number
-                double:
-                  description: None
-                  format: double
-                  maximum: 123.4
-                  minimum: 67.8
-                  type: number
-                string:
-                  description: None
-                  pattern: "/[a-z]/i"
-                  type: string
-                pattern_without_delimiter:
-                  description: None
-                  pattern: "^[A-Z].*"
-                  type: string
-                byte:
-                  description: None
-                  format: byte
-                  type: string
-                binary:
-                  description: None
-                  format: binary
-                  type: string
-                date:
-                  description: None
-                  format: date
-                  type: string
-                dateTime:
-                  description: None
-                  format: date-time
-                  type: string
-                password:
-                  description: None
-                  format: password
-                  maxLength: 64
-                  minLength: 10
-                  type: string
-                callback:
-                  description: None
-                  type: string
-              required:
-              - byte
-              - double
-              - number
-              - pattern_without_delimiter
         required: true
       responses:
         "400":
@@ -1016,16 +916,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testJsonFormData_request'
-                param:
-                  description: field1
-                  type: string
-                param2:
-                  description: field2
-                  type: string
-              required:
-              - param
-              - param2
         required: true
       responses:
         "200":
@@ -1231,16 +1122,7 @@ paths:
         content:
           multipart/form-data:
             schema:
-              properties:
+              $ref: '#/components/schemas/uploadFileWithRequiredFile_request'
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                requiredFile:
-                  description: file to upload
-                  format: binary
-                  type: string
-              required:
-              - requiredFile
         required: true
       responses:
         "200":
@@ -2147,6 +2029,136 @@ components:
       xml:
         namespace: http://a.com/schema
         prefix: pre
+    updatePetWithForm_request:
+      properties:
+        name:
+          description: Updated name of the pet
+          type: string
+        status:
+          description: Updated status of the pet
+          type: string
+    uploadFile_request:
+      properties:
+        additionalMetadata:
+          description: Additional data to pass to server
+          type: string
+        file:
+          description: file to upload
+          format: binary
+          type: string
+    testEnumParameters_request:
+      properties:
+        enum_form_string_array:
+          description: Form parameter enum test (string array)
+          items:
+            default: $
+            enum:
+            - '>'
+            - $
+            type: string
+          type: array
+        enum_form_string:
+          default: -efg
+          description: Form parameter enum test (string)
+          enum:
+          - _abc
+          - -efg
+          - (xyz)
+          type: string
+    testEndpointParameters_request:
+      properties:
+        integer:
+          description: None
+          format: int32
+          maximum: 100
+          minimum: 10
+          type: integer
+        int32:
+          description: None
+          format: int32
+          maximum: 200
+          minimum: 20
+          type: integer
+        int64:
+          description: None
+          format: int64
+          type: integer
+        number:
+          description: None
+          maximum: 543.2
+          minimum: 32.1
+          type: number
+        float:
+          description: None
+          format: float
+          maximum: 987.6
+          type: number
+        double:
+          description: None
+          format: double
+          maximum: 123.4
+          minimum: 67.8
+          type: number
+        string:
+          description: None
+          pattern: "/[a-z]/i"
+          type: string
+        pattern_without_delimiter:
+          description: None
+          pattern: "^[A-Z].*"
+          type: string
+        byte:
+          description: None
+          format: byte
+          type: string
+        binary:
+          description: None
+          format: binary
+          type: string
+        date:
+          description: None
+          format: date
+          type: string
+        dateTime:
+          description: None
+          format: date-time
+          type: string
+        password:
+          description: None
+          format: password
+          maxLength: 64
+          minLength: 10
+          type: string
+        callback:
+          description: None
+          type: string
+      required:
+      - byte
+      - double
+      - number
+      - pattern_without_delimiter
+    testJsonFormData_request:
+      properties:
+        param:
+          description: field1
+          type: string
+        param2:
+          description: field2
+          type: string
+      required:
+      - param
+      - param2
+    uploadFileWithRequiredFile_request:
+      properties:
+        additionalMetadata:
+          description: Additional data to pass to server
+          type: string
+        requiredFile:
+          description: file to upload
+          format: binary
+          type: string
+      required:
+      - requiredFile
     Dog_allOf:
       properties:
         breed:

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

@@ -12,7 +12,7 @@ docs/Apple.md
 docs/AppleReq.md
 docs/ArrayOfArrayOfNumberOnly.md
 docs/ArrayOfInlineAllOf.md
-docs/ArrayOfInlineAllOfArrayAllofDogPropertyItemsAllOf1.md
+docs/ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf.md
 docs/ArrayOfNumberOnly.md
 docs/ArrayTest.md
 docs/Banana.md
@@ -133,7 +133,7 @@ src/main/java/org/openapitools/client/model/Apple.java
 src/main/java/org/openapitools/client/model/AppleReq.java
 src/main/java/org/openapitools/client/model/ArrayOfArrayOfNumberOnly.java
 src/main/java/org/openapitools/client/model/ArrayOfInlineAllOf.java
-src/main/java/org/openapitools/client/model/ArrayOfInlineAllOfArrayAllofDogPropertyItemsAllOf1.java
+src/main/java/org/openapitools/client/model/ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf.java
 src/main/java/org/openapitools/client/model/ArrayOfNumberOnly.java
 src/main/java/org/openapitools/client/model/ArrayTest.java
 src/main/java/org/openapitools/client/model/Banana.java

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

@@ -162,7 +162,7 @@ Class | Method | HTTP request | Description
  - [AppleReq](docs/AppleReq.md)
  - [ArrayOfArrayOfNumberOnly](docs/ArrayOfArrayOfNumberOnly.md)
  - [ArrayOfInlineAllOf](docs/ArrayOfInlineAllOf.md)
- - [ArrayOfInlineAllOfArrayAllofDogPropertyItemsAllOf1](docs/ArrayOfInlineAllOfArrayAllofDogPropertyItemsAllOf1.md)
+ - [ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf](docs/ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf.md)
  - [ArrayOfNumberOnly](docs/ArrayOfNumberOnly.md)
  - [ArrayTest](docs/ArrayTest.md)
  - [Banana](docs/Banana.md)

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

@@ -262,18 +262,10 @@ paths:
           type: integer
         style: simple
       requestBody:
-        $ref: '#/components/requestBodies/inline_object'
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/updatePetWithForm_request'
-                name:
-                  description: Updated name of the pet
-                  type: string
-                status:
-                  description: Updated status of the pet
-                  type: string
-              type: object
       responses:
         "405":
           description: Invalid input
@@ -301,19 +293,10 @@ paths:
           type: integer
         style: simple
       requestBody:
-        $ref: '#/components/requestBodies/inline_object_1'
         content:
           multipart/form-data:
             schema:
-              properties:
+              $ref: '#/components/schemas/uploadFile_request'
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                file:
-                  description: file to upload
-                  format: binary
-                  type: string
-              type: object
       responses:
         "200":
           content:
@@ -794,29 +777,10 @@ paths:
           type: number
         style: form
       requestBody:
-        $ref: '#/components/requestBodies/inline_object_2'
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testEnumParameters_request'
-                enum_form_string_array:
-                  description: Form parameter enum test (string array)
-                  items:
-                    default: $
-                    enum:
-                    - '>'
-                    - $
-                    type: string
-                  type: array
-                enum_form_string:
-                  default: -efg
-                  description: Form parameter enum test (string)
-                  enum:
-                  - _abc
-                  - -efg
-                  - (xyz)
-                  type: string
-              type: object
       responses:
         "400":
           description: Invalid request
@@ -852,83 +816,10 @@ paths:
         가짜 엔드 포인트
       operationId: testEndpointParameters
       requestBody:
-        $ref: '#/components/requestBodies/inline_object_3'
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testEndpointParameters_request'
-                integer:
-                  description: None
-                  maximum: 100
-                  minimum: 10
-                  type: integer
-                int32:
-                  description: None
-                  format: int32
-                  maximum: 200
-                  minimum: 20
-                  type: integer
-                int64:
-                  description: None
-                  format: int64
-                  type: integer
-                number:
-                  description: None
-                  maximum: 543.2
-                  minimum: 32.1
-                  type: number
-                float:
-                  description: None
-                  format: float
-                  maximum: 987.6
-                  type: number
-                double:
-                  description: None
-                  format: double
-                  maximum: 123.4
-                  minimum: 67.8
-                  type: number
-                string:
-                  description: None
-                  pattern: "/[a-z]/i"
-                  type: string
-                pattern_without_delimiter:
-                  description: None
-                  pattern: "^[A-Z].*"
-                  type: string
-                byte:
-                  description: None
-                  format: byte
-                  type: string
-                binary:
-                  description: None
-                  format: binary
-                  type: string
-                date:
-                  description: None
-                  format: date
-                  type: string
-                dateTime:
-                  default: 2010-02-01T10:20:10.11111+01:00
-                  description: None
-                  example: 2020-02-02T20:20:20.22222Z
-                  format: date-time
-                  type: string
-                password:
-                  description: None
-                  format: password
-                  maxLength: 64
-                  minLength: 10
-                  type: string
-                callback:
-                  description: None
-                  type: string
-              required:
-              - byte
-              - double
-              - number
-              - pattern_without_delimiter
-              type: object
       responses:
         "400":
           description: Invalid username supplied
@@ -1034,21 +925,10 @@ paths:
       description: ""
       operationId: testJsonFormData
       requestBody:
-        $ref: '#/components/requestBodies/inline_object_4'
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testJsonFormData_request'
-                param:
-                  description: field1
-                  type: string
-                param2:
-                  description: field2
-                  type: string
-              required:
-              - param
-              - param2
-              type: object
       responses:
         "200":
           description: successful operation
@@ -1209,21 +1089,10 @@ paths:
           type: integer
         style: simple
       requestBody:
-        $ref: '#/components/requestBodies/inline_object_5'
         content:
           multipart/form-data:
             schema:
-              properties:
+              $ref: '#/components/schemas/uploadFileWithRequiredFile_request'
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                requiredFile:
-                  description: file to upload
-                  format: binary
-                  type: string
-              required:
-              - requiredFile
-              type: object
       responses:
         "200":
           content:
@@ -1302,36 +1171,6 @@ components:
             $ref: '#/components/schemas/Pet'
       description: Pet object that needs to be added to the store
       required: true
-    inline_object:
-      content:
-        application/x-www-form-urlencoded:
-          schema:
-            $ref: '#/components/schemas/inline_object'
-    inline_object_1:
-      content:
-        multipart/form-data:
-          schema:
-            $ref: '#/components/schemas/inline_object_1'
-    inline_object_2:
-      content:
-        application/x-www-form-urlencoded:
-          schema:
-            $ref: '#/components/schemas/inline_object_2'
-    inline_object_3:
-      content:
-        application/x-www-form-urlencoded:
-          schema:
-            $ref: '#/components/schemas/inline_object_3'
-    inline_object_4:
-      content:
-        application/x-www-form-urlencoded:
-          schema:
-            $ref: '#/components/schemas/inline_object_4'
-    inline_object_5:
-      content:
-        multipart/form-data:
-          schema:
-            $ref: '#/components/schemas/inline_object_5'
   schemas:
     Foo:
       example:
@@ -2344,7 +2183,7 @@ components:
           items:
             allOf:
             - $ref: '#/components/schemas/Dog_allOf'
-            - $ref: '#/components/schemas/ArrayOfInlineAllOf_array_allof_dog_propertyItems_allOf_1'
+            - $ref: '#/components/schemas/ArrayOfInlineAllOf_array_allof_dog_property_inner_allOf'
           type: array
       required:
       - name
@@ -2357,7 +2196,7 @@ components:
         string:
           $ref: '#/components/schemas/Foo'
       type: object
-    inline_object:
+    updatePetWithForm_request:
       properties:
         name:
           description: Updated name of the pet
@@ -2366,7 +2205,7 @@ components:
           description: Updated status of the pet
           type: string
       type: object
-    inline_object_1:
+    uploadFile_request:
       properties:
         additionalMetadata:
           description: Additional data to pass to server
@@ -2376,7 +2215,7 @@ components:
           format: binary
           type: string
       type: object
-    inline_object_2:
+    testEnumParameters_request:
       properties:
         enum_form_string_array:
           description: Form parameter enum test (string array)
@@ -2396,7 +2235,7 @@ components:
           - (xyz)
           type: string
       type: object
-    inline_object_3:
+    testEndpointParameters_request:
       properties:
         integer:
           description: None
@@ -2470,7 +2309,7 @@ components:
       - number
       - pattern_without_delimiter
       type: object
-    inline_object_4:
+    testJsonFormData_request:
       properties:
         param:
           description: field1
@@ -2482,7 +2321,7 @@ components:
       - param
       - param2
       type: object
-    inline_object_5:
+    uploadFileWithRequiredFile_request:
       properties:
         additionalMetadata:
           description: Additional data to pass to server
@@ -2504,7 +2343,7 @@ components:
         declawed:
           type: boolean
       type: object
-    ArrayOfInlineAllOf_array_allof_dog_propertyItems_allOf_1:
+    ArrayOfInlineAllOf_array_allof_dog_property_inner_allOf:
       properties:
         color:
           type: string

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

@@ -0,0 +1,13 @@
+
+
+# ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf
+
+
+## Properties
+
+| Name | Type | Description | Notes |
+|------------ | ------------- | ------------- | -------------|
+|**color** | **String** |  |  [optional] |
+
+
+

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

@@ -225,7 +225,7 @@ public class JSON {
             .registerTypeAdapterFactory(new org.openapitools.client.model.AppleReq.CustomTypeAdapterFactory())
             .registerTypeAdapterFactory(new org.openapitools.client.model.ArrayOfArrayOfNumberOnly.CustomTypeAdapterFactory())
             .registerTypeAdapterFactory(new org.openapitools.client.model.ArrayOfInlineAllOf.CustomTypeAdapterFactory())
-            .registerTypeAdapterFactory(new org.openapitools.client.model.ArrayOfInlineAllOfArrayAllofDogPropertyItemsAllOf1.CustomTypeAdapterFactory())
+            .registerTypeAdapterFactory(new org.openapitools.client.model.ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf.CustomTypeAdapterFactory())
             .registerTypeAdapterFactory(new org.openapitools.client.model.ArrayOfNumberOnly.CustomTypeAdapterFactory())
             .registerTypeAdapterFactory(new org.openapitools.client.model.ArrayTest.CustomTypeAdapterFactory())
             .registerTypeAdapterFactory(new org.openapitools.client.model.Banana.CustomTypeAdapterFactory())

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

@@ -25,7 +25,7 @@ import io.swagger.annotations.ApiModelProperty;
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import org.openapitools.client.model.ArrayOfInlineAllOfArrayAllofDogPropertyItemsAllOf1;
+import org.openapitools.client.model.ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf;
 import org.openapitools.client.model.DogAllOf;
 
 import com.google.gson.Gson;

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

@@ -0,0 +1,273 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import java.util.Objects;
+import java.util.Arrays;
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonArray;
+import com.google.gson.JsonDeserializationContext;
+import com.google.gson.JsonDeserializer;
+import com.google.gson.JsonElement;
+import com.google.gson.JsonObject;
+import com.google.gson.JsonParseException;
+import com.google.gson.TypeAdapterFactory;
+import com.google.gson.reflect.TypeToken;
+
+import java.lang.reflect.Type;
+import java.util.HashMap;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Map.Entry;
+import java.util.Set;
+
+import org.openapitools.client.JSON;
+
+/**
+ * ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf
+ */
+@javax.annotation.Generated(value = "org.openapitools.codegen.languages.JavaClientCodegen")
+public class ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf {
+  public static final String SERIALIZED_NAME_COLOR = "color";
+  @SerializedName(SERIALIZED_NAME_COLOR)
+  private String color;
+
+  public ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf() { 
+  }
+
+  public ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf color(String color) {
+    
+    this.color = color;
+    return this;
+  }
+
+   /**
+   * Get color
+   * @return color
+  **/
+  @javax.annotation.Nullable
+  @ApiModelProperty(value = "")
+
+  public String getColor() {
+    return color;
+  }
+
+
+  public void setColor(String color) {
+    this.color = color;
+  }
+
+  /**
+   * A container for additional, undeclared properties.
+   * This is a holder for any undeclared properties as specified with
+   * the 'additionalProperties' keyword in the OAS document.
+   */
+  private Map<String, Object> additionalProperties;
+
+  /**
+   * Set the additional (undeclared) property with the specified name and value.
+   * If the property does not already exist, create it otherwise replace it.
+   */
+  public ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf putAdditionalProperty(String key, Object value) {
+    if (this.additionalProperties == null) {
+        this.additionalProperties = new HashMap<String, Object>();
+    }
+    this.additionalProperties.put(key, value);
+    return this;
+  }
+
+  /**
+   * Return the additional (undeclared) property.
+   */
+  public Map<String, Object> getAdditionalProperties() {
+    return additionalProperties;
+  }
+
+  /**
+   * Return the additional (undeclared) property with the specified name.
+   */
+  public Object getAdditionalProperty(String key) {
+    if (this.additionalProperties == null) {
+        return null;
+    }
+    return this.additionalProperties.get(key);
+  }
+
+
+  @Override
+  public boolean equals(Object o) {
+    if (this == o) {
+      return true;
+    }
+    if (o == null || getClass() != o.getClass()) {
+      return false;
+    }
+    ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf arrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf = (ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf) o;
+    return Objects.equals(this.color, arrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf.color)&&
+        Objects.equals(this.additionalProperties, arrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf.additionalProperties);
+  }
+
+  @Override
+  public int hashCode() {
+    return Objects.hash(color, additionalProperties);
+  }
+
+  @Override
+  public String toString() {
+    StringBuilder sb = new StringBuilder();
+    sb.append("class ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf {\n");
+    sb.append("    color: ").append(toIndentedString(color)).append("\n");
+    sb.append("    additionalProperties: ").append(toIndentedString(additionalProperties)).append("\n");
+    sb.append("}");
+    return sb.toString();
+  }
+
+  /**
+   * Convert the given object to string with each line indented by 4 spaces
+   * (except the first line).
+   */
+  private String toIndentedString(Object o) {
+    if (o == null) {
+      return "null";
+    }
+    return o.toString().replace("\n", "\n    ");
+  }
+
+
+  public static HashSet<String> openapiFields;
+  public static HashSet<String> openapiRequiredFields;
+
+  static {
+    // a set of all properties/fields (JSON key names)
+    openapiFields = new HashSet<String>();
+    openapiFields.add("color");
+
+    // a set of required properties/fields (JSON key names)
+    openapiRequiredFields = new HashSet<String>();
+  }
+
+ /**
+  * Validates the JSON Object and throws an exception if issues found
+  *
+  * @param jsonObj JSON Object
+  * @throws IOException if the JSON Object is invalid with respect to ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf
+  */
+  public static void validateJsonObject(JsonObject jsonObj) throws IOException {
+      if (jsonObj == null) {
+        if (ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf.openapiRequiredFields.isEmpty()) {
+          return;
+        } else { // has required fields
+          throw new IllegalArgumentException(String.format("The required field(s) %s in ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf is not found in the empty JSON string", ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf.openapiRequiredFields.toString()));
+        }
+      }
+      if (jsonObj.get("color") != null && !jsonObj.get("color").isJsonPrimitive()) {
+        throw new IllegalArgumentException(String.format("Expected the field `color` to be a primitive type in the JSON string but got `%s`", jsonObj.get("color").toString()));
+      }
+  }
+
+  public static class CustomTypeAdapterFactory implements TypeAdapterFactory {
+    @SuppressWarnings("unchecked")
+    @Override
+    public <T> TypeAdapter<T> create(Gson gson, TypeToken<T> type) {
+       if (!ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf.class.isAssignableFrom(type.getRawType())) {
+         return null; // this class only serializes 'ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf' and its subtypes
+       }
+       final TypeAdapter<JsonElement> elementAdapter = gson.getAdapter(JsonElement.class);
+       final TypeAdapter<ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf> thisAdapter
+                        = gson.getDelegateAdapter(this, TypeToken.get(ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf.class));
+
+       return (TypeAdapter<T>) new TypeAdapter<ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf>() {
+           @Override
+           public void write(JsonWriter out, ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf value) throws IOException {
+             JsonObject obj = thisAdapter.toJsonTree(value).getAsJsonObject();
+             obj.remove("additionalProperties");
+             // serialize additonal properties
+             if (value.getAdditionalProperties() != null) {
+               for (Map.Entry<String, Object> entry : value.getAdditionalProperties().entrySet()) {
+                 if (entry.getValue() instanceof String)
+                   obj.addProperty(entry.getKey(), (String) entry.getValue());
+                 else if (entry.getValue() instanceof Number)
+                   obj.addProperty(entry.getKey(), (Number) entry.getValue());
+                 else if (entry.getValue() instanceof Boolean)
+                   obj.addProperty(entry.getKey(), (Boolean) entry.getValue());
+                 else if (entry.getValue() instanceof Character)
+                   obj.addProperty(entry.getKey(), (Character) entry.getValue());
+                 else {
+                   obj.add(entry.getKey(), gson.toJsonTree(entry.getValue()).getAsJsonObject());
+                 }
+               }
+             }
+             elementAdapter.write(out, obj);
+           }
+
+           @Override
+           public ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf read(JsonReader in) throws IOException {
+             JsonObject jsonObj = elementAdapter.read(in).getAsJsonObject();
+             validateJsonObject(jsonObj);
+             // store additional fields in the deserialized instance
+             ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf instance = thisAdapter.fromJsonTree(jsonObj);
+             for (Map.Entry<String, JsonElement> entry : jsonObj.entrySet()) {
+               if (!openapiFields.contains(entry.getKey())) {
+                 if (entry.getValue().isJsonPrimitive()) { // primitive type
+                   if (entry.getValue().getAsJsonPrimitive().isString())
+                     instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsString());
+                   else if (entry.getValue().getAsJsonPrimitive().isNumber())
+                     instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsNumber());
+                   else if (entry.getValue().getAsJsonPrimitive().isBoolean())
+                     instance.putAdditionalProperty(entry.getKey(), entry.getValue().getAsBoolean());
+                   else
+                     throw new IllegalArgumentException(String.format("The field `%s` has unknown primitive type. Value: %s", entry.getKey(), entry.getValue().toString()));
+                 } else { // non-primitive type
+                   instance.putAdditionalProperty(entry.getKey(), gson.fromJson(entry.getValue(), HashMap.class));
+                 }
+               }
+             }
+             return instance;
+           }
+
+       }.nullSafe();
+    }
+  }
+
+ /**
+  * Create an instance of ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf given an JSON string
+  *
+  * @param jsonString JSON string
+  * @return An instance of ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf
+  * @throws IOException if the JSON string is invalid with respect to ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf
+  */
+  public static ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf fromJson(String jsonString) throws IOException {
+    return JSON.getGson().fromJson(jsonString, ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf.class);
+  }
+
+ /**
+  * Convert an instance of ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf to an JSON string
+  *
+  * @return JSON string
+  */
+  public String toJson() {
+    return JSON.getGson().toJson(this);
+  }
+}
+

samples/client/petstore/java/okhttp-gson/src/test/java/org/openapitools/client/model/ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOfTest.java

@@ -0,0 +1,50 @@
+/*
+ * OpenAPI Petstore
+ * This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+package org.openapitools.client.model;
+
+import com.google.gson.TypeAdapter;
+import com.google.gson.annotations.JsonAdapter;
+import com.google.gson.annotations.SerializedName;
+import com.google.gson.stream.JsonReader;
+import com.google.gson.stream.JsonWriter;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import java.io.IOException;
+import org.junit.jupiter.api.Disabled;
+import org.junit.jupiter.api.Test;
+
+
+/**
+ * Model tests for ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf
+ */
+public class ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOfTest {
+    private final ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf model = new ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf();
+
+    /**
+     * Model tests for ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf
+     */
+    @Test
+    public void testArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf() {
+        // TODO: test ArrayOfInlineAllOfArrayAllofDogPropertyInnerAllOf
+    }
+
+    /**
+     * Test the property 'color'
+     */
+    @Test
+    public void colorTest() {
+        // TODO: test color
+    }
+
+}

samples/client/petstore/java/rest-assured-jackson/api/openapi.yaml

@@ -250,13 +250,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/updatePetWithForm_request'
-                name:
-                  description: Updated name of the pet
-                  type: string
-                status:
-                  description: Updated status of the pet
-                  type: string
       responses:
         "405":
           content: {}
@@ -285,14 +279,7 @@ paths:
         content:
           multipart/form-data:
             schema:
-              properties:
+              $ref: '#/components/schemas/uploadFile_request'
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                file:
-                  description: file to upload
-                  format: binary
-                  type: string
       responses:
         "200":
           content:
@@ -763,24 +750,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testEnumParameters_request'
-                enum_form_string_array:
-                  description: Form parameter enum test (string array)
-                  items:
-                    default: $
-                    enum:
-                    - '>'
-                    - $
-                    type: string
-                  type: array
-                enum_form_string:
-                  default: -efg
-                  description: Form parameter enum test (string)
-                  enum:
-                  - _abc
-                  - -efg
-                  - (xyz)
-                  type: string
       responses:
         "400":
           content: {}
@@ -827,77 +797,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testEndpointParameters_request'
-                integer:
-                  description: None
-                  format: int32
-                  maximum: 100
-                  minimum: 10
-                  type: integer
-                int32:
-                  description: None
-                  format: int32
-                  maximum: 200
-                  minimum: 20
-                  type: integer
-                int64:
-                  description: None
-                  format: int64
-                  type: integer
-                number:
-                  description: None
-                  maximum: 543.2
-                  minimum: 32.1
-                  type: number
-                float:
-                  description: None
-                  format: float
-                  maximum: 987.6
-                  type: number
-                double:
-                  description: None
-                  format: double
-                  maximum: 123.4
-                  minimum: 67.8
-                  type: number
-                string:
-                  description: None
-                  pattern: "/[a-z]/i"
-                  type: string
-                pattern_without_delimiter:
-                  description: None
-                  pattern: "^[A-Z].*"
-                  type: string
-                byte:
-                  description: None
-                  format: byte
-                  type: string
-                binary:
-                  description: None
-                  format: binary
-                  type: string
-                date:
-                  description: None
-                  format: date
-                  type: string
-                dateTime:
-                  description: None
-                  format: date-time
-                  type: string
-                password:
-                  description: None
-                  format: password
-                  maxLength: 64
-                  minLength: 10
-                  type: string
-                callback:
-                  description: None
-                  type: string
-              required:
-              - byte
-              - double
-              - number
-              - pattern_without_delimiter
         required: true
       responses:
         "400":
@@ -1016,16 +916,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testJsonFormData_request'
-                param:
-                  description: field1
-                  type: string
-                param2:
-                  description: field2
-                  type: string
-              required:
-              - param
-              - param2
         required: true
       responses:
         "200":
@@ -1231,16 +1122,7 @@ paths:
         content:
           multipart/form-data:
             schema:
-              properties:
+              $ref: '#/components/schemas/uploadFileWithRequiredFile_request'
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                requiredFile:
-                  description: file to upload
-                  format: binary
-                  type: string
-              required:
-              - requiredFile
         required: true
       responses:
         "200":
@@ -2147,6 +2029,136 @@ components:
       xml:
         namespace: http://a.com/schema
         prefix: pre
+    updatePetWithForm_request:
+      properties:
+        name:
+          description: Updated name of the pet
+          type: string
+        status:
+          description: Updated status of the pet
+          type: string
+    uploadFile_request:
+      properties:
+        additionalMetadata:
+          description: Additional data to pass to server
+          type: string
+        file:
+          description: file to upload
+          format: binary
+          type: string
+    testEnumParameters_request:
+      properties:
+        enum_form_string_array:
+          description: Form parameter enum test (string array)
+          items:
+            default: $
+            enum:
+            - '>'
+            - $
+            type: string
+          type: array
+        enum_form_string:
+          default: -efg
+          description: Form parameter enum test (string)
+          enum:
+          - _abc
+          - -efg
+          - (xyz)
+          type: string
+    testEndpointParameters_request:
+      properties:
+        integer:
+          description: None
+          format: int32
+          maximum: 100
+          minimum: 10
+          type: integer
+        int32:
+          description: None
+          format: int32
+          maximum: 200
+          minimum: 20
+          type: integer
+        int64:
+          description: None
+          format: int64
+          type: integer
+        number:
+          description: None
+          maximum: 543.2
+          minimum: 32.1
+          type: number
+        float:
+          description: None
+          format: float
+          maximum: 987.6
+          type: number
+        double:
+          description: None
+          format: double
+          maximum: 123.4
+          minimum: 67.8
+          type: number
+        string:
+          description: None
+          pattern: "/[a-z]/i"
+          type: string
+        pattern_without_delimiter:
+          description: None
+          pattern: "^[A-Z].*"
+          type: string
+        byte:
+          description: None
+          format: byte
+          type: string
+        binary:
+          description: None
+          format: binary
+          type: string
+        date:
+          description: None
+          format: date
+          type: string
+        dateTime:
+          description: None
+          format: date-time
+          type: string
+        password:
+          description: None
+          format: password
+          maxLength: 64
+          minLength: 10
+          type: string
+        callback:
+          description: None
+          type: string
+      required:
+      - byte
+      - double
+      - number
+      - pattern_without_delimiter
+    testJsonFormData_request:
+      properties:
+        param:
+          description: field1
+          type: string
+        param2:
+          description: field2
+          type: string
+      required:
+      - param
+      - param2
+    uploadFileWithRequiredFile_request:
+      properties:
+        additionalMetadata:
+          description: Additional data to pass to server
+          type: string
+        requiredFile:
+          description: file to upload
+          format: binary
+          type: string
+      required:
+      - requiredFile
     Dog_allOf:
       properties:
         breed:

samples/client/petstore/java/rest-assured/api/openapi.yaml

@@ -250,13 +250,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/updatePetWithForm_request'
-                name:
-                  description: Updated name of the pet
-                  type: string
-                status:
-                  description: Updated status of the pet
-                  type: string
       responses:
         "405":
           content: {}
@@ -285,14 +279,7 @@ paths:
         content:
           multipart/form-data:
             schema:
-              properties:
+              $ref: '#/components/schemas/uploadFile_request'
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                file:
-                  description: file to upload
-                  format: binary
-                  type: string
       responses:
         "200":
           content:
@@ -763,24 +750,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testEnumParameters_request'
-                enum_form_string_array:
-                  description: Form parameter enum test (string array)
-                  items:
-                    default: $
-                    enum:
-                    - '>'
-                    - $
-                    type: string
-                  type: array
-                enum_form_string:
-                  default: -efg
-                  description: Form parameter enum test (string)
-                  enum:
-                  - _abc
-                  - -efg
-                  - (xyz)
-                  type: string
       responses:
         "400":
           content: {}
@@ -827,77 +797,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testEndpointParameters_request'
-                integer:
-                  description: None
-                  format: int32
-                  maximum: 100
-                  minimum: 10
-                  type: integer
-                int32:
-                  description: None
-                  format: int32
-                  maximum: 200
-                  minimum: 20
-                  type: integer
-                int64:
-                  description: None
-                  format: int64
-                  type: integer
-                number:
-                  description: None
-                  maximum: 543.2
-                  minimum: 32.1
-                  type: number
-                float:
-                  description: None
-                  format: float
-                  maximum: 987.6
-                  type: number
-                double:
-                  description: None
-                  format: double
-                  maximum: 123.4
-                  minimum: 67.8
-                  type: number
-                string:
-                  description: None
-                  pattern: "/[a-z]/i"
-                  type: string
-                pattern_without_delimiter:
-                  description: None
-                  pattern: "^[A-Z].*"
-                  type: string
-                byte:
-                  description: None
-                  format: byte
-                  type: string
-                binary:
-                  description: None
-                  format: binary
-                  type: string
-                date:
-                  description: None
-                  format: date
-                  type: string
-                dateTime:
-                  description: None
-                  format: date-time
-                  type: string
-                password:
-                  description: None
-                  format: password
-                  maxLength: 64
-                  minLength: 10
-                  type: string
-                callback:
-                  description: None
-                  type: string
-              required:
-              - byte
-              - double
-              - number
-              - pattern_without_delimiter
         required: true
       responses:
         "400":
@@ -1016,16 +916,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testJsonFormData_request'
-                param:
-                  description: field1
-                  type: string
-                param2:
-                  description: field2
-                  type: string
-              required:
-              - param
-              - param2
         required: true
       responses:
         "200":
@@ -1231,16 +1122,7 @@ paths:
         content:
           multipart/form-data:
             schema:
-              properties:
+              $ref: '#/components/schemas/uploadFileWithRequiredFile_request'
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                requiredFile:
-                  description: file to upload
-                  format: binary
-                  type: string
-              required:
-              - requiredFile
         required: true
       responses:
         "200":
@@ -2147,6 +2029,136 @@ components:
       xml:
         namespace: http://a.com/schema
         prefix: pre
+    updatePetWithForm_request:
+      properties:
+        name:
+          description: Updated name of the pet
+          type: string
+        status:
+          description: Updated status of the pet
+          type: string
+    uploadFile_request:
+      properties:
+        additionalMetadata:
+          description: Additional data to pass to server
+          type: string
+        file:
+          description: file to upload
+          format: binary
+          type: string
+    testEnumParameters_request:
+      properties:
+        enum_form_string_array:
+          description: Form parameter enum test (string array)
+          items:
+            default: $
+            enum:
+            - '>'
+            - $
+            type: string
+          type: array
+        enum_form_string:
+          default: -efg
+          description: Form parameter enum test (string)
+          enum:
+          - _abc
+          - -efg
+          - (xyz)
+          type: string
+    testEndpointParameters_request:
+      properties:
+        integer:
+          description: None
+          format: int32
+          maximum: 100
+          minimum: 10
+          type: integer
+        int32:
+          description: None
+          format: int32
+          maximum: 200
+          minimum: 20
+          type: integer
+        int64:
+          description: None
+          format: int64
+          type: integer
+        number:
+          description: None
+          maximum: 543.2
+          minimum: 32.1
+          type: number
+        float:
+          description: None
+          format: float
+          maximum: 987.6
+          type: number
+        double:
+          description: None
+          format: double
+          maximum: 123.4
+          minimum: 67.8
+          type: number
+        string:
+          description: None
+          pattern: "/[a-z]/i"
+          type: string
+        pattern_without_delimiter:
+          description: None
+          pattern: "^[A-Z].*"
+          type: string
+        byte:
+          description: None
+          format: byte
+          type: string
+        binary:
+          description: None
+          format: binary
+          type: string
+        date:
+          description: None
+          format: date
+          type: string
+        dateTime:
+          description: None
+          format: date-time
+          type: string
+        password:
+          description: None
+          format: password
+          maxLength: 64
+          minLength: 10
+          type: string
+        callback:
+          description: None
+          type: string
+      required:
+      - byte
+      - double
+      - number
+      - pattern_without_delimiter
+    testJsonFormData_request:
+      properties:
+        param:
+          description: field1
+          type: string
+        param2:
+          description: field2
+          type: string
+      required:
+      - param
+      - param2
+    uploadFileWithRequiredFile_request:
+      properties:
+        additionalMetadata:
+          description: Additional data to pass to server
+          type: string
+        requiredFile:
+          description: file to upload
+          format: binary
+          type: string
+      required:
+      - requiredFile
     Dog_allOf:
       properties:
         breed:

samples/client/petstore/java/resteasy/api/openapi.yaml

@@ -250,13 +250,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/updatePetWithForm_request'
-                name:
-                  description: Updated name of the pet
-                  type: string
-                status:
-                  description: Updated status of the pet
-                  type: string
       responses:
         "405":
           content: {}
@@ -285,14 +279,7 @@ paths:
         content:
           multipart/form-data:
             schema:
-              properties:
+              $ref: '#/components/schemas/uploadFile_request'
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                file:
-                  description: file to upload
-                  format: binary
-                  type: string
       responses:
         "200":
           content:
@@ -763,24 +750,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testEnumParameters_request'
-                enum_form_string_array:
-                  description: Form parameter enum test (string array)
-                  items:
-                    default: $
-                    enum:
-                    - '>'
-                    - $
-                    type: string
-                  type: array
-                enum_form_string:
-                  default: -efg
-                  description: Form parameter enum test (string)
-                  enum:
-                  - _abc
-                  - -efg
-                  - (xyz)
-                  type: string
       responses:
         "400":
           content: {}
@@ -827,77 +797,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testEndpointParameters_request'
-                integer:
-                  description: None
-                  format: int32
-                  maximum: 100
-                  minimum: 10
-                  type: integer
-                int32:
-                  description: None
-                  format: int32
-                  maximum: 200
-                  minimum: 20
-                  type: integer
-                int64:
-                  description: None
-                  format: int64
-                  type: integer
-                number:
-                  description: None
-                  maximum: 543.2
-                  minimum: 32.1
-                  type: number
-                float:
-                  description: None
-                  format: float
-                  maximum: 987.6
-                  type: number
-                double:
-                  description: None
-                  format: double
-                  maximum: 123.4
-                  minimum: 67.8
-                  type: number
-                string:
-                  description: None
-                  pattern: "/[a-z]/i"
-                  type: string
-                pattern_without_delimiter:
-                  description: None
-                  pattern: "^[A-Z].*"
-                  type: string
-                byte:
-                  description: None
-                  format: byte
-                  type: string
-                binary:
-                  description: None
-                  format: binary
-                  type: string
-                date:
-                  description: None
-                  format: date
-                  type: string
-                dateTime:
-                  description: None
-                  format: date-time
-                  type: string
-                password:
-                  description: None
-                  format: password
-                  maxLength: 64
-                  minLength: 10
-                  type: string
-                callback:
-                  description: None
-                  type: string
-              required:
-              - byte
-              - double
-              - number
-              - pattern_without_delimiter
         required: true
       responses:
         "400":
@@ -1016,16 +916,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testJsonFormData_request'
-                param:
-                  description: field1
-                  type: string
-                param2:
-                  description: field2
-                  type: string
-              required:
-              - param
-              - param2
         required: true
       responses:
         "200":
@@ -1231,16 +1122,7 @@ paths:
         content:
           multipart/form-data:
             schema:
-              properties:
+              $ref: '#/components/schemas/uploadFileWithRequiredFile_request'
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                requiredFile:
-                  description: file to upload
-                  format: binary
-                  type: string
-              required:
-              - requiredFile
         required: true
       responses:
         "200":
@@ -2147,6 +2029,136 @@ components:
       xml:
         namespace: http://a.com/schema
         prefix: pre
+    updatePetWithForm_request:
+      properties:
+        name:
+          description: Updated name of the pet
+          type: string
+        status:
+          description: Updated status of the pet
+          type: string
+    uploadFile_request:
+      properties:
+        additionalMetadata:
+          description: Additional data to pass to server
+          type: string
+        file:
+          description: file to upload
+          format: binary
+          type: string
+    testEnumParameters_request:
+      properties:
+        enum_form_string_array:
+          description: Form parameter enum test (string array)
+          items:
+            default: $
+            enum:
+            - '>'
+            - $
+            type: string
+          type: array
+        enum_form_string:
+          default: -efg
+          description: Form parameter enum test (string)
+          enum:
+          - _abc
+          - -efg
+          - (xyz)
+          type: string
+    testEndpointParameters_request:
+      properties:
+        integer:
+          description: None
+          format: int32
+          maximum: 100
+          minimum: 10
+          type: integer
+        int32:
+          description: None
+          format: int32
+          maximum: 200
+          minimum: 20
+          type: integer
+        int64:
+          description: None
+          format: int64
+          type: integer
+        number:
+          description: None
+          maximum: 543.2
+          minimum: 32.1
+          type: number
+        float:
+          description: None
+          format: float
+          maximum: 987.6
+          type: number
+        double:
+          description: None
+          format: double
+          maximum: 123.4
+          minimum: 67.8
+          type: number
+        string:
+          description: None
+          pattern: "/[a-z]/i"
+          type: string
+        pattern_without_delimiter:
+          description: None
+          pattern: "^[A-Z].*"
+          type: string
+        byte:
+          description: None
+          format: byte
+          type: string
+        binary:
+          description: None
+          format: binary
+          type: string
+        date:
+          description: None
+          format: date
+          type: string
+        dateTime:
+          description: None
+          format: date-time
+          type: string
+        password:
+          description: None
+          format: password
+          maxLength: 64
+          minLength: 10
+          type: string
+        callback:
+          description: None
+          type: string
+      required:
+      - byte
+      - double
+      - number
+      - pattern_without_delimiter
+    testJsonFormData_request:
+      properties:
+        param:
+          description: field1
+          type: string
+        param2:
+          description: field2
+          type: string
+      required:
+      - param
+      - param2
+    uploadFileWithRequiredFile_request:
+      properties:
+        additionalMetadata:
+          description: Additional data to pass to server
+          type: string
+        requiredFile:
+          description: file to upload
+          format: binary
+          type: string
+      required:
+      - requiredFile
     Dog_allOf:
       properties:
         breed:

samples/client/petstore/java/resttemplate-withXml/api/openapi.yaml

@@ -250,13 +250,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/updatePetWithForm_request'
-                name:
-                  description: Updated name of the pet
-                  type: string
-                status:
-                  description: Updated status of the pet
-                  type: string
       responses:
         "405":
           content: {}
@@ -285,14 +279,7 @@ paths:
         content:
           multipart/form-data:
             schema:
-              properties:
+              $ref: '#/components/schemas/uploadFile_request'
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                file:
-                  description: file to upload
-                  format: binary
-                  type: string
       responses:
         "200":
           content:
@@ -763,24 +750,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testEnumParameters_request'
-                enum_form_string_array:
-                  description: Form parameter enum test (string array)
-                  items:
-                    default: $
-                    enum:
-                    - '>'
-                    - $
-                    type: string
-                  type: array
-                enum_form_string:
-                  default: -efg
-                  description: Form parameter enum test (string)
-                  enum:
-                  - _abc
-                  - -efg
-                  - (xyz)
-                  type: string
       responses:
         "400":
           content: {}
@@ -827,77 +797,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testEndpointParameters_request'
-                integer:
-                  description: None
-                  format: int32
-                  maximum: 100
-                  minimum: 10
-                  type: integer
-                int32:
-                  description: None
-                  format: int32
-                  maximum: 200
-                  minimum: 20
-                  type: integer
-                int64:
-                  description: None
-                  format: int64
-                  type: integer
-                number:
-                  description: None
-                  maximum: 543.2
-                  minimum: 32.1
-                  type: number
-                float:
-                  description: None
-                  format: float
-                  maximum: 987.6
-                  type: number
-                double:
-                  description: None
-                  format: double
-                  maximum: 123.4
-                  minimum: 67.8
-                  type: number
-                string:
-                  description: None
-                  pattern: "/[a-z]/i"
-                  type: string
-                pattern_without_delimiter:
-                  description: None
-                  pattern: "^[A-Z].*"
-                  type: string
-                byte:
-                  description: None
-                  format: byte
-                  type: string
-                binary:
-                  description: None
-                  format: binary
-                  type: string
-                date:
-                  description: None
-                  format: date
-                  type: string
-                dateTime:
-                  description: None
-                  format: date-time
-                  type: string
-                password:
-                  description: None
-                  format: password
-                  maxLength: 64
-                  minLength: 10
-                  type: string
-                callback:
-                  description: None
-                  type: string
-              required:
-              - byte
-              - double
-              - number
-              - pattern_without_delimiter
         required: true
       responses:
         "400":
@@ -1016,16 +916,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testJsonFormData_request'
-                param:
-                  description: field1
-                  type: string
-                param2:
-                  description: field2
-                  type: string
-              required:
-              - param
-              - param2
         required: true
       responses:
         "200":
@@ -1231,16 +1122,7 @@ paths:
         content:
           multipart/form-data:
             schema:
-              properties:
+              $ref: '#/components/schemas/uploadFileWithRequiredFile_request'
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                requiredFile:
-                  description: file to upload
-                  format: binary
-                  type: string
-              required:
-              - requiredFile
         required: true
       responses:
         "200":
@@ -2147,6 +2029,136 @@ components:
       xml:
         namespace: http://a.com/schema
         prefix: pre
+    updatePetWithForm_request:
+      properties:
+        name:
+          description: Updated name of the pet
+          type: string
+        status:
+          description: Updated status of the pet
+          type: string
+    uploadFile_request:
+      properties:
+        additionalMetadata:
+          description: Additional data to pass to server
+          type: string
+        file:
+          description: file to upload
+          format: binary
+          type: string
+    testEnumParameters_request:
+      properties:
+        enum_form_string_array:
+          description: Form parameter enum test (string array)
+          items:
+            default: $
+            enum:
+            - '>'
+            - $
+            type: string
+          type: array
+        enum_form_string:
+          default: -efg
+          description: Form parameter enum test (string)
+          enum:
+          - _abc
+          - -efg
+          - (xyz)
+          type: string
+    testEndpointParameters_request:
+      properties:
+        integer:
+          description: None
+          format: int32
+          maximum: 100
+          minimum: 10
+          type: integer
+        int32:
+          description: None
+          format: int32
+          maximum: 200
+          minimum: 20
+          type: integer
+        int64:
+          description: None
+          format: int64
+          type: integer
+        number:
+          description: None
+          maximum: 543.2
+          minimum: 32.1
+          type: number
+        float:
+          description: None
+          format: float
+          maximum: 987.6
+          type: number
+        double:
+          description: None
+          format: double
+          maximum: 123.4
+          minimum: 67.8
+          type: number
+        string:
+          description: None
+          pattern: "/[a-z]/i"
+          type: string
+        pattern_without_delimiter:
+          description: None
+          pattern: "^[A-Z].*"
+          type: string
+        byte:
+          description: None
+          format: byte
+          type: string
+        binary:
+          description: None
+          format: binary
+          type: string
+        date:
+          description: None
+          format: date
+          type: string
+        dateTime:
+          description: None
+          format: date-time
+          type: string
+        password:
+          description: None
+          format: password
+          maxLength: 64
+          minLength: 10
+          type: string
+        callback:
+          description: None
+          type: string
+      required:
+      - byte
+      - double
+      - number
+      - pattern_without_delimiter
+    testJsonFormData_request:
+      properties:
+        param:
+          description: field1
+          type: string
+        param2:
+          description: field2
+          type: string
+      required:
+      - param
+      - param2
+    uploadFileWithRequiredFile_request:
+      properties:
+        additionalMetadata:
+          description: Additional data to pass to server
+          type: string
+        requiredFile:
+          description: file to upload
+          format: binary
+          type: string
+      required:
+      - requiredFile
     Dog_allOf:
       properties:
         breed:

samples/client/petstore/java/resttemplate/api/openapi.yaml

@@ -250,13 +250,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/updatePetWithForm_request'
-                name:
-                  description: Updated name of the pet
-                  type: string
-                status:
-                  description: Updated status of the pet
-                  type: string
       responses:
         "405":
           content: {}
@@ -285,14 +279,7 @@ paths:
         content:
           multipart/form-data:
             schema:
-              properties:
+              $ref: '#/components/schemas/uploadFile_request'
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                file:
-                  description: file to upload
-                  format: binary
-                  type: string
       responses:
         "200":
           content:
@@ -763,24 +750,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testEnumParameters_request'
-                enum_form_string_array:
-                  description: Form parameter enum test (string array)
-                  items:
-                    default: $
-                    enum:
-                    - '>'
-                    - $
-                    type: string
-                  type: array
-                enum_form_string:
-                  default: -efg
-                  description: Form parameter enum test (string)
-                  enum:
-                  - _abc
-                  - -efg
-                  - (xyz)
-                  type: string
       responses:
         "400":
           content: {}
@@ -827,77 +797,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testEndpointParameters_request'
-                integer:
-                  description: None
-                  format: int32
-                  maximum: 100
-                  minimum: 10
-                  type: integer
-                int32:
-                  description: None
-                  format: int32
-                  maximum: 200
-                  minimum: 20
-                  type: integer
-                int64:
-                  description: None
-                  format: int64
-                  type: integer
-                number:
-                  description: None
-                  maximum: 543.2
-                  minimum: 32.1
-                  type: number
-                float:
-                  description: None
-                  format: float
-                  maximum: 987.6
-                  type: number
-                double:
-                  description: None
-                  format: double
-                  maximum: 123.4
-                  minimum: 67.8
-                  type: number
-                string:
-                  description: None
-                  pattern: "/[a-z]/i"
-                  type: string
-                pattern_without_delimiter:
-                  description: None
-                  pattern: "^[A-Z].*"
-                  type: string
-                byte:
-                  description: None
-                  format: byte
-                  type: string
-                binary:
-                  description: None
-                  format: binary
-                  type: string
-                date:
-                  description: None
-                  format: date
-                  type: string
-                dateTime:
-                  description: None
-                  format: date-time
-                  type: string
-                password:
-                  description: None
-                  format: password
-                  maxLength: 64
-                  minLength: 10
-                  type: string
-                callback:
-                  description: None
-                  type: string
-              required:
-              - byte
-              - double
-              - number
-              - pattern_without_delimiter
         required: true
       responses:
         "400":
@@ -1016,16 +916,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testJsonFormData_request'
-                param:
-                  description: field1
-                  type: string
-                param2:
-                  description: field2
-                  type: string
-              required:
-              - param
-              - param2
         required: true
       responses:
         "200":
@@ -1231,16 +1122,7 @@ paths:
         content:
           multipart/form-data:
             schema:
-              properties:
+              $ref: '#/components/schemas/uploadFileWithRequiredFile_request'
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                requiredFile:
-                  description: file to upload
-                  format: binary
-                  type: string
-              required:
-              - requiredFile
         required: true
       responses:
         "200":
@@ -2147,6 +2029,136 @@ components:
       xml:
         namespace: http://a.com/schema
         prefix: pre
+    updatePetWithForm_request:
+      properties:
+        name:
+          description: Updated name of the pet
+          type: string
+        status:
+          description: Updated status of the pet
+          type: string
+    uploadFile_request:
+      properties:
+        additionalMetadata:
+          description: Additional data to pass to server
+          type: string
+        file:
+          description: file to upload
+          format: binary
+          type: string
+    testEnumParameters_request:
+      properties:
+        enum_form_string_array:
+          description: Form parameter enum test (string array)
+          items:
+            default: $
+            enum:
+            - '>'
+            - $
+            type: string
+          type: array
+        enum_form_string:
+          default: -efg
+          description: Form parameter enum test (string)
+          enum:
+          - _abc
+          - -efg
+          - (xyz)
+          type: string
+    testEndpointParameters_request:
+      properties:
+        integer:
+          description: None
+          format: int32
+          maximum: 100
+          minimum: 10
+          type: integer
+        int32:
+          description: None
+          format: int32
+          maximum: 200
+          minimum: 20
+          type: integer
+        int64:
+          description: None
+          format: int64
+          type: integer
+        number:
+          description: None
+          maximum: 543.2
+          minimum: 32.1
+          type: number
+        float:
+          description: None
+          format: float
+          maximum: 987.6
+          type: number
+        double:
+          description: None
+          format: double
+          maximum: 123.4
+          minimum: 67.8
+          type: number
+        string:
+          description: None
+          pattern: "/[a-z]/i"
+          type: string
+        pattern_without_delimiter:
+          description: None
+          pattern: "^[A-Z].*"
+          type: string
+        byte:
+          description: None
+          format: byte
+          type: string
+        binary:
+          description: None
+          format: binary
+          type: string
+        date:
+          description: None
+          format: date
+          type: string
+        dateTime:
+          description: None
+          format: date-time
+          type: string
+        password:
+          description: None
+          format: password
+          maxLength: 64
+          minLength: 10
+          type: string
+        callback:
+          description: None
+          type: string
+      required:
+      - byte
+      - double
+      - number
+      - pattern_without_delimiter
+    testJsonFormData_request:
+      properties:
+        param:
+          description: field1
+          type: string
+        param2:
+          description: field2
+          type: string
+      required:
+      - param
+      - param2
+    uploadFileWithRequiredFile_request:
+      properties:
+        additionalMetadata:
+          description: Additional data to pass to server
+          type: string
+        requiredFile:
+          description: file to upload
+          format: binary
+          type: string
+      required:
+      - requiredFile
     Dog_allOf:
       properties:
         breed:

samples/client/petstore/java/retrofit2-play26/api/openapi.yaml

@@ -250,13 +250,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/updatePetWithForm_request'
-                name:
-                  description: Updated name of the pet
-                  type: string
-                status:
-                  description: Updated status of the pet
-                  type: string
       responses:
         "405":
           content: {}
@@ -285,14 +279,7 @@ paths:
         content:
           multipart/form-data:
             schema:
-              properties:
+              $ref: '#/components/schemas/uploadFile_request'
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                file:
-                  description: file to upload
-                  format: binary
-                  type: string
       responses:
         "200":
           content:
@@ -763,24 +750,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testEnumParameters_request'
-                enum_form_string_array:
-                  description: Form parameter enum test (string array)
-                  items:
-                    default: $
-                    enum:
-                    - '>'
-                    - $
-                    type: string
-                  type: array
-                enum_form_string:
-                  default: -efg
-                  description: Form parameter enum test (string)
-                  enum:
-                  - _abc
-                  - -efg
-                  - (xyz)
-                  type: string
       responses:
         "400":
           content: {}
@@ -827,77 +797,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testEndpointParameters_request'
-                integer:
-                  description: None
-                  format: int32
-                  maximum: 100
-                  minimum: 10
-                  type: integer
-                int32:
-                  description: None
-                  format: int32
-                  maximum: 200
-                  minimum: 20
-                  type: integer
-                int64:
-                  description: None
-                  format: int64
-                  type: integer
-                number:
-                  description: None
-                  maximum: 543.2
-                  minimum: 32.1
-                  type: number
-                float:
-                  description: None
-                  format: float
-                  maximum: 987.6
-                  type: number
-                double:
-                  description: None
-                  format: double
-                  maximum: 123.4
-                  minimum: 67.8
-                  type: number
-                string:
-                  description: None
-                  pattern: "/[a-z]/i"
-                  type: string
-                pattern_without_delimiter:
-                  description: None
-                  pattern: "^[A-Z].*"
-                  type: string
-                byte:
-                  description: None
-                  format: byte
-                  type: string
-                binary:
-                  description: None
-                  format: binary
-                  type: string
-                date:
-                  description: None
-                  format: date
-                  type: string
-                dateTime:
-                  description: None
-                  format: date-time
-                  type: string
-                password:
-                  description: None
-                  format: password
-                  maxLength: 64
-                  minLength: 10
-                  type: string
-                callback:
-                  description: None
-                  type: string
-              required:
-              - byte
-              - double
-              - number
-              - pattern_without_delimiter
         required: true
       responses:
         "400":
@@ -1016,16 +916,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testJsonFormData_request'
-                param:
-                  description: field1
-                  type: string
-                param2:
-                  description: field2
-                  type: string
-              required:
-              - param
-              - param2
         required: true
       responses:
         "200":
@@ -1231,16 +1122,7 @@ paths:
         content:
           multipart/form-data:
             schema:
-              properties:
+              $ref: '#/components/schemas/uploadFileWithRequiredFile_request'
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                requiredFile:
-                  description: file to upload
-                  format: binary
-                  type: string
-              required:
-              - requiredFile
         required: true
       responses:
         "200":
@@ -2147,6 +2029,136 @@ components:
       xml:
         namespace: http://a.com/schema
         prefix: pre
+    updatePetWithForm_request:
+      properties:
+        name:
+          description: Updated name of the pet
+          type: string
+        status:
+          description: Updated status of the pet
+          type: string
+    uploadFile_request:
+      properties:
+        additionalMetadata:
+          description: Additional data to pass to server
+          type: string
+        file:
+          description: file to upload
+          format: binary
+          type: string
+    testEnumParameters_request:
+      properties:
+        enum_form_string_array:
+          description: Form parameter enum test (string array)
+          items:
+            default: $
+            enum:
+            - '>'
+            - $
+            type: string
+          type: array
+        enum_form_string:
+          default: -efg
+          description: Form parameter enum test (string)
+          enum:
+          - _abc
+          - -efg
+          - (xyz)
+          type: string
+    testEndpointParameters_request:
+      properties:
+        integer:
+          description: None
+          format: int32
+          maximum: 100
+          minimum: 10
+          type: integer
+        int32:
+          description: None
+          format: int32
+          maximum: 200
+          minimum: 20
+          type: integer
+        int64:
+          description: None
+          format: int64
+          type: integer
+        number:
+          description: None
+          maximum: 543.2
+          minimum: 32.1
+          type: number
+        float:
+          description: None
+          format: float
+          maximum: 987.6
+          type: number
+        double:
+          description: None
+          format: double
+          maximum: 123.4
+          minimum: 67.8
+          type: number
+        string:
+          description: None
+          pattern: "/[a-z]/i"
+          type: string
+        pattern_without_delimiter:
+          description: None
+          pattern: "^[A-Z].*"
+          type: string
+        byte:
+          description: None
+          format: byte
+          type: string
+        binary:
+          description: None
+          format: binary
+          type: string
+        date:
+          description: None
+          format: date
+          type: string
+        dateTime:
+          description: None
+          format: date-time
+          type: string
+        password:
+          description: None
+          format: password
+          maxLength: 64
+          minLength: 10
+          type: string
+        callback:
+          description: None
+          type: string
+      required:
+      - byte
+      - double
+      - number
+      - pattern_without_delimiter
+    testJsonFormData_request:
+      properties:
+        param:
+          description: field1
+          type: string
+        param2:
+          description: field2
+          type: string
+      required:
+      - param
+      - param2
+    uploadFileWithRequiredFile_request:
+      properties:
+        additionalMetadata:
+          description: Additional data to pass to server
+          type: string
+        requiredFile:
+          description: file to upload
+          format: binary
+          type: string
+      required:
+      - requiredFile
     Dog_allOf:
       properties:
         breed:

samples/client/petstore/java/retrofit2/api/openapi.yaml

@@ -250,13 +250,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/updatePetWithForm_request'
-                name:
-                  description: Updated name of the pet
-                  type: string
-                status:
-                  description: Updated status of the pet
-                  type: string
       responses:
         "405":
           content: {}
@@ -285,14 +279,7 @@ paths:
         content:
           multipart/form-data:
             schema:
-              properties:
+              $ref: '#/components/schemas/uploadFile_request'
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                file:
-                  description: file to upload
-                  format: binary
-                  type: string
       responses:
         "200":
           content:
@@ -763,24 +750,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testEnumParameters_request'
-                enum_form_string_array:
-                  description: Form parameter enum test (string array)
-                  items:
-                    default: $
-                    enum:
-                    - '>'
-                    - $
-                    type: string
-                  type: array
-                enum_form_string:
-                  default: -efg
-                  description: Form parameter enum test (string)
-                  enum:
-                  - _abc
-                  - -efg
-                  - (xyz)
-                  type: string
       responses:
         "400":
           content: {}
@@ -827,77 +797,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testEndpointParameters_request'
-                integer:
-                  description: None
-                  format: int32
-                  maximum: 100
-                  minimum: 10
-                  type: integer
-                int32:
-                  description: None
-                  format: int32
-                  maximum: 200
-                  minimum: 20
-                  type: integer
-                int64:
-                  description: None
-                  format: int64
-                  type: integer
-                number:
-                  description: None
-                  maximum: 543.2
-                  minimum: 32.1
-                  type: number
-                float:
-                  description: None
-                  format: float
-                  maximum: 987.6
-                  type: number
-                double:
-                  description: None
-                  format: double
-                  maximum: 123.4
-                  minimum: 67.8
-                  type: number
-                string:
-                  description: None
-                  pattern: "/[a-z]/i"
-                  type: string
-                pattern_without_delimiter:
-                  description: None
-                  pattern: "^[A-Z].*"
-                  type: string
-                byte:
-                  description: None
-                  format: byte
-                  type: string
-                binary:
-                  description: None
-                  format: binary
-                  type: string
-                date:
-                  description: None
-                  format: date
-                  type: string
-                dateTime:
-                  description: None
-                  format: date-time
-                  type: string
-                password:
-                  description: None
-                  format: password
-                  maxLength: 64
-                  minLength: 10
-                  type: string
-                callback:
-                  description: None
-                  type: string
-              required:
-              - byte
-              - double
-              - number
-              - pattern_without_delimiter
         required: true
       responses:
         "400":
@@ -1016,16 +916,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testJsonFormData_request'
-                param:
-                  description: field1
-                  type: string
-                param2:
-                  description: field2
-                  type: string
-              required:
-              - param
-              - param2
         required: true
       responses:
         "200":
@@ -1231,16 +1122,7 @@ paths:
         content:
           multipart/form-data:
             schema:
-              properties:
+              $ref: '#/components/schemas/uploadFileWithRequiredFile_request'
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                requiredFile:
-                  description: file to upload
-                  format: binary
-                  type: string
-              required:
-              - requiredFile
         required: true
       responses:
         "200":
@@ -2147,6 +2029,136 @@ components:
       xml:
         namespace: http://a.com/schema
         prefix: pre
+    updatePetWithForm_request:
+      properties:
+        name:
+          description: Updated name of the pet
+          type: string
+        status:
+          description: Updated status of the pet
+          type: string
+    uploadFile_request:
+      properties:
+        additionalMetadata:
+          description: Additional data to pass to server
+          type: string
+        file:
+          description: file to upload
+          format: binary
+          type: string
+    testEnumParameters_request:
+      properties:
+        enum_form_string_array:
+          description: Form parameter enum test (string array)
+          items:
+            default: $
+            enum:
+            - '>'
+            - $
+            type: string
+          type: array
+        enum_form_string:
+          default: -efg
+          description: Form parameter enum test (string)
+          enum:
+          - _abc
+          - -efg
+          - (xyz)
+          type: string
+    testEndpointParameters_request:
+      properties:
+        integer:
+          description: None
+          format: int32
+          maximum: 100
+          minimum: 10
+          type: integer
+        int32:
+          description: None
+          format: int32
+          maximum: 200
+          minimum: 20
+          type: integer
+        int64:
+          description: None
+          format: int64
+          type: integer
+        number:
+          description: None
+          maximum: 543.2
+          minimum: 32.1
+          type: number
+        float:
+          description: None
+          format: float
+          maximum: 987.6
+          type: number
+        double:
+          description: None
+          format: double
+          maximum: 123.4
+          minimum: 67.8
+          type: number
+        string:
+          description: None
+          pattern: "/[a-z]/i"
+          type: string
+        pattern_without_delimiter:
+          description: None
+          pattern: "^[A-Z].*"
+          type: string
+        byte:
+          description: None
+          format: byte
+          type: string
+        binary:
+          description: None
+          format: binary
+          type: string
+        date:
+          description: None
+          format: date
+          type: string
+        dateTime:
+          description: None
+          format: date-time
+          type: string
+        password:
+          description: None
+          format: password
+          maxLength: 64
+          minLength: 10
+          type: string
+        callback:
+          description: None
+          type: string
+      required:
+      - byte
+      - double
+      - number
+      - pattern_without_delimiter
+    testJsonFormData_request:
+      properties:
+        param:
+          description: field1
+          type: string
+        param2:
+          description: field2
+          type: string
+      required:
+      - param
+      - param2
+    uploadFileWithRequiredFile_request:
+      properties:
+        additionalMetadata:
+          description: Additional data to pass to server
+          type: string
+        requiredFile:
+          description: file to upload
+          format: binary
+          type: string
+      required:
+      - requiredFile
     Dog_allOf:
       properties:
         breed:

samples/client/petstore/java/retrofit2rx2/api/openapi.yaml

@@ -250,13 +250,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/updatePetWithForm_request'
-                name:
-                  description: Updated name of the pet
-                  type: string
-                status:
-                  description: Updated status of the pet
-                  type: string
       responses:
         "405":
           content: {}
@@ -285,14 +279,7 @@ paths:
         content:
           multipart/form-data:
             schema:
-              properties:
+              $ref: '#/components/schemas/uploadFile_request'
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                file:
-                  description: file to upload
-                  format: binary
-                  type: string
       responses:
         "200":
           content:
@@ -763,24 +750,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testEnumParameters_request'
-                enum_form_string_array:
-                  description: Form parameter enum test (string array)
-                  items:
-                    default: $
-                    enum:
-                    - '>'
-                    - $
-                    type: string
-                  type: array
-                enum_form_string:
-                  default: -efg
-                  description: Form parameter enum test (string)
-                  enum:
-                  - _abc
-                  - -efg
-                  - (xyz)
-                  type: string
       responses:
         "400":
           content: {}
@@ -827,77 +797,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testEndpointParameters_request'
-                integer:
-                  description: None
-                  format: int32
-                  maximum: 100
-                  minimum: 10
-                  type: integer
-                int32:
-                  description: None
-                  format: int32
-                  maximum: 200
-                  minimum: 20
-                  type: integer
-                int64:
-                  description: None
-                  format: int64
-                  type: integer
-                number:
-                  description: None
-                  maximum: 543.2
-                  minimum: 32.1
-                  type: number
-                float:
-                  description: None
-                  format: float
-                  maximum: 987.6
-                  type: number
-                double:
-                  description: None
-                  format: double
-                  maximum: 123.4
-                  minimum: 67.8
-                  type: number
-                string:
-                  description: None
-                  pattern: "/[a-z]/i"
-                  type: string
-                pattern_without_delimiter:
-                  description: None
-                  pattern: "^[A-Z].*"
-                  type: string
-                byte:
-                  description: None
-                  format: byte
-                  type: string
-                binary:
-                  description: None
-                  format: binary
-                  type: string
-                date:
-                  description: None
-                  format: date
-                  type: string
-                dateTime:
-                  description: None
-                  format: date-time
-                  type: string
-                password:
-                  description: None
-                  format: password
-                  maxLength: 64
-                  minLength: 10
-                  type: string
-                callback:
-                  description: None
-                  type: string
-              required:
-              - byte
-              - double
-              - number
-              - pattern_without_delimiter
         required: true
       responses:
         "400":
@@ -1016,16 +916,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testJsonFormData_request'
-                param:
-                  description: field1
-                  type: string
-                param2:
-                  description: field2
-                  type: string
-              required:
-              - param
-              - param2
         required: true
       responses:
         "200":
@@ -1231,16 +1122,7 @@ paths:
         content:
           multipart/form-data:
             schema:
-              properties:
+              $ref: '#/components/schemas/uploadFileWithRequiredFile_request'
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                requiredFile:
-                  description: file to upload
-                  format: binary
-                  type: string
-              required:
-              - requiredFile
         required: true
       responses:
         "200":
@@ -2147,6 +2029,136 @@ components:
       xml:
         namespace: http://a.com/schema
         prefix: pre
+    updatePetWithForm_request:
+      properties:
+        name:
+          description: Updated name of the pet
+          type: string
+        status:
+          description: Updated status of the pet
+          type: string
+    uploadFile_request:
+      properties:
+        additionalMetadata:
+          description: Additional data to pass to server
+          type: string
+        file:
+          description: file to upload
+          format: binary
+          type: string
+    testEnumParameters_request:
+      properties:
+        enum_form_string_array:
+          description: Form parameter enum test (string array)
+          items:
+            default: $
+            enum:
+            - '>'
+            - $
+            type: string
+          type: array
+        enum_form_string:
+          default: -efg
+          description: Form parameter enum test (string)
+          enum:
+          - _abc
+          - -efg
+          - (xyz)
+          type: string
+    testEndpointParameters_request:
+      properties:
+        integer:
+          description: None
+          format: int32
+          maximum: 100
+          minimum: 10
+          type: integer
+        int32:
+          description: None
+          format: int32
+          maximum: 200
+          minimum: 20
+          type: integer
+        int64:
+          description: None
+          format: int64
+          type: integer
+        number:
+          description: None
+          maximum: 543.2
+          minimum: 32.1
+          type: number
+        float:
+          description: None
+          format: float
+          maximum: 987.6
+          type: number
+        double:
+          description: None
+          format: double
+          maximum: 123.4
+          minimum: 67.8
+          type: number
+        string:
+          description: None
+          pattern: "/[a-z]/i"
+          type: string
+        pattern_without_delimiter:
+          description: None
+          pattern: "^[A-Z].*"
+          type: string
+        byte:
+          description: None
+          format: byte
+          type: string
+        binary:
+          description: None
+          format: binary
+          type: string
+        date:
+          description: None
+          format: date
+          type: string
+        dateTime:
+          description: None
+          format: date-time
+          type: string
+        password:
+          description: None
+          format: password
+          maxLength: 64
+          minLength: 10
+          type: string
+        callback:
+          description: None
+          type: string
+      required:
+      - byte
+      - double
+      - number
+      - pattern_without_delimiter
+    testJsonFormData_request:
+      properties:
+        param:
+          description: field1
+          type: string
+        param2:
+          description: field2
+          type: string
+      required:
+      - param
+      - param2
+    uploadFileWithRequiredFile_request:
+      properties:
+        additionalMetadata:
+          description: Additional data to pass to server
+          type: string
+        requiredFile:
+          description: file to upload
+          format: binary
+          type: string
+      required:
+      - requiredFile
     Dog_allOf:
       properties:
         breed:

samples/client/petstore/java/retrofit2rx3/api/openapi.yaml

@@ -250,13 +250,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/updatePetWithForm_request'
-                name:
-                  description: Updated name of the pet
-                  type: string
-                status:
-                  description: Updated status of the pet
-                  type: string
       responses:
         "405":
           content: {}
@@ -285,14 +279,7 @@ paths:
         content:
           multipart/form-data:
             schema:
-              properties:
+              $ref: '#/components/schemas/uploadFile_request'
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                file:
-                  description: file to upload
-                  format: binary
-                  type: string
       responses:
         "200":
           content:
@@ -763,24 +750,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testEnumParameters_request'
-                enum_form_string_array:
-                  description: Form parameter enum test (string array)
-                  items:
-                    default: $
-                    enum:
-                    - '>'
-                    - $
-                    type: string
-                  type: array
-                enum_form_string:
-                  default: -efg
-                  description: Form parameter enum test (string)
-                  enum:
-                  - _abc
-                  - -efg
-                  - (xyz)
-                  type: string
       responses:
         "400":
           content: {}
@@ -827,77 +797,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testEndpointParameters_request'
-                integer:
-                  description: None
-                  format: int32
-                  maximum: 100
-                  minimum: 10
-                  type: integer
-                int32:
-                  description: None
-                  format: int32
-                  maximum: 200
-                  minimum: 20
-                  type: integer
-                int64:
-                  description: None
-                  format: int64
-                  type: integer
-                number:
-                  description: None
-                  maximum: 543.2
-                  minimum: 32.1
-                  type: number
-                float:
-                  description: None
-                  format: float
-                  maximum: 987.6
-                  type: number
-                double:
-                  description: None
-                  format: double
-                  maximum: 123.4
-                  minimum: 67.8
-                  type: number
-                string:
-                  description: None
-                  pattern: "/[a-z]/i"
-                  type: string
-                pattern_without_delimiter:
-                  description: None
-                  pattern: "^[A-Z].*"
-                  type: string
-                byte:
-                  description: None
-                  format: byte
-                  type: string
-                binary:
-                  description: None
-                  format: binary
-                  type: string
-                date:
-                  description: None
-                  format: date
-                  type: string
-                dateTime:
-                  description: None
-                  format: date-time
-                  type: string
-                password:
-                  description: None
-                  format: password
-                  maxLength: 64
-                  minLength: 10
-                  type: string
-                callback:
-                  description: None
-                  type: string
-              required:
-              - byte
-              - double
-              - number
-              - pattern_without_delimiter
         required: true
       responses:
         "400":
@@ -1016,16 +916,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testJsonFormData_request'
-                param:
-                  description: field1
-                  type: string
-                param2:
-                  description: field2
-                  type: string
-              required:
-              - param
-              - param2
         required: true
       responses:
         "200":
@@ -1231,16 +1122,7 @@ paths:
         content:
           multipart/form-data:
             schema:
-              properties:
+              $ref: '#/components/schemas/uploadFileWithRequiredFile_request'
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                requiredFile:
-                  description: file to upload
-                  format: binary
-                  type: string
-              required:
-              - requiredFile
         required: true
       responses:
         "200":
@@ -2147,6 +2029,136 @@ components:
       xml:
         namespace: http://a.com/schema
         prefix: pre
+    updatePetWithForm_request:
+      properties:
+        name:
+          description: Updated name of the pet
+          type: string
+        status:
+          description: Updated status of the pet
+          type: string
+    uploadFile_request:
+      properties:
+        additionalMetadata:
+          description: Additional data to pass to server
+          type: string
+        file:
+          description: file to upload
+          format: binary
+          type: string
+    testEnumParameters_request:
+      properties:
+        enum_form_string_array:
+          description: Form parameter enum test (string array)
+          items:
+            default: $
+            enum:
+            - '>'
+            - $
+            type: string
+          type: array
+        enum_form_string:
+          default: -efg
+          description: Form parameter enum test (string)
+          enum:
+          - _abc
+          - -efg
+          - (xyz)
+          type: string
+    testEndpointParameters_request:
+      properties:
+        integer:
+          description: None
+          format: int32
+          maximum: 100
+          minimum: 10
+          type: integer
+        int32:
+          description: None
+          format: int32
+          maximum: 200
+          minimum: 20
+          type: integer
+        int64:
+          description: None
+          format: int64
+          type: integer
+        number:
+          description: None
+          maximum: 543.2
+          minimum: 32.1
+          type: number
+        float:
+          description: None
+          format: float
+          maximum: 987.6
+          type: number
+        double:
+          description: None
+          format: double
+          maximum: 123.4
+          minimum: 67.8
+          type: number
+        string:
+          description: None
+          pattern: "/[a-z]/i"
+          type: string
+        pattern_without_delimiter:
+          description: None
+          pattern: "^[A-Z].*"
+          type: string
+        byte:
+          description: None
+          format: byte
+          type: string
+        binary:
+          description: None
+          format: binary
+          type: string
+        date:
+          description: None
+          format: date
+          type: string
+        dateTime:
+          description: None
+          format: date-time
+          type: string
+        password:
+          description: None
+          format: password
+          maxLength: 64
+          minLength: 10
+          type: string
+        callback:
+          description: None
+          type: string
+      required:
+      - byte
+      - double
+      - number
+      - pattern_without_delimiter
+    testJsonFormData_request:
+      properties:
+        param:
+          description: field1
+          type: string
+        param2:
+          description: field2
+          type: string
+      required:
+      - param
+      - param2
+    uploadFileWithRequiredFile_request:
+      properties:
+        additionalMetadata:
+          description: Additional data to pass to server
+          type: string
+        requiredFile:
+          description: file to upload
+          format: binary
+          type: string
+      required:
+      - requiredFile
     Dog_allOf:
       properties:
         breed:

samples/client/petstore/java/vertx-no-nullable/api/openapi.yaml

@@ -250,13 +250,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/updatePetWithForm_request'
-                name:
-                  description: Updated name of the pet
-                  type: string
-                status:
-                  description: Updated status of the pet
-                  type: string
       responses:
         "405":
           content: {}
@@ -285,14 +279,7 @@ paths:
         content:
           multipart/form-data:
             schema:
-              properties:
+              $ref: '#/components/schemas/uploadFile_request'
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                file:
-                  description: file to upload
-                  format: binary
-                  type: string
       responses:
         "200":
           content:
@@ -763,24 +750,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testEnumParameters_request'
-                enum_form_string_array:
-                  description: Form parameter enum test (string array)
-                  items:
-                    default: $
-                    enum:
-                    - '>'
-                    - $
-                    type: string
-                  type: array
-                enum_form_string:
-                  default: -efg
-                  description: Form parameter enum test (string)
-                  enum:
-                  - _abc
-                  - -efg
-                  - (xyz)
-                  type: string
       responses:
         "400":
           content: {}
@@ -827,77 +797,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testEndpointParameters_request'
-                integer:
-                  description: None
-                  format: int32
-                  maximum: 100
-                  minimum: 10
-                  type: integer
-                int32:
-                  description: None
-                  format: int32
-                  maximum: 200
-                  minimum: 20
-                  type: integer
-                int64:
-                  description: None
-                  format: int64
-                  type: integer
-                number:
-                  description: None
-                  maximum: 543.2
-                  minimum: 32.1
-                  type: number
-                float:
-                  description: None
-                  format: float
-                  maximum: 987.6
-                  type: number
-                double:
-                  description: None
-                  format: double
-                  maximum: 123.4
-                  minimum: 67.8
-                  type: number
-                string:
-                  description: None
-                  pattern: "/[a-z]/i"
-                  type: string
-                pattern_without_delimiter:
-                  description: None
-                  pattern: "^[A-Z].*"
-                  type: string
-                byte:
-                  description: None
-                  format: byte
-                  type: string
-                binary:
-                  description: None
-                  format: binary
-                  type: string
-                date:
-                  description: None
-                  format: date
-                  type: string
-                dateTime:
-                  description: None
-                  format: date-time
-                  type: string
-                password:
-                  description: None
-                  format: password
-                  maxLength: 64
-                  minLength: 10
-                  type: string
-                callback:
-                  description: None
-                  type: string
-              required:
-              - byte
-              - double
-              - number
-              - pattern_without_delimiter
         required: true
       responses:
         "400":
@@ -1016,16 +916,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testJsonFormData_request'
-                param:
-                  description: field1
-                  type: string
-                param2:
-                  description: field2
-                  type: string
-              required:
-              - param
-              - param2
         required: true
       responses:
         "200":
@@ -1231,16 +1122,7 @@ paths:
         content:
           multipart/form-data:
             schema:
-              properties:
+              $ref: '#/components/schemas/uploadFileWithRequiredFile_request'
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                requiredFile:
-                  description: file to upload
-                  format: binary
-                  type: string
-              required:
-              - requiredFile
         required: true
       responses:
         "200":
@@ -2147,6 +2029,136 @@ components:
       xml:
         namespace: http://a.com/schema
         prefix: pre
+    updatePetWithForm_request:
+      properties:
+        name:
+          description: Updated name of the pet
+          type: string
+        status:
+          description: Updated status of the pet
+          type: string
+    uploadFile_request:
+      properties:
+        additionalMetadata:
+          description: Additional data to pass to server
+          type: string
+        file:
+          description: file to upload
+          format: binary
+          type: string
+    testEnumParameters_request:
+      properties:
+        enum_form_string_array:
+          description: Form parameter enum test (string array)
+          items:
+            default: $
+            enum:
+            - '>'
+            - $
+            type: string
+          type: array
+        enum_form_string:
+          default: -efg
+          description: Form parameter enum test (string)
+          enum:
+          - _abc
+          - -efg
+          - (xyz)
+          type: string
+    testEndpointParameters_request:
+      properties:
+        integer:
+          description: None
+          format: int32
+          maximum: 100
+          minimum: 10
+          type: integer
+        int32:
+          description: None
+          format: int32
+          maximum: 200
+          minimum: 20
+          type: integer
+        int64:
+          description: None
+          format: int64
+          type: integer
+        number:
+          description: None
+          maximum: 543.2
+          minimum: 32.1
+          type: number
+        float:
+          description: None
+          format: float
+          maximum: 987.6
+          type: number
+        double:
+          description: None
+          format: double
+          maximum: 123.4
+          minimum: 67.8
+          type: number
+        string:
+          description: None
+          pattern: "/[a-z]/i"
+          type: string
+        pattern_without_delimiter:
+          description: None
+          pattern: "^[A-Z].*"
+          type: string
+        byte:
+          description: None
+          format: byte
+          type: string
+        binary:
+          description: None
+          format: binary
+          type: string
+        date:
+          description: None
+          format: date
+          type: string
+        dateTime:
+          description: None
+          format: date-time
+          type: string
+        password:
+          description: None
+          format: password
+          maxLength: 64
+          minLength: 10
+          type: string
+        callback:
+          description: None
+          type: string
+      required:
+      - byte
+      - double
+      - number
+      - pattern_without_delimiter
+    testJsonFormData_request:
+      properties:
+        param:
+          description: field1
+          type: string
+        param2:
+          description: field2
+          type: string
+      required:
+      - param
+      - param2
+    uploadFileWithRequiredFile_request:
+      properties:
+        additionalMetadata:
+          description: Additional data to pass to server
+          type: string
+        requiredFile:
+          description: file to upload
+          format: binary
+          type: string
+      required:
+      - requiredFile
     Dog_allOf:
       properties:
         breed:

samples/client/petstore/java/vertx/api/openapi.yaml

@@ -250,13 +250,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/updatePetWithForm_request'
-                name:
-                  description: Updated name of the pet
-                  type: string
-                status:
-                  description: Updated status of the pet
-                  type: string
       responses:
         "405":
           content: {}
@@ -285,14 +279,7 @@ paths:
         content:
           multipart/form-data:
             schema:
-              properties:
+              $ref: '#/components/schemas/uploadFile_request'
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                file:
-                  description: file to upload
-                  format: binary
-                  type: string
       responses:
         "200":
           content:
@@ -763,24 +750,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testEnumParameters_request'
-                enum_form_string_array:
-                  description: Form parameter enum test (string array)
-                  items:
-                    default: $
-                    enum:
-                    - '>'
-                    - $
-                    type: string
-                  type: array
-                enum_form_string:
-                  default: -efg
-                  description: Form parameter enum test (string)
-                  enum:
-                  - _abc
-                  - -efg
-                  - (xyz)
-                  type: string
       responses:
         "400":
           content: {}
@@ -827,77 +797,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testEndpointParameters_request'
-                integer:
-                  description: None
-                  format: int32
-                  maximum: 100
-                  minimum: 10
-                  type: integer
-                int32:
-                  description: None
-                  format: int32
-                  maximum: 200
-                  minimum: 20
-                  type: integer
-                int64:
-                  description: None
-                  format: int64
-                  type: integer
-                number:
-                  description: None
-                  maximum: 543.2
-                  minimum: 32.1
-                  type: number
-                float:
-                  description: None
-                  format: float
-                  maximum: 987.6
-                  type: number
-                double:
-                  description: None
-                  format: double
-                  maximum: 123.4
-                  minimum: 67.8
-                  type: number
-                string:
-                  description: None
-                  pattern: "/[a-z]/i"
-                  type: string
-                pattern_without_delimiter:
-                  description: None
-                  pattern: "^[A-Z].*"
-                  type: string
-                byte:
-                  description: None
-                  format: byte
-                  type: string
-                binary:
-                  description: None
-                  format: binary
-                  type: string
-                date:
-                  description: None
-                  format: date
-                  type: string
-                dateTime:
-                  description: None
-                  format: date-time
-                  type: string
-                password:
-                  description: None
-                  format: password
-                  maxLength: 64
-                  minLength: 10
-                  type: string
-                callback:
-                  description: None
-                  type: string
-              required:
-              - byte
-              - double
-              - number
-              - pattern_without_delimiter
         required: true
       responses:
         "400":
@@ -1016,16 +916,7 @@ paths:
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testJsonFormData_request'
-                param:
-                  description: field1
-                  type: string
-                param2:
-                  description: field2
-                  type: string
-              required:
-              - param
-              - param2
         required: true
       responses:
         "200":
@@ -1231,16 +1122,7 @@ paths:
         content:
           multipart/form-data:
             schema:
-              properties:
+              $ref: '#/components/schemas/uploadFileWithRequiredFile_request'
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                requiredFile:
-                  description: file to upload
-                  format: binary
-                  type: string
-              required:
-              - requiredFile
         required: true
       responses:
         "200":
@@ -2147,6 +2029,136 @@ components:
       xml:
         namespace: http://a.com/schema
         prefix: pre
+    updatePetWithForm_request:
+      properties:
+        name:
+          description: Updated name of the pet
+          type: string
+        status:
+          description: Updated status of the pet
+          type: string
+    uploadFile_request:
+      properties:
+        additionalMetadata:
+          description: Additional data to pass to server
+          type: string
+        file:
+          description: file to upload
+          format: binary
+          type: string
+    testEnumParameters_request:
+      properties:
+        enum_form_string_array:
+          description: Form parameter enum test (string array)
+          items:
+            default: $
+            enum:
+            - '>'
+            - $
+            type: string
+          type: array
+        enum_form_string:
+          default: -efg
+          description: Form parameter enum test (string)
+          enum:
+          - _abc
+          - -efg
+          - (xyz)
+          type: string
+    testEndpointParameters_request:
+      properties:
+        integer:
+          description: None
+          format: int32
+          maximum: 100
+          minimum: 10
+          type: integer
+        int32:
+          description: None
+          format: int32
+          maximum: 200
+          minimum: 20
+          type: integer
+        int64:
+          description: None
+          format: int64
+          type: integer
+        number:
+          description: None
+          maximum: 543.2
+          minimum: 32.1
+          type: number
+        float:
+          description: None
+          format: float
+          maximum: 987.6
+          type: number
+        double:
+          description: None
+          format: double
+          maximum: 123.4
+          minimum: 67.8
+          type: number
+        string:
+          description: None
+          pattern: "/[a-z]/i"
+          type: string
+        pattern_without_delimiter:
+          description: None
+          pattern: "^[A-Z].*"
+          type: string
+        byte:
+          description: None
+          format: byte
+          type: string
+        binary:
+          description: None
+          format: binary
+          type: string
+        date:
+          description: None
+          format: date
+          type: string
+        dateTime:
+          description: None
+          format: date-time
+          type: string
+        password:
+          description: None
+          format: password
+          maxLength: 64
+          minLength: 10
+          type: string
+        callback:
+          description: None
+          type: string
+      required:
+      - byte
+      - double
+      - number
+      - pattern_without_delimiter
+    testJsonFormData_request:
+      properties:
+        param:
+          description: field1
+          type: string
+        param2:
+          description: field2
+          type: string
+      required:
+      - param
+      - param2
+    uploadFileWithRequiredFile_request:
+      properties:
+        additionalMetadata:
+          description: Additional data to pass to server
+          type: string
+        requiredFile:
+          description: file to upload
+          format: binary
+          type: string
+      required:
+      - requiredFile
     Dog_allOf:
       properties:
         breed:

samples/client/petstore/java/webclient/api/openapi.yaml

@@ -271,18 +271,10 @@ paths:
           type: integer
         style: simple
       requestBody:
-        $ref: '#/components/requestBodies/inline_object'
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/updatePetWithForm_request'
-                name:
-                  description: Updated name of the pet
-                  type: string
-                status:
-                  description: Updated status of the pet
-                  type: string
-              type: object
       responses:
         "200":
           description: Successful operation
@@ -312,19 +304,10 @@ paths:
           type: integer
         style: simple
       requestBody:
-        $ref: '#/components/requestBodies/inline_object_1'
         content:
           multipart/form-data:
             schema:
-              properties:
+              $ref: '#/components/schemas/uploadFile_request'
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                file:
-                  description: file to upload
-                  format: binary
-                  type: string
-              type: object
       responses:
         "200":
           content:
@@ -814,29 +797,10 @@ paths:
           type: array
         style: form
       requestBody:
-        $ref: '#/components/requestBodies/inline_object_2'
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testEnumParameters_request'
-                enum_form_string_array:
-                  description: Form parameter enum test (string array)
-                  items:
-                    default: $
-                    enum:
-                    - '>'
-                    - $
-                    type: string
-                  type: array
-                enum_form_string:
-                  default: -efg
-                  description: Form parameter enum test (string)
-                  enum:
-                  - _abc
-                  - -efg
-                  - (xyz)
-                  type: string
-              type: object
       responses:
         "400":
           description: Invalid request
@@ -872,81 +836,10 @@ paths:
         가짜 엔드 포인트
       operationId: testEndpointParameters
       requestBody:
-        $ref: '#/components/requestBodies/inline_object_3'
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testEndpointParameters_request'
-                integer:
-                  description: None
-                  maximum: 100
-                  minimum: 10
-                  type: integer
-                int32:
-                  description: None
-                  format: int32
-                  maximum: 200
-                  minimum: 20
-                  type: integer
-                int64:
-                  description: None
-                  format: int64
-                  type: integer
-                number:
-                  description: None
-                  maximum: 543.2
-                  minimum: 32.1
-                  type: number
-                float:
-                  description: None
-                  format: float
-                  maximum: 987.6
-                  type: number
-                double:
-                  description: None
-                  format: double
-                  maximum: 123.4
-                  minimum: 67.8
-                  type: number
-                string:
-                  description: None
-                  pattern: "/[a-z]/i"
-                  type: string
-                pattern_without_delimiter:
-                  description: None
-                  pattern: "^[A-Z].*"
-                  type: string
-                byte:
-                  description: None
-                  format: byte
-                  type: string
-                binary:
-                  description: None
-                  format: binary
-                  type: string
-                date:
-                  description: None
-                  format: date
-                  type: string
-                dateTime:
-                  description: None
-                  format: date-time
-                  type: string
-                password:
-                  description: None
-                  format: password
-                  maxLength: 64
-                  minLength: 10
-                  type: string
-                callback:
-                  description: None
-                  type: string
-              required:
-              - byte
-              - double
-              - number
-              - pattern_without_delimiter
-              type: object
       responses:
         "400":
           description: Invalid username supplied
@@ -1074,21 +967,10 @@ paths:
       description: ""
       operationId: testJsonFormData
       requestBody:
-        $ref: '#/components/requestBodies/inline_object_4'
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testJsonFormData_request'
-                param:
-                  description: field1
-                  type: string
-                param2:
-                  description: field2
-                  type: string
-              required:
-              - param
-              - param2
-              type: object
       responses:
         "200":
           description: successful operation
@@ -1287,21 +1169,10 @@ paths:
           type: integer
         style: simple
       requestBody:
-        $ref: '#/components/requestBodies/inline_object_5'
         content:
           multipart/form-data:
             schema:
-              properties:
+              $ref: '#/components/schemas/uploadFileWithRequiredFile_request'
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                requiredFile:
-                  description: file to upload
-                  format: binary
-                  type: string
-              required:
-              - requiredFile
-              type: object
       responses:
         "200":
           content:
@@ -1391,36 +1262,6 @@ components:
             $ref: '#/components/schemas/Pet'
       description: Pet object that needs to be added to the store
       required: true
-    inline_object:
-      content:
-        application/x-www-form-urlencoded:
-          schema:
-            $ref: '#/components/schemas/inline_object'
-    inline_object_1:
-      content:
-        multipart/form-data:
-          schema:
-            $ref: '#/components/schemas/inline_object_1'
-    inline_object_2:
-      content:
-        application/x-www-form-urlencoded:
-          schema:
-            $ref: '#/components/schemas/inline_object_2'
-    inline_object_3:
-      content:
-        application/x-www-form-urlencoded:
-          schema:
-            $ref: '#/components/schemas/inline_object_3'
-    inline_object_4:
-      content:
-        application/x-www-form-urlencoded:
-          schema:
-            $ref: '#/components/schemas/inline_object_4'
-    inline_object_5:
-      content:
-        multipart/form-data:
-          schema:
-            $ref: '#/components/schemas/inline_object_5'
   schemas:
     Foo:
       example:
@@ -2136,7 +1977,7 @@ components:
         string:
           $ref: '#/components/schemas/Foo'
       type: object
-    inline_object:
+    updatePetWithForm_request:
       properties:
         name:
           description: Updated name of the pet
@@ -2145,7 +1986,7 @@ components:
           description: Updated status of the pet
           type: string
       type: object
-    inline_object_1:
+    uploadFile_request:
       properties:
         additionalMetadata:
           description: Additional data to pass to server
@@ -2155,7 +1996,7 @@ components:
           format: binary
           type: string
       type: object
-    inline_object_2:
+    testEnumParameters_request:
       properties:
         enum_form_string_array:
           description: Form parameter enum test (string array)
@@ -2175,7 +2016,7 @@ components:
           - (xyz)
           type: string
       type: object
-    inline_object_3:
+    testEndpointParameters_request:
       properties:
         integer:
           description: None
@@ -2247,7 +2088,7 @@ components:
       - number
       - pattern_without_delimiter
       type: object
-    inline_object_4:
+    testJsonFormData_request:
       properties:
         param:
           description: field1
@@ -2259,7 +2100,7 @@ components:
       - param
       - param2
       type: object
-    inline_object_5:
+    uploadFileWithRequiredFile_request:
       properties:
         additionalMetadata:
           description: Additional data to pass to server

samples/client/petstore/php-dt-modern/.openapi-generator/FILES

@@ -50,13 +50,13 @@ src/App/DTO/FindPetsByTagsParameterData.php
 src/App/DTO/GetOrderByIdParameterData.php
 src/App/DTO/GetPetByIdParameterData.php
 src/App/DTO/GetUserByNameParameterData.php
-src/App/DTO/InlineObject.php
-src/App/DTO/InlineObject1.php
 src/App/DTO/LoginUserParameterData.php
 src/App/DTO/Order.php
 src/App/DTO/Pet.php
 src/App/DTO/Tag.php
 src/App/DTO/UpdatePetWithFormParameterData.php
+src/App/DTO/UpdatePetWithFormRequest.php
 src/App/DTO/UpdateUserParameterData.php
 src/App/DTO/UploadFileParameterData.php
+src/App/DTO/UploadFileRequest.php
 src/App/DTO/User.php

samples/client/petstore/php-dt-modern/src/App/ApiClient.php

@@ -1230,7 +1230,7 @@ class ApiClient extends OAGAC\AbstractApiClient
     /**
      * Updates a pet in the store with form data
      * @param \App\DTO\UpdatePetWithFormParameterData $parameters
-     * @param \App\DTO\InlineObject $requestContent
+     * @param \App\DTO\UpdatePetWithFormRequest $requestContent
      * @param iterable|string[][] $security
      * @param string $requestMediaType
      * @return ResponseInterface
@@ -1239,7 +1239,7 @@ class ApiClient extends OAGAC\AbstractApiClient
      */
     public function updatePetWithFormRaw(
         \App\DTO\UpdatePetWithFormParameterData $parameters,
-        \App\DTO\InlineObject $requestContent,
+        \App\DTO\UpdatePetWithFormRequest $requestContent,
         iterable $security = ['petstore_auth' => ['write:pets', 'read:pets', ]],
         string $requestMediaType = 'application/x-www-form-urlencoded'
     ): ResponseInterface
@@ -1253,7 +1253,7 @@ class ApiClient extends OAGAC\AbstractApiClient
     /**
      * Updates a pet in the store with form data
      * @param \App\DTO\UpdatePetWithFormParameterData $parameters
-     * @param \App\DTO\InlineObject $requestContent
+     * @param \App\DTO\UpdatePetWithFormRequest $requestContent
      * @param iterable|string[][] $security
      * @param string $requestMediaType
      * @return array
@@ -1263,7 +1263,7 @@ class ApiClient extends OAGAC\AbstractApiClient
      */
     public function updatePetWithForm(
         \App\DTO\UpdatePetWithFormParameterData $parameters,
-        \App\DTO\InlineObject $requestContent,
+        \App\DTO\UpdatePetWithFormRequest $requestContent,
         iterable $security = ['petstore_auth' => ['write:pets', 'read:pets', ]],
         string $requestMediaType = 'application/x-www-form-urlencoded'
     ): array
@@ -1283,7 +1283,7 @@ class ApiClient extends OAGAC\AbstractApiClient
     /**
      * Updates a pet in the store with form data
      * @param \App\DTO\UpdatePetWithFormParameterData $parameters
-     * @param \App\DTO\InlineObject $requestContent
+     * @param \App\DTO\UpdatePetWithFormRequest $requestContent
      * @param iterable|string[][] $security
      * @param string $requestMediaType
      * @return mixed
@@ -1294,7 +1294,7 @@ class ApiClient extends OAGAC\AbstractApiClient
      */
     public function updatePetWithFormResult(
         \App\DTO\UpdatePetWithFormParameterData $parameters,
-        \App\DTO\InlineObject $requestContent,
+        \App\DTO\UpdatePetWithFormRequest $requestContent,
         iterable $security = ['petstore_auth' => ['write:pets', 'read:pets', ]],
         string $requestMediaType = 'application/x-www-form-urlencoded'
     ): mixed
@@ -1387,7 +1387,7 @@ class ApiClient extends OAGAC\AbstractApiClient
     /**
      * uploads an image
      * @param \App\DTO\UploadFileParameterData $parameters
-     * @param \App\DTO\InlineObject1 $requestContent
+     * @param \App\DTO\UploadFileRequest $requestContent
      * @param iterable|string[][] $security
      * @param string $requestMediaType
      * @param string $responseMediaType
@@ -1397,7 +1397,7 @@ class ApiClient extends OAGAC\AbstractApiClient
      */
     public function uploadFileRaw(
         \App\DTO\UploadFileParameterData $parameters,
-        \App\DTO\InlineObject1 $requestContent,
+        \App\DTO\UploadFileRequest $requestContent,
         iterable $security = ['petstore_auth' => ['write:pets', 'read:pets', ]],
         string $requestMediaType = 'multipart/form-data',
         string $responseMediaType = 'application/json'
@@ -1413,7 +1413,7 @@ class ApiClient extends OAGAC\AbstractApiClient
     /**
      * uploads an image
      * @param \App\DTO\UploadFileParameterData $parameters
-     * @param \App\DTO\InlineObject1 $requestContent
+     * @param \App\DTO\UploadFileRequest $requestContent
      * @param iterable|string[][] $security
      * @param string $requestMediaType
      * @param string $responseMediaType
@@ -1424,7 +1424,7 @@ class ApiClient extends OAGAC\AbstractApiClient
      */
     public function uploadFile(
         \App\DTO\UploadFileParameterData $parameters,
-        \App\DTO\InlineObject1 $requestContent,
+        \App\DTO\UploadFileRequest $requestContent,
         iterable $security = ['petstore_auth' => ['write:pets', 'read:pets', ]],
         string $requestMediaType = 'multipart/form-data',
         string $responseMediaType = 'application/json'
@@ -1446,7 +1446,7 @@ class ApiClient extends OAGAC\AbstractApiClient
     /**
      * uploads an image
      * @param \App\DTO\UploadFileParameterData $parameters
-     * @param \App\DTO\InlineObject1 $requestContent
+     * @param \App\DTO\UploadFileRequest $requestContent
      * @param iterable|string[][] $security
      * @param string $requestMediaType
      * @param string $responseMediaType
@@ -1458,7 +1458,7 @@ class ApiClient extends OAGAC\AbstractApiClient
      */
     public function uploadFileResult(
         \App\DTO\UploadFileParameterData $parameters,
-        \App\DTO\InlineObject1 $requestContent,
+        \App\DTO\UploadFileRequest $requestContent,
         iterable $security = ['petstore_auth' => ['write:pets', 'read:pets', ]],
         string $requestMediaType = 'multipart/form-data',
         string $responseMediaType = 'application/json'

samples/client/petstore/php-dt-modern/src/App/DTO/UpdatePetWithFormRequest.php

@@ -0,0 +1,24 @@
+<?php
+declare(strict_types=1);
+
+namespace App\DTO;
+
+use Articus\DataTransfer\PhpAttribute as DTA;
+
+class UpdatePetWithFormRequest
+{
+    /**
+     * Updated name of the pet
+     */
+    #[DTA\Data(field: "name", nullable: true)]
+    #[DTA\Validator("Scalar", ["type" => "string"])]
+    public string|null $name = null;
+
+    /**
+     * Updated status of the pet
+     */
+    #[DTA\Data(field: "status", nullable: true)]
+    #[DTA\Validator("Scalar", ["type" => "string"])]
+    public string|null $status = null;
+
+}

samples/client/petstore/php-dt-modern/src/App/DTO/UploadFileRequest.php

@@ -0,0 +1,25 @@
+<?php
+declare(strict_types=1);
+
+namespace App\DTO;
+
+use Articus\DataTransfer\PhpAttribute as DTA;
+
+class UploadFileRequest
+{
+    /**
+     * Additional data to pass to server
+     */
+    #[DTA\Data(field: "additionalMetadata", nullable: true)]
+    #[DTA\Validator("Scalar", ["type" => "string"])]
+    public string|null $additional_metadata = null;
+
+    /**
+     * file to upload
+     */
+    #[DTA\Data(field: "file", nullable: true)]
+    #[DTA\Strategy("Object", ["type" => \SplFileObject::class])]
+    #[DTA\Validator("TypeCompliant", ["type" => \SplFileObject::class])]
+    public \SplFileObject|null $file = null;
+
+}

samples/client/petstore/php-dt/.openapi-generator/FILES

@@ -50,13 +50,13 @@ src/App/DTO/FindPetsByTagsParameterData.php
 src/App/DTO/GetOrderByIdParameterData.php
 src/App/DTO/GetPetByIdParameterData.php
 src/App/DTO/GetUserByNameParameterData.php
-src/App/DTO/InlineObject.php
-src/App/DTO/InlineObject1.php
 src/App/DTO/LoginUserParameterData.php
 src/App/DTO/Order.php
 src/App/DTO/Pet.php
 src/App/DTO/Tag.php
 src/App/DTO/UpdatePetWithFormParameterData.php
+src/App/DTO/UpdatePetWithFormRequest.php
 src/App/DTO/UpdateUserParameterData.php
 src/App/DTO/UploadFileParameterData.php
+src/App/DTO/UploadFileRequest.php
 src/App/DTO/User.php

samples/client/petstore/php-dt/src/App/ApiClient.php

@@ -1230,7 +1230,7 @@ class ApiClient extends OAGAC\AbstractApiClient
     /**
      * Updates a pet in the store with form data
      * @param \App\DTO\UpdatePetWithFormParameterData $parameters
-     * @param \App\DTO\InlineObject $requestContent
+     * @param \App\DTO\UpdatePetWithFormRequest $requestContent
      * @param iterable|string[][] $security
      * @param string $requestMediaType
      * @return ResponseInterface
@@ -1239,7 +1239,7 @@ class ApiClient extends OAGAC\AbstractApiClient
      */
     public function updatePetWithFormRaw(
         \App\DTO\UpdatePetWithFormParameterData $parameters,
-        \App\DTO\InlineObject $requestContent,
+        \App\DTO\UpdatePetWithFormRequest $requestContent,
         iterable $security = ['petstore_auth' => ['write:pets', 'read:pets', ]],
         string $requestMediaType = 'application/x-www-form-urlencoded'
     ): ResponseInterface
@@ -1253,7 +1253,7 @@ class ApiClient extends OAGAC\AbstractApiClient
     /**
      * Updates a pet in the store with form data
      * @param \App\DTO\UpdatePetWithFormParameterData $parameters
-     * @param \App\DTO\InlineObject $requestContent
+     * @param \App\DTO\UpdatePetWithFormRequest $requestContent
      * @param iterable|string[][] $security
      * @param string $requestMediaType
      * @return array
@@ -1263,7 +1263,7 @@ class ApiClient extends OAGAC\AbstractApiClient
      */
     public function updatePetWithForm(
         \App\DTO\UpdatePetWithFormParameterData $parameters,
-        \App\DTO\InlineObject $requestContent,
+        \App\DTO\UpdatePetWithFormRequest $requestContent,
         iterable $security = ['petstore_auth' => ['write:pets', 'read:pets', ]],
         string $requestMediaType = 'application/x-www-form-urlencoded'
     ): array
@@ -1283,7 +1283,7 @@ class ApiClient extends OAGAC\AbstractApiClient
     /**
      * Updates a pet in the store with form data
      * @param \App\DTO\UpdatePetWithFormParameterData $parameters
-     * @param \App\DTO\InlineObject $requestContent
+     * @param \App\DTO\UpdatePetWithFormRequest $requestContent
      * @param iterable|string[][] $security
      * @param string $requestMediaType
      * @return mixed
@@ -1294,7 +1294,7 @@ class ApiClient extends OAGAC\AbstractApiClient
      */
     public function updatePetWithFormResult(
         \App\DTO\UpdatePetWithFormParameterData $parameters,
-        \App\DTO\InlineObject $requestContent,
+        \App\DTO\UpdatePetWithFormRequest $requestContent,
         iterable $security = ['petstore_auth' => ['write:pets', 'read:pets', ]],
         string $requestMediaType = 'application/x-www-form-urlencoded'
     )
@@ -1387,7 +1387,7 @@ class ApiClient extends OAGAC\AbstractApiClient
     /**
      * uploads an image
      * @param \App\DTO\UploadFileParameterData $parameters
-     * @param \App\DTO\InlineObject1 $requestContent
+     * @param \App\DTO\UploadFileRequest $requestContent
      * @param iterable|string[][] $security
      * @param string $requestMediaType
      * @param string $responseMediaType
@@ -1397,7 +1397,7 @@ class ApiClient extends OAGAC\AbstractApiClient
      */
     public function uploadFileRaw(
         \App\DTO\UploadFileParameterData $parameters,
-        \App\DTO\InlineObject1 $requestContent,
+        \App\DTO\UploadFileRequest $requestContent,
         iterable $security = ['petstore_auth' => ['write:pets', 'read:pets', ]],
         string $requestMediaType = 'multipart/form-data',
         string $responseMediaType = 'application/json'
@@ -1413,7 +1413,7 @@ class ApiClient extends OAGAC\AbstractApiClient
     /**
      * uploads an image
      * @param \App\DTO\UploadFileParameterData $parameters
-     * @param \App\DTO\InlineObject1 $requestContent
+     * @param \App\DTO\UploadFileRequest $requestContent
      * @param iterable|string[][] $security
      * @param string $requestMediaType
      * @param string $responseMediaType
@@ -1424,7 +1424,7 @@ class ApiClient extends OAGAC\AbstractApiClient
      */
     public function uploadFile(
         \App\DTO\UploadFileParameterData $parameters,
-        \App\DTO\InlineObject1 $requestContent,
+        \App\DTO\UploadFileRequest $requestContent,
         iterable $security = ['petstore_auth' => ['write:pets', 'read:pets', ]],
         string $requestMediaType = 'multipart/form-data',
         string $responseMediaType = 'application/json'
@@ -1446,7 +1446,7 @@ class ApiClient extends OAGAC\AbstractApiClient
     /**
      * uploads an image
      * @param \App\DTO\UploadFileParameterData $parameters
-     * @param \App\DTO\InlineObject1 $requestContent
+     * @param \App\DTO\UploadFileRequest $requestContent
      * @param iterable|string[][] $security
      * @param string $requestMediaType
      * @param string $responseMediaType
@@ -1458,7 +1458,7 @@ class ApiClient extends OAGAC\AbstractApiClient
      */
     public function uploadFileResult(
         \App\DTO\UploadFileParameterData $parameters,
-        \App\DTO\InlineObject1 $requestContent,
+        \App\DTO\UploadFileRequest $requestContent,
         iterable $security = ['petstore_auth' => ['write:pets', 'read:pets', ]],
         string $requestMediaType = 'multipart/form-data',
         string $responseMediaType = 'application/json'

samples/client/petstore/php-dt/src/App/DTO/UpdatePetWithFormRequest.php

@@ -0,0 +1,28 @@
+<?php
+declare(strict_types=1);
+
+namespace App\DTO;
+
+use Articus\DataTransfer\Annotation as DTA;
+
+/**
+ */
+class UpdatePetWithFormRequest
+{
+    /**
+     * Updated name of the pet
+     * @DTA\Data(field="name", nullable=true)
+     * @DTA\Validator(name="Scalar", options={"type":"string"})
+     * @var string|null
+     */
+    public $name;
+
+    /**
+     * Updated status of the pet
+     * @DTA\Data(field="status", nullable=true)
+     * @DTA\Validator(name="Scalar", options={"type":"string"})
+     * @var string|null
+     */
+    public $status;
+
+}

samples/client/petstore/php-dt/src/App/DTO/UploadFileRequest.php

@@ -0,0 +1,29 @@
+<?php
+declare(strict_types=1);
+
+namespace App\DTO;
+
+use Articus\DataTransfer\Annotation as DTA;
+
+/**
+ */
+class UploadFileRequest
+{
+    /**
+     * Additional data to pass to server
+     * @DTA\Data(field="additionalMetadata", nullable=true)
+     * @DTA\Validator(name="Scalar", options={"type":"string"})
+     * @var string|null
+     */
+    public $additional_metadata;
+
+    /**
+     * file to upload
+     * @DTA\Data(field="file", nullable=true)
+     * @DTA\Strategy(name="Object", options={"type":\SplFileObject::class})
+     * @DTA\Validator(name="TypeCompliant", options={"type":\SplFileObject::class})
+     * @var \SplFileObject|null
+     */
+    public $file;
+
+}

samples/client/petstore/typescript-axios/builds/composed-schemas/api.ts

@@ -117,16 +117,61 @@ export const DogAllOfBreedEnum = {
 
 export type DogAllOfBreedEnum = typeof DogAllOfBreedEnum[keyof typeof DogAllOfBreedEnum];
 
+/**
+ * @type InlineRequest
+ * @export
+ */
+export type InlineRequest = Cat | Dog | any;
+
 /**
  * 
  * @export
- * @interface InlineObject
+ * @interface InlineRequest1
  */
-export interface InlineObject {
+export interface InlineRequest1 {
+    /**
+     * 
+     * @type {number}
+     * @memberof InlineRequest1
+     */
+    'age': number;
+    /**
+     * 
+     * @type {string}
+     * @memberof InlineRequest1
+     */
+    'nickname'?: string;
+    /**
+     * 
+     * @type {string}
+     * @memberof InlineRequest1
+     */
+    'pet_type': InlineRequest1PetTypeEnum;
+    /**
+     * 
+     * @type {boolean}
+     * @memberof InlineRequest1
+     */
+    'hunts'?: boolean;
+}
+
+export const InlineRequest1PetTypeEnum = {
+    Cat: 'Cat',
+    Dog: 'Dog'
+} as const;
+
+export type InlineRequest1PetTypeEnum = typeof InlineRequest1PetTypeEnum[keyof typeof InlineRequest1PetTypeEnum];
+
+/**
+ * 
+ * @export
+ * @interface InlineRequest2
+ */
+export interface InlineRequest2 {
     /**
      * 
      * @type {any}
-     * @memberof InlineObject
+     * @memberof InlineRequest2
      */
     'file'?: any;
 }
@@ -185,11 +230,11 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati
     return {
         /**
          * 
-         * @param {InlineObject} [inlineObject] 
+         * @param {InlineRequest2} [inlineRequest2] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        filePost: async (inlineObject?: InlineObject, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        filePost: async (inlineRequest2?: InlineRequest2, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
             const localVarPath = `/file`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -209,7 +254,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati
             setSearchParams(localVarUrlObj, localVarQueryParameter);
             let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
             localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-            localVarRequestOptions.data = serializeDataIfNeeded(inlineObject, localVarRequestOptions, configuration)
+            localVarRequestOptions.data = serializeDataIfNeeded(inlineRequest2, localVarRequestOptions, configuration)
 
             return {
                 url: toPathString(localVarUrlObj),
@@ -218,11 +263,11 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati
         },
         /**
          * 
-         * @param {PetByAge | PetByType} [petByAgePetByType] 
+         * @param {InlineRequest1} [inlineRequest1] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        petsFilteredPatch: async (petByAgePetByType?: PetByAge | PetByType, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        petsFilteredPatch: async (inlineRequest1?: InlineRequest1, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
             const localVarPath = `/pets-filtered`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -242,7 +287,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati
             setSearchParams(localVarUrlObj, localVarQueryParameter);
             let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
             localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-            localVarRequestOptions.data = serializeDataIfNeeded(petByAgePetByType, localVarRequestOptions, configuration)
+            localVarRequestOptions.data = serializeDataIfNeeded(inlineRequest1, localVarRequestOptions, configuration)
 
             return {
                 url: toPathString(localVarUrlObj),
@@ -251,11 +296,11 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati
         },
         /**
          * 
-         * @param {Cat | Dog} [catDog] 
+         * @param {InlineRequest} [inlineRequest] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        petsPatch: async (catDog?: Cat | Dog, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
+        petsPatch: async (inlineRequest?: InlineRequest, options: AxiosRequestConfig = {}): Promise<RequestArgs> => {
             const localVarPath = `/pets`;
             // use dummy base URL string because the URL constructor only accepts absolute URLs.
             const localVarUrlObj = new URL(localVarPath, DUMMY_BASE_URL);
@@ -275,7 +320,7 @@ export const DefaultApiAxiosParamCreator = function (configuration?: Configurati
             setSearchParams(localVarUrlObj, localVarQueryParameter);
             let headersFromBaseOptions = baseOptions && baseOptions.headers ? baseOptions.headers : {};
             localVarRequestOptions.headers = {...localVarHeaderParameter, ...headersFromBaseOptions, ...options.headers};
-            localVarRequestOptions.data = serializeDataIfNeeded(catDog, localVarRequestOptions, configuration)
+            localVarRequestOptions.data = serializeDataIfNeeded(inlineRequest, localVarRequestOptions, configuration)
 
             return {
                 url: toPathString(localVarUrlObj),
@@ -294,32 +339,32 @@ export const DefaultApiFp = function(configuration?: Configuration) {
     return {
         /**
          * 
-         * @param {InlineObject} [inlineObject] 
+         * @param {InlineRequest2} [inlineRequest2] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async filePost(inlineObject?: InlineObject, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
+        async filePost(inlineRequest2?: InlineRequest2, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.filePost(inlineObject, options);
+            const localVarAxiosArgs = await localVarAxiosParamCreator.filePost(inlineRequest2, options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
         /**
          * 
-         * @param {PetByAge | PetByType} [petByAgePetByType] 
+         * @param {InlineRequest1} [inlineRequest1] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async petsFilteredPatch(petByAgePetByType?: PetByAge | PetByType, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
+        async petsFilteredPatch(inlineRequest1?: InlineRequest1, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.petsFilteredPatch(petByAgePetByType, options);
+            const localVarAxiosArgs = await localVarAxiosParamCreator.petsFilteredPatch(inlineRequest1, options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
         /**
          * 
-         * @param {Cat | Dog} [catDog] 
+         * @param {InlineRequest} [inlineRequest] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        async petsPatch(catDog?: Cat | Dog, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
+        async petsPatch(inlineRequest?: InlineRequest, options?: AxiosRequestConfig): Promise<(axios?: AxiosInstance, basePath?: string) => AxiosPromise<void>> {
-            const localVarAxiosArgs = await localVarAxiosParamCreator.petsPatch(catDog, options);
+            const localVarAxiosArgs = await localVarAxiosParamCreator.petsPatch(inlineRequest, options);
             return createRequestFunction(localVarAxiosArgs, globalAxios, BASE_PATH, configuration);
         },
     }
@@ -334,30 +379,30 @@ export const DefaultApiFactory = function (configuration?: Configuration, basePa
     return {
         /**
          * 
-         * @param {InlineObject} [inlineObject] 
+         * @param {InlineRequest2} [inlineRequest2] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        filePost(inlineObject?: InlineObject, options?: any): AxiosPromise<void> {
+        filePost(inlineRequest2?: InlineRequest2, options?: any): AxiosPromise<void> {
-            return localVarFp.filePost(inlineObject, options).then((request) => request(axios, basePath));
+            return localVarFp.filePost(inlineRequest2, options).then((request) => request(axios, basePath));
         },
         /**
          * 
-         * @param {PetByAge | PetByType} [petByAgePetByType] 
+         * @param {InlineRequest1} [inlineRequest1] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        petsFilteredPatch(petByAgePetByType?: PetByAge | PetByType, options?: any): AxiosPromise<void> {
+        petsFilteredPatch(inlineRequest1?: InlineRequest1, options?: any): AxiosPromise<void> {
-            return localVarFp.petsFilteredPatch(petByAgePetByType, options).then((request) => request(axios, basePath));
+            return localVarFp.petsFilteredPatch(inlineRequest1, options).then((request) => request(axios, basePath));
         },
         /**
          * 
-         * @param {Cat | Dog} [catDog] 
+         * @param {InlineRequest} [inlineRequest] 
          * @param {*} [options] Override http request option.
          * @throws {RequiredError}
          */
-        petsPatch(catDog?: Cat | Dog, options?: any): AxiosPromise<void> {
+        petsPatch(inlineRequest?: InlineRequest, options?: any): AxiosPromise<void> {
-            return localVarFp.petsPatch(catDog, options).then((request) => request(axios, basePath));
+            return localVarFp.petsPatch(inlineRequest, options).then((request) => request(axios, basePath));
         },
     };
 };
@@ -371,35 +416,35 @@ export const DefaultApiFactory = function (configuration?: Configuration, basePa
 export class DefaultApi extends BaseAPI {
     /**
      * 
-     * @param {InlineObject} [inlineObject] 
+     * @param {InlineRequest2} [inlineRequest2] 
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof DefaultApi
      */
-    public filePost(inlineObject?: InlineObject, options?: AxiosRequestConfig) {
+    public filePost(inlineRequest2?: InlineRequest2, options?: AxiosRequestConfig) {
-        return DefaultApiFp(this.configuration).filePost(inlineObject, options).then((request) => request(this.axios, this.basePath));
+        return DefaultApiFp(this.configuration).filePost(inlineRequest2, options).then((request) => request(this.axios, this.basePath));
     }
 
     /**
      * 
-     * @param {PetByAge | PetByType} [petByAgePetByType] 
+     * @param {InlineRequest1} [inlineRequest1] 
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof DefaultApi
      */
-    public petsFilteredPatch(petByAgePetByType?: PetByAge | PetByType, options?: AxiosRequestConfig) {
+    public petsFilteredPatch(inlineRequest1?: InlineRequest1, options?: AxiosRequestConfig) {
-        return DefaultApiFp(this.configuration).petsFilteredPatch(petByAgePetByType, options).then((request) => request(this.axios, this.basePath));
+        return DefaultApiFp(this.configuration).petsFilteredPatch(inlineRequest1, options).then((request) => request(this.axios, this.basePath));
     }
 
     /**
      * 
-     * @param {Cat | Dog} [catDog] 
+     * @param {InlineRequest} [inlineRequest] 
      * @param {*} [options] Override http request option.
      * @throws {RequiredError}
      * @memberof DefaultApi
      */
-    public petsPatch(catDog?: Cat | Dog, options?: AxiosRequestConfig) {
+    public petsPatch(inlineRequest?: InlineRequest, options?: AxiosRequestConfig) {
-        return DefaultApiFp(this.configuration).petsPatch(catDog, options).then((request) => request(this.axios, this.basePath));
+        return DefaultApiFp(this.configuration).petsPatch(inlineRequest, options).then((request) => request(this.axios, this.basePath));
     }
 }
 

samples/client/petstore/typescript-fetch/builds/enum/.openapi-generator/FILES

@@ -2,7 +2,7 @@ apis/DefaultApi.ts
 apis/index.ts
 index.ts
 models/EnumPatternObject.ts
-models/InlineObject.ts
+models/FakeEnumRequestPostInlineRequest.ts
 models/InlineResponse200.ts
 models/NumberEnum.ts
 models/StringEnum.ts

samples/client/petstore/typescript-fetch/builds/enum/apis/DefaultApi.ts

@@ -18,9 +18,9 @@ import {
     EnumPatternObject,
     EnumPatternObjectFromJSON,
     EnumPatternObjectToJSON,
-    InlineObject,
+    FakeEnumRequestPostInlineRequest,
-    InlineObjectFromJSON,
+    FakeEnumRequestPostInlineRequestFromJSON,
-    InlineObjectToJSON,
+    FakeEnumRequestPostInlineRequestToJSON,
     InlineResponse200,
     InlineResponse200FromJSON,
     InlineResponse200ToJSON,
@@ -46,8 +46,8 @@ export interface FakeEnumRequestGetRefRequest {
     nullableNumberEnum?: NumberEnum | null;
 }
 
-export interface FakeEnumRequestPostInlineRequest {
+export interface FakeEnumRequestPostInlineOperationRequest {
-    inlineObject?: InlineObject;
+    fakeEnumRequestPostInlineRequest?: FakeEnumRequestPostInlineRequest;
 }
 
 export interface FakeEnumRequestPostRefRequest {
@@ -141,7 +141,7 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async fakeEnumRequestPostInlineRaw(requestParameters: FakeEnumRequestPostInlineRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<runtime.ApiResponse<InlineObject>> {
+    async fakeEnumRequestPostInlineRaw(requestParameters: FakeEnumRequestPostInlineOperationRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<runtime.ApiResponse<InlineResponse200>> {
         const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
@@ -153,15 +153,15 @@ export class DefaultApi extends runtime.BaseAPI {
             method: 'POST',
             headers: headerParameters,
             query: queryParameters,
-            body: InlineObjectToJSON(requestParameters.inlineObject),
+            body: FakeEnumRequestPostInlineRequestToJSON(requestParameters.fakeEnumRequestPostInlineRequest),
         }, initOverrides);
 
-        return new runtime.JSONApiResponse(response, (jsonValue) => InlineObjectFromJSON(jsonValue));
+        return new runtime.JSONApiResponse(response, (jsonValue) => InlineResponse200FromJSON(jsonValue));
     }
 
     /**
      */
-    async fakeEnumRequestPostInline(requestParameters: FakeEnumRequestPostInlineRequest = {}, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<InlineObject> {
+    async fakeEnumRequestPostInline(requestParameters: FakeEnumRequestPostInlineOperationRequest = {}, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<InlineResponse200> {
         const response = await this.fakeEnumRequestPostInlineRaw(requestParameters, initOverrides);
         return await response.value();
     }

samples/client/petstore/typescript-fetch/builds/enum/models/FakeEnumRequestPostInlineRequest.ts

@@ -0,0 +1,122 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * Enum test
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { exists, mapValues } from '../runtime';
+/**
+ * 
+ * @export
+ * @interface FakeEnumRequestPostInlineRequest
+ */
+export interface FakeEnumRequestPostInlineRequest {
+    /**
+     * 
+     * @type {string}
+     * @memberof FakeEnumRequestPostInlineRequest
+     */
+    stringEnum?: FakeEnumRequestPostInlineRequestStringEnumEnum;
+    /**
+     * 
+     * @type {string}
+     * @memberof FakeEnumRequestPostInlineRequest
+     */
+    nullableStringEnum?: FakeEnumRequestPostInlineRequestNullableStringEnumEnum;
+    /**
+     * 
+     * @type {number}
+     * @memberof FakeEnumRequestPostInlineRequest
+     */
+    numberEnum?: FakeEnumRequestPostInlineRequestNumberEnumEnum;
+    /**
+     * 
+     * @type {number}
+     * @memberof FakeEnumRequestPostInlineRequest
+     */
+    nullableNumberEnum?: FakeEnumRequestPostInlineRequestNullableNumberEnumEnum;
+}
+
+
+/**
+ * @export
+ */
+export const FakeEnumRequestPostInlineRequestStringEnumEnum = {
+    One: 'one',
+    Two: 'two',
+    Three: 'three'
+} as const;
+export type FakeEnumRequestPostInlineRequestStringEnumEnum = typeof FakeEnumRequestPostInlineRequestStringEnumEnum[keyof typeof FakeEnumRequestPostInlineRequestStringEnumEnum];
+
+/**
+ * @export
+ */
+export const FakeEnumRequestPostInlineRequestNullableStringEnumEnum = {
+    One: 'one',
+    Two: 'two',
+    Three: 'three'
+} as const;
+export type FakeEnumRequestPostInlineRequestNullableStringEnumEnum = typeof FakeEnumRequestPostInlineRequestNullableStringEnumEnum[keyof typeof FakeEnumRequestPostInlineRequestNullableStringEnumEnum];
+
+/**
+ * @export
+ */
+export const FakeEnumRequestPostInlineRequestNumberEnumEnum = {
+    NUMBER_1: 1,
+    NUMBER_2: 2,
+    NUMBER_3: 3
+} as const;
+export type FakeEnumRequestPostInlineRequestNumberEnumEnum = typeof FakeEnumRequestPostInlineRequestNumberEnumEnum[keyof typeof FakeEnumRequestPostInlineRequestNumberEnumEnum];
+
+/**
+ * @export
+ */
+export const FakeEnumRequestPostInlineRequestNullableNumberEnumEnum = {
+    NUMBER_1: 1,
+    NUMBER_2: 2,
+    NUMBER_3: 3
+} as const;
+export type FakeEnumRequestPostInlineRequestNullableNumberEnumEnum = typeof FakeEnumRequestPostInlineRequestNullableNumberEnumEnum[keyof typeof FakeEnumRequestPostInlineRequestNullableNumberEnumEnum];
+
+
+export function FakeEnumRequestPostInlineRequestFromJSON(json: any): FakeEnumRequestPostInlineRequest {
+    return FakeEnumRequestPostInlineRequestFromJSONTyped(json, false);
+}
+
+export function FakeEnumRequestPostInlineRequestFromJSONTyped(json: any, ignoreDiscriminator: boolean): FakeEnumRequestPostInlineRequest {
+    if ((json === undefined) || (json === null)) {
+        return json;
+    }
+    return {
+        
+        'stringEnum': !exists(json, 'string-enum') ? undefined : json['string-enum'],
+        'nullableStringEnum': !exists(json, 'nullable-string-enum') ? undefined : json['nullable-string-enum'],
+        'numberEnum': !exists(json, 'number-enum') ? undefined : json['number-enum'],
+        'nullableNumberEnum': !exists(json, 'nullable-number-enum') ? undefined : json['nullable-number-enum'],
+    };
+}
+
+export function FakeEnumRequestPostInlineRequestToJSON(value?: FakeEnumRequestPostInlineRequest | null): any {
+    if (value === undefined) {
+        return undefined;
+    }
+    if (value === null) {
+        return null;
+    }
+    return {
+        
+        'string-enum': value.stringEnum,
+        'nullable-string-enum': value.nullableStringEnum,
+        'number-enum': value.numberEnum,
+        'nullable-number-enum': value.nullableNumberEnum,
+    };
+}
+

samples/client/petstore/typescript-fetch/builds/enum/models/index.ts

@@ -1,7 +1,7 @@
 /* tslint:disable */
 /* eslint-disable */
 export * from './EnumPatternObject';
-export * from './InlineObject';
+export * from './FakeEnumRequestPostInlineRequest';
 export * from './InlineResponse200';
 export * from './NumberEnum';
 export * from './StringEnum';

samples/client/petstore/typescript-fetch/builds/with-string-enums/.openapi-generator/FILES

@@ -2,7 +2,7 @@ apis/DefaultApi.ts
 apis/index.ts
 index.ts
 models/EnumPatternObject.ts
-models/InlineObject.ts
+models/FakeEnumRequestPostInlineRequest.ts
 models/InlineResponse200.ts
 models/NumberEnum.ts
 models/StringEnum.ts

samples/client/petstore/typescript-fetch/builds/with-string-enums/apis/DefaultApi.ts

@@ -18,9 +18,9 @@ import {
     EnumPatternObject,
     EnumPatternObjectFromJSON,
     EnumPatternObjectToJSON,
-    InlineObject,
+    FakeEnumRequestPostInlineRequest,
-    InlineObjectFromJSON,
+    FakeEnumRequestPostInlineRequestFromJSON,
-    InlineObjectToJSON,
+    FakeEnumRequestPostInlineRequestToJSON,
     InlineResponse200,
     InlineResponse200FromJSON,
     InlineResponse200ToJSON,
@@ -46,8 +46,8 @@ export interface FakeEnumRequestGetRefRequest {
     nullableNumberEnum?: NumberEnum | null;
 }
 
-export interface FakeEnumRequestPostInlineRequest {
+export interface FakeEnumRequestPostInlineOperationRequest {
-    inlineObject?: InlineObject;
+    fakeEnumRequestPostInlineRequest?: FakeEnumRequestPostInlineRequest;
 }
 
 export interface FakeEnumRequestPostRefRequest {
@@ -141,7 +141,7 @@ export class DefaultApi extends runtime.BaseAPI {
 
     /**
      */
-    async fakeEnumRequestPostInlineRaw(requestParameters: FakeEnumRequestPostInlineRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<runtime.ApiResponse<InlineObject>> {
+    async fakeEnumRequestPostInlineRaw(requestParameters: FakeEnumRequestPostInlineOperationRequest, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<runtime.ApiResponse<InlineResponse200>> {
         const queryParameters: any = {};
 
         const headerParameters: runtime.HTTPHeaders = {};
@@ -153,15 +153,15 @@ export class DefaultApi extends runtime.BaseAPI {
             method: 'POST',
             headers: headerParameters,
             query: queryParameters,
-            body: InlineObjectToJSON(requestParameters.inlineObject),
+            body: FakeEnumRequestPostInlineRequestToJSON(requestParameters.fakeEnumRequestPostInlineRequest),
         }, initOverrides);
 
-        return new runtime.JSONApiResponse(response, (jsonValue) => InlineObjectFromJSON(jsonValue));
+        return new runtime.JSONApiResponse(response, (jsonValue) => InlineResponse200FromJSON(jsonValue));
     }
 
     /**
      */
-    async fakeEnumRequestPostInline(requestParameters: FakeEnumRequestPostInlineRequest = {}, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<InlineObject> {
+    async fakeEnumRequestPostInline(requestParameters: FakeEnumRequestPostInlineOperationRequest = {}, initOverrides?: RequestInit | runtime.InitOverideFunction): Promise<InlineResponse200> {
         const response = await this.fakeEnumRequestPostInlineRaw(requestParameters, initOverrides);
         return await response.value();
     }

samples/client/petstore/typescript-fetch/builds/with-string-enums/models/FakeEnumRequestPostInlineRequest.ts

@@ -0,0 +1,118 @@
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * Enum test
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * The version of the OpenAPI document: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { exists, mapValues } from '../runtime';
+/**
+ * 
+ * @export
+ * @interface FakeEnumRequestPostInlineRequest
+ */
+export interface FakeEnumRequestPostInlineRequest {
+    /**
+     * 
+     * @type {string}
+     * @memberof FakeEnumRequestPostInlineRequest
+     */
+    stringEnum?: FakeEnumRequestPostInlineRequestStringEnumEnum;
+    /**
+     * 
+     * @type {string}
+     * @memberof FakeEnumRequestPostInlineRequest
+     */
+    nullableStringEnum?: FakeEnumRequestPostInlineRequestNullableStringEnumEnum;
+    /**
+     * 
+     * @type {number}
+     * @memberof FakeEnumRequestPostInlineRequest
+     */
+    numberEnum?: FakeEnumRequestPostInlineRequestNumberEnumEnum;
+    /**
+     * 
+     * @type {number}
+     * @memberof FakeEnumRequestPostInlineRequest
+     */
+    nullableNumberEnum?: FakeEnumRequestPostInlineRequestNullableNumberEnumEnum;
+}
+
+/**
+* @export
+* @enum {string}
+*/
+export enum FakeEnumRequestPostInlineRequestStringEnumEnum {
+    One = 'one',
+    Two = 'two',
+    Three = 'three'
+}
+/**
+* @export
+* @enum {string}
+*/
+export enum FakeEnumRequestPostInlineRequestNullableStringEnumEnum {
+    One = 'one',
+    Two = 'two',
+    Three = 'three'
+}
+/**
+* @export
+* @enum {string}
+*/
+export enum FakeEnumRequestPostInlineRequestNumberEnumEnum {
+    NUMBER_1 = 1,
+    NUMBER_2 = 2,
+    NUMBER_3 = 3
+}
+/**
+* @export
+* @enum {string}
+*/
+export enum FakeEnumRequestPostInlineRequestNullableNumberEnumEnum {
+    NUMBER_1 = 1,
+    NUMBER_2 = 2,
+    NUMBER_3 = 3
+}
+
+
+export function FakeEnumRequestPostInlineRequestFromJSON(json: any): FakeEnumRequestPostInlineRequest {
+    return FakeEnumRequestPostInlineRequestFromJSONTyped(json, false);
+}
+
+export function FakeEnumRequestPostInlineRequestFromJSONTyped(json: any, ignoreDiscriminator: boolean): FakeEnumRequestPostInlineRequest {
+    if ((json === undefined) || (json === null)) {
+        return json;
+    }
+    return {
+        
+        'stringEnum': !exists(json, 'string-enum') ? undefined : json['string-enum'],
+        'nullableStringEnum': !exists(json, 'nullable-string-enum') ? undefined : json['nullable-string-enum'],
+        'numberEnum': !exists(json, 'number-enum') ? undefined : json['number-enum'],
+        'nullableNumberEnum': !exists(json, 'nullable-number-enum') ? undefined : json['nullable-number-enum'],
+    };
+}
+
+export function FakeEnumRequestPostInlineRequestToJSON(value?: FakeEnumRequestPostInlineRequest | null): any {
+    if (value === undefined) {
+        return undefined;
+    }
+    if (value === null) {
+        return null;
+    }
+    return {
+        
+        'string-enum': value.stringEnum,
+        'nullable-string-enum': value.nullableStringEnum,
+        'number-enum': value.numberEnum,
+        'nullable-number-enum': value.nullableNumberEnum,
+    };
+}
+

samples/client/petstore/typescript-fetch/builds/with-string-enums/models/index.ts

@@ -1,7 +1,7 @@
 /* tslint:disable */
 /* eslint-disable */
 export * from './EnumPatternObject';
-export * from './InlineObject';
+export * from './FakeEnumRequestPostInlineRequest';
 export * from './InlineResponse200';
 export * from './NumberEnum';
 export * from './StringEnum';

samples/openapi3/client/petstore/go/go-petstore/api/openapi.yaml

@@ -265,18 +265,10 @@ paths:
           type: integer
         style: simple
       requestBody:
-        $ref: '#/components/requestBodies/inline_object'
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/updatePetWithForm_request'
-                name:
-                  description: Updated name of the pet
-                  type: string
-                status:
-                  description: Updated status of the pet
-                  type: string
-              type: object
       responses:
         "405":
           description: Invalid input
@@ -302,19 +294,10 @@ paths:
           type: integer
         style: simple
       requestBody:
-        $ref: '#/components/requestBodies/inline_object_1'
         content:
           multipart/form-data:
             schema:
-              properties:
+              $ref: '#/components/schemas/uploadFile_request'
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                file:
-                  description: file to upload
-                  format: binary
-                  type: string
-              type: object
       responses:
         "200":
           content:
@@ -773,29 +756,10 @@ paths:
           type: number
         style: form
       requestBody:
-        $ref: '#/components/requestBodies/inline_object_2'
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testEnumParameters_request'
-                enum_form_string_array:
-                  description: Form parameter enum test (string array)
-                  items:
-                    default: $
-                    enum:
-                    - '>'
-                    - $
-                    type: string
-                  type: array
-                enum_form_string:
-                  default: -efg
-                  description: Form parameter enum test (string)
-                  enum:
-                  - _abc
-                  - -efg
-                  - (xyz)
-                  type: string
-              type: object
       responses:
         "400":
           description: Invalid request
@@ -827,81 +791,10 @@ paths:
         가짜 엔드 포인트
       operationId: testEndpointParameters
       requestBody:
-        $ref: '#/components/requestBodies/inline_object_3'
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testEndpointParameters_request'
-                integer:
-                  description: None
-                  maximum: 100
-                  minimum: 10
-                  type: integer
-                int32:
-                  description: None
-                  format: int32
-                  maximum: 200
-                  minimum: 20
-                  type: integer
-                int64:
-                  description: None
-                  format: int64
-                  type: integer
-                number:
-                  description: None
-                  maximum: 543.2
-                  minimum: 32.1
-                  type: number
-                float:
-                  description: None
-                  format: float
-                  maximum: 987.6
-                  type: number
-                double:
-                  description: None
-                  format: double
-                  maximum: 123.4
-                  minimum: 67.8
-                  type: number
-                string:
-                  description: None
-                  pattern: "/[a-z]/i"
-                  type: string
-                pattern_without_delimiter:
-                  description: None
-                  pattern: "^[A-Z].*"
-                  type: string
-                byte:
-                  description: None
-                  format: byte
-                  type: string
-                binary:
-                  description: None
-                  format: binary
-                  type: string
-                date:
-                  description: None
-                  format: date
-                  type: string
-                dateTime:
-                  description: None
-                  format: date-time
-                  type: string
-                password:
-                  description: None
-                  format: password
-                  maxLength: 64
-                  minLength: 10
-                  type: string
-                callback:
-                  description: None
-                  type: string
-              required:
-              - byte
-              - double
-              - number
-              - pattern_without_delimiter
-              type: object
       responses:
         "400":
           description: Invalid username supplied
@@ -997,21 +890,10 @@ paths:
       description: ""
       operationId: testJsonFormData
       requestBody:
-        $ref: '#/components/requestBodies/inline_object_4'
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testJsonFormData_request'
-                param:
-                  description: field1
-                  type: string
-                param2:
-                  description: field2
-                  type: string
-              required:
-              - param
-              - param2
-              type: object
       responses:
         "200":
           description: successful operation
@@ -1198,21 +1080,10 @@ paths:
           type: integer
         style: simple
       requestBody:
-        $ref: '#/components/requestBodies/inline_object_5'
         content:
           multipart/form-data:
             schema:
-              properties:
+              $ref: '#/components/schemas/uploadFileWithRequiredFile_request'
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                requiredFile:
-                  description: file to upload
-                  format: binary
-                  type: string
-              required:
-              - requiredFile
-              type: object
       responses:
         "200":
           content:
@@ -1267,36 +1138,6 @@ components:
             $ref: '#/components/schemas/Pet'
       description: Pet object that needs to be added to the store
       required: true
-    inline_object:
-      content:
-        application/x-www-form-urlencoded:
-          schema:
-            $ref: '#/components/schemas/inline_object'
-    inline_object_1:
-      content:
-        multipart/form-data:
-          schema:
-            $ref: '#/components/schemas/inline_object_1'
-    inline_object_2:
-      content:
-        application/x-www-form-urlencoded:
-          schema:
-            $ref: '#/components/schemas/inline_object_2'
-    inline_object_3:
-      content:
-        application/x-www-form-urlencoded:
-          schema:
-            $ref: '#/components/schemas/inline_object_3'
-    inline_object_4:
-      content:
-        application/x-www-form-urlencoded:
-          schema:
-            $ref: '#/components/schemas/inline_object_4'
-    inline_object_5:
-      content:
-        multipart/form-data:
-          schema:
-            $ref: '#/components/schemas/inline_object_5'
   schemas:
     Foo:
       example:
@@ -2122,7 +1963,7 @@ components:
         string:
           $ref: '#/components/schemas/Foo'
       type: object
-    inline_object:
+    updatePetWithForm_request:
       properties:
         name:
           description: Updated name of the pet
@@ -2131,7 +1972,7 @@ components:
           description: Updated status of the pet
           type: string
       type: object
-    inline_object_1:
+    uploadFile_request:
       properties:
         additionalMetadata:
           description: Additional data to pass to server
@@ -2141,7 +1982,7 @@ components:
           format: binary
           type: string
       type: object
-    inline_object_2:
+    testEnumParameters_request:
       properties:
         enum_form_string_array:
           description: Form parameter enum test (string array)
@@ -2161,7 +2002,7 @@ components:
           - (xyz)
           type: string
       type: object
-    inline_object_3:
+    testEndpointParameters_request:
       properties:
         integer:
           description: None
@@ -2233,7 +2074,7 @@ components:
       - number
       - pattern_without_delimiter
       type: object
-    inline_object_4:
+    testJsonFormData_request:
       properties:
         param:
           description: field1
@@ -2245,7 +2086,7 @@ components:
       - param
       - param2
       type: object
-    inline_object_5:
+    uploadFileWithRequiredFile_request:
       properties:
         additionalMetadata:
           description: Additional data to pass to server

samples/openapi3/client/petstore/java/jersey2-java8/api/openapi.yaml

@@ -262,18 +262,10 @@ paths:
           type: integer
         style: simple
       requestBody:
-        $ref: '#/components/requestBodies/inline_object'
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/updatePetWithForm_request'
-                name:
-                  description: Updated name of the pet
-                  type: string
-                status:
-                  description: Updated status of the pet
-                  type: string
-              type: object
       responses:
         "405":
           description: Invalid input
@@ -301,19 +293,10 @@ paths:
           type: integer
         style: simple
       requestBody:
-        $ref: '#/components/requestBodies/inline_object_1'
         content:
           multipart/form-data:
             schema:
-              properties:
+              $ref: '#/components/schemas/uploadFile_request'
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                file:
-                  description: file to upload
-                  format: binary
-                  type: string
-              type: object
       responses:
         "200":
           content:
@@ -794,29 +777,10 @@ paths:
           type: number
         style: form
       requestBody:
-        $ref: '#/components/requestBodies/inline_object_2'
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testEnumParameters_request'
-                enum_form_string_array:
-                  description: Form parameter enum test (string array)
-                  items:
-                    default: $
-                    enum:
-                    - '>'
-                    - $
-                    type: string
-                  type: array
-                enum_form_string:
-                  default: -efg
-                  description: Form parameter enum test (string)
-                  enum:
-                  - _abc
-                  - -efg
-                  - (xyz)
-                  type: string
-              type: object
       responses:
         "400":
           description: Invalid request
@@ -852,83 +816,10 @@ paths:
         가짜 엔드 포인트
       operationId: testEndpointParameters
       requestBody:
-        $ref: '#/components/requestBodies/inline_object_3'
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testEndpointParameters_request'
-                integer:
-                  description: None
-                  maximum: 100
-                  minimum: 10
-                  type: integer
-                int32:
-                  description: None
-                  format: int32
-                  maximum: 200
-                  minimum: 20
-                  type: integer
-                int64:
-                  description: None
-                  format: int64
-                  type: integer
-                number:
-                  description: None
-                  maximum: 543.2
-                  minimum: 32.1
-                  type: number
-                float:
-                  description: None
-                  format: float
-                  maximum: 987.6
-                  type: number
-                double:
-                  description: None
-                  format: double
-                  maximum: 123.4
-                  minimum: 67.8
-                  type: number
-                string:
-                  description: None
-                  pattern: "/[a-z]/i"
-                  type: string
-                pattern_without_delimiter:
-                  description: None
-                  pattern: "^[A-Z].*"
-                  type: string
-                byte:
-                  description: None
-                  format: byte
-                  type: string
-                binary:
-                  description: None
-                  format: binary
-                  type: string
-                date:
-                  description: None
-                  format: date
-                  type: string
-                dateTime:
-                  default: 2010-02-01T10:20:10.11111+01:00
-                  description: None
-                  example: 2020-02-02T20:20:20.22222Z
-                  format: date-time
-                  type: string
-                password:
-                  description: None
-                  format: password
-                  maxLength: 64
-                  minLength: 10
-                  type: string
-                callback:
-                  description: None
-                  type: string
-              required:
-              - byte
-              - double
-              - number
-              - pattern_without_delimiter
-              type: object
       responses:
         "400":
           description: Invalid username supplied
@@ -1034,21 +925,10 @@ paths:
       description: ""
       operationId: testJsonFormData
       requestBody:
-        $ref: '#/components/requestBodies/inline_object_4'
         content:
           application/x-www-form-urlencoded:
             schema:
-              properties:
+              $ref: '#/components/schemas/testJsonFormData_request'
-                param:
-                  description: field1
-                  type: string
-                param2:
-                  description: field2
-                  type: string
-              required:
-              - param
-              - param2
-              type: object
       responses:
         "200":
           description: successful operation
@@ -1209,21 +1089,10 @@ paths:
           type: integer
         style: simple
       requestBody:
-        $ref: '#/components/requestBodies/inline_object_5'
         content:
           multipart/form-data:
             schema:
-              properties:
+              $ref: '#/components/schemas/uploadFileWithRequiredFile_request'
-                additionalMetadata:
-                  description: Additional data to pass to server
-                  type: string
-                requiredFile:
-                  description: file to upload
-                  format: binary
-                  type: string
-              required:
-              - requiredFile
-              type: object
       responses:
         "200":
           content:
@@ -1302,36 +1171,6 @@ components:
             $ref: '#/components/schemas/Pet'
       description: Pet object that needs to be added to the store
       required: true
-    inline_object:
-      content:
-        application/x-www-form-urlencoded:
-          schema:
-            $ref: '#/components/schemas/inline_object'
-    inline_object_1:
-      content:
-        multipart/form-data:
-          schema:
-            $ref: '#/components/schemas/inline_object_1'
-    inline_object_2:
-      content:
-        application/x-www-form-urlencoded:
-          schema:
-            $ref: '#/components/schemas/inline_object_2'
-    inline_object_3:
-      content:
-        application/x-www-form-urlencoded:
-          schema:
-            $ref: '#/components/schemas/inline_object_3'
-    inline_object_4:
-      content:
-        application/x-www-form-urlencoded:
-          schema:
-            $ref: '#/components/schemas/inline_object_4'
-    inline_object_5:
-      content:
-        multipart/form-data:
-          schema:
-            $ref: '#/components/schemas/inline_object_5'
   schemas:
     Foo:
       example:
@@ -2305,7 +2144,7 @@ components:
         string:
           $ref: '#/components/schemas/Foo'
       type: object
-    inline_object:
+    updatePetWithForm_request:
       properties:
         name:
           description: Updated name of the pet
@@ -2314,7 +2153,7 @@ components:
           description: Updated status of the pet
           type: string
       type: object
-    inline_object_1:
+    uploadFile_request:
       properties:
         additionalMetadata:
           description: Additional data to pass to server
@@ -2324,7 +2163,7 @@ components:
           format: binary
           type: string
       type: object
-    inline_object_2:
+    testEnumParameters_request:
       properties:
         enum_form_string_array:
           description: Form parameter enum test (string array)
@@ -2344,7 +2183,7 @@ components:
           - (xyz)
           type: string
       type: object
-    inline_object_3:
+    testEndpointParameters_request:
       properties:
         integer:
           description: None
@@ -2418,7 +2257,7 @@ components:
       - number
       - pattern_without_delimiter
       type: object
-    inline_object_4:
+    testJsonFormData_request:
       properties:
         param:
           description: field1
@@ -2430,7 +2269,7 @@ components:
       - param
       - param2
       type: object
-    inline_object_5:
+    uploadFileWithRequiredFile_request:
       properties:
         additionalMetadata:
           description: Additional data to pass to server

samples/openapi3/client/petstore/python/.openapi-generator/FILES

@@ -41,7 +41,6 @@ docs/EnumTest.md
 docs/EquilateralTriangle.md
 docs/FakeApi.md
 docs/FakeClassnameTags123Api.md
-docs/FakePostInlineAdditionalPropertiesPayloadArrayData.md
 docs/File.md
 docs/FileSchemaTestClass.md
 docs/Foo.md
@@ -55,7 +54,6 @@ docs/GrandparentAnimal.md
 docs/HasOnlyReadOnly.md
 docs/HealthCheckResult.md
 docs/InlineAdditionalPropertiesRefPayload.md
-docs/InlineObject6.md
 docs/InlineResponseDefault.md
 docs/IntegerEnum.md
 docs/IntegerEnumOneValue.md
@@ -82,6 +80,8 @@ docs/ParentPet.md
 docs/Pet.md
 docs/PetApi.md
 docs/Pig.md
+docs/PostInlineAdditionalPropertiesPayloadRequest.md
+docs/PostInlineAdditionalPropertiesPayloadRequestArrayDataInner.md
 docs/Quadrilateral.md
 docs/QuadrilateralInterface.md
 docs/ReadOnlyFirst.md
@@ -155,7 +155,6 @@ petstore_api/model/enum_arrays.py
 petstore_api/model/enum_class.py
 petstore_api/model/enum_test.py
 petstore_api/model/equilateral_triangle.py
-petstore_api/model/fake_post_inline_additional_properties_payload_array_data.py
 petstore_api/model/file.py
 petstore_api/model/file_schema_test_class.py
 petstore_api/model/foo.py
@@ -169,7 +168,6 @@ petstore_api/model/grandparent_animal.py
 petstore_api/model/has_only_read_only.py
 petstore_api/model/health_check_result.py
 petstore_api/model/inline_additional_properties_ref_payload.py
-petstore_api/model/inline_object6.py
 petstore_api/model/inline_response_default.py
 petstore_api/model/integer_enum.py
 petstore_api/model/integer_enum_one_value.py
@@ -195,6 +193,8 @@ petstore_api/model/order.py
 petstore_api/model/parent_pet.py
 petstore_api/model/pet.py
 petstore_api/model/pig.py
+petstore_api/model/post_inline_additional_properties_payload_request.py
+petstore_api/model/post_inline_additional_properties_payload_request_array_data_inner.py
 petstore_api/model/quadrilateral.py
 petstore_api/model/quadrilateral_interface.py
 petstore_api/model/read_only_first.py

samples/openapi3/client/petstore/python/README.md

@@ -170,7 +170,6 @@ Class | Method | HTTP request | Description
  - [EnumClass](docs/EnumClass.md)
  - [EnumTest](docs/EnumTest.md)
  - [EquilateralTriangle](docs/EquilateralTriangle.md)
- - [FakePostInlineAdditionalPropertiesPayloadArrayData](docs/FakePostInlineAdditionalPropertiesPayloadArrayData.md)
  - [File](docs/File.md)
  - [FileSchemaTestClass](docs/FileSchemaTestClass.md)
  - [Foo](docs/Foo.md)
@@ -184,7 +183,6 @@ Class | Method | HTTP request | Description
  - [HasOnlyReadOnly](docs/HasOnlyReadOnly.md)
  - [HealthCheckResult](docs/HealthCheckResult.md)
  - [InlineAdditionalPropertiesRefPayload](docs/InlineAdditionalPropertiesRefPayload.md)
- - [InlineObject6](docs/InlineObject6.md)
  - [InlineResponseDefault](docs/InlineResponseDefault.md)
  - [IntegerEnum](docs/IntegerEnum.md)
  - [IntegerEnumOneValue](docs/IntegerEnumOneValue.md)
@@ -210,6 +208,8 @@ Class | Method | HTTP request | Description
  - [ParentPet](docs/ParentPet.md)
  - [Pet](docs/Pet.md)
  - [Pig](docs/Pig.md)
+ - [PostInlineAdditionalPropertiesPayloadRequest](docs/PostInlineAdditionalPropertiesPayloadRequest.md)
+ - [PostInlineAdditionalPropertiesPayloadRequestArrayDataInner](docs/PostInlineAdditionalPropertiesPayloadRequestArrayDataInner.md)
  - [Quadrilateral](docs/Quadrilateral.md)
  - [QuadrilateralInterface](docs/QuadrilateralInterface.md)
  - [ReadOnlyFirst](docs/ReadOnlyFirst.md)

samples/openapi3/client/petstore/python/docs/FakeApi.md

@@ -788,7 +788,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **post_inline_additional_properties_payload**
-> InlineObject6 post_inline_additional_properties_payload()
+> PostInlineAdditionalPropertiesPayloadRequest post_inline_additional_properties_payload()
 
 
 
@@ -799,7 +799,7 @@ No authorization required
 import time
 import petstore_api
 from petstore_api.api import fake_api
-from petstore_api.model.inline_object6 import InlineObject6
+from petstore_api.model.post_inline_additional_properties_payload_request import PostInlineAdditionalPropertiesPayloadRequest
 from pprint import pprint
 # Defining the host is optional and defaults to http://petstore.swagger.io:80/v2
 # See configuration.py for a list of all supported configuration parameters.
@@ -812,20 +812,20 @@ configuration = petstore_api.Configuration(
 with petstore_api.ApiClient() as api_client:
     # Create an instance of the API class
     api_instance = fake_api.FakeApi(api_client)
-    inline_object6 = InlineObject6(
+    post_inline_additional_properties_payload_request = PostInlineAdditionalPropertiesPayloadRequest(
         array_data=[
-            FakePostInlineAdditionalPropertiesPayloadArrayData(
+            PostInlineAdditionalPropertiesPayloadRequestArrayDataInner(
                 labels=[
                     "labels_example",
                 ],
             ),
         ],
-    ) # InlineObject6 |  (optional)
+    ) # PostInlineAdditionalPropertiesPayloadRequest |  (optional)
 
     # example passing only required values which don't have defaults set
     # and optional values
     try:
-        api_response = api_instance.post_inline_additional_properties_payload(inline_object6=inline_object6)
+        api_response = api_instance.post_inline_additional_properties_payload(post_inline_additional_properties_payload_request=post_inline_additional_properties_payload_request)
         pprint(api_response)
     except petstore_api.ApiException as e:
         print("Exception when calling FakeApi->post_inline_additional_properties_payload: %s\n" % e)
@@ -836,11 +836,11 @@ with petstore_api.ApiClient() as api_client:
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **inline_object6** | [**InlineObject6**](InlineObject6.md)|  | [optional]
+ **post_inline_additional_properties_payload_request** | [**PostInlineAdditionalPropertiesPayloadRequest**](PostInlineAdditionalPropertiesPayloadRequest.md)|  | [optional]
 
 ### Return type
 
-[**InlineObject6**](InlineObject6.md)
+[**PostInlineAdditionalPropertiesPayloadRequest**](PostInlineAdditionalPropertiesPayloadRequest.md)
 
 ### Authorization
 
@@ -887,7 +887,7 @@ with petstore_api.ApiClient() as api_client:
     api_instance = fake_api.FakeApi(api_client)
     inline_additional_properties_ref_payload = InlineAdditionalPropertiesRefPayload(
         array_data=[
-            FakePostInlineAdditionalPropertiesPayloadArrayData(
+            PostInlineAdditionalPropertiesPayloadRequestArrayDataInner(
                 labels=[
                     "labels_example",
                 ],

samples/openapi3/client/petstore/python/docs/InlineAdditionalPropertiesRefPayload.md

@@ -5,7 +5,7 @@ this payload is used for verification that some model_to_dict issues are fixed
 ## Properties
 Name | Type | Description | Notes
 ------------ | ------------- | ------------- | -------------
-**array_data** | [**[FakePostInlineAdditionalPropertiesPayloadArrayData], none_type**](FakePostInlineAdditionalPropertiesPayloadArrayData.md) |  | [optional] 
+**array_data** | [**[PostInlineAdditionalPropertiesPayloadRequestArrayDataInner], none_type**](PostInlineAdditionalPropertiesPayloadRequestArrayDataInner.md) |  | [optional] 
 **any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
 
 [[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)

samples/openapi3/client/petstore/python/docs/PostInlineAdditionalPropertiesPayloadRequest.md

@@ -0,0 +1,13 @@
+# PostInlineAdditionalPropertiesPayloadRequest
+
+this payload is used for verification that some model_to_dict issues are fixed
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**array_data** | [**[PostInlineAdditionalPropertiesPayloadRequestArrayDataInner], none_type**](PostInlineAdditionalPropertiesPayloadRequestArrayDataInner.md) |  | [optional] 
+**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+

samples/openapi3/client/petstore/python/docs/PostInlineAdditionalPropertiesPayloadRequestArrayDataInner.md

@@ -0,0 +1,12 @@
+# PostInlineAdditionalPropertiesPayloadRequestArrayDataInner
+
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**labels** | **[str, none_type]** |  | [optional] 
+**any string name** | **bool, date, datetime, dict, float, int, list, str, none_type** | any string name can be used but the value must be the correct type | [optional]
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+

samples/openapi3/client/petstore/python/petstore_api/api/fake_api.py

@@ -32,10 +32,10 @@ from petstore_api.model.file_schema_test_class import FileSchemaTestClass
 from petstore_api.model.gm_fruit_no_properties import GmFruitNoProperties
 from petstore_api.model.health_check_result import HealthCheckResult
 from petstore_api.model.inline_additional_properties_ref_payload import InlineAdditionalPropertiesRefPayload
-from petstore_api.model.inline_object6 import InlineObject6
 from petstore_api.model.mammal import Mammal
 from petstore_api.model.number_with_validations import NumberWithValidations
 from petstore_api.model.object_model_with_ref_props import ObjectModelWithRefProps
+from petstore_api.model.post_inline_additional_properties_payload_request import PostInlineAdditionalPropertiesPayloadRequest
 from petstore_api.model.string_enum import StringEnum
 from petstore_api.model.user import User
 
@@ -583,7 +583,7 @@ class FakeApi(object):
         )
         self.post_inline_additional_properties_payload_endpoint = _Endpoint(
             settings={
-                'response_type': (InlineObject6,),
+                'response_type': (PostInlineAdditionalPropertiesPayloadRequest,),
                 'auth': [],
                 'endpoint_path': '/fake/postInlineAdditionalPropertiesPayload',
                 'operation_id': 'post_inline_additional_properties_payload',
@@ -592,7 +592,7 @@ class FakeApi(object):
             },
             params_map={
                 'all': [
-                    'inline_object6',
+                    'post_inline_additional_properties_payload_request',
                 ],
                 'required': [],
                 'nullable': [
@@ -608,13 +608,13 @@ class FakeApi(object):
                 'allowed_values': {
                 },
                 'openapi_types': {
-                    'inline_object6':
+                    'post_inline_additional_properties_payload_request':
-                        (InlineObject6,),
+                        (PostInlineAdditionalPropertiesPayloadRequest,),
                 },
                 'attribute_map': {
                 },
                 'location_map': {
-                    'inline_object6': 'body',
+                    'post_inline_additional_properties_payload_request': 'body',
                 },
                 'collection_format_map': {
                 }
@@ -2575,7 +2575,7 @@ class FakeApi(object):
 
 
         Keyword Args:
-            inline_object6 (InlineObject6): [optional]
+            post_inline_additional_properties_payload_request (PostInlineAdditionalPropertiesPayloadRequest): [optional]
             _return_http_data_only (bool): response data without head status
                 code and headers. Default is True.
             _preload_content (bool): if False, the urllib3.HTTPResponse object
@@ -2608,7 +2608,7 @@ class FakeApi(object):
             async_req (bool): execute request asynchronously
 
         Returns:
-            InlineObject6
+            PostInlineAdditionalPropertiesPayloadRequest
                 If the method is called asynchronously, returns the request
                 thread.
         """

samples/openapi3/client/petstore/python/petstore_api/model/inline_additional_properties_ref_payload.py

@@ -30,8 +30,8 @@ from petstore_api.exceptions import ApiAttributeError
 
 
 def lazy_import():
-    from petstore_api.model.fake_post_inline_additional_properties_payload_array_data import FakePostInlineAdditionalPropertiesPayloadArrayData
+    from petstore_api.model.post_inline_additional_properties_payload_request_array_data_inner import PostInlineAdditionalPropertiesPayloadRequestArrayDataInner
-    globals()['FakePostInlineAdditionalPropertiesPayloadArrayData'] = FakePostInlineAdditionalPropertiesPayloadArrayData
+    globals()['PostInlineAdditionalPropertiesPayloadRequestArrayDataInner'] = PostInlineAdditionalPropertiesPayloadRequestArrayDataInner
 
 
 class InlineAdditionalPropertiesRefPayload(ModelNormal):
@@ -87,7 +87,7 @@ class InlineAdditionalPropertiesRefPayload(ModelNormal):
         """
         lazy_import()
         return {
-            'array_data': ([FakePostInlineAdditionalPropertiesPayloadArrayData], none_type,),  # noqa: E501
+            'array_data': ([PostInlineAdditionalPropertiesPayloadRequestArrayDataInner], none_type,),  # noqa: E501
         }
 
     @cached_property
@@ -140,7 +140,7 @@ class InlineAdditionalPropertiesRefPayload(ModelNormal):
                                 Animal class but this time we won't travel
                                 through its discriminator because we passed in
                                 _visited_composed_classes = (Animal,)
-            array_data ([FakePostInlineAdditionalPropertiesPayloadArrayData], none_type): [optional]  # noqa: E501
+            array_data ([PostInlineAdditionalPropertiesPayloadRequestArrayDataInner], none_type): [optional]  # noqa: E501
         """
 
         _check_type = kwargs.pop('_check_type', True)
@@ -226,7 +226,7 @@ class InlineAdditionalPropertiesRefPayload(ModelNormal):
                                 Animal class but this time we won't travel
                                 through its discriminator because we passed in
                                 _visited_composed_classes = (Animal,)
-            array_data ([FakePostInlineAdditionalPropertiesPayloadArrayData], none_type): [optional]  # noqa: E501
+            array_data ([PostInlineAdditionalPropertiesPayloadRequestArrayDataInner], none_type): [optional]  # noqa: E501
         """
 
         _check_type = kwargs.pop('_check_type', True)

samples/openapi3/client/petstore/python/petstore_api/model/post_inline_additional_properties_payload_request.py

@@ -0,0 +1,269 @@
+"""
+    OpenAPI Petstore
+
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
+
+    The version of the OpenAPI document: 1.0.0
+    Generated by: https://openapi-generator.tech
+"""
+
+
+import re  # noqa: F401
+import sys  # noqa: F401
+
+from petstore_api.model_utils import (  # noqa: F401
+    ApiTypeError,
+    ModelComposed,
+    ModelNormal,
+    ModelSimple,
+    cached_property,
+    change_keys_js_to_python,
+    convert_js_args_to_python_args,
+    date,
+    datetime,
+    file_type,
+    none_type,
+    validate_get_composed_info,
+    OpenApiModel
+)
+from petstore_api.exceptions import ApiAttributeError
+
+
+def lazy_import():
+    from petstore_api.model.post_inline_additional_properties_payload_request_array_data_inner import PostInlineAdditionalPropertiesPayloadRequestArrayDataInner
+    globals()['PostInlineAdditionalPropertiesPayloadRequestArrayDataInner'] = PostInlineAdditionalPropertiesPayloadRequestArrayDataInner
+
+
+class PostInlineAdditionalPropertiesPayloadRequest(ModelNormal):
+    """NOTE: This class is auto generated by OpenAPI Generator.
+    Ref: https://openapi-generator.tech
+
+    Do not edit the class manually.
+
+    Attributes:
+      allowed_values (dict): The key is the tuple path to the attribute
+          and the for var_name this is (var_name,). The value is a dict
+          with a capitalized key describing the allowed value and an allowed
+          value. These dicts store the allowed enum values.
+      attribute_map (dict): The key is attribute name
+          and the value is json key in definition.
+      discriminator_value_class_map (dict): A dict to go from the discriminator
+          variable value to the discriminator class name.
+      validations (dict): The key is the tuple path to the attribute
+          and the for var_name this is (var_name,). The value is a dict
+          that stores validations for max_length, min_length, max_items,
+          min_items, exclusive_maximum, inclusive_maximum, exclusive_minimum,
+          inclusive_minimum, and regex.
+      additional_properties_type (tuple): A tuple of classes accepted
+          as additional properties values.
+    """
+
+    allowed_values = {
+    }
+
+    validations = {
+    }
+
+    @cached_property
+    def additional_properties_type():
+        """
+        This must be a method because a model may have properties that are
+        of type self, this must run after the class is loaded
+        """
+        lazy_import()
+        return (bool, date, datetime, dict, float, int, list, str, none_type,)  # noqa: E501
+
+    _nullable = False
+
+    @cached_property
+    def openapi_types():
+        """
+        This must be a method because a model may have properties that are
+        of type self, this must run after the class is loaded
+
+        Returns
+            openapi_types (dict): The key is attribute name
+                and the value is attribute type.
+        """
+        lazy_import()
+        return {
+            'array_data': ([PostInlineAdditionalPropertiesPayloadRequestArrayDataInner], none_type,),  # noqa: E501
+        }
+
+    @cached_property
+    def discriminator():
+        return None
+
+
+    attribute_map = {
+        'array_data': 'arrayData',  # noqa: E501
+    }
+
+    read_only_vars = {
+    }
+
+    _composed_schemas = {}
+
+    @classmethod
+    @convert_js_args_to_python_args
+    def _from_openapi_data(cls, *args, **kwargs):  # noqa: E501
+        """PostInlineAdditionalPropertiesPayloadRequest - a model defined in OpenAPI
+
+        Keyword Args:
+            _check_type (bool): if True, values for parameters in openapi_types
+                                will be type checked and a TypeError will be
+                                raised if the wrong type is input.
+                                Defaults to True
+            _path_to_item (tuple/list): This is a list of keys or values to
+                                drill down to the model in received_data
+                                when deserializing a response
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
+            _configuration (Configuration): the instance to use when
+                                deserializing a file_type parameter.
+                                If passed, type conversion is attempted
+                                If omitted no type conversion is done.
+            _visited_composed_classes (tuple): This stores a tuple of
+                                classes that we have traveled through so that
+                                if we see that class again we will not use its
+                                discriminator again.
+                                When traveling through a discriminator, the
+                                composed schema that is
+                                is traveled through is added to this set.
+                                For example if Animal has a discriminator
+                                petType and we pass in "Dog", and the class Dog
+                                allOf includes Animal, we move through Animal
+                                once using the discriminator, and pick Dog.
+                                Then in Dog, we will make an instance of the
+                                Animal class but this time we won't travel
+                                through its discriminator because we passed in
+                                _visited_composed_classes = (Animal,)
+            array_data ([PostInlineAdditionalPropertiesPayloadRequestArrayDataInner], none_type): [optional]  # noqa: E501
+        """
+
+        _check_type = kwargs.pop('_check_type', True)
+        _spec_property_naming = kwargs.pop('_spec_property_naming', True)
+        _path_to_item = kwargs.pop('_path_to_item', ())
+        _configuration = kwargs.pop('_configuration', None)
+        _visited_composed_classes = kwargs.pop('_visited_composed_classes', ())
+
+        self = super(OpenApiModel, cls).__new__(cls)
+
+        if args:
+            for arg in args:
+                if isinstance(arg, dict):
+                    kwargs.update(arg)
+                else:
+                    raise ApiTypeError(
+                        "Invalid positional arguments=%s passed to %s. Remove those invalid positional arguments." % (
+                            args,
+                            self.__class__.__name__,
+                        ),
+                        path_to_item=_path_to_item,
+                        valid_classes=(self.__class__,),
+                    )
+
+        self._data_store = {}
+        self._check_type = _check_type
+        self._spec_property_naming = _spec_property_naming
+        self._path_to_item = _path_to_item
+        self._configuration = _configuration
+        self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
+
+        for var_name, var_value in kwargs.items():
+            if var_name not in self.attribute_map and \
+                        self._configuration is not None and \
+                        self._configuration.discard_unknown_keys and \
+                        self.additional_properties_type is None:
+                # discard variable.
+                continue
+            setattr(self, var_name, var_value)
+        return self
+
+    required_properties = set([
+        '_data_store',
+        '_check_type',
+        '_spec_property_naming',
+        '_path_to_item',
+        '_configuration',
+        '_visited_composed_classes',
+    ])
+
+    @convert_js_args_to_python_args
+    def __init__(self, *args, **kwargs):  # noqa: E501
+        """PostInlineAdditionalPropertiesPayloadRequest - a model defined in OpenAPI
+
+        Keyword Args:
+            _check_type (bool): if True, values for parameters in openapi_types
+                                will be type checked and a TypeError will be
+                                raised if the wrong type is input.
+                                Defaults to True
+            _path_to_item (tuple/list): This is a list of keys or values to
+                                drill down to the model in received_data
+                                when deserializing a response
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
+            _configuration (Configuration): the instance to use when
+                                deserializing a file_type parameter.
+                                If passed, type conversion is attempted
+                                If omitted no type conversion is done.
+            _visited_composed_classes (tuple): This stores a tuple of
+                                classes that we have traveled through so that
+                                if we see that class again we will not use its
+                                discriminator again.
+                                When traveling through a discriminator, the
+                                composed schema that is
+                                is traveled through is added to this set.
+                                For example if Animal has a discriminator
+                                petType and we pass in "Dog", and the class Dog
+                                allOf includes Animal, we move through Animal
+                                once using the discriminator, and pick Dog.
+                                Then in Dog, we will make an instance of the
+                                Animal class but this time we won't travel
+                                through its discriminator because we passed in
+                                _visited_composed_classes = (Animal,)
+            array_data ([PostInlineAdditionalPropertiesPayloadRequestArrayDataInner], none_type): [optional]  # noqa: E501
+        """
+
+        _check_type = kwargs.pop('_check_type', True)
+        _spec_property_naming = kwargs.pop('_spec_property_naming', False)
+        _path_to_item = kwargs.pop('_path_to_item', ())
+        _configuration = kwargs.pop('_configuration', None)
+        _visited_composed_classes = kwargs.pop('_visited_composed_classes', ())
+
+        if args:
+            for arg in args:
+                if isinstance(arg, dict):
+                    kwargs.update(arg)
+                else:
+                    raise ApiTypeError(
+                        "Invalid positional arguments=%s passed to %s. Remove those invalid positional arguments." % (
+                            args,
+                            self.__class__.__name__,
+                        ),
+                        path_to_item=_path_to_item,
+                        valid_classes=(self.__class__,),
+                    )
+
+        self._data_store = {}
+        self._check_type = _check_type
+        self._spec_property_naming = _spec_property_naming
+        self._path_to_item = _path_to_item
+        self._configuration = _configuration
+        self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
+
+        for var_name, var_value in kwargs.items():
+            if var_name not in self.attribute_map and \
+                        self._configuration is not None and \
+                        self._configuration.discard_unknown_keys and \
+                        self.additional_properties_type is None:
+                # discard variable.
+                continue
+            setattr(self, var_name, var_value)
+            if var_name in self.read_only_vars:
+                raise ApiAttributeError(f"`{var_name}` is a read-only attribute. Use `from_openapi_data` to instantiate "
+                                     f"class with read only attributes.")

samples/openapi3/client/petstore/python/petstore_api/model/post_inline_additional_properties_payload_request_array_data_inner.py

@@ -0,0 +1,263 @@
+"""
+    OpenAPI Petstore
+
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
+
+    The version of the OpenAPI document: 1.0.0
+    Generated by: https://openapi-generator.tech
+"""
+
+
+import re  # noqa: F401
+import sys  # noqa: F401
+
+from petstore_api.model_utils import (  # noqa: F401
+    ApiTypeError,
+    ModelComposed,
+    ModelNormal,
+    ModelSimple,
+    cached_property,
+    change_keys_js_to_python,
+    convert_js_args_to_python_args,
+    date,
+    datetime,
+    file_type,
+    none_type,
+    validate_get_composed_info,
+    OpenApiModel
+)
+from petstore_api.exceptions import ApiAttributeError
+
+
+
+class PostInlineAdditionalPropertiesPayloadRequestArrayDataInner(ModelNormal):
+    """NOTE: This class is auto generated by OpenAPI Generator.
+    Ref: https://openapi-generator.tech
+
+    Do not edit the class manually.
+
+    Attributes:
+      allowed_values (dict): The key is the tuple path to the attribute
+          and the for var_name this is (var_name,). The value is a dict
+          with a capitalized key describing the allowed value and an allowed
+          value. These dicts store the allowed enum values.
+      attribute_map (dict): The key is attribute name
+          and the value is json key in definition.
+      discriminator_value_class_map (dict): A dict to go from the discriminator
+          variable value to the discriminator class name.
+      validations (dict): The key is the tuple path to the attribute
+          and the for var_name this is (var_name,). The value is a dict
+          that stores validations for max_length, min_length, max_items,
+          min_items, exclusive_maximum, inclusive_maximum, exclusive_minimum,
+          inclusive_minimum, and regex.
+      additional_properties_type (tuple): A tuple of classes accepted
+          as additional properties values.
+    """
+
+    allowed_values = {
+    }
+
+    validations = {
+    }
+
+    @cached_property
+    def additional_properties_type():
+        """
+        This must be a method because a model may have properties that are
+        of type self, this must run after the class is loaded
+        """
+        return (bool, date, datetime, dict, float, int, list, str, none_type,)  # noqa: E501
+
+    _nullable = False
+
+    @cached_property
+    def openapi_types():
+        """
+        This must be a method because a model may have properties that are
+        of type self, this must run after the class is loaded
+
+        Returns
+            openapi_types (dict): The key is attribute name
+                and the value is attribute type.
+        """
+        return {
+            'labels': ([str, none_type],),  # noqa: E501
+        }
+
+    @cached_property
+    def discriminator():
+        return None
+
+
+    attribute_map = {
+        'labels': 'labels',  # noqa: E501
+    }
+
+    read_only_vars = {
+    }
+
+    _composed_schemas = {}
+
+    @classmethod
+    @convert_js_args_to_python_args
+    def _from_openapi_data(cls, *args, **kwargs):  # noqa: E501
+        """PostInlineAdditionalPropertiesPayloadRequestArrayDataInner - a model defined in OpenAPI
+
+        Keyword Args:
+            _check_type (bool): if True, values for parameters in openapi_types
+                                will be type checked and a TypeError will be
+                                raised if the wrong type is input.
+                                Defaults to True
+            _path_to_item (tuple/list): This is a list of keys or values to
+                                drill down to the model in received_data
+                                when deserializing a response
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
+            _configuration (Configuration): the instance to use when
+                                deserializing a file_type parameter.
+                                If passed, type conversion is attempted
+                                If omitted no type conversion is done.
+            _visited_composed_classes (tuple): This stores a tuple of
+                                classes that we have traveled through so that
+                                if we see that class again we will not use its
+                                discriminator again.
+                                When traveling through a discriminator, the
+                                composed schema that is
+                                is traveled through is added to this set.
+                                For example if Animal has a discriminator
+                                petType and we pass in "Dog", and the class Dog
+                                allOf includes Animal, we move through Animal
+                                once using the discriminator, and pick Dog.
+                                Then in Dog, we will make an instance of the
+                                Animal class but this time we won't travel
+                                through its discriminator because we passed in
+                                _visited_composed_classes = (Animal,)
+            labels ([str, none_type]): [optional]  # noqa: E501
+        """
+
+        _check_type = kwargs.pop('_check_type', True)
+        _spec_property_naming = kwargs.pop('_spec_property_naming', True)
+        _path_to_item = kwargs.pop('_path_to_item', ())
+        _configuration = kwargs.pop('_configuration', None)
+        _visited_composed_classes = kwargs.pop('_visited_composed_classes', ())
+
+        self = super(OpenApiModel, cls).__new__(cls)
+
+        if args:
+            for arg in args:
+                if isinstance(arg, dict):
+                    kwargs.update(arg)
+                else:
+                    raise ApiTypeError(
+                        "Invalid positional arguments=%s passed to %s. Remove those invalid positional arguments." % (
+                            args,
+                            self.__class__.__name__,
+                        ),
+                        path_to_item=_path_to_item,
+                        valid_classes=(self.__class__,),
+                    )
+
+        self._data_store = {}
+        self._check_type = _check_type
+        self._spec_property_naming = _spec_property_naming
+        self._path_to_item = _path_to_item
+        self._configuration = _configuration
+        self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
+
+        for var_name, var_value in kwargs.items():
+            if var_name not in self.attribute_map and \
+                        self._configuration is not None and \
+                        self._configuration.discard_unknown_keys and \
+                        self.additional_properties_type is None:
+                # discard variable.
+                continue
+            setattr(self, var_name, var_value)
+        return self
+
+    required_properties = set([
+        '_data_store',
+        '_check_type',
+        '_spec_property_naming',
+        '_path_to_item',
+        '_configuration',
+        '_visited_composed_classes',
+    ])
+
+    @convert_js_args_to_python_args
+    def __init__(self, *args, **kwargs):  # noqa: E501
+        """PostInlineAdditionalPropertiesPayloadRequestArrayDataInner - a model defined in OpenAPI
+
+        Keyword Args:
+            _check_type (bool): if True, values for parameters in openapi_types
+                                will be type checked and a TypeError will be
+                                raised if the wrong type is input.
+                                Defaults to True
+            _path_to_item (tuple/list): This is a list of keys or values to
+                                drill down to the model in received_data
+                                when deserializing a response
+            _spec_property_naming (bool): True if the variable names in the input data
+                                are serialized names, as specified in the OpenAPI document.
+                                False if the variable names in the input data
+                                are pythonic names, e.g. snake case (default)
+            _configuration (Configuration): the instance to use when
+                                deserializing a file_type parameter.
+                                If passed, type conversion is attempted
+                                If omitted no type conversion is done.
+            _visited_composed_classes (tuple): This stores a tuple of
+                                classes that we have traveled through so that
+                                if we see that class again we will not use its
+                                discriminator again.
+                                When traveling through a discriminator, the
+                                composed schema that is
+                                is traveled through is added to this set.
+                                For example if Animal has a discriminator
+                                petType and we pass in "Dog", and the class Dog
+                                allOf includes Animal, we move through Animal
+                                once using the discriminator, and pick Dog.
+                                Then in Dog, we will make an instance of the
+                                Animal class but this time we won't travel
+                                through its discriminator because we passed in
+                                _visited_composed_classes = (Animal,)
+            labels ([str, none_type]): [optional]  # noqa: E501
+        """
+
+        _check_type = kwargs.pop('_check_type', True)
+        _spec_property_naming = kwargs.pop('_spec_property_naming', False)
+        _path_to_item = kwargs.pop('_path_to_item', ())
+        _configuration = kwargs.pop('_configuration', None)
+        _visited_composed_classes = kwargs.pop('_visited_composed_classes', ())
+
+        if args:
+            for arg in args:
+                if isinstance(arg, dict):
+                    kwargs.update(arg)
+                else:
+                    raise ApiTypeError(
+                        "Invalid positional arguments=%s passed to %s. Remove those invalid positional arguments." % (
+                            args,
+                            self.__class__.__name__,
+                        ),
+                        path_to_item=_path_to_item,
+                        valid_classes=(self.__class__,),
+                    )
+
+        self._data_store = {}
+        self._check_type = _check_type
+        self._spec_property_naming = _spec_property_naming
+        self._path_to_item = _path_to_item
+        self._configuration = _configuration
+        self._visited_composed_classes = _visited_composed_classes + (self.__class__,)
+
+        for var_name, var_value in kwargs.items():
+            if var_name not in self.attribute_map and \
+                        self._configuration is not None and \
+                        self._configuration.discard_unknown_keys and \
+                        self.additional_properties_type is None:
+                # discard variable.
+                continue
+            setattr(self, var_name, var_value)
+            if var_name in self.read_only_vars:
+                raise ApiAttributeError(f"`{var_name}` is a read-only attribute. Use `from_openapi_data` to instantiate "
+                                     f"class with read only attributes.")

samples/openapi3/client/petstore/python/petstore_api/models/__init__.py

@@ -44,7 +44,6 @@ from petstore_api.model.enum_arrays import EnumArrays
 from petstore_api.model.enum_class import EnumClass
 from petstore_api.model.enum_test import EnumTest
 from petstore_api.model.equilateral_triangle import EquilateralTriangle
-from petstore_api.model.fake_post_inline_additional_properties_payload_array_data import FakePostInlineAdditionalPropertiesPayloadArrayData
 from petstore_api.model.file import File
 from petstore_api.model.file_schema_test_class import FileSchemaTestClass
 from petstore_api.model.foo import Foo
@@ -58,7 +57,6 @@ from petstore_api.model.grandparent_animal import GrandparentAnimal
 from petstore_api.model.has_only_read_only import HasOnlyReadOnly
 from petstore_api.model.health_check_result import HealthCheckResult
 from petstore_api.model.inline_additional_properties_ref_payload import InlineAdditionalPropertiesRefPayload
-from petstore_api.model.inline_object6 import InlineObject6
 from petstore_api.model.inline_response_default import InlineResponseDefault
 from petstore_api.model.integer_enum import IntegerEnum
 from petstore_api.model.integer_enum_one_value import IntegerEnumOneValue
@@ -84,6 +82,8 @@ from petstore_api.model.order import Order
 from petstore_api.model.parent_pet import ParentPet
 from petstore_api.model.pet import Pet
 from petstore_api.model.pig import Pig
+from petstore_api.model.post_inline_additional_properties_payload_request import PostInlineAdditionalPropertiesPayloadRequest
+from petstore_api.model.post_inline_additional_properties_payload_request_array_data_inner import PostInlineAdditionalPropertiesPayloadRequestArrayDataInner
 from petstore_api.model.quadrilateral import Quadrilateral
 from petstore_api.model.quadrilateral_interface import QuadrilateralInterface
 from petstore_api.model.read_only_first import ReadOnlyFirst

samples/openapi3/client/petstore/python/test/test_fake_api.py

@@ -76,12 +76,6 @@ class TestFakeApi(unittest.TestCase):
         """
         pass
 
-    def test_get_inline_additionl_properties_ref_payload(self):
-        """Test case for get_inline_additionl_properties_ref_payload
-
-        """
-        pass
-
     def test_mammal(self):
         """Test case for mammal
 
@@ -100,6 +94,18 @@ class TestFakeApi(unittest.TestCase):
         """
         pass
 
+    def test_post_inline_additional_properties_payload(self):
+        """Test case for post_inline_additional_properties_payload
+
+        """
+        pass
+
+    def test_post_inline_additional_properties_ref_payload(self):
+        """Test case for post_inline_additional_properties_ref_payload
+
+        """
+        pass
+
     def test_string(self):
         """Test case for string
 
@@ -172,6 +178,12 @@ class TestFakeApi(unittest.TestCase):
         """
         pass
 
+    def test_tx_rx_any_of_model(self):
+        """Test case for tx_rx_any_of_model
+
+        """
+        pass
+
     def test_upload_download_file(self):
         """Test case for upload_download_file
 

samples/openapi3/client/petstore/python/test/test_post_inline_additional_properties_payload_request.py

@@ -0,0 +1,37 @@
+"""
+    OpenAPI Petstore
+
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
+
+    The version of the OpenAPI document: 1.0.0
+    Generated by: https://openapi-generator.tech
+"""
+
+
+import sys
+import unittest
+
+import petstore_api
+from petstore_api.model.post_inline_additional_properties_payload_request_array_data_inner import PostInlineAdditionalPropertiesPayloadRequestArrayDataInner
+globals()['PostInlineAdditionalPropertiesPayloadRequestArrayDataInner'] = PostInlineAdditionalPropertiesPayloadRequestArrayDataInner
+from petstore_api.model.post_inline_additional_properties_payload_request import PostInlineAdditionalPropertiesPayloadRequest
+
+
+class TestPostInlineAdditionalPropertiesPayloadRequest(unittest.TestCase):
+    """PostInlineAdditionalPropertiesPayloadRequest unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testPostInlineAdditionalPropertiesPayloadRequest(self):
+        """Test PostInlineAdditionalPropertiesPayloadRequest"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = PostInlineAdditionalPropertiesPayloadRequest()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()

samples/openapi3/client/petstore/python/test/test_post_inline_additional_properties_payload_request_array_data_inner.py

@@ -0,0 +1,35 @@
+"""
+    OpenAPI Petstore
+
+    This spec is mainly for testing Petstore server and contains fake endpoints, models. Please do not use this for any other purpose. Special characters: \" \\  # noqa: E501
+
+    The version of the OpenAPI document: 1.0.0
+    Generated by: https://openapi-generator.tech
+"""
+
+
+import sys
+import unittest
+
+import petstore_api
+from petstore_api.model.post_inline_additional_properties_payload_request_array_data_inner import PostInlineAdditionalPropertiesPayloadRequestArrayDataInner
+
+
+class TestPostInlineAdditionalPropertiesPayloadRequestArrayDataInner(unittest.TestCase):
+    """PostInlineAdditionalPropertiesPayloadRequestArrayDataInner unit test stubs"""
+
+    def setUp(self):
+        pass
+
+    def tearDown(self):
+        pass
+
+    def testPostInlineAdditionalPropertiesPayloadRequestArrayDataInner(self):
+        """Test PostInlineAdditionalPropertiesPayloadRequestArrayDataInner"""
+        # FIXME: construct object with mandatory attributes with example values
+        # model = PostInlineAdditionalPropertiesPayloadRequestArrayDataInner()  # noqa: E501
+        pass
+
+
+if __name__ == '__main__':
+    unittest.main()

samples/openapi3/client/petstore/python/tests_manual/test_fake_api.py

@@ -644,7 +644,7 @@ class TestFakeApi(unittest.TestCase):
         """Test case for postInlineAdditionlPropertiesRefPayload
         """
         from petstore_api.model.inline_additional_properties_ref_payload import InlineAdditionalPropertiesRefPayload
-        from petstore_api.model.fake_post_inline_additional_properties_payload_array_data import FakePostInlineAdditionalPropertiesPayloadArrayData
+        from petstore_api.model.post_inline_additional_properties_payload_request_array_data_inner import PostInlineAdditionalPropertiesPayloadRequestArrayDataInner
         endpoint = self.api.post_inline_additional_properties_ref_payload_endpoint
         assert endpoint.openapi_types['inline_additional_properties_ref_payload'] == (InlineAdditionalPropertiesRefPayload,)
         assert endpoint.settings['response_type'] == (InlineAdditionalPropertiesRefPayload,)
@@ -664,7 +664,7 @@ class TestFakeApi(unittest.TestCase):
             }
             inline_additional_properties_ref_payload = InlineAdditionalPropertiesRefPayload(
                 array_data=[
-                    FakePostInlineAdditionalPropertiesPayloadArrayData(labels=[None, 'foo'])
+                    PostInlineAdditionalPropertiesPayloadRequestArrayDataInner(labels=[None, 'foo'])
                 ]
             )
             mock_method.return_value = self.mock_response(expected_json_body)
@@ -682,11 +682,11 @@ class TestFakeApi(unittest.TestCase):
     def test_post_inline_additional_properties_payload(self):
         """Test case for postInlineAdditionlPropertiesPayload
         """
-        from petstore_api.model.inline_object6 import InlineObject6
+        from petstore_api.model.post_inline_additional_properties_payload_request import PostInlineAdditionalPropertiesPayloadRequest
-        from petstore_api.model.fake_post_inline_additional_properties_payload_array_data import FakePostInlineAdditionalPropertiesPayloadArrayData
+        from petstore_api.model.post_inline_additional_properties_payload_request_array_data_inner import PostInlineAdditionalPropertiesPayloadRequestArrayDataInner
         endpoint = self.api.post_inline_additional_properties_payload_endpoint
-        assert endpoint.openapi_types['inline_object6'] == (InlineObject6,)
+        assert endpoint.openapi_types['post_inline_additional_properties_payload_request'] == (PostInlineAdditionalPropertiesPayloadRequest,)
-        assert endpoint.settings['response_type'] == (InlineObject6,)
+        assert endpoint.settings['response_type'] == (PostInlineAdditionalPropertiesPayloadRequest,)
 
         # serialization + deserialization works
         from petstore_api.rest import RESTClientObject, RESTResponse
@@ -701,21 +701,21 @@ class TestFakeApi(unittest.TestCase):
                     }
                 ]
             }
-            inline_object6 = InlineObject6(
+            post_inline_additional_properties_payload_request = PostInlineAdditionalPropertiesPayloadRequest(
                 array_data=[
-                    FakePostInlineAdditionalPropertiesPayloadArrayData(labels=[None, 'foo'])
+                    PostInlineAdditionalPropertiesPayloadRequestArrayDataInner(labels=[None, 'foo'])
                 ]
             )
             mock_method.return_value = self.mock_response(expected_json_body)
 
-            response = self.api.post_inline_additional_properties_payload(inline_object6=inline_object6)
+            response = self.api.post_inline_additional_properties_payload(post_inline_additional_properties_payload_request=post_inline_additional_properties_payload_request)
             self.assert_request_called_with(
                 mock_method,
                 'http://petstore.swagger.io:80/v2/fake/postInlineAdditionalPropertiesPayload',
                 body=expected_json_body
             )
 
-            assert isinstance(response, InlineObject6)
+            assert isinstance(response, PostInlineAdditionalPropertiesPayloadRequest)
             assert model_to_dict(response) == expected_json_body
 
     def test_post_tx_rx_any_of_payload(self):

samples/openapi3/client/petstore/typescript/builds/composed-schemas/.openapi-generator/FILES

@@ -15,7 +15,9 @@ models/Cat.ts
 models/CatAllOf.ts
 models/Dog.ts
 models/DogAllOf.ts
-models/InlineObject.ts
+models/InlineRequest.ts
+models/InlineRequest1.ts
+models/InlineRequest2.ts
 models/ObjectSerializer.ts
 models/PetByAge.ts
 models/PetByType.ts

samples/openapi3/client/petstore/typescript/builds/composed-schemas/DefaultApi.md

@@ -24,8 +24,8 @@ const configuration = .createConfiguration();
 const apiInstance = new .DefaultApi(configuration);
 
 let body:.DefaultApiFilePostRequest = {
-  // InlineObject (optional)
+  // InlineRequest2 (optional)
-  inlineObject: {
+  inlineRequest2: {
     file: null,
   },
 };
@@ -40,7 +40,7 @@ apiInstance.filePost(body).then((data:any) => {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **inlineObject** | **InlineObject**|  |
+ **inlineRequest2** | **InlineRequest2**|  |
 
 
 ### Return type
@@ -79,8 +79,8 @@ const configuration = .createConfiguration();
 const apiInstance = new .DefaultApi(configuration);
 
 let body:.DefaultApiPetsFilteredPatchRequest = {
-  // PetByAge | PetByType (optional)
+  // InlineRequest1 (optional)
-  petByAgePetByType: null,
+  inlineRequest1: null,
 };
 
 apiInstance.petsFilteredPatch(body).then((data:any) => {
@@ -93,7 +93,7 @@ apiInstance.petsFilteredPatch(body).then((data:any) => {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **petByAgePetByType** | **PetByAge | PetByType**|  |
+ **inlineRequest1** | **InlineRequest1**|  |
 
 
 ### Return type
@@ -132,8 +132,8 @@ const configuration = .createConfiguration();
 const apiInstance = new .DefaultApi(configuration);
 
 let body:.DefaultApiPetsPatchRequest = {
-  // Cat | Dog (optional)
+  // InlineRequest (optional)
-  catDog: null,
+  inlineRequest: null,
 };
 
 apiInstance.petsPatch(body).then((data:any) => {
@@ -146,7 +146,7 @@ apiInstance.petsPatch(body).then((data:any) => {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **catDog** | **Cat | Dog**|  |
+ **inlineRequest** | **InlineRequest**|  |
 
 
 ### Return type

samples/openapi3/client/petstore/typescript/builds/composed-schemas/apis/DefaultApi.ts

@@ -8,11 +8,9 @@ import {canConsumeForm, isCodeInRange} from '../util';
 import {SecurityAuthentication} from '../auth/auth';
 
 
-import { Cat } from '../models/Cat';
+import { InlineRequest } from '../models/InlineRequest';
-import { Dog } from '../models/Dog';
+import { InlineRequest1 } from '../models/InlineRequest1';
-import { InlineObject } from '../models/InlineObject';
+import { InlineRequest2 } from '../models/InlineRequest2';
-import { PetByAge } from '../models/PetByAge';
-import { PetByType } from '../models/PetByType';
 
 /**
  * no description
@@ -20,9 +18,9 @@ import { PetByType } from '../models/PetByType';
 export class DefaultApiRequestFactory extends BaseAPIRequestFactory {
 
     /**
-     * @param inlineObject 
+     * @param inlineRequest2 
      */
-    public async filePost(inlineObject?: InlineObject, _options?: Configuration): Promise<RequestContext> {
+    public async filePost(inlineRequest2?: InlineRequest2, _options?: Configuration): Promise<RequestContext> {
         let _config = _options || this.configuration;
 
 
@@ -40,7 +38,7 @@ export class DefaultApiRequestFactory extends BaseAPIRequestFactory {
         ]);
         requestContext.setHeaderParam("Content-Type", contentType);
         const serializedBody = ObjectSerializer.stringify(
-            ObjectSerializer.serialize(inlineObject, "InlineObject", ""),
+            ObjectSerializer.serialize(inlineRequest2, "InlineRequest2", ""),
             contentType
         );
         requestContext.setBody(serializedBody);
@@ -55,9 +53,9 @@ export class DefaultApiRequestFactory extends BaseAPIRequestFactory {
     }
 
     /**
-     * @param petByAgePetByType 
+     * @param inlineRequest1 
      */
-    public async petsFilteredPatch(petByAgePetByType?: PetByAge | PetByType, _options?: Configuration): Promise<RequestContext> {
+    public async petsFilteredPatch(inlineRequest1?: InlineRequest1, _options?: Configuration): Promise<RequestContext> {
         let _config = _options || this.configuration;
 
 
@@ -75,7 +73,7 @@ export class DefaultApiRequestFactory extends BaseAPIRequestFactory {
         ]);
         requestContext.setHeaderParam("Content-Type", contentType);
         const serializedBody = ObjectSerializer.stringify(
-            ObjectSerializer.serialize(petByAgePetByType, "PetByAge | PetByType", ""),
+            ObjectSerializer.serialize(inlineRequest1, "InlineRequest1", ""),
             contentType
         );
         requestContext.setBody(serializedBody);
@@ -90,9 +88,9 @@ export class DefaultApiRequestFactory extends BaseAPIRequestFactory {
     }
 
     /**
-     * @param catDog 
+     * @param inlineRequest 
      */
-    public async petsPatch(catDog?: Cat | Dog, _options?: Configuration): Promise<RequestContext> {
+    public async petsPatch(inlineRequest?: InlineRequest, _options?: Configuration): Promise<RequestContext> {
         let _config = _options || this.configuration;
 
 
@@ -110,7 +108,7 @@ export class DefaultApiRequestFactory extends BaseAPIRequestFactory {
         ]);
         requestContext.setHeaderParam("Content-Type", contentType);
         const serializedBody = ObjectSerializer.stringify(
-            ObjectSerializer.serialize(catDog, "Cat | Dog", ""),
+            ObjectSerializer.serialize(inlineRequest, "InlineRequest", ""),
             contentType
         );
         requestContext.setBody(serializedBody);

samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/InlineRequest.ts

@@ -0,0 +1,62 @@
+/**
+ * Example
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { Cat } from './Cat';
+import { Dog } from './Dog';
+import { HttpFile } from '../http/http';
+
+export class InlineRequest {
+    'hunts'?: boolean;
+    'age'?: number;
+    'bark'?: boolean;
+    'breed'?: InlineRequestBreedEnum;
+
+    static readonly discriminator: string | undefined = "petType";
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
+        {
+            "name": "hunts",
+            "baseName": "hunts",
+            "type": "boolean",
+            "format": ""
+        },
+        {
+            "name": "age",
+            "baseName": "age",
+            "type": "number",
+            "format": ""
+        },
+        {
+            "name": "bark",
+            "baseName": "bark",
+            "type": "boolean",
+            "format": ""
+        },
+        {
+            "name": "breed",
+            "baseName": "breed",
+            "type": "InlineRequestBreedEnum",
+            "format": ""
+        }    ];
+
+    static getAttributeTypeMap() {
+        return InlineRequest.attributeTypeMap;
+    }
+
+    public constructor() {
+        this.petType = "InlineRequest";
+    }
+}
+
+
+export type InlineRequestBreedEnum = "Dingo" | "Husky" | "Retriever" | "Shepherd" ;
+

samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/InlineRequest1.ts

@@ -0,0 +1,61 @@
+/**
+ * Example
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { PetByAge } from './PetByAge';
+import { PetByType } from './PetByType';
+import { HttpFile } from '../http/http';
+
+export class InlineRequest1 {
+    'age': number;
+    'nickname'?: string;
+    'petType': InlineRequest1PetTypeEnum;
+    'hunts'?: boolean;
+
+    static readonly discriminator: string | undefined = undefined;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
+        {
+            "name": "age",
+            "baseName": "age",
+            "type": "number",
+            "format": ""
+        },
+        {
+            "name": "nickname",
+            "baseName": "nickname",
+            "type": "string",
+            "format": ""
+        },
+        {
+            "name": "petType",
+            "baseName": "pet_type",
+            "type": "InlineRequest1PetTypeEnum",
+            "format": ""
+        },
+        {
+            "name": "hunts",
+            "baseName": "hunts",
+            "type": "boolean",
+            "format": ""
+        }    ];
+
+    static getAttributeTypeMap() {
+        return InlineRequest1.attributeTypeMap;
+    }
+
+    public constructor() {
+    }
+}
+
+
+export type InlineRequest1PetTypeEnum = "Cat" | "Dog" ;
+

samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/InlineRequest2.ts

@@ -0,0 +1,35 @@
+/**
+ * Example
+ * No description provided (generated by Openapi Generator https://github.com/openapitools/openapi-generator)
+ *
+ * OpenAPI spec version: 1.0.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+import { HttpFile } from '../http/http';
+
+export class InlineRequest2 {
+    'file'?: any;
+
+    static readonly discriminator: string | undefined = undefined;
+
+    static readonly attributeTypeMap: Array<{name: string, baseName: string, type: string, format: string}> = [
+        {
+            "name": "file",
+            "baseName": "file",
+            "type": "any",
+            "format": ""
+        }    ];
+
+    static getAttributeTypeMap() {
+        return InlineRequest2.attributeTypeMap;
+    }
+
+    public constructor() {
+    }
+}
+

samples/openapi3/client/petstore/typescript/builds/composed-schemas/models/ObjectSerializer.ts

@@ -2,7 +2,9 @@ export * from './Cat';
 export * from './CatAllOf';
 export * from './Dog';
 export * from './DogAllOf';
-export * from './InlineObject';
+export * from './InlineRequest';
+export * from './InlineRequest1';
+export * from './InlineRequest2';
 export * from './PetByAge';
 export * from './PetByType';
 
@@ -10,7 +12,9 @@ import { Cat } from './Cat';
 import { CatAllOf } from './CatAllOf';
 import { Dog , DogBreedEnum   } from './Dog';
 import { DogAllOf , DogAllOfBreedEnum   } from './DogAllOf';
-import { InlineObject } from './InlineObject';
+import { InlineRequest   , InlineRequestBreedEnum   } from './InlineRequest';
+import { InlineRequest1  , InlineRequest1PetTypeEnum    } from './InlineRequest1';
+import { InlineRequest2 } from './InlineRequest2';
 import { PetByAge } from './PetByAge';
 import { PetByType, PetByTypePetTypeEnum    } from './PetByType';
 
@@ -36,6 +40,8 @@ const supportedMediaTypes: { [mediaType: string]: number } = {
 let enumsMap: Set<string> = new Set<string>([
     "DogBreedEnum",
     "DogAllOfBreedEnum",
+    "InlineRequestBreedEnum",
+    "InlineRequest1PetTypeEnum",
     "PetByTypePetTypeEnum",
 ]);
 
@@ -44,7 +50,9 @@ let typeMap: {[index: string]: any} = {
     "CatAllOf": CatAllOf,
     "Dog": Dog,
     "DogAllOf": DogAllOf,
-    "InlineObject": InlineObject,
+    "InlineRequest": InlineRequest,
+    "InlineRequest1": InlineRequest1,
+    "InlineRequest2": InlineRequest2,
     "PetByAge": PetByAge,
     "PetByType": PetByType,
 }