Skip to content

Commit a729d24

Browse files
rwinchrwinch
committed
Polish oauth2-core format
Issue gh-8945
1 parent dc47a75 commit a729d24

19 files changed

+489
-127
lines changed

‎oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/endpoint/MapOAuth2AccessTokenResponseConverter.java

+9-2
Original file line numberDiff line numberDiff line change
@@ -55,8 +55,15 @@ public OAuth2AccessTokenResponse convert(Map<String, String> tokenResponseParame
5555
additionalParameters.put(entry.getKey(), entry.getValue());
5656
}
5757
}
58-
return OAuth2AccessTokenResponse.withToken(accessToken).tokenType(accessTokenType).expiresIn(expiresIn)
59-
.scopes(scopes).refreshToken(refreshToken).additionalParameters(additionalParameters).build();
58+
// @formatter:off
59+
return OAuth2AccessTokenResponse.withToken(accessToken)
60+
.tokenType(accessTokenType)
61+
.expiresIn(expiresIn)
62+
.scopes(scopes)
63+
.refreshToken(refreshToken)
64+
.additionalParameters(additionalParameters)
65+
.build();
66+
// @formatter:on
6067
}
6168

6269
private OAuth2AccessToken.TokenType getAccessTokenType(Map<String, String> tokenResponseParameters) {

‎oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/endpoint/OAuth2AuthorizationRequest.java

+6-2
Original file line numberDiff line numberDiff line change
@@ -215,12 +215,16 @@ public static Builder implicit() {
215215
*/
216216
public static Builder from(OAuth2AuthorizationRequest authorizationRequest) {
217217
Assert.notNull(authorizationRequest, "authorizationRequest cannot be null");
218+
// @formatter:off
218219
return new Builder(authorizationRequest.getGrantType())
219220
.authorizationUri(authorizationRequest.getAuthorizationUri())
220-
.clientId(authorizationRequest.getClientId()).redirectUri(authorizationRequest.getRedirectUri())
221-
.scopes(authorizationRequest.getScopes()).state(authorizationRequest.getState())
221+
.clientId(authorizationRequest.getClientId())
222+
.redirectUri(authorizationRequest.getRedirectUri())
223+
.scopes(authorizationRequest.getScopes())
224+
.state(authorizationRequest.getState())
222225
.additionalParameters(authorizationRequest.getAdditionalParameters())
223226
.attributes(authorizationRequest.getAttributes());
227+
// @formatter:on
224228
}
225229

226230
/**

‎oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/http/converter/OAuth2AccessTokenResponseHttpMessageConverter.java

+5-1
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,12 @@ protected OAuth2AccessTokenResponse readInternal(Class<? extends OAuth2AccessTok
7777
// Object and then convert values to String
7878
Map<String, Object> tokenResponseParameters = (Map<String, Object>) this.jsonMessageConverter
7979
.read(STRING_OBJECT_MAP.getType(), null, inputMessage);
80-
return this.tokenResponseConverter.convert(tokenResponseParameters.entrySet().stream()
80+
// @formatter:off
81+
return this.tokenResponseConverter.convert(tokenResponseParameters
82+
.entrySet()
83+
.stream()
8184
.collect(Collectors.toMap(Map.Entry::getKey, (entry) -> String.valueOf(entry.getValue()))));
85+
// @formatter:on
8286
}
8387
catch (Exception ex) {
8488
throw new HttpMessageNotReadableException(

‎oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/web/reactive/function/OAuth2AccessTokenResponseBodyExtractor.java

+9-3
Original file line numberDiff line numberDiff line change
@@ -123,9 +123,15 @@ private static OAuth2AccessTokenResponse oauth2AccessTokenResponse(AccessTokenRe
123123
refreshToken = accessTokenResponse.getTokens().getRefreshToken().getValue();
124124
}
125125
Map<String, Object> additionalParameters = new LinkedHashMap<>(accessTokenResponse.getCustomParameters());
126-
return OAuth2AccessTokenResponse.withToken(accessToken.getValue()).tokenType(accessTokenType)
127-
.expiresIn(expiresIn).scopes(scopes).refreshToken(refreshToken)
128-
.additionalParameters(additionalParameters).build();
126+
// @formatter:off
127+
return OAuth2AccessTokenResponse.withToken(accessToken.getValue())
128+
.tokenType(accessTokenType)
129+
.expiresIn(expiresIn)
130+
.scopes(scopes)
131+
.refreshToken(refreshToken)
132+
.additionalParameters(additionalParameters)
133+
.build();
134+
// @formatter:on
129135
}
130136

131137
}

‎oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/endpoint/OAuth2AccessTokenResponseMapConverterTests.java

+13-4
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,15 @@ public void convertFull() {
4949
Set<String> scopes = new HashSet<>();
5050
scopes.add("read");
5151
scopes.add("write");
52-
OAuth2AccessTokenResponse build = OAuth2AccessTokenResponse.withToken("access-token-value-1234").expiresIn(3699)
53-
.additionalParameters(additionalParameters).refreshToken("refresh-token-value-1234").scopes(scopes)
54-
.tokenType(OAuth2AccessToken.TokenType.BEARER).build();
52+
// @formatter:off
53+
OAuth2AccessTokenResponse build = OAuth2AccessTokenResponse.withToken("access-token-value-1234")
54+
.expiresIn(3699)
55+
.additionalParameters(additionalParameters)
56+
.refreshToken("refresh-token-value-1234")
57+
.scopes(scopes)
58+
.tokenType(OAuth2AccessToken.TokenType.BEARER)
59+
.build();
60+
// @formatter:on
5561
Map<String, String> result = this.messageConverter.convert(build);
5662
Assert.assertEquals(7, result.size());
5763
Assert.assertEquals("access-token-value-1234", result.get("access_token"));
@@ -65,8 +71,11 @@ public void convertFull() {
6571

6672
@Test
6773
public void convertMinimal() {
74+
// @formatter:off
6875
OAuth2AccessTokenResponse build = OAuth2AccessTokenResponse.withToken("access-token-value-1234")
69-
.tokenType(OAuth2AccessToken.TokenType.BEARER).build();
76+
.tokenType(OAuth2AccessToken.TokenType.BEARER)
77+
.build();
78+
// @formatter:on
7079
Map<String, String> result = this.messageConverter.convert(build);
7180
Assert.assertEquals(3, result.size());
7281
Assert.assertEquals("access-token-value-1234", result.get("access_token"));

‎oauth2/oauth2-core/src/test/java/org/springframework/security/oauth2/core/endpoint/OAuth2AccessTokenResponseTests.java

+48-11
Original file line numberDiff line numberDiff line change
@@ -45,27 +45,44 @@ public class OAuth2AccessTokenResponseTests {
4545

4646
@Test(expected = IllegalArgumentException.class)
4747
public void buildWhenTokenValueIsNullThenThrowIllegalArgumentException() {
48-
OAuth2AccessTokenResponse.withToken(null).tokenType(OAuth2AccessToken.TokenType.BEARER).expiresIn(EXPIRES_IN)
48+
// @formatter:off
49+
OAuth2AccessTokenResponse.withToken(null)
50+
.tokenType(OAuth2AccessToken.TokenType.BEARER)
51+
.expiresIn(EXPIRES_IN)
4952
.build();
53+
// @formatter:on
5054
}
5155

5256
@Test(expected = IllegalArgumentException.class)
5357
public void buildWhenTokenTypeIsNullThenThrowIllegalArgumentException() {
54-
OAuth2AccessTokenResponse.withToken(TOKEN_VALUE).tokenType(null).expiresIn(EXPIRES_IN).build();
58+
// @formatter:off
59+
OAuth2AccessTokenResponse.withToken(TOKEN_VALUE)
60+
.tokenType(null)
61+
.expiresIn(EXPIRES_IN)
62+
.build();
63+
// @formatter:on
5564
}
5665

5766
@Test
5867
public void buildWhenExpiresInIsZeroThenExpiresAtOneSecondAfterIssueAt() {
68+
// @formatter:off
5969
OAuth2AccessTokenResponse tokenResponse = OAuth2AccessTokenResponse.withToken(TOKEN_VALUE)
60-
.tokenType(OAuth2AccessToken.TokenType.BEARER).expiresIn(0).build();
70+
.tokenType(OAuth2AccessToken.TokenType.BEARER)
71+
.expiresIn(0)
72+
.build();
73+
// @formatter:on
6174
assertThat(tokenResponse.getAccessToken().getExpiresAt())
6275
.isEqualTo(tokenResponse.getAccessToken().getIssuedAt().plusSeconds(1));
6376
}
6477

6578
@Test
6679
public void buildWhenExpiresInIsNegativeThenExpiresAtOneSecondAfterIssueAt() {
80+
// @formatter:off
6781
OAuth2AccessTokenResponse tokenResponse = OAuth2AccessTokenResponse.withToken(TOKEN_VALUE)
68-
.tokenType(OAuth2AccessToken.TokenType.BEARER).expiresIn(-1L).build();
82+
.tokenType(OAuth2AccessToken.TokenType.BEARER)
83+
.expiresIn(-1L)
84+
.build();
85+
// @formatter:on
6986
assertThat(tokenResponse.getAccessToken().getExpiresAt())
7087
.isEqualTo(tokenResponse.getAccessToken().getIssuedAt().plusSeconds(1));
7188
}
@@ -77,9 +94,15 @@ public void buildWhenAllAttributesProvidedThenAllAttributesAreSet() {
7794
Map<String, Object> additionalParameters = new HashMap<>();
7895
additionalParameters.put("param1", "value1");
7996
additionalParameters.put("param2", "value2");
97+
// @formatter:off
8098
OAuth2AccessTokenResponse tokenResponse = OAuth2AccessTokenResponse.withToken(TOKEN_VALUE)
81-
.tokenType(OAuth2AccessToken.TokenType.BEARER).expiresIn(expiresAt.toEpochMilli()).scopes(scopes)
82-
.refreshToken(REFRESH_TOKEN_VALUE).additionalParameters(additionalParameters).build();
99+
.tokenType(OAuth2AccessToken.TokenType.BEARER)
100+
.expiresIn(expiresAt.toEpochMilli())
101+
.scopes(scopes)
102+
.refreshToken(REFRESH_TOKEN_VALUE)
103+
.additionalParameters(additionalParameters)
104+
.build();
105+
// @formatter:on
83106
assertThat(tokenResponse.getAccessToken()).isNotNull();
84107
assertThat(tokenResponse.getAccessToken().getTokenValue()).isEqualTo(TOKEN_VALUE);
85108
assertThat(tokenResponse.getAccessToken().getTokenType()).isEqualTo(OAuth2AccessToken.TokenType.BEARER);
@@ -97,9 +120,15 @@ public void buildWhenResponseThenAllAttributesAreSet() {
97120
Map<String, Object> additionalParameters = new HashMap<>();
98121
additionalParameters.put("param1", "value1");
99122
additionalParameters.put("param2", "value2");
123+
// @formatter:off
100124
OAuth2AccessTokenResponse tokenResponse = OAuth2AccessTokenResponse.withToken(TOKEN_VALUE)
101-
.tokenType(OAuth2AccessToken.TokenType.BEARER).expiresIn(expiresAt.toEpochMilli()).scopes(scopes)
102-
.refreshToken(REFRESH_TOKEN_VALUE).additionalParameters(additionalParameters).build();
125+
.tokenType(OAuth2AccessToken.TokenType.BEARER)
126+
.expiresIn(expiresAt.toEpochMilli())
127+
.scopes(scopes)
128+
.refreshToken(REFRESH_TOKEN_VALUE)
129+
.additionalParameters(additionalParameters)
130+
.build();
131+
// @formatter:on
103132
OAuth2AccessTokenResponse withResponse = OAuth2AccessTokenResponse.withResponse(tokenResponse).build();
104133
assertThat(withResponse.getAccessToken().getTokenValue())
105134
.isEqualTo(tokenResponse.getAccessToken().getTokenValue());
@@ -120,17 +149,25 @@ public void buildWhenResponseAndRefreshNullThenRefreshNull() {
120149
Map<String, Object> additionalParameters = new HashMap<>();
121150
additionalParameters.put("param1", "value1");
122151
additionalParameters.put("param2", "value2");
152+
// @formatter:off
123153
OAuth2AccessTokenResponse tokenResponse = OAuth2AccessTokenResponse.withToken(TOKEN_VALUE)
124-
.tokenType(OAuth2AccessToken.TokenType.BEARER).expiresIn(expiresAt.toEpochMilli()).scopes(scopes)
125-
.additionalParameters(additionalParameters).build();
154+
.tokenType(OAuth2AccessToken.TokenType.BEARER)
155+
.expiresIn(expiresAt.toEpochMilli())
156+
.scopes(scopes)
157+
.additionalParameters(additionalParameters)
158+
.build();
159+
// @formatter:on
126160
OAuth2AccessTokenResponse withResponse = OAuth2AccessTokenResponse.withResponse(tokenResponse).build();
127161
assertThat(withResponse.getRefreshToken()).isNull();
128162
}
129163

130164
@Test
131165
public void buildWhenResponseAndExpiresInThenExpiresAtEqualToIssuedAtPlusExpiresIn() {
166+
// @formatter:off
132167
OAuth2AccessTokenResponse tokenResponse = OAuth2AccessTokenResponse.withToken(TOKEN_VALUE)
133-
.tokenType(OAuth2AccessToken.TokenType.BEARER).build();
168+
.tokenType(OAuth2AccessToken.TokenType.BEARER)
169+
.build();
170+
// @formatter:on
134171
long expiresIn = 30;
135172
OAuth2AccessTokenResponse withResponse = OAuth2AccessTokenResponse.withResponse(tokenResponse)
136173
.expiresIn(expiresIn).build();

0 commit comments

Comments
 (0)