Marking some core types @BetaApi and @internalapi (#1933)

garrettjonesgoogle · web-flow · commit eec31d2d23f0 · 2017-04-18T09:57:09.000-07:00
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
@@ -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 <T> the value type that the page holds
  */
+@InternalApi
 public class AsyncPageImpl<T> extends PageImpl<T> implements AsyncPage<T> {
 
   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
@@ -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<Byte>, 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
@@ -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> {
 
   // 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
@@ -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
@@ -26,7 +26,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;
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
@@ -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 <T> the value type that the page holds
  */
+@InternalApi
 public class PageImpl<T> implements Page<T>, 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
@@ -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
@@ -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<T extends ServiceOptions> {
 
   private final String emulator;
