Rename AbstractMockServerSpec and friends

Fixes gh-31275

Signed-off-by: Rob Worsnop <[email protected]>

Author: rworsnop

spring-test/src/main/java/org/springframework/test/web/server/AbstractMockMvcServerSpec.java renamed to spring-test/src/main/java/org/springframework/test/web/server/AbstractMockServerSpec.java

@@ -28,15 +28,15 @@
 import org.springframework.test.web.servlet.setup.MockMvcConfigurer;
 
 /**
- * Base class for implementations of {@link RestTestClient.MockMvcServerSpec}
+ * Base class for implementations of {@link RestTestClient.MockServerSpec}
  * that simply delegates to a {@link org.springframework.test.web.servlet.setup.ConfigurableMockMvcBuilder} supplied by
  * the concrete subclasses.
  *
  * @author Rob Worsnop
  * @param <B> the type of the concrete subclass spec
  */
-abstract class AbstractMockMvcServerSpec<B extends RestTestClient.MockMvcServerSpec<B>>
-		implements RestTestClient.MockMvcServerSpec<B> {
+abstract class AbstractMockServerSpec<B extends RestTestClient.MockServerSpec<B>>
+		implements RestTestClient.MockServerSpec<B> {
 
 	@Override
 	public <T extends B> T filters(Filter... filters) {

spring-test/src/main/java/org/springframework/test/web/server/ApplicationContextMockMvcSpec.java renamed to spring-test/src/main/java/org/springframework/test/web/server/ApplicationContextMockSpec.java

@@ -26,10 +26,10 @@
  *
  * @author Rob Worsnop
  */
-class ApplicationContextMockMvcSpec extends AbstractMockMvcServerSpec<ApplicationContextMockMvcSpec> {
+class ApplicationContextMockSpec extends AbstractMockServerSpec<ApplicationContextMockSpec> {
 	private final DefaultMockMvcBuilder mockMvcBuilder;
 
-	public ApplicationContextMockMvcSpec(WebApplicationContext context) {
+	public ApplicationContextMockSpec(WebApplicationContext context) {
 		this.mockMvcBuilder = MockMvcBuilders.webAppContextSetup(context);
 	}
 

spring-test/src/main/java/org/springframework/test/web/server/RestTestClient.java

@@ -145,7 +145,7 @@ public interface RestTestClient {
 	 * to initialize {@link MockMvc}.
 	 */
 	static ControllerSpec bindToController(Object... controllers) {
-		return new StandaloneMockMvcSpec(controllers);
+		return new StandaloneMockSpec(controllers);
 	}
 
 	/**
@@ -156,7 +156,7 @@ static ControllerSpec bindToController(Object... controllers) {
 	 * to initialize {@link MockMvc}.
 	 */
 	static RouterFunctionSpec bindToRouterFunction(RouterFunction<?>... routerFunctions) {
-		return new RouterFunctionMockMvcSpec(routerFunctions);
+		return new RouterFunctionMockSpec(routerFunctions);
 	}
 
 	/**
@@ -167,8 +167,8 @@ static RouterFunctionSpec bindToRouterFunction(RouterFunction<?>... routerFuncti
 	 * {@link org.springframework.test.web.servlet.setup.MockMvcBuilders#webAppContextSetup(WebApplicationContext)}
 	 * to initialize {@code MockMvc}.
 	 */
-	static MockMvcServerSpec<?> bindToApplicationContext(WebApplicationContext context) {
-		return new ApplicationContextMockMvcSpec(context);
+	static MockServerSpec<?> bindToApplicationContext(WebApplicationContext context) {
+		return new ApplicationContextMockSpec(context);
 	}
 
 
@@ -207,7 +207,7 @@ static Builder bindToServer(ClientHttpRequestFactory requestFactory) {
 	/**
 	 * Specification for customizing controller configuration.
 	 */
-	interface ControllerSpec extends MockMvcServerSpec<ControllerSpec> {
+	interface ControllerSpec extends MockServerSpec<ControllerSpec> {
 		/**
 		 * Register {@link org.springframework.web.bind.annotation.ControllerAdvice}
 		 * <p>This is delegated to
@@ -342,7 +342,7 @@ ControllerSpec mappedInterceptors(
 	 * {@linkplain RouterFunction router functions}
 	 * directly, and a simple facade around {@link RouterFunctionMockMvcBuilder}.
 	 */
-	interface RouterFunctionSpec extends MockMvcServerSpec<RouterFunctionSpec> {
+	interface RouterFunctionSpec extends MockServerSpec<RouterFunctionSpec> {
 
 		/**
 		 * Set the message converters to use.
@@ -411,7 +411,7 @@ RouterFunctionSpec mappedInterceptors(
 	 *
 	 * @param <B> a self reference to the builder type
 	 */
-	interface MockMvcServerSpec<B extends MockMvcServerSpec<B>> {
+	interface MockServerSpec<B extends MockServerSpec<B>> {
 		/**
 		 * Add a global filter.
 		 * <p>This is delegated to

spring-test/src/main/java/org/springframework/test/web/server/RouterFunctionMockMvcSpec.java renamed to spring-test/src/main/java/org/springframework/test/web/server/RouterFunctionMockSpec.java

@@ -36,12 +36,12 @@
  *
  * @author Rob Worsnop
  */
-class RouterFunctionMockMvcSpec extends AbstractMockMvcServerSpec<RouterFunctionSpec>
+class RouterFunctionMockSpec extends AbstractMockServerSpec<RouterFunctionSpec>
 		implements RouterFunctionSpec {
 
 	private final RouterFunctionMockMvcBuilder mockMvcBuilder;
 
-	RouterFunctionMockMvcSpec(RouterFunction<?>... routerFunctions) {
+	RouterFunctionMockSpec(RouterFunction<?>... routerFunctions) {
 		this.mockMvcBuilder = MockMvcBuilders.routerFunctions(routerFunctions);
 	}
 

spring-test/src/main/java/org/springframework/test/web/server/StandaloneMockMvcSpec.java renamed to spring-test/src/main/java/org/springframework/test/web/server/StandaloneMockSpec.java

@@ -44,121 +44,121 @@
  *
  * @author Rob Worsnop
  */
-class StandaloneMockMvcSpec extends AbstractMockMvcServerSpec<RestTestClient.ControllerSpec>
+class StandaloneMockSpec extends AbstractMockServerSpec<RestTestClient.ControllerSpec>
 	implements RestTestClient.ControllerSpec {
 
 	private final StandaloneMockMvcBuilder mockMvcBuilder;
 
-	StandaloneMockMvcSpec(Object... controllers) {
+	StandaloneMockSpec(Object... controllers) {
 		this.mockMvcBuilder = MockMvcBuilders.standaloneSetup(controllers);
 	}
 
 	@Override
-	public StandaloneMockMvcSpec controllerAdvice(Object... controllerAdvice) {
+	public StandaloneMockSpec controllerAdvice(Object... controllerAdvice) {
 		this.mockMvcBuilder.setControllerAdvice(controllerAdvice);
 		return this;
 	}
 
 	@Override
-	public StandaloneMockMvcSpec messageConverters(HttpMessageConverter<?>... messageConverters) {
+	public StandaloneMockSpec messageConverters(HttpMessageConverter<?>... messageConverters) {
 		this.mockMvcBuilder.setMessageConverters(messageConverters);
 		return this;
 	}
 
 	@Override
-	public StandaloneMockMvcSpec validator(Validator validator) {
+	public StandaloneMockSpec validator(Validator validator) {
 		this.mockMvcBuilder.setValidator(validator);
 		return this;
 	}
 
 	@Override
-	public StandaloneMockMvcSpec conversionService(FormattingConversionService conversionService) {
+	public StandaloneMockSpec conversionService(FormattingConversionService conversionService) {
 		this.mockMvcBuilder.setConversionService(conversionService);
 		return this;
 	}
 
 	@Override
-	public StandaloneMockMvcSpec interceptors(HandlerInterceptor... interceptors) {
+	public StandaloneMockSpec interceptors(HandlerInterceptor... interceptors) {
 		mappedInterceptors(null, interceptors);
 		return this;
 	}
 
 	@Override
-	public StandaloneMockMvcSpec mappedInterceptors(
+	public StandaloneMockSpec mappedInterceptors(
 			String @Nullable [] pathPatterns, HandlerInterceptor... interceptors) {
 
 		this.mockMvcBuilder.addMappedInterceptors(pathPatterns, interceptors);
 		return this;
 	}
 
 	@Override
-	public StandaloneMockMvcSpec contentNegotiationManager(ContentNegotiationManager manager) {
+	public StandaloneMockSpec contentNegotiationManager(ContentNegotiationManager manager) {
 		this.mockMvcBuilder.setContentNegotiationManager(manager);
 		return this;
 	}
 
 	@Override
-	public StandaloneMockMvcSpec asyncRequestTimeout(long timeout) {
+	public StandaloneMockSpec asyncRequestTimeout(long timeout) {
 		this.mockMvcBuilder.setAsyncRequestTimeout(timeout);
 		return this;
 	}
 
 	@Override
-	public StandaloneMockMvcSpec customArgumentResolvers(HandlerMethodArgumentResolver... argumentResolvers) {
+	public StandaloneMockSpec customArgumentResolvers(HandlerMethodArgumentResolver... argumentResolvers) {
 		this.mockMvcBuilder.setCustomArgumentResolvers(argumentResolvers);
 		return this;
 	}
 
 	@Override
-	public StandaloneMockMvcSpec customReturnValueHandlers(HandlerMethodReturnValueHandler... handlers) {
+	public StandaloneMockSpec customReturnValueHandlers(HandlerMethodReturnValueHandler... handlers) {
 		this.mockMvcBuilder.setCustomReturnValueHandlers(handlers);
 		return this;
 	}
 
 	@Override
-	public StandaloneMockMvcSpec handlerExceptionResolvers(HandlerExceptionResolver... exceptionResolvers) {
+	public StandaloneMockSpec handlerExceptionResolvers(HandlerExceptionResolver... exceptionResolvers) {
 		this.mockMvcBuilder.setHandlerExceptionResolvers(exceptionResolvers);
 		return this;
 	}
 
 	@Override
-	public StandaloneMockMvcSpec viewResolvers(ViewResolver... resolvers) {
+	public StandaloneMockSpec viewResolvers(ViewResolver... resolvers) {
 		this.mockMvcBuilder.setViewResolvers(resolvers);
 		return this;
 	}
 
 	@Override
-	public StandaloneMockMvcSpec singleView(View view) {
+	public StandaloneMockSpec singleView(View view) {
 		this.mockMvcBuilder.setSingleView(view);
 		return this;
 	}
 
 	@Override
-	public StandaloneMockMvcSpec localeResolver(LocaleResolver localeResolver) {
+	public StandaloneMockSpec localeResolver(LocaleResolver localeResolver) {
 		this.mockMvcBuilder.setLocaleResolver(localeResolver);
 		return this;
 	}
 
 	@Override
-	public StandaloneMockMvcSpec flashMapManager(FlashMapManager flashMapManager) {
+	public StandaloneMockSpec flashMapManager(FlashMapManager flashMapManager) {
 		this.mockMvcBuilder.setFlashMapManager(flashMapManager);
 		return this;
 	}
 
 	@Override
-	public StandaloneMockMvcSpec patternParser(PathPatternParser parser) {
+	public StandaloneMockSpec patternParser(PathPatternParser parser) {
 		this.mockMvcBuilder.setPatternParser(parser);
 		return this;
 	}
 
 	@Override
-	public StandaloneMockMvcSpec placeholderValue(String name, String value) {
+	public StandaloneMockSpec placeholderValue(String name, String value) {
 		this.mockMvcBuilder.addPlaceholderValue(name, value);
 		return this;
 	}
 
 	@Override
-	public StandaloneMockMvcSpec customHandlerMapping(Supplier<RequestMappingHandlerMapping> factory) {
+	public StandaloneMockSpec customHandlerMapping(Supplier<RequestMappingHandlerMapping> factory) {
 		this.mockMvcBuilder.setCustomHandlerMapping(factory);
 		return this;
 	}

spring-test/src/test/java/org/springframework/test/web/server/StandaloneMockMvcSpecTests.java

@@ -27,21 +27,21 @@
 import org.springframework.web.bind.annotation.RestController;
 
 /**
- * Tests for {@link StandaloneMockMvcSpec}.
+ * Tests for {@link StandaloneMockSpec}.
  *
  * @author Rob Worsnop
  */
 public class StandaloneMockMvcSpecTests {
 
 	@Test
 	public void controller() {
-		new StandaloneMockMvcSpec(new MyController()).build()
+		new StandaloneMockSpec(new MyController()).build()
 				.get().uri("/")
 				.exchange()
 				.expectStatus().isOk()
 				.expectBody(String.class).isEqualTo("Success");
 
-		new StandaloneMockMvcSpec(new MyController()).build()
+		new StandaloneMockSpec(new MyController()).build()
 				.get().uri("")
 				.exchange()
 				.expectStatus().isOk()
@@ -50,7 +50,7 @@ public void controller() {
 
 	@Test
 	public void controllerAdvice() {
-		new StandaloneMockMvcSpec(new MyController())
+		new StandaloneMockSpec(new MyController())
 				.controllerAdvice(new MyControllerAdvice())
 				.build()
 				.get().uri("/exception")
@@ -61,7 +61,7 @@ public void controllerAdvice() {
 
 	@Test
 	public void controllerAdviceWithClassArgument() {
-		new StandaloneMockMvcSpec(MyController.class)
+		new StandaloneMockSpec(MyController.class)
 				.controllerAdvice(MyControllerAdvice.class)
 				.build()
 				.get().uri("/exception")