From 89de71f242dc10ffea372b6edd6418100f47b2b8 Mon Sep 17 00:00:00 2001
From: Sascha Frevel <3075075+sfrevel@users.noreply.github.com>
Date: Thu, 5 Mar 2020 10:25:01 +0100
Subject: [PATCH] TSK-1151: fixed pretty printing configuration for spring rest
 doc

---
 .../doc/api/BaseRestDocumentation.java        | 26 +++++++++++++------
 1 file changed, 18 insertions(+), 8 deletions(-)

diff --git a/rest/taskana-rest-spring/src/test/java/pro/taskana/doc/api/BaseRestDocumentation.java b/rest/taskana-rest-spring/src/test/java/pro/taskana/doc/api/BaseRestDocumentation.java
index 3ff2e0378..112fc21f4 100644
--- a/rest/taskana-rest-spring/src/test/java/pro/taskana/doc/api/BaseRestDocumentation.java
+++ b/rest/taskana-rest-spring/src/test/java/pro/taskana/doc/api/BaseRestDocumentation.java
@@ -1,25 +1,27 @@
 package pro.taskana.doc.api;
 
-import static org.springframework.restdocs.mockmvc.MockMvcRestDocumentation.document;
-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 org.junit.jupiter.api.BeforeEach;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.boot.test.autoconfigure.restdocs.AutoConfigureRestDocs;
+import org.springframework.boot.test.autoconfigure.restdocs.RestDocsMockMvcConfigurationCustomizer;
 import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc;
+import org.springframework.boot.test.context.TestConfiguration;
 import org.springframework.boot.web.server.LocalServerPort;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Import;
 import org.springframework.test.web.servlet.MockMvc;
 import org.springframework.web.context.WebApplicationContext;
 
 import pro.taskana.RestHelper;
 import pro.taskana.TaskanaSpringBootTest;
+import pro.taskana.doc.api.BaseRestDocumentation.ResultHandlerConfiguration;
 
 /** Base class for Rest Documentation tests. */
+@TaskanaSpringBootTest
 @AutoConfigureMockMvc
 @AutoConfigureRestDocs
-@TaskanaSpringBootTest
+@Import(ResultHandlerConfiguration.class)
 public abstract class BaseRestDocumentation {
 
   @LocalServerPort protected int port;
@@ -30,8 +32,16 @@ public abstract class BaseRestDocumentation {
 
   @Autowired protected RestHelper restHelper;
 
-  @BeforeEach
-  public void setUpMockMvc() {
-    document("{methodName}", preprocessRequest(prettyPrint()), preprocessResponse(prettyPrint()));
+  @TestConfiguration
+  static class ResultHandlerConfiguration {
+
+    @Bean
+    public RestDocsMockMvcConfigurationCustomizer restDocsMockMvcConfigurationCustomizer() {
+      return configurer ->
+          configurer
+              .operationPreprocessors()
+              .withRequestDefaults(prettyPrint())
+              .withResponseDefaults(prettyPrint());
+    }
   }
 }