chore: remove beta httpjson (#2358)

Fixes #2101 ☕️
googleapis · Feb 15, 2024 · 7da92b1 · 7da92b1
1 parent 5a821c5
commit 7da92b1
Show file tree

Hide file tree

Showing 22 changed files with 2 additions and 66 deletions.
diff --git a/...n/java/com/google/api/generator/gapic/composer/grpcrest/ServiceSettingsClassComposer.java b/...n/java/com/google/api/generator/gapic/composer/grpcrest/ServiceSettingsClassComposer.java
@@ -45,8 +45,6 @@ protected List<MethodDefinition> createNestedBuilderCreatorMethods(
       String newBuilderMethodName,
       String createDefaultMethodName,
       List<AnnotationNode> annotations) {
-    AnnotationNode betaApiAnnotaiton =
-        AnnotationNode.builder().setType(FIXED_TYPESTORE.get("BetaApi")).build();
 
     List<MethodDefinition> methods = new ArrayList<>();
     methods.addAll(
@@ -59,10 +57,7 @@ protected List<MethodDefinition> createNestedBuilderCreatorMethods(
               typeStore,
               "newHttpJsonBuilder",
               "createHttpJsonDefault",
-              ImmutableList.<AnnotationNode>builder()
-                  .addAll(annotations)
-                  .add(betaApiAnnotaiton)
-                  .build()));
+              ImmutableList.<AnnotationNode>builder().addAll(annotations).build()));
     }
     return methods;
   }
@@ -77,9 +72,6 @@ protected List<MethodDefinition> createNewBuilderMethods(
       CommentStatement comment) {
     List<MethodDefinition> methods = new ArrayList<>();
 
-    AnnotationNode betaApiAnnotaiton =
-        AnnotationNode.builder().setType(FIXED_TYPESTORE.get("BetaApi")).build();
-
     Iterator<String> transportNames = getTransportContext().transportNames().iterator();
 
     methods.addAll(
@@ -98,10 +90,7 @@ protected List<MethodDefinition> createNewBuilderMethods(
               typeStore,
               "newHttpJsonBuilder",
               "createHttpJsonDefault",
-              ImmutableList.<AnnotationNode>builder()
-                  .addAll(annotations)
-                  .add(betaApiAnnotaiton)
-                  .build(),
+              ImmutableList.<AnnotationNode>builder().addAll(annotations).build(),
               new SettingsCommentComposer(transportNames.next())
                   .getNewTransportBuilderMethodComment()));
     }

diff --git a/...n/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceStubClassComposer.java b/...n/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceStubClassComposer.java
@@ -210,19 +210,6 @@ protected List<MethodDefinition> createOperationsStubGetterMethod(
     return super.createOperationsStubGetterMethod(service, operationsStubVarExpr);
   }
 
-  @Override
-  protected List<AnnotationNode> createClassAnnotations(Service service) {
-    List<AnnotationNode> annotations = super.createClassAnnotations(service);
-
-    TypeNode betaApiType = FIXED_TYPESTORE.get("BetaApi");
-
-    if (annotations.stream().noneMatch(a -> betaApiType.equals(a.type()))) {
-      annotations.add(AnnotationNode.builder().setType(betaApiType).build());
-    }
-
-    return annotations;
-  }
-
   @Override
   protected List<MethodDefinition> createGetMethodDescriptorsMethod(
       Service service,

diff --git a/...rc/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoSettings.golden b/...rc/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoSettings.golden
@@ -177,7 +177,6 @@ public class EchoSettings extends ClientSettings<EchoSettings> {
   }
 
   /** Returns a new REST builder for this class. */
-  @BetaApi
   public static Builder newHttpJsonBuilder() {
     return Builder.createHttpJsonDefault();
   }
@@ -219,7 +218,6 @@ public class EchoSettings extends ClientSettings<EchoSettings> {
       return new Builder(EchoStubSettings.newBuilder());
     }
 
-    @BetaApi
     private static Builder createHttpJsonDefault() {
       return new Builder(EchoStubSettings.newHttpJsonBuilder());
     }

diff --git a/...gle/api/generator/gapic/composer/rest/goldens/HttpJsonAutoPopulateFieldTestingStub.golden b/...gle/api/generator/gapic/composer/rest/goldens/HttpJsonAutoPopulateFieldTestingStub.golden
@@ -1,6 +1,5 @@
 package com.google.auto.populate.field.stub;
 
-import com.google.api.core.BetaApi;
 import com.google.api.core.InternalApi;
 import com.google.api.gax.core.BackgroundResource;
 import com.google.api.gax.core.BackgroundResourceAggregation;
@@ -36,7 +35,6 @@ import javax.annotation.Generated;
  * <p>This class is for advanced usage and reflects the underlying API directly.
  */
 @Generated("by gapic-generator-java")
-@BetaApi
 public class HttpJsonAutoPopulateFieldTestingStub extends AutoPopulateFieldTestingStub {
   private static final TypeRegistry typeRegistry = TypeRegistry.newBuilder().build();
 

diff --git a/...va/com/google/api/generator/gapic/composer/rest/goldens/HttpJsonRoutingHeadersStub.golden b/...va/com/google/api/generator/gapic/composer/rest/goldens/HttpJsonRoutingHeadersStub.golden
@@ -1,6 +1,5 @@
 package com.google.explicit.dynamic.routing.header.stub;
 
-import com.google.api.core.BetaApi;
 import com.google.api.core.InternalApi;
 import com.google.api.gax.core.BackgroundResource;
 import com.google.api.gax.core.BackgroundResourceAggregation;
@@ -35,7 +34,6 @@ import javax.annotation.Generated;
  * <p>This class is for advanced usage and reflects the underlying API directly.
  */
 @Generated("by gapic-generator-java")
-@BetaApi
 public class HttpJsonExplicitDynamicRoutingHeaderTestingStub
     extends ExplicitDynamicRoutingHeaderTestingStub {
   private static final TypeRegistry typeRegistry = TypeRegistry.newBuilder().build();

diff --git a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/ComplianceSettings.java b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/ComplianceSettings.java
@@ -212,7 +212,6 @@ public static Builder newBuilder() {
   }
 
   /** Returns a new REST builder for this class. */
-  @BetaApi
   public static Builder newHttpJsonBuilder() {
     return Builder.createHttpJsonDefault();
   }
@@ -254,7 +253,6 @@ private static Builder createDefault() {
       return new Builder(ComplianceStubSettings.newBuilder());
     }
 
-    @BetaApi
     private static Builder createHttpJsonDefault() {
       return new Builder(ComplianceStubSettings.newHttpJsonBuilder());
     }

diff --git a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/EchoSettings.java b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/EchoSettings.java
@@ -228,7 +228,6 @@ public static Builder newBuilder() {
   }
 
   /** Returns a new REST builder for this class. */
-  @BetaApi
   public static Builder newHttpJsonBuilder() {
     return Builder.createHttpJsonDefault();
   }
@@ -270,7 +269,6 @@ private static Builder createDefault() {
       return new Builder(EchoStubSettings.newBuilder());
     }
 
-    @BetaApi
     private static Builder createHttpJsonDefault() {
       return new Builder(EchoStubSettings.newHttpJsonBuilder());
     }

diff --git a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/IdentitySettings.java b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/IdentitySettings.java
@@ -190,7 +190,6 @@ public static Builder newBuilder() {
   }
 
   /** Returns a new REST builder for this class. */
-  @BetaApi
   public static Builder newHttpJsonBuilder() {
     return Builder.createHttpJsonDefault();
   }
@@ -232,7 +231,6 @@ private static Builder createDefault() {
       return new Builder(IdentityStubSettings.newBuilder());
     }
 
-    @BetaApi
     private static Builder createHttpJsonDefault() {
       return new Builder(IdentityStubSettings.newHttpJsonBuilder());
     }

diff --git a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/MessagingSettings.java b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/MessagingSettings.java
@@ -248,7 +248,6 @@ public static Builder newBuilder() {
   }
 
   /** Returns a new REST builder for this class. */
-  @BetaApi
   public static Builder newHttpJsonBuilder() {
     return Builder.createHttpJsonDefault();
   }
@@ -290,7 +289,6 @@ private static Builder createDefault() {
       return new Builder(MessagingStubSettings.newBuilder());
     }
 
-    @BetaApi
     private static Builder createHttpJsonDefault() {
       return new Builder(MessagingStubSettings.newHttpJsonBuilder());
     }

diff --git a/...ase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/SequenceServiceSettings.java b/...ase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/SequenceServiceSettings.java
@@ -200,7 +200,6 @@ public static Builder newBuilder() {
   }
 
   /** Returns a new REST builder for this class. */
-  @BetaApi
   public static Builder newHttpJsonBuilder() {
     return Builder.createHttpJsonDefault();
   }
@@ -242,7 +241,6 @@ private static Builder createDefault() {
       return new Builder(SequenceServiceStubSettings.newBuilder());
     }
 
-    @BetaApi
     private static Builder createHttpJsonDefault() {
       return new Builder(SequenceServiceStubSettings.newHttpJsonBuilder());
     }

diff --git a/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/TestingSettings.java b/showcase/gapic-showcase/src/main/java/com/google/showcase/v1beta1/TestingSettings.java
@@ -207,7 +207,6 @@ public static Builder newBuilder() {
   }
 
   /** Returns a new REST builder for this class. */
-  @BetaApi
   public static Builder newHttpJsonBuilder() {
     return Builder.createHttpJsonDefault();
   }
@@ -249,7 +248,6 @@ private static Builder createDefault() {
       return new Builder(TestingStubSettings.newBuilder());
     }
 
-    @BetaApi
     private static Builder createHttpJsonDefault() {
       return new Builder(TestingStubSettings.newHttpJsonBuilder());
     }

diff --git a/...oldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/ConnectionServiceSettings.java b/...oldens/apigeeconnect/src/com/google/cloud/apigeeconnect/v1/ConnectionServiceSettings.java
@@ -134,7 +134,6 @@ public static Builder newBuilder() {
   }
 
   /** Returns a new REST builder for this class. */
-  @BetaApi
   public static Builder newHttpJsonBuilder() {
     return Builder.createHttpJsonDefault();
   }
@@ -176,7 +175,6 @@ private static Builder createDefault() {
       return new Builder(ConnectionServiceStubSettings.newBuilder());
     }
 
-    @BetaApi
     private static Builder createHttpJsonDefault() {
       return new Builder(ConnectionServiceStubSettings.newHttpJsonBuilder());
     }

diff --git a/...igeeconnect/src/com/google/cloud/apigeeconnect/v1/stub/HttpJsonConnectionServiceStub.java b/...igeeconnect/src/com/google/cloud/apigeeconnect/v1/stub/HttpJsonConnectionServiceStub.java
@@ -18,7 +18,6 @@
 
 import static com.google.cloud.apigeeconnect.v1.ConnectionServiceClient.ListConnectionsPagedResponse;
 
-import com.google.api.core.BetaApi;
 import com.google.api.core.InternalApi;
 import com.google.api.gax.core.BackgroundResource;
 import com.google.api.gax.core.BackgroundResourceAggregation;
@@ -49,7 +48,6 @@
  * <p>This class is for advanced usage and reflects the underlying API directly.
  */
 @Generated("by gapic-generator-java")
-@BetaApi
 public class HttpJsonConnectionServiceStub extends ConnectionServiceStub {
   private static final TypeRegistry typeRegistry = TypeRegistry.newBuilder().build();
 

diff --git a/test/integration/goldens/asset/src/com/google/cloud/asset/v1/AssetServiceSettings.java b/test/integration/goldens/asset/src/com/google/cloud/asset/v1/AssetServiceSettings.java
@@ -262,7 +262,6 @@ public static Builder newBuilder() {
   }
 
   /** Returns a new REST builder for this class. */
-  @BetaApi
   public static Builder newHttpJsonBuilder() {
     return Builder.createHttpJsonDefault();
   }
@@ -304,7 +303,6 @@ private static Builder createDefault() {
       return new Builder(AssetServiceStubSettings.newBuilder());
     }
 
-    @BetaApi
     private static Builder createHttpJsonDefault() {
       return new Builder(AssetServiceStubSettings.newHttpJsonBuilder());
     }

diff --git a/...ntegration/goldens/asset/src/com/google/cloud/asset/v1/stub/HttpJsonAssetServiceStub.java b/...ntegration/goldens/asset/src/com/google/cloud/asset/v1/stub/HttpJsonAssetServiceStub.java
@@ -21,7 +21,6 @@
 import static com.google.cloud.asset.v1.AssetServiceClient.SearchAllIamPoliciesPagedResponse;
 import static com.google.cloud.asset.v1.AssetServiceClient.SearchAllResourcesPagedResponse;
 
-import com.google.api.core.BetaApi;
 import com.google.api.core.InternalApi;
 import com.google.api.gax.core.BackgroundResource;
 import com.google.api.gax.core.BackgroundResourceAggregation;
@@ -91,7 +90,6 @@
  * <p>This class is for advanced usage and reflects the underlying API directly.
  */
 @Generated("by gapic-generator-java")
-@BetaApi
 public class HttpJsonAssetServiceStub extends AssetServiceStub {
   private static final TypeRegistry typeRegistry =
       TypeRegistry.newBuilder()

diff --git a/...tion/goldens/compute/src/com/google/cloud/compute/v1small/stub/HttpJsonAddressesStub.java b/...tion/goldens/compute/src/com/google/cloud/compute/v1small/stub/HttpJsonAddressesStub.java
@@ -19,7 +19,6 @@
 import static com.google.cloud.compute.v1small.AddressesClient.AggregatedListPagedResponse;
 import static com.google.cloud.compute.v1small.AddressesClient.ListPagedResponse;
 
-import com.google.api.core.BetaApi;
 import com.google.api.core.InternalApi;
 import com.google.api.gax.core.BackgroundResource;
 import com.google.api.gax.core.BackgroundResourceAggregation;
@@ -59,7 +58,6 @@
  * <p>This class is for advanced usage and reflects the underlying API directly.
  */
 @Generated("by gapic-generator-java")
-@BetaApi
 public class HttpJsonAddressesStub extends AddressesStub {
   private static final TypeRegistry typeRegistry =
       TypeRegistry.newBuilder().add(Operation.getDescriptor()).build();

diff --git a/...ldens/compute/src/com/google/cloud/compute/v1small/stub/HttpJsonRegionOperationsStub.java b/...ldens/compute/src/com/google/cloud/compute/v1small/stub/HttpJsonRegionOperationsStub.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.compute.v1small.stub;
 
-import com.google.api.core.BetaApi;
 import com.google.api.core.InternalApi;
 import com.google.api.gax.core.BackgroundResource;
 import com.google.api.gax.core.BackgroundResourceAggregation;
@@ -54,7 +53,6 @@
  * <p>This class is for advanced usage and reflects the underlying API directly.
  */
 @Generated("by gapic-generator-java")
-@BetaApi
 public class HttpJsonRegionOperationsStub extends RegionOperationsStub {
   private static final TypeRegistry typeRegistry = TypeRegistry.newBuilder().build();
 

diff --git a/...n/goldens/credentials/src/com/google/cloud/iam/credentials/v1/IamCredentialsSettings.java b/...n/goldens/credentials/src/com/google/cloud/iam/credentials/v1/IamCredentialsSettings.java
@@ -147,7 +147,6 @@ public static Builder newBuilder() {
   }
 
   /** Returns a new REST builder for this class. */
-  @BetaApi
   public static Builder newHttpJsonBuilder() {
     return Builder.createHttpJsonDefault();
   }
@@ -189,7 +188,6 @@ private static Builder createDefault() {
       return new Builder(IamCredentialsStubSettings.newBuilder());
     }
 
-    @BetaApi
     private static Builder createHttpJsonDefault() {
       return new Builder(IamCredentialsStubSettings.newHttpJsonBuilder());
     }

diff --git a/.../credentials/src/com/google/cloud/iam/credentials/v1/stub/HttpJsonIamCredentialsStub.java b/.../credentials/src/com/google/cloud/iam/credentials/v1/stub/HttpJsonIamCredentialsStub.java
@@ -16,7 +16,6 @@
 
 package com.google.cloud.iam.credentials.v1.stub;
 
-import com.google.api.core.BetaApi;
 import com.google.api.core.InternalApi;
 import com.google.api.gax.core.BackgroundResource;
 import com.google.api.gax.core.BackgroundResourceAggregation;
@@ -53,7 +52,6 @@
  * <p>This class is for advanced usage and reflects the underlying API directly.
  */
 @Generated("by gapic-generator-java")
-@BetaApi
 public class HttpJsonIamCredentialsStub extends IamCredentialsStub {
   private static final TypeRegistry typeRegistry = TypeRegistry.newBuilder().build();
 

diff --git a/...ation/goldens/library/src/com/google/cloud/example/library/v1/LibraryServiceSettings.java b/...ation/goldens/library/src/com/google/cloud/example/library/v1/LibraryServiceSettings.java
@@ -202,7 +202,6 @@ public static Builder newBuilder() {
   }
 
   /** Returns a new REST builder for this class. */
-  @BetaApi
   public static Builder newHttpJsonBuilder() {
     return Builder.createHttpJsonDefault();
   }
@@ -244,7 +243,6 @@ private static Builder createDefault() {
       return new Builder(LibraryServiceStubSettings.newBuilder());
     }
 
-    @BetaApi
     private static Builder createHttpJsonDefault() {
       return new Builder(LibraryServiceStubSettings.newHttpJsonBuilder());
     }

diff --git a/...dens/library/src/com/google/cloud/example/library/v1/stub/HttpJsonLibraryServiceStub.java b/...dens/library/src/com/google/cloud/example/library/v1/stub/HttpJsonLibraryServiceStub.java
@@ -19,7 +19,6 @@
 import static com.google.cloud.example.library.v1.LibraryServiceClient.ListBooksPagedResponse;
 import static com.google.cloud.example.library.v1.LibraryServiceClient.ListShelvesPagedResponse;
 
-import com.google.api.core.BetaApi;
 import com.google.api.core.InternalApi;
 import com.google.api.gax.core.BackgroundResource;
 import com.google.api.gax.core.BackgroundResourceAggregation;
@@ -64,7 +63,6 @@
  * <p>This class is for advanced usage and reflects the underlying API directly.
  */
 @Generated("by gapic-generator-java")
-@BetaApi
 public class HttpJsonLibraryServiceStub extends LibraryServiceStub {
   private static final TypeRegistry typeRegistry = TypeRegistry.newBuilder().build();
 

diff --git a/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/CloudRedisSettings.java b/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/CloudRedisSettings.java
@@ -236,7 +236,6 @@ public static Builder newBuilder() {
   }
 
   /** Returns a new REST builder for this class. */
-  @BetaApi
   public static Builder newHttpJsonBuilder() {
     return Builder.createHttpJsonDefault();
   }
@@ -278,7 +277,6 @@ private static Builder createDefault() {
       return new Builder(CloudRedisStubSettings.newBuilder());
     }
 
-    @BetaApi
     private static Builder createHttpJsonDefault() {
       return new Builder(CloudRedisStubSettings.newHttpJsonBuilder());
     }