Adds new conformance/client module

Makefile

@@ -74,6 +74,8 @@ generate: $(PROTOC) buildplugin generateconformance generateexamples ## Generate
 .PHONY: generateconformance
 generateconformance: $(PROTOC) buildplugin ## Generate protofiles for conformance tests.
 	buf generate --template conformance/buf.gen.yaml -o conformance conformance/proto
+	buf generate --template conformance/client/buf.gen.yaml -o conformance/client buf.build/connectrpc/conformance:v1.0.0-rc1
+	buf generate --template conformance/client/buf.gen.lite.yaml -o conformance/client buf.build/connectrpc/conformance:v1.0.0-rc1
 
 .PHONY: generateexamples
 generateexamples: $(PROTOC) buildplugin ## Generate proto files for example apps.

conformance/client/buf.gen.lite.yaml

@@ -0,0 +1,20 @@
+version: v1
+managed:
+  enabled: true
+  java_package_prefix: com.connectrpc.lite
+plugins:
+  - plugin: connect-kotlin
+    out: build/generated/sources/bufgen
+    path: ./protoc-gen-connect-kotlin/build/install/protoc-gen-connect-kotlin/bin/protoc-gen-connect-kotlin
+    opt:
+      - generateCallbackMethods=true
+      - generateCoroutineMethods=true
+      - generateBlockingUnaryMethods=true
+  - plugin: java
+    out: build/generated/sources/bufgen
+    protoc_path: .tmp/bin/protoc
+    opt: lite
+  - plugin: kotlin
+    out: build/generated/sources/bufgen
+    protoc_path: .tmp/bin/protoc
+    opt: lite

conformance/client/buf.gen.yaml

@@ -0,0 +1,17 @@
+version: v1
+managed:
+  enabled: true
+plugins:
+  - plugin: connect-kotlin
+    out: google-java/build/generated/sources/bufgen
+    path: ./protoc-gen-connect-kotlin/build/install/protoc-gen-connect-kotlin/bin/protoc-gen-connect-kotlin
+    opt:
+      - generateCallbackMethods=true
+      - generateCoroutineMethods=true
+      - generateBlockingUnaryMethods=true
+  - plugin: java
+    out: google-java/build/generated/sources/bufgen
+    protoc_path: .tmp/bin/protoc
+  - plugin: kotlin
+    out: google-java/build/generated/sources/bufgen
+    protoc_path: .tmp/bin/protoc

conformance/client/build.gradle.kts

@@ -0,0 +1,39 @@
+plugins {
+    kotlin("jvm")
+}
+
+// This base project contains generated code for the lite runtime
+// and depends on the Google Protobuf Java Lite runtime.
+// The main client logic is implemented in terms of generated
+// code for that lite runtime.
+//
+// The non-lite runtime excludes the Google Protobuf Java Lite
+// runtime and instead uses the full Java runtime. It then can
+// adapt from the lite-runtime-generated code by serializing to
+// bytes and then de-serializing into non-lite-generated types.
+
+sourceSets {
+    main {
+        java {
+            srcDir("build/generated/sources/bufgen")
+        }
+    }
+}
+
+tasks {
+    compileKotlin {
+        kotlinOptions {
+            // Generated Kotlin code for protobufs uses RequiresOptIn annotation
+            freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
+        }
+    }
+}
+
+dependencies {
+    implementation(project(":okhttp"))
+    implementation(libs.kotlin.coroutines.core)
+    implementation(libs.protobuf.kotlin)
+    implementation(libs.protobuf.javalite)
+    implementation(libs.okio.core)
+    implementation(libs.okhttp.tls)
+}

conformance/client/google-java/build.gradle.kts

@@ -0,0 +1,55 @@
+buildscript {
+    repositories {
+        mavenCentral()
+        gradlePluginPortal()
+    }
+    dependencies {
+        classpath("gradle.plugin.com.github.johnrengelman:shadow:7.1.2")
+    }
+}
+
+plugins {
+    kotlin("jvm")
+    id("com.github.johnrengelman.shadow").version("7.1.2")
+}
+
+tasks {
+    compileKotlin {
+        kotlinOptions {
+            // Generated Kotlin code for protobufs uses OptIn annotation
+            freeCompilerArgs += "-opt-in=kotlin.RequiresOptIn"
+        }
+    }
+    shadowJar {
+        archiveBaseName.set("shadow")
+        manifest {
+            attributes(mapOf("Main-Class" to "com.connectrpc.conformance.client.java.MainKt"))
+        }
+    }
+    build {
+        dependsOn(shadowJar)
+    }
+}
+
+// This project contains an alternate copy of the generated
+// types, generated for the non-lite runtime.
+sourceSets {
+    main {
+        java {
+            srcDir("build/generated/sources/bufgen")
+        }
+    }
+}
+
+dependencies {
+    implementation(project(":conformance:client")) {
+        exclude(group = "com.google.protobuf", module = "protobuf-javalite")
+    }
+    implementation(project(":extensions:google-java"))
+    implementation(project(":okhttp"))
+    implementation(libs.kotlin.coroutines.core)
+    implementation(libs.protobuf.kotlin)
+    implementation(libs.protobuf.java)
+    implementation(libs.okio.core)
+    implementation(libs.okhttp.tls)
+}

conformance/client/google-java/src/main/kotlin/com/connectrpc/conformance/client/java/JavaBidiStreamClient.kt

@@ -0,0 +1,32 @@
+// Copyright 2022-2023 The Connect Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.connectrpc.conformance.client.java
+
+import com.connectrpc.Headers
+import com.connectrpc.conformance.client.adapt.BidiStreamClient
+import com.connectrpc.conformance.v1.BidiStreamRequest
+import com.connectrpc.conformance.v1.BidiStreamResponse
+import com.connectrpc.conformance.v1.ConformanceServiceClient
+
+class JavaBidiStreamClient(
+    private val client: ConformanceServiceClient,
+) : BidiStreamClient<BidiStreamRequest, BidiStreamResponse>(
+    BidiStreamRequest.getDefaultInstance(),
+    BidiStreamResponse.getDefaultInstance(),
+) {
+    override suspend fun execute(headers: Headers): BidiStream<BidiStreamRequest, BidiStreamResponse> {
+        return BidiStream.new(client.bidiStream(headers))
+    }
+}

conformance/client/google-java/src/main/kotlin/com/connectrpc/conformance/client/java/JavaClientStreamClient.kt

@@ -0,0 +1,32 @@
+// Copyright 2022-2023 The Connect Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.connectrpc.conformance.client.java
+
+import com.connectrpc.Headers
+import com.connectrpc.conformance.client.adapt.ClientStreamClient
+import com.connectrpc.conformance.v1.ClientStreamRequest
+import com.connectrpc.conformance.v1.ClientStreamResponse
+import com.connectrpc.conformance.v1.ConformanceServiceClient
+
+class JavaClientStreamClient(
+    private val client: ConformanceServiceClient,
+) : ClientStreamClient<ClientStreamRequest, ClientStreamResponse>(
+    ClientStreamRequest.getDefaultInstance(),
+    ClientStreamResponse.getDefaultInstance(),
+) {
+    override suspend fun execute(headers: Headers): ClientStream<ClientStreamRequest, ClientStreamResponse> {
+        return ClientStream.new(client.clientStream(headers))
+    }
+}

conformance/client/google-java/src/main/kotlin/com/connectrpc/conformance/client/java/JavaInvoker.kt

@@ -0,0 +1,62 @@
+// Copyright 2022-2023 The Connect Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.connectrpc.conformance.client.java
+
+import com.connectrpc.SerializationStrategy
+import com.connectrpc.conformance.client.adapt.BidiStreamClient
+import com.connectrpc.conformance.client.adapt.ClientStreamClient
+import com.connectrpc.conformance.client.adapt.Invoker
+import com.connectrpc.conformance.client.adapt.ServerStreamClient
+import com.connectrpc.conformance.client.adapt.UnaryClient
+import com.connectrpc.conformance.v1.ConformanceServiceClient
+import com.connectrpc.extensions.GoogleJavaJSONStrategy
+import com.connectrpc.extensions.GoogleJavaProtobufStrategy
+import com.connectrpc.impl.ProtocolClient
+import com.connectrpc.lite.connectrpc.conformance.v1.Codec
+
+class JavaInvoker(
+    protocolClient: ProtocolClient,
+) : Invoker {
+    private val client = ConformanceServiceClient(protocolClient)
+    override fun unaryClient(): UnaryClient<*, *> {
+        return JavaUnaryClient(client)
+    }
+
+    override fun unimplementedClient(): UnaryClient<*, *> {
+        return JavaUnimplementedClient(client)
+    }
+
+    override fun clientStreamClient(): ClientStreamClient<*, *> {
+        return JavaClientStreamClient(client)
+    }
+
+    override fun serverStreamClient(): ServerStreamClient<*, *> {
+        return JavaServerStreamClient(client)
+    }
+
+    override fun bidiStreamClient(): BidiStreamClient<*, *> {
+        return JavaBidiStreamClient(client)
+    }
+
+    companion object {
+        fun serializationStrategy(codec: Codec): SerializationStrategy {
+            return when (codec) {
+                Codec.CODEC_PROTO -> GoogleJavaProtobufStrategy()
+                Codec.CODEC_JSON -> GoogleJavaJSONStrategy()
+                else -> throw RuntimeException("unsupported codec $codec")
+            }
+        }
+    }
+}

conformance/client/google-java/src/main/kotlin/com/connectrpc/conformance/client/java/JavaServerStreamClient.kt

@@ -0,0 +1,35 @@
+// Copyright 2022-2023 The Connect Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.connectrpc.conformance.client.java
+
+import com.connectrpc.Headers
+import com.connectrpc.conformance.client.adapt.ResponseStream
+import com.connectrpc.conformance.client.adapt.ServerStreamClient
+import com.connectrpc.conformance.v1.ConformanceServiceClient
+import com.connectrpc.conformance.v1.ServerStreamRequest
+import com.connectrpc.conformance.v1.ServerStreamResponse
+
+class JavaServerStreamClient(
+    private val client: ConformanceServiceClient,
+) : ServerStreamClient<ServerStreamRequest, ServerStreamResponse>(
+    ServerStreamRequest.getDefaultInstance(),
+    ServerStreamResponse.getDefaultInstance(),
+) {
+    override suspend fun execute(req: ServerStreamRequest, headers: Headers): ResponseStream<ServerStreamResponse> {
+        val stream = client.serverStream(headers)
+        stream.sendAndClose(req)
+        return ResponseStream.new(stream)
+    }
+}

conformance/client/google-java/src/main/kotlin/com/connectrpc/conformance/client/java/JavaUnaryClient.kt

@@ -0,0 +1,47 @@
+// Copyright 2022-2023 The Connect Authors
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.connectrpc.conformance.client.java
+
+import com.connectrpc.Headers
+import com.connectrpc.ResponseMessage
+import com.connectrpc.UnaryBlockingCall
+import com.connectrpc.conformance.client.adapt.UnaryClient
+import com.connectrpc.conformance.v1.ConformanceServiceClient
+import com.connectrpc.conformance.v1.UnaryRequest
+import com.connectrpc.conformance.v1.UnaryResponse
+import com.connectrpc.http.Cancelable
+
+class JavaUnaryClient(
+    private val client: ConformanceServiceClient,
+) : UnaryClient<UnaryRequest, UnaryResponse>(
+    UnaryRequest.getDefaultInstance(),
+    UnaryResponse.getDefaultInstance(),
+) {
+    override suspend fun execute(req: UnaryRequest, headers: Headers): ResponseMessage<UnaryResponse> {
+        return client.unary(req, headers)
+    }
+
+    override fun execute(
+        req: UnaryRequest,
+        headers: Headers,
+        onFinish: (ResponseMessage<UnaryResponse>) -> Unit,
+    ): Cancelable {
+        return client.unary(req, headers, onFinish)
+    }
+
+    override fun blocking(req: UnaryRequest, headers: Headers): UnaryBlockingCall<UnaryResponse> {
+        return client.unaryBlocking(req, headers)
+    }
+}