diff --git a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameHelperClassComposer.java b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameHelperClassComposer.java index b558a9d715..73529ab21c 100644 --- a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameHelperClassComposer.java +++ b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/resourcename/ResourceNameHelperClassComposer.java @@ -14,7 +14,6 @@ package com.google.api.generator.gapic.composer.resourcename; -import com.google.api.core.BetaApi; import com.google.api.generator.engine.ast.AnnotationNode; import com.google.api.generator.engine.ast.AssignmentExpr; import com.google.api.generator.engine.ast.AssignmentOperationExpr; @@ -60,7 +59,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; @@ -503,13 +501,6 @@ private static List createBuilderCreatorMethods( ResourceName resourceName, List> tokenHierarchies, TypeStore typeStore) { List javaMethods = new ArrayList<>(); String newMethodNameFormat = "new%s"; - 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 annotations = Arrays.asList(betaAnnotation); // Create the newBuilder and variation methods here. // Variation example: newProjectLocationAutoscalingPolicyBuilder(). @@ -533,17 +524,13 @@ private static List createBuilderCreatorMethods( String variantName = getBuilderTypeName(tokenHierarchies, i); javaMethods.add( - methodDefStarterFn - .apply(String.format(newMethodNameFormat, variantName)) - .setAnnotations(i == 0 ? Collections.emptyList() : annotations) - .build()); + methodDefStarterFn.apply(String.format(newMethodNameFormat, variantName)).build()); if (i == 0 && tokenHierarchies.size() > 1) { // Create another builder creator method, but with the per-variant name. javaMethods.add( methodDefStarterFn .apply( String.format(newMethodNameFormat, getBuilderTypeName(tokenHierarchies.get(i)))) - .setAnnotations(annotations) .build()); } } @@ -597,15 +584,6 @@ private static List createOfOrFormatMethodHelper( String setMethodNameFormat = "set%s"; String buildMethodName = "build"; String toStringMethodName = "toString"; - AnnotationNode betaAnnotation = - AnnotationNode.builder() - .setType(FIXED_TYPESTORE.get("BetaApi")) - .setDescription( - String.format( - "The static %s methods are not stable yet and may be changed in the future.", - isFormatMethod ? "format" : "create")) - .build(); - List annotations = Arrays.asList(betaAnnotation); TypeNode thisClassType = typeStore.get(getThisClassName(resourceName)); TypeNode returnType = isFormatMethod ? TypeNode.STRING : thisClassType; @@ -624,7 +602,6 @@ private static List createOfOrFormatMethodHelper( MethodDefinition.builder() .setScope(ScopeNode.PUBLIC) .setIsStatic(true) - .setAnnotations(annotations) .setReturnType(returnType) .setName( String.format(methodNameFormat, concatToUpperCamelCaseName(tokens) + "Name")) @@ -682,7 +659,6 @@ private static List createOfOrFormatMethodHelper( MethodDefinition.builder() .setScope(ScopeNode.PUBLIC) .setIsStatic(true) - .setAnnotations(i == 0 ? Collections.emptyList() : annotations) .setReturnType(returnType) .setName( String.format( @@ -696,7 +672,6 @@ private static List createOfOrFormatMethodHelper( MethodDefinition.builder() .setScope(ScopeNode.PUBLIC) .setIsStatic(true) - .setAnnotations(annotations) .setReturnType(returnType) .setName( String.format( @@ -1701,21 +1676,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 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) @@ -1729,7 +1695,6 @@ private static TypeStore createStaticTypes() { List> concreteClazzes = Arrays.asList( ArrayList.class, - BetaApi.class, Generated.class, ImmutableMap.class, List.class, diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/AgentName.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/AgentName.golden index 7b73d8c9c4..2eb43f4f39 100644 --- a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/AgentName.golden +++ b/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; @@ -55,12 +54,10 @@ public class AgentName implements ResourceName { return new Builder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static Builder newProjectLocationBuilder() { return new Builder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static ProjectBuilder newProjectBuilder() { return new ProjectBuilder(); } @@ -73,12 +70,10 @@ public class AgentName implements ResourceName { return newBuilder().setProject(project).setLocation(location).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static AgentName ofProjectLocationName(String project, String location) { return newBuilder().setProject(project).setLocation(location).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static AgentName ofProjectName(String project) { return newProjectBuilder().setProject(project).build(); } @@ -87,12 +82,10 @@ public class AgentName implements ResourceName { return newBuilder().setProject(project).setLocation(location).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatProjectLocationName(String project, String location) { return newBuilder().setProject(project).setLocation(location).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatProjectName(String project) { return newProjectBuilder().setProject(project).build().toString(); } @@ -227,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; diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/FoobarName.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/FoobarName.golden index 7a96c37d77..4dcf36186a 100644 --- a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/resourcename/goldens/FoobarName.golden +++ b/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; @@ -92,22 +91,18 @@ public class FoobarName implements ResourceName { return new Builder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static Builder newProjectFoobarBuilder() { return new Builder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static ProjectVariantFoobarBuilder newProjectVariantFoobarBuilder() { return new ProjectVariantFoobarBuilder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static FoobarBuilder newFoobarBuilder() { return new FoobarBuilder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static BarFooFoobarBuilder newBarFooFoobarBuilder() { return new BarFooFoobarBuilder(); } @@ -120,12 +115,10 @@ public class FoobarName implements ResourceName { return newBuilder().setProject(project).setFoobar(foobar).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static FoobarName ofProjectFoobarName(String project, String foobar) { return newBuilder().setProject(project).setFoobar(foobar).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static FoobarName ofProjectVariantFoobarName( String project, String variant, String foobar) { return newProjectVariantFoobarBuilder() @@ -135,12 +128,10 @@ public class FoobarName implements ResourceName { .build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static FoobarName ofFoobarName(String foobar) { return newFoobarBuilder().setFoobar(foobar).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static FoobarName ofBarFooFoobarName(String barFoo, String foobar) { return newBarFooFoobarBuilder().setBarFoo(barFoo).setFoobar(foobar).build(); } @@ -149,12 +140,10 @@ public class FoobarName implements ResourceName { return newBuilder().setProject(project).setFoobar(foobar).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatProjectFoobarName(String project, String foobar) { return newBuilder().setProject(project).setFoobar(foobar).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatProjectVariantFoobarName( String project, String variant, String foobar) { return newProjectVariantFoobarBuilder() @@ -165,12 +154,10 @@ public class FoobarName implements ResourceName { .toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatFoobarName(String foobar) { return newFoobarBuilder().setFoobar(foobar).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatBarFooFoobarName(String barFoo, String foobar) { return newBarFooFoobarBuilder().setBarFoo(barFoo).setFoobar(foobar).build().toString(); } @@ -327,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; @@ -368,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; @@ -389,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; diff --git a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/BlurbName.java b/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/BlurbName.java index 843613d8c4..d676d00566 100644 --- a/showcase/proto-gapic-showcase-v1beta1/src/main/java/com/google/showcase/v1beta1/BlurbName.java +++ b/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; @@ -118,22 +117,18 @@ public static Builder newBuilder() { return new Builder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static Builder newUserLegacyUserBlurbBuilder() { return new Builder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static UserBlurbBuilder newUserBlurbBuilder() { return new UserBlurbBuilder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static RoomBlurbBuilder newRoomBlurbBuilder() { return new RoomBlurbBuilder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static RoomLegacyRoomBlurbBuilder newRoomLegacyRoomBlurbBuilder() { return new RoomLegacyRoomBlurbBuilder(); } @@ -146,22 +141,18 @@ public static BlurbName of(String user, String legacyUser, String blurb) { return newBuilder().setUser(user).setLegacyUser(legacyUser).setBlurb(blurb).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static BlurbName ofUserLegacyUserBlurbName(String user, String legacyUser, String blurb) { return newBuilder().setUser(user).setLegacyUser(legacyUser).setBlurb(blurb).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static BlurbName ofUserBlurbName(String user, String blurb) { return newUserBlurbBuilder().setUser(user).setBlurb(blurb).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static BlurbName ofRoomBlurbName(String room, String blurb) { return newRoomBlurbBuilder().setRoom(room).setBlurb(blurb).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static BlurbName ofRoomLegacyRoomBlurbName(String room, String legacyRoom, String blurb) { return newRoomLegacyRoomBlurbBuilder() .setRoom(room) @@ -174,22 +165,18 @@ public static String format(String user, String legacyUser, String blurb) { return newBuilder().setUser(user).setLegacyUser(legacyUser).setBlurb(blurb).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatUserLegacyUserBlurbName(String user, String legacyUser, String blurb) { return newBuilder().setUser(user).setLegacyUser(legacyUser).setBlurb(blurb).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatUserBlurbName(String user, String blurb) { return newUserBlurbBuilder().setUser(user).setBlurb(blurb).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatRoomBlurbName(String room, String blurb) { return newRoomBlurbBuilder().setRoom(room).setBlurb(blurb).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatRoomLegacyRoomBlurbName(String room, String legacyRoom, String blurb) { return newRoomLegacyRoomBlurbBuilder() .setRoom(room) @@ -369,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; @@ -400,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; @@ -431,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; diff --git a/test/integration/goldens/asset/src/com/google/cloud/asset/v1/FeedName.java b/test/integration/goldens/asset/src/com/google/cloud/asset/v1/FeedName.java index 7278bc364b..4dfc13d2e6 100644 --- a/test/integration/goldens/asset/src/com/google/cloud/asset/v1/FeedName.java +++ b/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; @@ -97,17 +96,14 @@ public static Builder newBuilder() { return new Builder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static Builder newProjectFeedBuilder() { return new Builder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static FolderFeedBuilder newFolderFeedBuilder() { return new FolderFeedBuilder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static OrganizationFeedBuilder newOrganizationFeedBuilder() { return new OrganizationFeedBuilder(); } @@ -120,17 +116,14 @@ public static FeedName of(String project, String feed) { return newBuilder().setProject(project).setFeed(feed).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static FeedName ofProjectFeedName(String project, String feed) { return newBuilder().setProject(project).setFeed(feed).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static FeedName ofFolderFeedName(String folder, String feed) { return newFolderFeedBuilder().setFolder(folder).setFeed(feed).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static FeedName ofOrganizationFeedName(String organization, String feed) { return newOrganizationFeedBuilder().setOrganization(organization).setFeed(feed).build(); } @@ -139,17 +132,14 @@ public static String format(String project, String feed) { return newBuilder().setProject(project).setFeed(feed).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatProjectFeedName(String project, String feed) { return newBuilder().setProject(project).setFeed(feed).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatFolderFeedName(String folder, String feed) { return newFolderFeedBuilder().setFolder(folder).setFeed(feed).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatOrganizationFeedName(String organization, String feed) { return newOrganizationFeedBuilder() .setOrganization(organization) @@ -305,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; @@ -336,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; diff --git a/test/integration/goldens/asset/src/com/google/cloud/asset/v1/SavedQueryName.java b/test/integration/goldens/asset/src/com/google/cloud/asset/v1/SavedQueryName.java index af70ae9f77..1e525a4843 100644 --- a/test/integration/goldens/asset/src/com/google/cloud/asset/v1/SavedQueryName.java +++ b/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; @@ -98,17 +97,14 @@ public static Builder newBuilder() { return new Builder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static Builder newProjectSavedQueryBuilder() { return new Builder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static FolderSavedQueryBuilder newFolderSavedQueryBuilder() { return new FolderSavedQueryBuilder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static OrganizationSavedQueryBuilder newOrganizationSavedQueryBuilder() { return new OrganizationSavedQueryBuilder(); } @@ -121,17 +117,14 @@ public static SavedQueryName of(String project, String savedQuery) { return newBuilder().setProject(project).setSavedQuery(savedQuery).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static SavedQueryName ofProjectSavedQueryName(String project, String savedQuery) { return newBuilder().setProject(project).setSavedQuery(savedQuery).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static SavedQueryName ofFolderSavedQueryName(String folder, String savedQuery) { return newFolderSavedQueryBuilder().setFolder(folder).setSavedQuery(savedQuery).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static SavedQueryName ofOrganizationSavedQueryName( String organization, String savedQuery) { return newOrganizationSavedQueryBuilder() @@ -144,12 +137,10 @@ public static String format(String project, String savedQuery) { return newBuilder().setProject(project).setSavedQuery(savedQuery).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatProjectSavedQueryName(String project, String savedQuery) { return newBuilder().setProject(project).setSavedQuery(savedQuery).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatFolderSavedQueryName(String folder, String savedQuery) { return newFolderSavedQueryBuilder() .setFolder(folder) @@ -158,7 +149,6 @@ public static String formatFolderSavedQueryName(String folder, String savedQuery .toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatOrganizationSavedQueryName(String organization, String savedQuery) { return newOrganizationSavedQueryBuilder() .setOrganization(organization) @@ -315,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; @@ -346,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; diff --git a/test/integration/goldens/logging/src/com/google/logging/v2/CmekSettingsName.java b/test/integration/goldens/logging/src/com/google/logging/v2/CmekSettingsName.java index 63c0183a11..4695948530 100644 --- a/test/integration/goldens/logging/src/com/google/logging/v2/CmekSettingsName.java +++ b/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; @@ -107,22 +106,18 @@ public static Builder newBuilder() { return new Builder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static Builder newProjectBuilder() { return new Builder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static OrganizationBuilder newOrganizationBuilder() { return new OrganizationBuilder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static FolderBuilder newFolderBuilder() { return new FolderBuilder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static BillingAccountBuilder newBillingAccountBuilder() { return new BillingAccountBuilder(); } @@ -135,22 +130,18 @@ public static CmekSettingsName of(String project) { return newBuilder().setProject(project).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static CmekSettingsName ofProjectName(String project) { return newBuilder().setProject(project).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static CmekSettingsName ofOrganizationName(String organization) { return newOrganizationBuilder().setOrganization(organization).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static CmekSettingsName ofFolderName(String folder) { return newFolderBuilder().setFolder(folder).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static CmekSettingsName ofBillingAccountName(String billingAccount) { return newBillingAccountBuilder().setBillingAccount(billingAccount).build(); } @@ -159,22 +150,18 @@ public static String format(String project) { return newBuilder().setProject(project).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatProjectName(String project) { return newBuilder().setProject(project).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatOrganizationName(String organization) { return newOrganizationBuilder().setOrganization(organization).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatFolderName(String folder) { return newFolderBuilder().setFolder(folder).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatBillingAccountName(String billingAccount) { return newBillingAccountBuilder().setBillingAccount(billingAccount).build().toString(); } @@ -319,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; @@ -340,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; @@ -361,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; diff --git a/test/integration/goldens/logging/src/com/google/logging/v2/LogBucketName.java b/test/integration/goldens/logging/src/com/google/logging/v2/LogBucketName.java index 0f77e30267..9b94f46faf 100644 --- a/test/integration/goldens/logging/src/com/google/logging/v2/LogBucketName.java +++ b/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; @@ -131,22 +130,18 @@ public static Builder newBuilder() { return new Builder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static Builder newProjectLocationBucketBuilder() { return new Builder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static OrganizationLocationBucketBuilder newOrganizationLocationBucketBuilder() { return new OrganizationLocationBucketBuilder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static FolderLocationBucketBuilder newFolderLocationBucketBuilder() { return new FolderLocationBucketBuilder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static BillingAccountLocationBucketBuilder newBillingAccountLocationBucketBuilder() { return new BillingAccountLocationBucketBuilder(); } @@ -159,13 +154,11 @@ public static LogBucketName of(String project, String location, String bucket) { return newBuilder().setProject(project).setLocation(location).setBucket(bucket).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static LogBucketName ofProjectLocationBucketName( String project, String location, String bucket) { return newBuilder().setProject(project).setLocation(location).setBucket(bucket).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static LogBucketName ofOrganizationLocationBucketName( String organization, String location, String bucket) { return newOrganizationLocationBucketBuilder() @@ -175,7 +168,6 @@ public static LogBucketName ofOrganizationLocationBucketName( .build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static LogBucketName ofFolderLocationBucketName( String folder, String location, String bucket) { return newFolderLocationBucketBuilder() @@ -185,7 +177,6 @@ public static LogBucketName ofFolderLocationBucketName( .build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static LogBucketName ofBillingAccountLocationBucketName( String billingAccount, String location, String bucket) { return newBillingAccountLocationBucketBuilder() @@ -204,7 +195,6 @@ public static String format(String project, String location, String bucket) { .toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatProjectLocationBucketName( String project, String location, String bucket) { return newBuilder() @@ -215,7 +205,6 @@ public static String formatProjectLocationBucketName( .toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatOrganizationLocationBucketName( String organization, String location, String bucket) { return newOrganizationLocationBucketBuilder() @@ -226,7 +215,6 @@ public static String formatOrganizationLocationBucketName( .toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatFolderLocationBucketName( String folder, String location, String bucket) { return newFolderLocationBucketBuilder() @@ -237,7 +225,6 @@ public static String formatFolderLocationBucketName( .toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatBillingAccountLocationBucketName( String billingAccount, String location, String bucket) { return newBillingAccountLocationBucketBuilder() @@ -426,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; @@ -467,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; @@ -508,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; diff --git a/test/integration/goldens/logging/src/com/google/logging/v2/LogExclusionName.java b/test/integration/goldens/logging/src/com/google/logging/v2/LogExclusionName.java index 2fa6913c62..c074cd4773 100644 --- a/test/integration/goldens/logging/src/com/google/logging/v2/LogExclusionName.java +++ b/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; @@ -118,22 +117,18 @@ public static Builder newBuilder() { return new Builder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static Builder newProjectExclusionBuilder() { return new Builder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static OrganizationExclusionBuilder newOrganizationExclusionBuilder() { return new OrganizationExclusionBuilder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static FolderExclusionBuilder newFolderExclusionBuilder() { return new FolderExclusionBuilder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static BillingAccountExclusionBuilder newBillingAccountExclusionBuilder() { return new BillingAccountExclusionBuilder(); } @@ -146,12 +141,10 @@ public static LogExclusionName of(String project, String exclusion) { return newBuilder().setProject(project).setExclusion(exclusion).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static LogExclusionName ofProjectExclusionName(String project, String exclusion) { return newBuilder().setProject(project).setExclusion(exclusion).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static LogExclusionName ofOrganizationExclusionName( String organization, String exclusion) { return newOrganizationExclusionBuilder() @@ -160,12 +153,10 @@ public static LogExclusionName ofOrganizationExclusionName( .build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static LogExclusionName ofFolderExclusionName(String folder, String exclusion) { return newFolderExclusionBuilder().setFolder(folder).setExclusion(exclusion).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static LogExclusionName ofBillingAccountExclusionName( String billingAccount, String exclusion) { return newBillingAccountExclusionBuilder() @@ -178,12 +169,10 @@ public static String format(String project, String exclusion) { return newBuilder().setProject(project).setExclusion(exclusion).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatProjectExclusionName(String project, String exclusion) { return newBuilder().setProject(project).setExclusion(exclusion).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatOrganizationExclusionName(String organization, String exclusion) { return newOrganizationExclusionBuilder() .setOrganization(organization) @@ -192,12 +181,10 @@ public static String formatOrganizationExclusionName(String organization, String .toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatFolderExclusionName(String folder, String exclusion) { return newFolderExclusionBuilder().setFolder(folder).setExclusion(exclusion).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatBillingAccountExclusionName(String billingAccount, String exclusion) { return newBillingAccountExclusionBuilder() .setBillingAccount(billingAccount) @@ -364,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; @@ -395,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; @@ -426,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; diff --git a/test/integration/goldens/logging/src/com/google/logging/v2/LogName.java b/test/integration/goldens/logging/src/com/google/logging/v2/LogName.java index 21c790f861..69ad97a73e 100644 --- a/test/integration/goldens/logging/src/com/google/logging/v2/LogName.java +++ b/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; @@ -117,22 +116,18 @@ public static Builder newBuilder() { return new Builder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static Builder newProjectLogBuilder() { return new Builder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static OrganizationLogBuilder newOrganizationLogBuilder() { return new OrganizationLogBuilder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static FolderLogBuilder newFolderLogBuilder() { return new FolderLogBuilder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static BillingAccountLogBuilder newBillingAccountLogBuilder() { return new BillingAccountLogBuilder(); } @@ -145,22 +140,18 @@ public static LogName of(String project, String log) { return newBuilder().setProject(project).setLog(log).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static LogName ofProjectLogName(String project, String log) { return newBuilder().setProject(project).setLog(log).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static LogName ofOrganizationLogName(String organization, String log) { return newOrganizationLogBuilder().setOrganization(organization).setLog(log).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static LogName ofFolderLogName(String folder, String log) { return newFolderLogBuilder().setFolder(folder).setLog(log).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static LogName ofBillingAccountLogName(String billingAccount, String log) { return newBillingAccountLogBuilder().setBillingAccount(billingAccount).setLog(log).build(); } @@ -169,22 +160,18 @@ public static String format(String project, String log) { return newBuilder().setProject(project).setLog(log).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatProjectLogName(String project, String log) { return newBuilder().setProject(project).setLog(log).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatOrganizationLogName(String organization, String log) { return newOrganizationLogBuilder().setOrganization(organization).setLog(log).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatFolderLogName(String folder, String log) { return newFolderLogBuilder().setFolder(folder).setLog(log).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatBillingAccountLogName(String billingAccount, String log) { return newBillingAccountLogBuilder() .setBillingAccount(billingAccount) @@ -350,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; @@ -381,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; @@ -412,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; diff --git a/test/integration/goldens/logging/src/com/google/logging/v2/LogSinkName.java b/test/integration/goldens/logging/src/com/google/logging/v2/LogSinkName.java index 030992a76f..257e07444b 100644 --- a/test/integration/goldens/logging/src/com/google/logging/v2/LogSinkName.java +++ b/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; @@ -117,22 +116,18 @@ public static Builder newBuilder() { return new Builder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static Builder newProjectSinkBuilder() { return new Builder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static OrganizationSinkBuilder newOrganizationSinkBuilder() { return new OrganizationSinkBuilder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static FolderSinkBuilder newFolderSinkBuilder() { return new FolderSinkBuilder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static BillingAccountSinkBuilder newBillingAccountSinkBuilder() { return new BillingAccountSinkBuilder(); } @@ -145,22 +140,18 @@ public static LogSinkName of(String project, String sink) { return newBuilder().setProject(project).setSink(sink).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static LogSinkName ofProjectSinkName(String project, String sink) { return newBuilder().setProject(project).setSink(sink).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static LogSinkName ofOrganizationSinkName(String organization, String sink) { return newOrganizationSinkBuilder().setOrganization(organization).setSink(sink).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static LogSinkName ofFolderSinkName(String folder, String sink) { return newFolderSinkBuilder().setFolder(folder).setSink(sink).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static LogSinkName ofBillingAccountSinkName(String billingAccount, String sink) { return newBillingAccountSinkBuilder().setBillingAccount(billingAccount).setSink(sink).build(); } @@ -169,12 +160,10 @@ public static String format(String project, String sink) { return newBuilder().setProject(project).setSink(sink).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatProjectSinkName(String project, String sink) { return newBuilder().setProject(project).setSink(sink).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatOrganizationSinkName(String organization, String sink) { return newOrganizationSinkBuilder() .setOrganization(organization) @@ -183,12 +172,10 @@ public static String formatOrganizationSinkName(String organization, String sink .toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatFolderSinkName(String folder, String sink) { return newFolderSinkBuilder().setFolder(folder).setSink(sink).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatBillingAccountSinkName(String billingAccount, String sink) { return newBillingAccountSinkBuilder() .setBillingAccount(billingAccount) @@ -354,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; @@ -385,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; @@ -416,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; diff --git a/test/integration/goldens/logging/src/com/google/logging/v2/LogViewName.java b/test/integration/goldens/logging/src/com/google/logging/v2/LogViewName.java index 92b3a1ad75..75f36ab113 100644 --- a/test/integration/goldens/logging/src/com/google/logging/v2/LogViewName.java +++ b/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; @@ -141,22 +140,18 @@ public static Builder newBuilder() { return new Builder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static Builder newProjectLocationBucketViewBuilder() { return new Builder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static OrganizationLocationBucketViewBuilder newOrganizationLocationBucketViewBuilder() { return new OrganizationLocationBucketViewBuilder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static FolderLocationBucketViewBuilder newFolderLocationBucketViewBuilder() { return new FolderLocationBucketViewBuilder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static BillingAccountLocationBucketViewBuilder newBillingAccountLocationBucketViewBuilder() { return new BillingAccountLocationBucketViewBuilder(); @@ -175,7 +170,6 @@ public static LogViewName of(String project, String location, String bucket, Str .build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static LogViewName ofProjectLocationBucketViewName( String project, String location, String bucket, String view) { return newBuilder() @@ -186,7 +180,6 @@ public static LogViewName ofProjectLocationBucketViewName( .build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static LogViewName ofOrganizationLocationBucketViewName( String organization, String location, String bucket, String view) { return newOrganizationLocationBucketViewBuilder() @@ -197,7 +190,6 @@ public static LogViewName ofOrganizationLocationBucketViewName( .build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static LogViewName ofFolderLocationBucketViewName( String folder, String location, String bucket, String view) { return newFolderLocationBucketViewBuilder() @@ -208,7 +200,6 @@ public static LogViewName ofFolderLocationBucketViewName( .build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static LogViewName ofBillingAccountLocationBucketViewName( String billingAccount, String location, String bucket, String view) { return newBillingAccountLocationBucketViewBuilder() @@ -229,7 +220,6 @@ public static String format(String project, String location, String bucket, Stri .toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatProjectLocationBucketViewName( String project, String location, String bucket, String view) { return newBuilder() @@ -241,7 +231,6 @@ public static String formatProjectLocationBucketViewName( .toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatOrganizationLocationBucketViewName( String organization, String location, String bucket, String view) { return newOrganizationLocationBucketViewBuilder() @@ -253,7 +242,6 @@ public static String formatOrganizationLocationBucketViewName( .toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatFolderLocationBucketViewName( String folder, String location, String bucket, String view) { return newFolderLocationBucketViewBuilder() @@ -265,7 +253,6 @@ public static String formatFolderLocationBucketViewName( .toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatBillingAccountLocationBucketViewName( String billingAccount, String location, String bucket, String view) { return newBillingAccountLocationBucketViewBuilder() @@ -486,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; @@ -537,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; @@ -591,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; diff --git a/test/integration/goldens/logging/src/com/google/logging/v2/SettingsName.java b/test/integration/goldens/logging/src/com/google/logging/v2/SettingsName.java index 86322c9321..ab9e462544 100644 --- a/test/integration/goldens/logging/src/com/google/logging/v2/SettingsName.java +++ b/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; @@ -107,22 +106,18 @@ public static Builder newBuilder() { return new Builder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static Builder newProjectBuilder() { return new Builder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static OrganizationBuilder newOrganizationBuilder() { return new OrganizationBuilder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static FolderBuilder newFolderBuilder() { return new FolderBuilder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static BillingAccountBuilder newBillingAccountBuilder() { return new BillingAccountBuilder(); } @@ -135,22 +130,18 @@ public static SettingsName of(String project) { return newBuilder().setProject(project).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static SettingsName ofProjectName(String project) { return newBuilder().setProject(project).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static SettingsName ofOrganizationName(String organization) { return newOrganizationBuilder().setOrganization(organization).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static SettingsName ofFolderName(String folder) { return newFolderBuilder().setFolder(folder).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static SettingsName ofBillingAccountName(String billingAccount) { return newBillingAccountBuilder().setBillingAccount(billingAccount).build(); } @@ -159,22 +150,18 @@ public static String format(String project) { return newBuilder().setProject(project).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatProjectName(String project) { return newBuilder().setProject(project).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatOrganizationName(String organization) { return newOrganizationBuilder().setOrganization(organization).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatFolderName(String folder) { return newFolderBuilder().setFolder(folder).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatBillingAccountName(String billingAccount) { return newBillingAccountBuilder().setBillingAccount(billingAccount).build().toString(); } @@ -319,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; @@ -340,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; @@ -361,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; diff --git a/test/integration/goldens/pubsub/src/com/google/pubsub/v1/TopicName.java b/test/integration/goldens/pubsub/src/com/google/pubsub/v1/TopicName.java index abae4f0317..8fe96fcb8d 100644 --- a/test/integration/goldens/pubsub/src/com/google/pubsub/v1/TopicName.java +++ b/test/integration/goldens/pubsub/src/com/google/pubsub/v1/TopicName.java @@ -16,7 +16,6 @@ package com.google.pubsub.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; @@ -71,7 +70,6 @@ public static Builder newBuilder() { return new Builder(); } - @BetaApi("The per-pattern Builders are not stable yet and may be changed in the future.") public static Builder newProjectTopicBuilder() { return new Builder(); } @@ -84,12 +82,10 @@ public static TopicName of(String project, String topic) { return newBuilder().setProject(project).setTopic(topic).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static TopicName ofProjectTopicName(String project, String topic) { return newBuilder().setProject(project).setTopic(topic).build(); } - @BetaApi("The static create methods are not stable yet and may be changed in the future.") public static TopicName ofDeletedTopicName() { return new TopicName("_deleted-topic_"); } @@ -98,12 +94,10 @@ public static String format(String project, String topic) { return newBuilder().setProject(project).setTopic(topic).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatProjectTopicName(String project, String topic) { return newBuilder().setProject(project).setTopic(topic).build().toString(); } - @BetaApi("The static format methods are not stable yet and may be changed in the future.") public static String formatDeletedTopicName() { return "_deleted-topic_"; }