Cwikius-Spring
/
spring-security
mirror of https://github.com/spring-projects/spring-security.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix whitespace issues in format-off code 

Fix a few whitespace issues in format-off code that would
otherwise fail checkstyle.

Issue gh-8945
This commit is contained in:
Phillip Webb 2020-07-30 00:34:51 -07:00 committed by Rob Winch
parent 834dcf5bcf
commit ee661f7b71
7 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/src/main/java/org/springframework/security/config/annotation/web/configurers/JeeConfigurer.java
View File

@ -230,8 +230,8 @@ public final class JeeConfigurer<H extends HttpSecurityBuilder<H>> extends Abstr
* @return the {@link AuthenticationUserDetailsService} to use * @return the {@link AuthenticationUserDetailsService} to use
*/ */
private AuthenticationUserDetailsService<PreAuthenticatedAuthenticationToken> getUserDetailsService() { private AuthenticationUserDetailsService<PreAuthenticatedAuthenticationToken> getUserDetailsService() {
return (this.authenticationUserDetailsService != null) return (this.authenticationUserDetailsService != null) ? this.authenticationUserDetailsService
? new PreAuthenticatedGrantedAuthoritiesUserDetailsService() : this.authenticationUserDetailsService; : new PreAuthenticatedGrantedAuthoritiesUserDetailsService();
} }
/** /**

3
config/src/test/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurerTests.java
View File

@ -349,7 +349,8 @@ public class Saml2LoginConfigurerTests {
.authorizeRequests((authz) -> authz .authorizeRequests((authz) -> authz
.anyRequest().authenticated() .anyRequest().authenticated()
) )
.saml2Login((saml2) -> {}); .saml2Login((saml2) -> {
});
// @formatter:on // @formatter:on
} }

2
etc/checkstyle/checkstyle-suppressions.xml
View File

@ -3,8 +3,6 @@
"-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN" "-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
"https://checkstyle.org/dtds/suppressions_1_2.dtd"> "https://checkstyle.org/dtds/suppressions_1_2.dtd">
<suppressions> <suppressions>
<suppress files=".*" checks="WhitespaceAfter" />
<suppress files=".*" checks="WhitespaceAround" />
<suppress files=".*" checks="JavadocMethod" /> <suppress files=".*" checks="JavadocMethod" />
<suppress files=".*" checks="JavadocStyle" /> <suppress files=".*" checks="JavadocStyle" />
<suppress files=".*" checks="JavadocTagContinuationIndentation" /> <suppress files=".*" checks="JavadocTagContinuationIndentation" />

3
web/src/main/java/org/springframework/security/web/jackson2/CookieDeserializer.java
View File

@ -57,8 +57,7 @@ class CookieDeserializer extends JsonDeserializer<Cookie> {
} }
private JsonNode readJsonNode(JsonNode jsonNode, String field) { private JsonNode readJsonNode(JsonNode jsonNode, String field) {
return hasNonNullField(jsonNode, field) ? jsonNode.get(field) return hasNonNullField(jsonNode, field) ? jsonNode.get(field) : MissingNode.getInstance();
: MissingNode.getInstance();
} }
private boolean hasNonNullField(JsonNode jsonNode, String field) { private boolean hasNonNullField(JsonNode jsonNode, String field) {