Add createGrpcClient<T> utility

Author: Lipen

jacodb-ets/src/main/kotlin/org/jacodb/ets/grpc/LoadScene.kt

@@ -17,14 +17,14 @@
 package org.jacodb.ets.grpc
 
 import manager.GetSceneRequest
+import manager.ManagerClient
 import mu.KotlinLogging
-import org.jacodb.ets.service.grpcClient
+import org.jacodb.ets.service.createGrpcClient
 import java.nio.file.Path
 import kotlin.io.path.pathString
 import kotlin.time.DurationUnit
 import kotlin.time.measureTimedValue
 import model.Scene as ProtoScene
-import manager.ManagerClient
 
 private val logger = KotlinLogging.logger {}
 
@@ -35,7 +35,7 @@ fun loadScene(
     port: Int = DEFAULT_PORT,
 ): ProtoScene {
     logger.info { "Connecting to gRPC server on port $port..." }
-    val manager: ManagerClient = grpcClient(port).create()
+    val manager = createGrpcClient<ManagerClient>(port)
     logger.info { "Requesting Scene for '$path'..." }
     val (scene, timeLoad) = measureTimedValue {
         val request = GetSceneRequest(path.pathString)

jacodb-ets/src/test/kotlin/org/jacodb/ets/test/GrpcTest.kt

@@ -17,12 +17,12 @@
 package org.jacodb.ets.test
 
 import mu.KotlinLogging
+import org.jacodb.ets.grpc.Server
 import org.jacodb.ets.grpc.loadScene
+import org.jacodb.ets.grpc.startArkAnalyzerServer
 import org.jacodb.ets.model.EtsScene
 import org.jacodb.ets.proto.toEts
-import org.jacodb.ets.grpc.Server
 import org.jacodb.ets.test.utils.assumeNotNull
-import org.jacodb.ets.grpc.startArkAnalyzerServer
 import org.jacodb.ets.test.utils.testFactory
 import org.jacodb.ets.utils.getResourcePath
 import org.jacodb.ets.utils.getResourcePathOrNull

jacodb-ets/src/test/kotlin/org/jacodb/ets/test/WireTest.kt

@@ -21,7 +21,7 @@ import greeter.HelloRequest
 import io.grpc.ServerBuilder
 import mu.KotlinLogging
 import org.jacodb.ets.service.GreeterService
-import org.jacodb.ets.service.grpcClient
+import org.jacodb.ets.service.createGrpcClient
 import kotlin.test.Test
 
 private val logger = KotlinLogging.logger {}
@@ -40,7 +40,7 @@ class WireTest {
         server.start()
         logger.info { "Server listening on port ${server.port}" }
 
-        val client: GreeterClient = grpcClient(PORT).create()
+        val client = createGrpcClient<GreeterClient>(PORT)
 
         val request = HelloRequest(name = "Kotlin")
         logger.info { "Sending $request" }

jacodb-ets/wire-client/src/main/kotlin/org/jacodb/ets/service/Utils.kt renamed to jacodb-ets/wire-client/src/main/kotlin/org/jacodb/ets/service/GrpcClient.kt

@@ -17,6 +17,7 @@
 package org.jacodb.ets.service
 
 import com.squareup.wire.GrpcClient
+import com.squareup.wire.Service
 import okhttp3.OkHttpClient
 import okhttp3.Protocol
 
@@ -31,3 +32,7 @@ fun grpcClient(port: Int = DEFAULT_PORT): GrpcClient {
         .baseUrl("http://0.0.0.0:$port")
         .build()
 }
+
+inline fun <reified T : Service> createGrpcClient(port: Int = DEFAULT_PORT): T {
+    return grpcClient(port).create()
+}

jacodb-ets/wire-client/src/main/kotlin/org/jacodb/ets/service/ClientGreeter.kt renamed to jacodb-ets/wire-client/src/main/kotlin/org/jacodb/ets/service/TestGreeter.kt

@@ -16,28 +16,13 @@
 
 package org.jacodb.ets.service
 
-import com.squareup.wire.GrpcMethod
-import greeter.HelloReply
+import greeter.GreeterClient
 import greeter.HelloRequest
 
 fun main() {
     val port = 50051
-    // val greeter: GreeterClient = grpcClient(port).create()
-    // val request = HelloRequest(name = "Kotlin")
-    // val response = greeter.SayHello().executeBlocking(request)
-    // println("Response: \"${response.message}\"")
-
-    // Below is the manual way to create a gRPC call.
-    // We use it here to make 'path' contain 'greeter' instead of 'greeter2',
-    val client = grpcClient(port)
-    val call = client.newCall(
-        GrpcMethod(
-            path = "/greeter.Greeter/SayHello",
-            requestAdapter = HelloRequest.ADAPTER,
-            responseAdapter = HelloReply.ADAPTER
-        )
-    )
+    val greeter = createGrpcClient<GreeterClient>(port)
     val request = HelloRequest(name = "Kotlin")
-    val response: HelloReply = call.executeBlocking(request)
+    val response = greeter.SayHello().executeBlocking(request)
     println("Response: \"${response.message}\"")
 }

jacodb-ets/wire-client/src/main/kotlin/org/jacodb/ets/service/ClientManager.kt renamed to jacodb-ets/wire-client/src/main/kotlin/org/jacodb/ets/service/TestManager.kt

@@ -21,7 +21,7 @@ import manager.ManagerClient
 
 fun main() {
     val port = 50051
-    val manager: ManagerClient = grpcClient(port).create()
+    val manager = createGrpcClient<ManagerClient>(port)
     val path = "TODO"
     val request = GetSceneRequest(path)
     val scene = manager.GetScene().executeBlocking(request)