Skip to content

Commit c28adb2

Browse files
BlockingStub type was not extending BlockingStub.
1 parent 82a9322 commit c28adb2

3 files changed

Lines changed: 16 additions & 6 deletions

File tree

gradle.properties

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
org.gradle.jvmargs='-Dfile.encoding=UTF-8'
22

3-
GROUP=com.squareup.wiregrpcserver
4-
VERSION_NAME=1.1.0-SNAPSHOT
3+
GROUP=com.pkware.squareup.wiregrpcserver
4+
VERSION_NAME=1.1.0
55

66
# Publishing SHA 256 and 512 hashes of maven-metadata is not supported by Sonatype and Nexus.
77
# See https://github.com/gradle/gradle/issues/11308 and https://issues.sonatype.org/browse/NEXUS-21802

server-generator/src/main/java/com/squareup/wire/kotlin/grpcserver/BlockingStubGenerator.kt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ object BlockingStubGenerator {
5656
this,
5757
service,
5858
ClassName("io.grpc.stub", "AbstractStub"),
59+
true,
5960
)
6061
}
6162
.addBlockingStubRpcCalls(generator, service)

server-generator/src/main/java/com/squareup/wire/kotlin/grpcserver/StubGenerator.kt

Lines changed: 13 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,7 @@ object StubGenerator {
6868
this,
6969
service,
7070
ClassName("io.grpc.kotlin", "AbstractCoroutineStub"),
71+
false,
7172
)
7273
addSuspendedStubRpcCalls(generator, this, service, options)
7374
}
@@ -98,7 +99,13 @@ object StubGenerator {
9899
.addType(
99100
TypeSpec.classBuilder(stubClassName)
100101
.apply {
101-
addAbstractStubConstructor(generator, this, service, ClassName("io.grpc.stub", "AbstractStub"))
102+
addAbstractStubConstructor(
103+
generator,
104+
this,
105+
service,
106+
ClassName("io.grpc.stub", "AbstractStub"),
107+
false
108+
)
102109
addStubRpcCalls(generator, this, service, options)
103110
}
104111
.build(),
@@ -110,12 +117,14 @@ object StubGenerator {
110117
builder: TypeSpec.Builder,
111118
service: Service,
112119
superClass: ClassName,
120+
blockingStub: Boolean,
113121
): TypeSpec.Builder {
122+
val stubType = if(blockingStub) "Blocking" else ""
114123
val serviceClassName = generator.classNameFor(service.type)
115124
val stubClassName = ClassName(
116125
packageName = serviceClassName.packageName,
117126
"${serviceClassName.simpleName}WireGrpc",
118-
"${serviceClassName.simpleName}Stub",
127+
"${serviceClassName.simpleName}${stubType}Stub",
119128
)
120129
return builder
121130
// Really this is a superclass, just want to add secondary constructors.
@@ -140,8 +149,8 @@ object StubGenerator {
140149
.addModifiers(KModifier.OVERRIDE)
141150
.addParameter("channel", ClassName("io.grpc", "Channel"))
142151
.addParameter("callOptions", ClassName("io.grpc", "CallOptions"))
143-
.addStatement("return ${service.name}Stub(channel, callOptions)")
144-
.returns(ClassName("", "${service.name}Stub"))
152+
.addStatement("return ${service.name}${stubType}Stub(channel, callOptions)")
153+
.returns(ClassName("", "${service.name}${stubType}Stub"))
145154
.build(),
146155
)
147156
}

0 commit comments

Comments
 (0)