From e4b5290e4898858612da882d9186b2aba548a9d9 Mon Sep 17 00:00:00 2001
From: Robert Jaros <rjaros@finn.pl>
Date: Thu, 27 Feb 2020 15:28:16 +0100
Subject: Remove deprecated methods. Style fixes.

---
 .../kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt | 15 +++++++--------
 .../src/main/kotlin/pl/treksoft/kvision/types/Date.kt     |  3 ---
 2 files changed, 7 insertions(+), 11 deletions(-)

(limited to 'kvision-modules/kvision-server-spring-boot/src/main/kotlin/pl')

diff --git a/kvision-modules/kvision-server-spring-boot/src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt b/kvision-modules/kvision-server-spring-boot/src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt
index 34fb02db..2ee939ef 100644
--- a/kvision-modules/kvision-server-spring-boot/src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt
+++ b/kvision-modules/kvision-server-spring-boot/src/main/kotlin/pl/treksoft/kvision/remote/KVServiceManager.kt
@@ -35,7 +35,6 @@ import kotlinx.coroutines.reactive.awaitSingle
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import org.springframework.context.ApplicationContext
-import org.springframework.security.core.Authentication
 import org.springframework.web.reactive.function.server.ServerRequest
 import org.springframework.web.reactive.function.server.ServerResponse
 import org.springframework.web.reactive.function.server.awaitBody
@@ -143,7 +142,7 @@ actual open class KVServiceManager<T : Any> actual constructor(val serviceClass:
                     )
                 )
             } catch (e: Exception) {
-                if (!(e is ServiceException)) LOG.error(e.message, e)
+                if (e !is ServiceException) LOG.error(e.message, e)
                 ServerResponse.ok().json().bodyValueAndAwait(
                     mapper.writeValueAsString(
                         JsonRpcResponse(
@@ -188,7 +187,7 @@ actual open class KVServiceManager<T : Any> actual constructor(val serviceClass:
                         )
                     )
                 } catch (e: Exception) {
-                    if (!(e is ServiceException)) LOG.error(e.message, e)
+                    if (e !is ServiceException) LOG.error(e.message, e)
                     ServerResponse.ok().json().bodyValueAndAwait(
                         mapper.writeValueAsString(
                             JsonRpcResponse(
@@ -244,7 +243,7 @@ actual open class KVServiceManager<T : Any> actual constructor(val serviceClass:
                         )
                     )
                 } catch (e: Exception) {
-                    if (!(e is ServiceException)) LOG.error(e.message, e)
+                    if (e !is ServiceException) LOG.error(e.message, e)
                     ServerResponse.ok().json().bodyValueAndAwait(
                         mapper.writeValueAsString(
                             JsonRpcResponse(
@@ -302,7 +301,7 @@ actual open class KVServiceManager<T : Any> actual constructor(val serviceClass:
                         )
                     )
                 } catch (e: Exception) {
-                    if (!(e is ServiceException)) LOG.error(e.message, e)
+                    if (e !is ServiceException) LOG.error(e.message, e)
                     ServerResponse.ok().json().bodyValueAndAwait(
                         mapper.writeValueAsString(
                             JsonRpcResponse(
@@ -361,7 +360,7 @@ actual open class KVServiceManager<T : Any> actual constructor(val serviceClass:
                         )
                     )
                 } catch (e: Exception) {
-                    if (!(e is ServiceException)) LOG.error(e.message, e)
+                    if (e !is ServiceException) LOG.error(e.message, e)
                     ServerResponse.ok().json().bodyValueAndAwait(
                         mapper.writeValueAsString(
                             JsonRpcResponse(
@@ -422,7 +421,7 @@ actual open class KVServiceManager<T : Any> actual constructor(val serviceClass:
                         )
                     )
                 } catch (e: Exception) {
-                    if (!(e is ServiceException)) LOG.error(e.message, e)
+                    if (e !is ServiceException) LOG.error(e.message, e)
                     ServerResponse.ok().json().bodyValueAndAwait(
                         mapper.writeValueAsString(
                             JsonRpcResponse(
@@ -531,7 +530,7 @@ actual open class KVServiceManager<T : Any> actual constructor(val serviceClass:
                         )
                     )
                 } catch (e: Exception) {
-                    if (!(e is ServiceException)) LOG.error(e.message, e)
+                    if (e !is ServiceException) LOG.error(e.message, e)
                     ServerResponse.ok().json().bodyValueAndAwait(
                         mapper.writeValueAsString(
                             JsonRpcResponse(
diff --git a/kvision-modules/kvision-server-spring-boot/src/main/kotlin/pl/treksoft/kvision/types/Date.kt b/kvision-modules/kvision-server-spring-boot/src/main/kotlin/pl/treksoft/kvision/types/Date.kt
index 09ba6d01..61f8ba58 100644
--- a/kvision-modules/kvision-server-spring-boot/src/main/kotlin/pl/treksoft/kvision/types/Date.kt
+++ b/kvision-modules/kvision-server-spring-boot/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
-- 
cgit