From 8a4e848ce661eae2d635f031561765b53eab4527 Mon Sep 17 00:00:00 2001 From: Garrett Jones Date: Mon, 17 Apr 2017 15:37:32 -0700 Subject: [PATCH 1/2] Marking some core types @BetaApi and @InternalApi --- .../src/main/java/com/google/cloud/AsyncPageImpl.java | 2 ++ .../src/main/java/com/google/cloud/ByteArray.java | 2 ++ google-cloud-core/src/main/java/com/google/cloud/Date.java | 2 ++ .../src/main/java/com/google/cloud/FieldSelector.java | 2 ++ .../src/main/java/com/google/cloud/GrpcTransportOptions.java | 3 ++- google-cloud-core/src/main/java/com/google/cloud/PageImpl.java | 3 ++- .../src/main/java/com/google/cloud/WaitForOption.java | 2 ++ .../main/java/com/google/cloud/testing/BaseEmulatorHelper.java | 2 ++ 8 files changed, 16 insertions(+), 2 deletions(-) diff --git a/google-cloud-core/src/main/java/com/google/cloud/AsyncPageImpl.java b/google-cloud-core/src/main/java/com/google/cloud/AsyncPageImpl.java index d812e126ffb5..f72783cf87b9 100644 --- a/google-cloud-core/src/main/java/com/google/cloud/AsyncPageImpl.java +++ b/google-cloud-core/src/main/java/com/google/cloud/AsyncPageImpl.java @@ -18,6 +18,7 @@ import com.google.api.core.ApiFuture; import com.google.api.core.ApiFutures; +import com.google.api.core.InternalApi; import com.google.api.gax.core.AsyncPage; import com.google.api.gax.core.Page; import com.google.common.base.Throwables; @@ -30,6 +31,7 @@ * * @param the value type that the page holds */ +@InternalApi public class AsyncPageImpl extends PageImpl implements AsyncPage { private static final long serialVersionUID = -6009473188630364906L; diff --git a/google-cloud-core/src/main/java/com/google/cloud/ByteArray.java b/google-cloud-core/src/main/java/com/google/cloud/ByteArray.java index 8b83a1e4b2a5..449e827c4116 100644 --- a/google-cloud-core/src/main/java/com/google/cloud/ByteArray.java +++ b/google-cloud-core/src/main/java/com/google/cloud/ByteArray.java @@ -16,6 +16,7 @@ package com.google.cloud; +import com.google.api.core.BetaApi; import com.google.common.base.MoreObjects; import com.google.common.base.MoreObjects.ToStringHelper; import com.google.common.io.BaseEncoding; @@ -31,6 +32,7 @@ /** * An immutable byte array holder. */ +@BetaApi public class ByteArray implements Iterable, Serializable { private static final long serialVersionUID = -1908809133893782840L; diff --git a/google-cloud-core/src/main/java/com/google/cloud/Date.java b/google-cloud-core/src/main/java/com/google/cloud/Date.java index a11d259df717..9da1bb6631b1 100644 --- a/google-cloud-core/src/main/java/com/google/cloud/Date.java +++ b/google-cloud-core/src/main/java/com/google/cloud/Date.java @@ -16,6 +16,7 @@ package com.google.cloud; +import com.google.api.core.BetaApi; import com.google.common.base.Preconditions; import java.util.Objects; import java.util.regex.Matcher; @@ -24,6 +25,7 @@ /** * Represents a Date without time, such as 2017-03-17. Date is timezone independent. */ +@BetaApi public final class Date implements Comparable { // Date format "yyyy-mm-dd" diff --git a/google-cloud-core/src/main/java/com/google/cloud/FieldSelector.java b/google-cloud-core/src/main/java/com/google/cloud/FieldSelector.java index 125a03e212cf..24706b52e5f3 100644 --- a/google-cloud-core/src/main/java/com/google/cloud/FieldSelector.java +++ b/google-cloud-core/src/main/java/com/google/cloud/FieldSelector.java @@ -16,6 +16,7 @@ package com.google.cloud; +import com.google.api.core.InternalApi; import com.google.common.base.Function; import com.google.common.base.Joiner; import com.google.common.collect.Lists; @@ -42,6 +43,7 @@ public interface FieldSelector { * A helper class used to build composite selectors given a number of fields. This class is not * supposed to be used directly by users. */ + @InternalApi class Helper { private static final String[] EMPTY_FIELDS = {}; diff --git a/google-cloud-core/src/main/java/com/google/cloud/GrpcTransportOptions.java b/google-cloud-core/src/main/java/com/google/cloud/GrpcTransportOptions.java index 81402c9e7398..bfb0ccd398d6 100644 --- a/google-cloud-core/src/main/java/com/google/cloud/GrpcTransportOptions.java +++ b/google-cloud-core/src/main/java/com/google/cloud/GrpcTransportOptions.java @@ -18,6 +18,7 @@ import static com.google.common.base.MoreObjects.firstNonNull; +import com.google.api.core.BetaApi; import com.google.api.gax.core.FixedCredentialsProvider; import com.google.api.gax.core.RetrySettings; import com.google.api.gax.grpc.ChannelProvider; @@ -26,7 +27,6 @@ import com.google.auth.Credentials; import com.google.common.annotations.VisibleForTesting; import com.google.common.base.Preconditions; -import com.google.common.net.HostAndPort; import io.grpc.internal.SharedResourceHolder; import io.grpc.internal.SharedResourceHolder.Resource; import java.io.IOException; @@ -41,6 +41,7 @@ * Class representing service options for those services that use gRPC as the transport * layer. */ +@BetaApi public class GrpcTransportOptions implements TransportOptions { private static final long serialVersionUID = -9049538465533951165L; diff --git a/google-cloud-core/src/main/java/com/google/cloud/PageImpl.java b/google-cloud-core/src/main/java/com/google/cloud/PageImpl.java index ac329aab449d..e49e1e75a615 100644 --- a/google-cloud-core/src/main/java/com/google/cloud/PageImpl.java +++ b/google-cloud-core/src/main/java/com/google/cloud/PageImpl.java @@ -16,10 +16,10 @@ package com.google.cloud; +import com.google.api.core.InternalApi; import com.google.api.gax.core.Page; import com.google.common.collect.AbstractIterator; import com.google.common.collect.ImmutableMap; - import java.io.Serializable; import java.util.Collections; import java.util.Iterator; @@ -31,6 +31,7 @@ * * @param the value type that the page holds */ +@InternalApi public class PageImpl implements Page, Serializable { private static final long serialVersionUID = 3914827379823557934L; diff --git a/google-cloud-core/src/main/java/com/google/cloud/WaitForOption.java b/google-cloud-core/src/main/java/com/google/cloud/WaitForOption.java index a84b25bc369b..a03b0642596a 100644 --- a/google-cloud-core/src/main/java/com/google/cloud/WaitForOption.java +++ b/google-cloud-core/src/main/java/com/google/cloud/WaitForOption.java @@ -18,6 +18,7 @@ import static com.google.common.base.Preconditions.checkArgument; +import com.google.api.core.BetaApi; import com.google.common.base.MoreObjects; import java.io.Serializable; @@ -27,6 +28,7 @@ /** * This class represents options for methods that wait for changes in the status of a resource. */ +@BetaApi public abstract class WaitForOption implements Serializable { private static final long serialVersionUID = 8443451708032349243L; diff --git a/google-cloud-core/src/main/java/com/google/cloud/testing/BaseEmulatorHelper.java b/google-cloud-core/src/main/java/com/google/cloud/testing/BaseEmulatorHelper.java index 2b4276068d7b..0de8675a4092 100644 --- a/google-cloud-core/src/main/java/com/google/cloud/testing/BaseEmulatorHelper.java +++ b/google-cloud-core/src/main/java/com/google/cloud/testing/BaseEmulatorHelper.java @@ -16,6 +16,7 @@ package com.google.cloud.testing; +import com.google.api.core.InternalApi; import com.google.cloud.ServiceOptions; import com.google.common.io.CharStreams; import com.google.common.util.concurrent.SettableFuture; @@ -57,6 +58,7 @@ /** * Utility class to start and stop a local service which is used by unit testing. */ +@InternalApi public abstract class BaseEmulatorHelper { private final String emulator; From af2e431bcb9bd9c8f4ffe1779843df6f097e51e2 Mon Sep 17 00:00:00 2001 From: Garrett Jones Date: Mon, 17 Apr 2017 15:47:06 -0700 Subject: [PATCH 2/2] Removing @BetaApi from one class --- .../src/main/java/com/google/cloud/GrpcTransportOptions.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/google-cloud-core/src/main/java/com/google/cloud/GrpcTransportOptions.java b/google-cloud-core/src/main/java/com/google/cloud/GrpcTransportOptions.java index bfb0ccd398d6..15fb9a7311ce 100644 --- a/google-cloud-core/src/main/java/com/google/cloud/GrpcTransportOptions.java +++ b/google-cloud-core/src/main/java/com/google/cloud/GrpcTransportOptions.java @@ -18,7 +18,6 @@ import static com.google.common.base.MoreObjects.firstNonNull; -import com.google.api.core.BetaApi; import com.google.api.gax.core.FixedCredentialsProvider; import com.google.api.gax.core.RetrySettings; import com.google.api.gax.grpc.ChannelProvider; @@ -41,7 +40,6 @@ * Class representing service options for those services that use gRPC as the transport * layer. */ -@BetaApi public class GrpcTransportOptions implements TransportOptions { private static final long serialVersionUID = -9049538465533951165L;