fixed test

server-info-spring-web/src/main/kotlin/ru/touchin/server/info/advices/ServerInfoAdvice.kt

@@ -30,11 +30,13 @@ class ServerInfoAdvice(
         response: ServerHttpResponse
     ): Any? {
         for (service in serverInfoHeaders) {
-            response
-                .headers
-                .addAll(
-                    service.getHeaders()
-                )
+            val serverInfo = service.getHeaders()
+
+            serverInfo.map {
+                response
+                    .headers
+                    .add(it.first, it.second)
+            }
         }
 
         return body

server-info-spring-web/src/main/kotlin/ru/touchin/server/info/configurations/ServerInfo.kt

@@ -6,6 +6,6 @@ import org.springframework.context.annotation.Configuration
 
 @Suppress("SpringFacetCodeInspection")
 @Configuration
-@ComponentScan("ru.touchin.server.info.advices")
+@ComponentScan("ru.touchin.server.info.advices", "ru.touchin.server.info.controllers")
 @ConfigurationPropertiesScan("ru.touchin.server.info")
 class ServerInfo

server-info-spring-web/src/main/kotlin/ru/touchin/server/info/controllers/ServerInfoController.kt

@@ -0,0 +1,34 @@
+package ru.touchin.server.info.controllers
+
+import org.springframework.web.bind.annotation.GetMapping
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+import ru.touchin.server.info.response.ServerInfoResponse
+import ru.touchin.server.info.services.ServerInfoHeader
+
+@RestController
+@RequestMapping("/info")
+class ServerInfoController(
+    private val serverInfoHeaders: List<ServerInfoHeader>
+) {
+
+    @GetMapping
+    fun getServerInfo(): ServerInfoResponse {
+        val serverInfoList = mutableListOf<Map<String, String>>()
+
+        for (service in serverInfoHeaders) {
+            val headers = service.getHeaders()
+
+            headers.map {
+                serverInfoList.add(
+                    mapOf(it)
+                )
+            }
+        }
+
+        return ServerInfoResponse(
+            serverInfo = serverInfoList
+        )
+    }
+
+}

server-info-spring-web/src/main/kotlin/ru/touchin/server/info/response/ServerInfoResponse.kt

@@ -0,0 +1,7 @@
+package ru.touchin.server.info.response
+
+import org.springframework.util.MultiValueMap
+
+data class ServerInfoResponse(
+    val serverInfo: List<Map<String, String>>
+)

server-info-spring-web/src/main/kotlin/ru/touchin/server/info/services/ServerInfoHeader.kt

@@ -4,6 +4,6 @@ import org.springframework.util.MultiValueMap
 
 interface ServerInfoHeader {
 
-    fun getHeaders(): MultiValueMap<String, String>
+    fun getHeaders(): List<Pair<String, String>>
 
 }

server-info-spring-web/src/main/kotlin/ru/touchin/server/info/services/version/BuildVersionHeader.kt

@@ -11,11 +11,10 @@ class BuildVersionHeader(
     private val serverInfoProperties: ServerInfoProperties
 ) : ServerInfoHeader {
 
-    override fun getHeaders(): MultiValueMap<String, String> {
-        return LinkedMultiValueMap<String, String>()
-            .apply {
-                this.add("X-App-Build-Version", serverInfoProperties.buildVersion)
-            }
+    override fun getHeaders(): List<Pair<String, String>> {
+        return listOf(
+            "X-App-Build-Version" to serverInfoProperties.buildVersion
+        )
     }
 
 }

server-info-spring-web/src/test/kotlin/ru/touchin/server/info/controllers/ServerInfoControllerMvcTest.kt

@@ -0,0 +1,41 @@
+package ru.touchin.server.info.controllers
+
+import org.junit.jupiter.api.DisplayName
+import org.junit.jupiter.api.Test
+import org.springframework.beans.factory.annotation.Autowired
+import org.springframework.boot.test.autoconfigure.web.servlet.AutoConfigureMockMvc
+import org.springframework.boot.test.context.SpringBootTest
+import org.springframework.test.context.ActiveProfiles
+import org.springframework.test.web.servlet.MockMvc
+import org.springframework.test.web.servlet.request.MockMvcRequestBuilders
+import org.springframework.test.web.servlet.result.MockMvcResultHandlers
+import org.springframework.test.web.servlet.result.MockMvcResultMatchers
+
+@ActiveProfiles("test")
+@SpringBootTest
+@AutoConfigureMockMvc
+class ServerInfoControllerMvcTest {
+
+    @Autowired
+    private lateinit var mockMvc: MockMvc
+
+    @Test
+    fun shouldBeWrappedResponse() {
+        mockMvc
+            .perform(MockMvcRequestBuilders.get("/info"))
+            .andDo(MockMvcResultHandlers.print())
+            .andExpect(MockMvcResultMatchers.status().isOk)
+            .andExpect(MockMvcResultMatchers.content().json(
+                """
+                    {
+                        "serverInfo": [
+                            {
+                                "X-App-Build-Version": "1"
+                            }
+                        ]
+                    }
+                """.trimIndent()
+            ))
+    }
+
+}