Skip to content

Commit b57f523

Browse files
authored
Merge pull request #744 from reta/oas2.support.generators
Add --use-oas2 command line argument support for standalone Swagger Codegen CLI
2 parents 4534cf9 + 9124fbe commit b57f523

File tree

7 files changed

+8
-28
lines changed

7 files changed

+8
-28
lines changed

src/main/java/io/swagger/codegen/v3/generators/java/AbstractJavaJAXRSServerCodegen.java

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,5 +246,8 @@ public void setUseBeanValidation(boolean useBeanValidation) {
246246
this.useBeanValidation = useBeanValidation;
247247
}
248248

249-
249+
@Override
250+
public String getArgumentsLocation() {
251+
return "/arguments/server.yaml";
252+
}
250253
}

src/main/java/io/swagger/codegen/v3/generators/java/JavaCXFServerCodegen.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -190,11 +190,6 @@ public void processOpts() {
190190
}
191191
}
192192

193-
@Override
194-
public String getArgumentsLocation() {
195-
return "";
196-
}
197-
198193
@Override
199194
public String getName() {
200195
return "jaxrs-cxf";

src/main/java/io/swagger/codegen/v3/generators/java/JavaJAXRSSpecServerCodegen.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66
import io.swagger.codegen.v3.CodegenOperation;
77
import io.swagger.codegen.v3.CodegenProperty;
88
import io.swagger.codegen.v3.SupportingFile;
9-
import io.swagger.codegen.v3.generators.util.OpenAPIUtil;
109
import io.swagger.v3.core.util.Json;
1110
import io.swagger.v3.oas.models.OpenAPI;
1211
import io.swagger.v3.oas.models.Operation;
@@ -105,11 +104,6 @@ public void processOpts() {
105104
}
106105
}
107106

108-
@Override
109-
public String getArgumentsLocation() {
110-
return "";
111-
}
112-
113107
@Override
114108
public String getDefaultTemplateDir() {
115109
return JAXRS_TEMPLATE_DIRECTORY_NAME + "/spec";

src/main/java/io/swagger/codegen/v3/generators/java/JavaJerseyServerCodegen.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -143,11 +143,6 @@ public void addSupportingFiles() {
143143
supportingFiles.add(new SupportingFile("StringUtil.mustache", (sourceFolder + '/' + apiPackage).replace(".", "/"), "StringUtil.java"));
144144
}
145145

146-
@Override
147-
public String getArgumentsLocation() {
148-
return "";
149-
}
150-
151146
@Override
152147
public String getDefaultTemplateDir() {
153148
return JAXRS_TEMPLATE_DIRECTORY_NAME;

src/main/java/io/swagger/codegen/v3/generators/java/JavaResteasyEapServerCodegen.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -105,11 +105,6 @@ public void processOpts() {
105105

106106
}
107107

108-
@Override
109-
public String getArgumentsLocation() {
110-
return "";
111-
}
112-
113108
@Override
114109
public String getDefaultTemplateDir() {
115110
return JAXRS_TEMPLATE_DIRECTORY_NAME + "/resteasy/eap";

src/main/java/io/swagger/codegen/v3/generators/java/JavaResteasyServerCodegen.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -95,12 +95,6 @@ else if (dateLibrary.startsWith("java8")) {
9595
}
9696
}
9797

98-
99-
@Override
100-
public String getArgumentsLocation() {
101-
return "";
102-
}
103-
10498
@Override
10599
public String getDefaultTemplateDir() {
106100
return JAXRS_TEMPLATE_DIRECTORY_NAME + "/resteasy";
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
arguments:
2+
- option: "--use-oas2"
3+
description: "use OpenAPI v2.0 (Swagger 1.5.x) annotations (by default, OpenAPI v3.0 is used)."
4+
type: "boolean"

0 commit comments

Comments
 (0)