Cwikius-Spring/spring-security
1
0
Fork 0
mirror of synced 2026-08-04 01:07: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
core/src/test/java/org/springframework/security/access/annotation/SecuredAnnotationSecurityMetadataSourceTests.java
+1 -1
View File
@@ -248,7 +248,7 @@ public class SecuredAnnotationSecurityMetadataSourceTests {
class CustomAnnotatedServiceImpl implements CustomAnnotatedService {
}
enum SecurityEnum implements ConfigAttribute,GrantedAuthority {
enum SecurityEnum implements ConfigAttribute, GrantedAuthority {
ADMIN, USER;
public String getAttribute() {
core/src/test/java/org/springframework/security/access/expression/method/MethodExpressionVoterTests.java
+1 -1
View File
@@ -88,7 +88,7 @@ public class MethodExpressionVoterTests {
am.vote(joe, mi, createAttributes(new PreInvocationExpressionAttribute(
"(filterObject == 'joe' or filterObject == 'sam')", "collection",
"permitAll")));
assertThat(arg).containsExactly("joe","sam");
assertThat(arg).containsExactly("joe", "sam");
}
@Test(expected = IllegalArgumentException.class)
core/src/test/java/org/springframework/security/core/SpringSecurityCoreVersionTests.java
+12 -12
View File
@@ -85,8 +85,8 @@ public class SpringSecurityCoreVersionTests {
String version = "1";
spy(SpringSecurityCoreVersion.class);
spy(SpringVersion.class);
doReturn(version).when(SpringSecurityCoreVersion.class,"getVersion");
doReturn(version).when(SpringVersion.class,"getVersion");
doReturn(version).when(SpringSecurityCoreVersion.class, "getVersion");
doReturn(version).when(SpringVersion.class, "getVersion");
performChecks();
@@ -97,8 +97,8 @@ public class SpringSecurityCoreVersionTests {
public void noLoggingIfSpringVersionNull() throws Exception {
spy(SpringSecurityCoreVersion.class);
spy(SpringVersion.class);
doReturn("1").when(SpringSecurityCoreVersion.class,"getVersion");
doReturn(null).when(SpringVersion.class,"getVersion");
doReturn("1").when(SpringSecurityCoreVersion.class, "getVersion");
doReturn(null).when(SpringVersion.class, "getVersion");
performChecks();
@@ -109,8 +109,8 @@ public class SpringSecurityCoreVersionTests {
public void warnIfSpringVersionTooSmall() throws Exception {
spy(SpringSecurityCoreVersion.class);
spy(SpringVersion.class);
doReturn("3").when(SpringSecurityCoreVersion.class,"getVersion");
doReturn("2").when(SpringVersion.class,"getVersion");
doReturn("3").when(SpringSecurityCoreVersion.class, "getVersion");
doReturn("2").when(SpringVersion.class, "getVersion");
performChecks();
@@ -121,8 +121,8 @@ public class SpringSecurityCoreVersionTests {
public void noWarnIfSpringVersionLarger() throws Exception {
spy(SpringSecurityCoreVersion.class);
spy(SpringVersion.class);
doReturn("4.0.0.RELEASE").when(SpringSecurityCoreVersion.class,"getVersion");
doReturn("4.0.0.RELEASE").when(SpringVersion.class,"getVersion");
doReturn("4.0.0.RELEASE").when(SpringSecurityCoreVersion.class, "getVersion");
doReturn("4.0.0.RELEASE").when(SpringVersion.class, "getVersion");
performChecks();
@@ -135,8 +135,8 @@ public class SpringSecurityCoreVersionTests {
String minSpringVersion = "3.2.8.RELEASE";
spy(SpringSecurityCoreVersion.class);
spy(SpringVersion.class);
doReturn("3.2.0.RELEASE").when(SpringSecurityCoreVersion.class,"getVersion");
doReturn("3.2.10.RELEASE").when(SpringVersion.class,"getVersion");
doReturn("3.2.0.RELEASE").when(SpringSecurityCoreVersion.class, "getVersion");
doReturn("3.2.10.RELEASE").when(SpringVersion.class, "getVersion");
performChecks(minSpringVersion);
@@ -147,8 +147,8 @@ public class SpringSecurityCoreVersionTests {
public void noLoggingIfPropertySet() throws Exception {
spy(SpringSecurityCoreVersion.class);
spy(SpringVersion.class);
doReturn("3").when(SpringSecurityCoreVersion.class,"getVersion");
doReturn("2").when(SpringVersion.class,"getVersion");
doReturn("3").when(SpringSecurityCoreVersion.class, "getVersion");
doReturn("2").when(SpringVersion.class, "getVersion");
System.setProperty(getDisableChecksProperty(), Boolean.TRUE.toString());
performChecks();
core/src/test/java/org/springframework/security/core/userdetails/PasswordEncodedUser.java
+2 -2
View File
@@ -25,7 +25,7 @@ import java.util.function.Function;
public class PasswordEncodedUser {
private static final UserDetails USER = withUsername("user").password("password").roles("USER").build();
private static final UserDetails ADMIN = withUsername("admin").password("password").roles("USER","ADMIN").build();
private static final UserDetails ADMIN = withUsername("admin").password("password").roles("USER", "ADMIN").build();
public static UserDetails user() {
return User.withUserDetails(USER).build();
@@ -48,7 +48,7 @@ public class PasswordEncodedUser {
.passwordEncoder(passwordEncoder());
}
private static Function<String,String> passwordEncoder() {
private static Function<String, String> passwordEncoder() {
return rawPassword -> "{noop}" + rawPassword;
}
core/src/test/java/org/springframework/security/core/userdetails/UserTests.java
+2 -2
View File
@@ -150,7 +150,7 @@ public class UserTests {
@Test
public void withUserDetailsWhenAllEnabled() throws Exception {
User expected = new User("rob","pass", true, true, true, true, ROLE_12);
User expected = new User("rob", "pass", true, true, true, true, ROLE_12);
UserDetails actual = User.withUserDetails(expected).build();
@@ -166,7 +166,7 @@ public class UserTests {
@Test
public void withUserDetailsWhenAllDisabled() throws Exception {
User expected = new User("rob","pass", false, false, false, false, ROLE_12);
User expected = new User("rob", "pass", false, false, false, false, ROLE_12);
UserDetails actual = User.withUserDetails(expected).build();
core/src/test/java/org/springframework/security/jackson2/RememberMeAuthenticationTokenMixinTests.java
+2 -2
View File
@@ -107,8 +107,8 @@ public class RememberMeAuthenticationTokenMixinTests extends AbstractMixinTests
.readValue(String.format(REMEMBERME_AUTH_JSON, "\"password\""), RememberMeAuthenticationToken.class);
assertThat(token).isNotNull();
assertThat(token.getPrincipal()).isNotNull().isInstanceOf(User.class);
assertThat(((User)token.getPrincipal()).getUsername()).isEqualTo("admin");
assertThat(((User)token.getPrincipal()).getPassword()).isEqualTo("1234");
assertThat(((User) token.getPrincipal()).getUsername()).isEqualTo("admin");
assertThat(((User) token.getPrincipal()).getPassword()).isEqualTo("1234");
assertThat(((User) token.getPrincipal()).getAuthorities()).hasSize(1).contains(new SimpleGrantedAuthority("ROLE_USER"));
assertThat(token.getAuthorities()).hasSize(1).contains(new SimpleGrantedAuthority("ROLE_USER"));
assertThat(((User) token.getPrincipal()).isEnabled()).isEqualTo(true);
core/src/test/java/org/springframework/security/jackson2/UsernamePasswordAuthenticationTokenMixinTests.java
+1 -1
View File
@@ -120,7 +120,7 @@ public class UsernamePasswordAuthenticationTokenMixinTests extends AbstractMixin
.readValue(AUTHENTICATED_JSON, UsernamePasswordAuthenticationToken.class);
assertThat(token).isNotNull();
assertThat(token.getPrincipal()).isNotNull().isInstanceOf(User.class);
assertThat(((User)token.getPrincipal()).getAuthorities()).isNotNull().hasSize(1).contains(new SimpleGrantedAuthority("ROLE_USER"));
assertThat(((User) token.getPrincipal()).getAuthorities()).isNotNull().hasSize(1).contains(new SimpleGrantedAuthority("ROLE_USER"));
assertThat(token.isAuthenticated()).isEqualTo(true);
assertThat(token.getAuthorities()).hasSize(1).contains(new SimpleGrantedAuthority("ROLE_USER"));
}