Skip to content

Commit cf231d5

Browse files
mhuster23Oleksandr Dzhychko
authored andcommitted
refactor: adapt to new expect/actual classes requirements
1 parent 98dadfc commit cf231d5

File tree

6 files changed

+10
-6
lines changed

6 files changed

+10
-6
lines changed

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -766,7 +766,9 @@ private class AutoTransactions(val delegate: ITransactionManager) : ITransaction
766766
}
767767
}
768768

769-
expect class PlatformSpecificLightModelClientBuilder() : LightModelClientBuilder
769+
expect class PlatformSpecificLightModelClientBuilder() : LightModelClientBuilder {
770+
override fun getDefaultEngineFactory(): HttpClientEngineFactory<*>
771+
}
770772

771773
abstract class LightModelClientBuilder {
772774
private var host: String = "localhost"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ import io.ktor.client.engine.HttpClientEngineFactory
1717
import io.ktor.client.engine.js.Js
1818

1919
actual class PlatformSpecificLightModelClientBuilder actual constructor() : LightModelClientBuilder() {
20-
override fun getDefaultEngineFactory(): HttpClientEngineFactory<*> = Js
20+
actual override fun getDefaultEngineFactory(): HttpClientEngineFactory<*> = Js
2121
}

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ import io.ktor.client.engine.HttpClientEngineFactory
1717
import io.ktor.client.engine.cio.CIO
1818

1919
actual class PlatformSpecificLightModelClientBuilder : LightModelClientBuilder() {
20-
override fun getDefaultEngineFactory(): HttpClientEngineFactory<*> = CIO
20+
actual override fun getDefaultEngineFactory(): HttpClientEngineFactory<*> = CIO
2121
}

model-client/src/commonMain/kotlin/org/modelix/model/client2/ModelClientV2.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -563,7 +563,9 @@ abstract class ModelClientV2Builder {
563563
}
564564
}
565565

566-
expect class ModelClientV2PlatformSpecificBuilder() : ModelClientV2Builder
566+
expect class ModelClientV2PlatformSpecificBuilder() : ModelClientV2Builder {
567+
override fun createHttpClient(): HttpClient
568+
}
567569

568570
fun VersionDelta.checkObjectHashes() {
569571
HashUtil.checkObjectHashes(objectsMap)

model-client/src/jsMain/kotlin/org/modelix/model/client2/ModelClientV2PlatformSpecificBuilder.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import io.ktor.client.HttpClientConfig
55
import io.ktor.client.engine.js.Js
66

77
actual class ModelClientV2PlatformSpecificBuilder : ModelClientV2Builder() {
8-
override fun createHttpClient(): HttpClient {
8+
actual override fun createHttpClient(): HttpClient {
99
return HttpClient(Js) {
1010
configureHttpClient(this)
1111
}

model-client/src/jvmMain/kotlin/org/modelix/model/client2/ModelClientV2PlatformSpecificBuilder.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ actual class ModelClientV2PlatformSpecificBuilder : ModelClientV2Builder() {
1313
}
1414
}
1515

16-
override fun createHttpClient(): HttpClient {
16+
actual override fun createHttpClient(): HttpClient {
1717
return HttpClient(CIO) {
1818
configureHttpClient(this)
1919
}

0 commit comments

Comments
 (0)