Skip to content

Commit 57c4b1b

Browse files
author
John French
committed
Use uppercase enum name for CodegenVersion in GenerationRequest
1 parent 5fcd323 commit 57c4b1b

File tree

3 files changed

+9
-19
lines changed

3 files changed

+9
-19
lines changed

modules/swagger-codegen/src/main/java/io/swagger/codegen/v3/service/GenerationRequest.java

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ public class GenerationRequest implements Serializable {
99
private String specURL = null;
1010
private Options options = new Options();
1111
private Type type = Type.CLIENT;
12-
private CodegenVersion codegenVersion = CodegenVersion.v3;
12+
private CodegenVersion codegenVersion = CodegenVersion.V3;
1313

1414
public enum Type {
1515
CLIENT("client"), SERVER("server");
@@ -26,17 +26,7 @@ public String getTypeName() {
2626
}
2727

2828
public enum CodegenVersion {
29-
v2("V2"), v3("V3");
30-
31-
private String name;
32-
33-
CodegenVersion(String name) {
34-
this.name = name;
35-
}
36-
37-
public String getCodegenVersionName() {
38-
return name;
39-
}
29+
V2, V3;
4030
}
4131

4232
public GenerationRequest spec(Object spec) {

modules/swagger-codegen/src/main/java/io/swagger/codegen/v3/service/GeneratorService.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public class GeneratorService {
1818

1919
public GeneratorService generationRequest(GenerationRequest generationRequest) {
2020
this.generationRequest = generationRequest;
21-
if (GenerationRequest.CodegenVersion.v2.equals(generationRequest.getCodegenVersion())) {
21+
if (GenerationRequest.CodegenVersion.V2.equals(generationRequest.getCodegenVersion())) {
2222
final io.swagger.codegen.ClientOptInput clientOptInputV2;
2323
try {
2424
clientOptInputV2 = GeneratorUtil.getClientOptInputV2(generationRequest);

modules/swagger-codegen/src/test/java/io/swagger/codegen/v3/service/GeneratorServiceTest.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ public void testGeneratorServiceJava3() {
2121

2222
GenerationRequest request = new GenerationRequest();
2323
request
24-
.codegenVersion(GenerationRequest.CodegenVersion.v3)
24+
.codegenVersion(GenerationRequest.CodegenVersion.V3)
2525
.type(GenerationRequest.Type.SERVER)
2626
.spec(loadSpecAsNode("3_0_0/petstore.json", false, false))
2727
.options(
@@ -38,7 +38,7 @@ public void testGeneratorServiceJava2() {
3838

3939
GenerationRequest request = new GenerationRequest();
4040
request
41-
.codegenVersion(GenerationRequest.CodegenVersion.v2)
41+
.codegenVersion(GenerationRequest.CodegenVersion.V2)
4242
.type(GenerationRequest.Type.SERVER)
4343
.spec(loadSpecAsNode("2_0/petstore.json", false, true))
4444
.options(
@@ -55,7 +55,7 @@ public void testGeneratorServiceJava3Spec2() {
5555

5656
GenerationRequest request = new GenerationRequest();
5757
request
58-
.codegenVersion(GenerationRequest.CodegenVersion.v3)
58+
.codegenVersion(GenerationRequest.CodegenVersion.V3)
5959
.type(GenerationRequest.Type.SERVER)
6060
.spec(loadSpecAsNode("2_0/petstore.json", false, true))
6161
.options(
@@ -71,7 +71,7 @@ public void testGeneratorServiceJava3Spec2() {
7171
public void testGeneratorServiceJava3RefSpec() {
7272
GenerationRequest request = new GenerationRequest();
7373
request
74-
.codegenVersion(GenerationRequest.CodegenVersion.v3)
74+
.codegenVersion(GenerationRequest.CodegenVersion.V3)
7575
.type(GenerationRequest.Type.SERVER)
7676
.specURL("3_0_0/petstore.json")
7777
.options(
@@ -89,7 +89,7 @@ public void testGeneratorServiceJavaClient3() {
8989

9090
GenerationRequest request = new GenerationRequest();
9191
request
92-
.codegenVersion(GenerationRequest.CodegenVersion.v3)
92+
.codegenVersion(GenerationRequest.CodegenVersion.V3)
9393
.type(GenerationRequest.Type.CLIENT)
9494
.spec(loadSpecAsNode("3_0_0/petstore.json", false, false))
9595
.options(
@@ -109,7 +109,7 @@ public void testGeneratorServiceJavaClient3() {
109109
public void testGeneratorServiceJavaClient2() {
110110
GenerationRequest request = new GenerationRequest();
111111
request
112-
.codegenVersion(GenerationRequest.CodegenVersion.v2)
112+
.codegenVersion(GenerationRequest.CodegenVersion.V2)
113113
.type(GenerationRequest.Type.CLIENT)
114114
.spec(loadSpecAsNode("2_0/petstore.json", false, true))
115115
.options(

0 commit comments

Comments
 (0)