aboutsummaryrefslogtreecommitdiff
path: root/kvision-modules/kvision-server-javalin/src
diff options
context:
space:
mode:
authorRobert Jaros <rjaros@finn.pl>2020-02-27 15:28:16 +0100
committerRobert Jaros <rjaros@finn.pl>2020-02-27 15:28:16 +0100
commite4b5290e4898858612da882d9186b2aba548a9d9 (patch)
treeb9bbd4dbba14953fd9fba011b2c7f1e629c307d9 /kvision-modules/kvision-server-javalin/src
parentbff6c721074bda50e2d5a23d8aa96bf1f939f62a (diff)
downloadkvision-e4b5290e4898858612da882d9186b2aba548a9d9.tar.gz
kvision-e4b5290e4898858612da882d9186b2aba548a9d9.tar.bz2
kvision-e4b5290e4898858612da882d9186b2aba548a9d9.zip
Remove deprecated methods.
Style fixes.
Diffstat (limited to 'kvision-modules/kvision-server-javalin/src')
-rw-r--r--kvision-modules/kvision-server-javalin/src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt14
-rw-r--r--kvision-modules/kvision-server-javalin/src/main/kotlin/pl/treksoft/kvision/types/Date.kt3
2 files changed, 7 insertions, 10 deletions
diff --git a/kvision-modules/kvision-server-javalin/src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt b/kvision-modules/kvision-server-javalin/src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt
index 5cbd3495..ffb2936b 100644
--- a/kvision-modules/kvision-server-javalin/src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt
+++ b/kvision-modules/kvision-server-javalin/src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt
@@ -144,7 +144,7 @@ actual open class KVServiceManager<T : Any> actual constructor(val serviceClass:
result = mapper.writeValueAsString(result)
)
} catch (e: Exception) {
- if (!(e is ServiceException)) LOG.error(e.message, e)
+ if (e !is ServiceException) LOG.error(e.message, e)
JsonRpcResponse(
id = jsonRpcRequest.id, error = e.message ?: "Error",
exceptionType = e.javaClass.canonicalName
@@ -184,7 +184,7 @@ actual open class KVServiceManager<T : Any> actual constructor(val serviceClass:
result = mapper.writeValueAsString(result)
)
} catch (e: Exception) {
- if (!(e is ServiceException)) LOG.error(e.message, e)
+ if (e !is ServiceException) LOG.error(e.message, e)
JsonRpcResponse(
id = jsonRpcRequest.id, error = e.message ?: "Error",
exceptionType = e.javaClass.canonicalName
@@ -228,7 +228,7 @@ actual open class KVServiceManager<T : Any> actual constructor(val serviceClass:
result = mapper.writeValueAsString(result)
)
} catch (e: Exception) {
- if (!(e is ServiceException)) LOG.error(e.message, e)
+ if (e !is ServiceException) LOG.error(e.message, e)
JsonRpcResponse(
id = jsonRpcRequest.id, error = e.message ?: "Error",
exceptionType = e.javaClass.canonicalName
@@ -274,7 +274,7 @@ actual open class KVServiceManager<T : Any> actual constructor(val serviceClass:
result = mapper.writeValueAsString(result)
)
} catch (e: Exception) {
- if (!(e is ServiceException)) LOG.error(e.message, e)
+ if (e !is ServiceException) LOG.error(e.message, e)
JsonRpcResponse(
id = jsonRpcRequest.id, error = e.message ?: "Error",
exceptionType = e.javaClass.canonicalName
@@ -321,7 +321,7 @@ actual open class KVServiceManager<T : Any> actual constructor(val serviceClass:
result = mapper.writeValueAsString(result)
)
} catch (e: Exception) {
- if (!(e is ServiceException)) LOG.error(e.message, e)
+ if (e !is ServiceException) LOG.error(e.message, e)
JsonRpcResponse(
id = jsonRpcRequest.id, error = e.message ?: "Error",
exceptionType = e.javaClass.canonicalName
@@ -370,7 +370,7 @@ actual open class KVServiceManager<T : Any> actual constructor(val serviceClass:
result = mapper.writeValueAsString(result)
)
} catch (e: Exception) {
- if (!(e is ServiceException)) LOG.error(e.message, e)
+ if (e !is ServiceException) LOG.error(e.message, e)
JsonRpcResponse(
id = jsonRpcRequest.id, error = e.message ?: "Error",
exceptionType = e.javaClass.canonicalName
@@ -494,7 +494,7 @@ actual open class KVServiceManager<T : Any> actual constructor(val serviceClass:
result = mapper.writeValueAsString(result)
)
} catch (e: Exception) {
- if (!(e is ServiceException)) LOG.error(e.message, e)
+ if (e !is ServiceException) LOG.error(e.message, e)
JsonRpcResponse(
id = jsonRpcRequest.id, error = e.message ?: "Error",
exceptionType = e.javaClass.canonicalName
diff --git a/kvision-modules/kvision-server-javalin/src/main/kotlin/pl/treksoft/kvision/types/Date.kt b/kvision-modules/kvision-server-javalin/src/main/kotlin/pl/treksoft/kvision/types/Date.kt
index 09ba6d01..61f8ba58 100644
--- a/kvision-modules/kvision-server-javalin/src/main/kotlin/pl/treksoft/kvision/types/Date.kt
+++ b/kvision-modules/kvision-server-javalin/src/main/kotlin/pl/treksoft/kvision/types/Date.kt
@@ -36,9 +36,6 @@ import java.time.OffsetTime
import java.time.format.DateTimeFormatter
import java.time.format.DateTimeParseException
-@Deprecated("Not supported in KVision 2+. Use LocalDateTime or OffsetDateTime instead.", level = DeprecationLevel.ERROR)
-actual typealias Date = LocalDateTime
-
actual typealias LocalDateTime = LocalDateTime
actual typealias LocalDate = LocalDate