Skip to content

Commit 7b41ae4

Browse files
author
Paŭlo Ebermann
committed
Issue #4788: remove System.getProperty from language codegens.
It was just used for apiPackage/modelPackage, for which we have regular parameters.
1 parent 95a3737 commit 7b41ae4

File tree

2 files changed

+18
-4
lines changed

2 files changed

+18
-4
lines changed

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

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,16 @@ public JavaInflectorServerCodegen() {
3434
modelDocTemplateFiles.remove("model_doc.mustache");
3535
apiDocTemplateFiles.remove("api_doc.mustache");
3636

37+
if(System.getProperty("swagger.codegen.inflector.apipackage") != null) {
38+
LOGGER.warn("System property 'swagger.codegen.inflector.apipackage' is not supported anymore, use the standard apiPackage parameter.");
39+
}
40+
41+
if(System.getProperty("swagger.codegen.inflector.modelpackage") != null) {
42+
LOGGER.warn("System property 'swagger.codegen.inflector.modelpackage' is not supported anymore, please use the standard modelPackage parameter.");
43+
}
3744

38-
apiPackage = System.getProperty("swagger.codegen.inflector.apipackage", "io.swagger.handler");
39-
modelPackage = System.getProperty("swagger.codegen.inflector.modelpackage", "io.swagger.model");
45+
apiPackage = "io.swagger.handler";
46+
modelPackage = "io.swagger.model";
4047

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

modules/swagger-codegen/src/main/java/io/swagger/codegen/languages/UndertowCodegen.java

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,16 @@ public UndertowCodegen() {
3636
modelDocTemplateFiles.remove("model_doc.mustache");
3737
apiDocTemplateFiles.remove("api_doc.mustache");
3838

39+
if(System.getProperty("swagger.codegen.undertow.apipackage") != null) {
40+
LOGGER.warn("System property 'swagger.codegen.undertow.apipackage' is not supported anymore, use the standard apiPackage parameter.");
41+
}
42+
43+
if(System.getProperty("swagger.codegen.undertow.modelpackage") != null) {
44+
LOGGER.warn("System property 'swagger.codegen.undertow.modelpackage' is not supported anymore, please use the standard modelPackage parameter.");
45+
}
3946

40-
apiPackage = System.getProperty("swagger.codegen.undertow.apipackage", "io.swagger.handler");
41-
modelPackage = System.getProperty("swagger.codegen.undertow.modelpackage", "io.swagger.model");
47+
apiPackage = "io.swagger.handler";
48+
modelPackage = "io.swagger.model";
4249

4350
additionalProperties.put("title", title);
4451
}

0 commit comments

Comments
 (0)