Skip to content

Commit 681578d

Browse files
authored
rename enum constants (#10631)
1 parent e85c67e commit 681578d

File tree

8 files changed

+52
-28
lines changed

8 files changed

+52
-28
lines changed

modules/openapi-generator/src/main/resources/Java/libraries/jersey2/auth/OAuth.mustache

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public class OAuth implements Authentication {
2626
2727
private String tokenUrl;
2828
private String absoluteTokenUrl;
29-
private OAuthFlow flow = OAuthFlow.application;
29+
private OAuthFlow flow = OAuthFlow.APPLICATION;
3030
private OAuth20Service service;
3131
private DefaultApi20 authApi;
3232
private String scope;
@@ -103,18 +103,18 @@ public class OAuth implements Authentication {
103103
}
104104
try {
105105
switch (flow) {
106-
case password:
106+
case PASSWORD:
107107
if (username != null && password != null) {
108108
accessToken = service.getAccessTokenPasswordGrant(username, password, scope);
109109
}
110110
break;
111-
case accessCode:
111+
case ACCESS_CODE:
112112
if (code != null) {
113113
accessToken = service.getAccessToken(code);
114114
code = null;
115115
}
116116
break;
117-
case application:
117+
case APPLICATION:
118118
accessToken = service.getAccessTokenClientCredentialsGrant(scope);
119119
break;
120120
default:
@@ -159,14 +159,14 @@ public class OAuth implements Authentication {
159159
}
160160

161161
public OAuth usePasswordFlow(String username, String password) {
162-
this.flow = OAuthFlow.password;
162+
this.flow = OAuthFlow.PASSWORD;
163163
this.username = username;
164164
this.password = password;
165165
return this;
166166
}
167167

168168
public OAuth useAuthorizationCodeFlow(String code) {
169-
this.flow = OAuthFlow.accessCode;
169+
this.flow = OAuthFlow.ACCESS_CODE;
170170
this.code = code;
171171
return this;
172172
}

modules/openapi-generator/src/main/resources/Java/libraries/jersey2/auth/OAuthFlow.mustache

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,12 @@
22

33
package {{invokerPackage}}.auth;
44

5+
/**
6+
* OAuth flows that are supported by this client
7+
*/
58
public enum OAuthFlow {
6-
accessCode, implicit, password, application
9+
ACCESS_CODE,
10+
IMPLICIT,
11+
PASSWORD,
12+
APPLICATION
713
}

samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/auth/OAuth.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public class OAuth implements Authentication {
3737

3838
private String tokenUrl;
3939
private String absoluteTokenUrl;
40-
private OAuthFlow flow = OAuthFlow.application;
40+
private OAuthFlow flow = OAuthFlow.APPLICATION;
4141
private OAuth20Service service;
4242
private DefaultApi20 authApi;
4343
private String scope;
@@ -114,18 +114,18 @@ public synchronized OAuth2AccessToken obtainAccessToken(String refreshToken) thr
114114
}
115115
try {
116116
switch (flow) {
117-
case password:
117+
case PASSWORD:
118118
if (username != null && password != null) {
119119
accessToken = service.getAccessTokenPasswordGrant(username, password, scope);
120120
}
121121
break;
122-
case accessCode:
122+
case ACCESS_CODE:
123123
if (code != null) {
124124
accessToken = service.getAccessToken(code);
125125
code = null;
126126
}
127127
break;
128-
case application:
128+
case APPLICATION:
129129
accessToken = service.getAccessTokenClientCredentialsGrant(scope);
130130
break;
131131
default:
@@ -170,14 +170,14 @@ public OAuth setCredentials(String clientId, String clientSecret, Boolean debug)
170170
}
171171

172172
public OAuth usePasswordFlow(String username, String password) {
173-
this.flow = OAuthFlow.password;
173+
this.flow = OAuthFlow.PASSWORD;
174174
this.username = username;
175175
this.password = password;
176176
return this;
177177
}
178178

179179
public OAuth useAuthorizationCodeFlow(String code) {
180-
this.flow = OAuthFlow.accessCode;
180+
this.flow = OAuthFlow.ACCESS_CODE;
181181
this.code = code;
182182
return this;
183183
}

samples/client/petstore/java/jersey2-java8-localdatetime/src/main/java/org/openapitools/client/auth/OAuthFlow.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@
1313

1414
package org.openapitools.client.auth;
1515

16+
/**
17+
* OAuth flows that are supported by this client
18+
*/
1619
public enum OAuthFlow {
17-
accessCode, implicit, password, application
20+
ACCESS_CODE,
21+
IMPLICIT,
22+
PASSWORD,
23+
APPLICATION
1824
}

samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/OAuth.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public class OAuth implements Authentication {
3737

3838
private String tokenUrl;
3939
private String absoluteTokenUrl;
40-
private OAuthFlow flow = OAuthFlow.application;
40+
private OAuthFlow flow = OAuthFlow.APPLICATION;
4141
private OAuth20Service service;
4242
private DefaultApi20 authApi;
4343
private String scope;
@@ -114,18 +114,18 @@ public synchronized OAuth2AccessToken obtainAccessToken(String refreshToken) thr
114114
}
115115
try {
116116
switch (flow) {
117-
case password:
117+
case PASSWORD:
118118
if (username != null && password != null) {
119119
accessToken = service.getAccessTokenPasswordGrant(username, password, scope);
120120
}
121121
break;
122-
case accessCode:
122+
case ACCESS_CODE:
123123
if (code != null) {
124124
accessToken = service.getAccessToken(code);
125125
code = null;
126126
}
127127
break;
128-
case application:
128+
case APPLICATION:
129129
accessToken = service.getAccessTokenClientCredentialsGrant(scope);
130130
break;
131131
default:
@@ -170,14 +170,14 @@ public OAuth setCredentials(String clientId, String clientSecret, Boolean debug)
170170
}
171171

172172
public OAuth usePasswordFlow(String username, String password) {
173-
this.flow = OAuthFlow.password;
173+
this.flow = OAuthFlow.PASSWORD;
174174
this.username = username;
175175
this.password = password;
176176
return this;
177177
}
178178

179179
public OAuth useAuthorizationCodeFlow(String code) {
180-
this.flow = OAuthFlow.accessCode;
180+
this.flow = OAuthFlow.ACCESS_CODE;
181181
this.code = code;
182182
return this;
183183
}

samples/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/OAuthFlow.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@
1313

1414
package org.openapitools.client.auth;
1515

16+
/**
17+
* OAuth flows that are supported by this client
18+
*/
1619
public enum OAuthFlow {
17-
accessCode, implicit, password, application
20+
ACCESS_CODE,
21+
IMPLICIT,
22+
PASSWORD,
23+
APPLICATION
1824
}

samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/OAuth.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ public class OAuth implements Authentication {
3737

3838
private String tokenUrl;
3939
private String absoluteTokenUrl;
40-
private OAuthFlow flow = OAuthFlow.application;
40+
private OAuthFlow flow = OAuthFlow.APPLICATION;
4141
private OAuth20Service service;
4242
private DefaultApi20 authApi;
4343
private String scope;
@@ -114,18 +114,18 @@ public synchronized OAuth2AccessToken obtainAccessToken(String refreshToken) thr
114114
}
115115
try {
116116
switch (flow) {
117-
case password:
117+
case PASSWORD:
118118
if (username != null && password != null) {
119119
accessToken = service.getAccessTokenPasswordGrant(username, password, scope);
120120
}
121121
break;
122-
case accessCode:
122+
case ACCESS_CODE:
123123
if (code != null) {
124124
accessToken = service.getAccessToken(code);
125125
code = null;
126126
}
127127
break;
128-
case application:
128+
case APPLICATION:
129129
accessToken = service.getAccessTokenClientCredentialsGrant(scope);
130130
break;
131131
default:
@@ -170,14 +170,14 @@ public OAuth setCredentials(String clientId, String clientSecret, Boolean debug)
170170
}
171171

172172
public OAuth usePasswordFlow(String username, String password) {
173-
this.flow = OAuthFlow.password;
173+
this.flow = OAuthFlow.PASSWORD;
174174
this.username = username;
175175
this.password = password;
176176
return this;
177177
}
178178

179179
public OAuth useAuthorizationCodeFlow(String code) {
180-
this.flow = OAuthFlow.accessCode;
180+
this.flow = OAuthFlow.ACCESS_CODE;
181181
this.code = code;
182182
return this;
183183
}

samples/openapi3/client/petstore/java/jersey2-java8/src/main/java/org/openapitools/client/auth/OAuthFlow.java

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,6 +13,12 @@
1313

1414
package org.openapitools.client.auth;
1515

16+
/**
17+
* OAuth flows that are supported by this client
18+
*/
1619
public enum OAuthFlow {
17-
accessCode, implicit, password, application
20+
ACCESS_CODE,
21+
IMPLICIT,
22+
PASSWORD,
23+
APPLICATION
1824
}

0 commit comments

Comments
 (0)