remove remaining remove @BetaApi for per-pattern Builders and update tests.

Author: zhumin8

gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameHelperClassComposer.java

@@ -60,7 +60,6 @@
 import com.google.common.collect.ImmutableMap;
 import java.util.ArrayList;
 import java.util.Arrays;
-import java.util.Collections;
 import java.util.HashMap;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
@@ -1678,21 +1677,12 @@ private static ClassDefinition createNestedBuilderClass(
     nestedClassMethods.add(buildMethod);
 
     // Return the class.
-    AnnotationNode betaAnnotation =
-        AnnotationNode.builder()
-            .setType(FIXED_TYPESTORE.get("BetaApi"))
-            .setDescription(
-                "The per-pattern Builders are not stable yet and may be changed in the future.")
-            .build();
-    List<AnnotationNode> classAnnotations =
-        isDefaultClass ? Collections.emptyList() : Arrays.asList(betaAnnotation);
 
     return ClassDefinition.builder()
         .setHeaderCommentStatements(
             CommentStatement.withComment(
                 JavaDocComment.withComment(
                     String.format(BUILDER_CLASS_HEADER_PATTERN, resourceNamePattern))))
-        .setAnnotations(classAnnotations)
         .setIsNested(true)
         .setScope(ScopeNode.PUBLIC)
         .setIsStatic(true)

gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/AgentName.golden

@@ -1,6 +1,5 @@
 package com.google.cloud.dialogflow.v2beta1;
 
-import com.google.api.core.BetaApi;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.pathtemplate.ValidationException;
 import com.google.api.resourcenames.ResourceName;
@@ -221,7 +220,6 @@ public class AgentName implements ResourceName {
   }
 
   /** Builder for projects/{project}/agent. */
-  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
   public static class ProjectBuilder {
     private String project;
 

gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/FoobarName.golden

@@ -1,6 +1,5 @@
 package com.google.showcase.v1beta1;
 
-import com.google.api.core.BetaApi;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.pathtemplate.ValidationException;
 import com.google.api.resourcenames.ResourceName;
@@ -315,7 +314,6 @@ public class FoobarName implements ResourceName {
   }
 
   /** Builder for projects/{project}/chocolate/variants/{variant}/foobars/{foobar}. */
-  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
   public static class ProjectVariantFoobarBuilder {
     private String project;
     private String variant;
@@ -356,7 +354,6 @@ public class FoobarName implements ResourceName {
   }
 
   /** Builder for foobars/{foobar}. */
-  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
   public static class FoobarBuilder {
     private String foobar;
 
@@ -377,7 +374,6 @@ public class FoobarName implements ResourceName {
   }
 
   /** Builder for bar_foos/{bar_foo}/foobars/{foobar}. */
-  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
   public static class BarFooFoobarBuilder {
     private String barFoo;
     private String foobar;

showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/BlurbName.java

@@ -16,7 +16,6 @@
 
 package com.google.showcase.v1beta1;
 
-import com.google.api.core.BetaApi;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.pathtemplate.ValidationException;
 import com.google.api.resourcenames.ResourceName;
@@ -357,7 +356,6 @@ public BlurbName build() {
   }
 
   /** Builder for users/{user}/profile/blurbs/{blurb}. */
-  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
   public static class UserBlurbBuilder {
     private String user;
     private String blurb;
@@ -388,7 +386,6 @@ public BlurbName build() {
   }
 
   /** Builder for rooms/{room}/blurbs/{blurb}. */
-  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
   public static class RoomBlurbBuilder {
     private String room;
     private String blurb;
@@ -419,7 +416,6 @@ public BlurbName build() {
   }
 
   /** Builder for rooms/{room}/blurbs/legacy/{legacy_room}.{blurb}. */
-  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
   public static class RoomLegacyRoomBlurbBuilder {
     private String room;
     private String legacyRoom;

test/integration/goldens/asset/src/com/google/cloud/asset/v1/FeedName.java

@@ -16,7 +16,6 @@
 
 package com.google.cloud.asset.v1;
 
-import com.google.api.core.BetaApi;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.pathtemplate.ValidationException;
 import com.google.api.resourcenames.ResourceName;
@@ -296,7 +295,6 @@ public FeedName build() {
   }
 
   /** Builder for folders/{folder}/feeds/{feed}. */
-  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
   public static class FolderFeedBuilder {
     private String folder;
     private String feed;
@@ -327,7 +325,6 @@ public FeedName build() {
   }
 
   /** Builder for organizations/{organization}/feeds/{feed}. */
-  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
   public static class OrganizationFeedBuilder {
     private String organization;
     private String feed;

test/integration/goldens/asset/src/com/google/cloud/asset/v1/SavedQueryName.java

@@ -16,7 +16,6 @@
 
 package com.google.cloud.asset.v1;
 
-import com.google.api.core.BetaApi;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.pathtemplate.ValidationException;
 import com.google.api.resourcenames.ResourceName;
@@ -306,7 +305,6 @@ public SavedQueryName build() {
   }
 
   /** Builder for folders/{folder}/savedQueries/{saved_query}. */
-  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
   public static class FolderSavedQueryBuilder {
     private String folder;
     private String savedQuery;
@@ -337,7 +335,6 @@ public SavedQueryName build() {
   }
 
   /** Builder for organizations/{organization}/savedQueries/{saved_query}. */
-  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
   public static class OrganizationSavedQueryBuilder {
     private String organization;
     private String savedQuery;

test/integration/goldens/logging/src/com/google/logging/v2/CmekSettingsName.java

@@ -16,7 +16,6 @@
 
 package com.google.logging.v2;
 
-import com.google.api.core.BetaApi;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.pathtemplate.ValidationException;
 import com.google.api.resourcenames.ResourceName;
@@ -307,7 +306,6 @@ public CmekSettingsName build() {
   }
 
   /** Builder for organizations/{organization}/cmekSettings. */
-  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
   public static class OrganizationBuilder {
     private String organization;
 
@@ -328,7 +326,6 @@ public CmekSettingsName build() {
   }
 
   /** Builder for folders/{folder}/cmekSettings. */
-  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
   public static class FolderBuilder {
     private String folder;
 
@@ -349,7 +346,6 @@ public CmekSettingsName build() {
   }
 
   /** Builder for billingAccounts/{billing_account}/cmekSettings. */
-  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
   public static class BillingAccountBuilder {
     private String billingAccount;
 

test/integration/goldens/logging/src/com/google/logging/v2/LogBucketName.java

@@ -16,7 +16,6 @@
 
 package com.google.logging.v2;
 
-import com.google.api.core.BetaApi;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.pathtemplate.ValidationException;
 import com.google.api.resourcenames.ResourceName;
@@ -414,7 +413,6 @@ public LogBucketName build() {
   }
 
   /** Builder for organizations/{organization}/locations/{location}/buckets/{bucket}. */
-  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
   public static class OrganizationLocationBucketBuilder {
     private String organization;
     private String location;
@@ -455,7 +453,6 @@ public LogBucketName build() {
   }
 
   /** Builder for folders/{folder}/locations/{location}/buckets/{bucket}. */
-  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
   public static class FolderLocationBucketBuilder {
     private String folder;
     private String location;
@@ -496,7 +493,6 @@ public LogBucketName build() {
   }
 
   /** Builder for billingAccounts/{billing_account}/locations/{location}/buckets/{bucket}. */
-  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
   public static class BillingAccountLocationBucketBuilder {
     private String billingAccount;
     private String location;

test/integration/goldens/logging/src/com/google/logging/v2/LogExclusionName.java

@@ -16,7 +16,6 @@
 
 package com.google.logging.v2;
 
-import com.google.api.core.BetaApi;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.pathtemplate.ValidationException;
 import com.google.api.resourcenames.ResourceName;
@@ -352,7 +351,6 @@ public LogExclusionName build() {
   }
 
   /** Builder for organizations/{organization}/exclusions/{exclusion}. */
-  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
   public static class OrganizationExclusionBuilder {
     private String organization;
     private String exclusion;
@@ -383,7 +381,6 @@ public LogExclusionName build() {
   }
 
   /** Builder for folders/{folder}/exclusions/{exclusion}. */
-  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
   public static class FolderExclusionBuilder {
     private String folder;
     private String exclusion;
@@ -414,7 +411,6 @@ public LogExclusionName build() {
   }
 
   /** Builder for billingAccounts/{billing_account}/exclusions/{exclusion}. */
-  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
   public static class BillingAccountExclusionBuilder {
     private String billingAccount;
     private String exclusion;

test/integration/goldens/logging/src/com/google/logging/v2/LogName.java

@@ -16,7 +16,6 @@
 
 package com.google.logging.v2;
 
-import com.google.api.core.BetaApi;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.pathtemplate.ValidationException;
 import com.google.api.resourcenames.ResourceName;
@@ -338,7 +337,6 @@ public LogName build() {
   }
 
   /** Builder for organizations/{organization}/logs/{log}. */
-  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
   public static class OrganizationLogBuilder {
     private String organization;
     private String log;
@@ -369,7 +367,6 @@ public LogName build() {
   }
 
   /** Builder for folders/{folder}/logs/{log}. */
-  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
   public static class FolderLogBuilder {
     private String folder;
     private String log;
@@ -400,7 +397,6 @@ public LogName build() {
   }
 
   /** Builder for billingAccounts/{billing_account}/logs/{log}. */
-  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
   public static class BillingAccountLogBuilder {
     private String billingAccount;
     private String log;

test/integration/goldens/logging/src/com/google/logging/v2/LogSinkName.java

@@ -16,7 +16,6 @@
 
 package com.google.logging.v2;
 
-import com.google.api.core.BetaApi;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.pathtemplate.ValidationException;
 import com.google.api.resourcenames.ResourceName;
@@ -342,7 +341,6 @@ public LogSinkName build() {
   }
 
   /** Builder for organizations/{organization}/sinks/{sink}. */
-  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
   public static class OrganizationSinkBuilder {
     private String organization;
     private String sink;
@@ -373,7 +371,6 @@ public LogSinkName build() {
   }
 
   /** Builder for folders/{folder}/sinks/{sink}. */
-  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
   public static class FolderSinkBuilder {
     private String folder;
     private String sink;
@@ -404,7 +401,6 @@ public LogSinkName build() {
   }
 
   /** Builder for billingAccounts/{billing_account}/sinks/{sink}. */
-  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
   public static class BillingAccountSinkBuilder {
     private String billingAccount;
     private String sink;

test/integration/goldens/logging/src/com/google/logging/v2/LogViewName.java

@@ -16,7 +16,6 @@
 
 package com.google.logging.v2;
 
-import com.google.api.core.BetaApi;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.pathtemplate.ValidationException;
 import com.google.api.resourcenames.ResourceName;
@@ -474,7 +473,6 @@ public LogViewName build() {
   /**
    * Builder for organizations/{organization}/locations/{location}/buckets/{bucket}/views/{view}.
    */
-  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
   public static class OrganizationLocationBucketViewBuilder {
     private String organization;
     private String location;
@@ -525,7 +523,6 @@ public LogViewName build() {
   }
 
   /** Builder for folders/{folder}/locations/{location}/buckets/{bucket}/views/{view}. */
-  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
   public static class FolderLocationBucketViewBuilder {
     private String folder;
     private String location;
@@ -579,7 +576,6 @@ public LogViewName build() {
    * Builder for
    * billingAccounts/{billing_account}/locations/{location}/buckets/{bucket}/views/{view}.
    */
-  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
   public static class BillingAccountLocationBucketViewBuilder {
     private String billingAccount;
     private String location;

test/integration/goldens/logging/src/com/google/logging/v2/SettingsName.java

@@ -16,7 +16,6 @@
 
 package com.google.logging.v2;
 
-import com.google.api.core.BetaApi;
 import com.google.api.pathtemplate.PathTemplate;
 import com.google.api.pathtemplate.ValidationException;
 import com.google.api.resourcenames.ResourceName;
@@ -307,7 +306,6 @@ public SettingsName build() {
   }
 
   /** Builder for organizations/{organization}/settings. */
-  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
   public static class OrganizationBuilder {
     private String organization;
 
@@ -328,7 +326,6 @@ public SettingsName build() {
   }
 
   /** Builder for folders/{folder}/settings. */
-  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
   public static class FolderBuilder {
     private String folder;
 
@@ -349,7 +346,6 @@ public SettingsName build() {
   }
 
   /** Builder for billingAccounts/{billing_account}/settings. */
-  @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.")
   public static class BillingAccountBuilder {
     private String billingAccount;