removed extra new lines, reformatted getSessionId method in Client.kt and removed changes in JsonMessageSerializer.kt

Author: satya-p91

kwamp-client-core/src/main/kotlin/com/laurencegarmstrong/kwamp/client/core/Client.kt

@@ -47,8 +47,6 @@ class ClientImpl(
     onClose: suspend (message: String) -> Unit = {},
     private val exceptionCatcher: ExceptionCatcher = ExceptionSwallower()
 ) : Client, CoroutineScope by CoroutineScope(Executors.newSingleThreadExecutor().asCoroutineDispatcher()) {
-
-
     private val log = LoggerFactory.getLogger(ClientImpl::class.java)!!
     private val connection = Connection(incoming, outgoing, onClose, getSerializer(protocol))
 
@@ -87,7 +85,6 @@ class ClientImpl(
         }
     }
 
-
     private fun handleMessage(message: Message) {
         messageListenersHandler.notifyListeners(message)
 
@@ -122,7 +119,6 @@ class ClientImpl(
         connection.withNextMessage { message: Welcome ->
             log.info("Session established. ID: ${message.session}")
             sessionId = message.session
-
         }.join()
     }
 
@@ -158,10 +154,7 @@ class ClientImpl(
         eventHandler: EventHandler
     ) = subscriber.subscribe(topicPattern, eventHandler)
 
-
-    fun getID(): Long? {
-        return sessionId
-    }
+    fun getSessionId() = sessionId
 }
 
 // Can be overridden to handle exceptions

kwamp-core/src/main/kotlin/com/laurencegarmstrong/kwamp/core/serialization/json/JsonMessageSerializer.kt

@@ -57,10 +57,7 @@ internal fun Klaxon.convertJsonObject(jo: Any?): Any? = when {
         val converter = findConverterFromClass(Any::class.java, null)
         converter.fromJson(JsonValue(jo, null, null, this))
     }
-    //this helps prevent crashing when null value is received for any key
-    else -> {
-        log("Couldn't convert $jo")
-    }
+    else -> throw KlaxonException("Couldn't convert $jo")
 }
 
 private val MAP_CONVERTER = object : Converter {