TouchInstinct
/
Backend-common
309
1
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

rename wrap annotations

This commit is contained in:
Alexander Buntakov 2021-06-08 18:21:02 +03:00
parent 109ff1675e
commit 6d14e19aa1
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
response-wrapper-spring-web/src/main/kotlin/ru/touchin/wrapper/advices/WrapResponseAdvice.kt
View File

@ -8,17 +8,17 @@ import org.springframework.http.server.ServerHttpRequest
import org.springframework.http.server.ServerHttpResponse
import org.springframework.web.bind.annotation.RestControllerAdvice
import org.springframework.web.servlet.mvc.method.annotation.ResponseBodyAdvice
import ru.touchin.wrapper.annotations.NoWrapResponse
import ru.touchin.wrapper.annotations.WrapResponse
import ru.touchin.wrapper.annotations.NoResponseWrap
import ru.touchin.wrapper.annotations.ResponseWrap
import ru.touchin.wrapper.components.ResponseBodyWrapper
@RestControllerAdvice(annotations = [WrapResponse::class])
@RestControllerAdvice(annotations = [ResponseWrap::class])
class WrapResponseAdvice(
private val responseWrapper: ResponseBodyWrapper
): ResponseBodyAdvice<Any> {
override fun supports(returnType: MethodParameter, converterType: Class<out HttpMessageConverter<*>>): Boolean {
return !returnType.hasMethodAnnotation(NoWrapResponse::class.java)
return !returnType.hasMethodAnnotation(NoResponseWrap::class.java)
}
/***

2
response-wrapper-spring-web/src/main/kotlin/ru/touchin/wrapper/annotations/NoWrapResponse.kt → response-wrapper-spring-web/src/main/kotlin/ru/touchin/wrapper/annotations/NoResponseWrap.kt
View File

@ -1,4 +1,4 @@
package ru.touchin.wrapper.annotations
@Target(allowedTargets = [AnnotationTarget.FUNCTION, AnnotationTarget.CLASS])
annotation class NoWrapResponse
annotation class NoResponseWrap

2
response-wrapper-spring-web/src/main/kotlin/ru/touchin/wrapper/annotations/WrapResponse.kt → response-wrapper-spring-web/src/main/kotlin/ru/touchin/wrapper/annotations/ResponseWrap.kt
View File

@ -1,4 +1,4 @@
package ru.touchin.wrapper.annotations
@Target(allowedTargets = [AnnotationTarget.FUNCTION, AnnotationTarget.CLASS])
annotation class WrapResponse
annotation class ResponseWrap

8
response-wrapper-spring-web/src/test/kotlin/ru/touchin/web/wrapper/WrapResponseAdviceMvcTest.kt
View File

@ -15,11 +15,11 @@ import org.springframework.test.web.servlet.result.MockMvcResultMatchers
import org.springframework.web.bind.annotation.GetMapping
import org.springframework.web.bind.annotation.RequestMapping
import org.springframework.web.bind.annotation.RestController
import ru.touchin.wrapper.annotations.NoWrapResponse
import ru.touchin.wrapper.annotations.WrapResponse
import ru.touchin.wrapper.annotations.NoResponseWrap
import ru.touchin.wrapper.annotations.ResponseWrap
@RestController
@WrapResponse
@ResponseWrap
@RequestMapping("/wrapper")
class WrapperController {
@ -28,7 +28,7 @@ class WrapperController {
return mapOf("wrap" to "yes")
}
@NoWrapResponse
@NoResponseWrap
@GetMapping("/no-wrap")
fun noWrap(): Map<String, String> {
return mapOf("wrap" to "no")