Skip to content
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.

Sign up for GitHub

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

Jump to bottom

[Java][Jersey2] Add JsonTypeName annotation #6551

Merged
merged 63 commits into from
Jul 18, 2020
Merged

[Java][Jersey2] Add JsonTypeName annotation #6551

merged 63 commits into from
Jul 18, 2020

Commits on May 13, 2020

  1. Mustache template should use invokerPackage tag to generate import

    @sebastien-rosset
    sebastien-rosset committed May 13, 2020
    Configuration menu
    Copy the full SHA
    41e97e6 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene… 

    …rator
    @sebastien-rosset
    sebastien-rosset committed May 13, 2020
    Configuration menu
    Copy the full SHA
    1760f6a View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene… 

    …rator
    @sebastien-rosset
    sebastien-rosset committed May 13, 2020
    Configuration menu
    Copy the full SHA
    3ae466e View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene… 

    …rator
    @sebastien-rosset
    sebastien-rosset committed May 13, 2020
    Configuration menu
    Copy the full SHA
    b628667 View commit details
    Browse the repository at this point in the history

Commits on May 14, 2020

  1. Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene… 

    …rator
    @sebastien-rosset
    sebastien-rosset committed May 14, 2020
    Configuration menu
    Copy the full SHA
    4dc915c View commit details
    Browse the repository at this point in the history

Commits on May 16, 2020

  1. Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene… 

    …rator
    @sebastien-rosset
    sebastien-rosset committed May 16, 2020
    Configuration menu
    Copy the full SHA
    7a207f6 View commit details
    Browse the repository at this point in the history

Commits on May 18, 2020

  1. Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene… 

    …rator
    @sebastien-rosset
    sebastien-rosset committed May 18, 2020
    Configuration menu
    Copy the full SHA
    776fba6 View commit details
    Browse the repository at this point in the history

Commits on May 19, 2020

  1. Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene… 

    …rator
    @sebastien-rosset
    sebastien-rosset committed May 19, 2020
    Configuration menu
    Copy the full SHA
    3fac434 View commit details
    Browse the repository at this point in the history

Commits on May 20, 2020

  1. Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene… 

    …rator
    @sebastien-rosset
    sebastien-rosset committed May 20, 2020
    Configuration menu
    Copy the full SHA
    a96c46b View commit details
    Browse the repository at this point in the history

Commits on May 21, 2020

  1. Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene… 

    …rator
    @sebastien-rosset
    sebastien-rosset committed May 21, 2020
    Configuration menu
    Copy the full SHA
    1351fd0 View commit details
    Browse the repository at this point in the history

Commits on May 22, 2020

  1. Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene… 

    …rator
    @sebastien-rosset
    sebastien-rosset committed May 22, 2020
    Configuration menu
    Copy the full SHA
    ba65735 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene… 

    …rator
    @sebastien-rosset
    sebastien-rosset committed May 22, 2020
    Configuration menu
    Copy the full SHA
    9a0b89e View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene… 

    …rator
    @sebastien-rosset
    sebastien-rosset committed May 22, 2020
    Configuration menu
    Copy the full SHA
    4c84190 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene… 

    …rator
    @sebastien-rosset
    sebastien-rosset committed May 22, 2020
    Configuration menu
    Copy the full SHA
    94ae683 View commit details
    Browse the repository at this point in the history

Commits on May 23, 2020

  1. Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene… 

    …rator
    @sebastien-rosset
    sebastien-rosset committed May 23, 2020
    Configuration menu
    Copy the full SHA
    aac9f5a View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene… 

    …rator
    @sebastien-rosset
    sebastien-rosset committed May 23, 2020
    Configuration menu
    Copy the full SHA
    93baa3d View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene… 

    …rator
    @sebastien-rosset
    sebastien-rosset committed May 23, 2020
    Configuration menu
    Copy the full SHA
    5c313b4 View commit details
    Browse the repository at this point in the history

  4. Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene… 

    …rator
    @sebastien-rosset
    sebastien-rosset committed May 23, 2020
    Configuration menu
    Copy the full SHA
    cda8898 View commit details
    Browse the repository at this point in the history

Commits on May 24, 2020

  1. Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene… 

    …rator
    @sebastien-rosset
    sebastien-rosset committed May 24, 2020
    Configuration menu
    Copy the full SHA
    1f7e5c1 View commit details
    Browse the repository at this point in the history

Commits on May 25, 2020

  1. Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene… 

    …rator
    @sebastien-rosset
    sebastien-rosset committed May 25, 2020
    Configuration menu
    Copy the full SHA
    bef435e View commit details
    Browse the repository at this point in the history

Commits on May 26, 2020

  1. Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene… 

    …rator
    @sebastien-rosset
    sebastien-rosset committed May 26, 2020
    Configuration menu
    Copy the full SHA
    a9cad38 View commit details
    Browse the repository at this point in the history

Commits on May 27, 2020

  1. Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene… 

    …rator
    @sebastien-rosset
    sebastien-rosset committed May 27, 2020
    Configuration menu
    Copy the full SHA
    877ecfe View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene… 

    …rator
    @sebastien-rosset
    sebastien-rosset committed May 27, 2020
    Configuration menu
    Copy the full SHA
    8c055f5 View commit details
    Browse the repository at this point in the history

Commits on May 28, 2020

  1. Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene… 

    …rator
    @sebastien-rosset
    sebastien-rosset committed May 28, 2020
    Configuration menu
    Copy the full SHA
    d64f421 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene… 

    …rator
    @sebastien-rosset
    sebastien-rosset committed May 28, 2020
    Configuration menu
    Copy the full SHA
    4d0edfe View commit details
    Browse the repository at this point in the history

Commits on May 29, 2020

  1. Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene… 

    …rator
    @sebastien-rosset
    sebastien-rosset committed May 29, 2020
    Configuration menu
    Copy the full SHA
    476eb01 View commit details
    Browse the repository at this point in the history

Commits on May 30, 2020

  1. Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene… 

    …rator
    @sebastien-rosset
    sebastien-rosset committed May 30, 2020
    Configuration menu
    Copy the full SHA
    8ff6088 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene… 

    …rator
    @sebastien-rosset
    sebastien-rosset committed May 30, 2020
    Configuration menu
    Copy the full SHA
    ac1a061 View commit details
    Browse the repository at this point in the history

Commits on May 31, 2020

  1. Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene… 

    …rator
    @sebastien-rosset
    sebastien-rosset committed May 31, 2020
    Configuration menu
    Copy the full SHA
    8579966 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene… 

    …rator
    @sebastien-rosset
    sebastien-rosset committed May 31, 2020
    Configuration menu
    Copy the full SHA
    7c45925 View commit details
    Browse the repository at this point in the history

Commits on Jun 1, 2020

  1. Merge remote-tracking branch 'upstream/master'

    @vvb
    vvb committed Jun 1, 2020
    Configuration menu
    Copy the full SHA
    7f52a53 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene… 

    …rator
    @sebastien-rosset
    sebastien-rosset committed Jun 1, 2020
    Configuration menu
    Copy the full SHA
    76d3348 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of github.com:CiscoM31/openapi-generator

    @sebastien-rosset
    sebastien-rosset committed Jun 1, 2020
    Configuration menu
    Copy the full SHA
    797e779 View commit details
    Browse the repository at this point in the history

Commits on Jun 2, 2020

  1. Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene… 

    …rator
    @sebastien-rosset
    sebastien-rosset committed Jun 2, 2020
    Configuration menu
    Copy the full SHA
    700e0f9 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene… 

    …rator
    @sebastien-rosset
    sebastien-rosset committed Jun 2, 2020
    Configuration menu
    Copy the full SHA
    cf45a86 View commit details
    Browse the repository at this point in the history

Commits on Jun 4, 2020

  1. Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene… 

    …rator
    @sebastien-rosset
    sebastien-rosset committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    ad3fa7e View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene… 

    …rator
    @sebastien-rosset
    sebastien-rosset committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    12ecf34 View commit details
    Browse the repository at this point in the history

  3. Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene… 

    …rator
    @sebastien-rosset
    sebastien-rosset committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    6321dfc View commit details
    Browse the repository at this point in the history

  4. add JsonSubTypes annotation to handle scenario when OAS name has spec… 

    …ial characters
    @sebastien-rosset
    sebastien-rosset committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    c05b82e View commit details
    Browse the repository at this point in the history

  5. add JsonSubTypes annotation to handle scenario when OAS name has spec… 

    …ial characters. Add unit test
    @sebastien-rosset
    sebastien-rosset committed Jun 4, 2020
    Configuration menu
    Copy the full SHA
    92eadd7 View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2020

  1. Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene… 

    …rator
    @sebastien-rosset
    sebastien-rosset committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    ae8e870 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:CiscoM31/openapi-generator into j… 

    …ersey2-subtype-annotation
    @sebastien-rosset
    sebastien-rosset committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    a8d8b96 View commit details
    Browse the repository at this point in the history

  3. run sample scripts

    @sebastien-rosset
    sebastien-rosset committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    97e490e View commit details
    Browse the repository at this point in the history

  4. fix unit test

    @sebastien-rosset
    sebastien-rosset committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    3237fc6 View commit details
    Browse the repository at this point in the history

  5. Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene… 

    …rator
    @sebastien-rosset
    sebastien-rosset committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    d1f351b View commit details
    Browse the repository at this point in the history

  6. run sample scripts

    @sebastien-rosset
    sebastien-rosset committed Jun 5, 2020
    Configuration menu
    Copy the full SHA
    5e2f013 View commit details
    Browse the repository at this point in the history

Commits on Jun 8, 2020

  1. Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene… 

    …rator
    @sebastien-rosset
    sebastien-rosset committed Jun 8, 2020
    Configuration menu
    Copy the full SHA
    5d7aa84 View commit details
    Browse the repository at this point in the history

Commits on Jun 9, 2020

  1. Merge branch 'master' of https://github.com/OpenAPITools/openapi-gene… 

    …rator
    @sebastien-rosset
    sebastien-rosset committed Jun 9, 2020
    Configuration menu
    Copy the full SHA
    76996aa View commit details
    Browse the repository at this point in the history

  2. resolve merge conflicts

    @sebastien-rosset
    sebastien-rosset committed Jun 9, 2020
    Configuration menu
    Copy the full SHA
    a873091 View commit details
    Browse the repository at this point in the history

Commits on Jul 7, 2020

  1. resolve merge conflicts. sync from master

    @sebastien-rosset
    sebastien-rosset committed Jul 7, 2020
    Configuration menu
    Copy the full SHA
    6ff9965 View commit details
    Browse the repository at this point in the history

  2. add minimal openapi document to show issue with special characters an… 

    …d discriminators
    @sebastien-rosset
    sebastien-rosset committed Jul 7, 2020
    Configuration menu
    Copy the full SHA
    ed663e0 View commit details
    Browse the repository at this point in the history

  3. Add 'isClassnameSanitized' tag

    @sebastien-rosset
    sebastien-rosset committed Jul 7, 2020
    Configuration menu
    Copy the full SHA
    db62818 View commit details
    Browse the repository at this point in the history

  4. Add 'isClassnameSanitized' tag

    @sebastien-rosset
    sebastien-rosset committed Jul 7, 2020
    Configuration menu
    Copy the full SHA
    b312cee View commit details
    Browse the repository at this point in the history

  5. Add 'isClassnameSanitized' tag

    @sebastien-rosset
    sebastien-rosset committed Jul 7, 2020
    Configuration menu
    Copy the full SHA
    12bfcd4 View commit details
    Browse the repository at this point in the history

  6. Add 'isClassnameSanitized' tag

    @sebastien-rosset
    sebastien-rosset committed Jul 7, 2020
    Configuration menu
    Copy the full SHA
    c4a42a3 View commit details
    Browse the repository at this point in the history

  7. Add 'isClassnameSanitized' tag

    @sebastien-rosset
    sebastien-rosset committed Jul 7, 2020
    Configuration menu
    Copy the full SHA
    e701504 View commit details
    Browse the repository at this point in the history

  8. Add 'isClassnameSanitized' tag

    @sebastien-rosset
    sebastien-rosset committed Jul 7, 2020
    Configuration menu
    Copy the full SHA
    72f6a30 View commit details
    Browse the repository at this point in the history

Commits on Jul 9, 2020

  1. Merge branch 'master' of github.com:CiscoM31/openapi-generator into j… 

    …ersey2-subtype-annotation
    @sebastien-rosset
    sebastien-rosset committed Jul 9, 2020
    Configuration menu
    Copy the full SHA
    9636649 View commit details
    Browse the repository at this point in the history

Commits on Jul 14, 2020

  1. Add unit tests for unmarshaling of discriminators with special charac… 

    …ters
    @sebastien-rosset
    sebastien-rosset committed Jul 14, 2020
    Configuration menu
    Copy the full SHA
    27a0c6c View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' of github.com:CiscoM31/openapi-generator into j… 

    …ersey2-subtype-annotation
    @sebastien-rosset
    sebastien-rosset committed Jul 14, 2020
    Configuration menu
    Copy the full SHA
    05b168f View commit details
    Browse the repository at this point in the history

  3. Add unit tests for unmarshaling of discriminators with special charac… 

    …ters
    @sebastien-rosset
    sebastien-rosset committed Jul 14, 2020
    Configuration menu
    Copy the full SHA
    da0dcc1 View commit details
    Browse the repository at this point in the history

Commits on Jul 17, 2020

  1. Merge branch 'master' of github.com:CiscoM31/openapi-generator into j… 

    …ersey2-subtype-annotation
    @sebastien-rosset
    sebastien-rosset committed Jul 17, 2020
    Configuration menu
    Copy the full SHA
    2a4c15a View commit details
    Browse the repository at this point in the history

  2. use JsonTypeName

    @wing328 @sebastien-rosset
    wing328 authored and sebastien-rosset committed Jul 17, 2020
    Configuration menu
    Copy the full SHA
    1f5fc0c View commit details
    Browse the repository at this point in the history