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
  • !14981

[JavaSpring] migrate config files to use 3.0 spec

  • Review changes

  • Download
  • Email patches
  • Plain diff
Merged William Cheng requested to merge spring-migrate-3.0-spec into master 2 years ago
  • Overview 1
  • Commits 4
  • Pipelines 0
  • Changes 88
  • migrate remaining spring config files to use 3.0 spec
  • update workflow files to include more samples

PR checklist

  • Read the contribution guidelines.
  • Pull Request title clearly describes the work in the pull request and Pull Request description provides details about how to validate the work. Missing information here may result in delayed response from the community.
  • Run the following to build the project and update samples:
    ./mvnw clean package 
    ./bin/generate-samples.sh
    ./bin/utils/export_docs_generators.sh
    Commit all changed files. This is important, as CI jobs will verify all generator outputs of your HEAD commit as it would merge with master. These must match the expectations made by your contribution. You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example ./bin/generate-samples.sh bin/configs/java*. For Windows users, please run the script in Git BASH.
  • In case you are adding a new generator, run the following additional script :
    ./bin/utils/ensure-up-to-date.sh
    Commit all changed files.
  • File the PR against the correct branch: master (6.3.0) (minor release - breaking changes with fallbacks), 7.0.x (breaking changes without fallbacks)
  • If your PR is targeting a particular programming language, @mention the technical committee members, so they are more likely to review the pull request.

cc @cachescrubber (2022/02) @welshm (2022/02) @MelleD (2022/02) @atextor (2022/02) @manedev79 (2022/02) @javisst (2022/02) @borsch (2022/02) @banlevente (2022/02) @Zomzog (2022/09)

Compare
  • master (base)

and
  • latest version
    f4568d52
    4 commits, 2 years ago

88 files
+ 3641
- 5798

    Preferences

    File browser
    Compare changes
.github/‎workflows‎
samples-s‎pring.yaml‎ +6 -1
bin/c‎onfigs‎
spring-cloud-a‎sync-oas3.yaml‎ +1 -1
spring-clou‎d-async.yaml‎ +0 -11
spring-cloud-petstore-feig‎n-spring-pageable-oas3.yaml‎ +1 -1
spring-cloud-petstore-fe‎ign-spring-pageable.yaml‎ +0 -9
spring-stub‎s-oas3.yaml‎ +1 -1
spring-stubs-skip-de‎fault-interface.yaml‎ +1 -1
spring-s‎tubs.yaml‎ +0 -10
springboot-petstore-server-spring-pag‎eable-delegatePattern-without-j8.yaml‎ +1 -1
springboot-petstore-server-spri‎ng-pageable-delegatePattern.yaml‎ +1 -1
springboot-petstore-server-sp‎ring-pageable-without-j8.yaml‎ +1 -1
springboot-petstore-ser‎ver-spring-pageable.yaml‎ +1 -1
modules/…/…/‎…/…/…/spring‎
petstore-with-fake-endpoints-models-‎for-testing-with-spring-pageable.yaml‎ +2170 -0
petstore-with-spr‎ing-pageable.yaml‎ +733 -0
sam‎ples‎
client/‎petstore‎
spring-cl‎oud-async‎
.openapi-‎generator‎
FI‎LES‎ +0 -16
VER‎SION‎ +0 -1
src/main/java/o‎rg/openapitools‎
a‎pi‎
PetAp‎i.java‎ +0 -309
PetApiCl‎ient.java‎ +0 -8
StoreA‎pi.java‎ +0 -147
StoreApiC‎lient.java‎ +0 -8
UserAp‎i.java‎ +0 -244
UserApiCl‎ient.java‎ +0 -8
config‎uration‎
ApiKeyRequestI‎nterceptor.java‎ +0 -31
ClientConfig‎uration.java‎ +0 -48
mo‎del‎
Catego‎ry.java‎ +0 -109
ModelApiRe‎sponse.java‎ +0 -135
Order‎.java‎ +0 -246
Tag.‎java‎ +0 -109
User‎.java‎ +0 -253
.openapi-gen‎erator-ignore‎ +0 -23
READ‎ME.md‎ +0 -53
pom‎.xml‎ +0 -82
spring-cloud-s‎pring-pageable‎
.openapi-‎generator‎
FI‎LES‎ +0 -16
VER‎SION‎ +0 -1
src/main/java/o‎rg/openapitools‎
a‎pi‎
PetAp‎i.java‎ +0 -312
PetApiCl‎ient.java‎ +0 -8
StoreA‎pi.java‎ +0 -146
StoreApiC‎lient.java‎ +0 -8
UserAp‎i.java‎ +0 -266
UserApiCl‎ient.java‎ +0 -8
config‎uration‎
ApiKeyRequestI‎nterceptor.java‎ +0 -31
ClientConfig‎uration.java‎ +0 -48
mo‎del‎
Catego‎ry.java‎ +0 -109
ModelApiRe‎sponse.java‎ +0 -135
Order‎.java‎ +0 -246
Tag.‎java‎ +0 -109
User‎.java‎ +0 -253
.openapi-gen‎erator-ignore‎ +0 -23
READ‎ME.md‎ +0 -53
pom‎.xml‎ +0 -82
openapi3/cli‎ent/petstore‎
spring-cloud-async/‎…/…/…/…/openapitools‎
a‎pi‎
PetAp‎i.java‎ +36 -11
StoreA‎pi.java‎ +6 -3
UserAp‎i.java‎ +45 -13
mo‎del‎
Catego‎ry.java‎ +1 -1
spring-stubs/src/…‎/…/org/openapitools‎
a‎pi‎
PetAp‎i.java‎ +64 -11
StoreA‎pi.java‎ +6 -3
UserAp‎i.java‎ +45 -13
mo‎del‎
Catego‎ry.java‎ +1 -1
…/…/…‎/…/…/…‎
a‎pi‎
PetAp‎i.java‎ +36 -11
StoreA‎pi.java‎ +6 -3
UserAp‎i.java‎ +45 -13
mo‎del‎
Catego‎ry.java‎ +1 -1
server/‎petstore‎
spring‎-stubs‎
.openapi-‎generator‎
FI‎LES‎ +0 -12
VER‎SION‎ +0 -1
src/main/java/o‎rg/openapitools‎
a‎pi‎
ApiUti‎l.java‎ +0 -19
PetAp‎i.java‎ +0 -387
StoreA‎pi.java‎ +0 -190
UserAp‎i.java‎ +0 -285
mo‎del‎
Catego‎ry.java‎ +0 -109
ModelApiRe‎sponse.java‎ +0 -135
Order‎.java‎ +0 -246
Tag.‎java‎ +0 -109
User‎.java‎ +0 -253
.openapi-gen‎erator-ignore‎ +0 -23
READ‎ME.md‎ +0 -27
pom‎.xml‎ +0 -83
springboot-spring‎-pageable/src/main‎
java/org/open‎apitools/model‎
SpecialMod‎elName.java‎ +3 -3
TypeHolderE‎xample.java‎ +1 -1
reso‎urces‎
openap‎i.yaml‎ +104 -24
…/‎…/…‎
java/org/open‎apitools/model‎
SpecialMod‎elName.java‎ +3 -3
TypeHolderE‎xample.java‎ +1 -1
reso‎urces‎
openap‎i.yaml‎ +104 -24
…/‎…/…‎
java/org/open‎apitools/model‎
SpecialMod‎elName.java‎ +3 -3
TypeHolderE‎xample.java‎ +1 -1
reso‎urces‎
openap‎i.yaml‎ +104 -24
…/‎…/…‎
java/org/open‎apitools/model‎
SpecialMod‎elName.java‎ +3 -3
TypeHolderE‎xample.java‎ +1 -1
reso‎urces‎
openap‎i.yaml‎ +104 -24
.github/workflows/samples-spring.yaml
+ 6
- 1
  • View file @ f4568d52

  • Edit in single-file editor

  • Open in Web IDE


@@ -22,9 +22,10 @@ jobs:
- samples/openapi3/client/petstore/spring-cloud
- samples/client/petstore/spring-cloud-date-time
- samples/openapi3/client/petstore/spring-cloud-date-time
- samples/client/petstore/spring-stubs
- samples/openapi3/client/petstore/spring-stubs
- samples/openapi3/client/petstore/spring-stubs-skip-default-interface
- samples/openapi3/client/petstore/spring-cloud-async
- samples/openapi3/client/petstore/spring-cloud-spring-pageable
# servers
- samples/server/petstore/springboot
- samples/openapi3/server/petstore/springboot
@@ -41,6 +42,10 @@ jobs:
- samples/openapi3/server/petstore/spring-boot-oneof
- samples/server/petstore/springboot-virtualan
- samples/server/petstore/springboot-implicitHeaders-annotationLibrary
- samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8
- samples/server/petstore/springboot-spring-pageable-delegatePattern
- samples/server/petstore/springboot-spring-pageable-without-j8
- samples/server/petstore/springboot-spring-pageable
steps:
- uses: actions/checkout@v3
- uses: actions/setup-java@v3
bin/configs/spring-cloud-async-oas3.yaml
+ 1
- 1
  • View file @ f4568d52

  • Edit in single-file editor

  • Open in Web IDE


generatorName: spring
outputDir: samples/openapi3/client/petstore/spring-cloud-async
library: spring-cloud
inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
templateDir: modules/openapi-generator/src/main/resources/JavaSpring
additionalProperties:
groupId: org.openapitools.openapi3
bin/configs/spring-cloud-async.yaml deleted 100644 → 0
+ 0
- 11
  • View file @ 02b62485

generatorName: spring
outputDir: samples/client/petstore/spring-cloud-async
library: spring-cloud
inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
templateDir: modules/openapi-generator/src/main/resources/JavaSpring
additionalProperties:
documentationProvider: springfox
async: "true"
java8: "true"
artifactId: petstore-spring-cloud
hideGenerationTimestamp: "true"
bin/configs/spring-cloud-petstore-feign-spring-pageable-oas3.yaml
+ 1
- 1
  • View file @ f4568d52

  • Edit in single-file editor

  • Open in Web IDE


generatorName: spring
outputDir: samples/openapi3/client/petstore/spring-cloud-spring-pageable
library: spring-cloud
inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-spring-pageable.yaml
inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-spring-pageable.yaml
templateDir: modules/openapi-generator/src/main/resources/JavaSpring
additionalProperties:
groupId: org.openapitools.openapi3
bin/configs/spring-cloud-petstore-feign-spring-pageable.yaml deleted 100644 → 0
+ 0
- 9
  • View file @ 02b62485

generatorName: spring
outputDir: samples/client/petstore/spring-cloud-spring-pageable
library: spring-cloud
inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-spring-pageable.yaml
templateDir: modules/openapi-generator/src/main/resources/JavaSpring
additionalProperties:
documentationProvider: springfox
artifactId: spring-cloud-spring-pageable
hideGenerationTimestamp: 'true'
bin/configs/spring-stubs-oas3.yaml
+ 1
- 1
  • View file @ f4568d52

  • Edit in single-file editor

  • Open in Web IDE


generatorName: spring
outputDir: samples/openapi3/client/petstore/spring-stubs
inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
templateDir: modules/openapi-generator/src/main/resources/JavaSpring
additionalProperties:
groupId: org.openapitools.openapi3
bin/configs/spring-stubs-skip-default-interface.yaml
+ 1
- 1
  • View file @ f4568d52

  • Edit in single-file editor

  • Open in Web IDE


generatorName: spring
outputDir: samples/openapi3/client/petstore/spring-stubs-skip-default-interface
inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
templateDir: modules/openapi-generator/src/main/resources/JavaSpring
additionalProperties:
groupId: org.openapitools.openapi3
bin/configs/spring-stubs.yaml deleted 100644 → 0
+ 0
- 10
  • View file @ 02b62485

generatorName: spring
outputDir: samples/server/petstore/spring-stubs
inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore.yaml
templateDir: modules/openapi-generator/src/main/resources/JavaSpring
additionalProperties:
documentationProvider: springfox
artifactId: spring-stubs
interfaceOnly: "true"
singleContentTypes: "true"
hideGenerationTimestamp: "true"
bin/configs/springboot-petstore-server-spring-pageable-delegatePattern-without-j8.yaml
+ 1
- 1
  • View file @ f4568d52

  • Edit in single-file editor

  • Open in Web IDE


generatorName: spring
outputDir: samples/server/petstore/springboot-spring-pageable-delegatePattern-without-j8
library: spring-boot
inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml
inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml
templateDir: modules/openapi-generator/src/main/resources/JavaSpring
delegatePattern: true
java8: false
bin/configs/springboot-petstore-server-spring-pageable-delegatePattern.yaml
+ 1
- 1
  • View file @ f4568d52

  • Edit in single-file editor

  • Open in Web IDE


generatorName: spring
outputDir: samples/server/petstore/springboot-spring-pageable-delegatePattern
library: spring-boot
inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml
inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml
templateDir: modules/openapi-generator/src/main/resources/JavaSpring
delegatePattern: true
additionalProperties:
bin/configs/springboot-petstore-server-spring-pageable-without-j8.yaml
+ 1
- 1
  • View file @ f4568d52

  • Edit in single-file editor

  • Open in Web IDE


generatorName: spring
outputDir: samples/server/petstore/springboot-spring-pageable-without-j8
library: spring-boot
inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml
inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml
templateDir: modules/openapi-generator/src/main/resources/JavaSpring
java8: false
additionalProperties:
bin/configs/springboot-petstore-server-spring-pageable.yaml
+ 1
- 1
  • View file @ f4568d52

  • Edit in single-file editor

  • Open in Web IDE


generatorName: spring
outputDir: samples/server/petstore/springboot-spring-pageable
library: spring-boot
inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml
inputSpec: modules/openapi-generator/src/test/resources/3_0/spring/petstore-with-fake-endpoints-models-for-testing-with-spring-pageable.yaml
templateDir: modules/openapi-generator/src/main/resources/JavaSpring
additionalProperties:
documentationProvider: springfox
0 Assignees
None
Assign to
2 Reviewers
Oleh Kurpiak's avatar
Oleh Kurpiak
Jim Schubert's avatar
Jim Schubert
Request review from
Labels
3
Enhancement: CI/Test Server: Java Server: Spring
3
Enhancement: CI/Test Server: Java Server: Spring
    Assign labels
  • Manage project labels

Milestone
6.5.0
6.5.0 (expired)
None
Time tracking
No estimate or time spent
Lock merge request
Unlocked
4
4 participants
Jim Schubert
Oleh Kurpiak
Administrator
William Cheng
Reference: OpenAPITools/openapi-generator!14981
Source branch: spring-migrate-3.0-spec

Menu

Explore Projects Groups Snippets