Skip to content

Commit cf2435f

Browse files
l3enderl3ender
authored
Add support for controlling output of OpenAPI Generator version in generated files (#17952)
* add initial openapi config and java generated files * add java implementation for adding generator version * regenerate sample client files * remove tabs * only show generated version if build info exists * set build info for batch generation * update generator doc for new global flag * use existing property for generator version * update templates to include generator version * update templates for better generator version syntax * revert undesired changes * regenerate samples for openapi client * update templates to correct formatting/newlines * correct description text and add to usage doc * add generator cli option for all codegen types * use more concise version info; update existing codegens to support new prop * correct wrong prop reference * add initial test coverage for new prop * update last (scala) templates with new prop * update samples after upstream merge * use consistent version output * use better sample project id/name * revert using option for generator version in templates
1 parent c87ad56 commit cf2435f

5,612 files changed

Lines changed: 34853 additions & 5131 deletions

File tree

Some content is hidden

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

‎bin/configs/java-apache-generator-version.yaml‎

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-generator-version
3+
library: apache-httpclient
4+
inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
5+
templateDir: modules/openapi-generator/src/main/resources/Java
6+
additionalProperties:
7+
artifactId: apache-httpclient-generator-version
8+
hideGenerationTimestamp: true

‎modules/openapi-generator-maven-plugin/examples/templates/README.mustache‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
- Build date: {{generatedDate}}
1111
{{/hideGenerationTimestamp}}
1212

13+
- Generator version: {{generatorVersion}}
14+
1315
{{#appDescriptionWithNewLines}}{{{appDescriptionWithNewLines}}}{{/appDescriptionWithNewLines}}
1416

1517
{{#infoUrl}}

‎modules/openapi-generator-maven-plugin/src/it/custom-template/templates/README.mustache‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
- Build date: {{generatedDate}}
1111
{{/hideGenerationTimestamp}}
1212

13+
- Generator version: {{generatorVersion}}
14+
1315
{{#appDescriptionWithNewLines}}{{{appDescriptionWithNewLines}}}{{/appDescriptionWithNewLines}}
1416

1517
{{#infoUrl}}

‎modules/openapi-generator-maven-plugin/src/it/jaxrs-jersey2/templates/README.mustache‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
- Build date: {{generatedDate}}
1111
{{/hideGenerationTimestamp}}
1212

13+
- Generator version: {{generatorVersion}}
14+
1315
{{#appDescriptionWithNewLines}}{{{appDescriptionWithNewLines}}}{{/appDescriptionWithNewLines}}
1416

1517
{{#infoUrl}}

‎modules/openapi-generator-maven-plugin/src/it/jaxrs-jersey3/templates/README.mustache‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
- Build date: {{generatedDate}}
1111
{{/hideGenerationTimestamp}}
1212

13+
- Generator version: {{generatorVersion}}
14+
1315
{{#appDescriptionWithNewLines}}{{{appDescriptionWithNewLines}}}{{/appDescriptionWithNewLines}}
1416

1517
{{#infoUrl}}

‎modules/openapi-generator/src/main/resources/C-libcurl/README.md.mustache‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@ This API client was generated by the [OpenAPI Generator](https://openapi-generat
88
{{^hideGenerationTimestamp}}
99
- Build date: {{generatedDate}}
1010
{{/hideGenerationTimestamp}}
11+
- Generator version: {{generatorVersion}}
1112
- Build package: {{generatorClass}}
1213
{{#infoUrl}}
1314
For more information, please visit [{{{infoUrl}}}]({{{infoUrl}}})

‎modules/openapi-generator/src/main/resources/Eiffel/README.mustache‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ This API client was generated by the [OpenAPI Generator](https://openapi-generat
1212
{{^hideGenerationTimestamp}}
1313
- Build date: {{generatedDate}}
1414
{{/hideGenerationTimestamp}}
15+
- Generator version: {{generatorVersion}}
1516
- Build package: {{generatorClass}}
1617
{{#infoUrl}}
1718
For more information, please visit [{{{infoUrl}}}]({{{infoUrl}}})

‎modules/openapi-generator/src/main/resources/Groovy/README.mustache‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,7 @@ This Groovy package, using the [http-builder-ng library](https://http-builder-ng
1313
{{^hideGenerationTimestamp}}
1414
- Build date: {{generatedDate}}
1515
{{/hideGenerationTimestamp}}
16+
- Generator version: {{generatorVersion}}
1617
- Build package: {{generatorClass}}
1718
{{#infoUrl}}
1819
For more information, please visit [{{{infoUrl}}}]({{{infoUrl}}})

‎modules/openapi-generator/src/main/resources/Java/README.mustache‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
- Build date: {{generatedDate}}
99
{{/hideGenerationTimestamp}}
1010

11+
- Generator version: {{generatorVersion}}
12+
1113
{{{appDescriptionWithNewLines}}}
1214

1315
{{#infoUrl}}

‎modules/openapi-generator/src/main/resources/Java/generatedAnnotation.mustache‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
@{{javaxPackage}}.annotation.Generated(value = "{{generatorClass}}"{{^hideGenerationTimestamp}}, date = "{{generatedDate}}"{{/hideGenerationTimestamp}})
1+
@{{javaxPackage}}.annotation.Generated(value = "{{generatorClass}}"{{^hideGenerationTimestamp}}, date = "{{generatedDate}}"{{/hideGenerationTimestamp}}, comments = "Generator version: {{generatorVersion}}")

0 commit comments

Comments
 (0)