Skip to content

Commit 8ed1e68

Browse files
committed
Merge branch 'master' of https://github.com/OpenAPITools/openapi-generator into OpenAPITools-master
2 parents 39bb52e + 9c66d33 commit 8ed1e68

File tree

4,092 files changed

+93836
-13102
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

4,092 files changed

+93836
-13102
lines changed

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,5 @@
1616
These must match the expectations made by your contribution.
1717
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*`.
1818
For Windows users, please run the script in [Git BASH](https://gitforwindows.org/).
19-
- [ ] File the PR against the [correct branch](https://github.com/OpenAPITools/openapi-generator/wiki/Git-Branches): `master`, `5.3.x`, `6.0.x`
19+
- [ ] File the PR against the [correct branch](https://github.com/OpenAPITools/openapi-generator/wiki/Git-Branches): `master` (5.3.0), `6.0.x`
2020
- [ ] If your PR is targeting a particular programming language, @mention the [technical committee](https://github.com/openapitools/openapi-generator/#62---openapi-generator-technical-committee) members, so they are more likely to review the pull request.

.gitignore

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -176,12 +176,15 @@ samples/client/petstore/python-tornado/.venv/
176176

177177
# PHP
178178
samples/client/petstore/php/OpenAPIClient-php/composer.lock
179+
samples/client/petstore/php-dt/composer.lock
180+
samples/client/petstore/php-dt-modern/composer.lock
179181
samples/openapi3/server/petstore/php-symfony/SymfonyBundle-php/composer.lock
180182
samples/server/petstore/php-laravel/lib/composer.lock
181183
samples/server/petstore/php-lumen/lib/composer.lock
182184
samples/server/petstore/php-slim4/composer.lock
183185
samples/server/petstore/php-symfony/SymfonyBundle-php/composer.lock
184186
samples/server/petstore/php-mezzio-ph/composer.lock
187+
samples/server/petstore/php-mezzio-ph-modern/composer.lock
185188

186189
# ts
187190
samples/client/petstore/typescript-angular2/npm/npm-debug.log
@@ -212,7 +215,9 @@ cabal.project.local
212215
samples/client/petstore/haskell-http-client/docs/haddock-bundle.min.js
213216
samples/client/petstore/haskell-http-client/docs/meta.json
214217
samples/client/petstore/haskell-http-client/docs/quick-jump.css
218+
samples/client/petstore/haskell-http-client/stack.yaml.lock
215219
samples/server/petstore/haskell-servant/stack.yaml.lock
220+
samples/server/petstore/haskell-yesod/stack.yaml.lock
216221

217222
# R
218223
.Rproj.user

README.md

Lines changed: 16 additions & 20 deletions
Large diffs are not rendered by default.
File renamed without changes.

bin/configs/go-petstore.yaml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,3 +7,4 @@ additionalProperties:
77
packageName: petstore
88
disallowAdditionalPropertiesIfNotPresent: false
99
generateInterfaces: true
10+
skipReadonlyPropertiesInInt: false
Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
generatorName: haskell-yesod
2+
outputDir: samples/server/petstore/haskell-yesod
3+
inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
4+
templateDir: modules/openapi-generator/src/main/resources/haskell-yesod
5+
additionalProperties:
6+
hideGenerationTimestamp: "true"
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
generatorName: java
2+
outputDir: samples/client/petstore/java/apache-httpclient
3+
library: apache-httpclient
4+
inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
5+
templateDir: modules/openapi-generator/src/main/resources/Java
6+
additionalProperties:
7+
artifactId: petstore-apache-httpclient
8+
hideGenerationTimestamp: true
Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
generatorName: java-micronaut-client
2+
outputDir: samples/client/petstore/java-micronaut-client/
3+
inputSpec: modules/openapi-generator/src/test/resources/2_0/petstore-with-fake-endpoints-models-for-testing.yaml
4+
additionalProperties:
5+
artifactId: petstore-micronaut
6+
hideGenerationTimestamp: "true"
7+
configureAuth: "false"
8+
build: "all"
9+
test: "spock"

bin/configs/php-dt-modern.yaml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
generatorName: php-dt
2+
outputDir: samples/client/petstore/php-dt-modern
3+
inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
4+
templateDir: modules/openapi-generator/src/main/resources/php-dt-modern
5+
additionalProperties:
6+
modern: "true"

bin/configs/php-dt.yaml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
generatorName: php-dt
2+
outputDir: samples/client/petstore/php-dt
3+
inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore.yaml
4+
templateDir: modules/openapi-generator/src/main/resources/php-dt

0 commit comments

Comments
 (0)