Merge pull request #11 from icerockdev/serialization_fix

Fixed serialization problem for responses

Author: AlexeiiShvedov

README.md

@@ -12,7 +12,7 @@ repositories {
 }
 
 // Append dependency
-implementation("com.icerockdev:web-utils:0.1.4")
+implementation("com.icerockdev:web-utils:0.2.0")
 ````
 
 ## Library usage

sample/src/main/kotlin/com/icerockdev/sample/server.kt

@@ -92,11 +92,11 @@ fun Application.main() {
 
 class TestRequest(val email: String, @JsonSecret val password: String) : Request()
 class TestResponse2(status: Int, val email: String, @JsonSecret val password: String) :
-    AbstractResponse(status, isSuccess = true) {
+    AbstractResponse(status, success = true) {
 }
 
 class TestResponse(status: Int, message: String) :
-    AbstractResponse(status, message, isSuccess = true) {
+    AbstractResponse(status, message, success = true) {
     @JsonSecret
     val data = message
 }

web-utils/build.gradle.kts

@@ -13,7 +13,7 @@ apply(plugin = "java")
 apply(plugin = "kotlin")
 
 group = "com.icerockdev"
-version = "0.1.5"
+version = "0.2.0"
 
 val sourcesJar by tasks.registering(Jar::class) {
     classifier = "sources"

web-utils/src/main/kotlin/com/icerockdev/api/AbstractResponse.kt

@@ -4,14 +4,12 @@
 
 package com.icerockdev.api
 
-import com.fasterxml.jackson.annotation.JsonProperty
 import com.icerockdev.webserver.tools.DateTimeUtil
 
 abstract class AbstractResponse(
     var status: Int = 0,
     var message: String = "",
     var timestamp: Long = DateTimeUtil.getTimestamp(),
-    @JsonProperty("success")
-    var isSuccess: Boolean = false
+    var success: Boolean = false
 ) {
 }

web-utils/src/main/kotlin/com/icerockdev/api/ErrorResponse.kt

@@ -19,9 +19,9 @@ class ErrorResponse() : ResponseList() {
 
     private fun setValidationParams(list: List<ErrorDetail>) {
         this.status = 422
-        this.isSuccess = false
+        this.success = false
         this.message = "Validation Error"
-        this.dataList = list
+        this.data = list
     }
 
     constructor(errorList: List<ErrorDetail>) : this() {

web-utils/src/main/kotlin/com/icerockdev/api/Response.kt

@@ -4,11 +4,9 @@
 
 package com.icerockdev.api
 
-import com.fasterxml.jackson.annotation.JsonProperty
 import com.icerockdev.webserver.tools.DateTimeUtil
 
 open class Response(
-    @JsonProperty("data")
     open var data: Any? = null,
     status: Int = 200,
     message: String = "",

web-utils/src/main/kotlin/com/icerockdev/api/ResponseList.kt

@@ -4,12 +4,10 @@
 
 package com.icerockdev.api
 
-import com.fasterxml.jackson.annotation.JsonProperty
 import com.icerockdev.webserver.tools.DateTimeUtil
 
 open class ResponseList(
-    @JsonProperty("data")
-    open var dataList: List<Any> = listOf(),
+    open var data: List<Any> = listOf(),
     status: Int = 200,
     message: String = "",
     timestamp: Long = DateTimeUtil.getTimestamp(),

web-utils/src/main/kotlin/com/icerockdev/exception/ExtUserException.kt

@@ -4,24 +4,22 @@
 
 package com.icerockdev.exception
 
-import com.fasterxml.jackson.annotation.JsonProperty
 import com.icerockdev.api.ErrorResponse
 
 abstract class ExtUserException(status: Int, message: String) :
     UserException(status, message) {
-    @JsonProperty("data")
-    open var dataList: List<ErrorDetail> = mutableListOf()
+    open var data: List<ErrorDetail> = mutableListOf()
 
     override fun getErrorResponse(): ErrorResponse {
         return ErrorResponse().also {
             it.status = this.status
             it.message = this.message.toString()
-            it.isSuccess = false
-            it.dataList = dataList
+            it.success = false
+            it.data = data
         }
     }
 
     protected fun setErrors(list: List<ErrorDetail>) {
-        this.dataList = list
+        this.data = list
     }
 }

web-utils/src/main/kotlin/com/icerockdev/exception/UserException.kt

@@ -15,7 +15,7 @@ abstract class UserException(
         return ErrorResponse().also {
             it.status = this.status
             it.message = this.message ?: ""
-            it.isSuccess = false
+            it.success = false
         }
     }
 }

web-utils/src/main/kotlin/com/icerockdev/webserver/configuration.kt

@@ -45,7 +45,7 @@ fun getStatusConfiguration(): StatusPages.Configuration.() -> Unit {
             val error = ErrorResponse().also {
                 it.status = status.value
                 it.message = "Unauthorized"
-                it.isSuccess = false
+                it.success = false
             }
             call.respond(
                 status,