refactor(light-model-client): LightModelClientJVM replaced with platform specific actual classes

Author: slisson

docs/global/modules/core/pages/howto/usage-light-model-client.adoc

@@ -9,7 +9,7 @@ Creating an instance that loads the entire model from the server can be done lik
 
 [source,kotlin]
 --
-val client = LightModelClientJVM.builder()
+val client = LightModelClient.builder()
     .url("ws://localhost/json/v2/test-repo/ws") // optional, by default it connects to the MPS plugin
     .build()
 --

gradle.properties

@@ -1,4 +1,5 @@
 systemProp.org.gradle.internal.http.socketTimeout=120000
+kotlin.daemon.jvmargs=-Xmx2G
 
 kotlinVersion=1.8.20
 kotlinCoroutinesVersion=1.6.4

light-model-client/src/commonMain/kotlin/org/modelix/client/light/LightModelClient.kt

@@ -9,7 +9,7 @@ import org.modelix.model.area.IArea
 import org.modelix.model.area.IAreaListener
 import org.modelix.model.area.IAreaReference
 import org.modelix.model.server.api.*
-import kotlin.reflect.KClass
+import kotlin.jvm.JvmStatic
 import kotlin.time.Duration
 import kotlin.time.Duration.Companion.milliseconds
 import kotlin.time.Duration.Companion.seconds
@@ -660,7 +660,8 @@ class LightModelClient(val connection: IConnection, val debugName: String = "")
             LightClientReferenceSerializer.register()
         }
 
-        fun builder() = LightModelClientBuilder()
+        @JvmStatic
+        fun builder(): LightModelClientBuilder = PlatformSpecificLightModelClientBuilder()
     }
 
     interface IConnection {
@@ -676,7 +677,9 @@ class LightModelClient(val connection: IConnection, val debugName: String = "")
     }
 }
 
-class LightModelClientBuilder {
+expect class PlatformSpecificLightModelClientBuilder() : LightModelClientBuilder
+
+abstract class LightModelClientBuilder {
     private var host: String = "localhost"
     private var port: Int = 48302
     private var url: String? = null
@@ -686,11 +689,13 @@ class LightModelClientBuilder {
     private var httpEngineFactory: HttpClientEngineFactory<*>? = null
     private var debugName: String = ""
 
+    protected abstract fun getDefaultEngineFactory(): HttpClientEngineFactory<*>
+
     fun build(): LightModelClient {
         return LightModelClient(
             connection ?: (
                 WebsocketConnection((httpClient ?: (
-                        httpEngine?.let { HttpClient(it) } ?: httpEngineFactory?.let { HttpClient(it) } ?: HttpClient()
+                        httpEngine?.let { HttpClient(it) } ?: (httpEngineFactory ?: getDefaultEngineFactory()).let { HttpClient(it) }
                     )
                 ).config {
                     install(WebSockets)

light-model-client/src/jsMain/kotlin/org/modelix/client/light/PlatformSpecificLightModelClientBuilder.kt

@@ -0,0 +1,21 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.modelix.client.light
+
+import io.ktor.client.engine.*
+import io.ktor.client.engine.js.*
+
+actual class PlatformSpecificLightModelClientBuilder actual constructor() : LightModelClientBuilder() {
+    override fun getDefaultEngineFactory(): HttpClientEngineFactory<*> = Js
+}

light-model-client/src/jvmMain/kotlin/org/modelix/client/light/LightModelClientJVM.kt

@@ -15,6 +15,7 @@ package org.modelix.client.light
 
 import io.ktor.client.engine.cio.*
 
+@Deprecated("Use LightModelClient", ReplaceWith("LightModelClient"))
 object LightModelClientJVM {
     @JvmStatic
     fun builder() = LightModelClient.builder().also { it.httpEngine(CIO) }

light-model-client/src/jvmMain/kotlin/org/modelix/client/light/PlatformSpecificLightModelClientBuilder.kt

@@ -0,0 +1,21 @@
+/*
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package org.modelix.client.light
+
+import io.ktor.client.engine.*
+import io.ktor.client.engine.cio.*
+
+actual class PlatformSpecificLightModelClientBuilder : LightModelClientBuilder() {
+    override fun getDefaultEngineFactory(): HttpClientEngineFactory<*> = CIO
+}

light-model-client/src/jvmTest/kotlin/org/modelix/client/light/LightModelClientTest.kt

@@ -63,7 +63,7 @@ class LightModelClientTest {
             //println("init: $response")
 
             val createClient: suspend (debugName: String)->LightModelClient = { debugName ->
-                val client = LightModelClientJVM.builder()
+                val client = LightModelClient.builder()
                     .httpClient(httpClient)
                     .url("ws://localhost/json/v2/test-repo/ws")
                     .debugName(debugName)