From 463acd0bb5a61f838b23530ca4f6537a7d48f7d6 Mon Sep 17 00:00:00 2001
From: Charlie La Mothe <clamothe@backblaze.com>
Date: Wed, 2 Oct 2024 16:58:51 -0700
Subject: [PATCH] Make the `bindService` method `final` to be consistent with
 gRPC-java

https://github.com/grpc/grpc-java/blob/6f3542297c2fb46a38cab65d510fc2ce76200045/compiler/src/java_plugin/cpp/java_generator.cpp#L836
---
 .../com/squareup/wire/kotlin/grpcserver/ImplBaseGenerator.kt    | 2 +-
 server-generator/src/test/golden/ImplBase.kt                    | 2 +-
 server-generator/src/test/golden/RouteGuideWireGrpc.kt          | 2 +-
 server-generator/src/test/golden/nonSingleMethodService.kt      | 2 +-
 server-generator/src/test/golden/singleMethodService.kt         | 2 +-
 server-generator/src/test/golden/unitService.kt                 | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/server-generator/src/main/java/com/squareup/wire/kotlin/grpcserver/ImplBaseGenerator.kt b/server-generator/src/main/java/com/squareup/wire/kotlin/grpcserver/ImplBaseGenerator.kt
index bb5d84a..403ca46 100644
--- a/server-generator/src/main/java/com/squareup/wire/kotlin/grpcserver/ImplBaseGenerator.kt
+++ b/server-generator/src/main/java/com/squareup/wire/kotlin/grpcserver/ImplBaseGenerator.kt
@@ -134,7 +134,7 @@ object ImplBaseGenerator {
 
         builder.addFunction(
             FunSpec.builder("bindService")
-                .addModifiers(KModifier.OVERRIDE)
+                .addModifiers(KModifier.OVERRIDE, KModifier.FINAL)
                 .returns(ClassName("io.grpc", "ServerServiceDefinition"))
                 .addCode(bindServiceCodeBlock(service, options))
                 .build(),
diff --git a/server-generator/src/test/golden/ImplBase.kt b/server-generator/src/test/golden/ImplBase.kt
index ed50a75..c192ea1 100644
--- a/server-generator/src/test/golden/ImplBase.kt
+++ b/server-generator/src/test/golden/ImplBase.kt
@@ -28,7 +28,7 @@ public class RouteGuideWireGrpc {
     public open fun RouteChat(response: StreamObserver<RouteNote>): StreamObserver<RouteNote> =
         throw UnsupportedOperationException()
 
-    override fun bindService(): ServerServiceDefinition =
+    final override fun bindService(): ServerServiceDefinition =
         ServerServiceDefinition.builder(getServiceDescriptor()).addMethod(
               getGetFeatureMethod(),
               asyncUnaryCall(this@RouteGuideImplBase::GetFeature)
diff --git a/server-generator/src/test/golden/RouteGuideWireGrpc.kt b/server-generator/src/test/golden/RouteGuideWireGrpc.kt
index 1eb0e9b..401063f 100644
--- a/server-generator/src/test/golden/RouteGuideWireGrpc.kt
+++ b/server-generator/src/test/golden/RouteGuideWireGrpc.kt
@@ -224,7 +224,7 @@ public object RouteGuideWireGrpc {
     public open fun RouteChat(response: StreamObserver<RouteNote>): StreamObserver<RouteNote> =
         throw UnsupportedOperationException()
 
-    override fun bindService(): ServerServiceDefinition =
+    final override fun bindService(): ServerServiceDefinition =
         ServerServiceDefinition.builder(getServiceDescriptor()).addMethod(
               getGetFeatureMethod(),
               serverCallsAsyncUnaryCall(this@RouteGuideImplBase::GetFeature)
diff --git a/server-generator/src/test/golden/nonSingleMethodService.kt b/server-generator/src/test/golden/nonSingleMethodService.kt
index 7246a7c..a1d326f 100644
--- a/server-generator/src/test/golden/nonSingleMethodService.kt
+++ b/server-generator/src/test/golden/nonSingleMethodService.kt
@@ -145,7 +145,7 @@ public object FooServiceWireGrpc {
     public open fun Call2(request: Request, response: StreamObserver<Response>): Unit = throw
         UnsupportedOperationException()
 
-    override fun bindService(): ServerServiceDefinition =
+    final override fun bindService(): ServerServiceDefinition =
         ServerServiceDefinition.builder(getServiceDescriptor()).addMethod(
               getCall1Method(),
               serverCallsAsyncUnaryCall(this@FooServiceImplBase::Call1)
diff --git a/server-generator/src/test/golden/singleMethodService.kt b/server-generator/src/test/golden/singleMethodService.kt
index 401b121..d2a9efa 100644
--- a/server-generator/src/test/golden/singleMethodService.kt
+++ b/server-generator/src/test/golden/singleMethodService.kt
@@ -145,7 +145,7 @@ public object FooServiceWireGrpc {
     public open fun Call2(request: Request, response: StreamObserver<Response>): Unit = throw
         UnsupportedOperationException()
 
-    override fun bindService(): ServerServiceDefinition =
+    final override fun bindService(): ServerServiceDefinition =
         ServerServiceDefinition.builder(getServiceDescriptor()).addMethod(
               getCall1Method(),
               serverCallsAsyncUnaryCall(this@FooServiceImplBase::Call1)
diff --git a/server-generator/src/test/golden/unitService.kt b/server-generator/src/test/golden/unitService.kt
index cc1047d..52fddbe 100644
--- a/server-generator/src/test/golden/unitService.kt
+++ b/server-generator/src/test/golden/unitService.kt
@@ -115,7 +115,7 @@ public object MyServiceWireGrpc {
   ) : WireBindableService {
     public open suspend fun doSomething(request: Unit): Unit = throw UnsupportedOperationException()
 
-    override fun bindService(): ServerServiceDefinition =
+    final override fun bindService(): ServerServiceDefinition =
         ServerServiceDefinition.builder(getServiceDescriptor()).addMethod(
                io.grpc.kotlin.ServerCalls.unaryServerMethodDefinition(
                  context = context,