Skip to content
GitLab
    • Explore Projects Groups Snippets
Projects Groups Snippets
  • /
  • Help
    • Help
    • Support
    • Community forum
    • Submit feedback
    • Contribute to GitLab
  • Sign in / Register
  • O openapi-generator
  • Project information
    • Project information
    • Activity
    • Labels
    • Members
  • Repository
    • Repository
    • Files
    • Commits
    • Branches
    • Tags
    • Contributors
    • Graph
    • Compare
  • Issues 3,476
    • Issues 3,476
    • List
    • Boards
    • Service Desk
    • Milestones
  • Merge requests 402
    • Merge requests 402
  • CI/CD
    • CI/CD
    • Pipelines
    • Jobs
    • Schedules
  • Deployments
    • Deployments
    • Environments
    • Releases
  • Packages and registries
    • Packages and registries
    • Package Registry
    • Infrastructure Registry
  • Monitor
    • Monitor
    • Incidents
  • Analytics
    • Analytics
    • Value stream
    • CI/CD
    • Repository
  • Wiki
    • Wiki
  • Snippets
    • Snippets
  • Activity
  • Graph
  • Create a new issue
  • Jobs
  • Commits
  • Issue Boards
Collapse sidebar
  • OpenAPI Tools
  • openapi-generator
  • Merge requests
  • !1725

Skip default value for container in Spring generators

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged William Cheng requested to merge fix_spring_default into master 6 years ago
  • Overview 0
  • Commits 2
  • Pipelines 0
  • Changes 36

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.

Description of the PR

For https://github.com/OpenAPITools/openapi-generator/pull/1552

cc @bbdouglas (2017/07) @JFCote (2017/08) @sreeshas (2017/08) @jfiala (2017/08) @lukoyanov (2017/09) @cbornet (2017/09) @jeff9finger (2018/01)

Compare
  • master (base)

and
  • latest version
    7f533ddd
    2 commits, 2 years ago

36 files
+ 52
- 52

    Preferences

    File browser
    Compare changes
modules/…/…/…‎/…/JavaSpring‎
libraries/s‎pring-cloud‎
formParam‎s.mustache‎ +1 -1
bodyParam‎s.mustache‎ +1 -1
formParam‎s.mustache‎ +1 -1
headerPara‎ms.mustache‎ +1 -1
pathParam‎s.mustache‎ +1 -1
queryParam‎s.mustache‎ +1 -1
sam‎ples‎
client/‎petstore‎
spring-cloud/src/…/‎…/…/openapitools/api‎
PetAp‎i.java‎ +2 -2
spring-stubs/src/…/‎…/…/openapitools/api‎
PetAp‎i.java‎ +2 -2
server/‎petstore‎
spring-mvc-j8-asy‎nc/src/…/…/…/…/api‎
FakeAp‎i.java‎ +1 -1
PetAp‎i.java‎ +2 -2
spring-mvc-j8-local‎datetime/…/…/…/…/…/…‎
FakeAp‎i.java‎ +1 -1
PetAp‎i.java‎ +2 -2
spring-mvc/src/…/…‎/…/openapitools/api‎
FakeAp‎i.java‎ +1 -1
FakeApiCont‎roller.java‎ +1 -1
PetAp‎i.java‎ +2 -2
PetApiCont‎roller.java‎ +2 -2
springboot-beanvali‎dation/…/…/…/…/…/api‎
FakeAp‎i.java‎ +1 -1
FakeApiCont‎roller.java‎ +1 -1
PetAp‎i.java‎ +2 -2
PetApiCont‎roller.java‎ +2 -2
springboot-delegate‎-j8/src/…/…/…/…/api‎
FakeAp‎i.java‎ +1 -1
PetAp‎i.java‎ +2 -2
springboot-delega‎te/src/…/…/…/…/api‎
FakeAp‎i.java‎ +1 -1
FakeApiCont‎roller.java‎ +1 -1
PetAp‎i.java‎ +2 -2
PetApiCont‎roller.java‎ +2 -2
springboot-implicit‎Headers/…/…/…/…/…/…‎
FakeAp‎i.java‎ +1 -1
PetAp‎i.java‎ +2 -2
springboot-reacti‎ve/src/…/…/…/…/api‎
FakeAp‎i.java‎ +1 -1
PetAp‎i.java‎ +2 -2
springboot-useoptio‎nal/src/…/…/…/…/api‎
FakeAp‎i.java‎ +1 -1
PetAp‎i.java‎ +2 -2
springboot-virtuala‎n/src/…/…/…/…/…/api‎
FakeAp‎i.java‎ +1 -1
PetAp‎i.java‎ +2 -2
springboot/src/…/…‎/…/openapitools/api‎
FakeAp‎i.java‎ +1 -1
PetAp‎i.java‎ +2 -2
modules/openapi-generator/src/main/resources/JavaSpring/libraries/spring-cloud/formParams.mustache
+ 1
- 1
  • View file @ 7f533ddd

  • Edit in single-file editor

  • Open in Web IDE

{{#isFormParam}}{{^isFile}}@ApiParam(value = "{{{description}}}"{{#required}}, required=true{{/required}} {{#allowableValues}}, allowableValues="{{{allowableValues}}}"{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) @RequestParam(value="{{baseName}}"{{#required}}, required=true{{/required}}{{^required}}, required=false{{/required}}) {{{dataType}}} {{paramName}}{{/isFile}}{{#isFile}}@ApiParam(value = "file detail") @RequestParam("{{baseName}}") MultipartFile {{paramName}}{{/isFile}}{{/isFormParam}}
\ No newline at end of file
{{#isFormParam}}{{^isFile}}@ApiParam(value = "{{{description}}}"{{#required}}, required=true{{/required}} {{#allowableValues}}, allowableValues="{{{allowableValues}}}"{{/allowableValues}}{{^isContainer}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}{{/isContainer}}) @RequestParam(value="{{baseName}}"{{#required}}, required=true{{/required}}{{^required}}, required=false{{/required}}) {{{dataType}}} {{paramName}}{{/isFile}}{{#isFile}}@ApiParam(value = "file detail") @RequestParam("{{baseName}}") MultipartFile {{paramName}}{{/isFile}}{{/isFormParam}}
\ No newline at end of file
modules/openapi-generator/src/main/resources/JavaSpring/bodyParams.mustache
+ 1
- 1
  • View file @ 7f533ddd

  • Edit in single-file editor

  • Open in Web IDE

{{#isBodyParam}}@ApiParam(value = "{{{description}}}" {{#required}},required=true{{/required}} {{^isContainer}}{{#allowableValues}}, allowableValues="{{{allowableValues}}}"{{/allowableValues}}{{/isContainer}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) {{#useBeanValidation}}@Valid{{/useBeanValidation}} @RequestBody {{^reactive}}{{{dataType}}}{{/reactive}}{{#reactive}}{{^isListContainer}}Mono{{/isListContainer}}{{#isListContainer}}Flux{{/isListContainer}}<{{{baseType}}}>{{/reactive}} {{paramName}}{{/isBodyParam}}
\ No newline at end of file
{{#isBodyParam}}@ApiParam(value = "{{{description}}}" {{#required}},required=true{{/required}} {{^isContainer}}{{#allowableValues}}, allowableValues="{{{allowableValues}}}"{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}{{/isContainer}}) {{#useBeanValidation}}@Valid{{/useBeanValidation}} @RequestBody {{^reactive}}{{{dataType}}}{{/reactive}}{{#reactive}}{{^isListContainer}}Mono{{/isListContainer}}{{#isListContainer}}Flux{{/isListContainer}}<{{{baseType}}}>{{/reactive}} {{paramName}}{{/isBodyParam}}
\ No newline at end of file
modules/openapi-generator/src/main/resources/JavaSpring/formParams.mustache
+ 1
- 1
  • View file @ 7f533ddd

  • Edit in single-file editor

  • Open in Web IDE

{{#isFormParam}}{{^isFile}}@ApiParam(value = "{{{description}}}"{{#required}}, required=true{{/required}}{{#allowableValues}}, allowableValues="{{#values}}{{{.}}}{{^-last}}, {{/-last}}{{#-last}}{{/-last}}{{/values}}"{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) @RequestParam(value="{{baseName}}"{{#required}}, required=true{{/required}}{{^required}}, required=false{{/required}}) {{{dataType}}} {{paramName}}{{/isFile}}{{#isFile}}@ApiParam(value = "file detail") {{#useBeanValidation}}@Valid{{/useBeanValidation}} @RequestPart("file") MultipartFile {{baseName}}{{/isFile}}{{/isFormParam}}
\ No newline at end of file
{{#isFormParam}}{{^isFile}}@ApiParam(value = "{{{description}}}"{{#required}}, required=true{{/required}}{{#allowableValues}}, allowableValues="{{#values}}{{{.}}}{{^-last}}, {{/-last}}{{#-last}}{{/-last}}{{/values}}"{{/allowableValues}}{{^isContainer}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}{{/isContainer}}) @RequestParam(value="{{baseName}}"{{#required}}, required=true{{/required}}{{^required}}, required=false{{/required}}) {{{dataType}}} {{paramName}}{{/isFile}}{{#isFile}}@ApiParam(value = "file detail") {{#useBeanValidation}}@Valid{{/useBeanValidation}} @RequestPart("file") MultipartFile {{baseName}}{{/isFile}}{{/isFormParam}}
\ No newline at end of file
modules/openapi-generator/src/main/resources/JavaSpring/headerParams.mustache
+ 1
- 1
  • View file @ 7f533ddd

  • Edit in single-file editor

  • Open in Web IDE

{{#isHeaderParam}}@ApiParam(value = "{{{description}}}" {{#required}},required=true{{/required}}{{#allowableValues}}, allowableValues="{{#values}}{{{.}}}{{^-last}}, {{/-last}}{{#-last}}{{/-last}}{{/values}}"{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) @RequestHeader(value="{{baseName}}", required={{#required}}true{{/required}}{{^required}}false{{/required}}) {{>optionalDataType}} {{paramName}}{{/isHeaderParam}}
\ No newline at end of file
{{#isHeaderParam}}@ApiParam(value = "{{{description}}}" {{#required}},required=true{{/required}}{{#allowableValues}}, allowableValues="{{#values}}{{{.}}}{{^-last}}, {{/-last}}{{#-last}}{{/-last}}{{/values}}"{{/allowableValues}}{{^isContainer}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}{{/isContainer}}) @RequestHeader(value="{{baseName}}", required={{#required}}true{{/required}}{{^required}}false{{/required}}) {{>optionalDataType}} {{paramName}}{{/isHeaderParam}}
\ No newline at end of file
modules/openapi-generator/src/main/resources/JavaSpring/pathParams.mustache
+ 1
- 1
  • View file @ 7f533ddd

  • Edit in single-file editor

  • Open in Web IDE

{{#isPathParam}}{{#useBeanValidation}}{{>beanValidationPathParams}}{{/useBeanValidation}}@ApiParam(value = "{{{description}}}"{{#required}},required=true{{/required}}{{#allowableValues}}, allowableValues = "{{#enumVars}}{{#lambdaEscapeDoubleQuote}}{{{value}}}{{/lambdaEscapeDoubleQuote}}{{^-last}}, {{/-last}}{{#-last}}{{/-last}}{{/enumVars}}"{{/allowableValues}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}) @PathVariable("{{baseName}}") {{>optionalDataType}} {{paramName}}{{/isPathParam}}
\ No newline at end of file
{{#isPathParam}}{{#useBeanValidation}}{{>beanValidationPathParams}}{{/useBeanValidation}}@ApiParam(value = "{{{description}}}"{{#required}},required=true{{/required}}{{#allowableValues}}, allowableValues = "{{#enumVars}}{{#lambdaEscapeDoubleQuote}}{{{value}}}{{/lambdaEscapeDoubleQuote}}{{^-last}}, {{/-last}}{{#-last}}{{/-last}}{{/enumVars}}"{{/allowableValues}}{{^isContainer}}{{#defaultValue}}, defaultValue="{{{defaultValue}}}"{{/defaultValue}}{{/isContainer}}) @PathVariable("{{baseName}}") {{>optionalDataType}} {{paramName}}{{/isPathParam}}
\ No newline at end of file
0 Assignees
None
Assign to
0 Reviewers
None
Request review from
Labels
2
Enhancement: General Server: Spring
2
Enhancement: General Server: Spring
    Assign labels
  • Manage project labels

Milestone
4.0.0
4.0.0 (expired)
None
Time tracking
No estimate or time spent
Lock merge request
Unlocked
1
1 participant
William Cheng
Reference: OpenAPITools/openapi-generator!1725
Source branch: fix_spring_default

Menu

Explore Projects Groups Snippets