diff --git a/gapic-generator-java/BUILD.bazel b/gapic-generator-java/BUILD.bazel index 0b8f9abb03..7d7e512dad 100644 --- a/gapic-generator-java/BUILD.bazel +++ b/gapic-generator-java/BUILD.bazel @@ -200,6 +200,7 @@ GOLDEN_UPDATING_UNIT_TESTS = [ "com.google.api.generator.gapic.composer.grpcrest.ServiceClientClassComposerTest", "com.google.api.generator.gapic.composer.grpcrest.ServiceClientTestClassComposerTest", "com.google.api.generator.gapic.composer.grpcrest.ServiceSettingsClassComposerTest", + "com.google.api.generator.gapic.composer.grpcrest.ServiceStubSettingsClassComposerTest", "com.google.api.generator.gapic.composer.resourcename.ResourceNameHelperClassComposerTest", "com.google.api.generator.gapic.composer.rest.HttpJsonServiceCallableFactoryClassComposerTest", "com.google.api.generator.gapic.composer.rest.HttpJsonServiceStubClassComposerTest", diff --git a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/comment/SettingsCommentComposer.java b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/comment/SettingsCommentComposer.java index 7f2c83e4a2..2e119b670f 100644 --- a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/comment/SettingsCommentComposer.java +++ b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/comment/SettingsCommentComposer.java @@ -89,6 +89,27 @@ public class SettingsCommentComposer { .map(c -> CommentStatement.withComment(c)) .collect(Collectors.toList()); + private final CommentStatement newTransportBuilderMethodComment; + private final CommentStatement transportProviderBuilderMethodComment; + + public SettingsCommentComposer(String transportPrefix) { + this.newTransportBuilderMethodComment = + toSimpleComment(String.format("Returns a new %s builder for this class.", transportPrefix)); + this.transportProviderBuilderMethodComment = + toSimpleComment( + String.format( + "Returns a builder for the default %s ChannelProvider for this service.", + transportPrefix)); + } + + public CommentStatement getNewTransportBuilderMethodComment() { + return newTransportBuilderMethodComment; + } + + public CommentStatement getTransportProviderBuilderMethodComment() { + return transportProviderBuilderMethodComment; + } + public static CommentStatement createCallSettingsGetterComment( String javaMethodName, boolean isMethodDeprecated) { String methodComment = String.format(CALL_SETTINGS_METHOD_DOC_PATTERN, javaMethodName); diff --git a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceCallableFactoryClassComposer.java b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceCallableFactoryClassComposer.java index d3a23dd4fd..9fcbaa0f9e 100644 --- a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceCallableFactoryClassComposer.java +++ b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceCallableFactoryClassComposer.java @@ -70,7 +70,7 @@ public GapicClass generate(GapicContext context, Service service) { String pakkage = String.format("%s.stub", service.pakkage()); StubCommentComposer commentComposer = - new StubCommentComposer(getTransportContext().transportName()); + new StubCommentComposer(getTransportContext().transportNames().get(0)); ClassDefinition classDef = ClassDefinition.builder() .setPackageString(pakkage) diff --git a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientClassComposer.java b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientClassComposer.java index 5303f6d680..cc6ee5b4f0 100644 --- a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientClassComposer.java +++ b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceClientClassComposer.java @@ -340,18 +340,11 @@ private static List createStaticCreatorMethods( .setType(typeStore.get(ClassNames.getServiceStubClassName(service))) .setName("stub") .build()); - AnnotationNode betaAnnotation = - AnnotationNode.builder() - .setType(typeStore.get("BetaApi")) - .setDescription( - "A restructuring of stub classes is planned, so this may break in the future") - .build(); methods.add( MethodDefinition.builder() .setHeaderCommentStatements( ServiceClientCommentComposer.createCreateMethodStubArgComment( ClassNames.getServiceClientClassName(service), settingsVarExpr.type())) - .setAnnotations(Arrays.asList(betaAnnotation)) .setScope(ScopeNode.PUBLIC) .setIsStatic(true) .setIsFinal(true) @@ -448,15 +441,8 @@ private List createConstructorMethods( if (hasLroClient) { ctorAssignmentExprs.addAll(operationsClientAssignExprs); } - AnnotationNode betaAnnotation = - AnnotationNode.builder() - .setType(typeStore.get("BetaApi")) - .setDescription( - "A restructuring of stub classes is planned, so this may break in the future") - .build(); methods.add( MethodDefinition.constructorBuilder() - .setAnnotations(Arrays.asList(betaAnnotation)) .setScope(ScopeNode.PROTECTED) .setReturnType(thisClassType) .setArguments(stubVarExpr.toBuilder().setIsDecl(true).build()) @@ -534,12 +520,6 @@ private List createGetterMethods( methodNameToTypes.put(opClientMethodName, opClientTypesIt.next()); } } - AnnotationNode betaStubAnnotation = - AnnotationNode.builder() - .setType(typeStore.get("BetaApi")) - .setDescription( - "A restructuring of stub classes is planned, so this may break in the future") - .build(); return methodNameToTypes.entrySet().stream() .map( @@ -554,10 +534,6 @@ private List createGetterMethods( ServiceClientCommentComposer.GET_OPERATIONS_CLIENT_METHOD_COMMENT); } return methodBuilder - .setAnnotations( - methodName.equals("getStub") - ? Arrays.asList(betaStubAnnotation) - : Collections.emptyList()) .setScope(ScopeNode.PUBLIC) .setName(methodName) .setIsFinal(!methodName.equals("getStub")) diff --git a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceSettingsClassComposer.java b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceSettingsClassComposer.java index 6bf3d2d57b..68780ed6bc 100644 --- a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceSettingsClassComposer.java +++ b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceSettingsClassComposer.java @@ -85,7 +85,7 @@ public abstract class AbstractServiceSettingsClassComposer implements ClassCompo private static final String OPERATION_SETTINGS_LITERAL = "OperationSettings"; private static final String SETTINGS_LITERAL = "Settings"; - private static final TypeStore FIXED_TYPESTORE = createStaticTypes(); + protected static final TypeStore FIXED_TYPESTORE = createStaticTypes(); private final TransportContext transportContext; @@ -185,7 +185,14 @@ private List createClassMethods(Service service, TypeStore typ javaMethods.addAll(createSettingsGetterMethods(service, typeStore)); javaMethods.add(createCreatorMethod(service, typeStore)); javaMethods.addAll(createDefaultGetterMethods(service, typeStore)); - javaMethods.addAll(createNewBuilderMethods(service, typeStore, "newBuilder", "createDefault")); + javaMethods.addAll( + createNewBuilderMethods( + service, + typeStore, + "newBuilder", + "createDefault", + ImmutableList.of(), + SettingsCommentComposer.NEW_BUILDER_METHOD_COMMENT)); javaMethods.addAll(createBuilderHelperMethods(service, typeStore)); javaMethods.add(createConstructorMethod(service, typeStore)); return javaMethods; @@ -370,13 +377,37 @@ private List createDefaultGetterMethods(Service service, TypeS getTransportContext().defaultTransportProviderBuilderNames().iterator(); Iterator> channelProviderClassesIt = getTransportContext().instantiatingChannelProviderBuilderClasses().iterator(); - while (providerBuilderNamesIt.hasNext() && channelProviderClassesIt.hasNext()) { + Iterator transportNamesIt = getTransportContext().transportNames().iterator(); + + boolean secondaryTransportProviderBuilder = false; + while (providerBuilderNamesIt.hasNext() + && channelProviderClassesIt.hasNext() + && transportNamesIt.hasNext()) { + List annotations = ImmutableList.of(); + + // For clients supporting multiple transports (mainly grpc+rest case) make secondary transport + // declared as @BetaApi for now. + if (secondaryTransportProviderBuilder) { + annotations = + Arrays.asList(AnnotationNode.builder().setType(FIXED_TYPESTORE.get("BetaApi")).build()); + } + CommentStatement commentStatement = + SettingsCommentComposer.DEFAULT_TRANSPORT_PROVIDER_BUILDER_METHOD_COMMENT; + if (getTransportContext().transportNames().size() > 1) { + commentStatement = + new SettingsCommentComposer(transportNamesIt.next()) + .getTransportProviderBuilderMethodComment(); + } + javaMethods.add( methodMakerFn.apply( - methodStarterFn.apply( - providerBuilderNamesIt.next(), - typeMakerFn.apply(channelProviderClassesIt.next())), - SettingsCommentComposer.DEFAULT_TRANSPORT_PROVIDER_BUILDER_METHOD_COMMENT)); + methodStarterFn + .apply( + providerBuilderNamesIt.next(), + typeMakerFn.apply(channelProviderClassesIt.next())) + .setAnnotations(annotations), + commentStatement)); + secondaryTransportProviderBuilder = true; } javaMethods.add( @@ -408,11 +439,14 @@ protected List createNewBuilderMethods( Service service, TypeStore typeStore, String newBuilderMethodName, - String createDefaultMethodName) { + String createDefaultMethodName, + List annotations, + CommentStatement comment) { TypeNode builderType = typeStore.get(BUILDER_CLASS_NAME); return ImmutableList.of( MethodDefinition.builder() - .setHeaderCommentStatements(SettingsCommentComposer.NEW_BUILDER_METHOD_COMMENT) + .setHeaderCommentStatements(comment) + .setAnnotations(annotations) .setScope(ScopeNode.PUBLIC) .setIsStatic(true) .setReturnType(builderType) @@ -500,7 +534,8 @@ private List createNestedBuilderClassMethods( List javaMethods = new ArrayList<>(); javaMethods.addAll(createNestedBuilderConstructorMethods(service, typeStore)); javaMethods.addAll( - createNestedBuilderCreatorMethods(service, typeStore, "newBuilder", "createDefault")); + createNestedBuilderCreatorMethods( + service, typeStore, "newBuilder", "createDefault", ImmutableList.of())); javaMethods.add(createNestedBuilderStubSettingsBuilderMethod(service, typeStore)); javaMethods.add(createNestedBuilderApplyToAllUnaryMethod(service, typeStore)); javaMethods.addAll(createNestedBuilderSettingsGetterMethods(service, typeStore)); @@ -591,7 +626,8 @@ protected List createNestedBuilderCreatorMethods( Service service, TypeStore typeStore, String newBuilderMethodName, - String createDefaultMethodName) { + String createDefaultMethodName, + List annotations) { MethodInvocationExpr ctorArg = MethodInvocationExpr.builder() .setStaticReferenceType( @@ -602,6 +638,7 @@ protected List createNestedBuilderCreatorMethods( TypeNode builderType = typeStore.get(BUILDER_CLASS_NAME); return ImmutableList.of( MethodDefinition.builder() + .setAnnotations(annotations) .setScope(ScopeNode.PRIVATE) .setIsStatic(true) .setReturnType(builderType) diff --git a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubSettingsClassComposer.java b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubSettingsClassComposer.java index bfedd5e190..1074173850 100644 --- a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubSettingsClassComposer.java +++ b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractServiceStubSettingsClassComposer.java @@ -249,12 +249,14 @@ protected List createDefaultTransportTransportProviderBuilderM getTransportContext().instantiatingChannelProviderBuilderClasses().iterator(); Iterator builderNamesIt = getTransportContext().defaultTransportProviderBuilderNames().iterator(); + Iterator transportNamesIt = getTransportContext().transportNames().iterator(); List methods = new ArrayList<>(); while (providerClassIt.hasNext() && providerBuilderClassIt.hasNext() - && builderNamesIt.hasNext()) { + && builderNamesIt.hasNext() + && transportNamesIt.hasNext()) { TypeNode returnType = TypeNode.withReference(ConcreteReference.withClazz(providerBuilderClassIt.next())); TypeNode channelProviderType = @@ -269,16 +271,29 @@ protected List createDefaultTransportTransportProviderBuilderM Expr returnExpr = initializeTransportProviderBuilder(transportChannelProviderBuilderExpr, returnType); + List annotations = new ArrayList<>(); + if (!methods.isEmpty()) { + annotations.add(AnnotationNode.builder().setType(FIXED_TYPESTORE.get("BetaApi")).build()); + } + CommentStatement commentStatement = + SettingsCommentComposer.DEFAULT_TRANSPORT_PROVIDER_BUILDER_METHOD_COMMENT; + if (getTransportContext().transportNames().size() > 1) { + commentStatement = + new SettingsCommentComposer(transportNamesIt.next()) + .getTransportProviderBuilderMethodComment(); + } + MethodDefinition method = MethodDefinition.builder() - .setHeaderCommentStatements( - SettingsCommentComposer.DEFAULT_TRANSPORT_PROVIDER_BUILDER_METHOD_COMMENT) + .setHeaderCommentStatements(commentStatement) + .setAnnotations(annotations) .setScope(ScopeNode.PUBLIC) .setIsStatic(true) .setReturnType(returnType) .setName(builderNamesIt.next()) .setReturnExpr(returnExpr) .build(); + methods.add(method); } @@ -981,7 +996,13 @@ private List createClassMethods( createMethodSettingsGetterMethods(methodSettingsMemberVarExprs, deprecatedSettingVarNames)); javaMethods.add(createCreateStubMethod(service, typeStore)); javaMethods.addAll(createDefaultHelperAndGetterMethods(service, typeStore)); - javaMethods.addAll(createNewBuilderMethods(service, typeStore, "newBuilder", "createDefault")); + javaMethods.addAll( + createNewBuilderMethods( + service, + typeStore, + "newBuilder", + "createDefault", + SettingsCommentComposer.NEW_BUILDER_METHOD_COMMENT)); javaMethods.addAll(createBuilderHelperMethods(service, typeStore)); javaMethods.add(createClassConstructor(service, methodSettingsMemberVarExprs, typeStore)); return javaMethods; @@ -1086,15 +1107,8 @@ private MethodDefinition createCreateStubMethod(Service service, TypeStore typeS // Put the method together. TypeNode returnType = typeStore.get(ClassNames.getServiceStubClassName(service)); - AnnotationNode annotation = - AnnotationNode.builder() - .setType(FIXED_TYPESTORE.get("BetaApi")) - .setDescription( - "A restructuring of stub classes is planned, so this may break in the future") - .build(); return MethodDefinition.builder() - .setAnnotations(Arrays.asList(annotation)) .setScope(ScopeNode.PUBLIC) .setReturnType(returnType) .setName("createStub") @@ -1186,12 +1200,13 @@ protected List createNewBuilderMethods( Service service, TypeStore typeStore, String newBuilderMethodName, - String createDefaultMethodName) { + String createDefaultMethodName, + CommentStatement methodComment) { // Create the newBuilder() method. final TypeNode builderReturnType = typeStore.get(NESTED_BUILDER_CLASS_NAME); return ImmutableList.of( MethodDefinition.builder() - .setHeaderCommentStatements(SettingsCommentComposer.NEW_BUILDER_METHOD_COMMENT) + .setHeaderCommentStatements(methodComment) .setScope(ScopeNode.PUBLIC) .setIsStatic(true) .setReturnType(builderReturnType) diff --git a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractTransportServiceStubClassComposer.java b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractTransportServiceStubClassComposer.java index 65307fcb5c..e9d5d6c7c6 100644 --- a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractTransportServiceStubClassComposer.java +++ b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/AbstractTransportServiceStubClassComposer.java @@ -190,7 +190,7 @@ public GapicClass generate(GapicContext context, Service service) { messageTypes); StubCommentComposer commentComposer = - new StubCommentComposer(getTransportContext().transportName()); + new StubCommentComposer(getTransportContext().transportNames().get(0)); ClassDefinition classDef = ClassDefinition.builder() diff --git a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/TransportContext.java b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/TransportContext.java index b87644c8ae..ab98a86b18 100644 --- a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/TransportContext.java +++ b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/common/TransportContext.java @@ -30,8 +30,7 @@ public abstract class TransportContext { // For AbstractServiceStubClassComposer public abstract Transport transport(); - @Nullable - public abstract String transportName(); + public abstract List transportNames(); @Nullable public abstract Class callSettingsClass(); @@ -98,7 +97,7 @@ public abstract static class Builder { public abstract Builder setTransport(Transport transport); - public abstract Builder setTransportName(String value); + public abstract Builder setTransportNames(List values); public abstract Builder setCallSettingsClass(Class callSettingsClass); diff --git a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/GrpcContext.java b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/GrpcContext.java index f8df523fa3..8874e128e9 100644 --- a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/GrpcContext.java +++ b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpc/GrpcContext.java @@ -34,7 +34,7 @@ public abstract class GrpcContext extends TransportContext { GrpcContext.builder() .setClassNames(new ClassNames("Grpc")) .setTransport(Transport.GRPC) - .setTransportName("gRPC") + .setTransportNames(ImmutableList.of("gRPC")) // For grpc.GrpcServiceStubClassComposer .setCallSettingsClass(GrpcCallSettings.class) .setStubCallableFactoryType(classToType(GrpcStubCallableFactory.class)) diff --git a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpcrest/GrpcRestContext.java b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpcrest/GrpcRestContext.java index 2b52699f72..f383fa7d1b 100644 --- a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpcrest/GrpcRestContext.java +++ b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpcrest/GrpcRestContext.java @@ -33,7 +33,7 @@ public abstract class GrpcRestContext extends TransportContext { GrpcRestContext.builder() .setClassNames(new ClassNames("Grpc", "HttpJson")) .setTransport(Transport.GRPC_REST) - .setTransportName(null) + .setTransportNames(ImmutableList.of("gRPC", "REST")) // For grpcrest.GrpcServiceStubClassComposer .setCallSettingsClass(null) .setStubCallableFactoryType(null) diff --git a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpcrest/ServiceSettingsClassComposer.java b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpcrest/ServiceSettingsClassComposer.java index 03ff5dc54a..3b48a45958 100644 --- a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpcrest/ServiceSettingsClassComposer.java +++ b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpcrest/ServiceSettingsClassComposer.java @@ -14,11 +14,16 @@ package com.google.api.generator.gapic.composer.grpcrest; +import com.google.api.generator.engine.ast.AnnotationNode; +import com.google.api.generator.engine.ast.CommentStatement; import com.google.api.generator.engine.ast.MethodDefinition; +import com.google.api.generator.gapic.composer.comment.SettingsCommentComposer; import com.google.api.generator.gapic.composer.common.AbstractServiceSettingsClassComposer; import com.google.api.generator.gapic.composer.store.TypeStore; import com.google.api.generator.gapic.model.Service; +import com.google.common.collect.ImmutableList; import java.util.ArrayList; +import java.util.Iterator; import java.util.List; public class ServiceSettingsClassComposer extends AbstractServiceSettingsClassComposer { @@ -37,14 +42,25 @@ protected List createNestedBuilderCreatorMethods( Service service, TypeStore typeStore, String newBuilderMethodName, - String createDefaultMethodName) { + String createDefaultMethodName, + List annotations) { List methods = new ArrayList<>(); + AnnotationNode betaApiAnnotaiton = + AnnotationNode.builder().setType(FIXED_TYPESTORE.get("BetaApi")).build(); methods.addAll( - super.createNestedBuilderCreatorMethods(service, typeStore, "newBuilder", "createDefault")); + super.createNestedBuilderCreatorMethods( + service, typeStore, "newBuilder", "createDefault", annotations)); methods.addAll( super.createNestedBuilderCreatorMethods( - service, typeStore, "newHttpJsonBuilder", "createHttpJsonDefault")); + service, + typeStore, + "newHttpJsonBuilder", + "createHttpJsonDefault", + ImmutableList.builder() + .addAll(annotations) + .add(betaApiAnnotaiton) + .build())); return methods; } @@ -54,14 +70,37 @@ protected List createNewBuilderMethods( Service service, TypeStore typeStore, String newBuilderMethodName, - String createDefaultMethodName) { + String createDefaultMethodName, + List annotations, + CommentStatement comment) { List methods = new ArrayList<>(); + AnnotationNode betaApiAnnotaiton = + AnnotationNode.builder().setType(FIXED_TYPESTORE.get("BetaApi")).build(); + + Iterator transportNames = getTransportContext().transportNames().iterator(); + methods.addAll( - super.createNewBuilderMethods(service, typeStore, "newBuilder", "createDefault")); + super.createNewBuilderMethods( + service, + typeStore, + "newBuilder", + "createDefault", + annotations, + new SettingsCommentComposer(transportNames.next()) + .getNewTransportBuilderMethodComment())); methods.addAll( super.createNewBuilderMethods( - service, typeStore, "newHttpJsonBuilder", "createHttpJsonDefault")); + service, + typeStore, + "newHttpJsonBuilder", + "createHttpJsonDefault", + ImmutableList.builder() + .addAll(annotations) + .add(betaApiAnnotaiton) + .build(), + new SettingsCommentComposer(transportNames.next()) + .getNewTransportBuilderMethodComment())); return methods; } diff --git a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpcrest/ServiceStubSettingsClassComposer.java b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpcrest/ServiceStubSettingsClassComposer.java index 6f65ced39c..84adf3598a 100644 --- a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpcrest/ServiceStubSettingsClassComposer.java +++ b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/grpcrest/ServiceStubSettingsClassComposer.java @@ -18,6 +18,7 @@ import com.google.api.gax.grpc.GaxGrpcProperties; import com.google.api.gax.httpjson.GaxHttpJsonProperties; import com.google.api.gax.rpc.ApiClientHeaderProvider; +import com.google.api.generator.engine.ast.CommentStatement; import com.google.api.generator.engine.ast.ConcreteReference; import com.google.api.generator.engine.ast.Expr; import com.google.api.generator.engine.ast.MethodDefinition; @@ -35,6 +36,7 @@ import com.google.api.generator.gapic.model.Service; import com.google.common.collect.ImmutableList; import java.util.ArrayList; +import java.util.Iterator; import java.util.List; public class ServiceStubSettingsClassComposer extends AbstractServiceStubSettingsClassComposer { @@ -188,13 +190,26 @@ protected List createNewBuilderMethods( Service service, TypeStore typeStore, String newBuilderMethodName, - String createDefaultMethodName) { + String createDefaultMethodName, + CommentStatement methodComment) { List methods = new ArrayList<>(); + Iterator transportNames = getTransportContext().transportNames().iterator(); methods.addAll( - super.createNewBuilderMethods(service, typeStore, "newBuilder", "createDefault")); + super.createNewBuilderMethods( + service, + typeStore, + "newBuilder", + "createDefault", + new SettingsCommentComposer(transportNames.next()) + .getNewTransportBuilderMethodComment())); methods.addAll( super.createNewBuilderMethods( - service, typeStore, "newHttpJsonBuilder", "createHttpJsonDefault")); + service, + typeStore, + "newHttpJsonBuilder", + "createHttpJsonDefault", + new SettingsCommentComposer(transportNames.next()) + .getNewTransportBuilderMethodComment())); return methods; } } diff --git a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceStubClassComposer.java b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceStubClassComposer.java index 3fe0af3df1..f02ca75deb 100644 --- a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceStubClassComposer.java +++ b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/rest/HttpJsonServiceStubClassComposer.java @@ -240,12 +240,12 @@ protected Expr createTransportSettingsInitExpr( protected List createClassAnnotations(Service service) { List annotations = super.createClassAnnotations(service); - annotations.add( - AnnotationNode.builder() - .setType(FIXED_TYPESTORE.get("BetaApi")) - .setDescription( - "A restructuring of stub classes is planned, so this may break in the future") - .build()); + TypeNode betaApiType = FIXED_TYPESTORE.get("BetaApi"); + + if (annotations.stream().noneMatch(a -> betaApiType.equals(a.type()))) { + annotations.add(AnnotationNode.builder().setType(betaApiType).build()); + } + return annotations; } diff --git a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/rest/RestContext.java b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/rest/RestContext.java index fd88157ee5..f4a844c338 100644 --- a/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/rest/RestContext.java +++ b/gapic-generator-java/src/main/java/com/google/api/generator/gapic/composer/rest/RestContext.java @@ -34,7 +34,7 @@ public abstract class RestContext extends TransportContext { RestContext.builder() .setClassNames(new ClassNames("HttpJson")) .setTransport(Transport.REST) - .setTransportName("REST") + .setTransportNames(ImmutableList.of("REST")) // For httpjson.HttpJsonServiceStubClassComposer .setCallSettingsClass(HttpJsonCallSettings.class) .setStubCallableFactoryType(classToType(HttpJsonStubCallableFactory.class)) diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/BookshopClient.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/BookshopClient.golden index 70c66dc794..3afb4d32a2 100644 --- a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/BookshopClient.golden +++ b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/BookshopClient.golden @@ -98,7 +98,6 @@ public class BookshopClient implements BackgroundResource { * Constructs an instance of BookshopClient, using the given stub for making calls. This is for * advanced usage - prefer using create(BookshopSettings). */ - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public static final BookshopClient create(BookshopStub stub) { return new BookshopClient(stub); } @@ -112,7 +111,6 @@ public class BookshopClient implements BackgroundResource { this.stub = ((BookshopStubSettings) settings.getStubSettings()).createStub(); } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") protected BookshopClient(BookshopStub stub) { this.settings = null; this.stub = stub; @@ -122,7 +120,6 @@ public class BookshopClient implements BackgroundResource { return settings; } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public BookshopStub getStub() { return stub; } diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/DeprecatedServiceClient.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/DeprecatedServiceClient.golden index 4e5cbaad3f..d060da2118 100644 --- a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/DeprecatedServiceClient.golden +++ b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/DeprecatedServiceClient.golden @@ -1,6 +1,5 @@ package com.google.testdata.v1; -import com.google.api.core.BetaApi; import com.google.api.gax.core.BackgroundResource; import com.google.api.gax.rpc.UnaryCallable; import com.google.protobuf.Empty; @@ -103,7 +102,6 @@ public class DeprecatedServiceClient implements BackgroundResource { * Constructs an instance of DeprecatedServiceClient, using the given stub for making calls. This * is for advanced usage - prefer using create(DeprecatedServiceSettings). */ - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public static final DeprecatedServiceClient create(DeprecatedServiceStub stub) { return new DeprecatedServiceClient(stub); } @@ -118,7 +116,6 @@ public class DeprecatedServiceClient implements BackgroundResource { this.stub = ((DeprecatedServiceStubSettings) settings.getStubSettings()).createStub(); } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") protected DeprecatedServiceClient(DeprecatedServiceStub stub) { this.settings = null; this.stub = stub; @@ -128,7 +125,6 @@ public class DeprecatedServiceClient implements BackgroundResource { return settings; } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public DeprecatedServiceStub getStub() { return stub; } diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/DeprecatedServiceStubSettings.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/DeprecatedServiceStubSettings.golden index 8ace8d9fde..edd591e115 100644 --- a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/DeprecatedServiceStubSettings.golden +++ b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/DeprecatedServiceStubSettings.golden @@ -88,7 +88,6 @@ public class DeprecatedServiceStubSettings extends StubSettings { return collideNameSettings; } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public EchoStub createStub() throws IOException { if (getTransportChannelProvider() .getTransportName() diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/IdentityClient.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/IdentityClient.golden index 36a0848d94..cdf81bbdc5 100644 --- a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/IdentityClient.golden +++ b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/IdentityClient.golden @@ -107,7 +107,6 @@ public class IdentityClient implements BackgroundResource { * Constructs an instance of IdentityClient, using the given stub for making calls. This is for * advanced usage - prefer using create(IdentitySettings). */ - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public static final IdentityClient create(IdentityStub stub) { return new IdentityClient(stub); } @@ -121,7 +120,6 @@ public class IdentityClient implements BackgroundResource { this.stub = ((IdentityStubSettings) settings.getStubSettings()).createStub(); } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") protected IdentityClient(IdentityStub stub) { this.settings = null; this.stub = stub; @@ -131,7 +129,6 @@ public class IdentityClient implements BackgroundResource { return settings; } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public IdentityStub getStub() { return stub; } diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/LoggingServiceV2StubSettings.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/LoggingServiceV2StubSettings.golden index c19e424304..bf0e8a54ca 100644 --- a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/LoggingServiceV2StubSettings.golden +++ b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpc/goldens/LoggingServiceV2StubSettings.golden @@ -408,7 +408,6 @@ public class LoggingServiceV2StubSettings extends StubSettings { return detachSubscriptionSettings; } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public PublisherStub createStub() throws IOException { if (getTransportChannelProvider() .getTransportName() diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/ServiceStubSettingsClassComposerTest.java b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/ServiceStubSettingsClassComposerTest.java new file mode 100644 index 0000000000..1035aa1d85 --- /dev/null +++ b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/ServiceStubSettingsClassComposerTest.java @@ -0,0 +1,40 @@ +// Copyright 2022 Google LLC +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +// See the License for the specific language governing permissions and +// limitations under the License. + +package com.google.api.generator.gapic.composer.grpcrest; + +import com.google.api.generator.engine.writer.JavaWriterVisitor; +import com.google.api.generator.gapic.model.GapicClass; +import com.google.api.generator.gapic.model.GapicContext; +import com.google.api.generator.gapic.model.Service; +import com.google.api.generator.test.framework.Assert; +import com.google.api.generator.test.framework.Utils; +import java.nio.file.Path; +import java.nio.file.Paths; +import org.junit.Test; + +public class ServiceStubSettingsClassComposerTest { + @Test + public void generateServiceClasses() { + GapicContext context = GrpcRestTestProtoLoader.instance().parseShowcaseEcho(); + Service echoProtoService = context.services().get(0); + GapicClass clazz = ServiceSettingsClassComposer.instance().generate(context, echoProtoService); + + JavaWriterVisitor visitor = new JavaWriterVisitor(); + clazz.classDefinition().accept(visitor); + Utils.saveCodegenToFile(this.getClass(), "EchoStubSettings.golden", visitor.write()); + Path goldenFilePath = Paths.get(Utils.getGoldenDir(this.getClass()), "EchoStubSettings.golden"); + Assert.assertCodeEquals(goldenFilePath, visitor.write()); + } +} diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoClient.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoClient.golden index b54b8bbb64..d98a99ae95 100644 --- a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoClient.golden +++ b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoClient.golden @@ -127,7 +127,6 @@ public class EchoClient implements BackgroundResource { * Constructs an instance of EchoClient, using the given stub for making calls. This is for * advanced usage - prefer using create(EchoSettings). */ - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public static final EchoClient create(EchoStub stub) { return new EchoClient(stub); } @@ -144,7 +143,6 @@ public class EchoClient implements BackgroundResource { this.httpJsonOperationsClient = OperationsClient.create(this.stub.getHttpJsonOperationsStub()); } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") protected EchoClient(EchoStub stub) { this.settings = null; this.stub = stub; @@ -157,7 +155,6 @@ public class EchoClient implements BackgroundResource { return settings; } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public EchoStub getStub() { return stub; } diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoEmpty.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoEmpty.golden index 95547b9cee..4e1cae4e5c 100644 --- a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoEmpty.golden +++ b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoEmpty.golden @@ -106,7 +106,6 @@ public class EchoEmpyClient implements BackgroundResource { * Constructs an instance of EchoEmpyClient, using the given stub for making calls. This is for * advanced usage - prefer using create(EchoEmpySettings). */ - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public static final EchoEmpyClient create(EchoEmpyStub stub) { return new EchoEmpyClient(stub); } @@ -120,7 +119,6 @@ public class EchoEmpyClient implements BackgroundResource { this.stub = ((EchoEmpyStubSettings) settings.getStubSettings()).createStub(); } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") protected EchoEmpyClient(EchoEmpyStub stub) { this.settings = null; this.stub = stub; @@ -130,7 +128,6 @@ public class EchoEmpyClient implements BackgroundResource { return settings; } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public EchoEmpyStub getStub() { return stub; } diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoSettings.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoSettings.golden index b3c9486aea..fa61fd6819 100644 --- a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoSettings.golden +++ b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoSettings.golden @@ -127,12 +127,13 @@ public class EchoSettings extends ClientSettings { return EchoStubSettings.defaultCredentialsProviderBuilder(); } - /** Returns a builder for the default ChannelProvider for this service. */ + /** Returns a builder for the default gRPC ChannelProvider for this service. */ public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() { return EchoStubSettings.defaultGrpcTransportProviderBuilder(); } - /** Returns a builder for the default ChannelProvider for this service. */ + /** Returns a builder for the default REST ChannelProvider for this service. */ + @BetaApi public static InstantiatingHttpJsonChannelProvider.Builder defaultHttpJsonTransportProviderBuilder() { return EchoStubSettings.defaultHttpJsonTransportProviderBuilder(); @@ -147,12 +148,13 @@ public class EchoSettings extends ClientSettings { return EchoStubSettings.defaultApiClientHeaderProviderBuilder(); } - /** Returns a new builder for this class. */ + /** Returns a new gRPC builder for this class. */ public static Builder newBuilder() { return Builder.createDefault(); } - /** Returns a new builder for this class. */ + /** Returns a new REST builder for this class. */ + @BetaApi public static Builder newHttpJsonBuilder() { return Builder.createHttpJsonDefault(); } @@ -194,6 +196,7 @@ public class EchoSettings extends ClientSettings { return new Builder(EchoStubSettings.newBuilder()); } + @BetaApi private static Builder createHttpJsonDefault() { return new Builder(EchoStubSettings.newHttpJsonBuilder()); } diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoStubSettings.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoStubSettings.golden new file mode 100644 index 0000000000..fa61fd6819 --- /dev/null +++ b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/EchoStubSettings.golden @@ -0,0 +1,270 @@ +package com.google.showcase.grpcrest.v1beta1; + +import static com.google.showcase.grpcrest.v1beta1.EchoClient.PagedExpandPagedResponse; +import static com.google.showcase.grpcrest.v1beta1.EchoClient.SimplePagedExpandPagedResponse; + +import com.google.api.core.ApiFunction; +import com.google.api.core.BetaApi; +import com.google.api.gax.core.GoogleCredentialsProvider; +import com.google.api.gax.core.InstantiatingExecutorProvider; +import com.google.api.gax.grpc.InstantiatingGrpcChannelProvider; +import com.google.api.gax.httpjson.InstantiatingHttpJsonChannelProvider; +import com.google.api.gax.rpc.ApiClientHeaderProvider; +import com.google.api.gax.rpc.ClientContext; +import com.google.api.gax.rpc.ClientSettings; +import com.google.api.gax.rpc.OperationCallSettings; +import com.google.api.gax.rpc.PagedCallSettings; +import com.google.api.gax.rpc.ServerStreamingCallSettings; +import com.google.api.gax.rpc.StubSettings; +import com.google.api.gax.rpc.TransportChannelProvider; +import com.google.api.gax.rpc.UnaryCallSettings; +import com.google.longrunning.Operation; +import com.google.showcase.grpcrest.v1beta1.stub.EchoStubSettings; +import java.io.IOException; +import java.util.List; +import javax.annotation.Generated; + +// AUTO-GENERATED DOCUMENTATION AND CLASS. +/** + * Settings class to configure an instance of {@link EchoClient}. + * + *

The default instance has everything set to sensible defaults: + * + *

    + *
  • The default service address (localhost) and default port (7469) are used. + *
  • Credentials are acquired automatically through Application Default Credentials. + *
  • Retries are configured for idempotent methods but not for non-idempotent methods. + *
+ * + *

The builder of this class is recursive, so contained classes are themselves builders. When + * build() is called, the tree of builders is called to create the complete settings object. + * + *

For example, to set the total timeout of echo to 30 seconds: + * + * 

{@code
+ * // This snippet has been automatically generated for illustrative purposes only.
+ * // It may require modifications to work in your environment.
+ * EchoSettings.Builder echoSettingsBuilder = EchoSettings.newBuilder();
+ * echoSettingsBuilder
+ *     .echoSettings()
+ *     .setRetrySettings(
+ *         echoSettingsBuilder
+ *             .echoSettings()
+ *             .getRetrySettings()
+ *             .toBuilder()
+ *             .setTotalTimeout(Duration.ofSeconds(30))
+ *             .build());
+ * EchoSettings echoSettings = echoSettingsBuilder.build();
+ * }
+ */ +@BetaApi +@Generated("by gapic-generator-java") +public class EchoSettings extends ClientSettings { + + /** Returns the object with the settings used for calls to echo. */ + public UnaryCallSettings echoSettings() { + return ((EchoStubSettings) getStubSettings()).echoSettings(); + } + + /** Returns the object with the settings used for calls to expand. */ + public ServerStreamingCallSettings expandSettings() { + return ((EchoStubSettings) getStubSettings()).expandSettings(); + } + + /** Returns the object with the settings used for calls to pagedExpand. */ + public PagedCallSettings + pagedExpandSettings() { + return ((EchoStubSettings) getStubSettings()).pagedExpandSettings(); + } + + /** Returns the object with the settings used for calls to simplePagedExpand. */ + public PagedCallSettings + simplePagedExpandSettings() { + return ((EchoStubSettings) getStubSettings()).simplePagedExpandSettings(); + } + + /** Returns the object with the settings used for calls to wait. */ + public UnaryCallSettings waitSettings() { + return ((EchoStubSettings) getStubSettings()).waitSettings(); + } + + /** Returns the object with the settings used for calls to wait. */ + public OperationCallSettings waitOperationSettings() { + return ((EchoStubSettings) getStubSettings()).waitOperationSettings(); + } + + /** Returns the object with the settings used for calls to block. */ + public UnaryCallSettings blockSettings() { + return ((EchoStubSettings) getStubSettings()).blockSettings(); + } + + /** Returns the object with the settings used for calls to collideName. */ + public UnaryCallSettings collideNameSettings() { + return ((EchoStubSettings) getStubSettings()).collideNameSettings(); + } + + public static final EchoSettings create(EchoStubSettings stub) throws IOException { + return new EchoSettings.Builder(stub.toBuilder()).build(); + } + + /** Returns a builder for the default ExecutorProvider for this service. */ + public static InstantiatingExecutorProvider.Builder defaultExecutorProviderBuilder() { + return EchoStubSettings.defaultExecutorProviderBuilder(); + } + + /** Returns the default service endpoint. */ + public static String getDefaultEndpoint() { + return EchoStubSettings.getDefaultEndpoint(); + } + + /** Returns the default service scopes. */ + public static List getDefaultServiceScopes() { + return EchoStubSettings.getDefaultServiceScopes(); + } + + /** Returns a builder for the default credentials for this service. */ + public static GoogleCredentialsProvider.Builder defaultCredentialsProviderBuilder() { + return EchoStubSettings.defaultCredentialsProviderBuilder(); + } + + /** Returns a builder for the default gRPC ChannelProvider for this service. */ + public static InstantiatingGrpcChannelProvider.Builder defaultGrpcTransportProviderBuilder() { + return EchoStubSettings.defaultGrpcTransportProviderBuilder(); + } + + /** Returns a builder for the default REST ChannelProvider for this service. */ + @BetaApi + public static InstantiatingHttpJsonChannelProvider.Builder + defaultHttpJsonTransportProviderBuilder() { + return EchoStubSettings.defaultHttpJsonTransportProviderBuilder(); + } + + public static TransportChannelProvider defaultTransportChannelProvider() { + return EchoStubSettings.defaultTransportChannelProvider(); + } + + @BetaApi("The surface for customizing headers is not stable yet and may change in the future.") + public static ApiClientHeaderProvider.Builder defaultApiClientHeaderProviderBuilder() { + return EchoStubSettings.defaultApiClientHeaderProviderBuilder(); + } + + /** Returns a new gRPC builder for this class. */ + public static Builder newBuilder() { + return Builder.createDefault(); + } + + /** Returns a new REST builder for this class. */ + @BetaApi + public static Builder newHttpJsonBuilder() { + return Builder.createHttpJsonDefault(); + } + + /** Returns a new builder for this class. */ + public static Builder newBuilder(ClientContext clientContext) { + return new Builder(clientContext); + } + + /** Returns a builder containing all the values of this settings class. */ + public Builder toBuilder() { + return new Builder(this); + } + + protected EchoSettings(Builder settingsBuilder) throws IOException { + super(settingsBuilder); + } + + /** Builder for EchoSettings. */ + public static class Builder extends ClientSettings.Builder { + + protected Builder() throws IOException { + this(((ClientContext) null)); + } + + protected Builder(ClientContext clientContext) { + super(EchoStubSettings.newBuilder(clientContext)); + } + + protected Builder(EchoSettings settings) { + super(settings.getStubSettings().toBuilder()); + } + + protected Builder(EchoStubSettings.Builder stubSettings) { + super(stubSettings); + } + + private static Builder createDefault() { + return new Builder(EchoStubSettings.newBuilder()); + } + + @BetaApi + private static Builder createHttpJsonDefault() { + return new Builder(EchoStubSettings.newHttpJsonBuilder()); + } + + public EchoStubSettings.Builder getStubSettingsBuilder() { + return ((EchoStubSettings.Builder) getStubSettings()); + } + + /** + * Applies the given settings updater function to all of the unary API methods in this service. + * + *

Note: This method does not support applying settings to streaming methods. + */ + public Builder applyToAllUnaryMethods( + ApiFunction, Void> settingsUpdater) { + super.applyToAllUnaryMethods( + getStubSettingsBuilder().unaryMethodSettingsBuilders(), settingsUpdater); + return this; + } + + /** Returns the builder for the settings used for calls to echo. */ + public UnaryCallSettings.Builder echoSettings() { + return getStubSettingsBuilder().echoSettings(); + } + + /** Returns the builder for the settings used for calls to expand. */ + public ServerStreamingCallSettings.Builder expandSettings() { + return getStubSettingsBuilder().expandSettings(); + } + + /** Returns the builder for the settings used for calls to pagedExpand. */ + public PagedCallSettings.Builder< + PagedExpandRequest, PagedExpandResponse, PagedExpandPagedResponse> + pagedExpandSettings() { + return getStubSettingsBuilder().pagedExpandSettings(); + } + + /** Returns the builder for the settings used for calls to simplePagedExpand. */ + public PagedCallSettings.Builder< + PagedExpandRequest, PagedExpandResponse, SimplePagedExpandPagedResponse> + simplePagedExpandSettings() { + return getStubSettingsBuilder().simplePagedExpandSettings(); + } + + /** Returns the builder for the settings used for calls to wait. */ + public UnaryCallSettings.Builder waitSettings() { + return getStubSettingsBuilder().waitSettings(); + } + + /** Returns the builder for the settings used for calls to wait. */ + public OperationCallSettings.Builder + waitOperationSettings() { + return getStubSettingsBuilder().waitOperationSettings(); + } + + /** Returns the builder for the settings used for calls to block. */ + public UnaryCallSettings.Builder blockSettings() { + return getStubSettingsBuilder().blockSettings(); + } + + /** Returns the builder for the settings used for calls to collideName. */ + public UnaryCallSettings.Builder collideNameSettings() { + return getStubSettingsBuilder().collideNameSettings(); + } + + @Override + public EchoSettings build() throws IOException { + return new EchoSettings(this); + } + } +} diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/HttpJsonEchoStub.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/HttpJsonEchoStub.golden index 1796b414b7..1660428fea 100644 --- a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/HttpJsonEchoStub.golden +++ b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/grpcrest/goldens/HttpJsonEchoStub.golden @@ -50,7 +50,6 @@ import javax.annotation.Generated; */ @BetaApi @Generated("by gapic-generator-java") -@BetaApi("A restructuring of stub classes is planned, so this may break in the future") public class HttpJsonEchoStub extends EchoStub { private static final TypeRegistry typeRegistry = TypeRegistry.newBuilder() diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/ComplianceStubSettings.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/ComplianceStubSettings.golden index 7fd6d0bc34..1709498e09 100644 --- a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/ComplianceStubSettings.golden +++ b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/ComplianceStubSettings.golden @@ -103,7 +103,6 @@ public class ComplianceStubSettings extends StubSettings return repeatDataPathTrailingResourceSettings; } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public ComplianceStub createStub() throws IOException { if (getTransportChannelProvider() .getTransportName() diff --git a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/HttpJsonComplianceStub.golden b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/HttpJsonComplianceStub.golden index 8744b02704..1c9ca0f31a 100644 --- a/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/HttpJsonComplianceStub.golden +++ b/gapic-generator-java/src/test/java/com/google/api/generator/gapic/composer/rest/goldens/HttpJsonComplianceStub.golden @@ -32,7 +32,6 @@ import javax.annotation.Generated; */ @BetaApi @Generated("by gapic-generator-java") -@BetaApi("A restructuring of stub classes is planned, so this may break in the future") public class HttpJsonComplianceStub extends ComplianceStub { private static final TypeRegistry typeRegistry = TypeRegistry.newBuilder().build(); diff --git a/gapic-generator-java/test/integration/goldens/asset/src/com/google/cloud/asset/v1/AssetServiceClient.java b/gapic-generator-java/test/integration/goldens/asset/src/com/google/cloud/asset/v1/AssetServiceClient.java index 501a2c124d..6277dc6f88 100644 --- a/gapic-generator-java/test/integration/goldens/asset/src/com/google/cloud/asset/v1/AssetServiceClient.java +++ b/gapic-generator-java/test/integration/goldens/asset/src/com/google/cloud/asset/v1/AssetServiceClient.java @@ -18,7 +18,6 @@ import com.google.api.core.ApiFuture; import com.google.api.core.ApiFutures; -import com.google.api.core.BetaApi; import com.google.api.gax.core.BackgroundResource; import com.google.api.gax.longrunning.OperationFuture; import com.google.api.gax.paging.AbstractFixedSizeCollection; @@ -135,7 +134,6 @@ public static final AssetServiceClient create(AssetServiceSettings settings) thr * Constructs an instance of AssetServiceClient, using the given stub for making calls. This is * for advanced usage - prefer using create(AssetServiceSettings). */ - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public static final AssetServiceClient create(AssetServiceStub stub) { return new AssetServiceClient(stub); } @@ -151,7 +149,6 @@ protected AssetServiceClient(AssetServiceSettings settings) throws IOException { this.operationsClient = OperationsClient.create(this.stub.getOperationsStub()); } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") protected AssetServiceClient(AssetServiceStub stub) { this.settings = null; this.stub = stub; @@ -162,7 +159,6 @@ public final AssetServiceSettings getSettings() { return settings; } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public AssetServiceStub getStub() { return stub; } diff --git a/gapic-generator-java/test/integration/goldens/asset/src/com/google/cloud/asset/v1/stub/AssetServiceStubSettings.java b/gapic-generator-java/test/integration/goldens/asset/src/com/google/cloud/asset/v1/stub/AssetServiceStubSettings.java index 842073522f..a2c2b821cd 100644 --- a/gapic-generator-java/test/integration/goldens/asset/src/com/google/cloud/asset/v1/stub/AssetServiceStubSettings.java +++ b/gapic-generator-java/test/integration/goldens/asset/src/com/google/cloud/asset/v1/stub/AssetServiceStubSettings.java @@ -429,7 +429,6 @@ public UnaryCallSettings analyzeMoveSet return analyzeMoveSettings; } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public AssetServiceStub createStub() throws IOException { if (getTransportChannelProvider() .getTransportName() diff --git a/gapic-generator-java/test/integration/goldens/bigtable/src/com/google/cloud/bigtable/data/v2/BaseBigtableDataClient.java b/gapic-generator-java/test/integration/goldens/bigtable/src/com/google/cloud/bigtable/data/v2/BaseBigtableDataClient.java index b1543dcdca..35511f399e 100644 --- a/gapic-generator-java/test/integration/goldens/bigtable/src/com/google/cloud/bigtable/data/v2/BaseBigtableDataClient.java +++ b/gapic-generator-java/test/integration/goldens/bigtable/src/com/google/cloud/bigtable/data/v2/BaseBigtableDataClient.java @@ -16,7 +16,6 @@ package com.google.cloud.bigtable.data.v2; -import com.google.api.core.BetaApi; import com.google.api.gax.core.BackgroundResource; import com.google.api.gax.rpc.ServerStreamingCallable; import com.google.api.gax.rpc.UnaryCallable; @@ -138,7 +137,6 @@ public static final BaseBigtableDataClient create(BaseBigtableDataSettings setti * Constructs an instance of BaseBigtableDataClient, using the given stub for making calls. This * is for advanced usage - prefer using create(BaseBigtableDataSettings). */ - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public static final BaseBigtableDataClient create(BigtableStub stub) { return new BaseBigtableDataClient(stub); } @@ -153,7 +151,6 @@ protected BaseBigtableDataClient(BaseBigtableDataSettings settings) throws IOExc this.stub = ((BigtableStubSettings) settings.getStubSettings()).createStub(); } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") protected BaseBigtableDataClient(BigtableStub stub) { this.settings = null; this.stub = stub; @@ -163,7 +160,6 @@ public final BaseBigtableDataSettings getSettings() { return settings; } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public BigtableStub getStub() { return stub; } diff --git a/gapic-generator-java/test/integration/goldens/bigtable/src/com/google/cloud/bigtable/data/v2/stub/BigtableStubSettings.java b/gapic-generator-java/test/integration/goldens/bigtable/src/com/google/cloud/bigtable/data/v2/stub/BigtableStubSettings.java index 9489b80f91..603cb49e2d 100644 --- a/gapic-generator-java/test/integration/goldens/bigtable/src/com/google/cloud/bigtable/data/v2/stub/BigtableStubSettings.java +++ b/gapic-generator-java/test/integration/goldens/bigtable/src/com/google/cloud/bigtable/data/v2/stub/BigtableStubSettings.java @@ -144,7 +144,6 @@ public ServerStreamingCallSettings mutate return readModifyWriteRowSettings; } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public BigtableStub createStub() throws IOException { if (getTransportChannelProvider() .getTransportName() diff --git a/gapic-generator-java/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/AddressesClient.java b/gapic-generator-java/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/AddressesClient.java index 579e8a9336..564bd1b461 100644 --- a/gapic-generator-java/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/AddressesClient.java +++ b/gapic-generator-java/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/AddressesClient.java @@ -129,7 +129,6 @@ public static final AddressesClient create(AddressesSettings settings) throws IO * Constructs an instance of AddressesClient, using the given stub for making calls. This is for * advanced usage - prefer using create(AddressesSettings). */ - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public static final AddressesClient create(AddressesStub stub) { return new AddressesClient(stub); } @@ -143,7 +142,6 @@ protected AddressesClient(AddressesSettings settings) throws IOException { this.stub = ((AddressesStubSettings) settings.getStubSettings()).createStub(); } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") protected AddressesClient(AddressesStub stub) { this.settings = null; this.stub = stub; @@ -153,7 +151,6 @@ public final AddressesSettings getSettings() { return settings; } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public AddressesStub getStub() { return stub; } diff --git a/gapic-generator-java/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/RegionOperationsClient.java b/gapic-generator-java/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/RegionOperationsClient.java index dcec18f5b3..1b1bedac90 100644 --- a/gapic-generator-java/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/RegionOperationsClient.java +++ b/gapic-generator-java/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/RegionOperationsClient.java @@ -16,7 +16,6 @@ package com.google.cloud.compute.v1small; -import com.google.api.core.BetaApi; import com.google.api.gax.core.BackgroundResource; import com.google.api.gax.rpc.UnaryCallable; import com.google.cloud.compute.v1small.stub.RegionOperationsStub; @@ -119,7 +118,6 @@ public static final RegionOperationsClient create(RegionOperationsSettings setti * Constructs an instance of RegionOperationsClient, using the given stub for making calls. This * is for advanced usage - prefer using create(RegionOperationsSettings). */ - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public static final RegionOperationsClient create(RegionOperationsStub stub) { return new RegionOperationsClient(stub); } @@ -134,7 +132,6 @@ protected RegionOperationsClient(RegionOperationsSettings settings) throws IOExc this.stub = ((RegionOperationsStubSettings) settings.getStubSettings()).createStub(); } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") protected RegionOperationsClient(RegionOperationsStub stub) { this.settings = null; this.stub = stub; @@ -144,7 +141,6 @@ public final RegionOperationsSettings getSettings() { return settings; } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public RegionOperationsStub getStub() { return stub; } diff --git a/gapic-generator-java/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/AddressesStubSettings.java b/gapic-generator-java/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/AddressesStubSettings.java index d870e63477..fb12d1ca5d 100644 --- a/gapic-generator-java/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/AddressesStubSettings.java +++ b/gapic-generator-java/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/AddressesStubSettings.java @@ -275,7 +275,6 @@ public PagedCallSettings l return listSettings; } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public AddressesStub createStub() throws IOException { if (getTransportChannelProvider() .getTransportName() diff --git a/gapic-generator-java/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/HttpJsonAddressesStub.java b/gapic-generator-java/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/HttpJsonAddressesStub.java index d2a05bcb76..cf65b0a01d 100644 --- a/gapic-generator-java/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/HttpJsonAddressesStub.java +++ b/gapic-generator-java/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/HttpJsonAddressesStub.java @@ -59,7 +59,7 @@ *

This class is for advanced usage and reflects the underlying API directly. */ @Generated("by gapic-generator-java") -@BetaApi("A restructuring of stub classes is planned, so this may break in the future") +@BetaApi public class HttpJsonAddressesStub extends AddressesStub { private static final TypeRegistry typeRegistry = TypeRegistry.newBuilder().add(Operation.getDescriptor()).build(); diff --git a/gapic-generator-java/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/HttpJsonRegionOperationsStub.java b/gapic-generator-java/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/HttpJsonRegionOperationsStub.java index 37828e1bb7..6a0ed35356 100644 --- a/gapic-generator-java/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/HttpJsonRegionOperationsStub.java +++ b/gapic-generator-java/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/HttpJsonRegionOperationsStub.java @@ -54,7 +54,7 @@ *

This class is for advanced usage and reflects the underlying API directly. */ @Generated("by gapic-generator-java") -@BetaApi("A restructuring of stub classes is planned, so this may break in the future") +@BetaApi public class HttpJsonRegionOperationsStub extends RegionOperationsStub { private static final TypeRegistry typeRegistry = TypeRegistry.newBuilder().build(); diff --git a/gapic-generator-java/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/RegionOperationsStubSettings.java b/gapic-generator-java/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/RegionOperationsStubSettings.java index 83ba9319e1..22a3a8ab15 100644 --- a/gapic-generator-java/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/RegionOperationsStubSettings.java +++ b/gapic-generator-java/test/integration/goldens/compute/src/com/google/cloud/compute/v1small/stub/RegionOperationsStubSettings.java @@ -100,7 +100,6 @@ public UnaryCallSettings waitSettings() { return waitSettings; } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public RegionOperationsStub createStub() throws IOException { if (getTransportChannelProvider() .getTransportName() diff --git a/gapic-generator-java/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/IamCredentialsClient.java b/gapic-generator-java/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/IamCredentialsClient.java index 5c1dd677c3..8ccb484730 100644 --- a/gapic-generator-java/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/IamCredentialsClient.java +++ b/gapic-generator-java/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/IamCredentialsClient.java @@ -16,7 +16,6 @@ package com.google.cloud.iam.credentials.v1; -import com.google.api.core.BetaApi; import com.google.api.gax.core.BackgroundResource; import com.google.api.gax.rpc.UnaryCallable; import com.google.cloud.iam.credentials.v1.stub.IamCredentialsStub; @@ -128,7 +127,6 @@ public static final IamCredentialsClient create(IamCredentialsSettings settings) * Constructs an instance of IamCredentialsClient, using the given stub for making calls. This is * for advanced usage - prefer using create(IamCredentialsSettings). */ - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public static final IamCredentialsClient create(IamCredentialsStub stub) { return new IamCredentialsClient(stub); } @@ -143,7 +141,6 @@ protected IamCredentialsClient(IamCredentialsSettings settings) throws IOExcepti this.stub = ((IamCredentialsStubSettings) settings.getStubSettings()).createStub(); } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") protected IamCredentialsClient(IamCredentialsStub stub) { this.settings = null; this.stub = stub; @@ -153,7 +150,6 @@ public final IamCredentialsSettings getSettings() { return settings; } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public IamCredentialsStub getStub() { return stub; } diff --git a/gapic-generator-java/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/stub/IamCredentialsStubSettings.java b/gapic-generator-java/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/stub/IamCredentialsStubSettings.java index c5a188f4fc..a8e98059f6 100644 --- a/gapic-generator-java/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/stub/IamCredentialsStubSettings.java +++ b/gapic-generator-java/test/integration/goldens/credentials/src/com/google/cloud/iam/credentials/v1/stub/IamCredentialsStubSettings.java @@ -118,7 +118,6 @@ public UnaryCallSettings signJwtSettings() { return signJwtSettings; } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public IamCredentialsStub createStub() throws IOException { if (getTransportChannelProvider() .getTransportName() diff --git a/gapic-generator-java/test/integration/goldens/iam/src/com/google/iam/v1/IAMPolicyClient.java b/gapic-generator-java/test/integration/goldens/iam/src/com/google/iam/v1/IAMPolicyClient.java index 64444f651d..8a21063c02 100644 --- a/gapic-generator-java/test/integration/goldens/iam/src/com/google/iam/v1/IAMPolicyClient.java +++ b/gapic-generator-java/test/integration/goldens/iam/src/com/google/iam/v1/IAMPolicyClient.java @@ -16,7 +16,6 @@ package com.google.iam.v1; -import com.google.api.core.BetaApi; import com.google.api.gax.core.BackgroundResource; import com.google.api.gax.rpc.UnaryCallable; import com.google.iam.v1.stub.IAMPolicyStub; @@ -138,7 +137,6 @@ public static final IAMPolicyClient create(IAMPolicySettings settings) throws IO * Constructs an instance of IAMPolicyClient, using the given stub for making calls. This is for * advanced usage - prefer using create(IAMPolicySettings). */ - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public static final IAMPolicyClient create(IAMPolicyStub stub) { return new IAMPolicyClient(stub); } @@ -152,7 +150,6 @@ protected IAMPolicyClient(IAMPolicySettings settings) throws IOException { this.stub = ((IAMPolicyStubSettings) settings.getStubSettings()).createStub(); } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") protected IAMPolicyClient(IAMPolicyStub stub) { this.settings = null; this.stub = stub; @@ -162,7 +159,6 @@ public final IAMPolicySettings getSettings() { return settings; } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public IAMPolicyStub getStub() { return stub; } diff --git a/gapic-generator-java/test/integration/goldens/iam/src/com/google/iam/v1/stub/IAMPolicyStubSettings.java b/gapic-generator-java/test/integration/goldens/iam/src/com/google/iam/v1/stub/IAMPolicyStubSettings.java index 063e2c605d..12df652de3 100644 --- a/gapic-generator-java/test/integration/goldens/iam/src/com/google/iam/v1/stub/IAMPolicyStubSettings.java +++ b/gapic-generator-java/test/integration/goldens/iam/src/com/google/iam/v1/stub/IAMPolicyStubSettings.java @@ -105,7 +105,6 @@ public UnaryCallSettings getIamPolicySettings() { return testIamPermissionsSettings; } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public IAMPolicyStub createStub() throws IOException { if (getTransportChannelProvider() .getTransportName() diff --git a/gapic-generator-java/test/integration/goldens/kms/src/com/google/cloud/kms/v1/KeyManagementServiceClient.java b/gapic-generator-java/test/integration/goldens/kms/src/com/google/cloud/kms/v1/KeyManagementServiceClient.java index 7edd77bdc4..71b5a3e61a 100644 --- a/gapic-generator-java/test/integration/goldens/kms/src/com/google/cloud/kms/v1/KeyManagementServiceClient.java +++ b/gapic-generator-java/test/integration/goldens/kms/src/com/google/cloud/kms/v1/KeyManagementServiceClient.java @@ -18,7 +18,6 @@ import com.google.api.core.ApiFuture; import com.google.api.core.ApiFutures; -import com.google.api.core.BetaApi; import com.google.api.gax.core.BackgroundResource; import com.google.api.gax.paging.AbstractFixedSizeCollection; import com.google.api.gax.paging.AbstractPage; @@ -150,7 +149,6 @@ public static final KeyManagementServiceClient create(KeyManagementServiceSettin * Constructs an instance of KeyManagementServiceClient, using the given stub for making calls. * This is for advanced usage - prefer using create(KeyManagementServiceSettings). */ - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public static final KeyManagementServiceClient create(KeyManagementServiceStub stub) { return new KeyManagementServiceClient(stub); } @@ -165,7 +163,6 @@ protected KeyManagementServiceClient(KeyManagementServiceSettings settings) thro this.stub = ((KeyManagementServiceStubSettings) settings.getStubSettings()).createStub(); } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") protected KeyManagementServiceClient(KeyManagementServiceStub stub) { this.settings = null; this.stub = stub; @@ -175,7 +172,6 @@ public final KeyManagementServiceSettings getSettings() { return settings; } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public KeyManagementServiceStub getStub() { return stub; } diff --git a/gapic-generator-java/test/integration/goldens/kms/src/com/google/cloud/kms/v1/stub/KeyManagementServiceStubSettings.java b/gapic-generator-java/test/integration/goldens/kms/src/com/google/cloud/kms/v1/stub/KeyManagementServiceStubSettings.java index 5c5f66fd26..4c7d0011b3 100644 --- a/gapic-generator-java/test/integration/goldens/kms/src/com/google/cloud/kms/v1/stub/KeyManagementServiceStubSettings.java +++ b/gapic-generator-java/test/integration/goldens/kms/src/com/google/cloud/kms/v1/stub/KeyManagementServiceStubSettings.java @@ -625,7 +625,6 @@ public UnaryCallSettings getLocationSettings() { return testIamPermissionsSettings; } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public KeyManagementServiceStub createStub() throws IOException { if (getTransportChannelProvider() .getTransportName() diff --git a/gapic-generator-java/test/integration/goldens/library/src/com/google/cloud/example/library/v1/LibraryServiceClient.java b/gapic-generator-java/test/integration/goldens/library/src/com/google/cloud/example/library/v1/LibraryServiceClient.java index ca7865e600..a426e4ebbf 100644 --- a/gapic-generator-java/test/integration/goldens/library/src/com/google/cloud/example/library/v1/LibraryServiceClient.java +++ b/gapic-generator-java/test/integration/goldens/library/src/com/google/cloud/example/library/v1/LibraryServiceClient.java @@ -18,7 +18,6 @@ import com.google.api.core.ApiFuture; import com.google.api.core.ApiFutures; -import com.google.api.core.BetaApi; import com.google.api.gax.core.BackgroundResource; import com.google.api.gax.paging.AbstractFixedSizeCollection; import com.google.api.gax.paging.AbstractPage; @@ -148,7 +147,6 @@ public static final LibraryServiceClient create(LibraryServiceSettings settings) * Constructs an instance of LibraryServiceClient, using the given stub for making calls. This is * for advanced usage - prefer using create(LibraryServiceSettings). */ - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public static final LibraryServiceClient create(LibraryServiceStub stub) { return new LibraryServiceClient(stub); } @@ -163,7 +161,6 @@ protected LibraryServiceClient(LibraryServiceSettings settings) throws IOExcepti this.stub = ((LibraryServiceStubSettings) settings.getStubSettings()).createStub(); } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") protected LibraryServiceClient(LibraryServiceStub stub) { this.settings = null; this.stub = stub; @@ -173,7 +170,6 @@ public final LibraryServiceSettings getSettings() { return settings; } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public LibraryServiceStub getStub() { return stub; } diff --git a/gapic-generator-java/test/integration/goldens/library/src/com/google/cloud/example/library/v1/stub/LibraryServiceStubSettings.java b/gapic-generator-java/test/integration/goldens/library/src/com/google/cloud/example/library/v1/stub/LibraryServiceStubSettings.java index c12c6876f7..e10e50e435 100644 --- a/gapic-generator-java/test/integration/goldens/library/src/com/google/cloud/example/library/v1/stub/LibraryServiceStubSettings.java +++ b/gapic-generator-java/test/integration/goldens/library/src/com/google/cloud/example/library/v1/stub/LibraryServiceStubSettings.java @@ -284,7 +284,6 @@ public UnaryCallSettings moveBookSettings() { return moveBookSettings; } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public LibraryServiceStub createStub() throws IOException { if (getTransportChannelProvider() .getTransportName() diff --git a/gapic-generator-java/test/integration/goldens/logging/src/com/google/cloud/logging/v2/ConfigClient.java b/gapic-generator-java/test/integration/goldens/logging/src/com/google/cloud/logging/v2/ConfigClient.java index f4e4fd0932..9a84edeb33 100644 --- a/gapic-generator-java/test/integration/goldens/logging/src/com/google/cloud/logging/v2/ConfigClient.java +++ b/gapic-generator-java/test/integration/goldens/logging/src/com/google/cloud/logging/v2/ConfigClient.java @@ -18,7 +18,6 @@ import com.google.api.core.ApiFuture; import com.google.api.core.ApiFutures; -import com.google.api.core.BetaApi; import com.google.api.gax.core.BackgroundResource; import com.google.api.gax.paging.AbstractFixedSizeCollection; import com.google.api.gax.paging.AbstractPage; @@ -169,7 +168,6 @@ public static final ConfigClient create(ConfigSettings settings) throws IOExcept * Constructs an instance of ConfigClient, using the given stub for making calls. This is for * advanced usage - prefer using create(ConfigSettings). */ - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public static final ConfigClient create(ConfigServiceV2Stub stub) { return new ConfigClient(stub); } @@ -183,7 +181,6 @@ protected ConfigClient(ConfigSettings settings) throws IOException { this.stub = ((ConfigServiceV2StubSettings) settings.getStubSettings()).createStub(); } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") protected ConfigClient(ConfigServiceV2Stub stub) { this.settings = null; this.stub = stub; @@ -193,7 +190,6 @@ public final ConfigSettings getSettings() { return settings; } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public ConfigServiceV2Stub getStub() { return stub; } diff --git a/gapic-generator-java/test/integration/goldens/logging/src/com/google/cloud/logging/v2/LoggingClient.java b/gapic-generator-java/test/integration/goldens/logging/src/com/google/cloud/logging/v2/LoggingClient.java index e15a4f0960..ab6544d82c 100644 --- a/gapic-generator-java/test/integration/goldens/logging/src/com/google/cloud/logging/v2/LoggingClient.java +++ b/gapic-generator-java/test/integration/goldens/logging/src/com/google/cloud/logging/v2/LoggingClient.java @@ -20,7 +20,6 @@ import com.google.api.MonitoredResourceDescriptor; import com.google.api.core.ApiFuture; import com.google.api.core.ApiFutures; -import com.google.api.core.BetaApi; import com.google.api.gax.core.BackgroundResource; import com.google.api.gax.paging.AbstractFixedSizeCollection; import com.google.api.gax.paging.AbstractPage; @@ -142,7 +141,6 @@ public static final LoggingClient create(LoggingSettings settings) throws IOExce * Constructs an instance of LoggingClient, using the given stub for making calls. This is for * advanced usage - prefer using create(LoggingSettings). */ - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public static final LoggingClient create(LoggingServiceV2Stub stub) { return new LoggingClient(stub); } @@ -156,7 +154,6 @@ protected LoggingClient(LoggingSettings settings) throws IOException { this.stub = ((LoggingServiceV2StubSettings) settings.getStubSettings()).createStub(); } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") protected LoggingClient(LoggingServiceV2Stub stub) { this.settings = null; this.stub = stub; @@ -166,7 +163,6 @@ public final LoggingSettings getSettings() { return settings; } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public LoggingServiceV2Stub getStub() { return stub; } diff --git a/gapic-generator-java/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MetricsClient.java b/gapic-generator-java/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MetricsClient.java index c74e0a912c..386b7d36a7 100644 --- a/gapic-generator-java/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MetricsClient.java +++ b/gapic-generator-java/test/integration/goldens/logging/src/com/google/cloud/logging/v2/MetricsClient.java @@ -18,7 +18,6 @@ import com.google.api.core.ApiFuture; import com.google.api.core.ApiFutures; -import com.google.api.core.BetaApi; import com.google.api.gax.core.BackgroundResource; import com.google.api.gax.paging.AbstractFixedSizeCollection; import com.google.api.gax.paging.AbstractPage; @@ -130,7 +129,6 @@ public static final MetricsClient create(MetricsSettings settings) throws IOExce * Constructs an instance of MetricsClient, using the given stub for making calls. This is for * advanced usage - prefer using create(MetricsSettings). */ - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public static final MetricsClient create(MetricsServiceV2Stub stub) { return new MetricsClient(stub); } @@ -144,7 +142,6 @@ protected MetricsClient(MetricsSettings settings) throws IOException { this.stub = ((MetricsServiceV2StubSettings) settings.getStubSettings()).createStub(); } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") protected MetricsClient(MetricsServiceV2Stub stub) { this.settings = null; this.stub = stub; @@ -154,7 +151,6 @@ public final MetricsSettings getSettings() { return settings; } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public MetricsServiceV2Stub getStub() { return stub; } diff --git a/gapic-generator-java/test/integration/goldens/logging/src/com/google/cloud/logging/v2/stub/ConfigServiceV2StubSettings.java b/gapic-generator-java/test/integration/goldens/logging/src/com/google/cloud/logging/v2/stub/ConfigServiceV2StubSettings.java index 456dd597f4..ade13c5ddb 100644 --- a/gapic-generator-java/test/integration/goldens/logging/src/com/google/cloud/logging/v2/stub/ConfigServiceV2StubSettings.java +++ b/gapic-generator-java/test/integration/goldens/logging/src/com/google/cloud/logging/v2/stub/ConfigServiceV2StubSettings.java @@ -494,7 +494,6 @@ public UnaryCallSettings updateCmekSett return updateCmekSettingsSettings; } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public ConfigServiceV2Stub createStub() throws IOException { if (getTransportChannelProvider() .getTransportName() diff --git a/gapic-generator-java/test/integration/goldens/logging/src/com/google/cloud/logging/v2/stub/LoggingServiceV2StubSettings.java b/gapic-generator-java/test/integration/goldens/logging/src/com/google/cloud/logging/v2/stub/LoggingServiceV2StubSettings.java index 180ef48c6b..220b7f22c1 100644 --- a/gapic-generator-java/test/integration/goldens/logging/src/com/google/cloud/logging/v2/stub/LoggingServiceV2StubSettings.java +++ b/gapic-generator-java/test/integration/goldens/logging/src/com/google/cloud/logging/v2/stub/LoggingServiceV2StubSettings.java @@ -424,7 +424,6 @@ public UnaryCallSettings deleteLogSettings() { return tailLogEntriesSettings; } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public LoggingServiceV2Stub createStub() throws IOException { if (getTransportChannelProvider() .getTransportName() diff --git a/gapic-generator-java/test/integration/goldens/logging/src/com/google/cloud/logging/v2/stub/MetricsServiceV2StubSettings.java b/gapic-generator-java/test/integration/goldens/logging/src/com/google/cloud/logging/v2/stub/MetricsServiceV2StubSettings.java index 5716cdceae..871b9b1ee1 100644 --- a/gapic-generator-java/test/integration/goldens/logging/src/com/google/cloud/logging/v2/stub/MetricsServiceV2StubSettings.java +++ b/gapic-generator-java/test/integration/goldens/logging/src/com/google/cloud/logging/v2/stub/MetricsServiceV2StubSettings.java @@ -192,7 +192,6 @@ public UnaryCallSettings deleteLogMetricSettings( return deleteLogMetricSettings; } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public MetricsServiceV2Stub createStub() throws IOException { if (getTransportChannelProvider() .getTransportName() diff --git a/gapic-generator-java/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/SchemaServiceClient.java b/gapic-generator-java/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/SchemaServiceClient.java index 0efce32a29..b6783f5367 100644 --- a/gapic-generator-java/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/SchemaServiceClient.java +++ b/gapic-generator-java/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/SchemaServiceClient.java @@ -18,7 +18,6 @@ import com.google.api.core.ApiFuture; import com.google.api.core.ApiFutures; -import com.google.api.core.BetaApi; import com.google.api.gax.core.BackgroundResource; import com.google.api.gax.paging.AbstractFixedSizeCollection; import com.google.api.gax.paging.AbstractPage; @@ -142,7 +141,6 @@ public static final SchemaServiceClient create(SchemaServiceSettings settings) * Constructs an instance of SchemaServiceClient, using the given stub for making calls. This is * for advanced usage - prefer using create(SchemaServiceSettings). */ - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public static final SchemaServiceClient create(SchemaServiceStub stub) { return new SchemaServiceClient(stub); } @@ -157,7 +155,6 @@ protected SchemaServiceClient(SchemaServiceSettings settings) throws IOException this.stub = ((SchemaServiceStubSettings) settings.getStubSettings()).createStub(); } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") protected SchemaServiceClient(SchemaServiceStub stub) { this.settings = null; this.stub = stub; @@ -167,7 +164,6 @@ public final SchemaServiceSettings getSettings() { return settings; } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public SchemaServiceStub getStub() { return stub; } diff --git a/gapic-generator-java/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/SubscriptionAdminClient.java b/gapic-generator-java/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/SubscriptionAdminClient.java index 9b31bed522..6ce8f4a349 100644 --- a/gapic-generator-java/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/SubscriptionAdminClient.java +++ b/gapic-generator-java/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/SubscriptionAdminClient.java @@ -18,7 +18,6 @@ import com.google.api.core.ApiFuture; import com.google.api.core.ApiFutures; -import com.google.api.core.BetaApi; import com.google.api.gax.core.BackgroundResource; import com.google.api.gax.paging.AbstractFixedSizeCollection; import com.google.api.gax.paging.AbstractPage; @@ -165,7 +164,6 @@ public static final SubscriptionAdminClient create(SubscriptionAdminSettings set * Constructs an instance of SubscriptionAdminClient, using the given stub for making calls. This * is for advanced usage - prefer using create(SubscriptionAdminSettings). */ - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public static final SubscriptionAdminClient create(SubscriberStub stub) { return new SubscriptionAdminClient(stub); } @@ -180,7 +178,6 @@ protected SubscriptionAdminClient(SubscriptionAdminSettings settings) throws IOE this.stub = ((SubscriberStubSettings) settings.getStubSettings()).createStub(); } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") protected SubscriptionAdminClient(SubscriberStub stub) { this.settings = null; this.stub = stub; @@ -190,7 +187,6 @@ public final SubscriptionAdminSettings getSettings() { return settings; } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public SubscriberStub getStub() { return stub; } diff --git a/gapic-generator-java/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/TopicAdminClient.java b/gapic-generator-java/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/TopicAdminClient.java index 68bf054a86..30a8a62940 100644 --- a/gapic-generator-java/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/TopicAdminClient.java +++ b/gapic-generator-java/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/TopicAdminClient.java @@ -18,7 +18,6 @@ import com.google.api.core.ApiFuture; import com.google.api.core.ApiFutures; -import com.google.api.core.BetaApi; import com.google.api.gax.core.BackgroundResource; import com.google.api.gax.paging.AbstractFixedSizeCollection; import com.google.api.gax.paging.AbstractPage; @@ -145,7 +144,6 @@ public static final TopicAdminClient create(TopicAdminSettings settings) throws * Constructs an instance of TopicAdminClient, using the given stub for making calls. This is for * advanced usage - prefer using create(TopicAdminSettings). */ - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public static final TopicAdminClient create(PublisherStub stub) { return new TopicAdminClient(stub); } @@ -159,7 +157,6 @@ protected TopicAdminClient(TopicAdminSettings settings) throws IOException { this.stub = ((PublisherStubSettings) settings.getStubSettings()).createStub(); } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") protected TopicAdminClient(PublisherStub stub) { this.settings = null; this.stub = stub; @@ -169,7 +166,6 @@ public final TopicAdminSettings getSettings() { return settings; } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public PublisherStub getStub() { return stub; } diff --git a/gapic-generator-java/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/stub/PublisherStubSettings.java b/gapic-generator-java/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/stub/PublisherStubSettings.java index aaeb343d30..dd5a997402 100644 --- a/gapic-generator-java/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/stub/PublisherStubSettings.java +++ b/gapic-generator-java/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/stub/PublisherStubSettings.java @@ -458,7 +458,6 @@ public UnaryCallSettings getIamPolicySettings() { return testIamPermissionsSettings; } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public PublisherStub createStub() throws IOException { if (getTransportChannelProvider() .getTransportName() diff --git a/gapic-generator-java/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/stub/SchemaServiceStubSettings.java b/gapic-generator-java/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/stub/SchemaServiceStubSettings.java index a7d8fc4ae4..963e9b7cef 100644 --- a/gapic-generator-java/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/stub/SchemaServiceStubSettings.java +++ b/gapic-generator-java/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/stub/SchemaServiceStubSettings.java @@ -222,7 +222,6 @@ public UnaryCallSettings getIamPolicySettings() { return testIamPermissionsSettings; } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public SchemaServiceStub createStub() throws IOException { if (getTransportChannelProvider() .getTransportName() diff --git a/gapic-generator-java/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/stub/SubscriberStubSettings.java b/gapic-generator-java/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/stub/SubscriberStubSettings.java index bb8299b268..036017d5e9 100644 --- a/gapic-generator-java/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/stub/SubscriberStubSettings.java +++ b/gapic-generator-java/test/integration/goldens/pubsub/src/com/google/cloud/pubsub/v1/stub/SubscriberStubSettings.java @@ -363,7 +363,6 @@ public UnaryCallSettings getIamPolicySettings() { return testIamPermissionsSettings; } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public SubscriberStub createStub() throws IOException { if (getTransportChannelProvider() .getTransportName() diff --git a/gapic-generator-java/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/CloudRedisClient.java b/gapic-generator-java/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/CloudRedisClient.java index da68b2788e..8479bbf51f 100644 --- a/gapic-generator-java/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/CloudRedisClient.java +++ b/gapic-generator-java/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/CloudRedisClient.java @@ -150,7 +150,6 @@ public static final CloudRedisClient create(CloudRedisSettings settings) throws * Constructs an instance of CloudRedisClient, using the given stub for making calls. This is for * advanced usage - prefer using create(CloudRedisSettings). */ - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public static final CloudRedisClient create(CloudRedisStub stub) { return new CloudRedisClient(stub); } @@ -165,7 +164,6 @@ protected CloudRedisClient(CloudRedisSettings settings) throws IOException { this.operationsClient = OperationsClient.create(this.stub.getOperationsStub()); } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") protected CloudRedisClient(CloudRedisStub stub) { this.settings = null; this.stub = stub; @@ -176,7 +174,6 @@ public final CloudRedisSettings getSettings() { return settings; } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public CloudRedisStub getStub() { return stub; } diff --git a/gapic-generator-java/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/stub/CloudRedisStubSettings.java b/gapic-generator-java/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/stub/CloudRedisStubSettings.java index 05ce9661a9..9776782ead 100644 --- a/gapic-generator-java/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/stub/CloudRedisStubSettings.java +++ b/gapic-generator-java/test/integration/goldens/redis/src/com/google/cloud/redis/v1beta1/stub/CloudRedisStubSettings.java @@ -301,7 +301,6 @@ public UnaryCallSettings deleteInstanceSetting return rescheduleMaintenanceOperationSettings; } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public CloudRedisStub createStub() throws IOException { if (getTransportChannelProvider() .getTransportName() diff --git a/gapic-generator-java/test/integration/goldens/storage/src/com/google/storage/v2/StorageClient.java b/gapic-generator-java/test/integration/goldens/storage/src/com/google/storage/v2/StorageClient.java index 7ac3053780..c7a9a4d737 100644 --- a/gapic-generator-java/test/integration/goldens/storage/src/com/google/storage/v2/StorageClient.java +++ b/gapic-generator-java/test/integration/goldens/storage/src/com/google/storage/v2/StorageClient.java @@ -18,7 +18,6 @@ import com.google.api.core.ApiFuture; import com.google.api.core.ApiFutures; -import com.google.api.core.BetaApi; import com.google.api.gax.core.BackgroundResource; import com.google.api.gax.paging.AbstractFixedSizeCollection; import com.google.api.gax.paging.AbstractPage; @@ -144,7 +143,6 @@ public static final StorageClient create(StorageSettings settings) throws IOExce * Constructs an instance of StorageClient, using the given stub for making calls. This is for * advanced usage - prefer using create(StorageSettings). */ - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public static final StorageClient create(StorageStub stub) { return new StorageClient(stub); } @@ -158,7 +156,6 @@ protected StorageClient(StorageSettings settings) throws IOException { this.stub = ((StorageStubSettings) settings.getStubSettings()).createStub(); } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") protected StorageClient(StorageStub stub) { this.settings = null; this.stub = stub; @@ -168,7 +165,6 @@ public final StorageSettings getSettings() { return settings; } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public StorageStub getStub() { return stub; } diff --git a/gapic-generator-java/test/integration/goldens/storage/src/com/google/storage/v2/stub/StorageStubSettings.java b/gapic-generator-java/test/integration/goldens/storage/src/com/google/storage/v2/stub/StorageStubSettings.java index 5e786e6bca..e2ab998b19 100644 --- a/gapic-generator-java/test/integration/goldens/storage/src/com/google/storage/v2/stub/StorageStubSettings.java +++ b/gapic-generator-java/test/integration/goldens/storage/src/com/google/storage/v2/stub/StorageStubSettings.java @@ -565,7 +565,6 @@ public UnaryCallSettings updateHmacKeySet return updateHmacKeySettings; } - @BetaApi("A restructuring of stub classes is planned, so this may break in the future") public StorageStub createStub() throws IOException { if (getTransportChannelProvider() .getTransportName()