From ee661f7b711299fc1b077090b034bed12901fe42 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@vmware.com>
Date: Thu, 30 Jul 2020 00:34:51 -0700
Subject: [PATCH] Fix whitespace issues in format-off code

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

Issue gh-8945
---
 .../config/annotation/web/configurers/JeeConfigurer.java      | 4 ++--
 .../web/configurers/saml2/Saml2LoginConfigurerTests.java      | 3 ++-
 .../security/jackson2/UserDeserializerTests.java              | 2 +-
 etc/checkstyle/checkstyle-suppressions.xml                    | 2 --
 .../security/web/jackson2/CookieDeserializer.java             | 3 +--
 .../security/web/jackson2/DefaultSavedRequestMixinTests.java  | 2 +-
 .../PreAuthenticatedAuthenticationTokenMixinTests.java        | 2 +-
 7 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/JeeConfigurer.java b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/JeeConfigurer.java
index 078adc18b0..30928d0b24 100644
--- a/config/src/main/java/org/springframework/security/config/annotation/web/configurers/JeeConfigurer.java
+++ b/config/src/main/java/org/springframework/security/config/annotation/web/configurers/JeeConfigurer.java
@@ -230,8 +230,8 @@ public final class JeeConfigurer<H extends HttpSecurityBuilder<H>> extends Abstr
 	 * @return the {@link AuthenticationUserDetailsService} to use
 	 */
 	private AuthenticationUserDetailsService<PreAuthenticatedAuthenticationToken> getUserDetailsService() {
-		return (this.authenticationUserDetailsService != null)
-				? new PreAuthenticatedGrantedAuthoritiesUserDetailsService() : this.authenticationUserDetailsService;
+		return (this.authenticationUserDetailsService != null) ? this.authenticationUserDetailsService
+				: new PreAuthenticatedGrantedAuthoritiesUserDetailsService();
 	}
 
 	/**
diff --git a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurerTests.java b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurerTests.java
index a8c47766f6..601473a3e6 100644
--- a/config/src/test/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurerTests.java
+++ b/config/src/test/java/org/springframework/security/config/annotation/web/configurers/saml2/Saml2LoginConfigurerTests.java
@@ -349,7 +349,8 @@ public class Saml2LoginConfigurerTests {
 				.authorizeRequests((authz) -> authz
 					.anyRequest().authenticated()
 				)
-				.saml2Login((saml2) -> {});
+				.saml2Login((saml2) -> {
+				});
 			// @formatter:on
 		}
 
diff --git a/core/src/test/java/org/springframework/security/jackson2/UserDeserializerTests.java b/core/src/test/java/org/springframework/security/jackson2/UserDeserializerTests.java
index 5f165c43d3..f7d902486b 100644
--- a/core/src/test/java/org/springframework/security/jackson2/UserDeserializerTests.java
+++ b/core/src/test/java/org/springframework/security/jackson2/UserDeserializerTests.java
@@ -45,7 +45,7 @@ public class UserDeserializerTests extends AbstractMixinTests {
 	public static final String USER_JSON = "{"
 		+ "\"@class\": \"org.springframework.security.core.userdetails.User\", "
 		+ "\"username\": \"admin\","
-		+ " \"password\": "+ USER_PASSWORD +", "
+		+ " \"password\": " + USER_PASSWORD + ", "
 		+ "\"accountNonExpired\": true, "
 		+ "\"accountNonLocked\": true, "
 		+ "\"credentialsNonExpired\": true, "
diff --git a/etc/checkstyle/checkstyle-suppressions.xml b/etc/checkstyle/checkstyle-suppressions.xml
index ec81d6574e..8ad15ce4af 100644
--- a/etc/checkstyle/checkstyle-suppressions.xml
+++ b/etc/checkstyle/checkstyle-suppressions.xml
@@ -3,8 +3,6 @@
 		"-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
 		"https://checkstyle.org/dtds/suppressions_1_2.dtd">
 <suppressions>
-	<suppress files=".*" checks="WhitespaceAfter" />
-	<suppress files=".*" checks="WhitespaceAround" />
 	<suppress files=".*" checks="JavadocMethod" />
 	<suppress files=".*" checks="JavadocStyle" />
 	<suppress files=".*" checks="JavadocTagContinuationIndentation" />
diff --git a/web/src/main/java/org/springframework/security/web/jackson2/CookieDeserializer.java b/web/src/main/java/org/springframework/security/web/jackson2/CookieDeserializer.java
index 90e1273faf..4b0c3a41f2 100644
--- a/web/src/main/java/org/springframework/security/web/jackson2/CookieDeserializer.java
+++ b/web/src/main/java/org/springframework/security/web/jackson2/CookieDeserializer.java
@@ -57,8 +57,7 @@ class CookieDeserializer extends JsonDeserializer<Cookie> {
 	}
 
 	private JsonNode readJsonNode(JsonNode jsonNode, String field) {
-		return hasNonNullField(jsonNode, field) ? jsonNode.get(field)
-				: MissingNode.getInstance();
+		return hasNonNullField(jsonNode, field) ? jsonNode.get(field) : MissingNode.getInstance();
 	}
 
 	private boolean hasNonNullField(JsonNode jsonNode, String field) {
diff --git a/web/src/test/java/org/springframework/security/web/jackson2/DefaultSavedRequestMixinTests.java b/web/src/test/java/org/springframework/security/web/jackson2/DefaultSavedRequestMixinTests.java
index 33da0c0a6d..d5cff45f45 100644
--- a/web/src/test/java/org/springframework/security/web/jackson2/DefaultSavedRequestMixinTests.java
+++ b/web/src/test/java/org/springframework/security/web/jackson2/DefaultSavedRequestMixinTests.java
@@ -58,7 +58,7 @@ public class DefaultSavedRequestMixinTests extends AbstractMixinTests {
 	// @formatter:off
 	private static final String REQUEST_JSON = "{" +
 		"\"@class\": \"org.springframework.security.web.savedrequest.DefaultSavedRequest\", "
-		+ "\"cookies\": "+ COOKIES_JSON +","
+		+ "\"cookies\": " + COOKIES_JSON + ","
 		+ "\"locales\": [\"java.util.ArrayList\", [\"en\"]], "
 		+ "\"headers\": {\"@class\": \"java.util.TreeMap\", \"x-auth-token\": [\"java.util.ArrayList\", [\"12\"]]}, "
 		+ "\"parameters\": {\"@class\": \"java.util.TreeMap\"},"
diff --git a/web/src/test/java/org/springframework/security/web/jackson2/PreAuthenticatedAuthenticationTokenMixinTests.java b/web/src/test/java/org/springframework/security/web/jackson2/PreAuthenticatedAuthenticationTokenMixinTests.java
index acc7f3feda..a4a79d5e6d 100644
--- a/web/src/test/java/org/springframework/security/web/jackson2/PreAuthenticatedAuthenticationTokenMixinTests.java
+++ b/web/src/test/java/org/springframework/security/web/jackson2/PreAuthenticatedAuthenticationTokenMixinTests.java
@@ -41,7 +41,7 @@ public class PreAuthenticatedAuthenticationTokenMixinTests extends AbstractMixin
 		+ "\"credentials\": \"credentials\", "
 		+ "\"authenticated\": true, "
 		+ "\"details\": null, "
-		+ "\"authorities\": "+ SimpleGrantedAuthorityMixinTests.AUTHORITIES_ARRAYLIST_JSON
+		+ "\"authorities\": " + SimpleGrantedAuthorityMixinTests.AUTHORITIES_ARRAYLIST_JSON
 	+ "}";
 	// @formatter:on