From eac4c6decc5588a0df9e843af32fc2848039d281 Mon Sep 17 00:00:00 2001 From: Hanzhen Yi Date: Tue, 22 May 2018 16:01:40 -0700 Subject: [PATCH 1/4] Add logging interceptor and error augmentation interceptor --- .../cloud/spanner/spi/v1/GapicSpannerRpc.java | 96 ++++++++-------- .../spanner/spi/v1/LoggingInterceptor.java | 108 ++++++++++++++++++ .../spi/v1/SpannerInterceptorProvider.java | 40 +++++++ 3 files changed, 194 insertions(+), 50 deletions(-) create mode 100644 google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/LoggingInterceptor.java create mode 100644 google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/SpannerInterceptorProvider.java diff --git a/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java index 18ca176d0153..fba7beab6ab6 100644 --- a/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java +++ b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/GapicSpannerRpc.java @@ -23,11 +23,9 @@ import com.google.api.gax.core.GaxProperties; import com.google.api.gax.grpc.GaxGrpcProperties; import com.google.api.gax.grpc.GrpcCallContext; -import com.google.api.gax.grpc.GrpcTransportChannel; import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider; import com.google.api.gax.longrunning.OperationFuture; import com.google.api.gax.rpc.ApiClientHeaderProvider; -import com.google.api.gax.rpc.FixedTransportChannelProvider; import com.google.api.gax.rpc.HeaderProvider; import com.google.api.gax.rpc.ServerStream; import com.google.api.gax.rpc.StatusCode; @@ -52,6 +50,7 @@ import com.google.common.base.MoreObjects; import com.google.common.collect.ImmutableSet; import com.google.longrunning.GetOperationRequest; +import com.google.longrunning.Operation; import com.google.protobuf.Empty; import com.google.protobuf.FieldMask; import com.google.spanner.admin.database.v1.CreateDatabaseMetadata; @@ -83,10 +82,10 @@ import com.google.spanner.v1.CreateSessionRequest; import com.google.spanner.v1.DeleteSessionRequest; import com.google.spanner.v1.ExecuteSqlRequest; +import com.google.spanner.v1.PartialResultSet; import com.google.spanner.v1.PartitionQueryRequest; import com.google.spanner.v1.PartitionReadRequest; import com.google.spanner.v1.PartitionResponse; -import com.google.spanner.v1.PartialResultSet; import com.google.spanner.v1.ReadRequest; import com.google.spanner.v1.RollbackRequest; import com.google.spanner.v1.Session; @@ -100,8 +99,6 @@ import java.util.concurrent.Future; import javax.annotation.Nullable; -import com.google.longrunning.Operation; - /** Implementation of Cloud Spanner remote calls using Gapic libraries. */ public class GapicSpannerRpc implements SpannerRpc { @@ -145,9 +142,7 @@ public GapicSpannerRpc(SpannerOptions options) throws IOException { mergedHeaderProvider.getHeaders(), internalHeaderProviderBuilder.getResourceHeaderKey()); - // TODO(pongad): make RPC logging work (formerly LoggingInterceptor) // TODO(pongad): add watchdog - // TODO(pongad): make error augmentation work (formerly SpannerErrorInterceptor) // TODO(hzyi): make this channelProvider configurable through SpannerOptions TransportChannelProvider channelProvider = @@ -156,11 +151,12 @@ public GapicSpannerRpc(SpannerOptions options) throws IOException { .setEndpoint(options.getEndpoint()) .setMaxInboundMessageSize(MAX_MESSAGE_SIZE) .setPoolSize(options.getNumChannels()) + .setInterceptorProvider(new SpannerInterceptorProvider()) .build(); CredentialsProvider credentialsProvider = GrpcTransportOptions.setUpCredentialsProvider(options); - + // Disabling retry for now because spanner handles retry in SpannerImpl. // We will finally want to improve gax but for smooth transitioning we // preserve the retry in SpannerImpl @@ -168,48 +164,48 @@ public GapicSpannerRpc(SpannerOptions options) throws IOException { // TODO: bump the version of gax and remove this try-catch block // applyToAllUnaryMethods does not throw exception in the latest version this.stub = - GrpcSpannerStub.create( - SpannerStubSettings.newBuilder() - .setTransportChannelProvider(channelProvider) - .setCredentialsProvider(credentialsProvider) - .applyToAllUnaryMethods( - new ApiFunction, Void>() { - @Override - public Void apply(UnaryCallSettings.Builder builder) { - builder.setRetryableCodes(ImmutableSet.of()); - return null; - } - }) - .build()); - - this.instanceStub = - GrpcInstanceAdminStub.create( - InstanceAdminStubSettings.newBuilder() - .setTransportChannelProvider(channelProvider) - .setCredentialsProvider(credentialsProvider) - .applyToAllUnaryMethods( - new ApiFunction, Void>() { - @Override - public Void apply(UnaryCallSettings.Builder builder) { - builder.setRetryableCodes(ImmutableSet.of()); - return null; - } - }) - .build()); - this.databaseStub = - GrpcDatabaseAdminStub.create( - DatabaseAdminStubSettings.newBuilder() - .setTransportChannelProvider(channelProvider) - .setCredentialsProvider(credentialsProvider) - .applyToAllUnaryMethods( - new ApiFunction, Void>() { - @Override - public Void apply(UnaryCallSettings.Builder builder) { - builder.setRetryableCodes(ImmutableSet.of()); - return null; - } - }) - .build()); + GrpcSpannerStub.create( + SpannerStubSettings.newBuilder() + .setTransportChannelProvider(channelProvider) + .setCredentialsProvider(credentialsProvider) + .applyToAllUnaryMethods( + new ApiFunction, Void>() { + @Override + public Void apply(UnaryCallSettings.Builder builder) { + builder.setRetryableCodes(ImmutableSet.of()); + return null; + } + }) + .build()); + + this.instanceStub = + GrpcInstanceAdminStub.create( + InstanceAdminStubSettings.newBuilder() + .setTransportChannelProvider(channelProvider) + .setCredentialsProvider(credentialsProvider) + .applyToAllUnaryMethods( + new ApiFunction, Void>() { + @Override + public Void apply(UnaryCallSettings.Builder builder) { + builder.setRetryableCodes(ImmutableSet.of()); + return null; + } + }) + .build()); + this.databaseStub = + GrpcDatabaseAdminStub.create( + DatabaseAdminStubSettings.newBuilder() + .setTransportChannelProvider(channelProvider) + .setCredentialsProvider(credentialsProvider) + .applyToAllUnaryMethods( + new ApiFunction, Void>() { + @Override + public Void apply(UnaryCallSettings.Builder builder) { + builder.setRetryableCodes(ImmutableSet.of()); + return null; + } + }) + .build()); } catch (Exception e) { throw SpannerExceptionFactory.newSpannerException(e); } diff --git a/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/LoggingInterceptor.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/LoggingInterceptor.java new file mode 100644 index 000000000000..44571b1a6523 --- /dev/null +++ b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/LoggingInterceptor.java @@ -0,0 +1,108 @@ +/* + * Copyright 2018 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.google.cloud.spanner.spi.v1; + +import io.grpc.CallOptions; +import io.grpc.Channel; +import io.grpc.ClientCall; +import io.grpc.ClientInterceptor; +import io.grpc.ForwardingClientCall; +import io.grpc.ForwardingClientCallListener; +import io.grpc.Metadata; +import io.grpc.MethodDescriptor; +import io.grpc.Status; +import java.util.logging.Level; +import java.util.logging.Logger; +import javax.annotation.Nullable; + +/** Adds logging to rpc calls */ +class LoggingInterceptor implements ClientInterceptor { + + private final Logger logger; + private final Level level; + + LoggingInterceptor(Logger logger, Level level) { + this.logger = logger; + this.level = level; + } + + private class CallLogger { + + private final MethodDescriptor method; + + CallLogger(MethodDescriptor method) { + this.method = method; + } + + void log(String message) { + logger.log( + level, + "{0}[{1}]: {2}", + new Object[] { + method.getFullMethodName(), Integer.toHexString(System.identityHashCode(this)), message + }); + } + + void logfmt(String message, Object... params) { + log(String.format(message, params)); + } + } + + @Override + public ClientCall interceptCall( + MethodDescriptor method, CallOptions callOptions, Channel next) { + if (!logger.isLoggable(level)) { + return next.newCall(method, callOptions); + } + + final CallLogger callLogger = new CallLogger(method); + callLogger.log("Start"); + return new ForwardingClientCall.SimpleForwardingClientCall( + next.newCall(method, callOptions)) { + @Override + public void start(Listener responseListener, Metadata headers) { + super.start( + new ForwardingClientCallListener.SimpleForwardingClientCallListener( + responseListener) { + @Override + public void onMessage(RespT message) { + callLogger.logfmt("Received:\n%s", message); + super.onMessage(message); + } + + @Override + public void onClose(Status status, Metadata trailers) { + callLogger.logfmt("Closed with status %s and trailers %s", status, trailers); + super.onClose(status, trailers); + } + }, + headers); + } + + @Override + public void sendMessage(ReqT message) { + callLogger.logfmt("Send:\n%s", message); + super.sendMessage(message); + } + + @Override + public void cancel(@Nullable String message, @Nullable Throwable cause) { + callLogger.logfmt("Cancelled with message %s", message); + super.cancel(message, cause); + } + }; + } +} diff --git a/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/SpannerInterceptorProvider.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/SpannerInterceptorProvider.java new file mode 100644 index 000000000000..a07d549cd415 --- /dev/null +++ b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/SpannerInterceptorProvider.java @@ -0,0 +1,40 @@ +/* + * Copyright 2018 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 + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ +package com.google.cloud.spanner.spi.v1; + +import com.google.api.gax.grpc.GrpcInterceptorProvider; +import com.google.common.collect.ImmutableList; +import io.grpc.ClientInterceptor; +import java.util.List; +import java.util.logging.Level; +import java.util.logging.Logger; + +/** + * For internal use only. + */ +class SpannerInterceptorProvider implements GrpcInterceptorProvider { + + private static final List clientInterceptors = + ImmutableList.of( + new SpannerErrorInterceptor(), + new LoggingInterceptor(Logger.getLogger(GrpcSpannerRpc.class.getName()), Level.FINER)); + + @Override + public List getInterceptors() { + return clientInterceptors; + } + +} From 638b583431891b1790c9d9876fbb9565cb58c868 Mon Sep 17 00:00:00 2001 From: Hanzhen Yi Date: Thu, 31 May 2018 16:36:52 -0700 Subject: [PATCH 2/4] update gax version --- google-cloud-bom/pom.xml | 280 +++++++++++++++++++-------------------- pom.xml | 2 +- 2 files changed, 141 insertions(+), 141 deletions(-) diff --git a/google-cloud-bom/pom.xml b/google-cloud-bom/pom.xml index d418263ab2f4..a2d67b36539b 100644 --- a/google-cloud-bom/pom.xml +++ b/google-cloud-bom/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-bom pom - 0.49.1-alpha-SNAPSHOT + 0.50.1-alpha-SNAPSHOT Google Cloud Java BOM https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-bom @@ -199,725 +199,725 @@ com.google.cloud google-cloud-bigtable - 0.49.1-alpha-SNAPSHOT + 0.50.1-alpha-SNAPSHOT com.google.cloud google-cloud-bigtable - 0.49.1-alpha-SNAPSHOT + 0.50.1-alpha-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-bigtable-v2 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-bigtable-v2 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.api.grpc proto-google-cloud-bigtable-admin-v2 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-bigtable-admin-v2 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.cloud google-cloud-bigquery - 1.31.1-SNAPSHOT + 1.32.1-SNAPSHOT com.google.cloud google-cloud-bigquery - 1.31.1-SNAPSHOT + 1.32.1-SNAPSHOT test-jar com.google.cloud google-cloud-bigquerydatatransfer - 0.49.1-beta-SNAPSHOT + 0.50.1-beta-SNAPSHOT com.google.cloud google-cloud-bigquerydatatransfer - 0.49.1-beta-SNAPSHOT + 0.50.1-beta-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-bigquerydatatransfer-v1 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-bigquerydatatransfer-v1 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.cloud google-cloud-compute - 0.49.1-alpha-SNAPSHOT + 0.50.1-alpha-SNAPSHOT com.google.cloud google-cloud-compute - 0.49.1-alpha-SNAPSHOT + 0.50.1-alpha-SNAPSHOT test-jar com.google.cloud google-cloud-container - 0.49.1-beta-SNAPSHOT + 0.50.1-beta-SNAPSHOT com.google.cloud google-cloud-container - 0.49.1-beta-SNAPSHOT + 0.50.1-beta-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-container-v1 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-container-v1 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.cloud google-cloud-contrib - 0.49.1-alpha-SNAPSHOT + 0.50.1-alpha-SNAPSHOT com.google.cloud google-cloud-contrib - 0.49.1-alpha-SNAPSHOT + 0.50.1-alpha-SNAPSHOT test-jar com.google.cloud google-cloud-nio - 0.49.1-alpha-SNAPSHOT + 0.50.1-alpha-SNAPSHOT com.google.cloud google-cloud-nio - 0.49.1-alpha-SNAPSHOT + 0.50.1-alpha-SNAPSHOT test-jar com.google.cloud google-cloud-core - 1.31.1-SNAPSHOT + 1.32.1-SNAPSHOT com.google.cloud google-cloud-core - 1.31.1-SNAPSHOT + 1.32.1-SNAPSHOT test-jar com.google.cloud google-cloud-core-grpc - 1.31.1-SNAPSHOT + 1.32.1-SNAPSHOT com.google.cloud google-cloud-core-grpc - 1.31.1-SNAPSHOT + 1.32.1-SNAPSHOT test-jar com.google.cloud google-cloud-core-http - 1.31.1-SNAPSHOT + 1.32.1-SNAPSHOT com.google.cloud google-cloud-core-http - 1.31.1-SNAPSHOT + 1.32.1-SNAPSHOT test-jar com.google.cloud google-cloud-dataproc - 0.49.1-alpha-SNAPSHOT + 0.50.1-alpha-SNAPSHOT com.google.cloud google-cloud-dataproc - 0.49.1-alpha-SNAPSHOT + 0.50.1-alpha-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-dataproc-v1 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-dataproc-v1 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.cloud google-cloud-datastore - 1.31.1-SNAPSHOT + 1.32.1-SNAPSHOT com.google.cloud google-cloud-datastore - 1.31.1-SNAPSHOT + 1.32.1-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-datastore-v1 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.cloud google-cloud-dlp - 0.49.1-beta-SNAPSHOT + 0.50.1-beta-SNAPSHOT com.google.cloud google-cloud-dlp - 0.49.1-beta-SNAPSHOT + 0.50.1-beta-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-dlp-v2 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-dlp-v2 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.cloud google-cloud-dialogflow - 0.49.1-alpha-SNAPSHOT + 0.50.1-alpha-SNAPSHOT com.google.cloud google-cloud-dialogflow - 0.49.1-alpha-SNAPSHOT + 0.50.1-alpha-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-dialogflow-v2beta1 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-dialogflow-v2beta1 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.api.grpc proto-google-cloud-dialogflow-v2 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-dialogflow-v2 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.cloud google-cloud-dns - 0.49.1-alpha-SNAPSHOT + 0.50.1-alpha-SNAPSHOT com.google.cloud google-cloud-dns - 0.49.1-alpha-SNAPSHOT + 0.50.1-alpha-SNAPSHOT test-jar com.google.cloud google-cloud-errorreporting - 0.49.1-beta-SNAPSHOT + 0.50.1-beta-SNAPSHOT com.google.cloud google-cloud-errorreporting - 0.49.1-beta-SNAPSHOT + 0.50.1-beta-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-error-reporting-v1beta1 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-error-reporting-v1beta1 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.cloud google-cloud-firestore - 0.49.1-beta-SNAPSHOT + 0.50.1-beta-SNAPSHOT com.google.cloud google-cloud-firestore - 0.49.1-beta-SNAPSHOT + 0.50.1-beta-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-firestore-v1beta1 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-firestore-v1beta1 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.cloud google-cloud-language - 1.31.1-SNAPSHOT + 1.32.1-SNAPSHOT com.google.cloud google-cloud-language - 1.31.1-SNAPSHOT + 1.32.1-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-language-v1 - 1.13.1-SNAPSHOT + 1.14.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-language-v1 - 1.13.1-SNAPSHOT + 1.14.1-SNAPSHOT com.google.api.grpc proto-google-cloud-language-v1beta2 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-language-v1beta2 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.cloud google-cloud-logging - 1.31.1-SNAPSHOT + 1.32.1-SNAPSHOT com.google.cloud google-cloud-logging - 1.31.1-SNAPSHOT + 1.32.1-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-logging-v2 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-logging-v2 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.cloud google-cloud-logging-logback - 0.49.1-alpha-SNAPSHOT + 0.50.1-alpha-SNAPSHOT com.google.cloud google-cloud-monitoring - 0.49.1-beta-SNAPSHOT + 0.50.1-beta-SNAPSHOT com.google.cloud google-cloud-monitoring - 0.49.1-beta-SNAPSHOT + 0.50.1-beta-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-monitoring-v3 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-monitoring-v3 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.cloud google-cloud-os-login - 0.49.1-alpha-SNAPSHOT + 0.50.1-alpha-SNAPSHOT com.google.cloud google-cloud-os-login - 0.49.1-alpha-SNAPSHOT + 0.50.1-alpha-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-os-login-v1 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-os-login-v1 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.cloud google-cloud-pubsub - 1.31.1-SNAPSHOT + 1.32.1-SNAPSHOT com.google.cloud google-cloud-pubsub - 1.31.1-SNAPSHOT + 1.32.1-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-pubsub-v1 - 1.13.1-SNAPSHOT + 1.14.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-pubsub-v1 - 1.13.1-SNAPSHOT + 1.14.1-SNAPSHOT com.google.cloud google-cloud-redis - 0.49.1-alpha-SNAPSHOT + 0.50.1-alpha-SNAPSHOT com.google.cloud google-cloud-redis - 0.49.1-alpha-SNAPSHOT + 0.50.1-alpha-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-redis-v1beta1 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-redis-v1beta1 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.cloud google-cloud-resourcemanager - 0.49.1-alpha-SNAPSHOT + 0.50.1-alpha-SNAPSHOT com.google.cloud google-cloud-resourcemanager - 0.49.1-alpha-SNAPSHOT + 0.50.1-alpha-SNAPSHOT test-jar com.google.cloud google-cloud-spanner - 0.49.1-beta-SNAPSHOT + 0.50.1-beta-SNAPSHOT com.google.cloud google-cloud-spanner - 0.49.1-beta-SNAPSHOT + 0.50.1-beta-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-spanner-v1 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-spanner-v1 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.api.grpc proto-google-cloud-spanner-admin-database-v1 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-spanner-admin-database-v1 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.api.grpc proto-google-cloud-spanner-admin-instance-v1 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-spanner-admin-instance-v1 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.cloud google-cloud-speech - 0.49.1-alpha-SNAPSHOT + 0.50.1-alpha-SNAPSHOT com.google.cloud google-cloud-speech - 0.49.1-alpha-SNAPSHOT + 0.50.1-alpha-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-speech-v1beta1 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-speech-v1beta1 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.api.grpc proto-google-cloud-speech-v1p1beta1 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-speech-v1p1beta1 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.api.grpc proto-google-cloud-speech-v1 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-speech-v1 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.cloud google-cloud-storage - 1.31.1-SNAPSHOT + 1.32.1-SNAPSHOT com.google.cloud google-cloud-storage - 1.31.1-SNAPSHOT + 1.32.1-SNAPSHOT test-jar com.google.cloud google-cloud-texttospeech - 0.49.1-beta-SNAPSHOT + 0.50.1-beta-SNAPSHOT com.google.cloud google-cloud-texttospeech - 0.49.1-beta-SNAPSHOT + 0.50.1-beta-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-texttospeech-v1beta1 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-texttospeech-v1beta1 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.api.grpc proto-google-cloud-texttospeech-v1 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-texttospeech-v1 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.cloud google-cloud-trace - 0.49.1-beta-SNAPSHOT + 0.50.1-beta-SNAPSHOT com.google.cloud google-cloud-trace - 0.49.1-beta-SNAPSHOT + 0.50.1-beta-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-trace-v1 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-trace-v1 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.api.grpc proto-google-cloud-trace-v2 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-trace-v2 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.cloud google-cloud-translate - 1.31.1-SNAPSHOT + 1.32.1-SNAPSHOT com.google.cloud google-cloud-translate - 1.31.1-SNAPSHOT + 1.32.1-SNAPSHOT test-jar com.google.cloud google-cloud-vision - 1.31.1-SNAPSHOT + 1.32.1-SNAPSHOT com.google.cloud google-cloud-vision - 1.31.1-SNAPSHOT + 1.32.1-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-vision-v1 - 1.13.1-SNAPSHOT + 1.14.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-vision-v1 - 1.13.1-SNAPSHOT + 1.14.1-SNAPSHOT com.google.api.grpc proto-google-cloud-vision-v1p1beta1 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-vision-v1p1beta1 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.api.grpc proto-google-cloud-vision-v1p2beta1 - 1.13.1-SNAPSHOT + 1.14.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-vision-v1p2beta1 - 1.13.1-SNAPSHOT + 1.14.1-SNAPSHOT com.google.cloud google-cloud-video-intelligence - 0.49.1-beta-SNAPSHOT + 0.50.1-beta-SNAPSHOT com.google.cloud google-cloud-video-intelligence - 0.49.1-beta-SNAPSHOT + 0.50.1-beta-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-video-intelligence-v1beta1 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-video-intelligence-v1beta1 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.api.grpc proto-google-cloud-video-intelligence-v1beta2 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-video-intelligence-v1beta2 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.api.grpc proto-google-cloud-video-intelligence-v1 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-video-intelligence-v1 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.api.grpc proto-google-cloud-video-intelligence-v1p1beta1 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-video-intelligence-v1p1beta1 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.api.grpc proto-google-cloud-iot-v1 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-iot-v1 - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.api.grpc proto-google-cloud-websecurityscanner-v1alpha - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-websecurityscanner-v1alpha - 0.14.1-SNAPSHOT + 0.15.1-SNAPSHOT @@ -1018,4 +1018,4 @@ - + \ No newline at end of file diff --git a/pom.xml b/pom.xml index 58e809ea7b55..af50c26c6c8d 100644 --- a/pom.xml +++ b/pom.xml @@ -104,4 +104,4 @@ - + \ No newline at end of file From e4607c5ae9f2f80fcdf08341627ae2121bb2f966 Mon Sep 17 00:00:00 2001 From: Hanzhen Yi Date: Mon, 4 Jun 2018 11:13:40 -0700 Subject: [PATCH 3/4] fix version --- google-cloud-bom/pom.xml | 280 +++++++++++++++++++-------------------- pom.xml | 2 +- 2 files changed, 141 insertions(+), 141 deletions(-) diff --git a/google-cloud-bom/pom.xml b/google-cloud-bom/pom.xml index a2d67b36539b..d418263ab2f4 100644 --- a/google-cloud-bom/pom.xml +++ b/google-cloud-bom/pom.xml @@ -4,7 +4,7 @@ com.google.cloud google-cloud-bom pom - 0.50.1-alpha-SNAPSHOT + 0.49.1-alpha-SNAPSHOT Google Cloud Java BOM https://github.com/GoogleCloudPlatform/google-cloud-java/tree/master/google-cloud-bom @@ -199,725 +199,725 @@ com.google.cloud google-cloud-bigtable - 0.50.1-alpha-SNAPSHOT + 0.49.1-alpha-SNAPSHOT com.google.cloud google-cloud-bigtable - 0.50.1-alpha-SNAPSHOT + 0.49.1-alpha-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-bigtable-v2 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-bigtable-v2 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.api.grpc proto-google-cloud-bigtable-admin-v2 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-bigtable-admin-v2 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.cloud google-cloud-bigquery - 1.32.1-SNAPSHOT + 1.31.1-SNAPSHOT com.google.cloud google-cloud-bigquery - 1.32.1-SNAPSHOT + 1.31.1-SNAPSHOT test-jar com.google.cloud google-cloud-bigquerydatatransfer - 0.50.1-beta-SNAPSHOT + 0.49.1-beta-SNAPSHOT com.google.cloud google-cloud-bigquerydatatransfer - 0.50.1-beta-SNAPSHOT + 0.49.1-beta-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-bigquerydatatransfer-v1 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-bigquerydatatransfer-v1 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.cloud google-cloud-compute - 0.50.1-alpha-SNAPSHOT + 0.49.1-alpha-SNAPSHOT com.google.cloud google-cloud-compute - 0.50.1-alpha-SNAPSHOT + 0.49.1-alpha-SNAPSHOT test-jar com.google.cloud google-cloud-container - 0.50.1-beta-SNAPSHOT + 0.49.1-beta-SNAPSHOT com.google.cloud google-cloud-container - 0.50.1-beta-SNAPSHOT + 0.49.1-beta-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-container-v1 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-container-v1 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.cloud google-cloud-contrib - 0.50.1-alpha-SNAPSHOT + 0.49.1-alpha-SNAPSHOT com.google.cloud google-cloud-contrib - 0.50.1-alpha-SNAPSHOT + 0.49.1-alpha-SNAPSHOT test-jar com.google.cloud google-cloud-nio - 0.50.1-alpha-SNAPSHOT + 0.49.1-alpha-SNAPSHOT com.google.cloud google-cloud-nio - 0.50.1-alpha-SNAPSHOT + 0.49.1-alpha-SNAPSHOT test-jar com.google.cloud google-cloud-core - 1.32.1-SNAPSHOT + 1.31.1-SNAPSHOT com.google.cloud google-cloud-core - 1.32.1-SNAPSHOT + 1.31.1-SNAPSHOT test-jar com.google.cloud google-cloud-core-grpc - 1.32.1-SNAPSHOT + 1.31.1-SNAPSHOT com.google.cloud google-cloud-core-grpc - 1.32.1-SNAPSHOT + 1.31.1-SNAPSHOT test-jar com.google.cloud google-cloud-core-http - 1.32.1-SNAPSHOT + 1.31.1-SNAPSHOT com.google.cloud google-cloud-core-http - 1.32.1-SNAPSHOT + 1.31.1-SNAPSHOT test-jar com.google.cloud google-cloud-dataproc - 0.50.1-alpha-SNAPSHOT + 0.49.1-alpha-SNAPSHOT com.google.cloud google-cloud-dataproc - 0.50.1-alpha-SNAPSHOT + 0.49.1-alpha-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-dataproc-v1 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-dataproc-v1 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.cloud google-cloud-datastore - 1.32.1-SNAPSHOT + 1.31.1-SNAPSHOT com.google.cloud google-cloud-datastore - 1.32.1-SNAPSHOT + 1.31.1-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-datastore-v1 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.cloud google-cloud-dlp - 0.50.1-beta-SNAPSHOT + 0.49.1-beta-SNAPSHOT com.google.cloud google-cloud-dlp - 0.50.1-beta-SNAPSHOT + 0.49.1-beta-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-dlp-v2 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-dlp-v2 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.cloud google-cloud-dialogflow - 0.50.1-alpha-SNAPSHOT + 0.49.1-alpha-SNAPSHOT com.google.cloud google-cloud-dialogflow - 0.50.1-alpha-SNAPSHOT + 0.49.1-alpha-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-dialogflow-v2beta1 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-dialogflow-v2beta1 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.api.grpc proto-google-cloud-dialogflow-v2 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-dialogflow-v2 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.cloud google-cloud-dns - 0.50.1-alpha-SNAPSHOT + 0.49.1-alpha-SNAPSHOT com.google.cloud google-cloud-dns - 0.50.1-alpha-SNAPSHOT + 0.49.1-alpha-SNAPSHOT test-jar com.google.cloud google-cloud-errorreporting - 0.50.1-beta-SNAPSHOT + 0.49.1-beta-SNAPSHOT com.google.cloud google-cloud-errorreporting - 0.50.1-beta-SNAPSHOT + 0.49.1-beta-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-error-reporting-v1beta1 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-error-reporting-v1beta1 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.cloud google-cloud-firestore - 0.50.1-beta-SNAPSHOT + 0.49.1-beta-SNAPSHOT com.google.cloud google-cloud-firestore - 0.50.1-beta-SNAPSHOT + 0.49.1-beta-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-firestore-v1beta1 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-firestore-v1beta1 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.cloud google-cloud-language - 1.32.1-SNAPSHOT + 1.31.1-SNAPSHOT com.google.cloud google-cloud-language - 1.32.1-SNAPSHOT + 1.31.1-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-language-v1 - 1.14.1-SNAPSHOT + 1.13.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-language-v1 - 1.14.1-SNAPSHOT + 1.13.1-SNAPSHOT com.google.api.grpc proto-google-cloud-language-v1beta2 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-language-v1beta2 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.cloud google-cloud-logging - 1.32.1-SNAPSHOT + 1.31.1-SNAPSHOT com.google.cloud google-cloud-logging - 1.32.1-SNAPSHOT + 1.31.1-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-logging-v2 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-logging-v2 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.cloud google-cloud-logging-logback - 0.50.1-alpha-SNAPSHOT + 0.49.1-alpha-SNAPSHOT com.google.cloud google-cloud-monitoring - 0.50.1-beta-SNAPSHOT + 0.49.1-beta-SNAPSHOT com.google.cloud google-cloud-monitoring - 0.50.1-beta-SNAPSHOT + 0.49.1-beta-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-monitoring-v3 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-monitoring-v3 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.cloud google-cloud-os-login - 0.50.1-alpha-SNAPSHOT + 0.49.1-alpha-SNAPSHOT com.google.cloud google-cloud-os-login - 0.50.1-alpha-SNAPSHOT + 0.49.1-alpha-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-os-login-v1 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-os-login-v1 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.cloud google-cloud-pubsub - 1.32.1-SNAPSHOT + 1.31.1-SNAPSHOT com.google.cloud google-cloud-pubsub - 1.32.1-SNAPSHOT + 1.31.1-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-pubsub-v1 - 1.14.1-SNAPSHOT + 1.13.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-pubsub-v1 - 1.14.1-SNAPSHOT + 1.13.1-SNAPSHOT com.google.cloud google-cloud-redis - 0.50.1-alpha-SNAPSHOT + 0.49.1-alpha-SNAPSHOT com.google.cloud google-cloud-redis - 0.50.1-alpha-SNAPSHOT + 0.49.1-alpha-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-redis-v1beta1 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-redis-v1beta1 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.cloud google-cloud-resourcemanager - 0.50.1-alpha-SNAPSHOT + 0.49.1-alpha-SNAPSHOT com.google.cloud google-cloud-resourcemanager - 0.50.1-alpha-SNAPSHOT + 0.49.1-alpha-SNAPSHOT test-jar com.google.cloud google-cloud-spanner - 0.50.1-beta-SNAPSHOT + 0.49.1-beta-SNAPSHOT com.google.cloud google-cloud-spanner - 0.50.1-beta-SNAPSHOT + 0.49.1-beta-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-spanner-v1 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-spanner-v1 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.api.grpc proto-google-cloud-spanner-admin-database-v1 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-spanner-admin-database-v1 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.api.grpc proto-google-cloud-spanner-admin-instance-v1 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-spanner-admin-instance-v1 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.cloud google-cloud-speech - 0.50.1-alpha-SNAPSHOT + 0.49.1-alpha-SNAPSHOT com.google.cloud google-cloud-speech - 0.50.1-alpha-SNAPSHOT + 0.49.1-alpha-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-speech-v1beta1 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-speech-v1beta1 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.api.grpc proto-google-cloud-speech-v1p1beta1 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-speech-v1p1beta1 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.api.grpc proto-google-cloud-speech-v1 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-speech-v1 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.cloud google-cloud-storage - 1.32.1-SNAPSHOT + 1.31.1-SNAPSHOT com.google.cloud google-cloud-storage - 1.32.1-SNAPSHOT + 1.31.1-SNAPSHOT test-jar com.google.cloud google-cloud-texttospeech - 0.50.1-beta-SNAPSHOT + 0.49.1-beta-SNAPSHOT com.google.cloud google-cloud-texttospeech - 0.50.1-beta-SNAPSHOT + 0.49.1-beta-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-texttospeech-v1beta1 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-texttospeech-v1beta1 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.api.grpc proto-google-cloud-texttospeech-v1 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-texttospeech-v1 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.cloud google-cloud-trace - 0.50.1-beta-SNAPSHOT + 0.49.1-beta-SNAPSHOT com.google.cloud google-cloud-trace - 0.50.1-beta-SNAPSHOT + 0.49.1-beta-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-trace-v1 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-trace-v1 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.api.grpc proto-google-cloud-trace-v2 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-trace-v2 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.cloud google-cloud-translate - 1.32.1-SNAPSHOT + 1.31.1-SNAPSHOT com.google.cloud google-cloud-translate - 1.32.1-SNAPSHOT + 1.31.1-SNAPSHOT test-jar com.google.cloud google-cloud-vision - 1.32.1-SNAPSHOT + 1.31.1-SNAPSHOT com.google.cloud google-cloud-vision - 1.32.1-SNAPSHOT + 1.31.1-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-vision-v1 - 1.14.1-SNAPSHOT + 1.13.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-vision-v1 - 1.14.1-SNAPSHOT + 1.13.1-SNAPSHOT com.google.api.grpc proto-google-cloud-vision-v1p1beta1 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-vision-v1p1beta1 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.api.grpc proto-google-cloud-vision-v1p2beta1 - 1.14.1-SNAPSHOT + 1.13.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-vision-v1p2beta1 - 1.14.1-SNAPSHOT + 1.13.1-SNAPSHOT com.google.cloud google-cloud-video-intelligence - 0.50.1-beta-SNAPSHOT + 0.49.1-beta-SNAPSHOT com.google.cloud google-cloud-video-intelligence - 0.50.1-beta-SNAPSHOT + 0.49.1-beta-SNAPSHOT test-jar com.google.api.grpc proto-google-cloud-video-intelligence-v1beta1 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-video-intelligence-v1beta1 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.api.grpc proto-google-cloud-video-intelligence-v1beta2 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-video-intelligence-v1beta2 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.api.grpc proto-google-cloud-video-intelligence-v1 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-video-intelligence-v1 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.api.grpc proto-google-cloud-video-intelligence-v1p1beta1 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-video-intelligence-v1p1beta1 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.api.grpc proto-google-cloud-iot-v1 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-iot-v1 - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.api.grpc proto-google-cloud-websecurityscanner-v1alpha - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT com.google.api.grpc grpc-google-cloud-websecurityscanner-v1alpha - 0.15.1-SNAPSHOT + 0.14.1-SNAPSHOT @@ -1018,4 +1018,4 @@ - \ No newline at end of file + diff --git a/pom.xml b/pom.xml index af50c26c6c8d..58e809ea7b55 100644 --- a/pom.xml +++ b/pom.xml @@ -104,4 +104,4 @@ - \ No newline at end of file + From 9cb14f9338725ad133a7bad9004471d2399ae45f Mon Sep 17 00:00:00 2001 From: Hanzhen Yi Date: Mon, 4 Jun 2018 16:20:30 -0700 Subject: [PATCH 4/4] fix code review issues --- .../cloud/spanner/spi/v1/SpannerInterceptorProvider.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/SpannerInterceptorProvider.java b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/SpannerInterceptorProvider.java index a07d549cd415..97c728ae2d83 100644 --- a/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/SpannerInterceptorProvider.java +++ b/google-cloud-clients/google-cloud-spanner/src/main/java/com/google/cloud/spanner/spi/v1/SpannerInterceptorProvider.java @@ -23,7 +23,9 @@ import java.util.logging.Logger; /** - * For internal use only. + * For internal use only. + * An interceptor provider that provides a list of grpc interceptors for {@code GapicSpannerRpc} + * to handle logging and error augmentation by intercepting grpc calls. */ class SpannerInterceptorProvider implements GrpcInterceptorProvider {