Skip to content

Commit d5e2aea

Browse files
committed
Merge pull request #1375 from xhh/issue-1308
Remove duplicate fields from sub-classes of the Java codegen
2 parents d2df310 + 43b3acf commit d5e2aea

File tree

3 files changed

+6
-16
lines changed

3 files changed

+6
-16
lines changed

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,6 @@
2222
import java.util.Map;
2323

2424
public class JavaInflectorServerCodegen extends JavaClientCodegen implements CodegenConfig {
25-
protected String invokerPackage = "io.swagger.handler";
26-
protected String groupId = "io.swagger";
27-
protected String artifactId = "swagger-inflector-server";
28-
protected String artifactVersion = "1.0.0";
2925
protected String title = "Swagger Inflector";
3026

3127
public JavaInflectorServerCodegen() {
@@ -35,6 +31,8 @@ public JavaInflectorServerCodegen() {
3531
modelTemplateFiles.put("model.mustache", ".java");
3632
apiTemplateFiles.put("api.mustache", ".java");
3733
templateDir = "JavaInflector";
34+
invokerPackage = "io.swagger.handler";
35+
artifactId = "swagger-inflector-server";
3836

3937
apiPackage = System.getProperty("swagger.codegen.inflector.apipackage", "io.swagger.handler");
4038
modelPackage = System.getProperty("swagger.codegen.inflector.modelpackage", "io.swagger.model");

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,16 +16,14 @@
1616
import java.util.Map;
1717

1818
public class JaxRSServerCodegen extends JavaClientCodegen implements CodegenConfig {
19-
protected String invokerPackage = "io.swagger.api";
20-
protected String groupId = "io.swagger";
21-
protected String artifactId = "swagger-jaxrs-server";
22-
protected String artifactVersion = "1.0.0";
2319
protected String title = "Swagger Server";
2420

2521
public JaxRSServerCodegen() {
2622
super.processOpts();
2723

2824
sourceFolder = "src/gen/java";
25+
invokerPackage = "io.swagger.api";
26+
artifactId = "swagger-jaxrs-server";
2927

3028
outputFolder = System.getProperty("swagger.codegen.jaxrs.genfolder", "generated-code/javaJaxRS");
3129
modelTemplateFiles.put("model.mustache", ".java");

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

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,13 +15,7 @@
1515
import java.util.Iterator;
1616

1717
public class SpringMVCServerCodegen extends JavaClientCodegen implements CodegenConfig {
18-
protected String invokerPackage = "io.swagger.api";
19-
protected String groupId = "io.swagger";
20-
protected String artifactId = "swagger-spring-mvc-server";
21-
protected String artifactVersion = "1.0.0";
22-
protected String sourceFolder = "src/main/java";
2318
protected String title = "Petstore Server";
24-
2519
protected String configPackage = "";
2620

2721
public SpringMVCServerCodegen() {
@@ -33,7 +27,8 @@ public SpringMVCServerCodegen() {
3327
apiPackage = "io.swagger.api";
3428
modelPackage = "io.swagger.model";
3529
configPackage = "io.swagger.configuration";
36-
30+
invokerPackage = "io.swagger.api";
31+
artifactId = "swagger-spring-mvc-server";
3732

3833
additionalProperties.put(CodegenConstants.INVOKER_PACKAGE, invokerPackage);
3934
additionalProperties.put(CodegenConstants.GROUP_ID, groupId);
@@ -201,4 +196,3 @@ public Map<String, Object> postProcessModels(Map<String, Object> objs) {
201196
return objs;
202197
}
203198
}
204-

0 commit comments

Comments
 (0)