docs: remove @BetaApi annotations for count aggregations (#1051)

kolea2 · web-flow · commit b8bdaa23f165 · 2023-04-26T13:50:13.000Z
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationQuery.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationQuery.java
@@ -19,7 +19,6 @@
 import static com.google.cloud.datastore.AggregationQuery.Mode.STRUCTURED;
 import static com.google.common.base.Preconditions.checkArgument;
 
-import com.google.api.core.BetaApi;
 import com.google.cloud.datastore.aggregation.Aggregation;
 import com.google.cloud.datastore.aggregation.AggregationBuilder;
 import java.util.HashSet;
@@ -67,7 +66,6 @@
  * @see <a href="https://cloud.google.com/appengine/docs/java/datastore/queries">Datastore
  *     queries</a>
  */
-@BetaApi
 public class AggregationQuery extends Query<AggregationResults> {
 
   private Set<Aggregation> aggregations;
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResult.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResult.java
@@ -15,15 +15,13 @@
  */
 package com.google.cloud.datastore;
 
-import com.google.api.core.BetaApi;
 import com.google.common.base.MoreObjects;
 import com.google.common.base.MoreObjects.ToStringHelper;
 import java.util.Map;
 import java.util.Map.Entry;
 import java.util.Objects;
 
 /** Represents a result of an {@link AggregationQuery} query submission. */
-@BetaApi
 public class AggregationResult {
 
   private final Map<String, LongValue> properties;
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResults.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/AggregationResults.java
@@ -17,7 +17,6 @@
 
 import static com.google.api.client.util.Preconditions.checkNotNull;
 
-import com.google.api.core.BetaApi;
 import com.google.api.core.InternalApi;
 import com.google.cloud.Timestamp;
 import java.util.Iterator;
@@ -30,7 +29,6 @@
  *
  * <p>This can be used to iterate over an underlying {@link List<AggregationResult>} directly.
  */
-@BetaApi
 public class AggregationResults implements Iterable<AggregationResult> {
 
   private final List<AggregationResult> aggregationResults;
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/Datastore.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.datastore;
 
-import com.google.api.core.BetaApi;
 import com.google.cloud.Service;
 import com.google.datastore.v1.TransactionOptions;
 import java.util.Iterator;
@@ -506,7 +505,6 @@ interface TransactionCallable<T> {
    * @throws DatastoreException upon failure
    * @return {@link AggregationResults}
    */
-  @BetaApi
   default AggregationResults runAggregation(AggregationQuery query, ReadOption... options) {
     throw new UnsupportedOperationException("Not implemented.");
   }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreImpl.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreImpl.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.datastore;
 
-import com.google.api.core.BetaApi;
 import com.google.api.gax.retrying.RetrySettings;
 import com.google.cloud.BaseService;
 import com.google.cloud.ExceptionHandler;
@@ -198,13 +197,11 @@ <T> QueryResults<T> run(Optional<ReadOptions> readOptionsPb, Query<T> query) {
   }
 
   @Override
-  @BetaApi
   public AggregationResults runAggregation(AggregationQuery query) {
     return aggregationQueryExecutor.execute(query);
   }
 
   @Override
-  @BetaApi
   public AggregationResults runAggregation(AggregationQuery query, ReadOption... options) {
     return aggregationQueryExecutor.execute(query, options);
   }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReader.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/DatastoreReader.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.datastore;
 
-import com.google.api.core.BetaApi;
 import java.util.Iterator;
 import java.util.List;
 
@@ -60,7 +59,6 @@ public interface DatastoreReader {
    *
    * @throws DatastoreException upon failure
    */
-  @BetaApi
   default AggregationResults runAggregation(AggregationQuery query) {
     throw new UnsupportedOperationException("Not implemented.");
   }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/Aggregation.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/Aggregation.java
@@ -16,14 +16,12 @@
 
 package com.google.cloud.datastore.aggregation;
 
-import com.google.api.core.BetaApi;
 import com.google.api.core.InternalApi;
 import com.google.datastore.v1.AggregationQuery;
 
 /**
  * Represents a Google Cloud Datastore Aggregation which is used with an {@link AggregationQuery}.
  */
-@BetaApi
 public abstract class Aggregation {
 
   private final String alias;
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/AggregationBuilder.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/AggregationBuilder.java
@@ -16,16 +16,13 @@
 
 package com.google.cloud.datastore.aggregation;
 
-import com.google.api.core.BetaApi;
-
 /**
  * An interface to represent the builders which build and customize {@link Aggregation} for {@link
  * com.google.cloud.datastore.AggregationQuery}.
  *
  * <p>Used by {@link
  * com.google.cloud.datastore.AggregationQuery.Builder#addAggregation(AggregationBuilder)}.
  */
-@BetaApi
 public interface AggregationBuilder<A extends Aggregation> {
   A build();
 }
diff --git a/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/CountAggregation.java b/google-cloud-datastore/src/main/java/com/google/cloud/datastore/aggregation/CountAggregation.java
@@ -16,13 +16,11 @@
 
 package com.google.cloud.datastore.aggregation;
 
-import com.google.api.core.BetaApi;
 import com.google.datastore.v1.AggregationQuery;
 import com.google.datastore.v1.AggregationQuery.Aggregation.Count;
 import java.util.Objects;
 
 /** Represents an {@link Aggregation} which returns count. */
-@BetaApi
 public class CountAggregation extends Aggregation {
 
   /** @param alias Alias to used when running this aggregation. */

Original file line number	Diff line number	Diff line change
`@@ -16,7 +16,6 @@`
`16`	`16`
`17`	`17`	`package com.google.cloud.datastore;`
`18`	`18`
`19`		`-import com.google.api.core.BetaApi;`
`20`	`19`	`import com.google.api.gax.retrying.RetrySettings;`
`21`	`20`	`import com.google.cloud.BaseService;`
`22`	`21`	`import com.google.cloud.ExceptionHandler;`
`@@ -198,13 +197,11 @@ <T> QueryResults<T> run(Optional<ReadOptions> readOptionsPb, Query<T> query) {`
`198`	`197`	`}`
`199`	`198`
`200`	`199`	`@Override`
`201`		`- @BetaApi`
`202`	`200`	`public AggregationResults runAggregation(AggregationQuery query) {`
`203`	`201`	`return aggregationQueryExecutor.execute(query);`
`204`	`202`	`}`
`205`	`203`
`206`	`204`	`@Override`
`207`		`- @BetaApi`
`208`	`205`	`public AggregationResults runAggregation(AggregationQuery query, ReadOption... options) {`
`209`	`206`	`return aggregationQueryExecutor.execute(query, options);`
`210`	`207`	`}`