Add support for configuring default request and response preprocessors

See gh-424

docs/src/test/java/com/example/mockmvc/CustomDefaultOperationPreprocessors.java

@@ -0,0 +1,50 @@
+/*
+ * Copyright 2014-2017 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.example.mockmvc;
+
+import org.junit.Before;
+import org.junit.Rule;
+
+import org.springframework.restdocs.JUnitRestDocumentation;
+import org.springframework.test.web.servlet.MockMvc;
+import org.springframework.test.web.servlet.setup.MockMvcBuilders;
+import org.springframework.web.context.WebApplicationContext;
+
+import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.documentationConfiguration;
+import static org.springframework.restdocs.operation.preprocess.Preprocessors.prettyPrint;
+import static org.springframework.restdocs.operation.preprocess.Preprocessors.removeHeaders;
+
+public class CustomDefaultOperationPreprocessors {
+
+	@Rule
+	public final JUnitRestDocumentation restDocumentation = new JUnitRestDocumentation();
+
+	private WebApplicationContext context;
+
+	private MockMvc mockMvc;
+
+	@Before
+	public void setup() {
+		// tag::custom-default-preprocessors[]
+		this.mockMvc = MockMvcBuilders.webAppContextSetup(this.context)
+				.apply(documentationConfiguration(this.restDocumentation).operationPreprocessors()
+						.withDefaultRequestPreprocessors(removeHeaders("Foo"))
+						.withDefaultResponsePreprocessors(prettyPrint()))
+				.build();
+		// end::custom-default-preprocessors[]
+	}
+}

docs/src/test/java/com/example/mockmvc/EveryTestPreprocessing.java

@@ -19,7 +19,6 @@ package com.example.mockmvc;
 import org.junit.Before;
 import org.junit.Rule;
 import org.springframework.restdocs.JUnitRestDocumentation;
-import org.springframework.restdocs.mockmvc.RestDocumentationResultHandler;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.test.web.servlet.setup.MockMvcBuilders;
 import org.springframework.web.context.WebApplicationContext;
@@ -29,8 +28,6 @@ import static org.springframework.restdocs.hypermedia.HypermediaDocumentation.li
 import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document;
 import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.documentationConfiguration;
 import static org.springframework.restdocs.mockmvc.RestDocumentationRequestBuilders.get;
-import static org.springframework.restdocs.operation.preprocess.Preprocessors.preprocessRequest;
-import static org.springframework.restdocs.operation.preprocess.Preprocessors.preprocessResponse;
 import static org.springframework.restdocs.operation.preprocess.Preprocessors.prettyPrint;
 import static org.springframework.restdocs.operation.preprocess.Preprocessors.removeHeaders;
 import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
@@ -45,16 +42,12 @@ public class EveryTestPreprocessing {
 	// tag::setup[]
 	private MockMvc mockMvc;
 
-	private RestDocumentationResultHandler documentationHandler;
-
 	@Before
 	public void setup() {
-		this.documentationHandler = document("{method-name}", // <1>
-				preprocessRequest(removeHeaders("Foo")),
-				preprocessResponse(prettyPrint()));
 		this.mockMvc = MockMvcBuilders.webAppContextSetup(this.context)
-				.apply(documentationConfiguration(this.restDocumentation))
-				.alwaysDo(this.documentationHandler) // <2>
+				.apply(documentationConfiguration(this.restDocumentation).operationPreprocessors()
+						.withDefaultRequestPreprocessors(removeHeaders("Foo"))
+						.withDefaultResponsePreprocessors(prettyPrint()))
 				.build();
 	}
 
@@ -64,7 +57,7 @@ public class EveryTestPreprocessing {
 		// tag::use[]
 		this.mockMvc.perform(get("/")) // <1>
 				.andExpect(status().isOk())
-				.andDo(this.documentationHandler.document( // <2>
+				.andDo(document("{method-name}",
 						links(linkWithRel("self").description("Canonical self link"))
 				));
 		// end::use[]

docs/src/test/java/com/example/restassured/CustomDefaultOperationPreprocessors.java

@@ -0,0 +1,49 @@
+/*
+ * Copyright 2014-2018 the original author or authors.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.example.restassured;
+
+import io.restassured.builder.RequestSpecBuilder;
+import io.restassured.specification.RequestSpecification;
+
+import org.junit.Before;
+import org.junit.Rule;
+
+import org.springframework.restdocs.JUnitRestDocumentation;
+
+import static org.springframework.restdocs.operation.preprocess.Preprocessors.prettyPrint;
+import static org.springframework.restdocs.operation.preprocess.Preprocessors.removeHeaders;
+import static org.springframework.restdocs.restassured3.RestAssuredRestDocumentation.documentationConfiguration;
+
+public class CustomDefaultOperationPreprocessors {
+
+	@Rule
+	public final JUnitRestDocumentation restDocumentation = new JUnitRestDocumentation();
+
+	@SuppressWarnings("unused")
+	private RequestSpecification spec;
+
+	@Before
+	public void setup() {
+		// tag::custom-default-preprocessors[]
+		this.spec = new RequestSpecBuilder()
+				.addFilter(documentationConfiguration(this.restDocumentation).operationPreprocessors()
+						.withDefaultRequestPreprocessors(removeHeaders("Foo"))
+						.withDefaultResponsePreprocessors(prettyPrint()))
+				.build();
+		// end::custom-default-preprocessors[]
+	}
+}

docs/src/test/java/com/example/restassured/EveryTestPreprocessing.java

@@ -23,13 +23,10 @@ import org.junit.Before;
 import org.junit.Rule;
 
 import org.springframework.restdocs.JUnitRestDocumentation;
-import org.springframework.restdocs.restassured3.RestDocumentationFilter;
 
 import static org.hamcrest.CoreMatchers.is;
 import static org.springframework.restdocs.hypermedia.HypermediaDocumentation.linkWithRel;
 import static org.springframework.restdocs.hypermedia.HypermediaDocumentation.links;
-import static org.springframework.restdocs.operation.preprocess.Preprocessors.preprocessRequest;
-import static org.springframework.restdocs.operation.preprocess.Preprocessors.preprocessResponse;
 import static org.springframework.restdocs.operation.preprocess.Preprocessors.prettyPrint;
 import static org.springframework.restdocs.operation.preprocess.Preprocessors.removeHeaders;
 import static org.springframework.restdocs.restassured3.RestAssuredRestDocumentation.document;
@@ -43,16 +40,12 @@ public class EveryTestPreprocessing {
 	// tag::setup[]
 	private RequestSpecification spec;
 
-	private RestDocumentationFilter documentationFilter;
-
 	@Before
 	public void setup() {
-		this.documentationFilter = document("{method-name}",
-				preprocessRequest(removeHeaders("Foo")),
-				preprocessResponse(prettyPrint())); // <1>
 		this.spec = new RequestSpecBuilder()
-				.addFilter(documentationConfiguration(this.restDocumentation))
-				.addFilter(this.documentationFilter)// <2>
+				.addFilter(documentationConfiguration(this.restDocumentation).operationPreprocessors()
+						.withDefaultRequestPreprocessors(removeHeaders("Foo"))
+						.withDefaultResponsePreprocessors(prettyPrint()))
 				.build();
 	}
 
@@ -60,8 +53,8 @@ public class EveryTestPreprocessing {
 
 	public void use() throws Exception {
 		// tag::use[]
-		RestAssured.given(this.spec) // <1>
-			.filter(this.documentationFilter.document( // <2>
+		RestAssured.given(this.spec)
+				.filter(document("{method-name]",
 					links(linkWithRel("self").description("Canonical self link"))))
 			.when().get("/")
 			.then().assertThat().statusCode(is(200));