Cwikius-Spring/spring-security
1
0
Fork 0
mirror of synced 2026-08-04 09:17:02 +00:00
Code Issues Packages Projects Releases Wiki Activity

Apply Checkstyle WhitespaceAfterCheck module

Browse Source
This commit is contained in:
Johnny Lim
2017-11-16 06:19:44 +09:00
committed by Rob Winch
parent 523332d51f
commit b6895e6359
88 changed files with 811 additions and 808 deletions
Download Patch File Download Diff File Expand all files Collapse all files
oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/OAuth2AuthorizationRequestRedirectFilter.java
+1 -1
View File
@@ -125,7 +125,7 @@ public class OAuth2AuthorizationRequestRedirectFilter extends OncePerRequestFilt
String redirectUriStr = this.expandRedirectUri(request, clientRegistration);
Map<String,Object> additionalParameters = new HashMap<>();
Map<String, Object> additionalParameters = new HashMap<>();
additionalParameters.put(OAuth2ParameterNames.REGISTRATION_ID, clientRegistration.getRegistrationId());
OAuth2AuthorizationRequest.Builder builder;
oauth2/oauth2-client/src/main/java/org/springframework/security/oauth2/client/web/OAuth2LoginAuthenticationFilter.java
+2 -2
View File
@@ -117,7 +117,7 @@ public class OAuth2LoginAuthenticationFilter extends AbstractAuthenticationProce
}
this.authorizationRequestRepository.removeAuthorizationRequest(request);
String registrationId = (String)authorizationRequest.getAdditionalParameters().get(OAuth2ParameterNames.REGISTRATION_ID);
String registrationId = (String) authorizationRequest.getAdditionalParameters().get(OAuth2ParameterNames.REGISTRATION_ID);
ClientRegistration clientRegistration = this.clientRegistrationRepository.findByRegistrationId(registrationId);
OAuth2LoginAuthenticationToken authenticationRequest = new OAuth2LoginAuthenticationToken(
@@ -125,7 +125,7 @@ public class OAuth2LoginAuthenticationFilter extends AbstractAuthenticationProce
authenticationRequest.setDetails(this.authenticationDetailsSource.buildDetails(request));
OAuth2LoginAuthenticationToken authenticationResult =
(OAuth2LoginAuthenticationToken)this.getAuthenticationManager().authenticate(authenticationRequest);
(OAuth2LoginAuthenticationToken) this.getAuthenticationManager().authenticate(authenticationRequest);
OAuth2AuthenticationToken oauth2Authentication = new OAuth2AuthenticationToken(
authenticationResult.getPrincipal(),
oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/authentication/OAuth2LoginAuthenticationProviderTests.java
+3 -3
View File
@@ -119,7 +119,7 @@ public class OAuth2LoginAuthenticationProviderTests {
when(this.authorizationRequest.getScopes()).thenReturn(new LinkedHashSet<>(Collections.singleton("openid")));
OAuth2LoginAuthenticationToken authentication =
(OAuth2LoginAuthenticationToken)this.authenticationProvider.authenticate(
(OAuth2LoginAuthenticationToken) this.authenticationProvider.authenticate(
new OAuth2LoginAuthenticationToken(this.clientRegistration, this.authorizationExchange));
assertThat(authentication).isNull();
@@ -175,7 +175,7 @@ public class OAuth2LoginAuthenticationProviderTests {
when(this.userService.loadUser(any())).thenReturn(principal);
OAuth2LoginAuthenticationToken authentication =
(OAuth2LoginAuthenticationToken)this.authenticationProvider.authenticate(
(OAuth2LoginAuthenticationToken) this.authenticationProvider.authenticate(
new OAuth2LoginAuthenticationToken(this.clientRegistration, this.authorizationExchange));
assertThat(authentication.isAuthenticated()).isTrue();
@@ -207,7 +207,7 @@ public class OAuth2LoginAuthenticationProviderTests {
this.authenticationProvider.setAuthoritiesMapper(authoritiesMapper);
OAuth2LoginAuthenticationToken authentication =
(OAuth2LoginAuthenticationToken)this.authenticationProvider.authenticate(
(OAuth2LoginAuthenticationToken) this.authenticationProvider.authenticate(
new OAuth2LoginAuthenticationToken(this.clientRegistration, this.authorizationExchange));
assertThat(authentication.getAuthorities()).isEqualTo(mappedAuthorities);
oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/oidc/authentication/OidcAuthorizationCodeAuthenticationProviderTests.java
+3 -3
View File
@@ -143,7 +143,7 @@ public class OidcAuthorizationCodeAuthenticationProviderTests {
when(this.authorizationRequest.getScopes()).thenReturn(new LinkedHashSet<>(Collections.singleton("scope1")));
OAuth2LoginAuthenticationToken authentication =
(OAuth2LoginAuthenticationToken)this.authenticationProvider.authenticate(
(OAuth2LoginAuthenticationToken) this.authenticationProvider.authenticate(
new OAuth2LoginAuthenticationToken(this.clientRegistration, this.authorizationExchange));
assertThat(authentication).isNull();
@@ -355,7 +355,7 @@ public class OidcAuthorizationCodeAuthenticationProviderTests {
when(this.userService.loadUser(any())).thenReturn(principal);
OAuth2LoginAuthenticationToken authentication =
(OAuth2LoginAuthenticationToken)this.authenticationProvider.authenticate(
(OAuth2LoginAuthenticationToken) this.authenticationProvider.authenticate(
new OAuth2LoginAuthenticationToken(this.clientRegistration, this.authorizationExchange));
assertThat(authentication.isAuthenticated()).isTrue();
@@ -389,7 +389,7 @@ public class OidcAuthorizationCodeAuthenticationProviderTests {
this.authenticationProvider.setAuthoritiesMapper(authoritiesMapper);
OAuth2LoginAuthenticationToken authentication =
(OAuth2LoginAuthenticationToken)this.authenticationProvider.authenticate(
(OAuth2LoginAuthenticationToken) this.authenticationProvider.authenticate(
new OAuth2LoginAuthenticationToken(this.clientRegistration, this.authorizationExchange));
assertThat(authentication.getAuthorities()).isEqualTo(mappedAuthorities);
oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/oidc/userinfo/OidcUserServiceTests.java
+1 -1
View File
@@ -159,7 +159,7 @@ public class OidcUserServiceTests {
assertThat(user.getAuthorities().size()).isEqualTo(1);
assertThat(user.getAuthorities().iterator().next()).isInstanceOf(OidcUserAuthority.class);
OidcUserAuthority userAuthority = (OidcUserAuthority)user.getAuthorities().iterator().next();
OidcUserAuthority userAuthority = (OidcUserAuthority) user.getAuthorities().iterator().next();
assertThat(userAuthority.getAuthority()).isEqualTo("ROLE_USER");
assertThat(userAuthority.getIdToken()).isEqualTo(user.getIdToken());
assertThat(userAuthority.getUserInfo()).isEqualTo(user.getUserInfo());
oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/userinfo/DefaultOAuth2UserServiceTests.java
+1 -1
View File
@@ -121,7 +121,7 @@ public class DefaultOAuth2UserServiceTests {
assertThat(user.getAuthorities().size()).isEqualTo(1);
assertThat(user.getAuthorities().iterator().next()).isInstanceOf(OAuth2UserAuthority.class);
OAuth2UserAuthority userAuthority = (OAuth2UserAuthority)user.getAuthorities().iterator().next();
OAuth2UserAuthority userAuthority = (OAuth2UserAuthority) user.getAuthorities().iterator().next();
assertThat(userAuthority.getAuthority()).isEqualTo("ROLE_USER");
assertThat(userAuthority.getAttributes()).isEqualTo(user.getAttributes());
}
oauth2/oauth2-client/src/test/java/org/springframework/security/oauth2/client/web/OAuth2AuthorizationRequestUriBuilderTests.java
+1 -1
View File
@@ -43,7 +43,7 @@ public class OAuth2AuthorizationRequestUriBuilderTests {
@Test
public void buildWhenScopeMultiThenSeparatedByEncodedSpace() {
OAuth2AuthorizationRequest request = OAuth2AuthorizationRequest.implicit()
.additionalParameters(Collections.singletonMap("foo","bar"))
.additionalParameters(Collections.singletonMap("foo", "bar"))
.authorizationUri("https://idp.example.com/oauth2/v2/auth")
.clientId("client-id")
.state("thestate")
oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/ClaimAccessor.java
+2 -2
View File
@@ -75,7 +75,7 @@ public interface ClaimAccessor {
return null;
}
Map<String, Object> claimValues = new HashMap<>();
((Map<?, ?>)this.getClaims().get(claim)).forEach((k, v) -> claimValues.put(k.toString(), v));
((Map<?, ?>) this.getClaims().get(claim)).forEach((k, v) -> claimValues.put(k.toString(), v));
return claimValues;
}
@@ -84,7 +84,7 @@ public interface ClaimAccessor {
return null;
}
List<String> claimValues = new ArrayList<>();
((List<?>)this.getClaims().get(claim)).forEach(e -> claimValues.add(e.toString()));
((List<?>) this.getClaims().get(claim)).forEach(e -> claimValues.add(e.toString()));
return claimValues;
}
}
oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/endpoint/OAuth2AccessTokenResponse.java
+3 -3
View File
@@ -33,7 +33,7 @@ import java.util.Set;
*/
public final class OAuth2AccessTokenResponse {
private OAuth2AccessToken accessToken;
private Map<String,Object> additionalParameters;
private Map<String, Object> additionalParameters;
private OAuth2AccessTokenResponse() {
}
@@ -55,7 +55,7 @@ public final class OAuth2AccessTokenResponse {
private OAuth2AccessToken.TokenType tokenType;
private long expiresIn;
private Set<String> scopes;
private Map<String,Object> additionalParameters;
private Map<String, Object> additionalParameters;
private Builder(String tokenValue) {
this.tokenValue = tokenValue;
@@ -76,7 +76,7 @@ public final class OAuth2AccessTokenResponse {
return this;
}
public Builder additionalParameters(Map<String,Object> additionalParameters) {
public Builder additionalParameters(Map<String, Object> additionalParameters) {
this.additionalParameters = additionalParameters;
return this;
}
oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/endpoint/OAuth2AuthorizationRequest.java
+3 -3
View File
@@ -49,7 +49,7 @@ public final class OAuth2AuthorizationRequest implements Serializable {
private String redirectUri;
private Set<String> scopes;
private String state;
private Map<String,Object> additionalParameters;
private Map<String, Object> additionalParameters;
private OAuth2AuthorizationRequest() {
}
@@ -102,7 +102,7 @@ public final class OAuth2AuthorizationRequest implements Serializable {
private String redirectUri;
private Set<String> scopes;
private String state;
private Map<String,Object> additionalParameters;
private Map<String, Object> additionalParameters;
private Builder(AuthorizationGrantType authorizationGrantType) {
Assert.notNull(authorizationGrantType, "authorizationGrantType cannot be null");
@@ -147,7 +147,7 @@ public final class OAuth2AuthorizationRequest implements Serializable {
return this;
}
public Builder additionalParameters(Map<String,Object> additionalParameters) {
public Builder additionalParameters(Map<String, Object> additionalParameters) {
this.additionalParameters = additionalParameters;
return this;
}
oauth2/oauth2-core/src/main/java/org/springframework/security/oauth2/core/oidc/DefaultAddressStandardClaim.java
+6 -6
View File
@@ -123,12 +123,12 @@ public final class DefaultAddressStandardClaim implements AddressStandardClaim {
}
public Builder(Map<String, Object> addressFields) {
this.formatted((String)addressFields.get(FORMATTED_FIELD_NAME));
this.streetAddress((String)addressFields.get(STREET_ADDRESS_FIELD_NAME));
this.locality((String)addressFields.get(LOCALITY_FIELD_NAME));
this.region((String)addressFields.get(REGION_FIELD_NAME));
this.postalCode((String)addressFields.get(POSTAL_CODE_FIELD_NAME));
this.country((String)addressFields.get(COUNTRY_FIELD_NAME));
this.formatted((String) addressFields.get(FORMATTED_FIELD_NAME));
this.streetAddress((String) addressFields.get(STREET_ADDRESS_FIELD_NAME));
this.locality((String) addressFields.get(LOCALITY_FIELD_NAME));
this.region((String) addressFields.get(REGION_FIELD_NAME));
this.postalCode((String) addressFields.get(POSTAL_CODE_FIELD_NAME));
this.country((String) addressFields.get(COUNTRY_FIELD_NAME));
}
public Builder formatted(String formatted) {