Polish ServerWebExchangeDelegatingServerHttpHeadersWriter

Issue gh-11073

web/src/main/java/org/springframework/security/web/server/header/ServerWebExchangeDelegatingServerHttpHeadersWriter.java

@@ -43,6 +43,8 @@ public final class ServerWebExchangeDelegatingServerHttpHeadersWriter implements
 	public ServerWebExchangeDelegatingServerHttpHeadersWriter(
 			ServerWebExchangeMatcherEntry<ServerHttpHeadersWriter> headersWriter) {
 		Assert.notNull(headersWriter, "headersWriter cannot be null");
+		Assert.notNull(headersWriter.getMatcher(), "webExchangeMatcher cannot be null");
+		Assert.notNull(headersWriter.getEntry(), "delegateHeadersWriter cannot be null");
 		this.headersWriter = headersWriter;
 	}
 
@@ -55,9 +57,7 @@ public final class ServerWebExchangeDelegatingServerHttpHeadersWriter implements
 	 */
 	public ServerWebExchangeDelegatingServerHttpHeadersWriter(ServerWebExchangeMatcher webExchangeMatcher,
 			ServerHttpHeadersWriter delegateHeadersWriter) {
-		Assert.notNull(webExchangeMatcher, "webExchangeMatcher cannot be null");
+		this(new ServerWebExchangeMatcherEntry<>(webExchangeMatcher, delegateHeadersWriter));
-		Assert.notNull(delegateHeadersWriter, "delegateHeadersWriter cannot be null");
-		this.headersWriter = new ServerWebExchangeMatcherEntry<>(webExchangeMatcher, delegateHeadersWriter);
 	}
 
 	@Override

web/src/test/java/org/springframework/security/web/server/header/ServerWebExchangeDelegatingServerHttpHeadersWriterTests.java

@@ -17,7 +17,6 @@
 package org.springframework.security.web.server.header;
 
 import java.util.Collections;
-import java.util.Map;
 
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
@@ -49,9 +48,6 @@ public class ServerWebExchangeDelegatingServerHttpHeadersWriterTests {
 	@Mock
 	private ServerHttpHeadersWriter delegate;
 
-	@Mock
-	private ServerWebExchangeMatcherEntry<ServerHttpHeadersWriter> matcherEntry;
-
 	private ServerWebExchange exchange;
 
 	private ServerWebExchangeDelegatingServerHttpHeadersWriter headerWriter;
@@ -63,49 +59,57 @@ public class ServerWebExchangeDelegatingServerHttpHeadersWriterTests {
 	}
 
 	@Test
-	public void constructorNullWebExchangeMatcher() {
+	public void constructorWhenNullWebExchangeMatcherThenException() {
 		assertThatIllegalArgumentException()
-				.isThrownBy(() -> new ServerWebExchangeDelegatingServerHttpHeadersWriter(null, this.delegate));
+				.isThrownBy(() -> new ServerWebExchangeDelegatingServerHttpHeadersWriter(null, this.delegate))
+				.withMessage("webExchangeMatcher cannot be null");
 	}
 
 	@Test
-	public void constructorNullWebExchangeMatcherEntry() {
+	public void constructorWhenNullWebExchangeMatcherEntryThenException() {
 		assertThatIllegalArgumentException()
-				.isThrownBy(() -> new ServerWebExchangeDelegatingServerHttpHeadersWriter(null));
+				.isThrownBy(() -> new ServerWebExchangeDelegatingServerHttpHeadersWriter(null))
+				.withMessage("headersWriter cannot be null");
 	}
 
 	@Test
-	public void constructorNullDelegate() {
+	public void constructorWhenNullDelegateHeadersWriterThenException() {
 		assertThatIllegalArgumentException()
-				.isThrownBy(() -> new ServerWebExchangeDelegatingServerHttpHeadersWriter(this.matcher, null));
+				.isThrownBy(() -> new ServerWebExchangeDelegatingServerHttpHeadersWriter(this.matcher, null))
+				.withMessage("delegateHeadersWriter cannot be null");
 	}
 
 	@Test
-	public void writeHeadersOnMatch() {
+	public void constructorWhenEntryWithNullMatcherThenException() {
-		Map<String, Object> params = Collections.singletonMap("foo", "bar");
+		assertThatIllegalArgumentException()
-		given(this.matcher.matches(this.exchange)).willReturn(ServerWebExchangeMatcher.MatchResult.match(params));
+				.isThrownBy(() -> new ServerWebExchangeDelegatingServerHttpHeadersWriter(
-		given(this.delegate.writeHttpHeaders(this.exchange)).willReturn(Mono.empty());
+						new ServerWebExchangeMatcherEntry<>(null, this.delegate)))
-		this.headerWriter.writeHttpHeaders(this.exchange).block();
+				.withMessage("webExchangeMatcher cannot be null");
-		verify(this.delegate).writeHttpHeaders(this.exchange);
 	}
 
 	@Test
-	public void writeHeadersOnNoMatch() {
+	public void constructorWhenEntryWithNullEntryThenException() {
-		given(this.matcher.matches(this.exchange)).willReturn(ServerWebExchangeMatcher.MatchResult.notMatch());
+		assertThatIllegalArgumentException()
-		this.headerWriter.writeHttpHeaders(this.exchange).block();
+				.isThrownBy(() -> new ServerWebExchangeDelegatingServerHttpHeadersWriter(
-		verify(this.delegate, times(0)).writeHttpHeaders(this.exchange);
+						new ServerWebExchangeMatcherEntry<>(this.matcher, null)))
+				.withMessage("delegateHeadersWriter cannot be null");
 	}
 
 	@Test
-	public void writeHeadersOnMatchWithServerWebExchangeMatcherEntry() {
+	public void writeHeadersWhenMatchThenDelegateWriteHttpHeaders() {
-		this.headerWriter = new ServerWebExchangeDelegatingServerHttpHeadersWriter(this.matcherEntry);
+		given(this.matcher.matches(this.exchange))
-		given(this.matcherEntry.getMatcher()).willReturn(this.matcher);
+				.willReturn(ServerWebExchangeMatcher.MatchResult.match(Collections.emptyMap()));
-		given(this.matcherEntry.getEntry()).willReturn(this.delegate);
-		Map<String, Object> params = Collections.singletonMap("foo", "bar");
-		given(this.matcher.matches(this.exchange)).willReturn(ServerWebExchangeMatcher.MatchResult.match(params));
 		given(this.delegate.writeHttpHeaders(this.exchange)).willReturn(Mono.empty());
 		this.headerWriter.writeHttpHeaders(this.exchange).block();
 		verify(this.delegate).writeHttpHeaders(this.exchange);
 	}
 
+	@Test
+	public void writeHeadersWhenNoMatchThenDelegateNotCalled() {
+		given(this.matcher.matches(this.exchange)).willReturn(ServerWebExchangeMatcher.MatchResult.notMatch());
+		this.headerWriter.writeHttpHeaders(this.exchange).block();
+		verify(this.matcher).matches(this.exchange);
+		verify(this.delegate, times(0)).writeHttpHeaders(this.exchange);
+	}
+
 }