From b69825d9257497078b3f2ec9db88163b7d48ad04 Mon Sep 17 00:00:00 2001
From: Phillip Webb <pwebb@vmware.com>
Date: Mon, 27 Jul 2020 20:16:05 -0700
Subject: [PATCH] Simplify boolean expression

Simplify boolean expression of the form `if (b == true)` to instead
just use the form `if (b)`.

Issue gh-8945
---
 .../security/config/http/HeadersBeanDefinitionParser.java       | 2 +-
 etc/checkstyle/checkstyle-suppressions.xml                      | 1 -
 2 files changed, 1 insertion(+), 2 deletions(-)

diff --git a/config/src/main/java/org/springframework/security/config/http/HeadersBeanDefinitionParser.java b/config/src/main/java/org/springframework/security/config/http/HeadersBeanDefinitionParser.java
index 0d24b203cb..1116d171db 100644
--- a/config/src/main/java/org/springframework/security/config/http/HeadersBeanDefinitionParser.java
+++ b/config/src/main/java/org/springframework/security/config/http/HeadersBeanDefinitionParser.java
@@ -234,7 +234,7 @@ public class HeadersBeanDefinitionParser implements BeanDefinitionParser {
 				headersWriter.addPropertyValue("preload", preload);
 			}
 
-			if (disabled == true) {
+			if (disabled) {
 				return;
 			}
 		}
diff --git a/etc/checkstyle/checkstyle-suppressions.xml b/etc/checkstyle/checkstyle-suppressions.xml
index 92888c1f7f..7f80bd3ecc 100644
--- a/etc/checkstyle/checkstyle-suppressions.xml
+++ b/etc/checkstyle/checkstyle-suppressions.xml
@@ -3,7 +3,6 @@
 		"-//Checkstyle//DTD SuppressionFilter Configuration 1.2//EN"
 		"https://checkstyle.org/dtds/suppressions_1_2.dtd">
 <suppressions>
-	<suppress files=".*" checks="SimplifyBooleanExpression" />
 	<suppress files=".*" checks="SimplifyBooleanReturn" />
 	<suppress files=".*" checks="SpringAvoidStaticImport" />
 	<suppress files=".*" checks="SpringCatch" />