Skip to content

Commit 0fff264

Browse files
Merge branch 'grpc:master' into Issue_fixed_6868
2 parents b151cb0 + ca99a8c commit 0fff264

144 files changed

Lines changed: 3292 additions & 2984 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

MODULE.bazel

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ module(
22
name = "grpc-java",
33
compatibility_level = 0,
44
repo_name = "io_grpc_grpc_java",
5-
version = "1.74.0-SNAPSHOT", # CURRENT_GRPC_VERSION
5+
version = "1.75.0-SNAPSHOT", # CURRENT_GRPC_VERSION
66
)
77

88
# GRPC_DEPS_START

README.md

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -44,8 +44,8 @@ For a guided tour, take a look at the [quick start
4444
guide](https://grpc.io/docs/languages/java/quickstart) or the more explanatory [gRPC
4545
basics](https://grpc.io/docs/languages/java/basics).
4646

47-
The [examples](https://github.com/grpc/grpc-java/tree/v1.72.0/examples) and the
48-
[Android example](https://github.com/grpc/grpc-java/tree/v1.72.0/examples/android)
47+
The [examples](https://github.com/grpc/grpc-java/tree/v1.73.0/examples) and the
48+
[Android example](https://github.com/grpc/grpc-java/tree/v1.73.0/examples/android)
4949
are standalone projects that showcase the usage of gRPC.
5050

5151
Download
@@ -56,18 +56,18 @@ Download [the JARs][]. Or for Maven with non-Android, add to your `pom.xml`:
5656
<dependency>
5757
<groupId>io.grpc</groupId>
5858
<artifactId>grpc-netty-shaded</artifactId>
59-
<version>1.72.0</version>
59+
<version>1.73.0</version>
6060
<scope>runtime</scope>
6161
</dependency>
6262
<dependency>
6363
<groupId>io.grpc</groupId>
6464
<artifactId>grpc-protobuf</artifactId>
65-
<version>1.72.0</version>
65+
<version>1.73.0</version>
6666
</dependency>
6767
<dependency>
6868
<groupId>io.grpc</groupId>
6969
<artifactId>grpc-stub</artifactId>
70-
<version>1.72.0</version>
70+
<version>1.73.0</version>
7171
</dependency>
7272
<dependency> <!-- necessary for Java 9+ -->
7373
<groupId>org.apache.tomcat</groupId>
@@ -79,18 +79,18 @@ Download [the JARs][]. Or for Maven with non-Android, add to your `pom.xml`:
7979

8080
Or for Gradle with non-Android, add to your dependencies:
8181
```gradle
82-
runtimeOnly 'io.grpc:grpc-netty-shaded:1.72.0'
83-
implementation 'io.grpc:grpc-protobuf:1.72.0'
84-
implementation 'io.grpc:grpc-stub:1.72.0'
82+
runtimeOnly 'io.grpc:grpc-netty-shaded:1.73.0'
83+
implementation 'io.grpc:grpc-protobuf:1.73.0'
84+
implementation 'io.grpc:grpc-stub:1.73.0'
8585
compileOnly 'org.apache.tomcat:annotations-api:6.0.53' // necessary for Java 9+
8686
```
8787

8888
For Android client, use `grpc-okhttp` instead of `grpc-netty-shaded` and
8989
`grpc-protobuf-lite` instead of `grpc-protobuf`:
9090
```gradle
91-
implementation 'io.grpc:grpc-okhttp:1.72.0'
92-
implementation 'io.grpc:grpc-protobuf-lite:1.72.0'
93-
implementation 'io.grpc:grpc-stub:1.72.0'
91+
implementation 'io.grpc:grpc-okhttp:1.73.0'
92+
implementation 'io.grpc:grpc-protobuf-lite:1.73.0'
93+
implementation 'io.grpc:grpc-stub:1.73.0'
9494
compileOnly 'org.apache.tomcat:annotations-api:6.0.53' // necessary for Java 9+
9595
```
9696

@@ -99,10 +99,10 @@ For [Bazel](https://bazel.build), you can either
9999
(with the GAVs from above), or use `@io_grpc_grpc_java//api` et al (see below).
100100

101101
[the JARs]:
102-
https://search.maven.org/search?q=g:io.grpc%20AND%20v:1.72.0
102+
https://search.maven.org/search?q=g:io.grpc%20AND%20v:1.73.0
103103

104104
Development snapshots are available in [Sonatypes's snapshot
105-
repository](https://oss.sonatype.org/content/repositories/snapshots/).
105+
repository](https://central.sonatype.com/repository/maven-snapshots/).
106106

107107
Generated Code
108108
--------------
@@ -131,7 +131,7 @@ For protobuf-based codegen integrated with the Maven build system, you can use
131131
<configuration>
132132
<protocArtifact>com.google.protobuf:protoc:3.25.5:exe:${os.detected.classifier}</protocArtifact>
133133
<pluginId>grpc-java</pluginId>
134-
<pluginArtifact>io.grpc:protoc-gen-grpc-java:1.72.0:exe:${os.detected.classifier}</pluginArtifact>
134+
<pluginArtifact>io.grpc:protoc-gen-grpc-java:1.73.0:exe:${os.detected.classifier}</pluginArtifact>
135135
</configuration>
136136
<executions>
137137
<execution>
@@ -161,7 +161,7 @@ protobuf {
161161
}
162162
plugins {
163163
grpc {
164-
artifact = 'io.grpc:protoc-gen-grpc-java:1.72.0'
164+
artifact = 'io.grpc:protoc-gen-grpc-java:1.73.0'
165165
}
166166
}
167167
generateProtoTasks {
@@ -194,7 +194,7 @@ protobuf {
194194
}
195195
plugins {
196196
grpc {
197-
artifact = 'io.grpc:protoc-gen-grpc-java:1.72.0'
197+
artifact = 'io.grpc:protoc-gen-grpc-java:1.73.0'
198198
}
199199
}
200200
generateProtoTasks {

RELEASING.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ Tagging the Release
160160
repository can then be `released`, which will begin the process of pushing
161161
the new artifacts to Maven Central (the staging repository will be destroyed
162162
in the process). You can see the complete process for releasing to Maven
163-
Central on the [OSSRH site](https://central.sonatype.org/pages/releasing-the-deployment.html).
163+
Central on the [OSSRH site](https://central.sonatype.org/publish/publish-portal-ossrh-staging-api/#deploying).
164164

165165
10. We have containers for each release to detect compatibility regressions with
166166
old releases. Generate one for the new release by following the [GCR image

android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/LoadBalancerStatsServiceGrpc.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -242,8 +242,8 @@ protected LoadBalancerStatsServiceBlockingV2Stub build(
242242
* Gets the backend distribution for RPCs sent by a test client.
243243
* </pre>
244244
*/
245-
public io.grpc.testing.integration.Messages.LoadBalancerStatsResponse getClientStats(io.grpc.testing.integration.Messages.LoadBalancerStatsRequest request) {
246-
return io.grpc.stub.ClientCalls.blockingUnaryCall(
245+
public io.grpc.testing.integration.Messages.LoadBalancerStatsResponse getClientStats(io.grpc.testing.integration.Messages.LoadBalancerStatsRequest request) throws io.grpc.StatusException {
246+
return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
247247
getChannel(), getGetClientStatsMethod(), getCallOptions(), request);
248248
}
249249

@@ -252,8 +252,8 @@ public io.grpc.testing.integration.Messages.LoadBalancerStatsResponse getClientS
252252
* Gets the accumulated stats for RPCs sent by a test client.
253253
* </pre>
254254
*/
255-
public io.grpc.testing.integration.Messages.LoadBalancerAccumulatedStatsResponse getClientAccumulatedStats(io.grpc.testing.integration.Messages.LoadBalancerAccumulatedStatsRequest request) {
256-
return io.grpc.stub.ClientCalls.blockingUnaryCall(
255+
public io.grpc.testing.integration.Messages.LoadBalancerAccumulatedStatsResponse getClientAccumulatedStats(io.grpc.testing.integration.Messages.LoadBalancerAccumulatedStatsRequest request) throws io.grpc.StatusException {
256+
return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
257257
getChannel(), getGetClientAccumulatedStatsMethod(), getCallOptions(), request);
258258
}
259259
}

android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/MetricsServiceGrpc.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -242,8 +242,8 @@ protected MetricsServiceBlockingV2Stub build(
242242
* Returns the value of one gauge
243243
* </pre>
244244
*/
245-
public io.grpc.testing.integration.Metrics.GaugeResponse getGauge(io.grpc.testing.integration.Metrics.GaugeRequest request) {
246-
return io.grpc.stub.ClientCalls.blockingUnaryCall(
245+
public io.grpc.testing.integration.Metrics.GaugeResponse getGauge(io.grpc.testing.integration.Metrics.GaugeRequest request) throws io.grpc.StatusException {
246+
return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
247247
getChannel(), getGetGaugeMethod(), getCallOptions(), request);
248248
}
249249
}

android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/ReconnectServiceGrpc.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -227,15 +227,15 @@ protected ReconnectServiceBlockingV2Stub build(
227227

228228
/**
229229
*/
230-
public io.grpc.testing.integration.EmptyProtos.Empty start(io.grpc.testing.integration.Messages.ReconnectParams request) {
231-
return io.grpc.stub.ClientCalls.blockingUnaryCall(
230+
public io.grpc.testing.integration.EmptyProtos.Empty start(io.grpc.testing.integration.Messages.ReconnectParams request) throws io.grpc.StatusException {
231+
return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
232232
getChannel(), getStartMethod(), getCallOptions(), request);
233233
}
234234

235235
/**
236236
*/
237-
public io.grpc.testing.integration.Messages.ReconnectInfo stop(io.grpc.testing.integration.EmptyProtos.Empty request) {
238-
return io.grpc.stub.ClientCalls.blockingUnaryCall(
237+
public io.grpc.testing.integration.Messages.ReconnectInfo stop(io.grpc.testing.integration.EmptyProtos.Empty request) throws io.grpc.StatusException {
238+
return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
239239
getChannel(), getStopMethod(), getCallOptions(), request);
240240
}
241241
}

android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/TestServiceGrpc.java

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -573,8 +573,8 @@ protected TestServiceBlockingV2Stub build(
573573
* One empty request followed by one empty response.
574574
* </pre>
575575
*/
576-
public io.grpc.testing.integration.EmptyProtos.Empty emptyCall(io.grpc.testing.integration.EmptyProtos.Empty request) {
577-
return io.grpc.stub.ClientCalls.blockingUnaryCall(
576+
public io.grpc.testing.integration.EmptyProtos.Empty emptyCall(io.grpc.testing.integration.EmptyProtos.Empty request) throws io.grpc.StatusException {
577+
return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
578578
getChannel(), getEmptyCallMethod(), getCallOptions(), request);
579579
}
580580

@@ -583,8 +583,8 @@ public io.grpc.testing.integration.EmptyProtos.Empty emptyCall(io.grpc.testing.i
583583
* One request followed by one response.
584584
* </pre>
585585
*/
586-
public io.grpc.testing.integration.Messages.SimpleResponse unaryCall(io.grpc.testing.integration.Messages.SimpleRequest request) {
587-
return io.grpc.stub.ClientCalls.blockingUnaryCall(
586+
public io.grpc.testing.integration.Messages.SimpleResponse unaryCall(io.grpc.testing.integration.Messages.SimpleRequest request) throws io.grpc.StatusException {
587+
return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
588588
getChannel(), getUnaryCallMethod(), getCallOptions(), request);
589589
}
590590

@@ -595,8 +595,8 @@ public io.grpc.testing.integration.Messages.SimpleResponse unaryCall(io.grpc.tes
595595
* satisfy subsequent requests.
596596
* </pre>
597597
*/
598-
public io.grpc.testing.integration.Messages.SimpleResponse cacheableUnaryCall(io.grpc.testing.integration.Messages.SimpleRequest request) {
599-
return io.grpc.stub.ClientCalls.blockingUnaryCall(
598+
public io.grpc.testing.integration.Messages.SimpleResponse cacheableUnaryCall(io.grpc.testing.integration.Messages.SimpleRequest request) throws io.grpc.StatusException {
599+
return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
600600
getChannel(), getCacheableUnaryCallMethod(), getCallOptions(), request);
601601
}
602602

@@ -661,8 +661,8 @@ public io.grpc.testing.integration.Messages.SimpleResponse cacheableUnaryCall(io
661661
* to test the behavior when clients call unimplemented methods.
662662
* </pre>
663663
*/
664-
public io.grpc.testing.integration.EmptyProtos.Empty unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty request) {
665-
return io.grpc.stub.ClientCalls.blockingUnaryCall(
664+
public io.grpc.testing.integration.EmptyProtos.Empty unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty request) throws io.grpc.StatusException {
665+
return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
666666
getChannel(), getUnimplementedCallMethod(), getCallOptions(), request);
667667
}
668668
}

android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/UnimplementedServiceGrpc.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -196,8 +196,8 @@ protected UnimplementedServiceBlockingV2Stub build(
196196
* A call that no server should implement
197197
* </pre>
198198
*/
199-
public io.grpc.testing.integration.EmptyProtos.Empty unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty request) {
200-
return io.grpc.stub.ClientCalls.blockingUnaryCall(
199+
public io.grpc.testing.integration.EmptyProtos.Empty unimplementedCall(io.grpc.testing.integration.EmptyProtos.Empty request) throws io.grpc.StatusException {
200+
return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
201201
getChannel(), getUnimplementedCallMethod(), getCallOptions(), request);
202202
}
203203
}

android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateClientConfigureServiceGrpc.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -191,8 +191,8 @@ protected XdsUpdateClientConfigureServiceBlockingV2Stub build(
191191
* Update the tes client's configuration.
192192
* </pre>
193193
*/
194-
public io.grpc.testing.integration.Messages.ClientConfigureResponse configure(io.grpc.testing.integration.Messages.ClientConfigureRequest request) {
195-
return io.grpc.stub.ClientCalls.blockingUnaryCall(
194+
public io.grpc.testing.integration.Messages.ClientConfigureResponse configure(io.grpc.testing.integration.Messages.ClientConfigureRequest request) throws io.grpc.StatusException {
195+
return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
196196
getChannel(), getConfigureMethod(), getCallOptions(), request);
197197
}
198198
}

android-interop-testing/src/generated/debug/grpc/io/grpc/testing/integration/XdsUpdateHealthServiceGrpc.java

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -227,15 +227,15 @@ protected XdsUpdateHealthServiceBlockingV2Stub build(
227227

228228
/**
229229
*/
230-
public io.grpc.testing.integration.EmptyProtos.Empty setServing(io.grpc.testing.integration.EmptyProtos.Empty request) {
231-
return io.grpc.stub.ClientCalls.blockingUnaryCall(
230+
public io.grpc.testing.integration.EmptyProtos.Empty setServing(io.grpc.testing.integration.EmptyProtos.Empty request) throws io.grpc.StatusException {
231+
return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
232232
getChannel(), getSetServingMethod(), getCallOptions(), request);
233233
}
234234

235235
/**
236236
*/
237-
public io.grpc.testing.integration.EmptyProtos.Empty setNotServing(io.grpc.testing.integration.EmptyProtos.Empty request) {
238-
return io.grpc.stub.ClientCalls.blockingUnaryCall(
237+
public io.grpc.testing.integration.EmptyProtos.Empty setNotServing(io.grpc.testing.integration.EmptyProtos.Empty request) throws io.grpc.StatusException {
238+
return io.grpc.stub.ClientCalls.blockingV2UnaryCall(
239239
getChannel(), getSetNotServingMethod(), getCallOptions(), request);
240240
}
241241
}

0 commit comments

Comments
 (0)