From 1fba6e50778010eb4a5ccd2efbdbbf4c04a4c429 Mon Sep 17 00:00:00 2001 From: yirutang Date: Thu, 1 Apr 2021 15:38:55 -0700 Subject: [PATCH] . --- .../storage/v1alpha2/BQTableSchemaToProtoDescriptor.java | 5 ++--- .../cloud/bigquery/storage/v1alpha2/DirectWriter.java | 5 ++--- .../cloud/bigquery/storage/v1alpha2/JsonStreamWriter.java | 5 ++--- .../cloud/bigquery/storage/v1alpha2/JsonToProtoMessage.java | 5 ++--- .../cloud/bigquery/storage/v1alpha2/JsonWriterCache.java | 5 ++--- .../bigquery/storage/v1alpha2/OnSchemaUpdateRunnable.java | 6 ++---- .../bigquery/storage/v1alpha2/ProtoSchemaConverter.java | 5 ++--- .../bigquery/storage/v1alpha2/SchemaCompatibility.java | 5 ++--- .../cloud/bigquery/storage/v1alpha2/StreamWriter.java | 5 ++--- .../com/google/cloud/bigquery/storage/v1alpha2/Waiter.java | 5 ++--- .../google/cloud/bigquery/storage/v1alpha2/WriterCache.java | 5 ++--- 11 files changed, 22 insertions(+), 34 deletions(-) diff --git a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1alpha2/BQTableSchemaToProtoDescriptor.java b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1alpha2/BQTableSchemaToProtoDescriptor.java index 26206c7725..9cc814602e 100644 --- a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1alpha2/BQTableSchemaToProtoDescriptor.java +++ b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1alpha2/BQTableSchemaToProtoDescriptor.java @@ -15,7 +15,6 @@ */ package com.google.cloud.bigquery.storage.v1alpha2; -import com.google.cloud.GcpLaunchStage; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; @@ -34,9 +33,9 @@ * when constructing the protobuf descriptor. The mapping between field types and field modes are * shown in the ImmutableMaps below. * - * @deprecated + * @deprecated Use {@link com.google.cloud.bigquery.storage.v1beta2.BQTableSchemaToProtoDescriptor} */ -@GcpLaunchStage.Deprecated +@Deprecated public class BQTableSchemaToProtoDescriptor { private static ImmutableMap BQTableSchemaModeMap = diff --git a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1alpha2/DirectWriter.java b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1alpha2/DirectWriter.java index 554720f8ca..85dc02ee3f 100644 --- a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1alpha2/DirectWriter.java +++ b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1alpha2/DirectWriter.java @@ -20,7 +20,6 @@ import com.google.api.core.ApiFutures; import com.google.api.gax.grpc.GrpcStatusCode; import com.google.api.gax.rpc.InvalidArgumentException; -import com.google.cloud.GcpLaunchStage; import com.google.cloud.bigquery.storage.v1alpha2.ProtoBufProto.ProtoRows; import com.google.cloud.bigquery.storage.v1alpha2.Storage.AppendRowsRequest; import com.google.common.annotations.VisibleForTesting; @@ -50,9 +49,9 @@ *

{@link DirectWriter} will use the credentials set on the channel, which uses application * default credentials through {@link GoogleCredentials#getApplicationDefault} by default. * - * @deprecated + * @deprecated no longer supported */ -@GcpLaunchStage.Deprecated +@Deprecated public class DirectWriter { private static final Logger LOG = Logger.getLogger(DirectWriter.class.getName()); private static WriterCache cache = null; diff --git a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1alpha2/JsonStreamWriter.java b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1alpha2/JsonStreamWriter.java index 9b6c9a24a2..214b8b5246 100644 --- a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1alpha2/JsonStreamWriter.java +++ b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1alpha2/JsonStreamWriter.java @@ -21,7 +21,6 @@ import com.google.api.gax.core.ExecutorProvider; import com.google.api.gax.retrying.RetrySettings; import com.google.api.gax.rpc.TransportChannelProvider; -import com.google.cloud.GcpLaunchStage; import com.google.cloud.bigquery.storage.v1alpha2.ProtoBufProto.ProtoRows; import com.google.cloud.bigquery.storage.v1alpha2.Storage.AppendRowsRequest; import com.google.cloud.bigquery.storage.v1alpha2.Storage.AppendRowsResponse; @@ -46,9 +45,9 @@ * table schema is updated, users will be able to ingest data on the new schema after some time (in * order of minutes). * - * @deprecated + * @deprecated Use {@link com.google.cloud.bigquery.storage.v1alpha2.JsonStreamWriter} */ -@GcpLaunchStage.Deprecated +@Deprecated public class JsonStreamWriter implements AutoCloseable { private static String streamPatternString = "projects/[^/]+/datasets/[^/]+/tables/[^/]+/streams/[^/]+"; diff --git a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1alpha2/JsonToProtoMessage.java b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1alpha2/JsonToProtoMessage.java index 3a52dfbfe1..34feb24766 100644 --- a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1alpha2/JsonToProtoMessage.java +++ b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1alpha2/JsonToProtoMessage.java @@ -15,7 +15,6 @@ */ package com.google.cloud.bigquery.storage.v1alpha2; -import com.google.cloud.GcpLaunchStage; import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableMap; import com.google.protobuf.Descriptors.Descriptor; @@ -31,9 +30,9 @@ * Converts Json data to protocol buffer messages given the protocol buffer descriptor. The protobuf * descriptor must have all fields lowercased. * - * @deprecated + * @deprecated Use {@link com.google.cloud.bigquery.storage.v1beta2.JsonToProtoMessage} */ -@GcpLaunchStage.Deprecated +@Deprecated public class JsonToProtoMessage { private static ImmutableMap FieldTypeToDebugMessage = new ImmutableMap.Builder() diff --git a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1alpha2/JsonWriterCache.java b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1alpha2/JsonWriterCache.java index 37e4488764..d72403a0c2 100644 --- a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1alpha2/JsonWriterCache.java +++ b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1alpha2/JsonWriterCache.java @@ -15,7 +15,6 @@ */ package com.google.cloud.bigquery.storage.v1alpha2; -import com.google.cloud.GcpLaunchStage; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import com.google.common.cache.Cache; @@ -32,9 +31,9 @@ * minutes if not used. Code sample: JsonWriterCache cache = JsonWriterCache.getInstance(); * JsonStreamWriter writer = cache.getWriter(); // Use... cache.returnWriter(writer); * - * @deprecated + * @deprecated No longer supported */ -@GcpLaunchStage.Deprecated +@Deprecated public class JsonWriterCache { private static final Logger LOG = Logger.getLogger(JsonWriterCache.class.getName()); diff --git a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1alpha2/OnSchemaUpdateRunnable.java b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1alpha2/OnSchemaUpdateRunnable.java index 40a96d147e..5194e6cb36 100644 --- a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1alpha2/OnSchemaUpdateRunnable.java +++ b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1alpha2/OnSchemaUpdateRunnable.java @@ -15,16 +15,14 @@ */ package com.google.cloud.bigquery.storage.v1alpha2; -import com.google.cloud.GcpLaunchStage; - /** * A abstract class that implements the Runnable interface and provides access to the current * StreamWriter and updatedSchema. This runnable will only be called when a updated schema has been * passed back through the AppendRowsResponse. Users should only implement the run() function. * - * @deprecated + * @deprecated Use {@link com.google.cloud.bigquery.storage.v1beta2.OnSchemaUpdateRunnable} */ -@GcpLaunchStage.Deprecated +@Deprecated public abstract class OnSchemaUpdateRunnable implements Runnable { private StreamWriter streamWriter; private Table.TableSchema updatedSchema; diff --git a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1alpha2/ProtoSchemaConverter.java b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1alpha2/ProtoSchemaConverter.java index 93ac2997b1..4367c4ba21 100644 --- a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1alpha2/ProtoSchemaConverter.java +++ b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1alpha2/ProtoSchemaConverter.java @@ -17,7 +17,6 @@ import com.google.api.gax.grpc.GrpcStatusCode; import com.google.api.gax.rpc.InvalidArgumentException; -import com.google.cloud.GcpLaunchStage; import com.google.cloud.bigquery.storage.v1alpha2.ProtoBufProto.ProtoSchema; import com.google.protobuf.DescriptorProtos.DescriptorProto; import com.google.protobuf.DescriptorProtos.EnumDescriptorProto; @@ -31,8 +30,8 @@ // A Converter class that turns a native protobuf::DescriptorProto to a self contained // protobuf::DescriptorProto // that can be reconstructed by the backend. -// @deprecated -@GcpLaunchStage.Deprecated +// @deprecated Use {@link com.google.cloud.bigquery.storage.v1beta2.ProtoSchemaConverter} +@Deprecated public class ProtoSchemaConverter { private static String getNameFromFullName(String fullName) { return fullName.replace('.', '_'); diff --git a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1alpha2/SchemaCompatibility.java b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1alpha2/SchemaCompatibility.java index 1ff8071e12..c79cf934d8 100644 --- a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1alpha2/SchemaCompatibility.java +++ b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1alpha2/SchemaCompatibility.java @@ -15,7 +15,6 @@ */ package com.google.cloud.bigquery.storage.v1alpha2; -import com.google.cloud.GcpLaunchStage; import com.google.cloud.bigquery.BigQuery; import com.google.cloud.bigquery.Field; import com.google.cloud.bigquery.LegacySQLTypeName; @@ -43,9 +42,9 @@ *

The implementation as of now is not complete, which measn, if this check passed, there is * still a possbility of writing will fail. * - * @deprecated + * @deprecated Use {@link com.google.cloud.bigquery.storage.v1beta2.SchemaCompatibility} */ -@GcpLaunchStage.Deprecated +@Deprecated public class SchemaCompatibility { private BigQuery bigquery; private static SchemaCompatibility compat; diff --git a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1alpha2/StreamWriter.java b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1alpha2/StreamWriter.java index 82552583d1..d94dba51b4 100644 --- a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1alpha2/StreamWriter.java +++ b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1alpha2/StreamWriter.java @@ -36,7 +36,6 @@ import com.google.api.gax.rpc.StreamController; import com.google.api.gax.rpc.TransportChannelProvider; import com.google.auth.oauth2.GoogleCredentials; -import com.google.cloud.GcpLaunchStage; import com.google.cloud.bigquery.storage.v1alpha2.Storage.AppendRowsRequest; import com.google.cloud.bigquery.storage.v1alpha2.Storage.AppendRowsResponse; import com.google.common.base.Preconditions; @@ -80,9 +79,9 @@ *

{@link StreamWriter} will use the credentials set on the channel, which uses application * default credentials through {@link GoogleCredentials#getApplicationDefault} by default. * - * @deprecated + * @deprecated Use {@link com.google.cloud.bigquery.storage.v1alpha2.JsonStreamWriterV2} */ -@GcpLaunchStage.Deprecated +@Deprecated public class StreamWriter implements AutoCloseable { private static final Logger LOG = Logger.getLogger(StreamWriter.class.getName()); diff --git a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1alpha2/Waiter.java b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1alpha2/Waiter.java index bb40f07ba6..29d389f494 100644 --- a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1alpha2/Waiter.java +++ b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1alpha2/Waiter.java @@ -19,7 +19,6 @@ import com.google.api.core.InternalApi; import com.google.api.gax.batching.FlowControlSettings; import com.google.api.gax.batching.FlowController; -import com.google.cloud.GcpLaunchStage; import java.util.LinkedList; import java.util.concurrent.CountDownLatch; import java.util.concurrent.locks.Lock; @@ -30,9 +29,9 @@ * A barrier kind of object that helps keep track of pending actions and synchronously wait until * all have completed. * - * @deprecated + * @deprecated No longer supported */ -@GcpLaunchStage.Deprecated +@Deprecated class Waiter { private static final Logger LOG = Logger.getLogger(Waiter.class.getName()); diff --git a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1alpha2/WriterCache.java b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1alpha2/WriterCache.java index 5727cc1e49..4aa4074f96 100644 --- a/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1alpha2/WriterCache.java +++ b/google-cloud-bigquerystorage/src/main/java/com/google/cloud/bigquery/storage/v1alpha2/WriterCache.java @@ -15,7 +15,6 @@ */ package com.google.cloud.bigquery.storage.v1alpha2; -import com.google.cloud.GcpLaunchStage; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; import com.google.common.cache.Cache; @@ -34,9 +33,9 @@ * minutes if not used. Code sample: WriterCache cache = WriterCache.getInstance(); StreamWriter * writer = cache.getWriter(); // Use... cache.returnWriter(writer); * - * @deprecated + * @deprecated No longer supported */ -@GcpLaunchStage.Deprecated +@Deprecated public class WriterCache { private static final Logger LOG = Logger.getLogger(WriterCache.class.getName());