From 2d76bff6d64da818a3aff7ea0bdf5a36b82c3464 Mon Sep 17 00:00:00 2001 From: Neenu Shaji Date: Fri, 15 Oct 2021 13:46:12 -0400 Subject: [PATCH] deps: update com_google_protobuf to 3.18.1 (#1519) deps: update guava to v31 deps: update grpc to 1.41.0 deps: update auto-value to 1.8.2 deps: update api-common to 2.0.5 deps: update google-http-client to 1.40.1 feat: remove deprecated Generated annotation fix: Fix com.google.rpc.Code to StatusCode.Code conversion logic --- dependencies.properties | 18 +++++++++--------- .../com/google/longrunning/MockOperations.java | 1 - .../google/longrunning/MockOperationsImpl.java | 1 - .../httpjson/longrunning/OperationsClient.java | 2 -- .../longrunning/OperationsSettings.java | 2 -- .../HttpJsonOperationsCallableFactory.java | 2 -- .../stub/HttpJsonOperationsStub.java | 2 -- .../longrunning/stub/OperationsStub.java | 2 -- .../stub/OperationsStubSettings.java | 2 -- .../longrunning/OperationsClientTest.java | 2 -- 10 files changed, 9 insertions(+), 25 deletions(-) diff --git a/dependencies.properties b/dependencies.properties index 82959b1ed..95bab641d 100644 --- a/dependencies.properties +++ b/dependencies.properties @@ -23,9 +23,9 @@ version.gax_httpjson=0.90.4-SNAPSHOT # Versions for dependencies which actual artifacts differ between Bazel and Gradle. # Gradle build depends on prebuilt maven artifacts, while Bazel build depends on Bazel workspaces # with the sources. -version.com_google_protobuf=3.15.2 +version.com_google_protobuf=3.18.1 version.google_java_format=1.1 -version.io_grpc=1.37.0 +version.io_grpc=1.41.0 # Maven artifacts. # Note, the actual name of each property matters (bazel build scripts depend on it). @@ -53,21 +53,21 @@ maven.io_netty_netty_handler_proxy=io.netty:netty-handler-proxy:4.1.52.Final maven.io_perfmark_perfmark_api=io.perfmark:perfmark-api:0.23.0 maven.org_apache_tomcat_annotations_api=org.apache.tomcat:annotations-api:6.0.53 maven.com_google_code_gson_gson=com.google.code.gson:gson:2.8.6 -maven.com_google_guava_guava=com.google.guava:guava:30.1.1-jre +maven.com_google_guava_guava=com.google.guava:guava:31.0.1-jre maven.com_google_guava_failureaccess=com.google.guava:failureaccess:1.0.1 maven.org_apache_commons_commons_lang3=org.apache.commons:commons-lang3:3.8.1 maven.com_google_android_annotations=com.google.android:annotations:4.1.1.4 maven.com_google_code_findbugs_jsr305=com.google.code.findbugs:jsr305:3.0.2 -maven.com_google_errorprone_error_prone_annotations=com.google.errorprone:error_prone_annotations:2.5.1 +maven.com_google_errorprone_error_prone_annotations=com.google.errorprone:error_prone_annotations:2.9.0 maven.com_google_j2objc_j2objc_annotations=com.google.j2objc:j2objc-annotations:1.3 -maven.com_google_auto_value_auto_value=com.google.auto.value:auto-value:1.4 -maven.com_google_auto_value_auto_value_annotations=com.google.auto.value:auto-value-annotations:1.7.4 -maven.com_google_api_api_common=com.google.api:api-common:2.0.1 +maven.com_google_auto_value_auto_value=com.google.auto.value:auto-value:1.8.2 +maven.com_google_auto_value_auto_value_annotations=com.google.auto.value:auto-value-annotations:1.8.2 +maven.com_google_api_api_common=com.google.api:api-common:2.0.5 maven.org_threeten_threetenbp=org.threeten:threetenbp:1.5.0 maven.com_google_api_grpc_grpc_google_iam_v1=com.google.api.grpc:grpc-google-iam-v1:1.0.9 maven.com_google_api_grpc_proto_google_iam_v1=com.google.api.grpc:proto-google-iam-v1:1.0.9 -maven.com_google_http_client_google_http_client=com.google.http-client:google-http-client:1.40.0 -maven.com_google_http_client_google_http_client_gson=com.google.http-client:google-http-client-gson:1.40.0 +maven.com_google_http_client_google_http_client=com.google.http-client:google-http-client:1.40.1 +maven.com_google_http_client_google_http_client_gson=com.google.http-client:google-http-client-gson:1.40.1 maven.org_codehaus_mojo_animal_sniffer_annotations=org.codehaus.mojo:animal-sniffer-annotations:1.18 maven.javax_annotation_javax_annotation_api=javax.annotation:javax.annotation-api:1.3.2 diff --git a/gax-grpc/src/test/java/com/google/longrunning/MockOperations.java b/gax-grpc/src/test/java/com/google/longrunning/MockOperations.java index 58effb067..624eaa5c6 100644 --- a/gax-grpc/src/test/java/com/google/longrunning/MockOperations.java +++ b/gax-grpc/src/test/java/com/google/longrunning/MockOperations.java @@ -35,7 +35,6 @@ import io.grpc.ServerServiceDefinition; import java.util.List; -@javax.annotation.Generated("by GAPIC") @BetaApi public class MockOperations implements MockGrpcService { private final MockOperationsImpl serviceImpl; diff --git a/gax-grpc/src/test/java/com/google/longrunning/MockOperationsImpl.java b/gax-grpc/src/test/java/com/google/longrunning/MockOperationsImpl.java index f2b6eef03..594508d3d 100644 --- a/gax-grpc/src/test/java/com/google/longrunning/MockOperationsImpl.java +++ b/gax-grpc/src/test/java/com/google/longrunning/MockOperationsImpl.java @@ -39,7 +39,6 @@ import java.util.List; import java.util.Queue; -@javax.annotation.Generated("by GAPIC") @BetaApi public class MockOperationsImpl extends OperationsImplBase { private List requests; diff --git a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/OperationsClient.java b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/OperationsClient.java index 929d9d64c..b24c0f8c2 100644 --- a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/OperationsClient.java +++ b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/OperationsClient.java @@ -52,7 +52,6 @@ import java.io.IOException; import java.util.List; import java.util.concurrent.TimeUnit; -import javax.annotation.Generated; // AUTO-GENERATED DOCUMENTATION AND CLASS. /** @@ -121,7 +120,6 @@ * *

Please refer to the GitHub repository's samples for more quickstart code snippets. */ -@Generated("by gapic-generator-java") @BetaApi public class OperationsClient implements BackgroundResource { private final OperationsSettings settings; diff --git a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/OperationsSettings.java b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/OperationsSettings.java index 42afe6c9f..a22ab01d5 100644 --- a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/OperationsSettings.java +++ b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/OperationsSettings.java @@ -52,7 +52,6 @@ import com.google.protobuf.Empty; import java.io.IOException; import java.util.List; -import javax.annotation.Generated; // AUTO-GENERATED DOCUMENTATION AND CLASS. /** @@ -85,7 +84,6 @@ * OperationsSettings operationsSettings = operationsSettingsBuilder.build(); * } */ -@Generated("by gapic-generator-java") @BetaApi public class OperationsSettings extends ClientSettings { diff --git a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/stub/HttpJsonOperationsCallableFactory.java b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/stub/HttpJsonOperationsCallableFactory.java index dc279501c..d98991702 100644 --- a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/stub/HttpJsonOperationsCallableFactory.java +++ b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/stub/HttpJsonOperationsCallableFactory.java @@ -42,7 +42,6 @@ import com.google.api.gax.rpc.PagedCallSettings; import com.google.api.gax.rpc.UnaryCallSettings; import com.google.api.gax.rpc.UnaryCallable; -import javax.annotation.Generated; // AUTO-GENERATED DOCUMENTATION AND CLASS. /** @@ -50,7 +49,6 @@ * *

This class is for advanced usage. */ -@Generated("by gapic-generator-java") @BetaApi public class HttpJsonOperationsCallableFactory implements HttpJsonStubCallableFactory { diff --git a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/stub/HttpJsonOperationsStub.java b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/stub/HttpJsonOperationsStub.java index 7684f5d9b..ccc9ae2c9 100644 --- a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/stub/HttpJsonOperationsStub.java +++ b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/stub/HttpJsonOperationsStub.java @@ -65,7 +65,6 @@ import java.util.List; import java.util.Map; import java.util.concurrent.TimeUnit; -import javax.annotation.Generated; // AUTO-GENERATED DOCUMENTATION AND CLASS. /** @@ -73,7 +72,6 @@ * *

This class is for advanced usage and reflects the underlying API directly. */ -@Generated("by gapic-generator-java") @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public class HttpJsonOperationsStub extends OperationsStub { private static final ApiMethodDescriptor diff --git a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/stub/OperationsStub.java b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/stub/OperationsStub.java index 0c125e050..46755d1ce 100644 --- a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/stub/OperationsStub.java +++ b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/stub/OperationsStub.java @@ -41,7 +41,6 @@ import com.google.longrunning.ListOperationsResponse; import com.google.longrunning.Operation; import com.google.protobuf.Empty; -import javax.annotation.Generated; // AUTO-GENERATED DOCUMENTATION AND CLASS. /** @@ -49,7 +48,6 @@ * *

This class is for advanced usage and reflects the underlying API directly. */ -@Generated("by gapic-generator-java") @BetaApi public abstract class OperationsStub implements BackgroundResource { diff --git a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/stub/OperationsStubSettings.java b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/stub/OperationsStubSettings.java index 679ab36a3..ccee9b1f2 100644 --- a/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/stub/OperationsStubSettings.java +++ b/gax-httpjson/src/main/java/com/google/api/gax/httpjson/longrunning/stub/OperationsStubSettings.java @@ -66,7 +66,6 @@ import com.google.protobuf.Empty; import java.io.IOException; import java.util.List; -import javax.annotation.Generated; import org.threeten.bp.Duration; // AUTO-GENERATED DOCUMENTATION AND CLASS. @@ -100,7 +99,6 @@ * OperationsStubSettings operationsSettings = operationsSettingsBuilder.build(); * } */ -@Generated("by gapic-generator-java") @BetaApi public class OperationsStubSettings extends StubSettings { /** The default scopes of the service. */ diff --git a/gax-httpjson/src/test/java/com/google/api/gax/httpjson/longrunning/OperationsClientTest.java b/gax-httpjson/src/test/java/com/google/api/gax/httpjson/longrunning/OperationsClientTest.java index 131870e78..96a8ac740 100644 --- a/gax-httpjson/src/test/java/com/google/api/gax/httpjson/longrunning/OperationsClientTest.java +++ b/gax-httpjson/src/test/java/com/google/api/gax/httpjson/longrunning/OperationsClientTest.java @@ -49,7 +49,6 @@ import java.io.IOException; import java.util.Arrays; import java.util.List; -import javax.annotation.Generated; import org.junit.After; import org.junit.AfterClass; import org.junit.Assert; @@ -57,7 +56,6 @@ import org.junit.BeforeClass; import org.junit.Test; -@Generated("by gapic-generator-java") public class OperationsClientTest { private static MockHttpService mockService; private static OperationsClient client;