Skip to content

Commit dac94a7

Browse files
committed
removed system properties for api/model on test and docs generations and use default custom options instead.
1 parent 3f3d552 commit dac94a7

File tree

2 files changed

+50
-7
lines changed

2 files changed

+50
-7
lines changed

src/main/java/io/swagger/codegen/languages/java/JavaInflectorServerCodegen.java

Lines changed: 37 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package io.swagger.codegen.languages.java;
22

33
import com.fasterxml.jackson.core.JsonProcessingException;
4+
import io.swagger.codegen.CodegenArgument;
45
import io.swagger.codegen.CodegenConstants;
56
import io.swagger.codegen.CodegenModel;
67
import io.swagger.codegen.CodegenOperation;
@@ -45,13 +46,6 @@ public JavaInflectorServerCodegen() {
4546
modelDocTemplateFiles.remove("model_doc.mustache");
4647
apiDocTemplateFiles.remove("api_doc.mustache");
4748

48-
// todo: remove when system properties are removed
49-
System.setProperty(CodegenConstants.MODEL_DOCS, Boolean.FALSE.toString());
50-
System.setProperty(CodegenConstants.API_DOCS, Boolean.FALSE.toString());
51-
System.setProperty(CodegenConstants.MODEL_TESTS, Boolean.FALSE.toString());
52-
System.setProperty(CodegenConstants.API_TESTS, Boolean.FALSE.toString());
53-
54-
5549
apiPackage = System.getProperty("swagger.codegen.inflector.apipackage", "io.swagger.controllers");
5650
modelPackage = System.getProperty("swagger.codegen.inflector.modelpackage", "io.swagger.model");
5751

@@ -203,6 +197,42 @@ protected String getOrGenerateOperationId(Operation operation, String path, Stri
203197
return super.getOrGenerateOperationId(operation, path, httpMethod.toUpperCase());
204198
}
205199

200+
@Override
201+
public void setLanguageArguments(List<CodegenArgument> languageArguments) {
202+
if (languageArguments == null) {
203+
languageArguments = new ArrayList<>();
204+
}
205+
if (!languageArguments.stream()
206+
.anyMatch(codegenArgument -> CodegenConstants.MODEL_DOCS_OPTION.equalsIgnoreCase(codegenArgument.getOption()) && StringUtils.isNotBlank(codegenArgument.getValue()))) {
207+
languageArguments.add(new CodegenArgument()
208+
.option(CodegenConstants.MODEL_DOCS_OPTION)
209+
.type("boolean")
210+
.value(Boolean.FALSE.toString()));
211+
}
212+
if (!languageArguments.stream()
213+
.anyMatch(codegenArgument -> CodegenConstants.API_DOCS_OPTION.equalsIgnoreCase(codegenArgument.getOption()) && StringUtils.isNotBlank(codegenArgument.getValue()))) {
214+
languageArguments.add(new CodegenArgument()
215+
.option(CodegenConstants.API_DOCS_OPTION)
216+
.type("boolean")
217+
.value(Boolean.FALSE.toString()));
218+
}
219+
if (!languageArguments.stream()
220+
.anyMatch(codegenArgument -> CodegenConstants.MODEL_TESTS_OPTION.equalsIgnoreCase(codegenArgument.getOption()) && StringUtils.isNotBlank(codegenArgument.getValue()))) {
221+
languageArguments.add(new CodegenArgument()
222+
.option(CodegenConstants.MODEL_TESTS_OPTION)
223+
.type("boolean")
224+
.value(Boolean.FALSE.toString()));
225+
}
226+
if (!languageArguments.stream()
227+
.anyMatch(codegenArgument -> CodegenConstants.API_TESTS_OPTION.equalsIgnoreCase(codegenArgument.getOption()) && StringUtils.isNotBlank(codegenArgument.getValue()))) {
228+
languageArguments.add(new CodegenArgument()
229+
.option(CodegenConstants.API_TESTS_OPTION)
230+
.type("boolean")
231+
.value(Boolean.FALSE.toString()));
232+
}
233+
super.setLanguageArguments(languageArguments);
234+
}
235+
206236
public String apiFilename(String templateName, String tag) {
207237
String result = super.apiFilename(templateName, tag);
208238

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
arguments:
2+
- option: "--model-docs"
3+
description: "generate models documentation."
4+
type: "boolean"
5+
- option: "--api-docs"
6+
description: "generate apis documentation."
7+
type: "boolean"
8+
- option: "--model-tests"
9+
description: "generate model tests."
10+
type: "boolean"
11+
- option: "--api-tests"
12+
description: "generate apis tests."
13+
type: "boolean"

0 commit comments

Comments
 (0)