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.

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

Generate setters for readonly properties in server code #1582

Merged
merged 4 commits into from
Mar 31, 2019

Conversation

tsiq-karold
Copy link
Contributor

@tsiq-karold tsiq-karold commented Nov 30, 2018

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

Fixes #1376.

I explored a couple of other alternatives, namely passing the tag (i.e. CodegenType) to the template and switching there or adding another property to the data passed to the template to indicate that a setter should be generated. Unfortunately, they didn't really work or were horrendously messy.

Please note I have run only ./bin/jaxrs-petstore-server.sh which generated new methods which can be seen in this PR and ./bin/java-petstore-jersey2.sh which generated no changes as expected. This change does impact all generators and I ran ./bin/run-all-petstore locally successfully but the message that printed said not to run it. It also changed some 900 files under samples which I thought would massively pollute this PR. Happy to do that if it's necessary though.

@tsiq-karold
Copy link
Contributor Author

The build failure in Travis seems totally unrelated to my change and I see it across a number of PRs.

@tsiq-karold
Copy link
Contributor Author

Looks like I'll need to run all the petstore samples as their differences fail the CircleCI build. How is this normally handled? It's going to generate a PR with ~900 files changed when the actual change is in one class.

@tsiq-karold
Copy link
Contributor Author

Can someone take a look at this PR please?

@wing328
Copy link
Member

wing328 commented Jan 22, 2019

@tsiq-karold sorry that I miss your message earlier. I'll have a look tomorrow.

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

@@ -480,6 +480,10 @@ private Model getParent(Model model) {
}
}

if (config.getTag() == CodegenType.SERVER) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@tsiq-karold Shall we use .equals() instead of == for string comparision?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These aren't strings, CodegenType is an enum.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Ah you're right. Completely forgot about that.

CodegenModel model = (CodegenModel) modelTemplate.get("model");

if (model != null && model.vars != null) {
model.vars.forEach((var) -> var.isReadOnly = false);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Here is the definitoin of readOnly in OAS v3:

Relevant only for Schema "properties" definitions. Declares the property as "read only". This means that it MAY be sent as part of a response but SHOULD NOT be sent as part of the request. If the property is marked as readOnly being true and is in the required list, the required will take effect on the response only. A property MUST NOT be marked as both readOnly and writeOnly being true. Default value is false.

Instead of forcing all readOnly to false in all model's properties, what about updating the server's model templates instead to remove isReadOnly mustache tag? e.g. https://github.com/OpenAPITools/openapi-generator/blob/master/modules/openapi-generator/src/main/resources/JavaJaxRS/pojo.mustache#L90

Copy link
Contributor Author

@tsiq-karold tsiq-karold Jan 23, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

That would also work although it's then a change that has to be applied per language and potentially library. It would at least solve my problem with updating petstore 😄

@tsiq-karold
Copy link
Contributor Author

Hi @wing328, this should be good to review again. I followed your suggested approach and have updated the relevant petstore generated files.

@cbornet
Copy link
Member

cbornet commented Jan 23, 2019

LGTM

@tsiq-karold
Copy link
Contributor Author

@wing328 any chance we could get this into 4.0.0?

@wing328 wing328 merged commit 822234d into OpenAPITools:master Mar 31, 2019
@wing328
Copy link
Member

wing328 commented Mar 31, 2019

@tsiq-karold sorry missed your reply. I've just merged it. Thanks again for the contribution.

@wing328 wing328 added this to the 4.0.0 milestone Mar 31, 2019
jimschubert added a commit to jimschubert/openapi-generator that referenced this pull request Apr 1, 2019
* master: (48 commits)
  [Typescript AngularJS] fix Extra package prefix in api parameters operations (OpenAPITools#2522)
  OpenAPITools#1023 - [Scala] Use status family during response processing (OpenAPITools#1024)
  Generate setters for readonly properties in server code (OpenAPITools#1582)
  [JS] fix NPE for null string and improve Travis config file (OpenAPITools#2553)
  [elm] Update ISO 8601 library (fixes missing time zone designator) (OpenAPITools#2545)
  [csharp] update sample after OpenAPITools#2528 (OpenAPITools#2550)
  [JavaScript] fix index.js, ApiClient.js and test files generated to incorrect location (OpenAPITools#2511)
  Aspnetcore nullable support (OpenAPITools#2529)
  Csharp nullable support (OpenAPITools#2528)
  [C++] [Qt5] Add enum support for client and server (OpenAPITools#2339)
  Fixed typo in migration-from-swagger-codegen.md (OpenAPITools#2548)
  [TypeScript Client] fix install Aurelia + fix use deprecated function (OpenAPITools#2514)
  [KOTLIN] fix var name not correctly sanitized (OpenAPITools#2537)
  Update swagger-parser to '2.0.11-OpenAPITools.org-1' (OpenAPITools#2262)
  Add @karismann to Java and Kotlin technical committee (OpenAPITools#2542)
  Add GoDaddy to the list of companies using OpenAPI Generator (OpenAPITools#2541)
  [Kotlin SpringBoot Server] alternative: fix optional parameter not correctly declared in service (OpenAPITools#2539)
  improve indentation, update dependencies (OpenAPITools#2521)
  update kotlin spring samples
  [JAVA] Use specified data type in enum's fromValue instead of string (OpenAPITools#2347)
  ...
jimschubert added a commit that referenced this pull request Apr 2, 2019
* master: (133 commits)
  #2503: fix out-of-memory issue with nested objects with arrays with maxItems set by limiting to max. 5 example items (#2536)
  remove emitDefaultValue option (#2559)
  fix EmitDefaultValue default vallue with false (#2558)
  Added API Key auth to rust-server (#2459)
  remove initialCaps and replace with camelize (#2546)
  Add packageName configuration to maven (#2429)
  [Typescript AngularJS] fix Extra package prefix in api parameters operations (#2522)
  #1023 - [Scala] Use status family during response processing (#1024)
  Generate setters for readonly properties in server code (#1582)
  [JS] fix NPE for null string and improve Travis config file (#2553)
  [elm] Update ISO 8601 library (fixes missing time zone designator) (#2545)
  [csharp] update sample after #2528 (#2550)
  [JavaScript] fix index.js, ApiClient.js and test files generated to incorrect location (#2511)
  Aspnetcore nullable support (#2529)
  Csharp nullable support (#2528)
  [C++] [Qt5] Add enum support for client and server (#2339)
  Fixed typo in migration-from-swagger-codegen.md (#2548)
  [TypeScript Client] fix install Aurelia + fix use deprecated function (#2514)
  [KOTLIN] fix var name not correctly sanitized (#2537)
  Update swagger-parser to '2.0.11-OpenAPITools.org-1' (#2262)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants