Only generate kotlin for the grpc service itself

ThePumpingLemma · ThePumpingLemma · commit 805340a76dbe · 2024-08-29T01:13:54.000-04:00
diff --git a/client/build.gradle.kts b/client/build.gradle.kts
@@ -18,6 +18,7 @@ sourceSets {
 dependencies {
   implementation(libs.moshiCore)
   implementation(libs.moshiKotlin)
+  implementation(libs.wireGrpcClient)
   implementation(libs.wireRuntime)
   implementation(libs.guice)
   implementation(libs.retrofit)
@@ -33,6 +34,12 @@ wire {
   sourcePath {
     srcDir("src/main/proto")
   }
+  kotlin {
+    includes = listOf("app.cash.backfila.protos.clientservice.BackfilaClientService")
+    rpcRole = "client"
+    javaInterop = true
+    exclusive = true
+  }
   java {
   }
 }
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -76,6 +76,7 @@ miskTailwind = { module = "com.squareup.misk:misk-tailwind", version.ref = "misk
 miskTesting = { module = "com.squareup.misk:misk-testing", version.ref = "misk" }
 wireCompiler = { module = "com.squareup.wire:wire-compiler", version = "4.4.2" }
 wireGradlePlugin = { module = "com.squareup.wire:wire-gradle-plugin", version = "4.4.2" }
+wireGrpcClient = { module = "com.squareup.wire:wire-grpc-client", version = "4.4.2" }
 wireMoshiAdapter = { module = "com.squareup.wire:wire-moshi-adapter", version = "4.4.2" }
 wireRuntime = { module = "com.squareup.wire:wire-runtime", version = "4.4.2" }
 wireSchema = { module = "com.squareup.wire:wire-schema", version = "4.4.2" }
diff --git a/service/build.gradle.kts b/service/build.gradle.kts
@@ -95,22 +95,6 @@ dependencies {
 
 wire {
   protoLibrary = true
-  sourcePath {
-    srcDir("src/main/proto")
-  }
-  sourcePath {
-    srcProject(":client")
-  }
-  kotlin {
-    includes = listOf("app.cash.backfila.protos.clientservice.*")
-    rpcRole = "client"
-    javaInterop = true
-  }
-  kotlin {
-    includes = listOf("app.cash.backfila.protos.service.*")
-    rpcRole = "server"
-    javaInterop = true
-  }
   kotlin {
     javaInterop = true
   }
diff --git a/service/src/main/kotlin/app/cash/backfila/client/GrpcCallbackConnectorProvider.kt b/service/src/main/kotlin/app/cash/backfila/client/GrpcCallbackConnectorProvider.kt
@@ -5,10 +5,10 @@ import app.cash.backfila.client.interceptors.OkHttpClientSpecifiedHeadersInterce
 import app.cash.backfila.protos.clientservice.BackfilaClientServiceClient
 import com.squareup.moshi.Moshi
 import com.squareup.wire.GrpcClient
-import misk.client.HttpClientConfigUrlProvider
 import java.net.URL
 import javax.inject.Inject
 import javax.inject.Singleton
+import misk.client.HttpClientConfigUrlProvider
 import misk.client.HttpClientFactory
 import misk.client.HttpClientsConfig
 import misk.moshi.adapter
diff --git a/service/src/main/kotlin/app/cash/backfila/service/persistence/DbRegisteredBackfill.kt b/service/src/main/kotlin/app/cash/backfila/service/persistence/DbRegisteredBackfill.kt
@@ -94,7 +94,7 @@ class DbRegisteredBackfill() : DbUnsharded<DbRegisteredBackfill>, DbTimestampedE
     this.service_id = service_id
     this.name = name
     if (parameters.isNotEmpty()) {
-      this.parameter_names = parameters.joinToString(",") { it.name!! }
+      this.parameter_names = parameters.joinToString(",") { it.name }
     }
     this.type_provided = type_provided
     this.type_consumed = type_consumed
@@ -106,7 +106,7 @@ class DbRegisteredBackfill() : DbUnsharded<DbRegisteredBackfill>, DbTimestampedE
       this.parameters.add(
         DbRegisteredParameter(
           this,
-          it.name!!,
+          it.name,
           it.description,
           it.required ?: false,
         ),
diff --git a/service/src/main/kotlin/app/cash/backfila/service/runner/statemachine/BatchPrecomputer.kt b/service/src/main/kotlin/app/cash/backfila/service/runner/statemachine/BatchPrecomputer.kt
@@ -58,7 +58,7 @@ class BatchPrecomputer(
             metadata.scanSize,
             pkeyCursor,
             KeyRange(metadata.pkeyStart, metadata.pkeyEnd),
-            metadata.parameters!!,
+            metadata.parameters,
             computeTimeLimitMs,
             computeCountLimit,
             metadata.dryRun,
@@ -87,9 +87,9 @@ class BatchPrecomputer(
           break
         }
 
-        pkeyCursor = response.batches.last().batch_range!!.end
-        computedScannedRecordCount += response.batches.sumOf { it.scanned_record_count!! }
-        computedMatchingRecordCount += response.batches.sumOf { it.matching_record_count!! }
+        pkeyCursor = response.batches.last().batch_range.end
+        computedScannedRecordCount += response.batches.sumOf { it.scanned_record_count }
+        computedMatchingRecordCount += response.batches.sumOf { it.matching_record_count }
 
         logger.debug { "Precomputer advanced to $pkeyCursor after scanning ${response.batches}" }
       } catch (e: CancellationException) {
diff --git a/service/src/test/kotlin/app/cash/backfila/actions/CloneBackfillActionTest.kt b/service/src/test/kotlin/app/cash/backfila/actions/CloneBackfillActionTest.kt
@@ -110,7 +110,7 @@ class CloneBackfillActionTest {
       )
 
       val cloneResponse = cloneBackfillAction.create(
-        response.backfill_run_id!!,
+        response.backfill_run_id,
         CloneBackfillRequest(
           batch_size = 123,
           scan_size = 223,
@@ -191,7 +191,7 @@ class CloneBackfillActionTest {
       )
 
       val cloneResponse = cloneBackfillAction.create(
-        responseVariant.backfill_run_id!!,
+        responseVariant.backfill_run_id,
         CloneBackfillRequest(
           batch_size = 123,
           scan_size = 223,
@@ -263,7 +263,7 @@ class CloneBackfillActionTest {
       )
 
       val cloneResponse = cloneBackfillAction.create(
-        response.backfill_run_id!!,
+        response.backfill_run_id,
         CloneBackfillRequest(
           range_clone_type = RangeCloneType.NEW,
         ),
@@ -324,7 +324,7 @@ class CloneBackfillActionTest {
       )
 
       val cloneResponse = cloneBackfillAction.create(
-        response.backfill_run_id!!,
+        response.backfill_run_id,
         CloneBackfillRequest(
           range_clone_type = RangeCloneType.CONTINUE,
         ),
@@ -385,7 +385,7 @@ class CloneBackfillActionTest {
       )
 
       val cloneResponse = cloneBackfillAction.create(
-        response.backfill_run_id!!,
+        response.backfill_run_id,
         CloneBackfillRequest(
           range_clone_type = RangeCloneType.RESTART,
         ),
@@ -447,7 +447,7 @@ class CloneBackfillActionTest {
 
       assertThatThrownBy {
         cloneBackfillAction.create(
-          response.backfill_run_id!!,
+          response.backfill_run_id,
           CloneBackfillRequest(
             range_clone_type = RangeCloneType.RESTART,
           ),
@@ -502,7 +502,7 @@ class CloneBackfillActionTest {
       )
 
       val cloneResponse = cloneBackfillAction.create(
-        response.backfill_run_id!!,
+        response.backfill_run_id,
         CloneBackfillRequest(
           range_clone_type = RangeCloneType.NEW,
         ),
@@ -544,7 +544,7 @@ class CloneBackfillActionTest {
 
       assertThatThrownBy {
         cloneBackfillAction.create(
-          response.backfill_run_id!!,
+          response.backfill_run_id,
           CloneBackfillRequest(
             batch_size = 123,
             scan_size = 223,
diff --git a/service/src/test/kotlin/app/cash/backfila/actions/GetServiceVariantsActionTest.kt b/service/src/test/kotlin/app/cash/backfila/actions/GetServiceVariantsActionTest.kt
@@ -88,7 +88,7 @@ class GetServiceVariantsActionTest {
           .backfill_name("ChickenSandwich")
           .build(),
       )
-      val id = response.backfill_run_id!!
+      val id = response.backfill_run_id
       startBackfillAction.start(id, StartBackfillRequest())
     }
 
@@ -125,7 +125,7 @@ class GetServiceVariantsActionTest {
           .backfill_name("ChickenSandwich")
           .build(),
       )
-      val id = response.backfill_run_id!!
+      val id = response.backfill_run_id
       startBackfillAction.start(id, StartBackfillRequest())
     }
     scope.fakeCaller(service = "oven") {
diff --git a/service/src/test/kotlin/app/cash/backfila/actions/GetServicesActionTest.kt b/service/src/test/kotlin/app/cash/backfila/actions/GetServicesActionTest.kt
@@ -96,7 +96,7 @@ class GetServicesActionTest {
           .backfill_name("ChickenSandwich")
           .build(),
       )
-      val id = response.backfill_run_id!!
+      val id = response.backfill_run_id
       startBackfillAction.start(id, StartBackfillRequest())
     }
 
@@ -136,7 +136,7 @@ class GetServicesActionTest {
           .backfill_name("ChickenSandwich")
           .build(),
       )
-      val id = response.backfill_run_id!!
+      val id = response.backfill_run_id
       startBackfillAction.start(id, StartBackfillRequest())
     }
     scope.fakeCaller(user = "molly") {
diff --git a/service/src/test/kotlin/app/cash/backfila/actions/StartStopBackfillActionTest.kt b/service/src/test/kotlin/app/cash/backfila/actions/StartStopBackfillActionTest.kt
@@ -105,7 +105,7 @@ class StartStopBackfillActionTest {
       assertThat(backfillRuns.paused_backfills).hasSize(1)
       assertThat(backfillRuns.running_backfills).hasSize(0)
 
-      val id = response.backfill_run_id!!
+      val id = response.backfill_run_id
       assertThat(backfillRuns.paused_backfills[0].id).isEqualTo(id.toString())
       startBackfillAction.start(id, StartBackfillRequest())
 
@@ -209,7 +209,7 @@ class StartStopBackfillActionTest {
       assertThat(deepFriedRuns.paused_backfills).hasSize(1)
       assertThat(deepFriedRuns.running_backfills).hasSize(0)
 
-      val defaultId = response.backfill_run_id!!
+      val defaultId = response.backfill_run_id
       assertThat(defaultRuns.paused_backfills[0].id).isEqualTo(defaultId.toString())
       startBackfillAction.start(defaultId, StartBackfillRequest())
 
@@ -221,7 +221,7 @@ class StartStopBackfillActionTest {
       assertThat(deepFriedRuns.paused_backfills).hasSize(1)
       assertThat(deepFriedRuns.running_backfills).hasSize(0)
 
-      val deepFriedId = response2.backfill_run_id!!
+      val deepFriedId = response2.backfill_run_id
       assertThat(deepFriedRuns.paused_backfills[0].id).isEqualTo(deepFriedId.toString())
       startBackfillAction.start(deepFriedId, StartBackfillRequest())
 
@@ -329,7 +329,7 @@ class StartStopBackfillActionTest {
       assertThat(deepFriedRuns.paused_backfills).hasSize(1)
       assertThat(deepFriedRuns.running_backfills).hasSize(0)
 
-      val defaultId = response.backfill_run_id!!
+      val defaultId = response.backfill_run_id
       assertThat(defaultRuns.paused_backfills[0].id).isEqualTo(defaultId.toString())
       startBackfillAction.start(defaultId, StartBackfillRequest())
 
@@ -341,7 +341,7 @@ class StartStopBackfillActionTest {
       assertThat(deepFriedRuns.paused_backfills).hasSize(1)
       assertThat(deepFriedRuns.running_backfills).hasSize(0)
 
-      val deepFriedId = response2.backfill_run_id!!
+      val deepFriedId = response2.backfill_run_id
       assertThat(deepFriedRuns.paused_backfills[0].id).isEqualTo(deepFriedId.toString())
       startBackfillAction.start(deepFriedId, StartBackfillRequest())
 
@@ -439,7 +439,7 @@ class StartStopBackfillActionTest {
           .backfill_name("ChickenSandwich")
           .build(),
       )
-      val id = response.backfill_run_id!!
+      val id = response.backfill_run_id
 
       assertThatThrownBy {
         startBackfillAction.start(id + 1, StartBackfillRequest())
@@ -472,7 +472,7 @@ class StartStopBackfillActionTest {
           .backfill_name("ChickenSandwich")
           .build(),
       )
-      val id = response.backfill_run_id!!
+      val id = response.backfill_run_id
       startBackfillAction.start(id, StartBackfillRequest())
 
       transacter.transaction { session ->
@@ -512,7 +512,7 @@ class StartStopBackfillActionTest {
           .backfill_name("ChickenSandwich")
           .build(),
       )
-      val id = response.backfill_run_id!!
+      val id = response.backfill_run_id
       assertThatThrownBy {
         stopBackfillAction.stop(id, StopBackfillRequest())
       }.isInstanceOf(BadRequestException::class.java)
@@ -544,7 +544,7 @@ class StartStopBackfillActionTest {
           .backfill_name("ChickenSandwich")
           .build(),
       )
-      val id = response.backfill_run_id!!
+      val id = response.backfill_run_id
 
       transacter.transaction { session ->
         val run = session.load(Id<DbBackfillRun>(id))
diff --git a/service/src/test/kotlin/app/cash/backfila/actions/UpdateBackfillActionTest.kt b/service/src/test/kotlin/app/cash/backfila/actions/UpdateBackfillActionTest.kt
@@ -67,7 +67,7 @@ class UpdateBackfillActionTest {
           .build(),
       )
 
-      val id = response.backfill_run_id!!
+      val id = response.backfill_run_id
 
       updateBackfillAction.update(id, UpdateBackfillRequest(num_threads = 12))
       var status = getBackfillStatusAction.status(id)
@@ -136,7 +136,7 @@ class UpdateBackfillActionTest {
           .backfill_name("ChickenSandwich")
           .build(),
       )
-      val defaultId = defaultResponse.backfill_run_id!!
+      val defaultId = defaultResponse.backfill_run_id
 
       val deepFriedResponse = createBackfillAction.create(
         "deep-fryer",
@@ -145,7 +145,7 @@ class UpdateBackfillActionTest {
           .backfill_name("ChickenSandwich")
           .build(),
       )
-      val deepFriedId = deepFriedResponse.backfill_run_id!!
+      val deepFriedId = deepFriedResponse.backfill_run_id
 
       updateBackfillAction.update(defaultId, UpdateBackfillRequest(num_threads = 12))
       var status = getBackfillStatusAction.status(defaultId)
@@ -225,7 +225,7 @@ class UpdateBackfillActionTest {
           .build(),
       )
 
-      val id = response.backfill_run_id!!
+      val id = response.backfill_run_id
 
       assertThatThrownBy {
         updateBackfillAction.update(id, UpdateBackfillRequest(scan_size = 12))
@@ -265,7 +265,7 @@ class UpdateBackfillActionTest {
           .build(),
       )
 
-      val id = response.backfill_run_id!!
+      val id = response.backfill_run_id
 
       assertThatThrownBy {
         updateBackfillAction.update(id, UpdateBackfillRequest(scan_size = 0))
diff --git a/service/src/test/kotlin/app/cash/backfila/api/CreateAndStartBackfillActionTest.kt b/service/src/test/kotlin/app/cash/backfila/api/CreateAndStartBackfillActionTest.kt
@@ -72,7 +72,7 @@ class CreateAndStartBackfillActionTest {
           .build(),
       )
 
-      val status = getBackfillStatusAction.status(response.backfill_run_id!!)
+      val status = getBackfillStatusAction.status(response.backfill_run_id)
       assertThat(status.state).isEqualTo(BackfillState.RUNNING)
       assertThat(status.created_by_user).isEqualTo("deep-fryer")
       assertThat(status.partitions[0].name).isEqualTo("-80")
diff --git a/service/src/test/kotlin/app/cash/backfila/client/FakeBackfilaCallbackConnector.kt b/service/src/test/kotlin/app/cash/backfila/client/FakeBackfilaCallbackConnector.kt
@@ -64,15 +64,15 @@ class FakeBackfilaCallbackConnector @Inject constructor() : BackfilaCallbackConn
       return getNextBatchRangeResponses.receive().getOrThrow()
     }
     val nextStart = if (request.previous_end_key != null) {
-      request.previous_end_key!!.utf8().toLong() + 1
+      request.previous_end_key.utf8().toLong() + 1
     } else {
-      request.backfill_range!!.start!!.utf8().toLong()
+      request.backfill_range.start.utf8().toLong()
     }
-    var nextEnd = nextStart + request.batch_size!! - 1
-    if (nextEnd > request.backfill_range!!.end!!.utf8().toLong()) {
-      nextEnd = request.backfill_range!!.end!!.utf8().toLong()
+    var nextEnd = nextStart + request.batch_size - 1
+    if (nextEnd > request.backfill_range.end.utf8().toLong()) {
+      nextEnd = request.backfill_range.end.utf8().toLong()
     }
-    if (nextStart > request.backfill_range!!.end!!.utf8().toLong()) {
+    if (nextStart > request.backfill_range.end.utf8().toLong()) {
       return GetNextBatchRangeResponse(listOf())
     }
     return GetNextBatchRangeResponse(
diff --git a/service/src/test/kotlin/app/cash/backfila/service/BackfillRunnerTest.kt b/service/src/test/kotlin/app/cash/backfila/service/BackfillRunnerTest.kt
diff --git a/service/src/test/kotlin/app/cash/backfila/service/LeaseHunterTest.kt b/service/src/test/kotlin/app/cash/backfila/service/LeaseHunterTest.kt

Original file line number	Diff line number	Diff line change
`@@ -88,7 +88,7 @@ class GetServiceVariantsActionTest {`
`88`	`88`	`.backfill_name("ChickenSandwich")`
`89`	`89`	`.build(),`
`90`	`90`	`)`
`91`		`- val id = response.backfill_run_id!!`
	`91`	`+ val id = response.backfill_run_id`
`92`	`92`	`startBackfillAction.start(id, StartBackfillRequest())`
`93`	`93`	`}`
`94`	`94`
`@@ -125,7 +125,7 @@ class GetServiceVariantsActionTest {`
`125`	`125`	`.backfill_name("ChickenSandwich")`
`126`	`126`	`.build(),`
`127`	`127`	`)`
`128`		`- val id = response.backfill_run_id!!`
	`128`	`+ val id = response.backfill_run_id`
`129`	`129`	`startBackfillAction.start(id, StartBackfillRequest())`
`130`	`130`	`}`
`131`	`131`	`scope.fakeCaller(service = "oven") {`
Original file line number	Diff line number	Diff line change
`@@ -96,7 +96,7 @@ class GetServicesActionTest {`
`96`	`96`	`.backfill_name("ChickenSandwich")`
`97`	`97`	`.build(),`
`98`	`98`	`)`
`99`		`- val id = response.backfill_run_id!!`
	`99`	`+ val id = response.backfill_run_id`
`100`	`100`	`startBackfillAction.start(id, StartBackfillRequest())`
`101`	`101`	`}`
`102`	`102`
`@@ -136,7 +136,7 @@ class GetServicesActionTest {`
`136`	`136`	`.backfill_name("ChickenSandwich")`
`137`	`137`	`.build(),`
`138`	`138`	`)`
`139`		`- val id = response.backfill_run_id!!`
	`139`	`+ val id = response.backfill_run_id`
`140`	`140`	`startBackfillAction.start(id, StartBackfillRequest())`
`141`	`141`	`}`
`142`	`142`	`scope.fakeCaller(user = "molly") {`