From e3f6b61743bb66a955dfe551bb7b6659ceac8c16 Mon Sep 17 00:00:00 2001
From: Stephane Nicoll <snicoll@pivotal.io>
Date: Sat, 29 Oct 2016 11:15:26 +0200
Subject: [PATCH] Polish

---
 .../servlet/setup/AbstractMockMvcBuilder.java | 24 +++++++++----------
 1 file changed, 11 insertions(+), 13 deletions(-)

diff --git a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/AbstractMockMvcBuilder.java b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/AbstractMockMvcBuilder.java
index 620c565ca9..125ccbe436 100644
--- a/spring-test/src/main/java/org/springframework/test/web/servlet/setup/AbstractMockMvcBuilder.java
+++ b/spring-test/src/main/java/org/springframework/test/web/servlet/setup/AbstractMockMvcBuilder.java
@@ -62,7 +62,6 @@ public abstract class AbstractMockMvcBuilder<B extends AbstractMockMvcBuilder<B>
 	private final List<MockMvcConfigurer> configurers = new ArrayList<>(4);
 
 
-	@SuppressWarnings("unchecked")
 	public final <T extends B> T addFilters(Filter... filters) {
 		Assert.notNull(filters, "filters cannot be null");
 
@@ -70,10 +69,9 @@ public abstract class AbstractMockMvcBuilder<B extends AbstractMockMvcBuilder<B>
 			Assert.notNull(f, "filters cannot contain null values");
 			this.filters.add(f);
 		}
-		return (T) this;
+		return self();
 	}
 
-	@SuppressWarnings("unchecked")
 	public final <T extends B> T addFilter(Filter filter, String... urlPatterns) {
 
 		Assert.notNull(filter, "filter cannot be null");
@@ -84,31 +82,27 @@ public abstract class AbstractMockMvcBuilder<B extends AbstractMockMvcBuilder<B>
 		}
 
 		this.filters.add(filter);
-		return (T) this;
+		return self();
 	}
 
-	@SuppressWarnings("unchecked")
 	public final <T extends B> T defaultRequest(RequestBuilder requestBuilder) {
 		this.defaultRequestBuilder = requestBuilder;
-		return (T) this;
+		return self();
 	}
 
-	@SuppressWarnings("unchecked")
 	public final <T extends B> T alwaysExpect(ResultMatcher resultMatcher) {
 		this.globalResultMatchers.add(resultMatcher);
-		return (T) this;
+		return self();
 	}
 
-	@SuppressWarnings("unchecked")
 	public final <T extends B> T alwaysDo(ResultHandler resultHandler) {
 		this.globalResultHandlers.add(resultHandler);
-		return (T) this;
+		return self();
 	}
 
-	@SuppressWarnings("unchecked")
 	public final <T extends B> T addDispatcherServletCustomizer(DispatcherServletCustomizer customizer) {
 		this.dispatcherServletCustomizers.add(customizer);
-		return (T) this;
+		return self();
 	}
 
 	public final <T extends B> T dispatchOptions(boolean dispatchOptions) {
@@ -116,10 +110,14 @@ public abstract class AbstractMockMvcBuilder<B extends AbstractMockMvcBuilder<B>
 				dispatcherServlet -> dispatcherServlet.setDispatchOptionsRequest(dispatchOptions));
 	}
 
-	@SuppressWarnings("unchecked")
 	public final <T extends B> T apply(MockMvcConfigurer configurer) {
 		configurer.afterConfigurerAdded(this);
 		this.configurers.add(configurer);
+		return self();
+	}
+
+	@SuppressWarnings("unchecked")
+	protected <T extends B> T self() {
 		return (T) this;
 	}