Skip to content
GitLab

Consider ComposedSchema in DefaultCodegen#fromRequestBody(..)

Merged Administrator requested to merge github/fork/jmini/issue192_allOf into master

Created by: jmini

PR checklist

  • Read the contribution guidelines.
  • Ran the shell script under ./bin/ to update Petstore sample so that CIs can verify the change. (For instance, only need to run ./bin/{LANG}-petstore.sh and ./bin/security/{LANG}-petstore.sh if updating the {LANG} (e.g. php, ruby, python, etc) code generator or {LANG} client's mustache templates). Windows batch files can be found in .\bin\windows\.
  • Filed the PR against the correct branch: master, 3.1.x, 4.0.x. Default: master.
  • Copied the technical committee to review the pull request if your PR is targeting a particular programming language.

Description of the PR

This is a fix for #192 (closed).

In DefaultCodegen#fromRequestBody(..) the composed-schema case was going through the default else case.

https://github.com/OpenAPITools/openapi-generator/blob/231202d0a3b4602e5b20e853c62a49446c1db200/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java#L4247-L4271

In my opinion, the composed-schema is more like the object case. This is why I have added || ModelUtils.isComposedSchema(schema) to the else condition here:

https://github.com/OpenAPITools/openapi-generator/blob/231202d0a3b4602e5b20e853c62a49446c1db200/modules/openapi-generator/src/main/java/org/openapitools/codegen/DefaultCodegen.java#L4229-L4247

A unit test with the spec provided in #192 (closed) is added to the change to demonstrate the effect of the change.