From c78775aa2aaf76f9fa1404ff32a10fb8227f380e Mon Sep 17 00:00:00 2001 From: Robert Jaros Date: Fri, 25 Oct 2019 20:46:42 +0200 Subject: Style fixes --- .../kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt | 1 + .../src/main/kotlin/pl/treksoft/kvision/types/Date.kt | 15 +++++++++------ 2 files changed, 10 insertions(+), 6 deletions(-) (limited to 'kvision-modules/kvision-server-jooby/src') diff --git a/kvision-modules/kvision-server-jooby/src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt b/kvision-modules/kvision-server-jooby/src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt index 6bb28059..bb682351 100644 --- a/kvision-modules/kvision-server-jooby/src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt +++ b/kvision-modules/kvision-server-jooby/src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt @@ -423,6 +423,7 @@ actual open class KVServiceManager actual constructor(val serviceClass: routes.add { call(HttpMethod.POST, "/kv/$routeDef") { req, res -> val jsonRpcRequest = req.body(JsonRpcRequest::class.java) + @Suppress("MagicNumber") if (jsonRpcRequest.params.size == 3) { val param1 = getParameter(jsonRpcRequest.params[0]) val param2 = getParameter(jsonRpcRequest.params[1]) diff --git a/kvision-modules/kvision-server-jooby/src/main/kotlin/pl/treksoft/kvision/types/Date.kt b/kvision-modules/kvision-server-jooby/src/main/kotlin/pl/treksoft/kvision/types/Date.kt index f041465b..58636fcc 100644 --- a/kvision-modules/kvision-server-jooby/src/main/kotlin/pl/treksoft/kvision/types/Date.kt +++ b/kvision-modules/kvision-server-jooby/src/main/kotlin/pl/treksoft/kvision/types/Date.kt @@ -87,6 +87,7 @@ class LocalDateTimeDeserializer : JsonDeserializer() { override fun deserialize(p: JsonParser, ctx: DeserializationContext): LocalDateTime? { val str = p.text try { + @Suppress("MagicNumber") return LocalDateTime.parse(str.dropLast(6), DateTimeFormatter.ISO_LOCAL_DATE_TIME) } catch (e: DateTimeParseException) { System.err.println(e) @@ -113,6 +114,7 @@ class LocalDateDeserializer : JsonDeserializer() { override fun deserialize(p: JsonParser, ctx: DeserializationContext): LocalDate? { val str = p.text try { + @Suppress("MagicNumber") return LocalDate.parse(str.dropLast(6), DateTimeFormatter.ISO_LOCAL_DATE_TIME) } catch (e: DateTimeParseException) { System.err.println(e) @@ -139,6 +141,7 @@ class LocalTimeDeserializer : JsonDeserializer() { override fun deserialize(p: JsonParser, ctx: DeserializationContext): LocalTime? { val str = p.text try { + @Suppress("MagicNumber") return LocalTime.parse(str.dropLast(6), DateTimeFormatter.ISO_LOCAL_DATE_TIME) } catch (e: DateTimeParseException) { System.err.println(e) @@ -164,11 +167,11 @@ class OffsetDateTimeDeserializer : JsonDeserializer() { @Throws(IOException::class) override fun deserialize(p: JsonParser, ctx: DeserializationContext): OffsetDateTime? { val str = p.text - try { - return OffsetDateTime.parse(str, DateTimeFormatter.ISO_OFFSET_DATE_TIME) + return try { + OffsetDateTime.parse(str, DateTimeFormatter.ISO_OFFSET_DATE_TIME) } catch (e: DateTimeParseException) { System.err.println(e) - return null + null } } } @@ -190,11 +193,11 @@ class OffsetTimeDeserializer : JsonDeserializer() { @Throws(IOException::class) override fun deserialize(p: JsonParser, ctx: DeserializationContext): OffsetTime? { val str = p.text - try { - return OffsetTime.parse(str, DateTimeFormatter.ISO_OFFSET_DATE_TIME) + return try { + OffsetTime.parse(str, DateTimeFormatter.ISO_OFFSET_DATE_TIME) } catch (e: DateTimeParseException) { System.err.println(e) - return null + null } } } -- cgit