Skip to content

Commit 644dfc0

Browse files
committed
upper case enums in generator openapi spec
1 parent 2c6a255 commit 644dfc0

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public String getTypeName() {
2626
}
2727

2828
public enum CodegenVersion {
29-
v2("v2"), v3("v3");
29+
v2("V2"), v3("V3");
3030

3131
private String name;
3232

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 ("v2".equals(generationRequest.getCodegenVersion().getCodegenVersionName())) {
21+
if (GenerationRequest.CodegenVersion.v2.equals(generationRequest.getCodegenVersion())) {
2222
final io.swagger.codegen.ClientOptInput clientOptInputV2;
2323
try {
2424
clientOptInputV2 = GeneratorUtil.getClientOptInputV2(generationRequest);

modules/swagger-generator/src/main/java/io/swagger/v3/generator/online/GeneratorController.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ public static HiddenOptions loadHiddenOptions(String location) {
171171
}
172172

173173
public ResponseContext clientLanguages(RequestContext requestContext, String version) {
174-
if ("v2".equals(version)) {
174+
if ("V2".equals(version)) {
175175
return new ResponseContext()
176176
.status(Response.Status.OK.getStatusCode())
177177
.entity(CLIENTSV2);
@@ -184,7 +184,7 @@ public ResponseContext clientLanguages(RequestContext requestContext, String ver
184184
}
185185

186186
public ResponseContext serverLanguages(RequestContext requestContext, String version) {
187-
if ("v2".equals(version)) {
187+
if ("V2".equals(version)) {
188188
return new ResponseContext()
189189
.status(Response.Status.OK.getStatusCode())
190190
.entity(SERVERSV2);
@@ -197,7 +197,7 @@ public ResponseContext serverLanguages(RequestContext requestContext, String ver
197197

198198
public ResponseContext listOptions(RequestContext requestContext, String language, String version) {
199199

200-
if ("v2".equals(version)) {
200+
if ("V2".equals(version)) {
201201
io.swagger.codegen.CodegenConfig config = null;
202202
try {
203203
config = CodegenConfigLoader.forName(language);

modules/swagger-generator/src/main/resources/openapi.yaml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -125,8 +125,8 @@ components:
125125
schema:
126126
type: string
127127
enum:
128-
- v2
129-
- v3
128+
- V2
129+
- V3
130130
schemas:
131131
GenerationRequest:
132132
x-swagger-router-model: io.swagger.codegen.v3.service.GenerationRequest
@@ -149,8 +149,8 @@ components:
149149
type: string
150150
description: codegen version to use
151151
enum:
152-
- v2
153-
- v3
152+
- V2
153+
- V3
154154
options:
155155
"$ref": "#/components/schemas/Options"
156156
AuthorizationValue:

modules/swagger-generator/src/test/java/io/swagger/v3/generator/online/GeneratorControllerIT.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ public class GeneratorControllerIT {
3131

3232
@Test
3333
public void testClientsV3() throws Exception {
34-
final HttpResponse response = client.execute(new HttpGet(DEFAULT_HOST + "/clients?version=v3"));
34+
final HttpResponse response = client.execute(new HttpGet(DEFAULT_HOST + "/clients?version=V3"));
3535
int responseCode = response.getStatusLine().getStatusCode();
3636
Assert.assertEquals(responseCode, 200);
3737

@@ -43,7 +43,7 @@ public void testClientsV3() throws Exception {
4343

4444
@Test
4545
public void testClientsV2() throws Exception {
46-
final HttpResponse response = client.execute(new HttpGet(DEFAULT_HOST + "/clients?version=v2"));
46+
final HttpResponse response = client.execute(new HttpGet(DEFAULT_HOST + "/clients?version=V2"));
4747
int responseCode = response.getStatusLine().getStatusCode();
4848
Assert.assertEquals(responseCode, 200);
4949

@@ -54,7 +54,7 @@ public void testClientsV2() throws Exception {
5454
}
5555
@Test
5656
public void testServersV3() throws Exception {
57-
final HttpResponse response = client.execute(new HttpGet(DEFAULT_HOST + "/servers?version=v3"));
57+
final HttpResponse response = client.execute(new HttpGet(DEFAULT_HOST + "/servers?version=V3"));
5858
int responseCode = response.getStatusLine().getStatusCode();
5959
Assert.assertEquals(responseCode, 200);
6060

@@ -66,7 +66,7 @@ public void testServersV3() throws Exception {
6666

6767
@Test
6868
public void testServersV2() throws Exception {
69-
final HttpResponse response = client.execute(new HttpGet(DEFAULT_HOST + "/servers?version=v2"));
69+
final HttpResponse response = client.execute(new HttpGet(DEFAULT_HOST + "/servers?version=V2"));
7070
int responseCode = response.getStatusLine().getStatusCode();
7171
Assert.assertEquals(responseCode, 200);
7272

0 commit comments

Comments
 (0)