diff --git a/coverage-report/pom.xml b/coverage-report/pom.xml index 0a594836d2..1dd76dfcbb 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-within-module com.google.api gax-grpc - 2.63.2-SNAPSHOT + protobuf-shading-within-module com.google.api gax-httpjson - 2.63.2-SNAPSHOT + protobuf-shading-within-module com.google.api diff --git a/gapic-generator-java-bom/pom.xml b/gapic-generator-java-bom/pom.xml index 5c053ea240..f8215abec3 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-within-module pom import @@ -92,44 +92,44 @@ com.google.api.grpc grpc-google-common-protos - 2.54.2-SNAPSHOT + protobuf-shading-within-module com.google.api.grpc proto-google-common-protos - 2.54.2-SNAPSHOT + protobuf-shading-within-module com.google.api.grpc proto-google-iam-v1 - 1.49.2-SNAPSHOT + protobuf-shading-within-module com.google.api.grpc proto-google-iam-v2 - 1.49.2-SNAPSHOT + protobuf-shading-within-module com.google.api.grpc proto-google-iam-v2beta - 1.49.2-SNAPSHOT + protobuf-shading-within-module com.google.api.grpc grpc-google-iam-v1 - 1.49.2-SNAPSHOT + protobuf-shading-within-module com.google.api.grpc grpc-google-iam-v2 - 1.49.2-SNAPSHOT + protobuf-shading-within-module com.google.api.grpc grpc-google-iam-v2beta - 1.49.2-SNAPSHOT + protobuf-shading-within-module diff --git a/gapic-generator-java/pom.xml b/gapic-generator-java/pom.xml index 4c6ced925f..2869df1fca 100644 --- a/gapic-generator-java/pom.xml +++ b/gapic-generator-java/pom.xml @@ -103,6 +103,7 @@ org.codehaus.mojo flatten-maven-plugin + 1.7.0 maven-compiler-plugin @@ -386,6 +387,7 @@ com.google.api gax + protobuf-shading-within-module com.google.api @@ -393,10 +395,12 @@ test-jar testlib + protobuf-shading-within-module com.google.api gax-grpc + protobuf-shading-within-module com.google.api @@ -404,10 +408,12 @@ test-jar testlib + protobuf-shading-within-module com.google.api gax-httpjson + protobuf-shading-within-module com.google.api @@ -415,6 +421,7 @@ test-jar testlib + protobuf-shading-within-module com.google.auto.value @@ -424,6 +431,12 @@ com.google.protobuf protobuf-java-util + + + com.google.protobuf + protobuf-java + + io.grpc @@ -432,6 +445,21 @@ io.grpc grpc-protobuf + + + com.google.protobuf + protobuf-java + + + com.google.api.grpc + proto-google-common-protos + + + + + org.example + protobuf-sdk + 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 a2db5ada32..5c6da74548 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 e16cc875f4..aeeb68de60 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 = @@ -598,7 +593,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 32d00af173..a453efe7c6 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-within-module pom GAX (Google Api eXtensions) for Java (BOM) Google Api eXtensions for Java (BOM) @@ -43,55 +43,55 @@ com.google.api gax - 2.63.2-SNAPSHOT + protobuf-shading-within-module com.google.api gax - 2.63.2-SNAPSHOT + protobuf-shading-within-module test-jar testlib com.google.api gax - 2.63.2-SNAPSHOT + protobuf-shading-within-module testlib com.google.api gax-grpc - 2.63.2-SNAPSHOT + protobuf-shading-within-module com.google.api gax-grpc - 2.63.2-SNAPSHOT + protobuf-shading-within-module test-jar testlib com.google.api gax-grpc - 2.63.2-SNAPSHOT + protobuf-shading-within-module testlib com.google.api gax-httpjson - 2.63.2-SNAPSHOT + protobuf-shading-within-module com.google.api gax-httpjson - 2.63.2-SNAPSHOT + protobuf-shading-within-module test-jar testlib com.google.api gax-httpjson - 2.63.2-SNAPSHOT + protobuf-shading-within-module testlib diff --git a/gax-java/gax-grpc/pom.xml b/gax-java/gax-grpc/pom.xml index bb69d7501f..6c57702f93 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-within-module 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-within-module @@ -23,9 +23,15 @@ com.google.api api-common + + org.example + protobuf-api + 1.0-SNAPSHOT + com.google.api.grpc proto-google-common-protos + protobuf-shading-within-module 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 getOperationResponses; public MockOperationsExImpl() { @@ -56,11 +57,11 @@ public MockOperationsExImpl() { getOperationResponses = new LinkedList<>(); } - public List getRequests() { + public List getRequests() { return requests; } - public void addGetOperationResponse(AbstractMessage response) { + public void addGetOperationResponse(Message response) { this.getOperationResponses.add(response); } diff --git a/gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/testing/MockGrpcService.java b/gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/testing/MockGrpcService.java index 2377609132..dfd69d428e 100644 --- a/gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/testing/MockGrpcService.java +++ b/gax-java/gax-grpc/src/test/java/com/google/api/gax/grpc/testing/MockGrpcService.java @@ -30,7 +30,7 @@ package com.google.api.gax.grpc.testing; import com.google.api.core.BetaApi; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import io.grpc.ServerServiceDefinition; import java.util.List; @@ -38,10 +38,10 @@ @BetaApi public interface MockGrpcService { /** Returns all the requests received. */ - List getRequests(); + List getRequests(); /** Adds the response to the response queue. */ - void addResponse(AbstractMessage response); + void addResponse(Message response); /** Adds the exception to the response queue. */ void addException(Exception exception); diff --git a/gax-java/gax-grpc/src/test/java/com/google/longrunning/MockOperations.java b/gax-java/gax-grpc/src/test/java/com/google/longrunning/MockOperations.java index 624eaa5c64..2037c16ea4 100644 --- a/gax-java/gax-grpc/src/test/java/com/google/longrunning/MockOperations.java +++ b/gax-java/gax-grpc/src/test/java/com/google/longrunning/MockOperations.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; @@ -44,12 +44,12 @@ public MockOperations() { } @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/gax-java/gax-grpc/src/test/java/com/google/longrunning/MockOperationsImpl.java b/gax-java/gax-grpc/src/test/java/com/google/longrunning/MockOperationsImpl.java index 594508d3de..3893cfe51f 100644 --- a/gax-java/gax-grpc/src/test/java/com/google/longrunning/MockOperationsImpl.java +++ b/gax-java/gax-grpc/src/test/java/com/google/longrunning/MockOperationsImpl.java @@ -31,8 +31,8 @@ import com.google.api.core.BetaApi; 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; @@ -41,7 +41,7 @@ @BetaApi public class MockOperationsImpl extends OperationsImplBase { - private List requests; + private List requests; private Queue responses; public MockOperationsImpl() { @@ -49,15 +49,15 @@ public MockOperationsImpl() { 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-grpc/src/test/java/com/google/longrunning/OperationsClientTest.java b/gax-java/gax-grpc/src/test/java/com/google/longrunning/OperationsClientTest.java index d438a8c4f4..f7970a8b79 100644 --- a/gax-java/gax-grpc/src/test/java/com/google/longrunning/OperationsClientTest.java +++ b/gax-java/gax-grpc/src/test/java/com/google/longrunning/OperationsClientTest.java @@ -39,9 +39,9 @@ import com.google.api.gax.rpc.InvalidArgumentException; import com.google.common.collect.Lists; import com.google.longrunning.OperationsClient.ListOperationsPagedResponse; -import com.google.protobuf.AbstractMessage; import com.google.protobuf.Duration; import com.google.protobuf.Empty; +import com.google.protobuf.Message; import io.grpc.Status; import io.grpc.StatusRuntimeException; import java.io.IOException; @@ -102,7 +102,7 @@ void getOperationTest() { Operation actualResponse = client.getOperation(name); assertEquals(expectedResponse, actualResponse); - List actualRequests = mockOperations.getRequests(); + List actualRequests = mockOperations.getRequests(); assertEquals(1, actualRequests.size()); GetOperationRequest actualRequest = (GetOperationRequest) actualRequests.get(0); @@ -145,7 +145,7 @@ void listOperationsTest() { assertEquals(1, resources.size()); assertEquals(expectedResponse.getOperationsList().get(0), resources.get(0)); - List actualRequests = mockOperations.getRequests(); + List actualRequests = mockOperations.getRequests(); assertEquals(1, actualRequests.size()); ListOperationsRequest actualRequest = (ListOperationsRequest) actualRequests.get(0); @@ -178,7 +178,7 @@ void cancelOperationTest() { client.cancelOperation(name); - List actualRequests = mockOperations.getRequests(); + List actualRequests = mockOperations.getRequests(); assertEquals(1, actualRequests.size()); CancelOperationRequest actualRequest = (CancelOperationRequest) actualRequests.get(0); @@ -209,7 +209,7 @@ void deleteOperationTest() { client.deleteOperation(name); - List actualRequests = mockOperations.getRequests(); + List actualRequests = mockOperations.getRequests(); assertEquals(1, actualRequests.size()); DeleteOperationRequest actualRequest = (DeleteOperationRequest) actualRequests.get(0); @@ -246,7 +246,7 @@ void waitOperationTest() { Operation actualResponse = client.waitOperation(request); assertEquals(expectedResponse, actualResponse); - List actualRequests = mockOperations.getRequests(); + List actualRequests = mockOperations.getRequests(); assertEquals(1, actualRequests.size()); WaitOperationRequest actualRequest = (WaitOperationRequest) actualRequests.get(0); diff --git a/gax-java/gax-httpjson/pom.xml b/gax-java/gax-httpjson/pom.xml index 3ffdb77c24..84e4bad34c 100644 --- a/gax-java/gax-httpjson/pom.xml +++ b/gax-java/gax-httpjson/pom.xml @@ -3,7 +3,7 @@ 4.0.0 gax-httpjson - 2.63.2-SNAPSHOT + protobuf-shading-within-module jar GAX (Google Api eXtensions) for Java (HTTP JSON) Google Api eXtensions for Java (HTTP JSON) @@ -11,7 +11,7 @@ com.google.api gax-parent - 2.63.2-SNAPSHOT + protobuf-shading-within-module @@ -31,6 +31,7 @@ com.google.api.grpc proto-google-common-protos + protobuf-shading-within-module com.google.auth @@ -48,9 +49,14 @@ com.google.http-client google-http-client + + + + - com.google.protobuf - protobuf-java + org.example + protobuf-api + 1.0-SNAPSHOT org.threeten @@ -67,6 +73,12 @@ com.google.protobuf protobuf-java-util + + + com.google.protobuf + protobuf-java + + com.google.code.findbugs diff --git a/gax-java/gax/pom.xml b/gax-java/gax/pom.xml index 4945be57f2..8b1c52189d 100644 --- a/gax-java/gax/pom.xml +++ b/gax-java/gax/pom.xml @@ -3,7 +3,7 @@ 4.0.0 gax - 2.63.2-SNAPSHOT + protobuf-shading-within-module jar GAX (Google Api eXtensions) for Java (Core) Google Api eXtensions for Java (Core) @@ -11,7 +11,7 @@ com.google.api gax-parent - 2.63.2-SNAPSHOT + protobuf-shading-within-module @@ -33,14 +33,26 @@ com.google.api.grpc proto-google-common-protos + protobuf-shading-within-module + + + + - com.google.protobuf - protobuf-java + org.example + protobuf-api + 1.0-SNAPSHOT - com.google.protobuf + com.google.protobuf protobuf-java-util + + + com.google.protobuf + protobuf-java + + org.threeten diff --git a/gax-java/pom.xml b/gax-java/pom.xml index eff5ffbc6f..ee532342fb 100644 --- a/gax-java/pom.xml +++ b/gax-java/pom.xml @@ -4,7 +4,7 @@ com.google.api gax-parent pom - 2.63.2-SNAPSHOT + protobuf-shading-within-module GAX (Google Api eXtensions) for Java (Parent) Google Api eXtensions for Java (Parent) @@ -98,24 +98,24 @@ com.google.api gax - 2.63.2-SNAPSHOT + protobuf-shading-within-module com.google.api gax - 2.63.2-SNAPSHOT + protobuf-shading-within-module test-jar testlib com.google.api.grpc proto-google-common-protos - 2.54.2-SNAPSHOT + protobuf-shading-within-module com.google.api.grpc grpc-google-common-protos - 2.54.2-SNAPSHOT + protobuf-shading-within-module io.grpc diff --git a/java-common-protos/grpc-google-common-protos/pom.xml b/java-common-protos/grpc-google-common-protos/pom.xml index 2e45dcf125..fa558cc1f8 100644 --- a/java-common-protos/grpc-google-common-protos/pom.xml +++ b/java-common-protos/grpc-google-common-protos/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-common-protos - 2.54.2-SNAPSHOT + protobuf-shading-within-module grpc-google-common-protos GRPC library for grpc-google-common-protos com.google.api.grpc google-common-protos-parent - 2.54.2-SNAPSHOT + protobuf-shading-within-module @@ -24,10 +24,25 @@ io.grpc grpc-protobuf + + + com.google.protobuf + protobuf-java + + + com.google.api.grpc + proto-google-common-protos + + + + + + - com.google.protobuf - protobuf-java + org.example + protobuf-api + 1.0-SNAPSHOT com.google.guava @@ -36,6 +51,12 @@ com.google.api.grpc proto-google-common-protos + + + org.example + protobuf-sdk + + @@ -44,6 +65,7 @@ org.codehaus.mojo flatten-maven-plugin + 1.7.0 diff --git a/java-common-protos/pom.xml b/java-common-protos/pom.xml index e415d0c96c..342d1027c3 100644 --- a/java-common-protos/pom.xml +++ b/java-common-protos/pom.xml @@ -4,7 +4,7 @@ com.google.api.grpc google-common-protos-parent pom - 2.54.2-SNAPSHOT + protobuf-shading-within-module Google Common Protos Parent Java idiomatic client for Google Cloud Platform services. @@ -65,7 +65,7 @@ com.google.api.grpc grpc-google-common-protos - 2.54.2-SNAPSHOT + protobuf-shading-within-module io.grpc @@ -77,7 +77,7 @@ com.google.api.grpc proto-google-common-protos - 2.54.2-SNAPSHOT + protobuf-shading-within-module com.google.guava diff --git a/java-common-protos/proto-google-common-protos/pom.xml b/java-common-protos/proto-google-common-protos/pom.xml index 0556e6d0c8..cb7b8184ec 100644 --- a/java-common-protos/proto-google-common-protos/pom.xml +++ b/java-common-protos/proto-google-common-protos/pom.xml @@ -3,18 +3,23 @@ 4.0.0 com.google.api.grpc proto-google-common-protos - 2.54.2-SNAPSHOT + protobuf-shading-within-module proto-google-common-protos PROTO library for proto-google-common-protos com.google.api.grpc google-common-protos-parent - 2.54.2-SNAPSHOT + protobuf-shading-within-module + + + + - com.google.protobuf - protobuf-java + org.example + protobuf-sdk + 1.0-SNAPSHOT @@ -23,6 +28,380 @@ org.codehaus.mojo flatten-maven-plugin + 1.7.0 + + + org.apache.maven.plugins + maven-shade-plugin + 3.6.0 + + + package + + shade + + + + + org.example:protobuf-sdk + + + + + com.google.protobuf + com.shaded.google.protobuf.common.protos + + com.google.protobuf.AbstractMessageLite + com.google.protobuf.AbstractParser + com.google.protobuf.AbstractProtobufList + com.google.protobuf.Android + com.google.protobuf.Any + com.google.protobuf.AnyOrBuilder + com.google.protobuf.AnyProto + com.google.protobuf.Api + com.google.protobuf.ApiOrBuilder + com.google.protobuf.ApiProto + com.google.protobuf.ArrayDecoders + com.google.protobuf.BooleanArrayList + com.google.protobuf.BoolValue + com.google.protobuf.BoolValueOrBuilder + com.google.protobuf.ByteBufferWriter + com.google.protobuf.ByteOutput + com.google.protobuf.ByteString + com.google.protobuf.BytesValue + com.google.protobuf.BytesValueOrBuilder + com.google.protobuf.CanIgnoreReturnValue + com.google.protobuf.CheckReturnValue + com.google.protobuf.CodedInputStream + com.google.protobuf.CodedInputStreamReader + com.google.protobuf.CodedOutputStream + com.google.protobuf.CodedOutputStreamWriter + com.google.protobuf.CompileTimeConstant + com.google.protobuf.DescriptorProtos + com.google.protobuf.Descriptors + com.google.protobuf.DoubleArrayList + com.google.protobuf.DoubleValue + com.google.protobuf.DoubleValueOrBuilder + com.google.protobuf.Duration + com.google.protobuf.DurationOrBuilder + com.google.protobuf.DurationProto + com.google.protobuf.DynamicMessage + com.google.protobuf.Empty + com.google.protobuf.EmptyOrBuilder + com.google.protobuf.EmptyProto + com.google.protobuf.Enum + com.google.protobuf.EnumOrBuilder + com.google.protobuf.EnumValue + com.google.protobuf.EnumValueOrBuilder + com.google.protobuf.ExperimentalApi + com.google.protobuf.Extension + com.google.protobuf.ExtensionLite + com.google.protobuf.ExtensionRegistry + com.google.protobuf.ExtensionRegistryFactory + com.google.protobuf.ExtensionRegistryLite + com.google.protobuf.ExtensionSchema + com.google.protobuf.ExtensionSchemaLite + com.google.protobuf.ExtensionSchemas + com.google.protobuf.Field + com.google.protobuf.FieldInfo + com.google.protobuf.FieldMask + com.google.protobuf.FieldMaskOrBuilder + com.google.protobuf.FieldMaskProto + com.google.protobuf.FieldOrBuilder + com.google.protobuf.FieldSet + com.google.protobuf.FieldType + com.google.protobuf.FlattenedAbstractMessage + com.google.protobuf.FlattenedGeneratedMessageV3 + com.google.protobuf.FloatArrayList + com.google.protobuf.FloatValue + com.google.protobuf.FloatValueOrBuilder + com.google.protobuf.GeneratedMessageInfoFactory + com.google.protobuf.GeneratedMessageLite + com.google.protobuf.InlineMe + com.google.protobuf.Int32Value + com.google.protobuf.Int32ValueOrBuilder + com.google.protobuf.Int64Value + com.google.protobuf.Int64ValueOrBuilder + com.google.protobuf.IntArrayList + com.google.protobuf.Internal + com.google.protobuf.InvalidProtocolBufferException + com.google.protobuf.IterableByteBufferInputStream + com.google.protobuf.Java8Compatibility + com.google.protobuf.JavaType + com.google.protobuf.LazyField + com.google.protobuf.LazyFieldLite + com.google.protobuf.LazyStringArrayList + com.google.protobuf.LazyStringList + com.google.protobuf.LimitedInputStream + com.google.protobuf.ListFieldSchema + com.google.protobuf.ListValue + com.google.protobuf.ListValueOrBuilder + com.google.protobuf.LongArrayList + com.google.protobuf.ManifestSchemaFactory + com.google.protobuf.MapEntry + com.google.protobuf.MapEntryLite + com.google.protobuf.MapField + com.google.protobuf.MapFieldBuilder + com.google.protobuf.MapFieldLite + com.google.protobuf.MapFieldReflectionAccessor + com.google.protobuf.MapFieldSchema + com.google.protobuf.MapFieldSchemaLite + com.google.protobuf.MapFieldSchemas + com.google.protobuf.Message + com.google.protobuf.MessageInfo + com.google.protobuf.MessageInfoFactory + com.google.protobuf.MessageLite + com.google.protobuf.MessageLiteOrBuilder + com.google.protobuf.MessageLiteToString + com.google.protobuf.MessageOrBuilder + com.google.protobuf.MessageReflection + com.google.protobuf.MessageSchema + com.google.protobuf.MessageSetSchema + com.google.protobuf.Method + com.google.protobuf.MethodOrBuilder + com.google.protobuf.Mixin + com.google.protobuf.MixinOrBuilder + com.google.protobuf.MutabilityOracle + com.google.protobuf.NewInstanceSchema + com.google.protobuf.NewInstanceSchemaLite + com.google.protobuf.NewInstanceSchemas + com.google.protobuf.NioByteString + com.google.protobuf.NullValue + com.google.protobuf.OneofInfo + com.google.protobuf.Option + com.google.protobuf.OptionOrBuilder + com.google.protobuf.Parser + com.google.protobuf.PrimitiveNonBoxingCollection + com.google.protobuf.Protobuf + com.google.protobuf.ProtobufArrayList + com.google.protobuf.ProtocolMessageEnum + com.google.protobuf.ProtocolStringList + com.google.protobuf.ProtoSyntax + com.google.protobuf.RawMessageInfo + com.google.protobuf.Reader + com.google.protobuf.RepeatedFieldBuilderV3 + com.google.protobuf.RopeByteString + com.google.protobuf.Schema + com.google.protobuf.SchemaFactory + com.google.protobuf.SchemaUtil + com.google.protobuf.SerializedForm + com.google.protobuf.SingleFieldBuilderV3 + com.google.protobuf.SmallSortedMap + com.google.protobuf.SourceContext + com.google.protobuf.SourceContextOrBuilder + com.google.protobuf.SourceContextProto + com.google.protobuf.StringValue + com.google.protobuf.StringValueOrBuilder + com.google.protobuf.Struct + com.google.protobuf.StructOrBuilder + com.google.protobuf.StructProto + com.google.protobuf.StructuralMessageInfo + com.google.protobuf.Syntax + com.google.protobuf.TextFormatEscaper + com.google.protobuf.TextFormatInternal + com.google.protobuf.Timestamp + com.google.protobuf.TimestampOrBuilder + com.google.protobuf.TimestampProto + com.google.protobuf.Type + com.google.protobuf.TypeOrBuilder + com.google.protobuf.TypeProto + com.google.protobuf.TypeRegistry + com.google.protobuf.UInt32Value + com.google.protobuf.UInt32ValueOrBuilder + com.google.protobuf.UInt64Value + com.google.protobuf.UInt64ValueOrBuilder + com.google.protobuf.UninitializedMessageException + com.google.protobuf.UnknownFieldSchema + com.google.protobuf.UnknownFieldSet + com.google.protobuf.UnknownFieldSetLite + com.google.protobuf.UnknownFieldSetLiteSchema + com.google.protobuf.UnmodifiableLazyStringList + com.google.protobuf.UnsafeUtil + com.google.protobuf.Utf8 + com.google.protobuf.Value + com.google.protobuf.ValueOrBuilder + com.google.protobuf.WireFormat + com.google.protobuf.WrappersProto + com.google.protobuf.Writer + + com.google.protobuf.AbstractMessageLite$* + com.google.protobuf.AbstractParser$* + com.google.protobuf.AbstractProtobufList$* + com.google.protobuf.Android$* + com.google.protobuf.Any$* + com.google.protobuf.AnyOrBuilder$* + com.google.protobuf.AnyProto$* + com.google.protobuf.Api$* + com.google.protobuf.ApiOrBuilder$* + com.google.protobuf.ApiProto$* + com.google.protobuf.ArrayDecoders$* + com.google.protobuf.BooleanArrayList$* + com.google.protobuf.BoolValue$* + com.google.protobuf.BoolValueOrBuilder$* + com.google.protobuf.ByteBufferWriter$* + com.google.protobuf.ByteOutput$* + com.google.protobuf.ByteString$* + com.google.protobuf.BytesValue$* + com.google.protobuf.BytesValueOrBuilder$* + com.google.protobuf.CanIgnoreReturnValue$* + com.google.protobuf.CheckReturnValue$* + com.google.protobuf.CodedInputStream$* + com.google.protobuf.CodedInputStreamReader$* + com.google.protobuf.CodedOutputStream$* + com.google.protobuf.CodedOutputStreamWriter$* + com.google.protobuf.CompileTimeConstant$* + com.google.protobuf.DescriptorProtos$* + com.google.protobuf.Descriptors$* + com.google.protobuf.DoubleArrayList$* + com.google.protobuf.DoubleValue$* + com.google.protobuf.DoubleValueOrBuilder$* + com.google.protobuf.Duration$* + com.google.protobuf.DurationOrBuilder$* + com.google.protobuf.DurationProto$* + com.google.protobuf.DynamicMessage$* + com.google.protobuf.Empty$* + com.google.protobuf.EmptyOrBuilder$* + com.google.protobuf.EmptyProto$* + com.google.protobuf.Enum$* + com.google.protobuf.EnumOrBuilder$* + com.google.protobuf.EnumValue$* + com.google.protobuf.EnumValueOrBuilder$* + com.google.protobuf.ExperimentalApi$* + com.google.protobuf.Extension$* + com.google.protobuf.ExtensionLite$* + com.google.protobuf.ExtensionRegistry$* + com.google.protobuf.ExtensionRegistryFactory$* + com.google.protobuf.ExtensionRegistryLite$* + com.google.protobuf.ExtensionSchema$* + com.google.protobuf.ExtensionSchemaLite$* + com.google.protobuf.ExtensionSchemas$* + com.google.protobuf.Field$* + com.google.protobuf.FieldInfo$* + com.google.protobuf.FieldMask$* + com.google.protobuf.FieldMaskOrBuilder$* + com.google.protobuf.FieldMaskProto$* + com.google.protobuf.FieldOrBuilder$* + com.google.protobuf.FieldSet$* + com.google.protobuf.FieldType$* + com.google.protobuf.FlattenedAbstractMessage$* + com.google.protobuf.FlattenedGeneratedMessageV3$* + com.google.protobuf.FloatArrayList$* + com.google.protobuf.FloatValue$* + com.google.protobuf.FloatValueOrBuilder$* + com.google.protobuf.GeneratedMessageInfoFactory$* + com.google.protobuf.GeneratedMessageLite$* + com.google.protobuf.InlineMe$* + com.google.protobuf.Int32Value$* + com.google.protobuf.Int32ValueOrBuilder$* + com.google.protobuf.Int64Value$* + com.google.protobuf.Int64ValueOrBuilder$* + com.google.protobuf.IntArrayList$* + com.google.protobuf.Internal$* + com.google.protobuf.InvalidProtocolBufferException$* + com.google.protobuf.IterableByteBufferInputStream$* + com.google.protobuf.Java8Compatibility$* + com.google.protobuf.JavaType$* + com.google.protobuf.LazyField$* + com.google.protobuf.LazyFieldLite$* + com.google.protobuf.LazyStringArrayList$* + com.google.protobuf.LazyStringList$* + com.google.protobuf.LimitedInputStream$* + com.google.protobuf.ListFieldSchema$* + com.google.protobuf.ListValue$* + com.google.protobuf.ListValueOrBuilder$* + com.google.protobuf.LongArrayList$* + com.google.protobuf.ManifestSchemaFactory$* + com.google.protobuf.MapEntry$* + com.google.protobuf.MapEntryLite$* + com.google.protobuf.MapField$* + com.google.protobuf.MapFieldBuilder$* + com.google.protobuf.MapFieldLite$* + com.google.protobuf.MapFieldReflectionAccessor$* + com.google.protobuf.MapFieldSchema$* + com.google.protobuf.MapFieldSchemaLite$* + com.google.protobuf.MapFieldSchemas$* + com.google.protobuf.Message$* + com.google.protobuf.MessageInfo$* + com.google.protobuf.MessageInfoFactory$* + com.google.protobuf.MessageLite$* + com.google.protobuf.MessageLiteOrBuilder$* + com.google.protobuf.MessageLiteToString$* + com.google.protobuf.MessageOrBuilder$* + com.google.protobuf.MessageReflection$* + com.google.protobuf.MessageSchema$* + com.google.protobuf.MessageSetSchema$* + com.google.protobuf.Method$* + com.google.protobuf.MethodOrBuilder$* + com.google.protobuf.Mixin$* + com.google.protobuf.MixinOrBuilder$* + com.google.protobuf.MutabilityOracle$* + com.google.protobuf.NewInstanceSchema$* + com.google.protobuf.NewInstanceSchemaLite$* + com.google.protobuf.NewInstanceSchemas$* + com.google.protobuf.NioByteString$* + com.google.protobuf.NullValue$* + com.google.protobuf.OneofInfo$* + com.google.protobuf.Option$* + com.google.protobuf.OptionOrBuilder$* + com.google.protobuf.Parser$* + com.google.protobuf.PrimitiveNonBoxingCollection$* + com.google.protobuf.Protobuf$* + com.google.protobuf.ProtobufArrayList$* + com.google.protobuf.ProtocolMessageEnum$* + com.google.protobuf.ProtocolStringList$* + com.google.protobuf.ProtoSyntax$* + com.google.protobuf.RawMessageInfo$* + com.google.protobuf.Reader$* + com.google.protobuf.RepeatedFieldBuilderV3$* + com.google.protobuf.RopeByteString$* + com.google.protobuf.Schema$* + com.google.protobuf.SchemaFactory$* + com.google.protobuf.SchemaUtil$* + com.google.protobuf.SerializedForm$* + com.google.protobuf.SingleFieldBuilderV3$* + com.google.protobuf.SmallSortedMap$* + com.google.protobuf.SourceContext$* + com.google.protobuf.SourceContextOrBuilder$* + com.google.protobuf.SourceContextProto$* + com.google.protobuf.StringValue$* + com.google.protobuf.StringValueOrBuilder$* + com.google.protobuf.Struct$* + com.google.protobuf.StructOrBuilder$* + com.google.protobuf.StructProto$* + com.google.protobuf.StructuralMessageInfo$* + com.google.protobuf.Syntax$* + com.google.protobuf.TextFormatEscaper$* + com.google.protobuf.TextFormatInternal$* + com.google.protobuf.Timestamp$* + com.google.protobuf.TimestampOrBuilder$* + com.google.protobuf.TimestampProto$* + com.google.protobuf.Type$* + com.google.protobuf.TypeOrBuilder$* + com.google.protobuf.TypeProto$* + com.google.protobuf.TypeRegistry$* + com.google.protobuf.UInt32Value$* + com.google.protobuf.UInt32ValueOrBuilder$* + com.google.protobuf.UInt64Value$* + com.google.protobuf.UInt64ValueOrBuilder$* + com.google.protobuf.UninitializedMessageException$* + com.google.protobuf.UnknownFieldSchema$* + com.google.protobuf.UnknownFieldSet$* + com.google.protobuf.UnknownFieldSetLite$* + com.google.protobuf.UnknownFieldSetLiteSchema$* + com.google.protobuf.UnmodifiableLazyStringList$* + com.google.protobuf.UnsafeUtil$* + com.google.protobuf.Utf8$* + com.google.protobuf.Value$* + com.google.protobuf.ValueOrBuilder$* + com.google.protobuf.WireFormat$* + com.google.protobuf.WrappersProto$* + com.google.protobuf.Writer$* + + + + + + diff --git a/java-core/google-cloud-core-bom/pom.xml b/java-core/google-cloud-core-bom/pom.xml index 06c6e23645..66b8cd180f 100644 --- a/java-core/google-cloud-core-bom/pom.xml +++ b/java-core/google-cloud-core-bom/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-core-bom - 2.53.2-SNAPSHOT + protobuf-shading-within-module pom @@ -23,17 +23,17 @@ com.google.cloud google-cloud-core - 2.53.2-SNAPSHOT + protobuf-shading-within-module com.google.cloud google-cloud-core-grpc - 2.53.2-SNAPSHOT + protobuf-shading-within-module com.google.cloud google-cloud-core-http - 2.53.2-SNAPSHOT + protobuf-shading-within-module diff --git a/java-core/google-cloud-core-grpc/pom.xml b/java-core/google-cloud-core-grpc/pom.xml index 94a07e125e..fcb585d2f6 100644 --- a/java-core/google-cloud-core-grpc/pom.xml +++ b/java-core/google-cloud-core-grpc/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-core-grpc - 2.53.2-SNAPSHOT + protobuf-shading-within-module jar Google Cloud Core gRPC @@ -12,7 +12,7 @@ com.google.cloud google-cloud-core-parent - 2.53.2-SNAPSHOT + protobuf-shading-within-module google-cloud-core-grpc @@ -25,6 +25,7 @@ com.google.cloud google-cloud-core + protobuf-shading-within-module com.google.guava @@ -33,10 +34,12 @@ com.google.api gax + protobuf-shading-within-module com.google.api gax-grpc + protobuf-shading-within-module com.google.api diff --git a/java-core/google-cloud-core-http/pom.xml b/java-core/google-cloud-core-http/pom.xml index afb0f39f0a..c7e21bdecd 100644 --- a/java-core/google-cloud-core-http/pom.xml +++ b/java-core/google-cloud-core-http/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-core-http - 2.53.2-SNAPSHOT + protobuf-shading-within-module jar Google Cloud Core HTTP @@ -12,7 +12,7 @@ com.google.cloud google-cloud-core-parent - 2.53.2-SNAPSHOT + protobuf-shading-within-module google-cloud-core-http @@ -21,6 +21,7 @@ com.google.cloud google-cloud-core + protobuf-shading-within-module com.google.auth @@ -49,10 +50,12 @@ com.google.api gax + protobuf-shading-within-module com.google.api gax-httpjson + protobuf-shading-within-module com.google.code.findbugs diff --git a/java-core/google-cloud-core/pom.xml b/java-core/google-cloud-core/pom.xml index a443a073a2..3e72b6d12f 100644 --- a/java-core/google-cloud-core/pom.xml +++ b/java-core/google-cloud-core/pom.xml @@ -3,7 +3,7 @@ 4.0.0 com.google.cloud google-cloud-core - 2.53.2-SNAPSHOT + protobuf-shading-within-module jar Google Cloud Core @@ -12,7 +12,7 @@ com.google.cloud google-cloud-core-parent - 2.53.2-SNAPSHOT + protobuf-shading-within-module google-cloud-core @@ -25,6 +25,7 @@ com.google.api gax + protobuf-shading-within-module com.google.auto.value @@ -33,14 +34,22 @@ com.google.protobuf protobuf-java-util + + + com.google.protobuf + protobuf-java + + com.google.api.grpc proto-google-common-protos + protobuf-shading-within-module com.google.api.grpc proto-google-iam-v1 + protobuf-shading-within-module org.threeten @@ -66,9 +75,14 @@ com.google.http-client google-http-client-gson + + + + - com.google.protobuf - protobuf-java + org.example + protobuf-sdk + 1.0-SNAPSHOT com.google.errorprone @@ -110,4 +124,387 @@ test + + + + + org.codehaus.mojo + flatten-maven-plugin + 1.7.0 + + + org.apache.maven.plugins + maven-shade-plugin + 3.6.0 + + + package + + shade + + + + + org.example:protobuf-sdk + + + + + com.google.protobuf + com.shaded.google.protobuf.core + + com.google.protobuf.AbstractMessageLite + com.google.protobuf.AbstractParser + com.google.protobuf.AbstractProtobufList + com.google.protobuf.Android + com.google.protobuf.Any + com.google.protobuf.AnyOrBuilder + com.google.protobuf.AnyProto + com.google.protobuf.Api + com.google.protobuf.ApiOrBuilder + com.google.protobuf.ApiProto + com.google.protobuf.ArrayDecoders + com.google.protobuf.BooleanArrayList + com.google.protobuf.BoolValue + com.google.protobuf.BoolValueOrBuilder + com.google.protobuf.ByteBufferWriter + com.google.protobuf.ByteOutput + com.google.protobuf.ByteString + com.google.protobuf.BytesValue + com.google.protobuf.BytesValueOrBuilder + com.google.protobuf.CanIgnoreReturnValue + com.google.protobuf.CheckReturnValue + com.google.protobuf.CodedInputStream + com.google.protobuf.CodedInputStreamReader + com.google.protobuf.CodedOutputStream + com.google.protobuf.CodedOutputStreamWriter + com.google.protobuf.CompileTimeConstant + com.google.protobuf.DescriptorProtos + com.google.protobuf.Descriptors + com.google.protobuf.DoubleArrayList + com.google.protobuf.DoubleValue + com.google.protobuf.DoubleValueOrBuilder + com.google.protobuf.Duration + com.google.protobuf.DurationOrBuilder + com.google.protobuf.DurationProto + com.google.protobuf.DynamicMessage + com.google.protobuf.Empty + com.google.protobuf.EmptyOrBuilder + com.google.protobuf.EmptyProto + com.google.protobuf.Enum + com.google.protobuf.EnumOrBuilder + com.google.protobuf.EnumValue + com.google.protobuf.EnumValueOrBuilder + com.google.protobuf.ExperimentalApi + com.google.protobuf.Extension + com.google.protobuf.ExtensionLite + com.google.protobuf.ExtensionRegistry + com.google.protobuf.ExtensionRegistryFactory + com.google.protobuf.ExtensionRegistryLite + com.google.protobuf.ExtensionSchema + com.google.protobuf.ExtensionSchemaLite + com.google.protobuf.ExtensionSchemas + com.google.protobuf.Field + com.google.protobuf.FieldInfo + com.google.protobuf.FieldMask + com.google.protobuf.FieldMaskOrBuilder + com.google.protobuf.FieldMaskProto + com.google.protobuf.FieldOrBuilder + com.google.protobuf.FieldSet + com.google.protobuf.FieldType + com.google.protobuf.FlattenedAbstractMessage + com.google.protobuf.FlattenedGeneratedMessageV3 + com.google.protobuf.FloatArrayList + com.google.protobuf.FloatValue + com.google.protobuf.FloatValueOrBuilder + com.google.protobuf.GeneratedMessageInfoFactory + com.google.protobuf.GeneratedMessageLite + com.google.protobuf.InlineMe + com.google.protobuf.Int32Value + com.google.protobuf.Int32ValueOrBuilder + com.google.protobuf.Int64Value + com.google.protobuf.Int64ValueOrBuilder + com.google.protobuf.IntArrayList + com.google.protobuf.Internal + com.google.protobuf.InvalidProtocolBufferException + com.google.protobuf.IterableByteBufferInputStream + com.google.protobuf.Java8Compatibility + com.google.protobuf.JavaType + com.google.protobuf.LazyField + com.google.protobuf.LazyFieldLite + com.google.protobuf.LazyStringArrayList + com.google.protobuf.LazyStringList + com.google.protobuf.LimitedInputStream + com.google.protobuf.ListFieldSchema + com.google.protobuf.ListValue + com.google.protobuf.ListValueOrBuilder + com.google.protobuf.LongArrayList + com.google.protobuf.ManifestSchemaFactory + com.google.protobuf.MapEntry + com.google.protobuf.MapEntryLite + com.google.protobuf.MapField + com.google.protobuf.MapFieldBuilder + com.google.protobuf.MapFieldLite + com.google.protobuf.MapFieldReflectionAccessor + com.google.protobuf.MapFieldSchema + com.google.protobuf.MapFieldSchemaLite + com.google.protobuf.MapFieldSchemas + com.google.protobuf.Message + com.google.protobuf.MessageInfo + com.google.protobuf.MessageInfoFactory + com.google.protobuf.MessageLite + com.google.protobuf.MessageLiteOrBuilder + com.google.protobuf.MessageLiteToString + com.google.protobuf.MessageOrBuilder + com.google.protobuf.MessageReflection + com.google.protobuf.MessageSchema + com.google.protobuf.MessageSetSchema + com.google.protobuf.Method + com.google.protobuf.MethodOrBuilder + com.google.protobuf.Mixin + com.google.protobuf.MixinOrBuilder + com.google.protobuf.MutabilityOracle + com.google.protobuf.NewInstanceSchema + com.google.protobuf.NewInstanceSchemaLite + com.google.protobuf.NewInstanceSchemas + com.google.protobuf.NioByteString + com.google.protobuf.NullValue + com.google.protobuf.OneofInfo + com.google.protobuf.Option + com.google.protobuf.OptionOrBuilder + com.google.protobuf.Parser + com.google.protobuf.PrimitiveNonBoxingCollection + com.google.protobuf.Protobuf + com.google.protobuf.ProtobufArrayList + com.google.protobuf.ProtocolMessageEnum + com.google.protobuf.ProtocolStringList + com.google.protobuf.ProtoSyntax + com.google.protobuf.RawMessageInfo + com.google.protobuf.Reader + com.google.protobuf.RepeatedFieldBuilderV3 + com.google.protobuf.RopeByteString + com.google.protobuf.Schema + com.google.protobuf.SchemaFactory + com.google.protobuf.SchemaUtil + com.google.protobuf.SerializedForm + com.google.protobuf.SingleFieldBuilderV3 + com.google.protobuf.SmallSortedMap + com.google.protobuf.SourceContext + com.google.protobuf.SourceContextOrBuilder + com.google.protobuf.SourceContextProto + com.google.protobuf.StringValue + com.google.protobuf.StringValueOrBuilder + com.google.protobuf.Struct + com.google.protobuf.StructOrBuilder + com.google.protobuf.StructProto + com.google.protobuf.StructuralMessageInfo + com.google.protobuf.Syntax + com.google.protobuf.TextFormatEscaper + com.google.protobuf.TextFormatInternal + com.google.protobuf.Timestamp + com.google.protobuf.TimestampOrBuilder + com.google.protobuf.TimestampProto + com.google.protobuf.Type + com.google.protobuf.TypeOrBuilder + com.google.protobuf.TypeProto + com.google.protobuf.TypeRegistry + com.google.protobuf.UInt32Value + com.google.protobuf.UInt32ValueOrBuilder + com.google.protobuf.UInt64Value + com.google.protobuf.UInt64ValueOrBuilder + com.google.protobuf.UninitializedMessageException + com.google.protobuf.UnknownFieldSchema + com.google.protobuf.UnknownFieldSet + com.google.protobuf.UnknownFieldSetLite + com.google.protobuf.UnknownFieldSetLiteSchema + com.google.protobuf.UnmodifiableLazyStringList + com.google.protobuf.UnsafeUtil + com.google.protobuf.Utf8 + com.google.protobuf.Value + com.google.protobuf.ValueOrBuilder + com.google.protobuf.WireFormat + com.google.protobuf.WrappersProto + com.google.protobuf.Writer + + com.google.protobuf.AbstractMessageLite$* + com.google.protobuf.AbstractParser$* + com.google.protobuf.AbstractProtobufList$* + com.google.protobuf.Android$* + com.google.protobuf.Any$* + com.google.protobuf.AnyOrBuilder$* + com.google.protobuf.AnyProto$* + com.google.protobuf.Api$* + com.google.protobuf.ApiOrBuilder$* + com.google.protobuf.ApiProto$* + com.google.protobuf.ArrayDecoders$* + com.google.protobuf.BooleanArrayList$* + com.google.protobuf.BoolValue$* + com.google.protobuf.BoolValueOrBuilder$* + com.google.protobuf.ByteBufferWriter$* + com.google.protobuf.ByteOutput$* + com.google.protobuf.ByteString$* + com.google.protobuf.BytesValue$* + com.google.protobuf.BytesValueOrBuilder$* + com.google.protobuf.CanIgnoreReturnValue$* + com.google.protobuf.CheckReturnValue$* + com.google.protobuf.CodedInputStream$* + com.google.protobuf.CodedInputStreamReader$* + com.google.protobuf.CodedOutputStream$* + com.google.protobuf.CodedOutputStreamWriter$* + com.google.protobuf.CompileTimeConstant$* + com.google.protobuf.DescriptorProtos$* + com.google.protobuf.Descriptors$* + com.google.protobuf.DoubleArrayList$* + com.google.protobuf.DoubleValue$* + com.google.protobuf.DoubleValueOrBuilder$* + com.google.protobuf.Duration$* + com.google.protobuf.DurationOrBuilder$* + com.google.protobuf.DurationProto$* + com.google.protobuf.DynamicMessage$* + com.google.protobuf.Empty$* + com.google.protobuf.EmptyOrBuilder$* + com.google.protobuf.EmptyProto$* + com.google.protobuf.Enum$* + com.google.protobuf.EnumOrBuilder$* + com.google.protobuf.EnumValue$* + com.google.protobuf.EnumValueOrBuilder$* + com.google.protobuf.ExperimentalApi$* + com.google.protobuf.Extension$* + com.google.protobuf.ExtensionLite$* + com.google.protobuf.ExtensionRegistry$* + com.google.protobuf.ExtensionRegistryFactory$* + com.google.protobuf.ExtensionRegistryLite$* + com.google.protobuf.ExtensionSchema$* + com.google.protobuf.ExtensionSchemaLite$* + com.google.protobuf.ExtensionSchemas$* + com.google.protobuf.Field$* + com.google.protobuf.FieldInfo$* + com.google.protobuf.FieldMask$* + com.google.protobuf.FieldMaskOrBuilder$* + com.google.protobuf.FieldMaskProto$* + com.google.protobuf.FieldOrBuilder$* + com.google.protobuf.FieldSet$* + com.google.protobuf.FieldType$* + com.google.protobuf.FlattenedAbstractMessage$* + com.google.protobuf.FlattenedGeneratedMessageV3$* + com.google.protobuf.FloatArrayList$* + com.google.protobuf.FloatValue$* + com.google.protobuf.FloatValueOrBuilder$* + com.google.protobuf.GeneratedMessageInfoFactory$* + com.google.protobuf.GeneratedMessageLite$* + com.google.protobuf.InlineMe$* + com.google.protobuf.Int32Value$* + com.google.protobuf.Int32ValueOrBuilder$* + com.google.protobuf.Int64Value$* + com.google.protobuf.Int64ValueOrBuilder$* + com.google.protobuf.IntArrayList$* + com.google.protobuf.Internal$* + com.google.protobuf.InvalidProtocolBufferException$* + com.google.protobuf.IterableByteBufferInputStream$* + com.google.protobuf.Java8Compatibility$* + com.google.protobuf.JavaType$* + com.google.protobuf.LazyField$* + com.google.protobuf.LazyFieldLite$* + com.google.protobuf.LazyStringArrayList$* + com.google.protobuf.LazyStringList$* + com.google.protobuf.LimitedInputStream$* + com.google.protobuf.ListFieldSchema$* + com.google.protobuf.ListValue$* + com.google.protobuf.ListValueOrBuilder$* + com.google.protobuf.LongArrayList$* + com.google.protobuf.ManifestSchemaFactory$* + com.google.protobuf.MapEntry$* + com.google.protobuf.MapEntryLite$* + com.google.protobuf.MapField$* + com.google.protobuf.MapFieldBuilder$* + com.google.protobuf.MapFieldLite$* + com.google.protobuf.MapFieldReflectionAccessor$* + com.google.protobuf.MapFieldSchema$* + com.google.protobuf.MapFieldSchemaLite$* + com.google.protobuf.MapFieldSchemas$* + com.google.protobuf.Message$* + com.google.protobuf.MessageInfo$* + com.google.protobuf.MessageInfoFactory$* + com.google.protobuf.MessageLite$* + com.google.protobuf.MessageLiteOrBuilder$* + com.google.protobuf.MessageLiteToString$* + com.google.protobuf.MessageOrBuilder$* + com.google.protobuf.MessageReflection$* + com.google.protobuf.MessageSchema$* + com.google.protobuf.MessageSetSchema$* + com.google.protobuf.Method$* + com.google.protobuf.MethodOrBuilder$* + com.google.protobuf.Mixin$* + com.google.protobuf.MixinOrBuilder$* + com.google.protobuf.MutabilityOracle$* + com.google.protobuf.NewInstanceSchema$* + com.google.protobuf.NewInstanceSchemaLite$* + com.google.protobuf.NewInstanceSchemas$* + com.google.protobuf.NioByteString$* + com.google.protobuf.NullValue$* + com.google.protobuf.OneofInfo$* + com.google.protobuf.Option$* + com.google.protobuf.OptionOrBuilder$* + com.google.protobuf.Parser$* + com.google.protobuf.PrimitiveNonBoxingCollection$* + com.google.protobuf.Protobuf$* + com.google.protobuf.ProtobufArrayList$* + com.google.protobuf.ProtocolMessageEnum$* + com.google.protobuf.ProtocolStringList$* + com.google.protobuf.ProtoSyntax$* + com.google.protobuf.RawMessageInfo$* + com.google.protobuf.Reader$* + com.google.protobuf.RepeatedFieldBuilderV3$* + com.google.protobuf.RopeByteString$* + com.google.protobuf.Schema$* + com.google.protobuf.SchemaFactory$* + com.google.protobuf.SchemaUtil$* + com.google.protobuf.SerializedForm$* + com.google.protobuf.SingleFieldBuilderV3$* + com.google.protobuf.SmallSortedMap$* + com.google.protobuf.SourceContext$* + com.google.protobuf.SourceContextOrBuilder$* + com.google.protobuf.SourceContextProto$* + com.google.protobuf.StringValue$* + com.google.protobuf.StringValueOrBuilder$* + com.google.protobuf.Struct$* + com.google.protobuf.StructOrBuilder$* + com.google.protobuf.StructProto$* + com.google.protobuf.StructuralMessageInfo$* + com.google.protobuf.Syntax$* + com.google.protobuf.TextFormatEscaper$* + com.google.protobuf.TextFormatInternal$* + com.google.protobuf.Timestamp$* + com.google.protobuf.TimestampOrBuilder$* + com.google.protobuf.TimestampProto$* + com.google.protobuf.Type$* + com.google.protobuf.TypeOrBuilder$* + com.google.protobuf.TypeProto$* + com.google.protobuf.TypeRegistry$* + com.google.protobuf.UInt32Value$* + com.google.protobuf.UInt32ValueOrBuilder$* + com.google.protobuf.UInt64Value$* + com.google.protobuf.UInt64ValueOrBuilder$* + com.google.protobuf.UninitializedMessageException$* + com.google.protobuf.UnknownFieldSchema$* + com.google.protobuf.UnknownFieldSet$* + com.google.protobuf.UnknownFieldSetLite$* + com.google.protobuf.UnknownFieldSetLiteSchema$* + com.google.protobuf.UnmodifiableLazyStringList$* + com.google.protobuf.UnsafeUtil$* + com.google.protobuf.Utf8$* + com.google.protobuf.Value$* + com.google.protobuf.ValueOrBuilder$* + com.google.protobuf.WireFormat$* + com.google.protobuf.WrappersProto$* + com.google.protobuf.Writer$* + + + + + + + + + diff --git a/java-core/pom.xml b/java-core/pom.xml index 70b20e9de1..27d0b9f687 100644 --- a/java-core/pom.xml +++ b/java-core/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-core-parent pom - 2.53.2-SNAPSHOT + protobuf-shading-within-module Google Cloud Core Parent Java idiomatic client for Google Cloud Platform services. diff --git a/java-iam/grpc-google-iam-v1/pom.xml b/java-iam/grpc-google-iam-v1/pom.xml index d48daba294..d36d8d4e59 100644 --- a/java-iam/grpc-google-iam-v1/pom.xml +++ b/java-iam/grpc-google-iam-v1/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-iam-v1 - 1.49.2-SNAPSHOT + protobuf-shading-within-module grpc-google-iam-v1 GRPC library for grpc-google-iam-v1 com.google.cloud google-iam-parent - 1.49.2-SNAPSHOT + protobuf-shading-within-module @@ -24,10 +24,25 @@ io.grpc grpc-protobuf + + + com.google.protobuf + protobuf-java + + + com.google.api.grpc + proto-google-common-protos + + + + + + - com.google.protobuf - protobuf-java + org.example + protobuf-api + 1.0-SNAPSHOT com.google.guava @@ -36,6 +51,7 @@ com.google.api.grpc proto-google-iam-v1 + protobuf-shading-within-module @@ -44,6 +60,7 @@ org.codehaus.mojo flatten-maven-plugin + 1.7.0 diff --git a/java-iam/grpc-google-iam-v2/pom.xml b/java-iam/grpc-google-iam-v2/pom.xml index 627c82d48e..6a6e15f2f4 100644 --- a/java-iam/grpc-google-iam-v2/pom.xml +++ b/java-iam/grpc-google-iam-v2/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-iam-v2 - 1.49.2-SNAPSHOT + protobuf-shading-within-module grpc-google-iam-v2 GRPC library for proto-google-iam-v2 com.google.cloud google-iam-parent - 1.49.2-SNAPSHOT + protobuf-shading-within-module @@ -24,18 +24,35 @@ io.grpc grpc-protobuf + + + com.google.protobuf + protobuf-java + + + com.google.api.grpc + proto-google-common-protos + + + + + + - com.google.protobuf - protobuf-java + org.example + protobuf-api + 1.0-SNAPSHOT com.google.api.grpc proto-google-common-protos + protobuf-shading-within-module com.google.api.grpc proto-google-iam-v2 + protobuf-shading-within-module com.google.guava @@ -63,6 +80,7 @@ org.codehaus.mojo flatten-maven-plugin + 1.7.0 diff --git a/java-iam/grpc-google-iam-v2beta/pom.xml b/java-iam/grpc-google-iam-v2beta/pom.xml index 65bf811877..26f53b1e58 100644 --- a/java-iam/grpc-google-iam-v2beta/pom.xml +++ b/java-iam/grpc-google-iam-v2beta/pom.xml @@ -4,13 +4,13 @@ 4.0.0 com.google.api.grpc grpc-google-iam-v2beta - 1.49.2-SNAPSHOT + protobuf-shading-within-module grpc-google-iam-v2beta GRPC library for proto-google-iam-v1 com.google.cloud google-iam-parent - 1.49.2-SNAPSHOT + protobuf-shading-within-module @@ -24,18 +24,35 @@ io.grpc grpc-protobuf + + + com.google.protobuf + protobuf-java + + + com.google.api.grpc + proto-google-common-protos + + + + + + - com.google.protobuf - protobuf-java + org.example + protobuf-api + 1.0-SNAPSHOT com.google.api.grpc proto-google-common-protos + protobuf-shading-within-module com.google.api.grpc proto-google-iam-v2beta + protobuf-shading-within-module com.google.guava @@ -63,6 +80,7 @@ org.codehaus.mojo flatten-maven-plugin + 1.7.0 diff --git a/java-iam/pom.xml b/java-iam/pom.xml index 55c262d234..c264f05767 100644 --- a/java-iam/pom.xml +++ b/java-iam/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-iam-parent pom - 1.49.2-SNAPSHOT + protobuf-shading-within-module Google IAM Parent Java idiomatic client for Google Cloud Platform services. @@ -78,44 +78,44 @@ com.google.api gax-bom - 2.63.2-SNAPSHOT + protobuf-shading-within-module pom import com.google.api.grpc proto-google-iam-v2 - 1.49.2-SNAPSHOT + protobuf-shading-within-module com.google.api.grpc grpc-google-iam-v2 - 1.49.2-SNAPSHOT + protobuf-shading-within-module com.google.api.grpc proto-google-common-protos - 2.54.2-SNAPSHOT + protobuf-shading-within-module com.google.api.grpc proto-google-iam-v2beta - 1.49.2-SNAPSHOT + protobuf-shading-within-module com.google.api.grpc grpc-google-iam-v1 - 1.49.2-SNAPSHOT + protobuf-shading-within-module com.google.api.grpc grpc-google-iam-v2beta - 1.49.2-SNAPSHOT + protobuf-shading-within-module com.google.api.grpc proto-google-iam-v1 - 1.49.2-SNAPSHOT + protobuf-shading-within-module javax.annotation diff --git a/java-iam/proto-google-iam-v1/pom.xml b/java-iam/proto-google-iam-v1/pom.xml index ae35bf25d2..648d7846c4 100644 --- a/java-iam/proto-google-iam-v1/pom.xml +++ b/java-iam/proto-google-iam-v1/pom.xml @@ -3,22 +3,28 @@ 4.0.0 com.google.api.grpc proto-google-iam-v1 - 1.49.2-SNAPSHOT + protobuf-shading-within-module proto-google-iam-v1 PROTO library for proto-google-iam-v1 com.google.cloud google-iam-parent - 1.49.2-SNAPSHOT + protobuf-shading-within-module + + + + - com.google.protobuf - protobuf-java + org.example + protobuf-sdk + 1.0-SNAPSHOT com.google.api.grpc proto-google-common-protos + protobuf-shading-within-module @@ -26,6 +32,380 @@ org.codehaus.mojo flatten-maven-plugin + 1.7.0 + + + org.apache.maven.plugins + maven-shade-plugin + 3.6.0 + + + package + + shade + + + + + org.example:protobuf-sdk + + + + + com.google.protobuf + com.shaded.google.protobuf.iam.v1 + + com.google.protobuf.AbstractMessageLite + com.google.protobuf.AbstractParser + com.google.protobuf.AbstractProtobufList + com.google.protobuf.Android + com.google.protobuf.Any + com.google.protobuf.AnyOrBuilder + com.google.protobuf.AnyProto + com.google.protobuf.Api + com.google.protobuf.ApiOrBuilder + com.google.protobuf.ApiProto + com.google.protobuf.ArrayDecoders + com.google.protobuf.BooleanArrayList + com.google.protobuf.BoolValue + com.google.protobuf.BoolValueOrBuilder + com.google.protobuf.ByteBufferWriter + com.google.protobuf.ByteOutput + com.google.protobuf.ByteString + com.google.protobuf.BytesValue + com.google.protobuf.BytesValueOrBuilder + com.google.protobuf.CanIgnoreReturnValue + com.google.protobuf.CheckReturnValue + com.google.protobuf.CodedInputStream + com.google.protobuf.CodedInputStreamReader + com.google.protobuf.CodedOutputStream + com.google.protobuf.CodedOutputStreamWriter + com.google.protobuf.CompileTimeConstant + com.google.protobuf.DescriptorProtos + com.google.protobuf.Descriptors + com.google.protobuf.DoubleArrayList + com.google.protobuf.DoubleValue + com.google.protobuf.DoubleValueOrBuilder + com.google.protobuf.Duration + com.google.protobuf.DurationOrBuilder + com.google.protobuf.DurationProto + com.google.protobuf.DynamicMessage + com.google.protobuf.Empty + com.google.protobuf.EmptyOrBuilder + com.google.protobuf.EmptyProto + com.google.protobuf.Enum + com.google.protobuf.EnumOrBuilder + com.google.protobuf.EnumValue + com.google.protobuf.EnumValueOrBuilder + com.google.protobuf.ExperimentalApi + com.google.protobuf.Extension + com.google.protobuf.ExtensionLite + com.google.protobuf.ExtensionRegistry + com.google.protobuf.ExtensionRegistryFactory + com.google.protobuf.ExtensionRegistryLite + com.google.protobuf.ExtensionSchema + com.google.protobuf.ExtensionSchemaLite + com.google.protobuf.ExtensionSchemas + com.google.protobuf.Field + com.google.protobuf.FieldInfo + com.google.protobuf.FieldMask + com.google.protobuf.FieldMaskOrBuilder + com.google.protobuf.FieldMaskProto + com.google.protobuf.FieldOrBuilder + com.google.protobuf.FieldSet + com.google.protobuf.FieldType + com.google.protobuf.FlattenedAbstractMessage + com.google.protobuf.FlattenedGeneratedMessageV3 + com.google.protobuf.FloatArrayList + com.google.protobuf.FloatValue + com.google.protobuf.FloatValueOrBuilder + com.google.protobuf.GeneratedMessageInfoFactory + com.google.protobuf.GeneratedMessageLite + com.google.protobuf.InlineMe + com.google.protobuf.Int32Value + com.google.protobuf.Int32ValueOrBuilder + com.google.protobuf.Int64Value + com.google.protobuf.Int64ValueOrBuilder + com.google.protobuf.IntArrayList + com.google.protobuf.Internal + com.google.protobuf.InvalidProtocolBufferException + com.google.protobuf.IterableByteBufferInputStream + com.google.protobuf.Java8Compatibility + com.google.protobuf.JavaType + com.google.protobuf.LazyField + com.google.protobuf.LazyFieldLite + com.google.protobuf.LazyStringArrayList + com.google.protobuf.LazyStringList + com.google.protobuf.LimitedInputStream + com.google.protobuf.ListFieldSchema + com.google.protobuf.ListValue + com.google.protobuf.ListValueOrBuilder + com.google.protobuf.LongArrayList + com.google.protobuf.ManifestSchemaFactory + com.google.protobuf.MapEntry + com.google.protobuf.MapEntryLite + com.google.protobuf.MapField + com.google.protobuf.MapFieldBuilder + com.google.protobuf.MapFieldLite + com.google.protobuf.MapFieldReflectionAccessor + com.google.protobuf.MapFieldSchema + com.google.protobuf.MapFieldSchemaLite + com.google.protobuf.MapFieldSchemas + com.google.protobuf.Message + com.google.protobuf.MessageInfo + com.google.protobuf.MessageInfoFactory + com.google.protobuf.MessageLite + com.google.protobuf.MessageLiteOrBuilder + com.google.protobuf.MessageLiteToString + com.google.protobuf.MessageOrBuilder + com.google.protobuf.MessageReflection + com.google.protobuf.MessageSchema + com.google.protobuf.MessageSetSchema + com.google.protobuf.Method + com.google.protobuf.MethodOrBuilder + com.google.protobuf.Mixin + com.google.protobuf.MixinOrBuilder + com.google.protobuf.MutabilityOracle + com.google.protobuf.NewInstanceSchema + com.google.protobuf.NewInstanceSchemaLite + com.google.protobuf.NewInstanceSchemas + com.google.protobuf.NioByteString + com.google.protobuf.NullValue + com.google.protobuf.OneofInfo + com.google.protobuf.Option + com.google.protobuf.OptionOrBuilder + com.google.protobuf.Parser + com.google.protobuf.PrimitiveNonBoxingCollection + com.google.protobuf.Protobuf + com.google.protobuf.ProtobufArrayList + com.google.protobuf.ProtocolMessageEnum + com.google.protobuf.ProtocolStringList + com.google.protobuf.ProtoSyntax + com.google.protobuf.RawMessageInfo + com.google.protobuf.Reader + com.google.protobuf.RepeatedFieldBuilderV3 + com.google.protobuf.RopeByteString + com.google.protobuf.Schema + com.google.protobuf.SchemaFactory + com.google.protobuf.SchemaUtil + com.google.protobuf.SerializedForm + com.google.protobuf.SingleFieldBuilderV3 + com.google.protobuf.SmallSortedMap + com.google.protobuf.SourceContext + com.google.protobuf.SourceContextOrBuilder + com.google.protobuf.SourceContextProto + com.google.protobuf.StringValue + com.google.protobuf.StringValueOrBuilder + com.google.protobuf.Struct + com.google.protobuf.StructOrBuilder + com.google.protobuf.StructProto + com.google.protobuf.StructuralMessageInfo + com.google.protobuf.Syntax + com.google.protobuf.TextFormatEscaper + com.google.protobuf.TextFormatInternal + com.google.protobuf.Timestamp + com.google.protobuf.TimestampOrBuilder + com.google.protobuf.TimestampProto + com.google.protobuf.Type + com.google.protobuf.TypeOrBuilder + com.google.protobuf.TypeProto + com.google.protobuf.TypeRegistry + com.google.protobuf.UInt32Value + com.google.protobuf.UInt32ValueOrBuilder + com.google.protobuf.UInt64Value + com.google.protobuf.UInt64ValueOrBuilder + com.google.protobuf.UninitializedMessageException + com.google.protobuf.UnknownFieldSchema + com.google.protobuf.UnknownFieldSet + com.google.protobuf.UnknownFieldSetLite + com.google.protobuf.UnknownFieldSetLiteSchema + com.google.protobuf.UnmodifiableLazyStringList + com.google.protobuf.UnsafeUtil + com.google.protobuf.Utf8 + com.google.protobuf.Value + com.google.protobuf.ValueOrBuilder + com.google.protobuf.WireFormat + com.google.protobuf.WrappersProto + com.google.protobuf.Writer + + com.google.protobuf.AbstractMessageLite$* + com.google.protobuf.AbstractParser$* + com.google.protobuf.AbstractProtobufList$* + com.google.protobuf.Android$* + com.google.protobuf.Any$* + com.google.protobuf.AnyOrBuilder$* + com.google.protobuf.AnyProto$* + com.google.protobuf.Api$* + com.google.protobuf.ApiOrBuilder$* + com.google.protobuf.ApiProto$* + com.google.protobuf.ArrayDecoders$* + com.google.protobuf.BooleanArrayList$* + com.google.protobuf.BoolValue$* + com.google.protobuf.BoolValueOrBuilder$* + com.google.protobuf.ByteBufferWriter$* + com.google.protobuf.ByteOutput$* + com.google.protobuf.ByteString$* + com.google.protobuf.BytesValue$* + com.google.protobuf.BytesValueOrBuilder$* + com.google.protobuf.CanIgnoreReturnValue$* + com.google.protobuf.CheckReturnValue$* + com.google.protobuf.CodedInputStream$* + com.google.protobuf.CodedInputStreamReader$* + com.google.protobuf.CodedOutputStream$* + com.google.protobuf.CodedOutputStreamWriter$* + com.google.protobuf.CompileTimeConstant$* + com.google.protobuf.DescriptorProtos$* + com.google.protobuf.Descriptors$* + com.google.protobuf.DoubleArrayList$* + com.google.protobuf.DoubleValue$* + com.google.protobuf.DoubleValueOrBuilder$* + com.google.protobuf.Duration$* + com.google.protobuf.DurationOrBuilder$* + com.google.protobuf.DurationProto$* + com.google.protobuf.DynamicMessage$* + com.google.protobuf.Empty$* + com.google.protobuf.EmptyOrBuilder$* + com.google.protobuf.EmptyProto$* + com.google.protobuf.Enum$* + com.google.protobuf.EnumOrBuilder$* + com.google.protobuf.EnumValue$* + com.google.protobuf.EnumValueOrBuilder$* + com.google.protobuf.ExperimentalApi$* + com.google.protobuf.Extension$* + com.google.protobuf.ExtensionLite$* + com.google.protobuf.ExtensionRegistry$* + com.google.protobuf.ExtensionRegistryFactory$* + com.google.protobuf.ExtensionRegistryLite$* + com.google.protobuf.ExtensionSchema$* + com.google.protobuf.ExtensionSchemaLite$* + com.google.protobuf.ExtensionSchemas$* + com.google.protobuf.Field$* + com.google.protobuf.FieldInfo$* + com.google.protobuf.FieldMask$* + com.google.protobuf.FieldMaskOrBuilder$* + com.google.protobuf.FieldMaskProto$* + com.google.protobuf.FieldOrBuilder$* + com.google.protobuf.FieldSet$* + com.google.protobuf.FieldType$* + com.google.protobuf.FlattenedAbstractMessage$* + com.google.protobuf.FlattenedGeneratedMessageV3$* + com.google.protobuf.FloatArrayList$* + com.google.protobuf.FloatValue$* + com.google.protobuf.FloatValueOrBuilder$* + com.google.protobuf.GeneratedMessageInfoFactory$* + com.google.protobuf.GeneratedMessageLite$* + com.google.protobuf.InlineMe$* + com.google.protobuf.Int32Value$* + com.google.protobuf.Int32ValueOrBuilder$* + com.google.protobuf.Int64Value$* + com.google.protobuf.Int64ValueOrBuilder$* + com.google.protobuf.IntArrayList$* + com.google.protobuf.Internal$* + com.google.protobuf.InvalidProtocolBufferException$* + com.google.protobuf.IterableByteBufferInputStream$* + com.google.protobuf.Java8Compatibility$* + com.google.protobuf.JavaType$* + com.google.protobuf.LazyField$* + com.google.protobuf.LazyFieldLite$* + com.google.protobuf.LazyStringArrayList$* + com.google.protobuf.LazyStringList$* + com.google.protobuf.LimitedInputStream$* + com.google.protobuf.ListFieldSchema$* + com.google.protobuf.ListValue$* + com.google.protobuf.ListValueOrBuilder$* + com.google.protobuf.LongArrayList$* + com.google.protobuf.ManifestSchemaFactory$* + com.google.protobuf.MapEntry$* + com.google.protobuf.MapEntryLite$* + com.google.protobuf.MapField$* + com.google.protobuf.MapFieldBuilder$* + com.google.protobuf.MapFieldLite$* + com.google.protobuf.MapFieldReflectionAccessor$* + com.google.protobuf.MapFieldSchema$* + com.google.protobuf.MapFieldSchemaLite$* + com.google.protobuf.MapFieldSchemas$* + com.google.protobuf.Message$* + com.google.protobuf.MessageInfo$* + com.google.protobuf.MessageInfoFactory$* + com.google.protobuf.MessageLite$* + com.google.protobuf.MessageLiteOrBuilder$* + com.google.protobuf.MessageLiteToString$* + com.google.protobuf.MessageOrBuilder$* + com.google.protobuf.MessageReflection$* + com.google.protobuf.MessageSchema$* + com.google.protobuf.MessageSetSchema$* + com.google.protobuf.Method$* + com.google.protobuf.MethodOrBuilder$* + com.google.protobuf.Mixin$* + com.google.protobuf.MixinOrBuilder$* + com.google.protobuf.MutabilityOracle$* + com.google.protobuf.NewInstanceSchema$* + com.google.protobuf.NewInstanceSchemaLite$* + com.google.protobuf.NewInstanceSchemas$* + com.google.protobuf.NioByteString$* + com.google.protobuf.NullValue$* + com.google.protobuf.OneofInfo$* + com.google.protobuf.Option$* + com.google.protobuf.OptionOrBuilder$* + com.google.protobuf.Parser$* + com.google.protobuf.PrimitiveNonBoxingCollection$* + com.google.protobuf.Protobuf$* + com.google.protobuf.ProtobufArrayList$* + com.google.protobuf.ProtocolMessageEnum$* + com.google.protobuf.ProtocolStringList$* + com.google.protobuf.ProtoSyntax$* + com.google.protobuf.RawMessageInfo$* + com.google.protobuf.Reader$* + com.google.protobuf.RepeatedFieldBuilderV3$* + com.google.protobuf.RopeByteString$* + com.google.protobuf.Schema$* + com.google.protobuf.SchemaFactory$* + com.google.protobuf.SchemaUtil$* + com.google.protobuf.SerializedForm$* + com.google.protobuf.SingleFieldBuilderV3$* + com.google.protobuf.SmallSortedMap$* + com.google.protobuf.SourceContext$* + com.google.protobuf.SourceContextOrBuilder$* + com.google.protobuf.SourceContextProto$* + com.google.protobuf.StringValue$* + com.google.protobuf.StringValueOrBuilder$* + com.google.protobuf.Struct$* + com.google.protobuf.StructOrBuilder$* + com.google.protobuf.StructProto$* + com.google.protobuf.StructuralMessageInfo$* + com.google.protobuf.Syntax$* + com.google.protobuf.TextFormatEscaper$* + com.google.protobuf.TextFormatInternal$* + com.google.protobuf.Timestamp$* + com.google.protobuf.TimestampOrBuilder$* + com.google.protobuf.TimestampProto$* + com.google.protobuf.Type$* + com.google.protobuf.TypeOrBuilder$* + com.google.protobuf.TypeProto$* + com.google.protobuf.TypeRegistry$* + com.google.protobuf.UInt32Value$* + com.google.protobuf.UInt32ValueOrBuilder$* + com.google.protobuf.UInt64Value$* + com.google.protobuf.UInt64ValueOrBuilder$* + com.google.protobuf.UninitializedMessageException$* + com.google.protobuf.UnknownFieldSchema$* + com.google.protobuf.UnknownFieldSet$* + com.google.protobuf.UnknownFieldSetLite$* + com.google.protobuf.UnknownFieldSetLiteSchema$* + com.google.protobuf.UnmodifiableLazyStringList$* + com.google.protobuf.UnsafeUtil$* + com.google.protobuf.Utf8$* + com.google.protobuf.Value$* + com.google.protobuf.ValueOrBuilder$* + com.google.protobuf.WireFormat$* + com.google.protobuf.WrappersProto$* + com.google.protobuf.Writer$* + + + + + + diff --git a/java-iam/proto-google-iam-v2/pom.xml b/java-iam/proto-google-iam-v2/pom.xml index 22b090e38c..2b9f3cd141 100644 --- a/java-iam/proto-google-iam-v2/pom.xml +++ b/java-iam/proto-google-iam-v2/pom.xml @@ -4,22 +4,28 @@ 4.0.0 com.google.api.grpc proto-google-iam-v2 - 1.49.2-SNAPSHOT + protobuf-shading-within-module proto-google-iam-v2 Proto library for proto-google-iam-v1 com.google.cloud google-iam-parent - 1.49.2-SNAPSHOT + protobuf-shading-within-module + + + + - com.google.protobuf - protobuf-java + org.example + protobuf-sdk + 1.0-SNAPSHOT com.google.api.grpc proto-google-common-protos + protobuf-shading-within-module @@ -28,7 +34,381 @@ org.codehaus.mojo flatten-maven-plugin + 1.7.0 + + org.apache.maven.plugins + maven-shade-plugin + 3.6.0 + + + package + + shade + + + + + org.example:protobuf-sdk + + + + + com.google.protobuf + com.shaded.google.protobuf.iam.v2 + + com.google.protobuf.AbstractMessageLite + com.google.protobuf.AbstractParser + com.google.protobuf.AbstractProtobufList + com.google.protobuf.Android + com.google.protobuf.Any + com.google.protobuf.AnyOrBuilder + com.google.protobuf.AnyProto + com.google.protobuf.Api + com.google.protobuf.ApiOrBuilder + com.google.protobuf.ApiProto + com.google.protobuf.ArrayDecoders + com.google.protobuf.BooleanArrayList + com.google.protobuf.BoolValue + com.google.protobuf.BoolValueOrBuilder + com.google.protobuf.ByteBufferWriter + com.google.protobuf.ByteOutput + com.google.protobuf.ByteString + com.google.protobuf.BytesValue + com.google.protobuf.BytesValueOrBuilder + com.google.protobuf.CanIgnoreReturnValue + com.google.protobuf.CheckReturnValue + com.google.protobuf.CodedInputStream + com.google.protobuf.CodedInputStreamReader + com.google.protobuf.CodedOutputStream + com.google.protobuf.CodedOutputStreamWriter + com.google.protobuf.CompileTimeConstant + com.google.protobuf.DescriptorProtos + com.google.protobuf.Descriptors + com.google.protobuf.DoubleArrayList + com.google.protobuf.DoubleValue + com.google.protobuf.DoubleValueOrBuilder + com.google.protobuf.Duration + com.google.protobuf.DurationOrBuilder + com.google.protobuf.DurationProto + com.google.protobuf.DynamicMessage + com.google.protobuf.Empty + com.google.protobuf.EmptyOrBuilder + com.google.protobuf.EmptyProto + com.google.protobuf.Enum + com.google.protobuf.EnumOrBuilder + com.google.protobuf.EnumValue + com.google.protobuf.EnumValueOrBuilder + com.google.protobuf.ExperimentalApi + com.google.protobuf.Extension + com.google.protobuf.ExtensionLite + com.google.protobuf.ExtensionRegistry + com.google.protobuf.ExtensionRegistryFactory + com.google.protobuf.ExtensionRegistryLite + com.google.protobuf.ExtensionSchema + com.google.protobuf.ExtensionSchemaLite + com.google.protobuf.ExtensionSchemas + com.google.protobuf.Field + com.google.protobuf.FieldInfo + com.google.protobuf.FieldMask + com.google.protobuf.FieldMaskOrBuilder + com.google.protobuf.FieldMaskProto + com.google.protobuf.FieldOrBuilder + com.google.protobuf.FieldSet + com.google.protobuf.FieldType + com.google.protobuf.FlattenedAbstractMessage + com.google.protobuf.FlattenedGeneratedMessageV3 + com.google.protobuf.FloatArrayList + com.google.protobuf.FloatValue + com.google.protobuf.FloatValueOrBuilder + com.google.protobuf.GeneratedMessageInfoFactory + com.google.protobuf.GeneratedMessageLite + com.google.protobuf.InlineMe + com.google.protobuf.Int32Value + com.google.protobuf.Int32ValueOrBuilder + com.google.protobuf.Int64Value + com.google.protobuf.Int64ValueOrBuilder + com.google.protobuf.IntArrayList + com.google.protobuf.Internal + com.google.protobuf.InvalidProtocolBufferException + com.google.protobuf.IterableByteBufferInputStream + com.google.protobuf.Java8Compatibility + com.google.protobuf.JavaType + com.google.protobuf.LazyField + com.google.protobuf.LazyFieldLite + com.google.protobuf.LazyStringArrayList + com.google.protobuf.LazyStringList + com.google.protobuf.LimitedInputStream + com.google.protobuf.ListFieldSchema + com.google.protobuf.ListValue + com.google.protobuf.ListValueOrBuilder + com.google.protobuf.LongArrayList + com.google.protobuf.ManifestSchemaFactory + com.google.protobuf.MapEntry + com.google.protobuf.MapEntryLite + com.google.protobuf.MapField + com.google.protobuf.MapFieldBuilder + com.google.protobuf.MapFieldLite + com.google.protobuf.MapFieldReflectionAccessor + com.google.protobuf.MapFieldSchema + com.google.protobuf.MapFieldSchemaLite + com.google.protobuf.MapFieldSchemas + com.google.protobuf.Message + com.google.protobuf.MessageInfo + com.google.protobuf.MessageInfoFactory + com.google.protobuf.MessageLite + com.google.protobuf.MessageLiteOrBuilder + com.google.protobuf.MessageLiteToString + com.google.protobuf.MessageOrBuilder + com.google.protobuf.MessageReflection + com.google.protobuf.MessageSchema + com.google.protobuf.MessageSetSchema + com.google.protobuf.Method + com.google.protobuf.MethodOrBuilder + com.google.protobuf.Mixin + com.google.protobuf.MixinOrBuilder + com.google.protobuf.MutabilityOracle + com.google.protobuf.NewInstanceSchema + com.google.protobuf.NewInstanceSchemaLite + com.google.protobuf.NewInstanceSchemas + com.google.protobuf.NioByteString + com.google.protobuf.NullValue + com.google.protobuf.OneofInfo + com.google.protobuf.Option + com.google.protobuf.OptionOrBuilder + com.google.protobuf.Parser + com.google.protobuf.PrimitiveNonBoxingCollection + com.google.protobuf.Protobuf + com.google.protobuf.ProtobufArrayList + com.google.protobuf.ProtocolMessageEnum + com.google.protobuf.ProtocolStringList + com.google.protobuf.ProtoSyntax + com.google.protobuf.RawMessageInfo + com.google.protobuf.Reader + com.google.protobuf.RepeatedFieldBuilderV3 + com.google.protobuf.RopeByteString + com.google.protobuf.Schema + com.google.protobuf.SchemaFactory + com.google.protobuf.SchemaUtil + com.google.protobuf.SerializedForm + com.google.protobuf.SingleFieldBuilderV3 + com.google.protobuf.SmallSortedMap + com.google.protobuf.SourceContext + com.google.protobuf.SourceContextOrBuilder + com.google.protobuf.SourceContextProto + com.google.protobuf.StringValue + com.google.protobuf.StringValueOrBuilder + com.google.protobuf.Struct + com.google.protobuf.StructOrBuilder + com.google.protobuf.StructProto + com.google.protobuf.StructuralMessageInfo + com.google.protobuf.Syntax + com.google.protobuf.TextFormatEscaper + com.google.protobuf.TextFormatInternal + com.google.protobuf.Timestamp + com.google.protobuf.TimestampOrBuilder + com.google.protobuf.TimestampProto + com.google.protobuf.Type + com.google.protobuf.TypeOrBuilder + com.google.protobuf.TypeProto + com.google.protobuf.TypeRegistry + com.google.protobuf.UInt32Value + com.google.protobuf.UInt32ValueOrBuilder + com.google.protobuf.UInt64Value + com.google.protobuf.UInt64ValueOrBuilder + com.google.protobuf.UninitializedMessageException + com.google.protobuf.UnknownFieldSchema + com.google.protobuf.UnknownFieldSet + com.google.protobuf.UnknownFieldSetLite + com.google.protobuf.UnknownFieldSetLiteSchema + com.google.protobuf.UnmodifiableLazyStringList + com.google.protobuf.UnsafeUtil + com.google.protobuf.Utf8 + com.google.protobuf.Value + com.google.protobuf.ValueOrBuilder + com.google.protobuf.WireFormat + com.google.protobuf.WrappersProto + com.google.protobuf.Writer + + com.google.protobuf.AbstractMessageLite$* + com.google.protobuf.AbstractParser$* + com.google.protobuf.AbstractProtobufList$* + com.google.protobuf.Android$* + com.google.protobuf.Any$* + com.google.protobuf.AnyOrBuilder$* + com.google.protobuf.AnyProto$* + com.google.protobuf.Api$* + com.google.protobuf.ApiOrBuilder$* + com.google.protobuf.ApiProto$* + com.google.protobuf.ArrayDecoders$* + com.google.protobuf.BooleanArrayList$* + com.google.protobuf.BoolValue$* + com.google.protobuf.BoolValueOrBuilder$* + com.google.protobuf.ByteBufferWriter$* + com.google.protobuf.ByteOutput$* + com.google.protobuf.ByteString$* + com.google.protobuf.BytesValue$* + com.google.protobuf.BytesValueOrBuilder$* + com.google.protobuf.CanIgnoreReturnValue$* + com.google.protobuf.CheckReturnValue$* + com.google.protobuf.CodedInputStream$* + com.google.protobuf.CodedInputStreamReader$* + com.google.protobuf.CodedOutputStream$* + com.google.protobuf.CodedOutputStreamWriter$* + com.google.protobuf.CompileTimeConstant$* + com.google.protobuf.DescriptorProtos$* + com.google.protobuf.Descriptors$* + com.google.protobuf.DoubleArrayList$* + com.google.protobuf.DoubleValue$* + com.google.protobuf.DoubleValueOrBuilder$* + com.google.protobuf.Duration$* + com.google.protobuf.DurationOrBuilder$* + com.google.protobuf.DurationProto$* + com.google.protobuf.DynamicMessage$* + com.google.protobuf.Empty$* + com.google.protobuf.EmptyOrBuilder$* + com.google.protobuf.EmptyProto$* + com.google.protobuf.Enum$* + com.google.protobuf.EnumOrBuilder$* + com.google.protobuf.EnumValue$* + com.google.protobuf.EnumValueOrBuilder$* + com.google.protobuf.ExperimentalApi$* + com.google.protobuf.Extension$* + com.google.protobuf.ExtensionLite$* + com.google.protobuf.ExtensionRegistry$* + com.google.protobuf.ExtensionRegistryFactory$* + com.google.protobuf.ExtensionRegistryLite$* + com.google.protobuf.ExtensionSchema$* + com.google.protobuf.ExtensionSchemaLite$* + com.google.protobuf.ExtensionSchemas$* + com.google.protobuf.Field$* + com.google.protobuf.FieldInfo$* + com.google.protobuf.FieldMask$* + com.google.protobuf.FieldMaskOrBuilder$* + com.google.protobuf.FieldMaskProto$* + com.google.protobuf.FieldOrBuilder$* + com.google.protobuf.FieldSet$* + com.google.protobuf.FieldType$* + com.google.protobuf.FlattenedAbstractMessage$* + com.google.protobuf.FlattenedGeneratedMessageV3$* + com.google.protobuf.FloatArrayList$* + com.google.protobuf.FloatValue$* + com.google.protobuf.FloatValueOrBuilder$* + com.google.protobuf.GeneratedMessageInfoFactory$* + com.google.protobuf.GeneratedMessageLite$* + com.google.protobuf.InlineMe$* + com.google.protobuf.Int32Value$* + com.google.protobuf.Int32ValueOrBuilder$* + com.google.protobuf.Int64Value$* + com.google.protobuf.Int64ValueOrBuilder$* + com.google.protobuf.IntArrayList$* + com.google.protobuf.Internal$* + com.google.protobuf.InvalidProtocolBufferException$* + com.google.protobuf.IterableByteBufferInputStream$* + com.google.protobuf.Java8Compatibility$* + com.google.protobuf.JavaType$* + com.google.protobuf.LazyField$* + com.google.protobuf.LazyFieldLite$* + com.google.protobuf.LazyStringArrayList$* + com.google.protobuf.LazyStringList$* + com.google.protobuf.LimitedInputStream$* + com.google.protobuf.ListFieldSchema$* + com.google.protobuf.ListValue$* + com.google.protobuf.ListValueOrBuilder$* + com.google.protobuf.LongArrayList$* + com.google.protobuf.ManifestSchemaFactory$* + com.google.protobuf.MapEntry$* + com.google.protobuf.MapEntryLite$* + com.google.protobuf.MapField$* + com.google.protobuf.MapFieldBuilder$* + com.google.protobuf.MapFieldLite$* + com.google.protobuf.MapFieldReflectionAccessor$* + com.google.protobuf.MapFieldSchema$* + com.google.protobuf.MapFieldSchemaLite$* + com.google.protobuf.MapFieldSchemas$* + com.google.protobuf.Message$* + com.google.protobuf.MessageInfo$* + com.google.protobuf.MessageInfoFactory$* + com.google.protobuf.MessageLite$* + com.google.protobuf.MessageLiteOrBuilder$* + com.google.protobuf.MessageLiteToString$* + com.google.protobuf.MessageOrBuilder$* + com.google.protobuf.MessageReflection$* + com.google.protobuf.MessageSchema$* + com.google.protobuf.MessageSetSchema$* + com.google.protobuf.Method$* + com.google.protobuf.MethodOrBuilder$* + com.google.protobuf.Mixin$* + com.google.protobuf.MixinOrBuilder$* + com.google.protobuf.MutabilityOracle$* + com.google.protobuf.NewInstanceSchema$* + com.google.protobuf.NewInstanceSchemaLite$* + com.google.protobuf.NewInstanceSchemas$* + com.google.protobuf.NioByteString$* + com.google.protobuf.NullValue$* + com.google.protobuf.OneofInfo$* + com.google.protobuf.Option$* + com.google.protobuf.OptionOrBuilder$* + com.google.protobuf.Parser$* + com.google.protobuf.PrimitiveNonBoxingCollection$* + com.google.protobuf.Protobuf$* + com.google.protobuf.ProtobufArrayList$* + com.google.protobuf.ProtocolMessageEnum$* + com.google.protobuf.ProtocolStringList$* + com.google.protobuf.ProtoSyntax$* + com.google.protobuf.RawMessageInfo$* + com.google.protobuf.Reader$* + com.google.protobuf.RepeatedFieldBuilderV3$* + com.google.protobuf.RopeByteString$* + com.google.protobuf.Schema$* + com.google.protobuf.SchemaFactory$* + com.google.protobuf.SchemaUtil$* + com.google.protobuf.SerializedForm$* + com.google.protobuf.SingleFieldBuilderV3$* + com.google.protobuf.SmallSortedMap$* + com.google.protobuf.SourceContext$* + com.google.protobuf.SourceContextOrBuilder$* + com.google.protobuf.SourceContextProto$* + com.google.protobuf.StringValue$* + com.google.protobuf.StringValueOrBuilder$* + com.google.protobuf.Struct$* + com.google.protobuf.StructOrBuilder$* + com.google.protobuf.StructProto$* + com.google.protobuf.StructuralMessageInfo$* + com.google.protobuf.Syntax$* + com.google.protobuf.TextFormatEscaper$* + com.google.protobuf.TextFormatInternal$* + com.google.protobuf.Timestamp$* + com.google.protobuf.TimestampOrBuilder$* + com.google.protobuf.TimestampProto$* + com.google.protobuf.Type$* + com.google.protobuf.TypeOrBuilder$* + com.google.protobuf.TypeProto$* + com.google.protobuf.TypeRegistry$* + com.google.protobuf.UInt32Value$* + com.google.protobuf.UInt32ValueOrBuilder$* + com.google.protobuf.UInt64Value$* + com.google.protobuf.UInt64ValueOrBuilder$* + com.google.protobuf.UninitializedMessageException$* + com.google.protobuf.UnknownFieldSchema$* + com.google.protobuf.UnknownFieldSet$* + com.google.protobuf.UnknownFieldSetLite$* + com.google.protobuf.UnknownFieldSetLiteSchema$* + com.google.protobuf.UnmodifiableLazyStringList$* + com.google.protobuf.UnsafeUtil$* + com.google.protobuf.Utf8$* + com.google.protobuf.Value$* + com.google.protobuf.ValueOrBuilder$* + com.google.protobuf.WireFormat$* + com.google.protobuf.WrappersProto$* + com.google.protobuf.Writer$* + + + + + + + diff --git a/java-iam/proto-google-iam-v2beta/pom.xml b/java-iam/proto-google-iam-v2beta/pom.xml index db5ff96114..ecab2f6967 100644 --- a/java-iam/proto-google-iam-v2beta/pom.xml +++ b/java-iam/proto-google-iam-v2beta/pom.xml @@ -4,22 +4,28 @@ 4.0.0 com.google.api.grpc proto-google-iam-v2beta - 1.49.2-SNAPSHOT + protobuf-shading-within-module proto-google-iam-v2beta Proto library for proto-google-iam-v1 com.google.cloud google-iam-parent - 1.49.2-SNAPSHOT + protobuf-shading-within-module + + + + - com.google.protobuf - protobuf-java + org.example + protobuf-sdk + 1.0-SNAPSHOT com.google.api.grpc proto-google-common-protos + protobuf-shading-within-module @@ -28,7 +34,381 @@ org.codehaus.mojo flatten-maven-plugin + 1.7.0 + + org.apache.maven.plugins + maven-shade-plugin + 3.6.0 + + + package + + shade + + + + + org.example:protobuf-sdk + + + + + com.google.protobuf + com.shaded.google.protobuf.iam.v2beta + + com.google.protobuf.AbstractMessageLite + com.google.protobuf.AbstractParser + com.google.protobuf.AbstractProtobufList + com.google.protobuf.Android + com.google.protobuf.Any + com.google.protobuf.AnyOrBuilder + com.google.protobuf.AnyProto + com.google.protobuf.Api + com.google.protobuf.ApiOrBuilder + com.google.protobuf.ApiProto + com.google.protobuf.ArrayDecoders + com.google.protobuf.BooleanArrayList + com.google.protobuf.BoolValue + com.google.protobuf.BoolValueOrBuilder + com.google.protobuf.ByteBufferWriter + com.google.protobuf.ByteOutput + com.google.protobuf.ByteString + com.google.protobuf.BytesValue + com.google.protobuf.BytesValueOrBuilder + com.google.protobuf.CanIgnoreReturnValue + com.google.protobuf.CheckReturnValue + com.google.protobuf.CodedInputStream + com.google.protobuf.CodedInputStreamReader + com.google.protobuf.CodedOutputStream + com.google.protobuf.CodedOutputStreamWriter + com.google.protobuf.CompileTimeConstant + com.google.protobuf.DescriptorProtos + com.google.protobuf.Descriptors + com.google.protobuf.DoubleArrayList + com.google.protobuf.DoubleValue + com.google.protobuf.DoubleValueOrBuilder + com.google.protobuf.Duration + com.google.protobuf.DurationOrBuilder + com.google.protobuf.DurationProto + com.google.protobuf.DynamicMessage + com.google.protobuf.Empty + com.google.protobuf.EmptyOrBuilder + com.google.protobuf.EmptyProto + com.google.protobuf.Enum + com.google.protobuf.EnumOrBuilder + com.google.protobuf.EnumValue + com.google.protobuf.EnumValueOrBuilder + com.google.protobuf.ExperimentalApi + com.google.protobuf.Extension + com.google.protobuf.ExtensionLite + com.google.protobuf.ExtensionRegistry + com.google.protobuf.ExtensionRegistryFactory + com.google.protobuf.ExtensionRegistryLite + com.google.protobuf.ExtensionSchema + com.google.protobuf.ExtensionSchemaLite + com.google.protobuf.ExtensionSchemas + com.google.protobuf.Field + com.google.protobuf.FieldInfo + com.google.protobuf.FieldMask + com.google.protobuf.FieldMaskOrBuilder + com.google.protobuf.FieldMaskProto + com.google.protobuf.FieldOrBuilder + com.google.protobuf.FieldSet + com.google.protobuf.FieldType + com.google.protobuf.FlattenedAbstractMessage + com.google.protobuf.FlattenedGeneratedMessageV3 + com.google.protobuf.FloatArrayList + com.google.protobuf.FloatValue + com.google.protobuf.FloatValueOrBuilder + com.google.protobuf.GeneratedMessageInfoFactory + com.google.protobuf.GeneratedMessageLite + com.google.protobuf.InlineMe + com.google.protobuf.Int32Value + com.google.protobuf.Int32ValueOrBuilder + com.google.protobuf.Int64Value + com.google.protobuf.Int64ValueOrBuilder + com.google.protobuf.IntArrayList + com.google.protobuf.Internal + com.google.protobuf.InvalidProtocolBufferException + com.google.protobuf.IterableByteBufferInputStream + com.google.protobuf.Java8Compatibility + com.google.protobuf.JavaType + com.google.protobuf.LazyField + com.google.protobuf.LazyFieldLite + com.google.protobuf.LazyStringArrayList + com.google.protobuf.LazyStringList + com.google.protobuf.LimitedInputStream + com.google.protobuf.ListFieldSchema + com.google.protobuf.ListValue + com.google.protobuf.ListValueOrBuilder + com.google.protobuf.LongArrayList + com.google.protobuf.ManifestSchemaFactory + com.google.protobuf.MapEntry + com.google.protobuf.MapEntryLite + com.google.protobuf.MapField + com.google.protobuf.MapFieldBuilder + com.google.protobuf.MapFieldLite + com.google.protobuf.MapFieldReflectionAccessor + com.google.protobuf.MapFieldSchema + com.google.protobuf.MapFieldSchemaLite + com.google.protobuf.MapFieldSchemas + com.google.protobuf.Message + com.google.protobuf.MessageInfo + com.google.protobuf.MessageInfoFactory + com.google.protobuf.MessageLite + com.google.protobuf.MessageLiteOrBuilder + com.google.protobuf.MessageLiteToString + com.google.protobuf.MessageOrBuilder + com.google.protobuf.MessageReflection + com.google.protobuf.MessageSchema + com.google.protobuf.MessageSetSchema + com.google.protobuf.Method + com.google.protobuf.MethodOrBuilder + com.google.protobuf.Mixin + com.google.protobuf.MixinOrBuilder + com.google.protobuf.MutabilityOracle + com.google.protobuf.NewInstanceSchema + com.google.protobuf.NewInstanceSchemaLite + com.google.protobuf.NewInstanceSchemas + com.google.protobuf.NioByteString + com.google.protobuf.NullValue + com.google.protobuf.OneofInfo + com.google.protobuf.Option + com.google.protobuf.OptionOrBuilder + com.google.protobuf.Parser + com.google.protobuf.PrimitiveNonBoxingCollection + com.google.protobuf.Protobuf + com.google.protobuf.ProtobufArrayList + com.google.protobuf.ProtocolMessageEnum + com.google.protobuf.ProtocolStringList + com.google.protobuf.ProtoSyntax + com.google.protobuf.RawMessageInfo + com.google.protobuf.Reader + com.google.protobuf.RepeatedFieldBuilderV3 + com.google.protobuf.RopeByteString + com.google.protobuf.Schema + com.google.protobuf.SchemaFactory + com.google.protobuf.SchemaUtil + com.google.protobuf.SerializedForm + com.google.protobuf.SingleFieldBuilderV3 + com.google.protobuf.SmallSortedMap + com.google.protobuf.SourceContext + com.google.protobuf.SourceContextOrBuilder + com.google.protobuf.SourceContextProto + com.google.protobuf.StringValue + com.google.protobuf.StringValueOrBuilder + com.google.protobuf.Struct + com.google.protobuf.StructOrBuilder + com.google.protobuf.StructProto + com.google.protobuf.StructuralMessageInfo + com.google.protobuf.Syntax + com.google.protobuf.TextFormatEscaper + com.google.protobuf.TextFormatInternal + com.google.protobuf.Timestamp + com.google.protobuf.TimestampOrBuilder + com.google.protobuf.TimestampProto + com.google.protobuf.Type + com.google.protobuf.TypeOrBuilder + com.google.protobuf.TypeProto + com.google.protobuf.TypeRegistry + com.google.protobuf.UInt32Value + com.google.protobuf.UInt32ValueOrBuilder + com.google.protobuf.UInt64Value + com.google.protobuf.UInt64ValueOrBuilder + com.google.protobuf.UninitializedMessageException + com.google.protobuf.UnknownFieldSchema + com.google.protobuf.UnknownFieldSet + com.google.protobuf.UnknownFieldSetLite + com.google.protobuf.UnknownFieldSetLiteSchema + com.google.protobuf.UnmodifiableLazyStringList + com.google.protobuf.UnsafeUtil + com.google.protobuf.Utf8 + com.google.protobuf.Value + com.google.protobuf.ValueOrBuilder + com.google.protobuf.WireFormat + com.google.protobuf.WrappersProto + com.google.protobuf.Writer + + com.google.protobuf.AbstractMessageLite$* + com.google.protobuf.AbstractParser$* + com.google.protobuf.AbstractProtobufList$* + com.google.protobuf.Android$* + com.google.protobuf.Any$* + com.google.protobuf.AnyOrBuilder$* + com.google.protobuf.AnyProto$* + com.google.protobuf.Api$* + com.google.protobuf.ApiOrBuilder$* + com.google.protobuf.ApiProto$* + com.google.protobuf.ArrayDecoders$* + com.google.protobuf.BooleanArrayList$* + com.google.protobuf.BoolValue$* + com.google.protobuf.BoolValueOrBuilder$* + com.google.protobuf.ByteBufferWriter$* + com.google.protobuf.ByteOutput$* + com.google.protobuf.ByteString$* + com.google.protobuf.BytesValue$* + com.google.protobuf.BytesValueOrBuilder$* + com.google.protobuf.CanIgnoreReturnValue$* + com.google.protobuf.CheckReturnValue$* + com.google.protobuf.CodedInputStream$* + com.google.protobuf.CodedInputStreamReader$* + com.google.protobuf.CodedOutputStream$* + com.google.protobuf.CodedOutputStreamWriter$* + com.google.protobuf.CompileTimeConstant$* + com.google.protobuf.DescriptorProtos$* + com.google.protobuf.Descriptors$* + com.google.protobuf.DoubleArrayList$* + com.google.protobuf.DoubleValue$* + com.google.protobuf.DoubleValueOrBuilder$* + com.google.protobuf.Duration$* + com.google.protobuf.DurationOrBuilder$* + com.google.protobuf.DurationProto$* + com.google.protobuf.DynamicMessage$* + com.google.protobuf.Empty$* + com.google.protobuf.EmptyOrBuilder$* + com.google.protobuf.EmptyProto$* + com.google.protobuf.Enum$* + com.google.protobuf.EnumOrBuilder$* + com.google.protobuf.EnumValue$* + com.google.protobuf.EnumValueOrBuilder$* + com.google.protobuf.ExperimentalApi$* + com.google.protobuf.Extension$* + com.google.protobuf.ExtensionLite$* + com.google.protobuf.ExtensionRegistry$* + com.google.protobuf.ExtensionRegistryFactory$* + com.google.protobuf.ExtensionRegistryLite$* + com.google.protobuf.ExtensionSchema$* + com.google.protobuf.ExtensionSchemaLite$* + com.google.protobuf.ExtensionSchemas$* + com.google.protobuf.Field$* + com.google.protobuf.FieldInfo$* + com.google.protobuf.FieldMask$* + com.google.protobuf.FieldMaskOrBuilder$* + com.google.protobuf.FieldMaskProto$* + com.google.protobuf.FieldOrBuilder$* + com.google.protobuf.FieldSet$* + com.google.protobuf.FieldType$* + com.google.protobuf.FlattenedAbstractMessage$* + com.google.protobuf.FlattenedGeneratedMessageV3$* + com.google.protobuf.FloatArrayList$* + com.google.protobuf.FloatValue$* + com.google.protobuf.FloatValueOrBuilder$* + com.google.protobuf.GeneratedMessageInfoFactory$* + com.google.protobuf.GeneratedMessageLite$* + com.google.protobuf.InlineMe$* + com.google.protobuf.Int32Value$* + com.google.protobuf.Int32ValueOrBuilder$* + com.google.protobuf.Int64Value$* + com.google.protobuf.Int64ValueOrBuilder$* + com.google.protobuf.IntArrayList$* + com.google.protobuf.Internal$* + com.google.protobuf.InvalidProtocolBufferException$* + com.google.protobuf.IterableByteBufferInputStream$* + com.google.protobuf.Java8Compatibility$* + com.google.protobuf.JavaType$* + com.google.protobuf.LazyField$* + com.google.protobuf.LazyFieldLite$* + com.google.protobuf.LazyStringArrayList$* + com.google.protobuf.LazyStringList$* + com.google.protobuf.LimitedInputStream$* + com.google.protobuf.ListFieldSchema$* + com.google.protobuf.ListValue$* + com.google.protobuf.ListValueOrBuilder$* + com.google.protobuf.LongArrayList$* + com.google.protobuf.ManifestSchemaFactory$* + com.google.protobuf.MapEntry$* + com.google.protobuf.MapEntryLite$* + com.google.protobuf.MapField$* + com.google.protobuf.MapFieldBuilder$* + com.google.protobuf.MapFieldLite$* + com.google.protobuf.MapFieldReflectionAccessor$* + com.google.protobuf.MapFieldSchema$* + com.google.protobuf.MapFieldSchemaLite$* + com.google.protobuf.MapFieldSchemas$* + com.google.protobuf.Message$* + com.google.protobuf.MessageInfo$* + com.google.protobuf.MessageInfoFactory$* + com.google.protobuf.MessageLite$* + com.google.protobuf.MessageLiteOrBuilder$* + com.google.protobuf.MessageLiteToString$* + com.google.protobuf.MessageOrBuilder$* + com.google.protobuf.MessageReflection$* + com.google.protobuf.MessageSchema$* + com.google.protobuf.MessageSetSchema$* + com.google.protobuf.Method$* + com.google.protobuf.MethodOrBuilder$* + com.google.protobuf.Mixin$* + com.google.protobuf.MixinOrBuilder$* + com.google.protobuf.MutabilityOracle$* + com.google.protobuf.NewInstanceSchema$* + com.google.protobuf.NewInstanceSchemaLite$* + com.google.protobuf.NewInstanceSchemas$* + com.google.protobuf.NioByteString$* + com.google.protobuf.NullValue$* + com.google.protobuf.OneofInfo$* + com.google.protobuf.Option$* + com.google.protobuf.OptionOrBuilder$* + com.google.protobuf.Parser$* + com.google.protobuf.PrimitiveNonBoxingCollection$* + com.google.protobuf.Protobuf$* + com.google.protobuf.ProtobufArrayList$* + com.google.protobuf.ProtocolMessageEnum$* + com.google.protobuf.ProtocolStringList$* + com.google.protobuf.ProtoSyntax$* + com.google.protobuf.RawMessageInfo$* + com.google.protobuf.Reader$* + com.google.protobuf.RepeatedFieldBuilderV3$* + com.google.protobuf.RopeByteString$* + com.google.protobuf.Schema$* + com.google.protobuf.SchemaFactory$* + com.google.protobuf.SchemaUtil$* + com.google.protobuf.SerializedForm$* + com.google.protobuf.SingleFieldBuilderV3$* + com.google.protobuf.SmallSortedMap$* + com.google.protobuf.SourceContext$* + com.google.protobuf.SourceContextOrBuilder$* + com.google.protobuf.SourceContextProto$* + com.google.protobuf.StringValue$* + com.google.protobuf.StringValueOrBuilder$* + com.google.protobuf.Struct$* + com.google.protobuf.StructOrBuilder$* + com.google.protobuf.StructProto$* + com.google.protobuf.StructuralMessageInfo$* + com.google.protobuf.Syntax$* + com.google.protobuf.TextFormatEscaper$* + com.google.protobuf.TextFormatInternal$* + com.google.protobuf.Timestamp$* + com.google.protobuf.TimestampOrBuilder$* + com.google.protobuf.TimestampProto$* + com.google.protobuf.Type$* + com.google.protobuf.TypeOrBuilder$* + com.google.protobuf.TypeProto$* + com.google.protobuf.TypeRegistry$* + com.google.protobuf.UInt32Value$* + com.google.protobuf.UInt32ValueOrBuilder$* + com.google.protobuf.UInt64Value$* + com.google.protobuf.UInt64ValueOrBuilder$* + com.google.protobuf.UninitializedMessageException$* + com.google.protobuf.UnknownFieldSchema$* + com.google.protobuf.UnknownFieldSet$* + com.google.protobuf.UnknownFieldSetLite$* + com.google.protobuf.UnknownFieldSetLiteSchema$* + com.google.protobuf.UnmodifiableLazyStringList$* + com.google.protobuf.UnsafeUtil$* + com.google.protobuf.Utf8$* + com.google.protobuf.Value$* + com.google.protobuf.ValueOrBuilder$* + com.google.protobuf.WireFormat$* + com.google.protobuf.WrappersProto$* + com.google.protobuf.Writer$* + + + + + + + diff --git a/java-shared-dependencies/first-party-dependencies/pom.xml b/java-shared-dependencies/first-party-dependencies/pom.xml index 3298719ed0..40ddd87c1b 100644 --- a/java-shared-dependencies/first-party-dependencies/pom.xml +++ b/java-shared-dependencies/first-party-dependencies/pom.xml @@ -45,7 +45,7 @@ com.google.cloud google-cloud-core-bom - 2.53.2-SNAPSHOT + protobuf-shading-within-module pom import @@ -69,13 +69,13 @@ com.google.cloud google-cloud-core - 2.53.2-SNAPSHOT + protobuf-shading-within-module test-jar com.google.cloud google-cloud-core - 2.53.2-SNAPSHOT + protobuf-shading-within-module tests diff --git a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockCompliance.java b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockCompliance.java index dbf0d0e821..b1315aa4f5 100644 --- a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockCompliance.java +++ b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockCompliance.java @@ -18,7 +18,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; import javax.annotation.Generated; @@ -33,12 +33,12 @@ public MockCompliance() { } @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/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockComplianceImpl.java b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockComplianceImpl.java index b8104527bd..1adc89e641 100644 --- a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockComplianceImpl.java +++ b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockComplianceImpl.java @@ -17,7 +17,7 @@ package com.google.showcase.v1beta1; import com.google.api.core.BetaApi; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import com.google.showcase.v1beta1.ComplianceGrpc.ComplianceImplBase; import io.grpc.stub.StreamObserver; import java.util.ArrayList; @@ -29,7 +29,7 @@ @BetaApi @Generated("by gapic-generator-java") public class MockComplianceImpl extends ComplianceImplBase { - private List requests; + private List requests; private Queue responses; public MockComplianceImpl() { @@ -37,15 +37,15 @@ public MockComplianceImpl() { 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/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockEcho.java b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockEcho.java index fc9db96a3e..4567510576 100644 --- a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockEcho.java +++ b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockEcho.java @@ -18,7 +18,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; import javax.annotation.Generated; @@ -33,12 +33,12 @@ public MockEcho() { } @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/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockEchoImpl.java b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockEchoImpl.java index f19c1090ee..199acb4e43 100644 --- a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockEchoImpl.java +++ b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockEchoImpl.java @@ -18,7 +18,7 @@ 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; @@ -30,7 +30,7 @@ @BetaApi @Generated("by gapic-generator-java") public class MockEchoImpl extends EchoImplBase { - private List requests; + private List requests; private Queue responses; public MockEchoImpl() { @@ -38,15 +38,15 @@ public MockEchoImpl() { 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/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockIAMPolicy.java b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockIAMPolicy.java index ef37c3d404..1e7ea12163 100644 --- a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockIAMPolicy.java +++ b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockIAMPolicy.java @@ -18,7 +18,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; import javax.annotation.Generated; @@ -33,12 +33,12 @@ public MockIAMPolicy() { } @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/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockIAMPolicyImpl.java b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockIAMPolicyImpl.java index 3c9b26728b..056fc23997 100644 --- a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockIAMPolicyImpl.java +++ b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockIAMPolicyImpl.java @@ -23,7 +23,7 @@ import com.google.iam.v1.SetIamPolicyRequest; import com.google.iam.v1.TestIamPermissionsRequest; import com.google.iam.v1.TestIamPermissionsResponse; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -34,7 +34,7 @@ @BetaApi @Generated("by gapic-generator-java") public class MockIAMPolicyImpl extends IAMPolicyImplBase { - private List requests; + private List requests; private Queue responses; public MockIAMPolicyImpl() { @@ -42,15 +42,15 @@ public MockIAMPolicyImpl() { 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/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockIdentity.java b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockIdentity.java index e6b7dd1c46..a32c1120ce 100644 --- a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockIdentity.java +++ b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockIdentity.java @@ -18,7 +18,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; import javax.annotation.Generated; @@ -33,12 +33,12 @@ public MockIdentity() { } @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/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockIdentityImpl.java b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockIdentityImpl.java index 31b7602e49..e81da8f5c9 100644 --- a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockIdentityImpl.java +++ b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockIdentityImpl.java @@ -17,8 +17,8 @@ package com.google.showcase.v1beta1; import com.google.api.core.BetaApi; -import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; +import com.google.protobuf.Message; import com.google.showcase.v1beta1.IdentityGrpc.IdentityImplBase; import io.grpc.stub.StreamObserver; import java.util.ArrayList; @@ -30,7 +30,7 @@ @BetaApi @Generated("by gapic-generator-java") public class MockIdentityImpl extends IdentityImplBase { - private List requests; + private List requests; private Queue responses; public MockIdentityImpl() { @@ -38,15 +38,15 @@ public MockIdentityImpl() { 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/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockLocations.java b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockLocations.java index 43855bd7e0..9322aca03b 100644 --- a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockLocations.java +++ b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockLocations.java @@ -18,7 +18,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; import javax.annotation.Generated; @@ -33,12 +33,12 @@ public MockLocations() { } @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/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockLocationsImpl.java b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockLocationsImpl.java index 59502a268d..3a8bb6de7b 100644 --- a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockLocationsImpl.java +++ b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockLocationsImpl.java @@ -22,7 +22,7 @@ import com.google.cloud.location.ListLocationsResponse; import com.google.cloud.location.Location; import com.google.cloud.location.LocationsGrpc.LocationsImplBase; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -33,7 +33,7 @@ @BetaApi @Generated("by gapic-generator-java") public class MockLocationsImpl extends LocationsImplBase { - private List requests; + private List requests; private Queue responses; public MockLocationsImpl() { @@ -41,15 +41,15 @@ public MockLocationsImpl() { 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/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockMessaging.java b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockMessaging.java index b9517576ed..7e760e9147 100644 --- a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockMessaging.java +++ b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockMessaging.java @@ -18,7 +18,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; import javax.annotation.Generated; @@ -33,12 +33,12 @@ public MockMessaging() { } @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/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockMessagingImpl.java b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockMessagingImpl.java index 2a36840c7c..d900f71c4f 100644 --- a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockMessagingImpl.java +++ b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockMessagingImpl.java @@ -18,8 +18,8 @@ import com.google.api.core.BetaApi; import com.google.longrunning.Operation; -import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; +import com.google.protobuf.Message; import com.google.showcase.v1beta1.MessagingGrpc.MessagingImplBase; import io.grpc.stub.StreamObserver; import java.util.ArrayList; @@ -31,7 +31,7 @@ @BetaApi @Generated("by gapic-generator-java") public class MockMessagingImpl extends MessagingImplBase { - private List requests; + private List requests; private Queue responses; public MockMessagingImpl() { @@ -39,15 +39,15 @@ public MockMessagingImpl() { 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/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockSequenceService.java b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockSequenceService.java index 606571e14d..d6c9ed2659 100644 --- a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockSequenceService.java +++ b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockSequenceService.java @@ -18,7 +18,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; import javax.annotation.Generated; @@ -33,12 +33,12 @@ public MockSequenceService() { } @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/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockSequenceServiceImpl.java b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockSequenceServiceImpl.java index a5e62fe1ad..55eae49147 100644 --- a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockSequenceServiceImpl.java +++ b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockSequenceServiceImpl.java @@ -17,8 +17,8 @@ package com.google.showcase.v1beta1; import com.google.api.core.BetaApi; -import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; +import com.google.protobuf.Message; import com.google.showcase.v1beta1.SequenceServiceGrpc.SequenceServiceImplBase; import io.grpc.stub.StreamObserver; import java.util.ArrayList; @@ -30,7 +30,7 @@ @BetaApi @Generated("by gapic-generator-java") public class MockSequenceServiceImpl extends SequenceServiceImplBase { - private List requests; + private List requests; private Queue responses; public MockSequenceServiceImpl() { @@ -38,15 +38,15 @@ public MockSequenceServiceImpl() { 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/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockTesting.java b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockTesting.java index c03ddbbe4a..f59b3e89d9 100644 --- a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockTesting.java +++ b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockTesting.java @@ -18,7 +18,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; import javax.annotation.Generated; @@ -33,12 +33,12 @@ public MockTesting() { } @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/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockTestingImpl.java b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockTestingImpl.java index a73afd59a3..b2bc134089 100644 --- a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockTestingImpl.java +++ b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/MockTestingImpl.java @@ -17,8 +17,8 @@ package com.google.showcase.v1beta1; import com.google.api.core.BetaApi; -import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; +import com.google.protobuf.Message; import com.google.showcase.v1beta1.TestingGrpc.TestingImplBase; import io.grpc.stub.StreamObserver; import java.util.ArrayList; @@ -30,7 +30,7 @@ @BetaApi @Generated("by gapic-generator-java") public class MockTestingImpl extends TestingImplBase { - private List requests; + private List requests; private Queue responses; public MockTestingImpl() { @@ -38,15 +38,15 @@ public MockTestingImpl() { 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/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/logging/ITLogging.java b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/logging/ITLogging.java index 5979b88c41..86ffaeb975 100644 --- a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/logging/ITLogging.java +++ b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/logging/ITLogging.java @@ -1,257 +1,257 @@ -/* - * Copyright 2025 Google LLC - * - * 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 - * - * https://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.google.showcase.v1beta1.it.logging; - -import static com.google.common.truth.Truth.assertThat; - -import ch.qos.logback.classic.Level; -import ch.qos.logback.classic.spi.ILoggingEvent; -import com.google.api.gax.grpc.GrpcLoggingInterceptor; -import com.google.api.gax.httpjson.HttpJsonLoggingInterceptor; -import com.google.common.collect.ImmutableMap; -import com.google.showcase.v1beta1.EchoClient; -import com.google.showcase.v1beta1.EchoRequest; -import com.google.showcase.v1beta1.EchoResponse; -import com.google.showcase.v1beta1.it.util.TestClientInitializer; -import java.util.List; -import java.util.Map; -import java.util.concurrent.TimeUnit; -import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Test; -import org.slf4j.LoggerFactory; -import org.slf4j.event.KeyValuePair; - -// This test needs to run with GOOGLE_SDK_JAVA_LOGGING=true -// mvn clean verify -P '!showcase,enable-integration-tests,loggingTestBase,slf4j2_logback' -public class ITLogging { - private static EchoClient grpcClient; - - private static EchoClient httpjsonClient; - - private static final KeyValuePair SERVICE_NAME_KEY_VALUE_PAIR = - new KeyValuePair("serviceName", "google.showcase.v1beta1.Echo"); - private static final KeyValuePair RPC_NAME_KEY_VALUE_PAIR = - new KeyValuePair("rpcName", "google.showcase.v1beta1.Echo/Echo"); - private static final KeyValuePair RESPONSE_STATUS_KEY_VALUE_PAIR = - new KeyValuePair("response.status", "OK"); - private static final KeyValuePair RESPONSE_STATUS_KEY_VALUE_PAIR_HTTP = - new KeyValuePair("response.status", "200"); - private static final KeyValuePair REQUEST_URL_KEY_VALUE_PAIR = - new KeyValuePair("request.url", "http://localhost:7469"); - - private static final KeyValuePair RESPONSE_HEADERS_KEY_VALUE_PAIR = - new KeyValuePair("response.headers", ImmutableMap.of("content-type", "application/grpc")); - - private static final String SENDING_REQUEST_MESSAGE = "Sending request"; - private static final String RECEIVING_RESPONSE_MESSAGE = "Received response"; - private static final String ECHO_STRING = "echo?"; - - private TestAppender setupTestLogger(Class clazz, Level level) { - TestAppender testAppender = new TestAppender(); - testAppender.start(); - org.slf4j.Logger logger = LoggerFactory.getLogger(clazz); - ((ch.qos.logback.classic.Logger) logger).setLevel(level); - ((ch.qos.logback.classic.Logger) logger).addAppender(testAppender); - return testAppender; - } - - @BeforeAll - static void createClients() throws Exception { - // Create gRPC Echo Client - grpcClient = TestClientInitializer.createGrpcEchoClient(); - // Create Http JSON Echo Client - httpjsonClient = TestClientInitializer.createHttpJsonEchoClient(); - } - - @AfterAll - static void destroyClients() throws InterruptedException { - grpcClient.close(); - httpjsonClient.close(); - - grpcClient.awaitTermination(TestClientInitializer.AWAIT_TERMINATION_SECONDS, TimeUnit.SECONDS); - httpjsonClient.awaitTermination( - TestClientInitializer.AWAIT_TERMINATION_SECONDS, TimeUnit.SECONDS); - } - - @Test - void testGrpc_receiveContent_logDebug() { - TestAppender testAppender = setupTestLogger(GrpcLoggingInterceptor.class, Level.DEBUG); - assertThat(echoGrpc(ECHO_STRING)).isEqualTo(ECHO_STRING); - - assertThat(testAppender.events.size()).isEqualTo(2); - // logging event for request - ILoggingEvent loggingEvent1 = testAppender.events.get(0); - assertThat(loggingEvent1.getMessage()).isEqualTo(SENDING_REQUEST_MESSAGE); - assertThat(loggingEvent1.getLevel()).isEqualTo(Level.DEBUG); - List keyValuePairs = loggingEvent1.getKeyValuePairs(); - assertThat(keyValuePairs.size()).isEqualTo(4); - assertThat(keyValuePairs).containsAtLeast(SERVICE_NAME_KEY_VALUE_PAIR, RPC_NAME_KEY_VALUE_PAIR); - - for (KeyValuePair kvp : keyValuePairs) { - if (kvp.key.equals("request.payload")) { - Map payload = (Map) kvp.value; - assertThat(payload.get("content")).isEqualTo(ECHO_STRING); - assertThat(payload.get("requestId")).isNotNull(); - assertThat(payload.get("otherRequestId")).isNotNull(); - } - if (kvp.key.equals("request.headers")) { - Map headers = (Map) kvp.value; - assertThat(headers).containsKey("x-goog-api-version"); - assertThat(headers).containsKey("x-goog-api-client"); - } - } - - // logging event for response - ILoggingEvent loggingEvent2 = testAppender.events.get(1); - assertThat(loggingEvent2.getMessage()).isEqualTo(RECEIVING_RESPONSE_MESSAGE); - - assertThat(loggingEvent2.getLevel()).isEqualTo(Level.DEBUG); - List keyValuePairs2 = loggingEvent2.getKeyValuePairs(); - assertThat(keyValuePairs2.size()).isEqualTo(5); - assertThat(keyValuePairs2) - .containsAtLeast( - RESPONSE_STATUS_KEY_VALUE_PAIR, - RESPONSE_HEADERS_KEY_VALUE_PAIR, - SERVICE_NAME_KEY_VALUE_PAIR, - RPC_NAME_KEY_VALUE_PAIR); - for (KeyValuePair kvp : keyValuePairs2) { - if (kvp.key.equals("response.payload")) { - Map payload = (Map) kvp.value; - assertThat(payload.get("content")).isEqualTo(ECHO_STRING); - assertThat(payload.get("requestId")).isNotNull(); - assertThat(payload.get("otherRequestId")).isNotNull(); - } - } - testAppender.stop(); - } - - @Test - void testGrpc_receiveContent_logInfo() { - TestAppender testAppender = setupTestLogger(GrpcLoggingInterceptor.class, Level.INFO); - assertThat(echoGrpc(ECHO_STRING)).isEqualTo(ECHO_STRING); - - assertThat(testAppender.events.size()).isEqualTo(2); - // logging event for request - ILoggingEvent loggingEvent1 = testAppender.events.get(0); - assertThat(loggingEvent1.getMessage()).isEqualTo(SENDING_REQUEST_MESSAGE); - assertThat(loggingEvent1.getLevel()).isEqualTo(Level.INFO); - List keyValuePairs = loggingEvent1.getKeyValuePairs(); - assertThat(keyValuePairs.size()).isEqualTo(2); - assertThat(keyValuePairs).containsAtLeast(SERVICE_NAME_KEY_VALUE_PAIR, RPC_NAME_KEY_VALUE_PAIR); - - // logging event for response - ILoggingEvent loggingEvent2 = testAppender.events.get(1); - assertThat(loggingEvent2.getMessage()).isEqualTo(RECEIVING_RESPONSE_MESSAGE); - - assertThat(loggingEvent2.getLevel()).isEqualTo(Level.INFO); - List keyValuePairs2 = loggingEvent2.getKeyValuePairs(); - assertThat(keyValuePairs2.size()).isEqualTo(3); - assertThat(keyValuePairs2) - .containsAtLeast( - RESPONSE_STATUS_KEY_VALUE_PAIR, SERVICE_NAME_KEY_VALUE_PAIR, RPC_NAME_KEY_VALUE_PAIR); - testAppender.stop(); - } - - @Test - void testHttpJson_receiveContent_logDebug() { - TestAppender testAppender = setupTestLogger(HttpJsonLoggingInterceptor.class, Level.DEBUG); - assertThat(echoHttpJson(ECHO_STRING)).isEqualTo(ECHO_STRING); - assertThat(testAppender.events.size()).isEqualTo(2); - // logging event for request - ILoggingEvent loggingEvent1 = testAppender.events.get(0); - assertThat(loggingEvent1.getMessage()).isEqualTo(SENDING_REQUEST_MESSAGE); - assertThat(loggingEvent1.getLevel()).isEqualTo(Level.DEBUG); - List keyValuePairs = loggingEvent1.getKeyValuePairs(); - assertThat(keyValuePairs.size()).isEqualTo(4); - assertThat(keyValuePairs).contains(RPC_NAME_KEY_VALUE_PAIR); - assertThat(keyValuePairs).contains(REQUEST_URL_KEY_VALUE_PAIR); - - for (KeyValuePair kvp : keyValuePairs) { - if (kvp.key.equals("request.payload")) { - Map payload = (Map) kvp.value; - assertThat(payload.get("content")).isEqualTo(ECHO_STRING); - assertThat(payload.get("requestId")).isNotNull(); - assertThat(payload.get("otherRequestId")).isNotNull(); - } - if (kvp.key.equals("request.headers")) { - Map headers = (Map) kvp.value; - assertThat(headers).containsKey("x-goog-api-version"); - assertThat(headers).containsKey("x-goog-api-client"); - } - } - - // logging event for response - ILoggingEvent loggingEvent2 = testAppender.events.get(1); - assertThat(loggingEvent2.getMessage()).isEqualTo(RECEIVING_RESPONSE_MESSAGE); - - assertThat(loggingEvent2.getLevel()).isEqualTo(Level.DEBUG); - List keyValuePairs2 = loggingEvent2.getKeyValuePairs(); - assertThat(keyValuePairs2.size()).isEqualTo(4); - assertThat(keyValuePairs2) - .containsAtLeast(RESPONSE_STATUS_KEY_VALUE_PAIR_HTTP, RPC_NAME_KEY_VALUE_PAIR); - for (KeyValuePair kvp : keyValuePairs2) { - if (kvp.key.equals("response.payload")) { - Map payload = (Map) kvp.value; - assertThat(payload.get("content")).isEqualTo(ECHO_STRING); - assertThat(payload.get("requestId")).isNotNull(); - assertThat(payload.get("otherRequestId")).isNotNull(); - } - if (kvp.key.equals("response.headers")) { - Map headers = (Map) kvp.value; - assertThat(headers.size()).isEqualTo(11); - } - } - testAppender.stop(); - } - - @Test - void testHttpJson_receiveContent_logInfo() { - TestAppender testAppender = setupTestLogger(HttpJsonLoggingInterceptor.class, Level.INFO); - assertThat(echoHttpJson(ECHO_STRING)).isEqualTo(ECHO_STRING); - assertThat(testAppender.events.size()).isEqualTo(2); - // logging event for request - ILoggingEvent loggingEvent1 = testAppender.events.get(0); - assertThat(loggingEvent1.getMessage()).isEqualTo(SENDING_REQUEST_MESSAGE); - assertThat(loggingEvent1.getLevel()).isEqualTo(Level.INFO); - List keyValuePairs = loggingEvent1.getKeyValuePairs(); - assertThat(keyValuePairs.size()).isEqualTo(2); - assertThat(keyValuePairs).contains(RPC_NAME_KEY_VALUE_PAIR); - assertThat(keyValuePairs).contains(REQUEST_URL_KEY_VALUE_PAIR); - - // logging event for response - ILoggingEvent loggingEvent2 = testAppender.events.get(1); - assertThat(loggingEvent2.getMessage()).isEqualTo(RECEIVING_RESPONSE_MESSAGE); - - assertThat(loggingEvent2.getLevel()).isEqualTo(Level.INFO); - List keyValuePairs2 = loggingEvent2.getKeyValuePairs(); - assertThat(keyValuePairs2.size()).isEqualTo(2); - assertThat(keyValuePairs2) - .containsAtLeast(RESPONSE_STATUS_KEY_VALUE_PAIR_HTTP, RPC_NAME_KEY_VALUE_PAIR); - testAppender.stop(); - } - - private String echoGrpc(String value) { - EchoResponse response = grpcClient.echo(EchoRequest.newBuilder().setContent(value).build()); - return response.getContent(); - } - - private String echoHttpJson(String value) { - EchoResponse response = httpjsonClient.echo(EchoRequest.newBuilder().setContent(value).build()); - return response.getContent(); - } -} +///* +// * Copyright 2025 Google LLC +// * +// * 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 +// * +// * https://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.google.showcase.v1beta1.it.logging; +// +//import static com.google.common.truth.Truth.assertThat; +// +//import ch.qos.logback.classic.Level; +//import ch.qos.logback.classic.spi.ILoggingEvent; +//import com.google.api.gax.grpc.GrpcLoggingInterceptor; +//import com.google.api.gax.httpjson.HttpJsonLoggingInterceptor; +//import com.google.common.collect.ImmutableMap; +//import com.google.showcase.v1beta1.EchoClient; +//import com.google.showcase.v1beta1.EchoRequest; +//import com.google.showcase.v1beta1.EchoResponse; +//import com.google.showcase.v1beta1.it.util.TestClientInitializer; +//import java.util.List; +//import java.util.Map; +//import java.util.concurrent.TimeUnit; +//import org.junit.jupiter.api.AfterAll; +//import org.junit.jupiter.api.BeforeAll; +//import org.junit.jupiter.api.Test; +//import org.slf4j.LoggerFactory; +//import org.slf4j.event.KeyValuePair; +// +//// This test needs to run with GOOGLE_SDK_JAVA_LOGGING=true +//// mvn clean verify -P '!showcase,enable-integration-tests,loggingTestBase,slf4j2_logback' +//public class ITLogging { +// private static EchoClient grpcClient; +// +// private static EchoClient httpjsonClient; +// +// private static final KeyValuePair SERVICE_NAME_KEY_VALUE_PAIR = +// new KeyValuePair("serviceName", "google.showcase.v1beta1.Echo"); +// private static final KeyValuePair RPC_NAME_KEY_VALUE_PAIR = +// new KeyValuePair("rpcName", "google.showcase.v1beta1.Echo/Echo"); +// private static final KeyValuePair RESPONSE_STATUS_KEY_VALUE_PAIR = +// new KeyValuePair("response.status", "OK"); +// private static final KeyValuePair RESPONSE_STATUS_KEY_VALUE_PAIR_HTTP = +// new KeyValuePair("response.status", "200"); +// private static final KeyValuePair REQUEST_URL_KEY_VALUE_PAIR = +// new KeyValuePair("request.url", "http://localhost:7469"); +// +// private static final KeyValuePair RESPONSE_HEADERS_KEY_VALUE_PAIR = +// new KeyValuePair("response.headers", ImmutableMap.of("content-type", "application/grpc")); +// +// private static final String SENDING_REQUEST_MESSAGE = "Sending request"; +// private static final String RECEIVING_RESPONSE_MESSAGE = "Received response"; +// private static final String ECHO_STRING = "echo?"; +// +// private TestAppender setupTestLogger(Class clazz, Level level) { +// TestAppender testAppender = new TestAppender(); +// testAppender.start(); +// org.slf4j.Logger logger = LoggerFactory.getLogger(clazz); +// ((ch.qos.logback.classic.Logger) logger).setLevel(level); +// ((ch.qos.logback.classic.Logger) logger).addAppender(testAppender); +// return testAppender; +// } +// +// @BeforeAll +// static void createClients() throws Exception { +// // Create gRPC Echo Client +// grpcClient = TestClientInitializer.createGrpcEchoClient(); +// // Create Http JSON Echo Client +// httpjsonClient = TestClientInitializer.createHttpJsonEchoClient(); +// } +// +// @AfterAll +// static void destroyClients() throws InterruptedException { +// grpcClient.close(); +// httpjsonClient.close(); +// +// grpcClient.awaitTermination(TestClientInitializer.AWAIT_TERMINATION_SECONDS, TimeUnit.SECONDS); +// httpjsonClient.awaitTermination( +// TestClientInitializer.AWAIT_TERMINATION_SECONDS, TimeUnit.SECONDS); +// } +// +// @Test +// void testGrpc_receiveContent_logDebug() { +// TestAppender testAppender = setupTestLogger(GrpcLoggingInterceptor.class, Level.DEBUG); +// assertThat(echoGrpc(ECHO_STRING)).isEqualTo(ECHO_STRING); +// +// assertThat(testAppender.events.size()).isEqualTo(2); +// // logging event for request +// ILoggingEvent loggingEvent1 = testAppender.events.get(0); +// assertThat(loggingEvent1.getMessage()).isEqualTo(SENDING_REQUEST_MESSAGE); +// assertThat(loggingEvent1.getLevel()).isEqualTo(Level.DEBUG); +// List keyValuePairs = loggingEvent1.getKeyValuePairs(); +// assertThat(keyValuePairs.size()).isEqualTo(4); +// assertThat(keyValuePairs).containsAtLeast(SERVICE_NAME_KEY_VALUE_PAIR, RPC_NAME_KEY_VALUE_PAIR); +// +// for (KeyValuePair kvp : keyValuePairs) { +// if (kvp.key.equals("request.payload")) { +// Map payload = (Map) kvp.value; +// assertThat(payload.get("content")).isEqualTo(ECHO_STRING); +// assertThat(payload.get("requestId")).isNotNull(); +// assertThat(payload.get("otherRequestId")).isNotNull(); +// } +// if (kvp.key.equals("request.headers")) { +// Map headers = (Map) kvp.value; +// assertThat(headers).containsKey("x-goog-api-version"); +// assertThat(headers).containsKey("x-goog-api-client"); +// } +// } +// +// // logging event for response +// ILoggingEvent loggingEvent2 = testAppender.events.get(1); +// assertThat(loggingEvent2.getMessage()).isEqualTo(RECEIVING_RESPONSE_MESSAGE); +// +// assertThat(loggingEvent2.getLevel()).isEqualTo(Level.DEBUG); +// List keyValuePairs2 = loggingEvent2.getKeyValuePairs(); +// assertThat(keyValuePairs2.size()).isEqualTo(5); +// assertThat(keyValuePairs2) +// .containsAtLeast( +// RESPONSE_STATUS_KEY_VALUE_PAIR, +// RESPONSE_HEADERS_KEY_VALUE_PAIR, +// SERVICE_NAME_KEY_VALUE_PAIR, +// RPC_NAME_KEY_VALUE_PAIR); +// for (KeyValuePair kvp : keyValuePairs2) { +// if (kvp.key.equals("response.payload")) { +// Map payload = (Map) kvp.value; +// assertThat(payload.get("content")).isEqualTo(ECHO_STRING); +// assertThat(payload.get("requestId")).isNotNull(); +// assertThat(payload.get("otherRequestId")).isNotNull(); +// } +// } +// testAppender.stop(); +// } +// +// @Test +// void testGrpc_receiveContent_logInfo() { +// TestAppender testAppender = setupTestLogger(GrpcLoggingInterceptor.class, Level.INFO); +// assertThat(echoGrpc(ECHO_STRING)).isEqualTo(ECHO_STRING); +// +// assertThat(testAppender.events.size()).isEqualTo(2); +// // logging event for request +// ILoggingEvent loggingEvent1 = testAppender.events.get(0); +// assertThat(loggingEvent1.getMessage()).isEqualTo(SENDING_REQUEST_MESSAGE); +// assertThat(loggingEvent1.getLevel()).isEqualTo(Level.INFO); +// List keyValuePairs = loggingEvent1.getKeyValuePairs(); +// assertThat(keyValuePairs.size()).isEqualTo(2); +// assertThat(keyValuePairs).containsAtLeast(SERVICE_NAME_KEY_VALUE_PAIR, RPC_NAME_KEY_VALUE_PAIR); +// +// // logging event for response +// ILoggingEvent loggingEvent2 = testAppender.events.get(1); +// assertThat(loggingEvent2.getMessage()).isEqualTo(RECEIVING_RESPONSE_MESSAGE); +// +// assertThat(loggingEvent2.getLevel()).isEqualTo(Level.INFO); +// List keyValuePairs2 = loggingEvent2.getKeyValuePairs(); +// assertThat(keyValuePairs2.size()).isEqualTo(3); +// assertThat(keyValuePairs2) +// .containsAtLeast( +// RESPONSE_STATUS_KEY_VALUE_PAIR, SERVICE_NAME_KEY_VALUE_PAIR, RPC_NAME_KEY_VALUE_PAIR); +// testAppender.stop(); +// } +// +// @Test +// void testHttpJson_receiveContent_logDebug() { +// TestAppender testAppender = setupTestLogger(HttpJsonLoggingInterceptor.class, Level.DEBUG); +// assertThat(echoHttpJson(ECHO_STRING)).isEqualTo(ECHO_STRING); +// assertThat(testAppender.events.size()).isEqualTo(2); +// // logging event for request +// ILoggingEvent loggingEvent1 = testAppender.events.get(0); +// assertThat(loggingEvent1.getMessage()).isEqualTo(SENDING_REQUEST_MESSAGE); +// assertThat(loggingEvent1.getLevel()).isEqualTo(Level.DEBUG); +// List keyValuePairs = loggingEvent1.getKeyValuePairs(); +// assertThat(keyValuePairs.size()).isEqualTo(4); +// assertThat(keyValuePairs).contains(RPC_NAME_KEY_VALUE_PAIR); +// assertThat(keyValuePairs).contains(REQUEST_URL_KEY_VALUE_PAIR); +// +// for (KeyValuePair kvp : keyValuePairs) { +// if (kvp.key.equals("request.payload")) { +// Map payload = (Map) kvp.value; +// assertThat(payload.get("content")).isEqualTo(ECHO_STRING); +// assertThat(payload.get("requestId")).isNotNull(); +// assertThat(payload.get("otherRequestId")).isNotNull(); +// } +// if (kvp.key.equals("request.headers")) { +// Map headers = (Map) kvp.value; +// assertThat(headers).containsKey("x-goog-api-version"); +// assertThat(headers).containsKey("x-goog-api-client"); +// } +// } +// +// // logging event for response +// ILoggingEvent loggingEvent2 = testAppender.events.get(1); +// assertThat(loggingEvent2.getMessage()).isEqualTo(RECEIVING_RESPONSE_MESSAGE); +// +// assertThat(loggingEvent2.getLevel()).isEqualTo(Level.DEBUG); +// List keyValuePairs2 = loggingEvent2.getKeyValuePairs(); +// assertThat(keyValuePairs2.size()).isEqualTo(4); +// assertThat(keyValuePairs2) +// .containsAtLeast(RESPONSE_STATUS_KEY_VALUE_PAIR_HTTP, RPC_NAME_KEY_VALUE_PAIR); +// for (KeyValuePair kvp : keyValuePairs2) { +// if (kvp.key.equals("response.payload")) { +// Map payload = (Map) kvp.value; +// assertThat(payload.get("content")).isEqualTo(ECHO_STRING); +// assertThat(payload.get("requestId")).isNotNull(); +// assertThat(payload.get("otherRequestId")).isNotNull(); +// } +// if (kvp.key.equals("response.headers")) { +// Map headers = (Map) kvp.value; +// assertThat(headers.size()).isEqualTo(11); +// } +// } +// testAppender.stop(); +// } +// +// @Test +// void testHttpJson_receiveContent_logInfo() { +// TestAppender testAppender = setupTestLogger(HttpJsonLoggingInterceptor.class, Level.INFO); +// assertThat(echoHttpJson(ECHO_STRING)).isEqualTo(ECHO_STRING); +// assertThat(testAppender.events.size()).isEqualTo(2); +// // logging event for request +// ILoggingEvent loggingEvent1 = testAppender.events.get(0); +// assertThat(loggingEvent1.getMessage()).isEqualTo(SENDING_REQUEST_MESSAGE); +// assertThat(loggingEvent1.getLevel()).isEqualTo(Level.INFO); +// List keyValuePairs = loggingEvent1.getKeyValuePairs(); +// assertThat(keyValuePairs.size()).isEqualTo(2); +// assertThat(keyValuePairs).contains(RPC_NAME_KEY_VALUE_PAIR); +// assertThat(keyValuePairs).contains(REQUEST_URL_KEY_VALUE_PAIR); +// +// // logging event for response +// ILoggingEvent loggingEvent2 = testAppender.events.get(1); +// assertThat(loggingEvent2.getMessage()).isEqualTo(RECEIVING_RESPONSE_MESSAGE); +// +// assertThat(loggingEvent2.getLevel()).isEqualTo(Level.INFO); +// List keyValuePairs2 = loggingEvent2.getKeyValuePairs(); +// assertThat(keyValuePairs2.size()).isEqualTo(2); +// assertThat(keyValuePairs2) +// .containsAtLeast(RESPONSE_STATUS_KEY_VALUE_PAIR_HTTP, RPC_NAME_KEY_VALUE_PAIR); +// testAppender.stop(); +// } +// +// private String echoGrpc(String value) { +// EchoResponse response = grpcClient.echo(EchoRequest.newBuilder().setContent(value).build()); +// return response.getContent(); +// } +// +// private String echoHttpJson(String value) { +// EchoResponse response = httpjsonClient.echo(EchoRequest.newBuilder().setContent(value).build()); +// return response.getContent(); +// } +//} diff --git a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/logging/ITLogging1x.java b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/logging/ITLogging1x.java index d0dec4b80d..772646ddd7 100644 --- a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/logging/ITLogging1x.java +++ b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/logging/ITLogging1x.java @@ -1,217 +1,217 @@ -/* - * Copyright 2025 Google LLC - * - * 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 - * - * https://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.google.showcase.v1beta1.it.logging; - -import static com.google.common.truth.Truth.assertThat; - -import ch.qos.logback.classic.Level; -import ch.qos.logback.classic.spi.ILoggingEvent; -import com.google.api.gax.grpc.GrpcLoggingInterceptor; -import com.google.api.gax.httpjson.HttpJsonLoggingInterceptor; -import com.google.common.collect.ImmutableMap; -import com.google.showcase.v1beta1.EchoClient; -import com.google.showcase.v1beta1.EchoRequest; -import com.google.showcase.v1beta1.EchoResponse; -import com.google.showcase.v1beta1.it.util.TestClientInitializer; -import java.util.Map; -import java.util.concurrent.TimeUnit; -import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Test; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; - -// This test needs to run with GOOGLE_SDK_JAVA_LOGGING=true -// mvn verify -P -// '!showcase,enable-integration-tests,loggingTestBase,slf4j1_logback ' -public class ITLogging1x { - private static EchoClient grpcClient; - - private static EchoClient httpjsonClient; - - private static final String ECHO_STRING = "echo?"; - private static final String SERVICE_NAME = "google.showcase.v1beta1.Echo"; - private static final String RPC_NAME = "google.showcase.v1beta1.Echo/Echo"; - private static final String ENDPOINT = "http://localhost:7469"; - private static final String SENDING_REQUEST_MESSAGE = "Sending request"; - private static final String RECEIVING_RESPONSE_MESSAGE = "Received response"; - - private static Logger logger = LoggerFactory.getLogger(ITLogging1x.class); - - private TestAppender setupTestLogger(Class clazz, Level level) { - TestAppender testAppender = new TestAppender(); - testAppender.start(); - Logger logger = LoggerFactory.getLogger(clazz); - ((ch.qos.logback.classic.Logger) logger).setLevel(level); - ((ch.qos.logback.classic.Logger) logger).addAppender(testAppender); - return testAppender; - } - - @BeforeAll - static void createClients() throws Exception { - // Create gRPC Echo Client - grpcClient = TestClientInitializer.createGrpcEchoClient(); - // Create Http JSON Echo Client - httpjsonClient = TestClientInitializer.createHttpJsonEchoClient(); - } - - @AfterAll - static void destroyClients() throws InterruptedException { - grpcClient.close(); - httpjsonClient.close(); - - grpcClient.awaitTermination(TestClientInitializer.AWAIT_TERMINATION_SECONDS, TimeUnit.SECONDS); - httpjsonClient.awaitTermination( - TestClientInitializer.AWAIT_TERMINATION_SECONDS, TimeUnit.SECONDS); - } - - @Test - void test() { - assertThat(logger.isInfoEnabled()).isTrue(); - assertThat(logger.isDebugEnabled()).isTrue(); - } - - @Test - void testGrpc_receiveContent_logDebug() { - TestAppender testAppender = setupTestLogger(GrpcLoggingInterceptor.class, Level.DEBUG); - assertThat(echoGrpc(ECHO_STRING)).isEqualTo(ECHO_STRING); - - assertThat(testAppender.events.size()).isEqualTo(2); - // logging event for request - ILoggingEvent loggingEvent1 = testAppender.events.get(0); - assertThat(loggingEvent1.getMessage()).isEqualTo(SENDING_REQUEST_MESSAGE); - assertThat(loggingEvent1.getLevel()).isEqualTo(Level.DEBUG); - Map mdcPropertyMap = loggingEvent1.getMDCPropertyMap(); - assertThat(mdcPropertyMap) - .containsAtLeastEntriesIn( - ImmutableMap.of("serviceName", SERVICE_NAME, "rpcName", RPC_NAME)); - assertThat(mdcPropertyMap).containsKey("request.headers"); - assertThat(mdcPropertyMap.get("request.headers")).startsWith("{\"x-goog-api-"); - - assertThat(mdcPropertyMap).containsKey("request.payload"); - assertThat(mdcPropertyMap.get("request.payload")) - .startsWith("{\"content\":\"echo?\",\"requestId\":"); - - // logging event for response - ILoggingEvent loggingEvent2 = testAppender.events.get(1); - assertThat(loggingEvent2.getMessage()).isEqualTo(RECEIVING_RESPONSE_MESSAGE); - assertThat(loggingEvent2.getLevel()).isEqualTo(Level.DEBUG); - Map responseMdcPropertyMap = loggingEvent2.getMDCPropertyMap(); - assertThat(responseMdcPropertyMap) - .containsAtLeastEntriesIn( - ImmutableMap.of( - "serviceName", SERVICE_NAME, "rpcName", RPC_NAME, "response.status", "OK")); - assertThat(responseMdcPropertyMap).containsKey("response.payload"); - assertThat(responseMdcPropertyMap).containsKey("response.headers"); - - testAppender.stop(); - } - - @Test - void testGrpc_receiveContent_logInfo() { - TestAppender testAppender = setupTestLogger(GrpcLoggingInterceptor.class, Level.INFO); - assertThat(echoGrpc(ECHO_STRING)).isEqualTo(ECHO_STRING); - - assertThat(testAppender.events.size()).isEqualTo(2); - // logging event for request - ILoggingEvent loggingEvent1 = testAppender.events.get(0); - assertThat(loggingEvent1.getMessage()).isEqualTo(SENDING_REQUEST_MESSAGE); - assertThat(loggingEvent1.getLevel()).isEqualTo(Level.INFO); - Map mdcPropertyMap = loggingEvent1.getMDCPropertyMap(); - assertThat(mdcPropertyMap) - .containsExactlyEntriesIn( - ImmutableMap.of("serviceName", SERVICE_NAME, "rpcName", RPC_NAME)); - - // logging event for response - ILoggingEvent loggingEvent2 = testAppender.events.get(1); - assertThat(loggingEvent2.getMessage()).isEqualTo(RECEIVING_RESPONSE_MESSAGE); - assertThat(loggingEvent2.getLevel()).isEqualTo(Level.INFO); - Map responseMdcPropertyMap = loggingEvent2.getMDCPropertyMap(); - assertThat(responseMdcPropertyMap) - .containsExactlyEntriesIn( - ImmutableMap.of( - "serviceName", SERVICE_NAME, "rpcName", RPC_NAME, "response.status", "OK")); - - testAppender.stop(); - } - - @Test - void testHttpJson_receiveContent_logDebug() { - TestAppender testAppender = setupTestLogger(HttpJsonLoggingInterceptor.class, Level.DEBUG); - assertThat(echoHttpJson(ECHO_STRING)).isEqualTo(ECHO_STRING); - assertThat(testAppender.events.size()).isEqualTo(2); - // logging event for request - ILoggingEvent loggingEvent1 = testAppender.events.get(0); - assertThat(loggingEvent1.getMessage()).isEqualTo(SENDING_REQUEST_MESSAGE); - assertThat(loggingEvent1.getLevel()).isEqualTo(Level.DEBUG); - Map mdcPropertyMap = loggingEvent1.getMDCPropertyMap(); - assertThat(mdcPropertyMap).containsEntry("rpcName", RPC_NAME); - assertThat(mdcPropertyMap).containsEntry("request.url", ENDPOINT); - assertThat(mdcPropertyMap).containsKey("request.headers"); - assertThat(mdcPropertyMap.get("request.headers")).startsWith("{\"x-goog-api-"); - assertThat(mdcPropertyMap).containsKey("request.payload"); - assertThat(mdcPropertyMap.get("request.payload")) - .startsWith("{\"content\":\"echo?\",\"requestId\":"); - - // logging event for response - ILoggingEvent loggingEvent2 = testAppender.events.get(1); - assertThat(loggingEvent2.getMessage()).isEqualTo(RECEIVING_RESPONSE_MESSAGE); - assertThat(loggingEvent2.getLevel()).isEqualTo(Level.DEBUG); - Map responseMdcPropertyMap = loggingEvent2.getMDCPropertyMap(); - assertThat(responseMdcPropertyMap) - .containsAtLeastEntriesIn(ImmutableMap.of("rpcName", RPC_NAME, "response.status", "200")); - assertThat(responseMdcPropertyMap).containsKey("response.payload"); - assertThat(responseMdcPropertyMap).containsKey("response.headers"); - testAppender.stop(); - } - - @Test - void testHttpJson_receiveContent_logInfo() { - TestAppender testAppender = setupTestLogger(HttpJsonLoggingInterceptor.class, Level.INFO); - assertThat(echoHttpJson(ECHO_STRING)).isEqualTo(ECHO_STRING); - assertThat(testAppender.events.size()).isEqualTo(2); - // logging event for request - ILoggingEvent loggingEvent1 = testAppender.events.get(0); - assertThat(loggingEvent1.getMessage()).isEqualTo(SENDING_REQUEST_MESSAGE); - assertThat(loggingEvent1.getLevel()).isEqualTo(Level.INFO); - Map mdcPropertyMap = loggingEvent1.getMDCPropertyMap(); - assertThat(mdcPropertyMap) - .containsExactlyEntriesIn( - ImmutableMap.of( - "rpcName", RPC_NAME, - "request.url", ENDPOINT)); - - // logging event for response - ILoggingEvent loggingEvent2 = testAppender.events.get(1); - assertThat(loggingEvent2.getMessage()).isEqualTo(RECEIVING_RESPONSE_MESSAGE); - assertThat(loggingEvent2.getLevel()).isEqualTo(Level.INFO); - Map responseMdcPropertyMap = loggingEvent2.getMDCPropertyMap(); - assertThat(responseMdcPropertyMap) - .containsExactlyEntriesIn(ImmutableMap.of("rpcName", RPC_NAME, "response.status", "200")); - testAppender.stop(); - } - - private String echoGrpc(String value) { - EchoResponse response = grpcClient.echo(EchoRequest.newBuilder().setContent(value).build()); - return response.getContent(); - } - - private String echoHttpJson(String value) { - EchoResponse response = httpjsonClient.echo(EchoRequest.newBuilder().setContent(value).build()); - return response.getContent(); - } -} +///* +// * Copyright 2025 Google LLC +// * +// * 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 +// * +// * https://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.google.showcase.v1beta1.it.logging; +// +//import static com.google.common.truth.Truth.assertThat; +// +//import ch.qos.logback.classic.Level; +//import ch.qos.logback.classic.spi.ILoggingEvent; +//import com.google.api.gax.grpc.GrpcLoggingInterceptor; +//import com.google.api.gax.httpjson.HttpJsonLoggingInterceptor; +//import com.google.common.collect.ImmutableMap; +//import com.google.showcase.v1beta1.EchoClient; +//import com.google.showcase.v1beta1.EchoRequest; +//import com.google.showcase.v1beta1.EchoResponse; +//import com.google.showcase.v1beta1.it.util.TestClientInitializer; +//import java.util.Map; +//import java.util.concurrent.TimeUnit; +//import org.junit.jupiter.api.AfterAll; +//import org.junit.jupiter.api.BeforeAll; +//import org.junit.jupiter.api.Test; +//import org.slf4j.Logger; +//import org.slf4j.LoggerFactory; +// +//// This test needs to run with GOOGLE_SDK_JAVA_LOGGING=true +//// mvn verify -P +//// '!showcase,enable-integration-tests,loggingTestBase,slf4j1_logback ' +//public class ITLogging1x { +// private static EchoClient grpcClient; +// +// private static EchoClient httpjsonClient; +// +// private static final String ECHO_STRING = "echo?"; +// private static final String SERVICE_NAME = "google.showcase.v1beta1.Echo"; +// private static final String RPC_NAME = "google.showcase.v1beta1.Echo/Echo"; +// private static final String ENDPOINT = "http://localhost:7469"; +// private static final String SENDING_REQUEST_MESSAGE = "Sending request"; +// private static final String RECEIVING_RESPONSE_MESSAGE = "Received response"; +// +// private static Logger logger = LoggerFactory.getLogger(ITLogging1x.class); +// +// private TestAppender setupTestLogger(Class clazz, Level level) { +// TestAppender testAppender = new TestAppender(); +// testAppender.start(); +// Logger logger = LoggerFactory.getLogger(clazz); +// ((ch.qos.logback.classic.Logger) logger).setLevel(level); +// ((ch.qos.logback.classic.Logger) logger).addAppender(testAppender); +// return testAppender; +// } +// +// @BeforeAll +// static void createClients() throws Exception { +// // Create gRPC Echo Client +// grpcClient = TestClientInitializer.createGrpcEchoClient(); +// // Create Http JSON Echo Client +// httpjsonClient = TestClientInitializer.createHttpJsonEchoClient(); +// } +// +// @AfterAll +// static void destroyClients() throws InterruptedException { +// grpcClient.close(); +// httpjsonClient.close(); +// +// grpcClient.awaitTermination(TestClientInitializer.AWAIT_TERMINATION_SECONDS, TimeUnit.SECONDS); +// httpjsonClient.awaitTermination( +// TestClientInitializer.AWAIT_TERMINATION_SECONDS, TimeUnit.SECONDS); +// } +// +// @Test +// void test() { +// assertThat(logger.isInfoEnabled()).isTrue(); +// assertThat(logger.isDebugEnabled()).isTrue(); +// } +// +// @Test +// void testGrpc_receiveContent_logDebug() { +// TestAppender testAppender = setupTestLogger(GrpcLoggingInterceptor.class, Level.DEBUG); +// assertThat(echoGrpc(ECHO_STRING)).isEqualTo(ECHO_STRING); +// +// assertThat(testAppender.events.size()).isEqualTo(2); +// // logging event for request +// ILoggingEvent loggingEvent1 = testAppender.events.get(0); +// assertThat(loggingEvent1.getMessage()).isEqualTo(SENDING_REQUEST_MESSAGE); +// assertThat(loggingEvent1.getLevel()).isEqualTo(Level.DEBUG); +// Map mdcPropertyMap = loggingEvent1.getMDCPropertyMap(); +// assertThat(mdcPropertyMap) +// .containsAtLeastEntriesIn( +// ImmutableMap.of("serviceName", SERVICE_NAME, "rpcName", RPC_NAME)); +// assertThat(mdcPropertyMap).containsKey("request.headers"); +// assertThat(mdcPropertyMap.get("request.headers")).startsWith("{\"x-goog-api-"); +// +// assertThat(mdcPropertyMap).containsKey("request.payload"); +// assertThat(mdcPropertyMap.get("request.payload")) +// .startsWith("{\"content\":\"echo?\",\"requestId\":"); +// +// // logging event for response +// ILoggingEvent loggingEvent2 = testAppender.events.get(1); +// assertThat(loggingEvent2.getMessage()).isEqualTo(RECEIVING_RESPONSE_MESSAGE); +// assertThat(loggingEvent2.getLevel()).isEqualTo(Level.DEBUG); +// Map responseMdcPropertyMap = loggingEvent2.getMDCPropertyMap(); +// assertThat(responseMdcPropertyMap) +// .containsAtLeastEntriesIn( +// ImmutableMap.of( +// "serviceName", SERVICE_NAME, "rpcName", RPC_NAME, "response.status", "OK")); +// assertThat(responseMdcPropertyMap).containsKey("response.payload"); +// assertThat(responseMdcPropertyMap).containsKey("response.headers"); +// +// testAppender.stop(); +// } +// +// @Test +// void testGrpc_receiveContent_logInfo() { +// TestAppender testAppender = setupTestLogger(GrpcLoggingInterceptor.class, Level.INFO); +// assertThat(echoGrpc(ECHO_STRING)).isEqualTo(ECHO_STRING); +// +// assertThat(testAppender.events.size()).isEqualTo(2); +// // logging event for request +// ILoggingEvent loggingEvent1 = testAppender.events.get(0); +// assertThat(loggingEvent1.getMessage()).isEqualTo(SENDING_REQUEST_MESSAGE); +// assertThat(loggingEvent1.getLevel()).isEqualTo(Level.INFO); +// Map mdcPropertyMap = loggingEvent1.getMDCPropertyMap(); +// assertThat(mdcPropertyMap) +// .containsExactlyEntriesIn( +// ImmutableMap.of("serviceName", SERVICE_NAME, "rpcName", RPC_NAME)); +// +// // logging event for response +// ILoggingEvent loggingEvent2 = testAppender.events.get(1); +// assertThat(loggingEvent2.getMessage()).isEqualTo(RECEIVING_RESPONSE_MESSAGE); +// assertThat(loggingEvent2.getLevel()).isEqualTo(Level.INFO); +// Map responseMdcPropertyMap = loggingEvent2.getMDCPropertyMap(); +// assertThat(responseMdcPropertyMap) +// .containsExactlyEntriesIn( +// ImmutableMap.of( +// "serviceName", SERVICE_NAME, "rpcName", RPC_NAME, "response.status", "OK")); +// +// testAppender.stop(); +// } +// +// @Test +// void testHttpJson_receiveContent_logDebug() { +// TestAppender testAppender = setupTestLogger(HttpJsonLoggingInterceptor.class, Level.DEBUG); +// assertThat(echoHttpJson(ECHO_STRING)).isEqualTo(ECHO_STRING); +// assertThat(testAppender.events.size()).isEqualTo(2); +// // logging event for request +// ILoggingEvent loggingEvent1 = testAppender.events.get(0); +// assertThat(loggingEvent1.getMessage()).isEqualTo(SENDING_REQUEST_MESSAGE); +// assertThat(loggingEvent1.getLevel()).isEqualTo(Level.DEBUG); +// Map mdcPropertyMap = loggingEvent1.getMDCPropertyMap(); +// assertThat(mdcPropertyMap).containsEntry("rpcName", RPC_NAME); +// assertThat(mdcPropertyMap).containsEntry("request.url", ENDPOINT); +// assertThat(mdcPropertyMap).containsKey("request.headers"); +// assertThat(mdcPropertyMap.get("request.headers")).startsWith("{\"x-goog-api-"); +// assertThat(mdcPropertyMap).containsKey("request.payload"); +// assertThat(mdcPropertyMap.get("request.payload")) +// .startsWith("{\"content\":\"echo?\",\"requestId\":"); +// +// // logging event for response +// ILoggingEvent loggingEvent2 = testAppender.events.get(1); +// assertThat(loggingEvent2.getMessage()).isEqualTo(RECEIVING_RESPONSE_MESSAGE); +// assertThat(loggingEvent2.getLevel()).isEqualTo(Level.DEBUG); +// Map responseMdcPropertyMap = loggingEvent2.getMDCPropertyMap(); +// assertThat(responseMdcPropertyMap) +// .containsAtLeastEntriesIn(ImmutableMap.of("rpcName", RPC_NAME, "response.status", "200")); +// assertThat(responseMdcPropertyMap).containsKey("response.payload"); +// assertThat(responseMdcPropertyMap).containsKey("response.headers"); +// testAppender.stop(); +// } +// +// @Test +// void testHttpJson_receiveContent_logInfo() { +// TestAppender testAppender = setupTestLogger(HttpJsonLoggingInterceptor.class, Level.INFO); +// assertThat(echoHttpJson(ECHO_STRING)).isEqualTo(ECHO_STRING); +// assertThat(testAppender.events.size()).isEqualTo(2); +// // logging event for request +// ILoggingEvent loggingEvent1 = testAppender.events.get(0); +// assertThat(loggingEvent1.getMessage()).isEqualTo(SENDING_REQUEST_MESSAGE); +// assertThat(loggingEvent1.getLevel()).isEqualTo(Level.INFO); +// Map mdcPropertyMap = loggingEvent1.getMDCPropertyMap(); +// assertThat(mdcPropertyMap) +// .containsExactlyEntriesIn( +// ImmutableMap.of( +// "rpcName", RPC_NAME, +// "request.url", ENDPOINT)); +// +// // logging event for response +// ILoggingEvent loggingEvent2 = testAppender.events.get(1); +// assertThat(loggingEvent2.getMessage()).isEqualTo(RECEIVING_RESPONSE_MESSAGE); +// assertThat(loggingEvent2.getLevel()).isEqualTo(Level.INFO); +// Map responseMdcPropertyMap = loggingEvent2.getMDCPropertyMap(); +// assertThat(responseMdcPropertyMap) +// .containsExactlyEntriesIn(ImmutableMap.of("rpcName", RPC_NAME, "response.status", "200")); +// testAppender.stop(); +// } +// +// private String echoGrpc(String value) { +// EchoResponse response = grpcClient.echo(EchoRequest.newBuilder().setContent(value).build()); +// return response.getContent(); +// } +// +// private String echoHttpJson(String value) { +// EchoResponse response = httpjsonClient.echo(EchoRequest.newBuilder().setContent(value).build()); +// return response.getContent(); +// } +//} diff --git a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/logging/ITLoggingDisabled.java b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/logging/ITLoggingDisabled.java index 16c6acb0a6..891596ce9b 100644 --- a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/logging/ITLoggingDisabled.java +++ b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/logging/ITLoggingDisabled.java @@ -1,78 +1,78 @@ -/* - * Copyright 2025 Google LLC - * - * 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 - * - * https://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.google.showcase.v1beta1.it.logging; - -import static com.google.common.truth.Truth.assertThat; - -import ch.qos.logback.classic.Level; -import ch.qos.logback.classic.spi.ILoggingEvent; -import ch.qos.logback.core.read.ListAppender; -import com.google.api.gax.grpc.GrpcLoggingInterceptor; -import com.google.showcase.v1beta1.EchoClient; -import com.google.showcase.v1beta1.EchoRequest; -import com.google.showcase.v1beta1.EchoResponse; -import com.google.showcase.v1beta1.it.util.TestClientInitializer; -import java.util.concurrent.TimeUnit; -import org.junit.jupiter.api.AfterAll; -import org.junit.jupiter.api.BeforeAll; -import org.junit.jupiter.api.Test; -import org.slf4j.LoggerFactory; - -// mvn verify -P '!showcase,enable-integration-tests,loggingTestBase,disabledLogging' -public class ITLoggingDisabled { - - private static EchoClient grpcClient; - private static final String ECHO_STRING = "echo?"; - - private TestAppender setupTestLogger(Class clazz) { - TestAppender testAppender = new TestAppender(); - testAppender.start(); - ListAppender listAppender = new ListAppender<>(); - listAppender.start(); - org.slf4j.Logger logger = LoggerFactory.getLogger(clazz); - ((ch.qos.logback.classic.Logger) logger).setLevel(Level.DEBUG); - ((ch.qos.logback.classic.Logger) logger).addAppender(testAppender); - return testAppender; - } - - @BeforeAll - static void createClients() throws Exception { - // Create gRPC Echo Client - grpcClient = TestClientInitializer.createGrpcEchoClient(); - } - - @AfterAll - static void destroyClients() throws InterruptedException { - grpcClient.close(); - - grpcClient.awaitTermination(TestClientInitializer.AWAIT_TERMINATION_SECONDS, TimeUnit.SECONDS); - } - - // only run when GOOGLE_SDK_JAVA_LOGGING!=true - @Test - void testloggingDisabled() { - TestAppender testAppender = setupTestLogger(GrpcLoggingInterceptor.class); - assertThat(echoGrpc(ECHO_STRING)).isEqualTo(ECHO_STRING); - - assertThat(testAppender.events.size()).isEqualTo(0); - } - - private String echoGrpc(String value) { - EchoResponse response = grpcClient.echo(EchoRequest.newBuilder().setContent(value).build()); - return response.getContent(); - } -} +///* +// * Copyright 2025 Google LLC +// * +// * 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 +// * +// * https://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.google.showcase.v1beta1.it.logging; +// +//import static com.google.common.truth.Truth.assertThat; +// +//import ch.qos.logback.classic.Level; +//import ch.qos.logback.classic.spi.ILoggingEvent; +//import ch.qos.logback.core.read.ListAppender; +//import com.google.api.gax.grpc.GrpcLoggingInterceptor; +//import com.google.showcase.v1beta1.EchoClient; +//import com.google.showcase.v1beta1.EchoRequest; +//import com.google.showcase.v1beta1.EchoResponse; +//import com.google.showcase.v1beta1.it.util.TestClientInitializer; +//import java.util.concurrent.TimeUnit; +//import org.junit.jupiter.api.AfterAll; +//import org.junit.jupiter.api.BeforeAll; +//import org.junit.jupiter.api.Test; +//import org.slf4j.LoggerFactory; +// +//// mvn verify -P '!showcase,enable-integration-tests,loggingTestBase,disabledLogging' +//public class ITLoggingDisabled { +// +// private static EchoClient grpcClient; +// private static final String ECHO_STRING = "echo?"; +// +// private TestAppender setupTestLogger(Class clazz) { +// TestAppender testAppender = new TestAppender(); +// testAppender.start(); +// ListAppender listAppender = new ListAppender<>(); +// listAppender.start(); +// org.slf4j.Logger logger = LoggerFactory.getLogger(clazz); +// ((ch.qos.logback.classic.Logger) logger).setLevel(Level.DEBUG); +// ((ch.qos.logback.classic.Logger) logger).addAppender(testAppender); +// return testAppender; +// } +// +// @BeforeAll +// static void createClients() throws Exception { +// // Create gRPC Echo Client +// grpcClient = TestClientInitializer.createGrpcEchoClient(); +// } +// +// @AfterAll +// static void destroyClients() throws InterruptedException { +// grpcClient.close(); +// +// grpcClient.awaitTermination(TestClientInitializer.AWAIT_TERMINATION_SECONDS, TimeUnit.SECONDS); +// } +// +// // only run when GOOGLE_SDK_JAVA_LOGGING!=true +// @Test +// void testloggingDisabled() { +// TestAppender testAppender = setupTestLogger(GrpcLoggingInterceptor.class); +// assertThat(echoGrpc(ECHO_STRING)).isEqualTo(ECHO_STRING); +// +// assertThat(testAppender.events.size()).isEqualTo(0); +// } +// +// private String echoGrpc(String value) { +// EchoResponse response = grpcClient.echo(EchoRequest.newBuilder().setContent(value).build()); +// return response.getContent(); +// } +//} diff --git a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/logging/TestAppender.java b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/logging/TestAppender.java index 92a6996936..1864bb351d 100644 --- a/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/logging/TestAppender.java +++ b/java-showcase/gapic-showcase/src/test/java/com/google/showcase/v1beta1/it/logging/TestAppender.java @@ -1,40 +1,40 @@ -/* - * Copyright 2025 Google LLC - * - * 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 - * - * https://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.google.showcase.v1beta1.it.logging; - -import ch.qos.logback.classic.spi.ILoggingEvent; -import ch.qos.logback.core.AppenderBase; -import java.util.ArrayList; -import java.util.List; - -/** Logback appender used to set up tests. */ -public class TestAppender extends AppenderBase { - public List events = new ArrayList<>(); - - @Override - protected void append(ILoggingEvent eventObject) { - // triggering Logback to capture the current MDC context and store it with the log event - // the default ListAppender does not capture MDC contents - eventObject.getMDCPropertyMap(); - - events.add(eventObject); - } - - public void clearEvents() { - events.clear(); - } -} +///* +// * Copyright 2025 Google LLC +// * +// * 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 +// * +// * https://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.google.showcase.v1beta1.it.logging; +// +//import ch.qos.logback.classic.spi.ILoggingEvent; +//import ch.qos.logback.core.AppenderBase; +//import java.util.ArrayList; +//import java.util.List; +// +///** Logback appender used to set up tests. */ +//public class TestAppender extends AppenderBase { +// public List events = new ArrayList<>(); +// +// @Override +// protected void append(ILoggingEvent eventObject) { +// // triggering Logback to capture the current MDC context and store it with the log event +// // the default ListAppender does not capture MDC contents +// eventObject.getMDCPropertyMap(); +// +// events.add(eventObject); +// } +// +// public void clearEvents() { +// events.clear(); +// } +//} diff --git a/java-showcase/pom.xml b/java-showcase/pom.xml index fb00d33996..ff910b45f9 100644 --- a/java-showcase/pom.xml +++ b/java-showcase/pom.xml @@ -148,6 +148,7 @@ org.codehaus.mojo flatten-maven-plugin + 1.7.0 @@ -183,6 +184,7 @@ org.codehaus.mojo flatten-maven-plugin + 1.7.0 diff --git a/sdk-platform-java-config/pom.xml b/sdk-platform-java-config/pom.xml index ef5c73d045..2368941a1f 100644 --- a/sdk-platform-java-config/pom.xml +++ b/sdk-platform-java-config/pom.xml @@ -13,7 +13,7 @@ com.google.cloud google-cloud-shared-config - 1.15.0 + 1.15.1-SNAPSHOT diff --git a/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/MockConnectionService.java b/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/MockConnectionService.java index 342a7081cb..32b7fbf580 100644 --- a/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/MockConnectionService.java +++ b/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/MockConnectionService.java @@ -18,7 +18,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; import javax.annotation.Generated; @@ -33,12 +33,12 @@ public MockConnectionService() { } @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/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/MockConnectionServiceImpl.java b/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/MockConnectionServiceImpl.java index 6dc865c8c9..89128dbe69 100644 --- a/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/MockConnectionServiceImpl.java +++ b/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/MockConnectionServiceImpl.java @@ -18,7 +18,7 @@ import com.google.api.core.BetaApi; import com.google.cloud.apigeeconnect.v1.ConnectionServiceGrpc.ConnectionServiceImplBase; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -29,7 +29,7 @@ @BetaApi @Generated("by gapic-generator-java") public class MockConnectionServiceImpl extends ConnectionServiceImplBase { - private List requests; + private List requests; private Queue responses; public MockConnectionServiceImpl() { @@ -37,15 +37,15 @@ public MockConnectionServiceImpl() { 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/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/MockTether.java b/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/MockTether.java index d24fc94881..6322e9c5a2 100644 --- a/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/MockTether.java +++ b/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/MockTether.java @@ -18,7 +18,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; import javax.annotation.Generated; @@ -33,12 +33,12 @@ public MockTether() { } @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/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/MockTetherImpl.java b/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/MockTetherImpl.java index 8161f3b2e8..8fa8a7c79c 100644 --- a/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/MockTetherImpl.java +++ b/test/integration/goldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/MockTetherImpl.java @@ -18,7 +18,7 @@ import com.google.api.core.BetaApi; import com.google.cloud.apigeeconnect.v1.TetherGrpc.TetherImplBase; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -29,7 +29,7 @@ @BetaApi @Generated("by gapic-generator-java") public class MockTetherImpl extends TetherImplBase { - private List requests; + private List requests; private Queue responses; public MockTetherImpl() { @@ -37,15 +37,15 @@ public MockTetherImpl() { 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/test/integration/goldens/asset/src/com/google/cloud/asset/v1/MockAssetService.java b/test/integration/goldens/asset/src/com/google/cloud/asset/v1/MockAssetService.java index f95c6ba2e4..b893f79e21 100644 --- a/test/integration/goldens/asset/src/com/google/cloud/asset/v1/MockAssetService.java +++ b/test/integration/goldens/asset/src/com/google/cloud/asset/v1/MockAssetService.java @@ -18,7 +18,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; import javax.annotation.Generated; @@ -33,12 +33,12 @@ public MockAssetService() { } @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/test/integration/goldens/asset/src/com/google/cloud/asset/v1/MockAssetServiceImpl.java b/test/integration/goldens/asset/src/com/google/cloud/asset/v1/MockAssetServiceImpl.java index 0f4ca7f433..b58a7bad6d 100644 --- a/test/integration/goldens/asset/src/com/google/cloud/asset/v1/MockAssetServiceImpl.java +++ b/test/integration/goldens/asset/src/com/google/cloud/asset/v1/MockAssetServiceImpl.java @@ -19,8 +19,8 @@ import com.google.api.core.BetaApi; import com.google.cloud.asset.v1.AssetServiceGrpc.AssetServiceImplBase; import com.google.longrunning.Operation; -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; @@ -31,7 +31,7 @@ @BetaApi @Generated("by gapic-generator-java") public class MockAssetServiceImpl extends AssetServiceImplBase { - private List requests; + private List requests; private Queue responses; public MockAssetServiceImpl() { @@ -39,15 +39,15 @@ public MockAssetServiceImpl() { 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/test/integration/goldens/bigtable/src/com/google/cloud/bigtable/data/v2/MockBigtable.java b/test/integration/goldens/bigtable/src/com/google/cloud/bigtable/data/v2/MockBigtable.java index 727061f892..c5d6571a86 100644 --- a/test/integration/goldens/bigtable/src/com/google/cloud/bigtable/data/v2/MockBigtable.java +++ b/test/integration/goldens/bigtable/src/com/google/cloud/bigtable/data/v2/MockBigtable.java @@ -18,7 +18,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; import javax.annotation.Generated; @@ -33,12 +33,12 @@ public MockBigtable() { } @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/test/integration/goldens/bigtable/src/com/google/cloud/bigtable/data/v2/MockBigtableImpl.java b/test/integration/goldens/bigtable/src/com/google/cloud/bigtable/data/v2/MockBigtableImpl.java index bc67264c49..5590a608c4 100644 --- a/test/integration/goldens/bigtable/src/com/google/cloud/bigtable/data/v2/MockBigtableImpl.java +++ b/test/integration/goldens/bigtable/src/com/google/cloud/bigtable/data/v2/MockBigtableImpl.java @@ -32,7 +32,7 @@ import com.google.bigtable.v2.ReadRowsResponse; import com.google.bigtable.v2.SampleRowKeysRequest; import com.google.bigtable.v2.SampleRowKeysResponse; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -43,7 +43,7 @@ @BetaApi @Generated("by gapic-generator-java") public class MockBigtableImpl extends BigtableImplBase { - private List requests; + private List requests; private Queue responses; public MockBigtableImpl() { @@ -51,15 +51,15 @@ public MockBigtableImpl() { 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/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/MockIAMCredentials.java b/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/MockIAMCredentials.java index 5998e6b2af..f99f69f9cb 100644 --- a/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/MockIAMCredentials.java +++ b/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/MockIAMCredentials.java @@ -18,7 +18,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; import javax.annotation.Generated; @@ -33,12 +33,12 @@ public MockIAMCredentials() { } @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/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/MockIAMCredentialsImpl.java b/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/MockIAMCredentialsImpl.java index 1a4f3bb9b1..b8d0805273 100644 --- a/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/MockIAMCredentialsImpl.java +++ b/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/MockIAMCredentialsImpl.java @@ -18,7 +18,7 @@ import com.google.api.core.BetaApi; import com.google.cloud.iam.credentials.v1.IAMCredentialsGrpc.IAMCredentialsImplBase; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -29,7 +29,7 @@ @BetaApi @Generated("by gapic-generator-java") public class MockIAMCredentialsImpl extends IAMCredentialsImplBase { - private List requests; + private List requests; private Queue responses; public MockIAMCredentialsImpl() { @@ -37,15 +37,15 @@ public MockIAMCredentialsImpl() { 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/test/integration/goldens/iam/src/com/google/iam/v1/MockIAMPolicy.java b/test/integration/goldens/iam/src/com/google/iam/v1/MockIAMPolicy.java index 320757dfa7..723ee1a31a 100644 --- a/test/integration/goldens/iam/src/com/google/iam/v1/MockIAMPolicy.java +++ b/test/integration/goldens/iam/src/com/google/iam/v1/MockIAMPolicy.java @@ -18,7 +18,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; import javax.annotation.Generated; @@ -33,12 +33,12 @@ public MockIAMPolicy() { } @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/test/integration/goldens/iam/src/com/google/iam/v1/MockIAMPolicyImpl.java b/test/integration/goldens/iam/src/com/google/iam/v1/MockIAMPolicyImpl.java index 403b0aedae..46c364b905 100644 --- a/test/integration/goldens/iam/src/com/google/iam/v1/MockIAMPolicyImpl.java +++ b/test/integration/goldens/iam/src/com/google/iam/v1/MockIAMPolicyImpl.java @@ -18,7 +18,7 @@ import com.google.api.core.BetaApi; import com.google.iam.v1.IAMPolicyGrpc.IAMPolicyImplBase; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -29,7 +29,7 @@ @BetaApi @Generated("by gapic-generator-java") public class MockIAMPolicyImpl extends IAMPolicyImplBase { - private List requests; + private List requests; private Queue responses; public MockIAMPolicyImpl() { @@ -37,15 +37,15 @@ public MockIAMPolicyImpl() { 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/test/integration/goldens/kms/src/com/google/cloud/kms/v1/MockIAMPolicy.java b/test/integration/goldens/kms/src/com/google/cloud/kms/v1/MockIAMPolicy.java index 7d7613bc81..e229ac9ff6 100644 --- a/test/integration/goldens/kms/src/com/google/cloud/kms/v1/MockIAMPolicy.java +++ b/test/integration/goldens/kms/src/com/google/cloud/kms/v1/MockIAMPolicy.java @@ -18,7 +18,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; import javax.annotation.Generated; @@ -33,12 +33,12 @@ public MockIAMPolicy() { } @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/test/integration/goldens/kms/src/com/google/cloud/kms/v1/MockIAMPolicyImpl.java b/test/integration/goldens/kms/src/com/google/cloud/kms/v1/MockIAMPolicyImpl.java index a6f63ba41b..f9d4b2d94d 100644 --- a/test/integration/goldens/kms/src/com/google/cloud/kms/v1/MockIAMPolicyImpl.java +++ b/test/integration/goldens/kms/src/com/google/cloud/kms/v1/MockIAMPolicyImpl.java @@ -22,7 +22,7 @@ import com.google.iam.v1.Policy; import com.google.iam.v1.TestIamPermissionsRequest; import com.google.iam.v1.TestIamPermissionsResponse; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -33,7 +33,7 @@ @BetaApi @Generated("by gapic-generator-java") public class MockIAMPolicyImpl extends IAMPolicyImplBase { - private List requests; + private List requests; private Queue responses; public MockIAMPolicyImpl() { @@ -41,15 +41,15 @@ public MockIAMPolicyImpl() { 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/test/integration/goldens/kms/src/com/google/cloud/kms/v1/MockKeyManagementService.java b/test/integration/goldens/kms/src/com/google/cloud/kms/v1/MockKeyManagementService.java index 83b6188727..944a56637f 100644 --- a/test/integration/goldens/kms/src/com/google/cloud/kms/v1/MockKeyManagementService.java +++ b/test/integration/goldens/kms/src/com/google/cloud/kms/v1/MockKeyManagementService.java @@ -18,7 +18,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; import javax.annotation.Generated; @@ -33,12 +33,12 @@ public MockKeyManagementService() { } @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/test/integration/goldens/kms/src/com/google/cloud/kms/v1/MockKeyManagementServiceImpl.java b/test/integration/goldens/kms/src/com/google/cloud/kms/v1/MockKeyManagementServiceImpl.java index 77d41dfdb7..f4ebea2f40 100644 --- a/test/integration/goldens/kms/src/com/google/cloud/kms/v1/MockKeyManagementServiceImpl.java +++ b/test/integration/goldens/kms/src/com/google/cloud/kms/v1/MockKeyManagementServiceImpl.java @@ -20,7 +20,7 @@ import com.google.cloud.kms.v1.KeyManagementServiceGrpc.KeyManagementServiceImplBase; import com.google.iam.v1.GetIamPolicyRequest; import com.google.iam.v1.Policy; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -31,7 +31,7 @@ @BetaApi @Generated("by gapic-generator-java") public class MockKeyManagementServiceImpl extends KeyManagementServiceImplBase { - private List requests; + private List requests; private Queue responses; public MockKeyManagementServiceImpl() { @@ -39,15 +39,15 @@ public MockKeyManagementServiceImpl() { 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/test/integration/goldens/kms/src/com/google/cloud/kms/v1/MockLocations.java b/test/integration/goldens/kms/src/com/google/cloud/kms/v1/MockLocations.java index 569ad9376d..82d17e691a 100644 --- a/test/integration/goldens/kms/src/com/google/cloud/kms/v1/MockLocations.java +++ b/test/integration/goldens/kms/src/com/google/cloud/kms/v1/MockLocations.java @@ -18,7 +18,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; import javax.annotation.Generated; @@ -33,12 +33,12 @@ public MockLocations() { } @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/test/integration/goldens/kms/src/com/google/cloud/kms/v1/MockLocationsImpl.java b/test/integration/goldens/kms/src/com/google/cloud/kms/v1/MockLocationsImpl.java index f24011c8fa..935e6eb9bd 100644 --- a/test/integration/goldens/kms/src/com/google/cloud/kms/v1/MockLocationsImpl.java +++ b/test/integration/goldens/kms/src/com/google/cloud/kms/v1/MockLocationsImpl.java @@ -22,7 +22,7 @@ import com.google.cloud.location.ListLocationsResponse; import com.google.cloud.location.Location; import com.google.cloud.location.LocationsGrpc.LocationsImplBase; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -33,7 +33,7 @@ @BetaApi @Generated("by gapic-generator-java") public class MockLocationsImpl extends LocationsImplBase { - private List requests; + private List requests; private Queue responses; public MockLocationsImpl() { @@ -41,15 +41,15 @@ public MockLocationsImpl() { 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/test/integration/goldens/library/src/com/google/cloud/example/library/v1/MockLibraryService.java b/test/integration/goldens/library/src/com/google/cloud/example/library/v1/MockLibraryService.java index b8617750ed..cc4d2178b6 100644 --- a/test/integration/goldens/library/src/com/google/cloud/example/library/v1/MockLibraryService.java +++ b/test/integration/goldens/library/src/com/google/cloud/example/library/v1/MockLibraryService.java @@ -18,7 +18,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; import javax.annotation.Generated; @@ -33,12 +33,12 @@ public MockLibraryService() { } @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/test/integration/goldens/library/src/com/google/cloud/example/library/v1/MockLibraryServiceImpl.java b/test/integration/goldens/library/src/com/google/cloud/example/library/v1/MockLibraryServiceImpl.java index 3be3da3235..ec2df9b687 100644 --- a/test/integration/goldens/library/src/com/google/cloud/example/library/v1/MockLibraryServiceImpl.java +++ b/test/integration/goldens/library/src/com/google/cloud/example/library/v1/MockLibraryServiceImpl.java @@ -33,8 +33,8 @@ import com.google.example.library.v1.MoveBookRequest; import com.google.example.library.v1.Shelf; import com.google.example.library.v1.UpdateBookRequest; -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; @@ -45,7 +45,7 @@ @BetaApi @Generated("by gapic-generator-java") public class MockLibraryServiceImpl extends LibraryServiceImplBase { - private List requests; + private List requests; private Queue responses; public MockLibraryServiceImpl() { @@ -53,15 +53,15 @@ public MockLibraryServiceImpl() { 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/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MockConfigServiceV2.java b/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MockConfigServiceV2.java index 4307b38185..437fcb0325 100644 --- a/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MockConfigServiceV2.java +++ b/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MockConfigServiceV2.java @@ -18,7 +18,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; import javax.annotation.Generated; @@ -33,12 +33,12 @@ public MockConfigServiceV2() { } @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/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MockConfigServiceV2Impl.java b/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MockConfigServiceV2Impl.java index 4228dd7b5a..eed73ec1f2 100644 --- a/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MockConfigServiceV2Impl.java +++ b/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MockConfigServiceV2Impl.java @@ -55,8 +55,8 @@ import com.google.logging.v2.UpdateSinkRequest; import com.google.logging.v2.UpdateViewRequest; import com.google.longrunning.Operation; -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; @@ -67,7 +67,7 @@ @BetaApi @Generated("by gapic-generator-java") public class MockConfigServiceV2Impl extends ConfigServiceV2ImplBase { - private List requests; + private List requests; private Queue responses; public MockConfigServiceV2Impl() { @@ -75,15 +75,15 @@ public MockConfigServiceV2Impl() { 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/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MockLoggingServiceV2.java b/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MockLoggingServiceV2.java index 3a0d1f388b..aa559c3eb3 100644 --- a/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MockLoggingServiceV2.java +++ b/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MockLoggingServiceV2.java @@ -18,7 +18,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; import javax.annotation.Generated; @@ -33,12 +33,12 @@ public MockLoggingServiceV2() { } @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/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MockLoggingServiceV2Impl.java b/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MockLoggingServiceV2Impl.java index cfff19d231..b9c299e2ee 100644 --- a/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MockLoggingServiceV2Impl.java +++ b/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MockLoggingServiceV2Impl.java @@ -29,8 +29,8 @@ import com.google.logging.v2.TailLogEntriesResponse; import com.google.logging.v2.WriteLogEntriesRequest; import com.google.logging.v2.WriteLogEntriesResponse; -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; @@ -41,7 +41,7 @@ @BetaApi @Generated("by gapic-generator-java") public class MockLoggingServiceV2Impl extends LoggingServiceV2ImplBase { - private List requests; + private List requests; private Queue responses; public MockLoggingServiceV2Impl() { @@ -49,15 +49,15 @@ public MockLoggingServiceV2Impl() { 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/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MockMetricsServiceV2.java b/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MockMetricsServiceV2.java index d4bb1d5af7..2ecfab1798 100644 --- a/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MockMetricsServiceV2.java +++ b/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MockMetricsServiceV2.java @@ -18,7 +18,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; import javax.annotation.Generated; @@ -33,12 +33,12 @@ public MockMetricsServiceV2() { } @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/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MockMetricsServiceV2Impl.java b/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MockMetricsServiceV2Impl.java index 597b93be7c..6c26aea17d 100644 --- a/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MockMetricsServiceV2Impl.java +++ b/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MockMetricsServiceV2Impl.java @@ -25,8 +25,8 @@ import com.google.logging.v2.LogMetric; import com.google.logging.v2.MetricsServiceV2Grpc.MetricsServiceV2ImplBase; import com.google.logging.v2.UpdateLogMetricRequest; -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; @@ -37,7 +37,7 @@ @BetaApi @Generated("by gapic-generator-java") public class MockMetricsServiceV2Impl extends MetricsServiceV2ImplBase { - private List requests; + private List requests; private Queue responses; public MockMetricsServiceV2Impl() { @@ -45,15 +45,15 @@ public MockMetricsServiceV2Impl() { 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/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockIAMPolicy.java b/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockIAMPolicy.java index ee510a051e..770453ebfa 100644 --- a/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockIAMPolicy.java +++ b/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockIAMPolicy.java @@ -18,7 +18,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; import javax.annotation.Generated; @@ -33,12 +33,12 @@ public MockIAMPolicy() { } @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/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockIAMPolicyImpl.java b/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockIAMPolicyImpl.java index f686ce75c5..c820f602f3 100644 --- a/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockIAMPolicyImpl.java +++ b/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockIAMPolicyImpl.java @@ -23,7 +23,7 @@ import com.google.iam.v1.SetIamPolicyRequest; import com.google.iam.v1.TestIamPermissionsRequest; import com.google.iam.v1.TestIamPermissionsResponse; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -34,7 +34,7 @@ @BetaApi @Generated("by gapic-generator-java") public class MockIAMPolicyImpl extends IAMPolicyImplBase { - private List requests; + private List requests; private Queue responses; public MockIAMPolicyImpl() { @@ -42,15 +42,15 @@ public MockIAMPolicyImpl() { 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/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockPublisher.java b/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockPublisher.java index 239ed03690..e841ca6224 100644 --- a/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockPublisher.java +++ b/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockPublisher.java @@ -18,7 +18,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; import javax.annotation.Generated; @@ -33,12 +33,12 @@ public MockPublisher() { } @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/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockPublisherImpl.java b/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockPublisherImpl.java index 5b2148c36d..badfc5e37a 100644 --- a/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockPublisherImpl.java +++ b/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockPublisherImpl.java @@ -17,8 +17,8 @@ package com.google.cloud.pubsub.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.pubsub.v1.DeleteTopicRequest; import com.google.pubsub.v1.DetachSubscriptionRequest; import com.google.pubsub.v1.DetachSubscriptionResponse; @@ -44,7 +44,7 @@ @BetaApi @Generated("by gapic-generator-java") public class MockPublisherImpl extends PublisherImplBase { - private List requests; + private List requests; private Queue responses; public MockPublisherImpl() { @@ -52,15 +52,15 @@ public MockPublisherImpl() { 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/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockSchemaService.java b/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockSchemaService.java index 838d5fbc68..876d053185 100644 --- a/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockSchemaService.java +++ b/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockSchemaService.java @@ -18,7 +18,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; import javax.annotation.Generated; @@ -33,12 +33,12 @@ public MockSchemaService() { } @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/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockSchemaServiceImpl.java b/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockSchemaServiceImpl.java index c2324f0b71..3ca3d85249 100644 --- a/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockSchemaServiceImpl.java +++ b/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockSchemaServiceImpl.java @@ -17,8 +17,8 @@ package com.google.cloud.pubsub.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.pubsub.v1.CommitSchemaRequest; import com.google.pubsub.v1.CreateSchemaRequest; import com.google.pubsub.v1.DeleteSchemaRequest; @@ -45,7 +45,7 @@ @BetaApi @Generated("by gapic-generator-java") public class MockSchemaServiceImpl extends SchemaServiceImplBase { - private List requests; + private List requests; private Queue responses; public MockSchemaServiceImpl() { @@ -53,15 +53,15 @@ public MockSchemaServiceImpl() { 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/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockSubscriber.java b/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockSubscriber.java index 067dcd8615..1b61bbd8fd 100644 --- a/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockSubscriber.java +++ b/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockSubscriber.java @@ -18,7 +18,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; import javax.annotation.Generated; @@ -33,12 +33,12 @@ public MockSubscriber() { } @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/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockSubscriberImpl.java b/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockSubscriberImpl.java index e466178eb9..4a39b40a39 100644 --- a/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockSubscriberImpl.java +++ b/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/MockSubscriberImpl.java @@ -17,8 +17,8 @@ package com.google.cloud.pubsub.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.pubsub.v1.AcknowledgeRequest; import com.google.pubsub.v1.CreateSnapshotRequest; import com.google.pubsub.v1.DeleteSnapshotRequest; @@ -52,7 +52,7 @@ @BetaApi @Generated("by gapic-generator-java") public class MockSubscriberImpl extends SubscriberImplBase { - private List requests; + private List requests; private Queue responses; public MockSubscriberImpl() { @@ -60,15 +60,15 @@ public MockSubscriberImpl() { 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/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/MockCloudRedis.java b/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/MockCloudRedis.java index a7fe90d365..d8282703ad 100644 --- a/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/MockCloudRedis.java +++ b/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/MockCloudRedis.java @@ -18,7 +18,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; import javax.annotation.Generated; @@ -33,12 +33,12 @@ public MockCloudRedis() { } @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/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/MockCloudRedisImpl.java b/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/MockCloudRedisImpl.java index a247c252fa..486d2211df 100644 --- a/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/MockCloudRedisImpl.java +++ b/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/MockCloudRedisImpl.java @@ -19,7 +19,7 @@ import com.google.api.core.BetaApi; import com.google.cloud.redis.v1beta1.CloudRedisGrpc.CloudRedisImplBase; import com.google.longrunning.Operation; -import com.google.protobuf.AbstractMessage; +import com.google.protobuf.Message; import io.grpc.stub.StreamObserver; import java.util.ArrayList; import java.util.LinkedList; @@ -30,7 +30,7 @@ @BetaApi @Generated("by gapic-generator-java") public class MockCloudRedisImpl extends CloudRedisImplBase { - private List requests; + private List requests; private Queue responses; public MockCloudRedisImpl() { @@ -38,15 +38,15 @@ public MockCloudRedisImpl() { 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/test/integration/goldens/storage/src/com/google/storage/v2/MockStorage.java b/test/integration/goldens/storage/src/com/google/storage/v2/MockStorage.java index da6553da1d..41992f458d 100644 --- a/test/integration/goldens/storage/src/com/google/storage/v2/MockStorage.java +++ b/test/integration/goldens/storage/src/com/google/storage/v2/MockStorage.java @@ -18,7 +18,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; import javax.annotation.Generated; @@ -33,12 +33,12 @@ public MockStorage() { } @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/test/integration/goldens/storage/src/com/google/storage/v2/MockStorageImpl.java b/test/integration/goldens/storage/src/com/google/storage/v2/MockStorageImpl.java index 3807dd67eb..b91fbda861 100644 --- a/test/integration/goldens/storage/src/com/google/storage/v2/MockStorageImpl.java +++ b/test/integration/goldens/storage/src/com/google/storage/v2/MockStorageImpl.java @@ -22,8 +22,8 @@ import com.google.iam.v1.SetIamPolicyRequest; import com.google.iam.v1.TestIamPermissionsRequest; import com.google.iam.v1.TestIamPermissionsResponse; -import com.google.protobuf.AbstractMessage; import com.google.protobuf.Empty; +import com.google.protobuf.Message; import com.google.storage.v2.StorageGrpc.StorageImplBase; import io.grpc.stub.StreamObserver; import java.util.ArrayList; @@ -35,7 +35,7 @@ @BetaApi @Generated("by gapic-generator-java") public class MockStorageImpl extends StorageImplBase { - private List requests; + private List requests; private Queue responses; public MockStorageImpl() { @@ -43,15 +43,15 @@ public MockStorageImpl() { 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); }