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:
parent
834dcf5bcf
commit
ee661f7b71
|
@ -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();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
|
@ -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
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -45,7 +45,7 @@ public class UserDeserializerTests extends AbstractMixinTests {
|
||||||
public static final String USER_JSON = "{"
|
public static final String USER_JSON = "{"
|
||||||
+ "\"@class\": \"org.springframework.security.core.userdetails.User\", "
|
+ "\"@class\": \"org.springframework.security.core.userdetails.User\", "
|
||||||
+ "\"username\": \"admin\","
|
+ "\"username\": \"admin\","
|
||||||
+ " \"password\": "+ USER_PASSWORD +", "
|
+ " \"password\": " + USER_PASSWORD + ", "
|
||||||
+ "\"accountNonExpired\": true, "
|
+ "\"accountNonExpired\": true, "
|
||||||
+ "\"accountNonLocked\": true, "
|
+ "\"accountNonLocked\": true, "
|
||||||
+ "\"credentialsNonExpired\": true, "
|
+ "\"credentialsNonExpired\": true, "
|
||||||
|
|
|
@ -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" />
|
||||||
|
|
|
@ -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) {
|
||||||
|
|
|
@ -58,7 +58,7 @@ public class DefaultSavedRequestMixinTests extends AbstractMixinTests {
|
||||||
// @formatter:off
|
// @formatter:off
|
||||||
private static final String REQUEST_JSON = "{" +
|
private static final String REQUEST_JSON = "{" +
|
||||||
"\"@class\": \"org.springframework.security.web.savedrequest.DefaultSavedRequest\", "
|
"\"@class\": \"org.springframework.security.web.savedrequest.DefaultSavedRequest\", "
|
||||||
+ "\"cookies\": "+ COOKIES_JSON +","
|
+ "\"cookies\": " + COOKIES_JSON + ","
|
||||||
+ "\"locales\": [\"java.util.ArrayList\", [\"en\"]], "
|
+ "\"locales\": [\"java.util.ArrayList\", [\"en\"]], "
|
||||||
+ "\"headers\": {\"@class\": \"java.util.TreeMap\", \"x-auth-token\": [\"java.util.ArrayList\", [\"12\"]]}, "
|
+ "\"headers\": {\"@class\": \"java.util.TreeMap\", \"x-auth-token\": [\"java.util.ArrayList\", [\"12\"]]}, "
|
||||||
+ "\"parameters\": {\"@class\": \"java.util.TreeMap\"},"
|
+ "\"parameters\": {\"@class\": \"java.util.TreeMap\"},"
|
||||||
|
|
|
@ -41,7 +41,7 @@ public class PreAuthenticatedAuthenticationTokenMixinTests extends AbstractMixin
|
||||||
+ "\"credentials\": \"credentials\", "
|
+ "\"credentials\": \"credentials\", "
|
||||||
+ "\"authenticated\": true, "
|
+ "\"authenticated\": true, "
|
||||||
+ "\"details\": null, "
|
+ "\"details\": null, "
|
||||||
+ "\"authorities\": "+ SimpleGrantedAuthorityMixinTests.AUTHORITIES_ARRAYLIST_JSON
|
+ "\"authorities\": " + SimpleGrantedAuthorityMixinTests.AUTHORITIES_ARRAYLIST_JSON
|
||||||
+ "}";
|
+ "}";
|
||||||
// @formatter:on
|
// @formatter:on
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue