diff --git a/coverage-report/pom.xml b/coverage-report/pom.xml
index a7017d8f3d..f64f5a2def 100644
--- a/coverage-report/pom.xml
+++ b/coverage-report/pom.xml
@@ -31,17 +31,17 @@
com.google.api
gax
- 2.63.2-SNAPSHOT
+ protobuf-shading-v1
com.google.api
gax-grpc
- 2.63.2-SNAPSHOT
+ protobuf-shading-v1
com.google.api
gax-httpjson
- 2.63.2-SNAPSHOT
+ protobuf-shading-v1
com.google.api
diff --git a/gapic-generator-java-bom/pom.xml b/gapic-generator-java-bom/pom.xml
index 5c053ea240..bf092da678 100644
--- a/gapic-generator-java-bom/pom.xml
+++ b/gapic-generator-java-bom/pom.xml
@@ -80,7 +80,7 @@
com.google.api
gax-bom
- 2.63.2-SNAPSHOT
+ protobuf-shading-v1
pom
import
@@ -92,44 +92,44 @@
com.google.api.grpc
grpc-google-common-protos
- 2.54.2-SNAPSHOT
+ protobuf-shading-v1
com.google.api.grpc
proto-google-common-protos
- 2.54.2-SNAPSHOT
+ protobuf-shading-v1
com.google.api.grpc
proto-google-iam-v1
- 1.49.2-SNAPSHOT
+ protobuf-shading-v1
com.google.api.grpc
proto-google-iam-v2
- 1.49.2-SNAPSHOT
+ protobuf-shading-v1
com.google.api.grpc
proto-google-iam-v2beta
- 1.49.2-SNAPSHOT
+ protobuf-shading-v1
com.google.api.grpc
grpc-google-iam-v1
- 1.49.2-SNAPSHOT
+ protobuf-shading-v1
com.google.api.grpc
grpc-google-iam-v2
- 1.49.2-SNAPSHOT
+ protobuf-shading-v1
com.google.api.grpc
grpc-google-iam-v2beta
- 1.49.2-SNAPSHOT
+ protobuf-shading-v1
diff --git a/gapic-generator-java-pom-parent/pom.xml b/gapic-generator-java-pom-parent/pom.xml
index 304fa698a9..495925eaed 100644
--- a/gapic-generator-java-pom-parent/pom.xml
+++ b/gapic-generator-java-pom-parent/pom.xml
@@ -15,7 +15,7 @@
com.google.cloud
google-cloud-shared-config
- 1.15.1
+ 1.15.1-SNAPSHOT
diff --git a/gapic-generator-java/pom.xml b/gapic-generator-java/pom.xml
index 4497f4b1ec..ca210bb6c7 100644
--- a/gapic-generator-java/pom.xml
+++ b/gapic-generator-java/pom.xml
@@ -385,6 +385,7 @@
com.google.api
gax
+ protobuf-shading-v1
com.google.api
@@ -392,10 +393,12 @@
test-jar
testlib
+ protobuf-shading-v1
com.google.api
gax-grpc
+ protobuf-shading-v1
com.google.api
@@ -403,10 +406,12 @@
test-jar
testlib
+ protobuf-shading-v1
com.google.api
gax-httpjson
+ protobuf-shading-v1
com.google.api
@@ -414,6 +419,7 @@
test-jar
testlib
+ protobuf-shading-v1
com.google.auto.value
@@ -423,6 +429,12 @@
com.google.protobuf
protobuf-java-util
+
+
+ com.google.protobuf
+ protobuf-java
+
+
io.grpc
@@ -431,6 +443,21 @@
io.grpc
grpc-protobuf
+
+
+ com.google.protobuf
+ protobuf-java
+
+
+ com.google.api.grpc
+ proto-google-common-protos
+
+
+
+
+ org.example
+ protobuf-sdk
+ latest-1.0-SNAPSHOT
org.yaml
diff --git a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientTestClassComposer.java b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientTestClassComposer.java
index d4bf61034c..5071cdff09 100644
--- a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientTestClassComposer.java
+++ b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientTestClassComposer.java
@@ -60,7 +60,6 @@
import com.google.common.base.Preconditions;
import com.google.common.collect.Lists;
import com.google.longrunning.Operation;
-import com.google.protobuf.AbstractMessage;
import com.google.protobuf.Any;
import java.io.IOException;
import java.util.ArrayList;
@@ -902,7 +901,7 @@ protected abstract List createRpcLroExceptionTestCatchBody(
private static TypeStore createStaticTypes() {
List> concreteClazzes =
Arrays.asList(
- AbstractMessage.class,
+ com.google.protobuf.Message.class,
After.class,
AfterClass.class,
Any.class,
diff --git a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/MockServiceClassComposer.java b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/MockServiceClassComposer.java
index 7227b4fe4a..afa2d94322 100644
--- a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/MockServiceClassComposer.java
+++ b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/MockServiceClassComposer.java
@@ -36,7 +36,7 @@
import com.google.api.generator.gapic.model.GapicClass.Kind;
import com.google.api.generator.gapic.model.GapicContext;
import com.google.api.generator.gapic.model.Service;
-import com.google.protobuf.AbstractMessage;
+import com.google.protobuf.Message;
import io.grpc.ServerServiceDefinition;
import java.util.Arrays;
import java.util.List;
@@ -130,7 +130,7 @@ private static MethodDefinition createGetRequestsMethod(
TypeNode.withReference(
ConcreteReference.builder()
.setClazz(List.class)
- .setGenerics(Arrays.asList(typeStore.get("AbstractMessage").reference()))
+ .setGenerics(Arrays.asList(typeStore.get("Message").reference()))
.build());
String methodName = "getRequests";
Expr returnExpr =
@@ -153,10 +153,7 @@ private static MethodDefinition createAddResponseMethod(
String methodName = "addResponse";
VariableExpr responseArgExpr =
VariableExpr.withVariable(
- Variable.builder()
- .setName("response")
- .setType(typeStore.get("AbstractMessage"))
- .build());
+ Variable.builder().setName("response").setType(typeStore.get("Message")).build());
Expr methodInvocationExpr =
MethodInvocationExpr.builder()
@@ -235,8 +232,7 @@ private static MethodDefinition createResetMethod(VariableExpr serviceImplVarExp
private static TypeStore createTypes(Service service) {
List> concreteClazzes =
- Arrays.asList(
- AbstractMessage.class, BetaApi.class, Generated.class, ServerServiceDefinition.class);
+ Arrays.asList(Message.class, BetaApi.class, Generated.class, ServerServiceDefinition.class);
TypeStore typeStore = new TypeStore(concreteClazzes);
typeStore.put("com.google.api.gax.grpc.testing", "MockGrpcService");
diff --git a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/MockServiceImplClassComposer.java b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/MockServiceImplClassComposer.java
index d6573f026d..cebd3fdf14 100644
--- a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/MockServiceImplClassComposer.java
+++ b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/MockServiceImplClassComposer.java
@@ -51,7 +51,7 @@
import com.google.api.generator.gapic.model.Service;
import com.google.api.generator.gapic.utils.JavaStyle;
import com.google.longrunning.Operation;
-import com.google.protobuf.AbstractMessage;
+import com.google.protobuf.Message;
import io.grpc.ServerServiceDefinition;
import io.grpc.stub.StreamObserver;
import java.util.ArrayList;
@@ -75,8 +75,7 @@ public class MockServiceImplClassComposer implements ClassComposer {
TypeNode.withReference(
ConcreteReference.builder()
.setClazz(List.class)
- .setGenerics(
- Arrays.asList(FIXED_TYPESTORE.get("AbstractMessage").reference()))
+ .setGenerics(Arrays.asList(FIXED_TYPESTORE.get("Message").reference()))
.build()))
.build());
@@ -179,10 +178,7 @@ private static MethodDefinition createGetRequestsMethod() {
private static MethodDefinition createAddResponseMethod() {
VariableExpr responseArgExpr =
VariableExpr.withVariable(
- Variable.builder()
- .setName("response")
- .setType(FIXED_TYPESTORE.get("AbstractMessage"))
- .build());
+ Variable.builder().setName("response").setType(FIXED_TYPESTORE.get("Message")).build());
Expr methodInvocationExpr =
MethodInvocationExpr.builder()
.setMethodName("add")
@@ -207,8 +203,7 @@ private static MethodDefinition createSetResponsesMethod(Service service) {
TypeNode.withReference(
ConcreteReference.builder()
.setClazz(List.class)
- .setGenerics(
- Arrays.asList(FIXED_TYPESTORE.get("AbstractMessage").reference()))
+ .setGenerics(Arrays.asList(FIXED_TYPESTORE.get("Message").reference()))
.build()))
.build());
Expr responseAssignExpr =
@@ -597,7 +592,7 @@ private static Statement createHandleObjectStatement(
private static TypeStore createStaticTypes() {
List> concreteClazzes =
Arrays.asList(
- AbstractMessage.class,
+ Message.class,
ArrayList.class,
BetaApi.class,
Generated.class,
diff --git a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/ServiceClientTestClassComposer.java b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/ServiceClientTestClassComposer.java
index b6d1ff3bc3..d4c055c003 100644
--- a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/ServiceClientTestClassComposer.java
+++ b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/ServiceClientTestClassComposer.java
@@ -53,7 +53,6 @@
import com.google.api.generator.gapic.model.Service;
import com.google.api.generator.gapic.utils.JavaStyle;
import com.google.common.base.Preconditions;
-import com.google.protobuf.AbstractMessage;
import io.grpc.StatusRuntimeException;
import java.util.ArrayList;
import java.util.Arrays;
@@ -378,7 +377,7 @@ protected List constructRpcTestCheckerLogic(
ConcreteReference.builder()
.setClazz(List.class)
.setGenerics(
- Arrays.asList(ConcreteReference.withClazz(AbstractMessage.class)))
+ Arrays.asList(ConcreteReference.withClazz(com.google.protobuf.Message.class)))
.build()))
.setName("actualRequests")
.build());
@@ -416,7 +415,7 @@ protected List constructRpcTestCheckerLogic(
.setArguments(
ValueExpr.withValue(
PrimitiveValue.builder().setType(TypeNode.INT).setValue("0").build()))
- .setReturnType(FIXED_TYPESTORE.get("AbstractMessage"))
+ .setReturnType(FIXED_TYPESTORE.get("Message"))
.build();
getFirstRequestExpr =
CastExpr.builder().setType(method.inputType()).setExpr(getFirstRequestExpr).build();
diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/MockDeprecatedService.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/MockDeprecatedService.golden
index f189549919..d25356b4a6 100644
--- a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/MockDeprecatedService.golden
+++ b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/MockDeprecatedService.golden
@@ -2,7 +2,7 @@ package com.google.testdata.v1;
import com.google.api.core.BetaApi;
import com.google.api.gax.grpc.testing.MockGrpcService;
-import com.google.protobuf.AbstractMessage;
+import com.google.protobuf.Message;
import io.grpc.ServerServiceDefinition;
import java.util.List;
import javax.annotation.Generated;
@@ -17,12 +17,12 @@ public class MockDeprecatedService implements MockGrpcService {
}
@Override
- public List getRequests() {
+ public List getRequests() {
return serviceImpl.getRequests();
}
@Override
- public void addResponse(AbstractMessage response) {
+ public void addResponse(Message response) {
serviceImpl.addResponse(response);
}
diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/MockDeprecatedServiceImpl.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/MockDeprecatedServiceImpl.golden
index 7092d93a9e..fb287b9e2a 100644
--- a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/MockDeprecatedServiceImpl.golden
+++ b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/MockDeprecatedServiceImpl.golden
@@ -1,8 +1,8 @@
package com.google.testdata.v1;
import com.google.api.core.BetaApi;
-import com.google.protobuf.AbstractMessage;
import com.google.protobuf.Empty;
+import com.google.protobuf.Message;
import com.google.testdata.v1.DeprecatedServiceGrpc.DeprecatedServiceImplBase;
import io.grpc.stub.StreamObserver;
import java.util.ArrayList;
@@ -14,7 +14,7 @@ import javax.annotation.Generated;
@BetaApi
@Generated("by gapic-generator-java")
public class MockDeprecatedServiceImpl extends DeprecatedServiceImplBase {
- private List requests;
+ private List requests;
private Queue responses;
public MockDeprecatedServiceImpl() {
@@ -22,15 +22,15 @@ public class MockDeprecatedServiceImpl extends DeprecatedServiceImplBase {
responses = new LinkedList<>();
}
- public List getRequests() {
+ public List getRequests() {
return requests;
}
- public void addResponse(AbstractMessage response) {
+ public void addResponse(Message response) {
responses.add(response);
}
- public void setResponses(List responses) {
+ public void setResponses(List responses) {
this.responses = new LinkedList(responses);
}
diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/MockEcho.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/MockEcho.golden
index 57c735b964..4a83043a43 100644
--- a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/MockEcho.golden
+++ b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/MockEcho.golden
@@ -2,7 +2,7 @@ package com.google.showcase.v1beta1;
import com.google.api.core.BetaApi;
import com.google.api.gax.grpc.testing.MockGrpcService;
-import com.google.protobuf.AbstractMessage;
+import com.google.protobuf.Message;
import io.grpc.ServerServiceDefinition;
import java.util.List;
import javax.annotation.Generated;
@@ -17,12 +17,12 @@ public class MockEcho implements MockGrpcService {
}
@Override
- public List getRequests() {
+ public List getRequests() {
return serviceImpl.getRequests();
}
@Override
- public void addResponse(AbstractMessage response) {
+ public void addResponse(Message response) {
serviceImpl.addResponse(response);
}
diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/MockEchoImpl.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/MockEchoImpl.golden
index ae3ff13888..668ed05a1f 100644
--- a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/MockEchoImpl.golden
+++ b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/MockEchoImpl.golden
@@ -2,7 +2,7 @@ package com.google.showcase.v1beta1;
import com.google.api.core.BetaApi;
import com.google.longrunning.Operation;
-import com.google.protobuf.AbstractMessage;
+import com.google.protobuf.Message;
import com.google.showcase.v1beta1.EchoGrpc.EchoImplBase;
import io.grpc.stub.StreamObserver;
import java.util.ArrayList;
@@ -14,7 +14,7 @@ import javax.annotation.Generated;
@BetaApi
@Generated("by gapic-generator-java")
public class MockEchoImpl extends EchoImplBase {
- private List requests;
+ private List requests;
private Queue responses;
public MockEchoImpl() {
@@ -22,15 +22,15 @@ public class MockEchoImpl extends EchoImplBase {
responses = new LinkedList<>();
}
- public List getRequests() {
+ public List getRequests() {
return requests;
}
- public void addResponse(AbstractMessage response) {
+ public void addResponse(Message response) {
responses.add(response);
}
- public void setResponses(List responses) {
+ public void setResponses(List responses) {
this.responses = new LinkedList(responses);
}
diff --git a/gax-java/gax-bom/pom.xml b/gax-java/gax-bom/pom.xml
index c619c5d090..feb10e8626 100644
--- a/gax-java/gax-bom/pom.xml
+++ b/gax-java/gax-bom/pom.xml
@@ -3,7 +3,7 @@
4.0.0
com.google.api
gax-bom
- 2.63.2-SNAPSHOT
+ protobuf-shading-v1
pom
GAX (Google Api eXtensions) for Java (BOM)
Google Api eXtensions for Java (BOM)
@@ -11,7 +11,7 @@
com.google.cloud
google-cloud-shared-config
- 1.15.1
+ 1.15.1-SNAPSHOT
@@ -43,55 +43,55 @@
com.google.api
gax
- 2.63.2-SNAPSHOT
+ protobuf-shading-v1
com.google.api
gax
- 2.63.2-SNAPSHOT
+ protobuf-shading-v1
test-jar
testlib
com.google.api
gax
- 2.63.2-SNAPSHOT
+ protobuf-shading-v1
testlib
com.google.api
gax-grpc
- 2.63.2-SNAPSHOT
+ protobuf-shading-v1
com.google.api
gax-grpc
- 2.63.2-SNAPSHOT
+ protobuf-shading-v1
test-jar
testlib
com.google.api
gax-grpc
- 2.63.2-SNAPSHOT
+ protobuf-shading-v1
testlib
com.google.api
gax-httpjson
- 2.63.2-SNAPSHOT
+ protobuf-shading-v1
com.google.api
gax-httpjson
- 2.63.2-SNAPSHOT
+ protobuf-shading-v1
test-jar
testlib
com.google.api
gax-httpjson
- 2.63.2-SNAPSHOT
+ protobuf-shading-v1
testlib
diff --git a/gax-java/gax-grpc/pom.xml b/gax-java/gax-grpc/pom.xml
index bb69d7501f..0d4afe47d5 100644
--- a/gax-java/gax-grpc/pom.xml
+++ b/gax-java/gax-grpc/pom.xml
@@ -3,7 +3,7 @@
4.0.0
gax-grpc
- 2.63.2-SNAPSHOT
+ protobuf-shading-v1
jar
GAX (Google Api eXtensions) for Java (gRPC)
Google Api eXtensions for Java (gRPC)
@@ -11,7 +11,7 @@
com.google.api
gax-parent
- 2.63.2-SNAPSHOT
+ protobuf-shading-v1
@@ -23,9 +23,15 @@
com.google.api
api-common
+
+ org.example
+ protobuf-api
+ latest-1.0-SNAPSHOT
+
com.google.api.grpc
proto-google-common-protos
+ protobuf-shading-v1
com.google.auth
@@ -54,6 +60,12 @@
io.grpc
grpc-alts
+
+
+ com.google.protobuf
+ protobuf-java
+
+
io.grpc
@@ -62,6 +74,16 @@
io.grpc
grpc-protobuf
+
+
+ com.google.protobuf
+ protobuf-java
+
+
+ com.google.api.grpc
+ proto-google-common-protos
+
+
io.grpc
@@ -104,6 +126,12 @@
io.grpc
grpc-s2a
test
+
+
+ com.google.protobuf
+ protobuf-java
+
+
com.google.api.grpc
diff --git a/gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/MockOperationsEx.java b/gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/MockOperationsEx.java
index 0f6c3fd8a3..62fb4f07d0 100644
--- a/gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/MockOperationsEx.java
+++ b/gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/MockOperationsEx.java
@@ -31,7 +31,7 @@
import com.google.api.core.BetaApi;
import com.google.api.gax.grpc.testing.MockGrpcService;
-import com.google.protobuf.AbstractMessage;
+import com.google.protobuf.Message;
import io.grpc.ServerServiceDefinition;
import java.util.List;
@@ -45,12 +45,12 @@ public MockOperationsEx() {
}
@Override
- public List getRequests() {
+ public List getRequests() {
return serviceImpl.getRequests();
}
@Override
- public void addResponse(AbstractMessage response) {
+ public void addResponse(Message response) {
serviceImpl.addGetOperationResponse(response);
}
diff --git a/gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/MockOperationsExImpl.java b/gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/MockOperationsExImpl.java
index 055e7cdca0..fadc77ad84 100644
--- a/gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/MockOperationsExImpl.java
+++ b/gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/MockOperationsExImpl.java
@@ -39,6 +39,7 @@
import com.google.longrunning.OperationsGrpc.OperationsImplBase;
import com.google.protobuf.AbstractMessage;
import com.google.protobuf.Empty;
+import com.google.protobuf.Message;
import io.grpc.stub.StreamObserver;
import java.util.ArrayList;
import java.util.LinkedList;
@@ -48,7 +49,7 @@
/** A custom mock Operations service implementation which only mocks responses for GetOperation. */
@BetaApi
public class MockOperationsExImpl extends OperationsImplBase {
- private List requests;
+ private List requests;
private Queue