Skip to content

[core] Handle referenced enum case correctly #2001

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jan 30, 2019

Conversation

jmini
Copy link
Member

@jmini jmini commented Jan 28, 2019

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.4.x, 4.0.x. Default: master.
  • Copied the technical committee to review the pull request if your PR is targeting a particular programming language. @OpenAPITools/generator-core-team

Description of the PR

This PR is about handling outer-enum with default value correctly.

allowableValues needs to be set, even for referenced enum.


Test spec (proposed in #1981)

openapi: 3.0.1
info:
  title: issue1981 test
  version: '1.0'
servers:
  - url: 'http://localhost:8000/'
paths:
  /testenum:
    post:
      requestBody:
        content:
          application/json:
            schema:
              $ref: '#/components/schemas/TestObject'
      responses:
        200:
          description: OK
components:
  schemas:
    TestObject:
      type: object
      properties:
        myEnum:
          $ref: '#/components/schemas/MyEnum'
    MyEnum:
      type: string
      default: FIRSTVALUE
      enum:
      - FIRSTVALUE
      - SECONDVALUE

Diff:

--- a/issue1981-oapigen-spring-boot-spring/src/main/java/org/openapitools/model/TestObject.java
+++ b/issue1981-oapigen-spring-boot-spring/src/main/java/org/openapitools/model/TestObject.java
 
 public class TestObject   {
   @JsonProperty("myEnum")
-  private MyEnum myEnum = null;
+  private MyEnum myEnum = MyEnum.FIRSTVALUE;
 
   public TestObject myEnum(MyEnum myEnum) {
     this.myEnum = myEnum;

@ajdergute have you a way to test/review this PR?

@auto-labeler
Copy link

auto-labeler bot commented Jan 28, 2019

👍 Thanks for opening this issue!
🏷 I have applied any labels matching special text in your issue.

The team will review the labels and make any necessary changes.

Copy link
Member

@wing328 wing328 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@wing328 wing328 added this to the 4.0.0 milestone Jan 30, 2019
@wing328 wing328 merged commit c871e3b into OpenAPITools:master Jan 30, 2019
@ajdergute
Copy link

Thank's a lot for this superfast bug fix. I tried it today with 4.0.0-beta2 and it works.

@adrien-marsoulaud
Copy link

This issue has raised again since 5.1.0 version

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants