Changed package name of io.architecture.api -> io.architecture.network.websocket.api

vitaliystoyanov · vitaliystoyanov · commit eb427caf772d · 2024-02-19T20:02:43.000+02:00
diff --git a/core/data/src/main/java/io/architecture/data/mapping/RouteMappingExt.kt b/core/data/src/main/java/io/architecture/data/mapping/RouteMappingExt.kt
@@ -1,7 +1,7 @@
 package io.architecture.data.mapping
 
 import io.architecture.database.api.model.CoordinateEntity
-import io.architecture.api.model.NetworkRoute
+import io.architecture.network.websocket.api.model.NetworkRoute
 import io.architecture.database.api.model.RouteEntity
 import io.architecture.model.Coordinate
 import io.architecture.model.Route
diff --git a/core/data/src/main/java/io/architecture/data/mapping/TraceMappingExt.kt b/core/data/src/main/java/io/architecture/data/mapping/TraceMappingExt.kt
@@ -1,7 +1,7 @@
 package io.architecture.data.mapping
 
 //import com.tinder.scarlet.WebSocket
-import io.architecture.api.model.NetworkTrace
+import io.architecture.network.websocket.api.model.NetworkTrace
 import io.architecture.database.api.model.TraceEntity
 import io.architecture.model.Node
 import io.architecture.model.Trace
diff --git a/core/data/src/main/java/io/architecture/data/repository/DefaultConnectionStateRepository.kt b/core/data/src/main/java/io/architecture/data/repository/DefaultConnectionStateRepository.kt
@@ -1,13 +1,13 @@
 package io.architecture.data.repository
 
 import android.util.Log
-import io.architecture.api.model.NetworkClientTime
 import io.architecture.common.ApplicationScope
 import io.architecture.common.IoDispatcher
-import io.architecture.datasource.api.NetworkDataSource
 import io.architecture.data.mapping.toExternalAs
 import io.architecture.data.repository.interfaces.ConnectionStateRepository
+import io.architecture.datasource.api.NetworkDataSource
 import io.architecture.model.Connection
+import io.architecture.network.websocket.model.NetworkClientTime
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.delay
diff --git a/core/datasource/api/src/main/java/io/architecture/datasource/api/NetworkDataSource.kt b/core/datasource/api/src/main/java/io/architecture/datasource/api/NetworkDataSource.kt
@@ -1,10 +1,10 @@
 package io.architecture.datasource.api
 
-import io.architecture.api.model.NetworkClientTime
-import io.architecture.api.model.NetworkRoute
-import io.architecture.api.model.NetworkServerTime
-import io.architecture.api.model.NetworkTrace
 import io.architecture.model.ConnectionEvent
+import io.architecture.network.websocket.api.model.NetworkRoute
+import io.architecture.network.websocket.api.model.NetworkTrace
+import io.architecture.network.websocket.model.NetworkClientTime
+import io.architecture.network.websocket.model.NetworkServerTime
 import kotlinx.coroutines.flow.Flow
 
 interface NetworkDataSource {
diff --git a/core/network/websocket/api/build.gradle.kts b/core/network/websocket/api/build.gradle.kts
@@ -6,7 +6,7 @@ plugins {
 }
 
 android {
-    namespace = "io.architecture.api"
+    namespace = "io.architecture.network.websocket.api"
     compileSdk = 34
 
 
diff --git a/core/network/websocket/api/src/main/java/io/architecture/api/RouteService.kt b/core/network/websocket/api/src/main/java/io/architecture/api/RouteService.kt
diff --git a/core/network/websocket/api/src/main/java/io/architecture/api/RttService.kt b/core/network/websocket/api/src/main/java/io/architecture/api/RttService.kt
diff --git a/core/network/websocket/api/src/main/java/io/architecture/api/TraceService.kt b/core/network/websocket/api/src/main/java/io/architecture/api/TraceService.kt
diff --git a/core/network/websocket/api/src/main/java/io/architecture/network/websocket/api/Configuration.kt b/core/network/websocket/api/src/main/java/io/architecture/network/websocket/api/Configuration.kt
@@ -1,4 +1,4 @@
-package io.architecture.api
+package io.architecture.network.websocket.api
 
 //@Module
 //@InstallIn(SingletonComponent::class)
diff --git a/core/network/websocket/api/src/main/java/io/architecture/network/websocket/api/ConnectionEventStreamer.kt b/core/network/websocket/api/src/main/java/io/architecture/network/websocket/api/ConnectionEventStreamer.kt
@@ -1,4 +1,4 @@
-package io.architecture.api
+package io.architecture.network.websocket.api
 
 import io.architecture.model.ConnectionEvent
 import kotlinx.coroutines.flow.Flow
diff --git a/core/network/websocket/api/src/main/java/io/architecture/network/websocket/api/RouteService.kt b/core/network/websocket/api/src/main/java/io/architecture/network/websocket/api/RouteService.kt
@@ -0,0 +1,9 @@
+package io.architecture.network.websocket.api
+
+import io.architecture.network.websocket.api.model.NetworkRoute
+import kotlinx.coroutines.flow.Flow
+
+
+interface RouteService {
+    fun streamRoutes(): Flow<NetworkRoute>
+}
diff --git a/core/network/websocket/api/src/main/java/io/architecture/network/websocket/api/RttService.kt b/core/network/websocket/api/src/main/java/io/architecture/network/websocket/api/RttService.kt
@@ -0,0 +1,11 @@
+package io.architecture.network.websocket.api
+
+import io.architecture.network.websocket.model.NetworkClientTime
+import io.architecture.network.websocket.model.NetworkServerTime
+import kotlinx.coroutines.flow.Flow
+
+interface RttService {
+    fun sendClientTime(time: NetworkClientTime)
+
+    fun streamServerTime(): Flow<NetworkServerTime>
+}
diff --git a/core/network/websocket/api/src/main/java/io/architecture/network/websocket/api/TraceService.kt b/core/network/websocket/api/src/main/java/io/architecture/network/websocket/api/TraceService.kt
@@ -0,0 +1,8 @@
+package io.architecture.network.websocket.api
+
+import io.architecture.network.websocket.api.model.NetworkTrace
+import kotlinx.coroutines.flow.Flow
+
+interface TraceService {
+    fun streamTraces(): Flow<NetworkTrace>
+}
diff --git a/core/network/websocket/api/src/main/java/io/architecture/network/websocket/api/model/NetworkRoute.kt b/core/network/websocket/api/src/main/java/io/architecture/network/websocket/api/model/NetworkRoute.kt
@@ -1,4 +1,4 @@
-package io.architecture.api.model
+package io.architecture.network.websocket.api.model
 
 import com.google.gson.annotations.SerializedName
 import kotlinx.serialization.Serializable
diff --git a/core/network/websocket/api/src/main/java/io/architecture/network/websocket/api/model/NetworkTrace.kt b/core/network/websocket/api/src/main/java/io/architecture/network/websocket/api/model/NetworkTrace.kt
@@ -1,4 +1,4 @@
-package io.architecture.api.model
+package io.architecture.network.websocket.api.model
 
 import com.google.gson.annotations.SerializedName
 import kotlinx.serialization.Serializable
diff --git a/core/network/websocket/api/src/main/java/io/architecture/network/websocket/api/model/NetworkUpstreamRtt.kt b/core/network/websocket/api/src/main/java/io/architecture/network/websocket/api/model/NetworkUpstreamRtt.kt
@@ -1,4 +1,4 @@
-package io.architecture.api.model
+package io.architecture.network.websocket.model
 
 import com.google.gson.annotations.SerializedName
 import kotlinx.serialization.Serializable
diff --git a/core/network/websocket/imp/ktor/src/main/java/io/architecture/ktor/KtorModule.kt b/core/network/websocket/imp/ktor/src/main/java/io/architecture/ktor/KtorModule.kt
@@ -5,14 +5,21 @@ import dagger.Module
 import dagger.Provides
 import dagger.hilt.InstallIn
 import dagger.hilt.components.SingletonComponent
-import io.architecture.api.*
-import io.architecture.api.model.NetworkClientTime
-import io.architecture.api.model.NetworkRoute
-import io.architecture.api.model.NetworkServerTime
-import io.architecture.api.model.NetworkTrace
 import io.architecture.common.ApplicationScope
 import io.architecture.common.DefaultDispatcher
 import io.architecture.ktor.internal.KtorProtobufClient
+import io.architecture.network.websocket.api.BASE_WS_HOST
+import io.architecture.network.websocket.api.BASE_WS_PORT
+import io.architecture.network.websocket.api.NODE_ROUTES_WS_PATH
+import io.architecture.network.websocket.api.NODE_TRACES_WS_PATH
+import io.architecture.network.websocket.api.RTT_WS_PATH
+import io.architecture.network.websocket.api.RouteService
+import io.architecture.network.websocket.api.RttService
+import io.architecture.network.websocket.api.TraceService
+import io.architecture.network.websocket.api.model.NetworkRoute
+import io.architecture.network.websocket.api.model.NetworkTrace
+import io.architecture.network.websocket.model.NetworkClientTime
+import io.architecture.network.websocket.model.NetworkServerTime
 import io.ktor.client.HttpClient
 import io.ktor.client.engine.cio.CIO
 import io.ktor.client.plugins.logging.LogLevel
diff --git a/core/network/websocket/imp/ktor/src/main/java/io/architecture/ktor/KtorNetworkDataSource.kt b/core/network/websocket/imp/ktor/src/main/java/io/architecture/ktor/KtorNetworkDataSource.kt
@@ -1,14 +1,11 @@
 package io.architecture.ktor
 
-import io.architecture.api.model.NetworkClientTime
-import io.architecture.api.model.NetworkRoute
-import io.architecture.api.model.NetworkServerTime
-import io.architecture.api.model.NetworkTrace
 import io.architecture.datasource.api.NetworkDataSource
-import io.architecture.ktor.KtorRouteService
-import io.architecture.ktor.KtorRttService
-import io.architecture.ktor.KtorTraceService
 import io.architecture.model.ConnectionEvent
+import io.architecture.network.websocket.api.model.NetworkRoute
+import io.architecture.network.websocket.api.model.NetworkTrace
+import io.architecture.network.websocket.model.NetworkClientTime
+import io.architecture.network.websocket.model.NetworkServerTime
 import kotlinx.coroutines.flow.Flow
 import javax.inject.Inject
 
diff --git a/core/network/websocket/imp/ktor/src/main/java/io/architecture/ktor/KtorRouteService.kt b/core/network/websocket/imp/ktor/src/main/java/io/architecture/ktor/KtorRouteService.kt
@@ -1,12 +1,12 @@
 package io.architecture.ktor
 
-import io.architecture.api.ConnectionEventStreamer
-import io.architecture.api.RouteService
-import io.architecture.api.model.NetworkRoute
 import io.architecture.common.ApplicationScope
 import io.architecture.common.DefaultDispatcher
 import io.architecture.ktor.internal.KtorProtobufClient
 import io.architecture.model.ConnectionEvent
+import io.architecture.network.websocket.api.ConnectionEventStreamer
+import io.architecture.network.websocket.api.RouteService
+import io.architecture.network.websocket.api.model.NetworkRoute
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
diff --git a/core/network/websocket/imp/ktor/src/main/java/io/architecture/ktor/KtorRttService.kt b/core/network/websocket/imp/ktor/src/main/java/io/architecture/ktor/KtorRttService.kt
@@ -1,13 +1,13 @@
 package io.architecture.ktor
 
-import io.architecture.api.ConnectionEventStreamer
-import io.architecture.api.RttService
-import io.architecture.api.model.NetworkClientTime
-import io.architecture.api.model.NetworkServerTime
 import io.architecture.common.ApplicationScope
 import io.architecture.common.DefaultDispatcher
 import io.architecture.ktor.internal.KtorProtobufClient
 import io.architecture.model.ConnectionEvent
+import io.architecture.network.websocket.api.ConnectionEventStreamer
+import io.architecture.network.websocket.api.RttService
+import io.architecture.network.websocket.model.NetworkClientTime
+import io.architecture.network.websocket.model.NetworkServerTime
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
diff --git a/core/network/websocket/imp/ktor/src/main/java/io/architecture/ktor/KtorTraceService.kt b/core/network/websocket/imp/ktor/src/main/java/io/architecture/ktor/KtorTraceService.kt
@@ -1,12 +1,12 @@
 package io.architecture.ktor
 
-import io.architecture.api.ConnectionEventStreamer
-import io.architecture.api.TraceService
-import io.architecture.api.model.NetworkTrace
 import io.architecture.common.ApplicationScope
 import io.architecture.common.DefaultDispatcher
 import io.architecture.ktor.internal.KtorProtobufClient
 import io.architecture.model.ConnectionEvent
+import io.architecture.network.websocket.api.ConnectionEventStreamer
+import io.architecture.network.websocket.api.TraceService
+import io.architecture.network.websocket.api.model.NetworkTrace
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.flow.Flow
diff --git a/core/network/websocket/imp/scarlet/src/main/java/io/architecture/scarlet/ScarletNetworkDataSource.kt b/core/network/websocket/imp/scarlet/src/main/java/io/architecture/scarlet/ScarletNetworkDataSource.kt
@@ -1,11 +1,11 @@
 package io.architecture.scarlet
 
-import io.architecture.api.model.NetworkClientTime
-import io.architecture.api.model.NetworkRoute
-import io.architecture.api.model.NetworkServerTime
-import io.architecture.api.model.NetworkTrace
 import io.architecture.datasource.api.NetworkDataSource
 import io.architecture.model.ConnectionEvent
+import io.architecture.network.websocket.api.model.NetworkRoute
+import io.architecture.network.websocket.api.model.NetworkTrace
+import io.architecture.network.websocket.model.NetworkClientTime
+import io.architecture.network.websocket.model.NetworkServerTime
 import kotlinx.coroutines.flow.Flow
 import kotlinx.coroutines.flow.map
 import javax.inject.Inject
diff --git a/core/network/websocket/imp/scarlet/src/main/java/io/architecture/scarlet/ScarletRouteService.kt b/core/network/websocket/imp/scarlet/src/main/java/io/architecture/scarlet/ScarletRouteService.kt
@@ -2,8 +2,8 @@ package io.architecture.scarlet
 
 import com.tinder.scarlet.WebSocket
 import com.tinder.scarlet.ws.Receive
-import io.architecture.api.RouteService
-import io.architecture.api.model.NetworkRoute
+import io.architecture.network.websocket.api.RouteService
+import io.architecture.network.websocket.api.model.NetworkRoute
 import io.architecture.scarlet.internal.Target
 import kotlinx.coroutines.flow.Flow
 
diff --git a/core/network/websocket/imp/scarlet/src/main/java/io/architecture/scarlet/ScarletTraceService.kt b/core/network/websocket/imp/scarlet/src/main/java/io/architecture/scarlet/ScarletTraceService.kt
@@ -3,10 +3,10 @@ package io.architecture.scarlet
 import com.tinder.scarlet.WebSocket
 import com.tinder.scarlet.ws.Receive
 import com.tinder.scarlet.ws.Send
-import io.architecture.api.TraceService
-import io.architecture.api.model.NetworkClientTime
-import io.architecture.api.model.NetworkServerTime
-import io.architecture.api.model.NetworkTrace
+import io.architecture.network.websocket.api.TraceService
+import io.architecture.network.websocket.api.model.NetworkTrace
+import io.architecture.network.websocket.model.NetworkClientTime
+import io.architecture.network.websocket.model.NetworkServerTime
 import io.architecture.scarlet.internal.Target
 import kotlinx.coroutines.flow.Flow
 

Original file line number	Diff line number	Diff line change
`@@ -6,7 +6,7 @@ plugins {`
`6`	`6`	`}`
`7`	`7`
`8`	`8`	`android {`
`9`		`- namespace = "io.architecture.api"`
	`9`	`+ namespace = "io.architecture.network.websocket.api"`
`10`	`10`	`compileSdk = 34`
`11`	`11`
`12`	`12`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-package io.architecture.api`
	`1`	`+package io.architecture.network.websocket.api`
`2`	`2`
`3`	`3`	`//@Module`
`4`	`4`	`//@InstallIn(SingletonComponent::class)`