From fd4726afaf63819ce3e5bcb134f9b30a1bf3b697 Mon Sep 17 00:00:00 2001
From: Rob Winch <rwinch@users.noreply.github.com>
Date: Mon, 13 Nov 2017 15:53:28 -0600
Subject: [PATCH] HeadersBuilder-HeadersSpec

Issue: gh-4822
---
 .../config/web/server/ServerHttpSecurity.java | 26 +++++++++----------
 ...BuilderTests.java => HeaderSpecTests.java} |  4 +--
 2 files changed, 15 insertions(+), 15 deletions(-)
 rename config/src/test/java/org/springframework/security/config/web/server/{HeaderBuilderTests.java => HeaderSpecTests.java} (97%)

diff --git a/config/src/main/java/org/springframework/security/config/web/server/ServerHttpSecurity.java b/config/src/main/java/org/springframework/security/config/web/server/ServerHttpSecurity.java
index cb9c233e08..46a456c2d6 100644
--- a/config/src/main/java/org/springframework/security/config/web/server/ServerHttpSecurity.java
+++ b/config/src/main/java/org/springframework/security/config/web/server/ServerHttpSecurity.java
@@ -97,7 +97,7 @@ public class ServerHttpSecurity {
 
 	private AuthorizeExchangeSpec authorizeExchange;
 
-	private HeaderBuilder headers = new HeaderBuilder();
+	private HeaderSpec headers = new HeaderSpec();
 
 	private CsrfBuilder csrf = new CsrfBuilder();
 
@@ -175,9 +175,9 @@ public class ServerHttpSecurity {
 		return this.formLogin;
 	}
 
-	public HeaderBuilder headers() {
+	public HeaderSpec headers() {
 		if(this.headers == null) {
-			this.headers = new HeaderBuilder();
+			this.headers = new HeaderSpec();
 		}
 		return this.headers;
 	}
@@ -627,7 +627,7 @@ public class ServerHttpSecurity {
 	 * @author Rob Winch
 	 * @since 5.0
 	 */
-	public class HeaderBuilder {
+	public class HeaderSpec {
 		private final List<ServerHttpHeadersWriter> writers;
 
 		private CacheControlServerHttpHeadersWriter cacheControl = new CacheControlServerHttpHeadersWriter();
@@ -672,7 +672,7 @@ public class ServerHttpSecurity {
 
 		public class CacheSpec {
 			public void disable() {
-				HeaderBuilder.this.writers.remove(HeaderBuilder.this.cacheControl);
+				HeaderSpec.this.writers.remove(HeaderSpec.this.cacheControl);
 			}
 
 			private CacheSpec() {}
@@ -680,7 +680,7 @@ public class ServerHttpSecurity {
 
 		public class ContentTypeOptionsSpec {
 			public void disable() {
-				HeaderBuilder.this.writers.remove(HeaderBuilder.this.contentTypeOptions);
+				HeaderSpec.this.writers.remove(HeaderSpec.this.contentTypeOptions);
 			}
 
 			private ContentTypeOptionsSpec() {}
@@ -688,10 +688,10 @@ public class ServerHttpSecurity {
 
 		public class FrameOptionsSpec {
 			public void mode(XFrameOptionsServerHttpHeadersWriter.Mode mode) {
-				HeaderBuilder.this.frameOptions.setMode(mode);
+				HeaderSpec.this.frameOptions.setMode(mode);
 			}
 			public void disable() {
-				HeaderBuilder.this.writers.remove(HeaderBuilder.this.frameOptions);
+				HeaderSpec.this.writers.remove(HeaderSpec.this.frameOptions);
 			}
 
 			private FrameOptionsSpec() {}
@@ -699,15 +699,15 @@ public class ServerHttpSecurity {
 
 		public class HstsSpec {
 			public void maxAge(Duration maxAge) {
-				HeaderBuilder.this.hsts.setMaxAge(maxAge);
+				HeaderSpec.this.hsts.setMaxAge(maxAge);
 			}
 
 			public void includeSubdomains(boolean includeSubDomains) {
-				HeaderBuilder.this.hsts.setIncludeSubDomains(includeSubDomains);
+				HeaderSpec.this.hsts.setIncludeSubDomains(includeSubDomains);
 			}
 
 			public void disable() {
-				HeaderBuilder.this.writers.remove(HeaderBuilder.this.hsts);
+				HeaderSpec.this.writers.remove(HeaderSpec.this.hsts);
 			}
 
 			private HstsSpec() {}
@@ -715,13 +715,13 @@ public class ServerHttpSecurity {
 
 		public class XssProtectionSpec {
 			public void disable() {
-				HeaderBuilder.this.writers.remove(HeaderBuilder.this.xss);
+				HeaderSpec.this.writers.remove(HeaderSpec.this.xss);
 			}
 
 			private XssProtectionSpec() {}
 		}
 
-		private HeaderBuilder() {
+		private HeaderSpec() {
 			this.writers = new ArrayList<>(
 				Arrays.asList(this.cacheControl, this.contentTypeOptions, this.hsts,
 					this.frameOptions, this.xss));
diff --git a/config/src/test/java/org/springframework/security/config/web/server/HeaderBuilderTests.java b/config/src/test/java/org/springframework/security/config/web/server/HeaderSpecTests.java
similarity index 97%
rename from config/src/test/java/org/springframework/security/config/web/server/HeaderBuilderTests.java
rename to config/src/test/java/org/springframework/security/config/web/server/HeaderSpecTests.java
index 88f0290ca8..2a9b406dfa 100644
--- a/config/src/test/java/org/springframework/security/config/web/server/HeaderBuilderTests.java
+++ b/config/src/test/java/org/springframework/security/config/web/server/HeaderSpecTests.java
@@ -39,9 +39,9 @@ import static org.assertj.core.api.AssertionsForInterfaceTypes.assertThat;
  * @author Rob Winch
  * @since 5.0
  */
-public class HeaderBuilderTests {
+public class HeaderSpecTests {
 
-	ServerHttpSecurity.HeaderBuilder headers = ServerHttpSecurity.http().headers();
+	ServerHttpSecurity.HeaderSpec headers = ServerHttpSecurity.http().headers();
 
 	HttpHeaders expectedHeaders = new HttpHeaders();