Skip to content

Commit 77fc9ff

Browse files
typetetrisrk0n
authored andcommitted
Fix documentation for users of AbstractJavaJAXRSServerCodegen (OpenAPITools#12142)
The default for `sourceFolder` in the documentation was wrong.
1 parent a5132bd commit 77fc9ff

File tree

8 files changed

+8
-7
lines changed

8 files changed

+8
-7
lines changed

docs/generators/java-msf4j.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
6464
|snapshotVersion|Uses a SNAPSHOT version.|<dl><dt>**true**</dt><dd>Use a SnapShot Version</dd><dt>**false**</dt><dd>Use a Release Version</dd></dl>|null|
6565
|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
6666
|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
67-
|sourceFolder|source folder for generated code| |src/main/java|
67+
|sourceFolder|source folder for generated code| |src/gen/java|
6868
|testOutput|Set output folder for models and APIs tests| |${project.build.directory}/generated-test-sources/openapi|
6969
|title|a title describing the application| |OpenAPI Server|
7070
|useBeanValidation|Use BeanValidation API annotations| |true|

docs/generators/jaxrs-cxf-extended.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
7070
|snapshotVersion|Uses a SNAPSHOT version.|<dl><dt>**true**</dt><dd>Use a SnapShot Version</dd><dt>**false**</dt><dd>Use a Release Version</dd></dl>|null|
7171
|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
7272
|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
73-
|sourceFolder|source folder for generated code| |src/main/java|
73+
|sourceFolder|source folder for generated code| |src/gen/java|
7474
|supportMultipleSpringServices|Support generation of Spring services from multiple specifications| |false|
7575
|testDataControlFile|JSON file to control test data generation| |null|
7676
|testDataFile|JSON file to contain generated test data| |null|

docs/generators/jaxrs-cxf.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
6868
|snapshotVersion|Uses a SNAPSHOT version.|<dl><dt>**true**</dt><dd>Use a SnapShot Version</dd><dt>**false**</dt><dd>Use a Release Version</dd></dl>|null|
6969
|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
7070
|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
71-
|sourceFolder|source folder for generated code| |src/main/java|
71+
|sourceFolder|source folder for generated code| |src/gen/java|
7272
|testOutput|Set output folder for models and APIs tests| |${project.build.directory}/generated-test-sources/openapi|
7373
|title|a title describing the application| |OpenAPI Server|
7474
|useAnnotatedBasePath|Use @Path annotations for basePath| |false|

docs/generators/jaxrs-jersey.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
6464
|snapshotVersion|Uses a SNAPSHOT version.|<dl><dt>**true**</dt><dd>Use a SnapShot Version</dd><dt>**false**</dt><dd>Use a Release Version</dd></dl>|null|
6565
|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
6666
|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
67-
|sourceFolder|source folder for generated code| |src/main/java|
67+
|sourceFolder|source folder for generated code| |src/gen/java|
6868
|supportJava6|Whether to support Java6 with the Jersey1/2 library.| |false|
6969
|testOutput|Set output folder for models and APIs tests| |${project.build.directory}/generated-test-sources/openapi|
7070
|title|a title describing the application| |OpenAPI Server|

docs/generators/jaxrs-resteasy-eap.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
6464
|snapshotVersion|Uses a SNAPSHOT version.|<dl><dt>**true**</dt><dd>Use a SnapShot Version</dd><dt>**false**</dt><dd>Use a Release Version</dd></dl>|null|
6565
|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
6666
|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
67-
|sourceFolder|source folder for generated code| |src/main/java|
67+
|sourceFolder|source folder for generated code| |src/gen/java|
6868
|testOutput|Set output folder for models and APIs tests| |${project.build.directory}/generated-test-sources/openapi|
6969
|title|a title describing the application| |OpenAPI Server|
7070
|useBeanValidation|Use BeanValidation API annotations| |true|

docs/generators/jaxrs-resteasy.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
6464
|snapshotVersion|Uses a SNAPSHOT version.|<dl><dt>**true**</dt><dd>Use a SnapShot Version</dd><dt>**false**</dt><dd>Use a Release Version</dd></dl>|null|
6565
|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
6666
|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
67-
|sourceFolder|source folder for generated code| |src/main/java|
67+
|sourceFolder|source folder for generated code| |src/gen/java|
6868
|testOutput|Set output folder for models and APIs tests| |${project.build.directory}/generated-test-sources/openapi|
6969
|title|a title describing the application| |OpenAPI Server|
7070
|useBeanValidation|Use BeanValidation API annotations| |true|

docs/generators/jaxrs-spec.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
6969
|snapshotVersion|Uses a SNAPSHOT version.|<dl><dt>**true**</dt><dd>Use a SnapShot Version</dd><dt>**false**</dt><dd>Use a Release Version</dd></dl>|null|
7070
|sortModelPropertiesByRequiredFlag|Sort model properties to place required parameters before optional parameters.| |true|
7171
|sortParamsByRequiredFlag|Sort method arguments to place required parameters before optional parameters.| |true|
72-
|sourceFolder|source folder for generated code| |src/main/java|
72+
|sourceFolder|source folder for generated code| |src/gen/java|
7373
|supportAsync|Wrap responses in CompletionStage type, allowing asynchronous computation (requires JAX-RS 2.1).| |false|
7474
|testOutput|Set output folder for models and APIs tests| |${project.build.directory}/generated-test-sources/openapi|
7575
|title|a title describing the application| |OpenAPI Server|

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractJavaJAXRSServerCodegen.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -70,6 +70,7 @@ public AbstractJavaJAXRSServerCodegen() {
7070
updateOption(CodegenConstants.API_PACKAGE, apiPackage);
7171
updateOption(CodegenConstants.MODEL_PACKAGE, modelPackage);
7272
updateOption(DATE_LIBRARY, this.getDateLibrary());
73+
updateOption(CodegenConstants.SOURCE_FOLDER, this.getSourceFolder());
7374

7475
additionalProperties.put("title", title);
7576
// java inflector uses the jackson lib

0 commit comments

Comments
 (0)