Sync master to 5.0.x #5968

wing328 · 2020-04-17T07:53:57Z

Merge conflicts (partial):

        both modified:   modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/ElmClientCodegen.java
        both modified:   modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegen.java
        deleted by us:   modules/openapi-generator/src/main/resources/csharp-netcore/Project.mustache
        deleted by us:   modules/openapi-generator/src/main/resources/csharp-netcore/project.json.mustache
        deleted by us:   modules/openapi-generator/src/main/resources/elm/api.mustache
        deleted by us:   modules/openapi-generator/src/main/resources/elm/api018.mustache
        both modified:   modules/openapi-generator/src/main/resources/elm/customTypeDecoder.mustache
        both modified:   modules/openapi-generator/src/main/resources/elm/customTypeEncoder.mustache
        both modified:   modules/openapi-generator/src/main/resources/elm/model.mustache
        deleted by us:   modules/openapi-generator/src/main/resources/elm/modelTypeArray.mustache
        deleted by us:   modules/openapi-generator/src/main/resources/elm/modelTypePrimitive.mustache
        both modified:   modules/openapi-generator/src/main/resources/elm/recordFieldValueDecoder.mustache
        both modified:   modules/openapi-generator/src/main/resources/elm/recordFieldValueEncoder.mustache
        both modified:   modules/openapi-generator/src/main/resources/rust-server/client-mod.mustache
        both modified:   modules/openapi-generator/src/main/resources/rust-server/models.mustache
        both modified:   modules/openapi-generator/src/main/resources/rust-server/server-mod.mustache

PR checklist

Read the contribution guidelines.
If contributing template-only or documentation-only changes which will change sample output, build the project before.
Run the shell script(s) under ./bin/ (or Windows batch scripts under.\bin\windows) to update Petstore samples related to your fix. This is important, as CI jobs will verify all generator outputs of your HEAD commit, and these must match the expectations made by your contribution. You only need to run ./bin/{LANG}-petstore.sh, ./bin/openapi3/{LANG}-petstore.sh if updating the code or mustache templates for a language ({LANG}) (e.g. php, ruby, python, etc).
File the PR against the correct branch: master, 4.3.x, 5.0.x. Default: master.
Copy the technical committee to review the pull request if your PR is targeting a particular programming language.

…coding. (#5255) This way letting WebClient do its Job in encoding the URL.

* [kotlin][client] Add Jackson as serialization library * [kotlin][client] Add kotlin-client-jackson.sh to kotlin-client-all.sh * update kotlin client samples * update doc Co-authored-by: William Cheng <[email protected]>

* Add error output to the log so that we can make sure why the error occurred * Fix forbidden method invocation using default charsets

* better code format for java webclient * prefix local varaible with localVar

…#5395 (#5440) * Support for additionalProperties in the C generator. * Support for additionalProperties in the C generator.

* Fix #5420 add headers from configuration object * Add baseOptions undefined checking #5420 * Update the samples and replace array to object #5420 * Update sample

* [typescript] Clean up modelPropertyNaming across generators Fixes #2976 Generators without runtime models conversion use "original" property naming by default. It's still possible to change it via cli options Generators with runtime conversion keep using "camelCase" * Refactoring: use enum instead of string for modelPropertyNaming * Restore the original camelCase for var names, decouple it from property names * Swap toParamName and toVarName logic (looks like I've mistaken them) * Regenerate docs * Remove a no longer used private method

* Added support for msvc builds Moved GCC-specific compile flags to non msvc builds, and added equivalent flags for msvc. * CMakeLists condition cleanup

When I originally implemented the feature set code, I added the getter/setter on DefaultCodegen and CodegenConfig as well as on GeneratorMetadata. GeneratorMetadata also includes the library variation features. When I went to add library-specific features, I realized the discrepancy. This removes the public setter from DefaultCodegen/CodegenConfig, and adds a protected modifyFeatureSet which accepts a lambda and hides the builder logic away in the method. This will be a breaking change for anyone who's created a custom generator in 4.2.3, so the impact is very limited.

* [swift] make some small improvements * [swift][client] revert model to use allVars * PostProcessModelProperty with allVars * PostProcessModelProperty with vars * [swift] improve objc interoperability * [swift] fix swift4 for CI to pass * [swift] improve objc interoperability * [swift] improve objc interoperability * Swift - try to fix build * [swift] remove pods from git

* scala-sttp-client template * invoker for sttp fixed and tests added * clean up pet api test from redunant comments * docs updated * fix artefact name, model comments and redunant generic * code optimization * cross scala versions 2.11 2.12 2.13 * date serializers extracted and joda enabled as default * basic and bearer authorization added, apikey in query supported

…) (#5474) * fix obsolute configuration in generated .rubocop.yml * fix style of `expect` with block in generated ruby client's test code * update sample of ruby client

* stripped parameter enabled for all scala based generators * scala samples updated * docs generators updated * fix scalatra. regenerated by openapi3 script. manually removed enum default value from scalatra example due bug in schema extraction

* various improvements to scala sttp * update ScalaSttpClientCodegen.java * add windows batch file * test scala sttp in jdk8 * fix tempalte directory

* Use the dataType if the baseType is not set * add tests for passing enum as parameter * updated requirements file in samples * Update spec to explicitly name objects and prevent `inline_object` * use the correct scripts to generate samples (`bin/openapi3/python-flask*`)

* Adds oneOf + anyOf schemas, models and tests to python-experimental * Adds setUpClass and tearDownClass * Removes newline in method_init_shared.mustache * Regenerated v3 spec sample for python-experimental * Fxes test for discard_unknown_keys * Moves new models into existing spec, regen python-exp and go-exp * Also fix python-exp windows file

…gh it includes a C key word. (#5487)

* [go-experimental] Support aliasing of API keys * Use {{.}} inside condition * Use name instead of keyParamName for lookup * x-lookup to x-auth-id-alias

* [java] Support aliasing of API keys * Rebuild Java Jersey2 sample client * x-lookup to x-auth-id-alias * Regenerated

wing328 · 2020-04-17T09:11:13Z

@richardwhiuk when you've time, I wonder if you can help resolve the following merge conflicts when syncing master to 5.0.x branch:

        both modified:   modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/RustServerCodegen.java
        both modified:   modules/openapi-generator/src/main/resources/rust-server/client-mod.mustache
        both modified:   modules/openapi-generator/src/main/resources/rust-server/models.mustache
        both modified:   modules/openapi-generator/src/main/resources/rust-server/server-mod.mustache

(search for <<< to identify the merge conflicts)

eriktim · 2020-04-19T15:49:47Z

@wing328 for Elm please pick all versions of the 5.0.x branch. I can also push a commit if you prefer that.

wing328 · 2020-04-20T02:57:57Z

@eriktim please go ahead to update this branch 5.0-sync-master directly.

eriktim · 2020-04-20T07:26:12Z

@wing328 I've pushed the required changes. However, due to the Rust conflicts I could not test it properly. It should be fine, but please let me know if you run into issues later.

wing328 · 2020-04-20T07:27:05Z

Thanks @eriktim 👍

richardwhiuk · 2020-04-20T09:47:28Z

@wing328 Yep, I'll pick up sorting out the merge conflicts - there is a fair few to get through.

richardwhiuk · 2020-04-20T17:48:58Z

@wing328 I've fixed up the Rust failures and regenerated the rust server samples. Looks like all the other samples need updating as well - I'll leave that to you.

wing328 · 2020-04-20T17:54:43Z

@richardwhiuk thanks. Let me take care of that.

wing328 · 2020-04-22T03:45:28Z

Closed via #6006 as there seems to be in issue triggering build in CircleCI.

This reverts commit 90dd7a0.

wing328 · 2020-04-22T04:00:12Z

Sorry. pressed the wrong button. Reverted the change (90dd7a0)

etherealjoy and others added 30 commits February 25, 2020 17:21

Change the Model template (#5222)

2d6311c

Add a link to Xero blog post (#5426)

dbd89d5

Removal of Encoding in the Query-Params in order to prevent double En…

ece48d0

…coding. (#5255) This way letting WebClient do its Job in encoding the URL.

update java webclient sample

8b64f4d

[kotlin][client] Add Jackson as serialization library (#5236)

f6ef4fb

* [kotlin][client] Add Jackson as serialization library * [kotlin][client] Add kotlin-client-jackson.sh to kotlin-client-all.sh * update kotlin client samples * update doc Co-authored-by: William Cheng <[email protected]>

include kotlin jackson in CI tests (#5438)

875ff05

[Ruby] Add error output (#5428)

427adc7

* Add error output to the log so that we can make sure why the error occurred * Fix forbidden method invocation using default charsets

Update usage.md (#5443)

6ad9fbc

fix NPE for enum (#5445)

ba0d673

[Java][WebClient] better code format (#5433)

5f547b8

* better code format for java webclient * prefix local varaible with localVar

fix issue with online service (#5461)

50d21cb

Support for additionalProperties in the C generator "Client: C" solves …

b0b46d5

…#5395 (#5440) * Support for additionalProperties in the C generator. * Support for additionalProperties in the C generator.

[docs] Enable Algolia search (#5472)

ea2acf0

Fix #5420 add headers from configuration object (#5422)

a4fc319

* Fix #5420 add headers from configuration object * Add baseOptions undefined checking #5420 * Update the samples and replace array to object #5420 * Update sample

Added support for msvc builds in cpp-qt5-client generator (#5468)

ca94454

* Added support for msvc builds Moved GCC-specific compile flags to non msvc builds, and added equivalent flags for msvc. * CMakeLists condition cleanup

[Ruby] Fix obsolete configuration of Rubocop and Rubocop's warns (#5417…

cc20eb8

…) (#5474) * fix obsolute configuration in generated .rubocop.yml * fix style of `expect` with block in generated ruby client's test code * update sample of ruby client

[Scala][sttp] various improvements (#5475)

4603061

* various improvements to scala sttp * update ScalaSttpClientCodegen.java * add windows batch file * test scala sttp in jdk8 * fix tempalte directory

fix CVE-2020-8130 (#5483)

0ed1b83

[go] Add Ptr method to const enum values (#5257)

165ad45

fix rubocop warns in Ruby client's custom spec (#5488)

d094cca

[C-libcurl] The name in API parameter should not be escaped even thou…

10d5d27

…gh it includes a C key word. (#5487)

[go-experimental] Support aliasing of API keys (#4940)

35e90a5

* [go-experimental] Support aliasing of API keys * Use {{.}} inside condition * Use name instead of keyParamName for lookup * x-lookup to x-auth-id-alias

[java] Support aliasing of API keys (#4966)

a03f7a5

* [java] Support aliasing of API keys * Rebuild Java Jersey2 sample client * x-lookup to x-auth-id-alias * Regenerated

wing328 added this to the 5.0.0 milestone Apr 17, 2020

Resolve Elm merge conflicts

c1cea7f

richardwhiuk added 3 commits April 20, 2020 18:43

[Rust Server] Fix up merge conflicts

3ad1646

Update samples

2cd5bc4

[Rust Server] Add debug log for rust-server-petstore.sh

935f610

wing328 added 6 commits April 21, 2020 02:22

update samples

5a9b0fc

update more samples

fc7dda8

fix dart openapi-generator version

0f8b0ed

remove deprecated c# files

15d0982

update meta codegen

f80a5b3

fix port in pom.xml

98ea048

wing328 removed the WIP Work in Progress label Apr 21, 2020

wing328 changed the title ~~[WIP] Sync master to 5.0.x~~ Sync master to 5.0.x Apr 21, 2020

wing328 added 2 commits April 21, 2020 18:13

fix port in sample

bf4c529

update jaxrs cxf version

ac5de91

wing328 closed this Apr 21, 2020

wing328 reopened this Apr 21, 2020

wing328 merged commit 90dd7a0 into 5.0.x Apr 22, 2020

wing328 deleted the 5.0-sync-master branch April 22, 2020 03:47

wing328 added a commit that referenced this pull request Apr 22, 2020

Revert "Sync master to 5.0.x (#5968)"

5de72a7

This reverts commit 90dd7a0.

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Sync master to 5.0.x #5968

Sync master to 5.0.x #5968

wing328 commented Apr 17, 2020 •

edited

Loading

wing328 commented Apr 17, 2020

eriktim commented Apr 19, 2020

wing328 commented Apr 20, 2020

eriktim commented Apr 20, 2020

wing328 commented Apr 20, 2020

richardwhiuk commented Apr 20, 2020

richardwhiuk commented Apr 20, 2020

wing328 commented Apr 20, 2020

wing328 commented Apr 22, 2020

wing328 commented Apr 22, 2020 •

edited

Loading

Sync master to 5.0.x #5968

Sync master to 5.0.x #5968

Conversation

wing328 commented Apr 17, 2020 • edited Loading

PR checklist

wing328 commented Apr 17, 2020

eriktim commented Apr 19, 2020

wing328 commented Apr 20, 2020

eriktim commented Apr 20, 2020

wing328 commented Apr 20, 2020

richardwhiuk commented Apr 20, 2020

richardwhiuk commented Apr 20, 2020

wing328 commented Apr 20, 2020

wing328 commented Apr 22, 2020

wing328 commented Apr 22, 2020 • edited Loading

wing328 commented Apr 17, 2020 •

edited

Loading

wing328 commented Apr 22, 2020 •

edited

Loading